diff options
| author | Jens Axboe | 2019-02-15 16:43:59 +0100 |
|---|---|---|
| committer | Jens Axboe | 2019-02-15 16:43:59 +0100 |
| commit | 6fb845f0e78de19eaaf6a2d351702474e44b6a9e (patch) | |
| tree | 94c6474b38d8f59d8f0de0151053283812e456c6 /drivers/net/ethernet/qlogic/qed/qed.h | |
| parent | block: kill BLK_MQ_F_SG_MERGE (diff) | |
| parent | Linux 5.0-rc6 (diff) | |
| download | kernel-qcow2-linux-6fb845f0e78de19eaaf6a2d351702474e44b6a9e.tar.gz kernel-qcow2-linux-6fb845f0e78de19eaaf6a2d351702474e44b6a9e.tar.xz kernel-qcow2-linux-6fb845f0e78de19eaaf6a2d351702474e44b6a9e.zip | |
Merge tag 'v5.0-rc6' into for-5.1/block
Pull in 5.0-rc6 to avoid a dumb merge conflict with fs/iomap.c.
This is needed since io_uring is now based on the block branch,
to avoid a conflict between the multi-page bvecs and the bits
of io_uring that touch the core block parts.
* tag 'v5.0-rc6': (525 commits)
Linux 5.0-rc6
x86/mm: Make set_pmd_at() paravirt aware
MAINTAINERS: Update the ocores i2c bus driver maintainer, etc
blk-mq: remove duplicated definition of blk_mq_freeze_queue
Blk-iolatency: warn on negative inflight IO counter
blk-iolatency: fix IO hang due to negative inflight counter
MAINTAINERS: unify reference to xen-devel list
x86/mm/cpa: Fix set_mce_nospec()
futex: Handle early deadlock return correctly
futex: Fix barrier comment
net: dsa: b53: Fix for failure when irq is not defined in dt
blktrace: Show requests without sector
mips: cm: reprime error cause
mips: loongson64: remove unreachable(), fix loongson_poweroff().
sit: check if IPv6 enabled before calling ip6_err_gen_icmpv6_unreach()
geneve: should not call rt6_lookup() when ipv6 was disabled
KVM: nVMX: unconditionally cancel preemption timer in free_nested (CVE-2019-7221)
KVM: x86: work around leak of uninitialized stack contents (CVE-2019-7222)
kvm: fix kvm_ioctl_create_device() reference counting (CVE-2019-6974)
signal: Better detection of synchronous signals
...
Diffstat (limited to 'drivers/net/ethernet/qlogic/qed/qed.h')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qed/qed.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h index 24a90163775e..2d8a77cc156b 100644 --- a/drivers/net/ethernet/qlogic/qed/qed.h +++ b/drivers/net/ethernet/qlogic/qed/qed.h @@ -53,7 +53,7 @@ extern const struct qed_common_ops qed_common_ops_pass; #define QED_MAJOR_VERSION 8 -#define QED_MINOR_VERSION 33 +#define QED_MINOR_VERSION 37 #define QED_REVISION_VERSION 0 #define QED_ENGINEERING_VERSION 20 |