kernel-5.16-0.rc2.20211124git5d9f4cf36721.19
* Wed Nov 24 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc2.20211124git5d9f4cf36721.19] - Fix up PREEMPT configs (Justin M. Forbes) - New configs in drivers/media (Fedora Kernel Team) - New configs in drivers/net/ethernet/litex (Fedora Kernel Team) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
88e40a4683
commit
24c54b66f6
@ -12,7 +12,7 @@ RHEL_MINOR = 99
|
||||
#
|
||||
# Use this spot to avoid future merge conflicts.
|
||||
# Do not trim this comment.
|
||||
RHEL_RELEASE = 21
|
||||
RHEL_RELEASE = 24
|
||||
|
||||
#
|
||||
# Early y+1 numbering
|
||||
|
@ -8760,6 +8760,7 @@ CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
# CONFIG_XEN is not set
|
||||
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
CONFIG_XEN_UNPOPULATED_ALLOC=y
|
||||
|
@ -7041,6 +7041,7 @@ CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_BACKEND is not set
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
# CONFIG_XEN is not set
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
# CONFIG_XEN_PVH is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
|
@ -8733,6 +8733,7 @@ CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
# CONFIG_XEN is not set
|
||||
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
CONFIG_XEN_UNPOPULATED_ALLOC=y
|
||||
|
@ -7017,6 +7017,7 @@ CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_BACKEND is not set
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
# CONFIG_XEN is not set
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
# CONFIG_XEN_PVH is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
|
@ -9034,6 +9034,7 @@ CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
# CONFIG_XEN is not set
|
||||
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
CONFIG_XEN_UNPOPULATED_ALLOC=y
|
||||
|
@ -9008,6 +9008,7 @@ CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
# CONFIG_XEN is not set
|
||||
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
CONFIG_XEN_UNPOPULATED_ALLOC=y
|
||||
|
@ -8766,6 +8766,7 @@ CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
# CONFIG_XEN is not set
|
||||
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
CONFIG_XEN_UNPOPULATED_ALLOC=y
|
||||
|
@ -8740,6 +8740,7 @@ CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
# CONFIG_XEN is not set
|
||||
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
CONFIG_XEN_UNPOPULATED_ALLOC=y
|
||||
|
@ -7976,6 +7976,7 @@ CONFIG_XEN_NETDEV_BACKEND=m
|
||||
CONFIG_XEN_NETDEV_FRONTEND=m
|
||||
CONFIG_XEN_PCIDEV_BACKEND=m
|
||||
CONFIG_XEN_PCIDEV_FRONTEND=m
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_BACKEND is not set
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
|
@ -7950,6 +7950,7 @@ CONFIG_XEN_NETDEV_BACKEND=m
|
||||
CONFIG_XEN_NETDEV_FRONTEND=m
|
||||
CONFIG_XEN_PCIDEV_BACKEND=m
|
||||
CONFIG_XEN_PCIDEV_FRONTEND=m
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_BACKEND is not set
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
|
@ -7545,6 +7545,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
|
||||
CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
CONFIG_XEN_UNPOPULATED_ALLOC=y
|
||||
|
@ -6797,6 +6797,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
|
||||
CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_BACKEND is not set
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
# CONFIG_XEN_PVH is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
|
@ -7518,6 +7518,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
|
||||
CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
CONFIG_XEN_UNPOPULATED_ALLOC=y
|
||||
|
@ -6777,6 +6777,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
|
||||
CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_BACKEND is not set
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
# CONFIG_XEN_PVH is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
|
@ -7508,6 +7508,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
|
||||
CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
CONFIG_XEN_UNPOPULATED_ALLOC=y
|
||||
|
@ -6758,6 +6758,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
|
||||
CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_BACKEND is not set
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
# CONFIG_XEN_PVH is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
|
@ -7481,6 +7481,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
|
||||
CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
CONFIG_XEN_UNPOPULATED_ALLOC=y
|
||||
|
@ -6738,6 +6738,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
|
||||
CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_BACKEND is not set
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
# CONFIG_XEN_PVH is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
|
@ -6773,6 +6773,7 @@ CONFIG_XDP_SOCKETS_DIAG=m
|
||||
CONFIG_XDP_SOCKETS=y
|
||||
# CONFIG_XEN_BACKEND is not set
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
# CONFIG_XEN_PVH is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
|
@ -8031,6 +8031,7 @@ CONFIG_XEN_NETDEV_BACKEND=m
|
||||
CONFIG_XEN_NETDEV_FRONTEND=m
|
||||
CONFIG_XEN_PCIDEV_BACKEND=m
|
||||
CONFIG_XEN_PCIDEV_FRONTEND=m
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_BACKEND is not set
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
|
@ -7065,6 +7065,7 @@ CONFIG_XENFS=m
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
CONFIG_XEN_NETDEV_FRONTEND=m
|
||||
# CONFIG_XEN_PCIDEV_FRONTEND is not set
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
# CONFIG_XEN_PVH is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
|
@ -8005,6 +8005,7 @@ CONFIG_XEN_NETDEV_BACKEND=m
|
||||
CONFIG_XEN_NETDEV_FRONTEND=m
|
||||
CONFIG_XEN_PCIDEV_BACKEND=m
|
||||
CONFIG_XEN_PCIDEV_FRONTEND=m
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_BACKEND is not set
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
|
@ -7042,6 +7042,7 @@ CONFIG_XENFS=m
|
||||
# CONFIG_XEN_GRANT_DMA_ALLOC is not set
|
||||
CONFIG_XEN_NETDEV_FRONTEND=m
|
||||
# CONFIG_XEN_PCIDEV_FRONTEND is not set
|
||||
CONFIG_XEN_PRIVCMD=m
|
||||
# CONFIG_XEN_PVCALLS_FRONTEND is not set
|
||||
# CONFIG_XEN_PVH is not set
|
||||
CONFIG_XEN_PVHVM_GUEST=y
|
||||
|
14
kernel.spec
14
kernel.spec
@ -83,9 +83,9 @@ Summary: The Linux kernel
|
||||
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
|
||||
# to build the base kernel using the debug configuration. (Specifying
|
||||
# the --with-release option overrides this setting.)
|
||||
%define debugbuildsenabled 0
|
||||
%define debugbuildsenabled 1
|
||||
|
||||
%global distro_build 0.rc2.20211126gita4849f6000e2.21
|
||||
%global distro_build 0.rc3.24
|
||||
|
||||
%if 0%{?fedora}
|
||||
%define secure_boot_arch x86_64
|
||||
@ -130,13 +130,13 @@ Summary: The Linux kernel
|
||||
|
||||
%define rpmversion 5.16.0
|
||||
%define patchversion 5.16
|
||||
%define pkgrelease 0.rc2.20211126gita4849f6000e2.21
|
||||
%define pkgrelease 0.rc3.24
|
||||
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 16
|
||||
|
||||
# allow pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 0.rc2.20211126gita4849f6000e2.21%{?buildid}%{?dist}
|
||||
%define specrelease 0.rc3.24%{?buildid}%{?dist}
|
||||
|
||||
%define pkg_release %{specrelease}
|
||||
|
||||
@ -682,7 +682,7 @@ BuildRequires: lld
|
||||
# exact git commit you can run
|
||||
#
|
||||
# xzcat -qq ${TARBALL} | git get-tar-commit-id
|
||||
Source0: linux-5.16-rc2-162-ga4849f6000e2.tar.xz
|
||||
Source0: linux-5.16-rc3.tar.xz
|
||||
|
||||
Source1: Makefile.rhelver
|
||||
|
||||
@ -1374,8 +1374,8 @@ ApplyOptionalPatch()
|
||||
fi
|
||||
}
|
||||
|
||||
%setup -q -n kernel-5.16-rc2-162-ga4849f6000e2 -c
|
||||
mv linux-5.16-rc2-162-ga4849f6000e2 linux-%{KVERREL}
|
||||
%setup -q -n kernel-5.16-rc3 -c
|
||||
mv linux-5.16-rc3 linux-%{KVERREL}
|
||||
|
||||
cd linux-%{KVERREL}
|
||||
cp -a %{SOURCE1} .
|
||||
|
@ -128,7 +128,7 @@ index 000000000000..effb81d04bfd
|
||||
+
|
||||
+endmenu
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 72b0c3d5cbad..d84f7c164563 100644
|
||||
index 0a6ecc8bb2d2..b339e50d93e8 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
|
||||
@ -270,7 +270,7 @@ index 0083464de5e3..2de5f417f3f2 100644
|
||||
setup_force_cpu_cap(X86_FEATURE_CPUID);
|
||||
cpu_parse_early_param();
|
||||
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
|
||||
index c410be738ae7..dcbff059b842 100644
|
||||
index 6a190c7f4d71..3fbfbf6ed21c 100644
|
||||
--- a/arch/x86/kernel/setup.c
|
||||
+++ b/arch/x86/kernel/setup.c
|
||||
@@ -20,6 +20,7 @@
|
||||
@ -1947,10 +1947,10 @@ index aeb95f409826..68a999b02009 100644
|
||||
/* Fusion */
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)},
|
||||
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
||||
index cee7170beae8..3f9d70325677 100644
|
||||
index 00792767c620..2ee890521ed7 100644
|
||||
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
||||
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
||||
@@ -12550,6 +12550,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev)
|
||||
@@ -12605,6 +12605,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev)
|
||||
* The pci device ids are defined in mpi/mpi2_cnfg.h.
|
||||
*/
|
||||
static const struct pci_device_id mpt3sas_pci_table[] = {
|
||||
@ -1958,7 +1958,7 @@ index cee7170beae8..3f9d70325677 100644
|
||||
/* Spitfire ~ 2004 */
|
||||
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2004,
|
||||
PCI_ANY_ID, PCI_ANY_ID },
|
||||
@@ -12568,6 +12569,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
|
||||
@@ -12623,6 +12624,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
|
||||
PCI_ANY_ID, PCI_ANY_ID },
|
||||
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2,
|
||||
PCI_ANY_ID, PCI_ANY_ID },
|
||||
@ -1966,7 +1966,7 @@ index cee7170beae8..3f9d70325677 100644
|
||||
/* Thunderbolt ~ 2208 */
|
||||
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1,
|
||||
PCI_ANY_ID, PCI_ANY_ID },
|
||||
@@ -12592,9 +12594,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
|
||||
@@ -12647,9 +12649,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
|
||||
PCI_ANY_ID, PCI_ANY_ID },
|
||||
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1,
|
||||
PCI_ANY_ID, PCI_ANY_ID },
|
||||
@ -2030,10 +2030,10 @@ index 8987acc24dac..5013d52a7211 100644
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
|
||||
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
|
||||
index 86658a81d284..5647f4756e97 100644
|
||||
index 00070a8a6507..e9e0ffa990cd 100644
|
||||
--- a/drivers/usb/core/hub.c
|
||||
+++ b/drivers/usb/core/hub.c
|
||||
@@ -5657,6 +5657,13 @@ static void hub_event(struct work_struct *work)
|
||||
@@ -5666,6 +5666,13 @@ static void hub_event(struct work_struct *work)
|
||||
(u16) hub->change_bits[0],
|
||||
(u16) hub->event_bits[0]);
|
||||
|
||||
|
6
sources
6
sources
@ -1,3 +1,3 @@
|
||||
SHA512 (linux-5.16-rc2-162-ga4849f6000e2.tar.xz) = 4b82ade582a4cdc6ae9ebe2635f5cd4f5dbeb285e4cfd26d252905014661d578f2df35c04dcfb55d21d75f4fddfe4918dbc561766e14a2e8129d70fd3187573e
|
||||
SHA512 (kernel-abi-stablelists-5.16.0-0.rc2.20211126gita4849f6000e2.21.tar.bz2) = 3afb8d049f3c43df3434959bf24382c13b481cc19782d8971ad400385e4d83d42433c233b1f72027dbef84f1349db30ace10e1625a69af5ebab83889ade90ae0
|
||||
SHA512 (kernel-kabi-dw-5.16.0-0.rc2.20211126gita4849f6000e2.21.tar.bz2) = b5ce471b04d1012318328f20b744f3c8af8b08a8e45f0a85b7e11933ea74da2330e15e1a9c6879715b940da8f56725973a0fbc2f1d9c33c455f331efdf510684
|
||||
SHA512 (linux-5.16-rc3.tar.xz) = 1db26fd17ff6e3400abff5ad739eb08ba4bf3a812e2c37aca8083dd913aab4d857ac66edf95c55cb9f4a52b4d209ff824c4c2609eaf1a4263e33080f36c7cc90
|
||||
SHA512 (kernel-abi-stablelists-5.16.0-0.rc3.24.tar.bz2) = fc20d485472024b9d7a7e3c433f9bcce0f1fb749856c9b2d3632270b88bdaa3fd2a667e6dc70dbd3fa13a23fc64fbfc9701e077a4dd3a6bb5869de2378c8033a
|
||||
SHA512 (kernel-kabi-dw-5.16.0-0.rc3.24.tar.bz2) = 8151ab931514345c056df3a3e5a86092193af0a848cafc648089652bef544c41809f055cab111d11fc49b9edbb650fc0fbc25f317b7aef564384ccaff3431231
|
||||
|
Loading…
Reference in New Issue
Block a user