summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel-aarch64-debug-fedora.config4
-rw-r--r--kernel-aarch64-fedora.config4
-rw-r--r--kernel-armv7hl-debug-fedora.config6
-rw-r--r--kernel-armv7hl-fedora.config6
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config6
-rw-r--r--kernel-armv7hl-lpae-fedora.config6
-rw-r--r--kernel-i686-debug-fedora.config4
-rw-r--r--kernel-i686-fedora.config4
-rw-r--r--kernel-ppc64le-debug-fedora.config4
-rw-r--r--kernel-ppc64le-fedora.config4
-rw-r--r--kernel-s390x-debug-fedora.config4
-rw-r--r--kernel-s390x-fedora.config4
-rw-r--r--kernel-x86_64-debug-fedora.config4
-rw-r--r--kernel-x86_64-fedora.config4
-rwxr-xr-xkernel.spec11
-rw-r--r--patch-5.11-redhat.patch12
-rw-r--r--sources6
17 files changed, 48 insertions, 45 deletions
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index e49bf8bad..f0ce17d24 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -126,7 +126,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -135,7 +135,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index cba8e9a22..8e5fe5a0d 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -126,7 +126,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -135,7 +135,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 27587b3d1..74d2781ea 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -119,7 +119,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -128,7 +128,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -4791,7 +4791,7 @@ CONFIG_NOUVEAU_DEBUG_MMU=y
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
CONFIG_NOUVEAU_PLATFORM_DRIVER=y
CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=32
+CONFIG_NR_CPUS=16
CONFIG_NS83820=m
# CONFIG_NTB is not set
# CONFIG_NTFS_FS is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index d7ecb47de..0fa2a779f 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -119,7 +119,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -128,7 +128,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -4769,7 +4769,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
CONFIG_NOUVEAU_PLATFORM_DRIVER=y
CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=32
+CONFIG_NR_CPUS=16
CONFIG_NS83820=m
# CONFIG_NTB is not set
# CONFIG_NTFS_FS is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index f02b4c111..8ebf40dfc 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -119,7 +119,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -128,7 +128,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -4689,7 +4689,7 @@ CONFIG_NOUVEAU_DEBUG_MMU=y
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
CONFIG_NOUVEAU_PLATFORM_DRIVER=y
CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=32
+CONFIG_NR_CPUS=16
CONFIG_NS83820=m
# CONFIG_NTB is not set
# CONFIG_NTFS_FS is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 201e9536b..7814bce35 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -119,7 +119,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -128,7 +128,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -4667,7 +4667,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
CONFIG_NOUVEAU_PLATFORM_DRIVER=y
CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=32
+CONFIG_NR_CPUS=16
CONFIG_NS83820=m
# CONFIG_NTB is not set
# CONFIG_NTFS_FS is not set
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index d2a4354e5..539fb8f03 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -134,7 +134,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -143,7 +143,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index a69764234..5b0b24a16 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -134,7 +134,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -143,7 +143,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index ad79a95a0..c0439346c 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -118,7 +118,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -127,7 +127,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 0c6e62965..74c080e80 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -118,7 +118,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -127,7 +127,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index a0ecb2da1..e1285b6f6 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -119,7 +119,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -128,7 +128,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 8e0f15590..f7b25d940 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -119,7 +119,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -128,7 +128,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index c7afb26e6..282b79722 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -136,7 +136,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -145,7 +145,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index fb5e9bcfe..8755afbb5 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -136,7 +136,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -145,7 +145,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
diff --git a/kernel.spec b/kernel.spec
index 378fbd38b..6250afae0 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -104,7 +104,7 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-%define rpmversion 5.11.15
+%define rpmversion 5.11.16
%define stableversion 5.11
%define pkgrelease 300
@@ -603,7 +603,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.11.15.tar.xz
+Source0: linux-5.11.16.tar.xz
Source1: Makefile.rhelver
@@ -1251,8 +1251,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.11.15 -c
-mv linux-5.11.15 linux-%{KVERREL}
+%setup -q -n kernel-5.11.16 -c
+mv linux-5.11.16 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2765,6 +2765,9 @@ fi
#
#
%changelog
+* Wed Apr 21 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.16-0]
+- Turn off ADI_AXI_ADC and AD9467 which now require CONFIG_OF (Justin M. Forbes)
+
* Fri Apr 16 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.15-0]
- Turn on CONFIG_VDPA_SIM_NET (rhbz 1942343) (Justin M. Forbes)
diff --git a/patch-5.11-redhat.patch b/patch-5.11-redhat.patch
index a31904e3d..d42fa4fb4 100644
--- a/patch-5.11-redhat.patch
+++ b/patch-5.11-redhat.patch
@@ -292,7 +292,7 @@ index 000000000000..c33a71263d9e
+ 2. Add the new profile name, along with a clear description of the
+ expected behaviour, to the sysfs-platform_profile ABI documentation.
diff --git a/Makefile b/Makefile
-index bcd8764fead9..f58195f60045 100644
+index 124d8e200776..17d54943a569 100644
--- a/Makefile
+++ b/Makefile
@@ -495,6 +495,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
@@ -304,10 +304,10 @@ index bcd8764fead9..f58195f60045 100644
-std=gnu89
KBUILD_CPPFLAGS := -D__KERNEL__
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 138248999df7..b962482a442e 100644
+index 3d2c684eab77..7a26e2e735d1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -1492,9 +1492,9 @@ config HIGHMEM
+@@ -1498,9 +1498,9 @@ config HIGHMEM
If unsure, say n.
config HIGHPTE
@@ -351,7 +351,7 @@ index a13d90206472..6a6aae01755b 100644
#define get_user(x, p) \
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 2517dd8c5a4d..c8dcf2660b24 100644
+index cd7f725b80d4..63ff09fffd7d 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -904,7 +904,7 @@ endchoice
@@ -454,7 +454,7 @@ index 1fbed91c73bc..73f5724342b1 100644
/* boot_command_line has been already set up in early.c */
*cmdline_p = boot_command_line;
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index df964571a6b4..200db376f728 100644
+index 54a3048ebc5b..45dabcea1f22 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -19,6 +19,7 @@
@@ -479,7 +479,7 @@ index df964571a6b4..200db376f728 100644
dmi_setup();
/*
-@@ -1116,19 +1124,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1113,19 +1121,7 @@ void __init setup_arch(char **cmdline_p)
/* Allocate bigger log buffer */
setup_log_buf(1);
diff --git a/sources b/sources
index b583323d1..b03baeb16 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.11.15.tar.xz) = 1434e667d17042b8f4acaff20826d0c879a3bf1101635e670e1c43fe670800bbc43ca54d6d51423d8b8c9c9281e03c6c23e3aa59f4aaeb41539c3f2187769520
-SHA512 (kernel-abi-whitelists-5.11.15-300.tar.bz2) = 20ff59c158bb06f44843b1585c79ef8cf845276d422f6a302ecaa49317696ba16782638d3bf64f4b9bf46c218eed5294e01684e3f2a701c8668bed34ad17de86
-SHA512 (kernel-kabi-dw-5.11.15-300.tar.bz2) = 0bc79ea8281914d0eebe75093b234db345e42df5a6f201c9225ab64d6d6cfb9ea5652f4728dc3dd3c7a00d5bd976929192265d363b59fb378576ad14e76992e0
+SHA512 (linux-5.11.16.tar.xz) = 95829118a094a018f200b8ef1f4bec7e3a90918702c488218581d4793dbff49767ec3d321c786ffa6c87c0015a3e1b22c02fe48707d8ccdc1203eb142ee91196
+SHA512 (kernel-abi-whitelists-5.11.16-300.tar.bz2) = fa3926de60a243bc9c1ad1c569fdfb3c6b5dfe9012741cf9b4ab4d3b78db22bf20deea2f89833d52c8cdd4a7fa0f0bf89d2dd52a6d81481068a1b84ece4ad03a
+SHA512 (kernel-kabi-dw-5.11.16-300.tar.bz2) = 357f62efb26425ede36f59ad7eb8a6594a71c354edd7efd0f168349fa6435f5eae4f46a4a876f42990e75a6f6779320c33c12e427fde994f84abb39c05801e45