kernel-5.13.0-0.rc1.20210513gitc06a2ba62fc4.15
* Thu May 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc1.20210513gitc06a2ba62fc4.15] - Remove unused boot loader specification files (David Ward) - Revert "nvme: multipath: Change default of kernel NVMe multipath to be disabled" (Mike Snitzer) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
d973690117
commit
e12344cfac
@ -1,3 +1,6 @@
|
|||||||
|
https://gitlab.com/cki-project/kernel-ark/-/commit/42fcca9ea8f8acd6f561e9589f92462246e572ff
|
||||||
|
42fcca9ea8f8acd6f561e9589f92462246e572ff Revert "nvme: multipath: Change default of kernel NVMe multipath to be disabled"
|
||||||
|
|
||||||
https://gitlab.com/cki-project/kernel-ark/-/commit/81cf9b7d49bb0a3786746e73d3090d97cefe301e
|
https://gitlab.com/cki-project/kernel-ark/-/commit/81cf9b7d49bb0a3786746e73d3090d97cefe301e
|
||||||
81cf9b7d49bb0a3786746e73d3090d97cefe301e nvme: multipath: Change default of kernel NVMe multipath to be disabled
|
81cf9b7d49bb0a3786746e73d3090d97cefe301e nvme: multipath: Change default of kernel NVMe multipath to be disabled
|
||||||
|
|
||||||
|
@ -3138,7 +3138,7 @@ CONFIG_MICROCHIP_PHY=m
|
|||||||
CONFIG_MICROCHIP_T1_PHY=m
|
CONFIG_MICROCHIP_T1_PHY=m
|
||||||
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
||||||
CONFIG_MICROSEMI_PHY=m
|
CONFIG_MICROSEMI_PHY=m
|
||||||
# CONFIG_MICROSOFT_MANA is not set
|
CONFIG_MICROSOFT_MANA=m
|
||||||
CONFIG_MIGRATION=y
|
CONFIG_MIGRATION=y
|
||||||
CONFIG_MII=m
|
CONFIG_MII=m
|
||||||
# CONFIG_MINIX_FS is not set
|
# CONFIG_MINIX_FS is not set
|
||||||
@ -3460,7 +3460,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
|
|||||||
CONFIG_NETFILTER_NETLINK=m
|
CONFIG_NETFILTER_NETLINK=m
|
||||||
CONFIG_NETFILTER_NETLINK_OSF=m
|
CONFIG_NETFILTER_NETLINK_OSF=m
|
||||||
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
||||||
CONFIG_NETFILTER_XTABLES_COMPAT=y
|
# CONFIG_NETFILTER_XTABLES_COMPAT is not set
|
||||||
CONFIG_NETFILTER_XTABLES=y
|
CONFIG_NETFILTER_XTABLES=y
|
||||||
CONFIG_NETFILTER_XT_CONNMARK=m
|
CONFIG_NETFILTER_XT_CONNMARK=m
|
||||||
CONFIG_NETFILTER_XT_MARK=m
|
CONFIG_NETFILTER_XT_MARK=m
|
||||||
|
@ -3118,7 +3118,7 @@ CONFIG_MICROCHIP_PHY=m
|
|||||||
CONFIG_MICROCHIP_T1_PHY=m
|
CONFIG_MICROCHIP_T1_PHY=m
|
||||||
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
||||||
CONFIG_MICROSEMI_PHY=m
|
CONFIG_MICROSEMI_PHY=m
|
||||||
# CONFIG_MICROSOFT_MANA is not set
|
CONFIG_MICROSOFT_MANA=m
|
||||||
CONFIG_MIGRATION=y
|
CONFIG_MIGRATION=y
|
||||||
CONFIG_MII=m
|
CONFIG_MII=m
|
||||||
# CONFIG_MINIX_FS is not set
|
# CONFIG_MINIX_FS is not set
|
||||||
@ -3440,7 +3440,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
|
|||||||
CONFIG_NETFILTER_NETLINK=m
|
CONFIG_NETFILTER_NETLINK=m
|
||||||
CONFIG_NETFILTER_NETLINK_OSF=m
|
CONFIG_NETFILTER_NETLINK_OSF=m
|
||||||
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
||||||
CONFIG_NETFILTER_XTABLES_COMPAT=y
|
# CONFIG_NETFILTER_XTABLES_COMPAT is not set
|
||||||
CONFIG_NETFILTER_XTABLES=y
|
CONFIG_NETFILTER_XTABLES=y
|
||||||
CONFIG_NETFILTER_XT_CONNMARK=m
|
CONFIG_NETFILTER_XT_CONNMARK=m
|
||||||
CONFIG_NETFILTER_XT_MARK=m
|
CONFIG_NETFILTER_XT_MARK=m
|
||||||
|
@ -2986,7 +2986,7 @@ CONFIG_MICROCHIP_PHY=m
|
|||||||
CONFIG_MICROCHIP_T1_PHY=m
|
CONFIG_MICROCHIP_T1_PHY=m
|
||||||
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
||||||
CONFIG_MICROSEMI_PHY=m
|
CONFIG_MICROSEMI_PHY=m
|
||||||
# CONFIG_MICROSOFT_MANA is not set
|
CONFIG_MICROSOFT_MANA=m
|
||||||
CONFIG_MIGRATION=y
|
CONFIG_MIGRATION=y
|
||||||
CONFIG_MII=m
|
CONFIG_MII=m
|
||||||
# CONFIG_MINIX_FS is not set
|
# CONFIG_MINIX_FS is not set
|
||||||
@ -3300,7 +3300,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
|
|||||||
CONFIG_NETFILTER_NETLINK=m
|
CONFIG_NETFILTER_NETLINK=m
|
||||||
CONFIG_NETFILTER_NETLINK_OSF=m
|
CONFIG_NETFILTER_NETLINK_OSF=m
|
||||||
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
||||||
CONFIG_NETFILTER_XTABLES_COMPAT=y
|
# CONFIG_NETFILTER_XTABLES_COMPAT is not set
|
||||||
CONFIG_NETFILTER_XTABLES=y
|
CONFIG_NETFILTER_XTABLES=y
|
||||||
CONFIG_NETFILTER_XT_CONNMARK=m
|
CONFIG_NETFILTER_XT_CONNMARK=m
|
||||||
CONFIG_NETFILTER_XT_MARK=m
|
CONFIG_NETFILTER_XT_MARK=m
|
||||||
|
@ -2969,7 +2969,7 @@ CONFIG_MICROCHIP_PHY=m
|
|||||||
CONFIG_MICROCHIP_T1_PHY=m
|
CONFIG_MICROCHIP_T1_PHY=m
|
||||||
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
||||||
CONFIG_MICROSEMI_PHY=m
|
CONFIG_MICROSEMI_PHY=m
|
||||||
# CONFIG_MICROSOFT_MANA is not set
|
CONFIG_MICROSOFT_MANA=m
|
||||||
CONFIG_MIGRATION=y
|
CONFIG_MIGRATION=y
|
||||||
CONFIG_MII=m
|
CONFIG_MII=m
|
||||||
# CONFIG_MINIX_FS is not set
|
# CONFIG_MINIX_FS is not set
|
||||||
@ -3283,7 +3283,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
|
|||||||
CONFIG_NETFILTER_NETLINK=m
|
CONFIG_NETFILTER_NETLINK=m
|
||||||
CONFIG_NETFILTER_NETLINK_OSF=m
|
CONFIG_NETFILTER_NETLINK_OSF=m
|
||||||
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
||||||
CONFIG_NETFILTER_XTABLES_COMPAT=y
|
# CONFIG_NETFILTER_XTABLES_COMPAT is not set
|
||||||
CONFIG_NETFILTER_XTABLES=y
|
CONFIG_NETFILTER_XTABLES=y
|
||||||
CONFIG_NETFILTER_XT_CONNMARK=m
|
CONFIG_NETFILTER_XT_CONNMARK=m
|
||||||
CONFIG_NETFILTER_XT_MARK=m
|
CONFIG_NETFILTER_XT_MARK=m
|
||||||
|
@ -2964,7 +2964,7 @@ CONFIG_MICROCHIP_PHY=m
|
|||||||
CONFIG_MICROCHIP_T1_PHY=m
|
CONFIG_MICROCHIP_T1_PHY=m
|
||||||
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
||||||
CONFIG_MICROSEMI_PHY=m
|
CONFIG_MICROSEMI_PHY=m
|
||||||
# CONFIG_MICROSOFT_MANA is not set
|
CONFIG_MICROSOFT_MANA=m
|
||||||
CONFIG_MIGRATION=y
|
CONFIG_MIGRATION=y
|
||||||
# CONFIG_MII is not set
|
# CONFIG_MII is not set
|
||||||
# CONFIG_MINIX_FS is not set
|
# CONFIG_MINIX_FS is not set
|
||||||
@ -3275,7 +3275,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
|
|||||||
CONFIG_NETFILTER_NETLINK=m
|
CONFIG_NETFILTER_NETLINK=m
|
||||||
CONFIG_NETFILTER_NETLINK_OSF=m
|
CONFIG_NETFILTER_NETLINK_OSF=m
|
||||||
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
||||||
CONFIG_NETFILTER_XTABLES_COMPAT=y
|
# CONFIG_NETFILTER_XTABLES_COMPAT is not set
|
||||||
CONFIG_NETFILTER_XTABLES=y
|
CONFIG_NETFILTER_XTABLES=y
|
||||||
CONFIG_NETFILTER_XT_CONNMARK=m
|
CONFIG_NETFILTER_XT_CONNMARK=m
|
||||||
CONFIG_NETFILTER_XT_MARK=m
|
CONFIG_NETFILTER_XT_MARK=m
|
||||||
|
@ -2947,7 +2947,7 @@ CONFIG_MICROCHIP_PHY=m
|
|||||||
CONFIG_MICROCHIP_T1_PHY=m
|
CONFIG_MICROCHIP_T1_PHY=m
|
||||||
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
||||||
CONFIG_MICROSEMI_PHY=m
|
CONFIG_MICROSEMI_PHY=m
|
||||||
# CONFIG_MICROSOFT_MANA is not set
|
CONFIG_MICROSOFT_MANA=m
|
||||||
CONFIG_MIGRATION=y
|
CONFIG_MIGRATION=y
|
||||||
# CONFIG_MII is not set
|
# CONFIG_MII is not set
|
||||||
# CONFIG_MINIX_FS is not set
|
# CONFIG_MINIX_FS is not set
|
||||||
@ -3258,7 +3258,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
|
|||||||
CONFIG_NETFILTER_NETLINK=m
|
CONFIG_NETFILTER_NETLINK=m
|
||||||
CONFIG_NETFILTER_NETLINK_OSF=m
|
CONFIG_NETFILTER_NETLINK_OSF=m
|
||||||
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
||||||
CONFIG_NETFILTER_XTABLES_COMPAT=y
|
# CONFIG_NETFILTER_XTABLES_COMPAT is not set
|
||||||
CONFIG_NETFILTER_XTABLES=y
|
CONFIG_NETFILTER_XTABLES=y
|
||||||
CONFIG_NETFILTER_XT_CONNMARK=m
|
CONFIG_NETFILTER_XT_CONNMARK=m
|
||||||
CONFIG_NETFILTER_XT_MARK=m
|
CONFIG_NETFILTER_XT_MARK=m
|
||||||
|
@ -2967,7 +2967,7 @@ CONFIG_MICROCHIP_PHY=m
|
|||||||
CONFIG_MICROCHIP_T1_PHY=m
|
CONFIG_MICROCHIP_T1_PHY=m
|
||||||
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
||||||
CONFIG_MICROSEMI_PHY=m
|
CONFIG_MICROSEMI_PHY=m
|
||||||
# CONFIG_MICROSOFT_MANA is not set
|
CONFIG_MICROSOFT_MANA=m
|
||||||
CONFIG_MIGRATION=y
|
CONFIG_MIGRATION=y
|
||||||
# CONFIG_MII is not set
|
# CONFIG_MII is not set
|
||||||
# CONFIG_MINIX_FS is not set
|
# CONFIG_MINIX_FS is not set
|
||||||
@ -3280,7 +3280,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
|
|||||||
CONFIG_NETFILTER_NETLINK=m
|
CONFIG_NETFILTER_NETLINK=m
|
||||||
CONFIG_NETFILTER_NETLINK_OSF=m
|
CONFIG_NETFILTER_NETLINK_OSF=m
|
||||||
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
||||||
CONFIG_NETFILTER_XTABLES_COMPAT=y
|
# CONFIG_NETFILTER_XTABLES_COMPAT is not set
|
||||||
CONFIG_NETFILTER_XTABLES=y
|
CONFIG_NETFILTER_XTABLES=y
|
||||||
CONFIG_NETFILTER_XT_CONNMARK=m
|
CONFIG_NETFILTER_XT_CONNMARK=m
|
||||||
CONFIG_NETFILTER_XT_MARK=m
|
CONFIG_NETFILTER_XT_MARK=m
|
||||||
|
@ -3163,7 +3163,7 @@ CONFIG_MICROCODE_INTEL=y
|
|||||||
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
||||||
CONFIG_MICROCODE=y
|
CONFIG_MICROCODE=y
|
||||||
CONFIG_MICROSEMI_PHY=m
|
CONFIG_MICROSEMI_PHY=m
|
||||||
# CONFIG_MICROSOFT_MANA is not set
|
CONFIG_MICROSOFT_MANA=m
|
||||||
CONFIG_MIGRATION=y
|
CONFIG_MIGRATION=y
|
||||||
CONFIG_MII=m
|
CONFIG_MII=m
|
||||||
# CONFIG_MINIX_FS is not set
|
# CONFIG_MINIX_FS is not set
|
||||||
@ -3483,7 +3483,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
|
|||||||
CONFIG_NETFILTER_NETLINK=m
|
CONFIG_NETFILTER_NETLINK=m
|
||||||
CONFIG_NETFILTER_NETLINK_OSF=m
|
CONFIG_NETFILTER_NETLINK_OSF=m
|
||||||
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
||||||
CONFIG_NETFILTER_XTABLES_COMPAT=y
|
# CONFIG_NETFILTER_XTABLES_COMPAT is not set
|
||||||
CONFIG_NETFILTER_XTABLES=y
|
CONFIG_NETFILTER_XTABLES=y
|
||||||
CONFIG_NETFILTER_XT_CONNMARK=m
|
CONFIG_NETFILTER_XT_CONNMARK=m
|
||||||
CONFIG_NETFILTER_XT_MARK=m
|
CONFIG_NETFILTER_XT_MARK=m
|
||||||
|
@ -3144,7 +3144,7 @@ CONFIG_MICROCODE_INTEL=y
|
|||||||
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
# CONFIG_MICROCODE_OLD_INTERFACE is not set
|
||||||
CONFIG_MICROCODE=y
|
CONFIG_MICROCODE=y
|
||||||
CONFIG_MICROSEMI_PHY=m
|
CONFIG_MICROSEMI_PHY=m
|
||||||
# CONFIG_MICROSOFT_MANA is not set
|
CONFIG_MICROSOFT_MANA=m
|
||||||
CONFIG_MIGRATION=y
|
CONFIG_MIGRATION=y
|
||||||
CONFIG_MII=m
|
CONFIG_MII=m
|
||||||
# CONFIG_MINIX_FS is not set
|
# CONFIG_MINIX_FS is not set
|
||||||
@ -3464,7 +3464,7 @@ CONFIG_NETFILTER_NETLINK_LOG=m
|
|||||||
CONFIG_NETFILTER_NETLINK=m
|
CONFIG_NETFILTER_NETLINK=m
|
||||||
CONFIG_NETFILTER_NETLINK_OSF=m
|
CONFIG_NETFILTER_NETLINK_OSF=m
|
||||||
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
||||||
CONFIG_NETFILTER_XTABLES_COMPAT=y
|
# CONFIG_NETFILTER_XTABLES_COMPAT is not set
|
||||||
CONFIG_NETFILTER_XTABLES=y
|
CONFIG_NETFILTER_XTABLES=y
|
||||||
CONFIG_NETFILTER_XT_CONNMARK=m
|
CONFIG_NETFILTER_XT_CONNMARK=m
|
||||||
CONFIG_NETFILTER_XT_MARK=m
|
CONFIG_NETFILTER_XT_MARK=m
|
||||||
|
15
kernel.spec
15
kernel.spec
@ -66,7 +66,7 @@ Summary: The Linux kernel
|
|||||||
# For a stable, released kernel, released_kernel should be 1.
|
# For a stable, released kernel, released_kernel should be 1.
|
||||||
%global released_kernel 0
|
%global released_kernel 0
|
||||||
|
|
||||||
%global distro_build 0.rc1.20210512git88b06399c9c7.15
|
%global distro_build 0.rc1.20210513gitc06a2ba62fc4.15
|
||||||
|
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%define secure_boot_arch x86_64
|
%define secure_boot_arch x86_64
|
||||||
@ -107,13 +107,13 @@ Summary: The Linux kernel
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%define rpmversion 5.13.0
|
%define rpmversion 5.13.0
|
||||||
%define pkgrelease 0.rc1.20210512git88b06399c9c7.15
|
%define pkgrelease 0.rc1.20210513gitc06a2ba62fc4.15
|
||||||
|
|
||||||
# This is needed to do merge window version magic
|
# This is needed to do merge window version magic
|
||||||
%define patchlevel 13
|
%define patchlevel 13
|
||||||
|
|
||||||
# allow pkg_release to have configurable %%{?dist} tag
|
# allow pkg_release to have configurable %%{?dist} tag
|
||||||
%define specrelease 0.rc1.20210512git88b06399c9c7.15%{?buildid}%{?dist}
|
%define specrelease 0.rc1.20210513gitc06a2ba62fc4.15%{?buildid}%{?dist}
|
||||||
|
|
||||||
%define pkg_release %{specrelease}
|
%define pkg_release %{specrelease}
|
||||||
|
|
||||||
@ -619,7 +619,7 @@ BuildRequires: clang
|
|||||||
# exact git commit you can run
|
# exact git commit you can run
|
||||||
#
|
#
|
||||||
# xzcat -qq ${TARBALL} | git get-tar-commit-id
|
# xzcat -qq ${TARBALL} | git get-tar-commit-id
|
||||||
Source0: linux-5.13-rc1-76-g88b06399c9c7.tar.xz
|
Source0: linux-5.13-rc1-92-gc06a2ba62fc4.tar.xz
|
||||||
|
|
||||||
Source1: Makefile.rhelver
|
Source1: Makefile.rhelver
|
||||||
|
|
||||||
@ -1270,8 +1270,8 @@ ApplyOptionalPatch()
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%setup -q -n kernel-5.13-rc1-76-g88b06399c9c7 -c
|
%setup -q -n kernel-5.13-rc1-92-gc06a2ba62fc4 -c
|
||||||
mv linux-5.13-rc1-76-g88b06399c9c7 linux-%{KVERREL}
|
mv linux-5.13-rc1-92-gc06a2ba62fc4 linux-%{KVERREL}
|
||||||
|
|
||||||
cd linux-%{KVERREL}
|
cd linux-%{KVERREL}
|
||||||
cp -a %{SOURCE1} .
|
cp -a %{SOURCE1} .
|
||||||
@ -2776,8 +2776,9 @@ fi
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
* Wed May 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc1.20210512git88b06399c9c7.15]
|
* Thu May 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc1.20210513gitc06a2ba62fc4.15]
|
||||||
- Remove unused boot loader specification files (David Ward)
|
- Remove unused boot loader specification files (David Ward)
|
||||||
|
- Revert "nvme: multipath: Change default of kernel NVMe multipath to be disabled" (Mike Snitzer)
|
||||||
|
|
||||||
* Wed May 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc1.20210512git88b06399c9c7.14]
|
* Wed May 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc1.20210512git88b06399c9c7.14]
|
||||||
- redhat/configs: Enable mlx5 IPsec and TLS offloads (Alaa Hleihel) [1869674 1957636]
|
- redhat/configs: Enable mlx5 IPsec and TLS offloads (Alaa Hleihel) [1869674 1957636]
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
drivers/net/ethernet/intel/ice/ice_main.c | 1 +
|
drivers/net/ethernet/intel/ice/ice_main.c | 1 +
|
||||||
drivers/net/wireguard/main.c | 7 +
|
drivers/net/wireguard/main.c | 7 +
|
||||||
drivers/nvme/host/core.c | 22 +-
|
drivers/nvme/host/core.c | 22 +-
|
||||||
drivers/nvme/host/multipath.c | 20 +-
|
drivers/nvme/host/multipath.c | 16 +-
|
||||||
drivers/nvme/host/nvme.h | 4 +
|
drivers/nvme/host/nvme.h | 4 +
|
||||||
drivers/pci/pci-driver.c | 29 ++
|
drivers/pci/pci-driver.c | 29 ++
|
||||||
drivers/pci/quirks.c | 24 ++
|
drivers/pci/quirks.c | 24 ++
|
||||||
@ -66,7 +66,7 @@
|
|||||||
security/lockdown/Kconfig | 13 +
|
security/lockdown/Kconfig | 13 +
|
||||||
security/lockdown/lockdown.c | 1 +
|
security/lockdown/lockdown.c | 1 +
|
||||||
security/security.c | 6 +
|
security/security.c | 6 +
|
||||||
68 files changed, 1201 insertions(+), 187 deletions(-)
|
68 files changed, 1197 insertions(+), 187 deletions(-)
|
||||||
|
|
||||||
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
|
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
|
||||||
index 75a9dd98e76e..3ff3291551f9 100644
|
index 75a9dd98e76e..3ff3291551f9 100644
|
||||||
@ -1358,22 +1358,10 @@ index 522c9b229f80..3161fec27575 100644
|
|||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(nvme_complete_rq);
|
EXPORT_SYMBOL_GPL(nvme_complete_rq);
|
||||||
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
|
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
|
||||||
index 0551796517e6..e64ab1be5765 100644
|
index 0551796517e6..79bd58079267 100644
|
||||||
--- a/drivers/nvme/host/multipath.c
|
--- a/drivers/nvme/host/multipath.c
|
||||||
+++ b/drivers/nvme/host/multipath.c
|
+++ b/drivers/nvme/host/multipath.c
|
||||||
@@ -8,7 +8,11 @@
|
@@ -65,14 +65,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags)
|
||||||
#include <trace/events/block.h>
|
|
||||||
#include "nvme.h"
|
|
||||||
|
|
||||||
+#ifdef CONFIG_RHEL_DIFFERENCES
|
|
||||||
+static bool multipath = false;
|
|
||||||
+#else
|
|
||||||
static bool multipath = true;
|
|
||||||
+#endif
|
|
||||||
module_param(multipath, bool, 0444);
|
|
||||||
MODULE_PARM_DESC(multipath,
|
|
||||||
"turn on native support for multiple controllers per subsystem");
|
|
||||||
@@ -65,14 +69,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags)
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1389,7 +1377,7 @@ index 0551796517e6..e64ab1be5765 100644
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* If we got back an ANA error, we know the controller is alive but not
|
* If we got back an ANA error, we know the controller is alive but not
|
||||||
@@ -83,6 +83,16 @@ void nvme_failover_req(struct request *req)
|
@@ -83,6 +79,16 @@ void nvme_failover_req(struct request *req)
|
||||||
set_bit(NVME_NS_ANA_PENDING, &ns->flags);
|
set_bit(NVME_NS_ANA_PENDING, &ns->flags);
|
||||||
queue_work(nvme_wq, &ns->ctrl->ana_work);
|
queue_work(nvme_wq, &ns->ctrl->ana_work);
|
||||||
}
|
}
|
||||||
|
6
sources
6
sources
@ -1,3 +1,3 @@
|
|||||||
SHA512 (linux-5.13-rc1-76-g88b06399c9c7.tar.xz) = 32c9b2c166cf06857213d3c360bef1d29fc865cce4f97c1b8aa6ad49c569336af849b8669764400dd77ab56b425d8118e98d416d171f6e79e9a0e1e04e517050
|
SHA512 (linux-5.13-rc1-92-gc06a2ba62fc4.tar.xz) = e464e0d10a639f0a2089d2accd41b2cc6831c8075d558c8cb37668d332fd3358cca705a8fd8bf41223beea599de7931d642dad00c30f0997ee2c30f149bfa51e
|
||||||
SHA512 (kernel-abi-whitelists-5.13.0-0.rc1.20210512git88b06399c9c7.15.tar.bz2) = 6d10a94575824fd64249a9ba4ac0280e1f1dcf864dd8e02328506b4fac8cf1f278b0e906e2f7ca9d7de05558cc95ca53df12df7af2d9139f0af3239e19859cf0
|
SHA512 (kernel-abi-whitelists-5.13.0-0.rc1.20210513gitc06a2ba62fc4.15.tar.bz2) = d69937ce10e0a7b6bb4817a4c6e4032f31df292811ff5505e4d3631dcd4c489591c1157dc05be4b22314c9b6870c461779fcc3e764db245c7a4606e3b104f8ed
|
||||||
SHA512 (kernel-kabi-dw-5.13.0-0.rc1.20210512git88b06399c9c7.15.tar.bz2) = 561d75b056d488b47790e5d7651c596c54f8576d2da5f19a0fd14d36c6ebffcf9edba10b6fd76ffe975e6780660c3fbcc5683190625077c5121d1fa838a89270
|
SHA512 (kernel-kabi-dw-5.13.0-0.rc1.20210513gitc06a2ba62fc4.15.tar.bz2) = e72934a2f18c793020cb0e7df648260adec94b02190645f491a6e88fe5ed7e9f31561e1f26d6326e10037be89920d94c61433b0bcfe8f730462fbb0ba0298569
|
||||||
|
Loading…
Reference in New Issue
Block a user