summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-11-10 12:17:49 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-11-10 12:17:49 -0600
commitcd5be03fded7ade485a122452d576127e0a0147f (patch)
tree2a8dc7691dbdb390e563fdc8200aff3f20910a38
parent863d61daf8bb1eb7b271dc8a4ccc12a6289e987c (diff)
downloadkernel-cd5be03fded7ade485a122452d576127e0a0147f.tar.gz
kernel-cd5be03fded7ade485a122452d576127e0a0147f.tar.xz
kernel-cd5be03fded7ade485a122452d576127e0a0147f.zip
kernel-5.16-0.rc0.20211110gitcb690f5238d7.10
* Wed Nov 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211110gitcb690f5238d7.10] - arm64: cpufeature: Export this_cpu_has_cap helper (Arnd Bergmann) - drm/virtio: Fix NULL dereference error in virtio_gpu_poll (Vivek Kasireddy) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog8
-rw-r--r--kernel-aarch64-debug-rhel.config3
-rw-r--r--kernel-aarch64-rhel.config3
-rw-r--r--kernel-ppc64le-debug-rhel.config3
-rw-r--r--kernel-ppc64le-rhel.config3
-rw-r--r--kernel-s390x-debug-rhel.config1
-rw-r--r--kernel-s390x-rhel.config1
-rw-r--r--kernel-s390x-zfcpdump-rhel.config1
-rw-r--r--kernel-x86_64-debug-rhel.config3
-rw-r--r--kernel-x86_64-rhel.config3
-rwxr-xr-xkernel.spec19
-rw-r--r--patch-5.16-redhat.patch6
-rw-r--r--sources6
14 files changed, 37 insertions, 25 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 0c6a71d1c..d54c79cf4 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
-RHEL_RELEASE = 9
+RHEL_RELEASE = 10
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index e923259e3..dc5ca97b6 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,8 +1,8 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/ca3bff2fbfde026a32a900a47e61443e79f64464
- ca3bff2fbfde026a32a900a47e61443e79f64464 arm64: cpufeature: Export this_cpu_has_cap helper
+https://gitlab.com/cki-project/kernel-ark/-/commit/22d78162a1ebd87197d6395e7b702033e6cd2905
+ 22d78162a1ebd87197d6395e7b702033e6cd2905 arm64: cpufeature: Export this_cpu_has_cap helper
-https://gitlab.com/cki-project/kernel-ark/-/commit/b7fc3a511b8d75b54b1bc4bd5f6a2d571bd00b5e
- b7fc3a511b8d75b54b1bc4bd5f6a2d571bd00b5e drm/virtio: Fix NULL dereference error in virtio_gpu_poll
+https://gitlab.com/cki-project/kernel-ark/-/commit/b3f61c9e2180aebee495c2f5e1389a8a1493bb0b
+ b3f61c9e2180aebee495c2f5e1389a8a1493bb0b drm/virtio: Fix NULL dereference error in virtio_gpu_poll
https://gitlab.com/cki-project/kernel-ark/-/commit/07b3d9b051aa347237b4c637a1984c1915c750b2
07b3d9b051aa347237b4c637a1984c1915c750b2 Enable e1000 in rhel9 as unsupported
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index a6800173a..d1be73b22 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -10,8 +10,9 @@ CONFIG_8139TOO_8129=y
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
# CONFIG_ABP060MG is not set
-# CONFIG_ACCESSIBILITY is not set
+CONFIG_ACCESSIBILITY=y
# CONFIG_ACER_WIRELESS is not set
# CONFIG_ACORN_PARTITION is not set
CONFIG_ACPI_AC=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 8f44cceec..5b5dc0212 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -10,8 +10,9 @@ CONFIG_8139TOO_8129=y
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
# CONFIG_ABP060MG is not set
-# CONFIG_ACCESSIBILITY is not set
+CONFIG_ACCESSIBILITY=y
# CONFIG_ACER_WIRELESS is not set
# CONFIG_ACORN_PARTITION is not set
CONFIG_ACPI_AC=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index db647ddd1..22bed7188 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -11,8 +11,9 @@ CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
CONFIG_842_DECOMPRESS=y
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
# CONFIG_ABP060MG is not set
-# CONFIG_ACCESSIBILITY is not set
+CONFIG_ACCESSIBILITY=y
# CONFIG_ACER_WIRELESS is not set
# CONFIG_ACORN_PARTITION is not set
CONFIG_ACPI_AC=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 87e9f65ac..ead300854 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -11,8 +11,9 @@ CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
CONFIG_842_DECOMPRESS=y
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
# CONFIG_ABP060MG is not set
-# CONFIG_ACCESSIBILITY is not set
+CONFIG_ACCESSIBILITY=y
# CONFIG_ACER_WIRELESS is not set
# CONFIG_ACORN_PARTITION is not set
CONFIG_ACPI_AC=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 8686d5f53..ec5da191b 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -10,6 +10,7 @@ CONFIG_8139TOO_8129=y
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
# CONFIG_ABP060MG is not set
# CONFIG_ACCESSIBILITY is not set
# CONFIG_ACER_WIRELESS is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index af11eaeba..d1ebadcfe 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -10,6 +10,7 @@ CONFIG_8139TOO_8129=y
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
# CONFIG_ABP060MG is not set
# CONFIG_ACCESSIBILITY is not set
# CONFIG_ACER_WIRELESS is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 6d52d48e3..b134d250b 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -10,6 +10,7 @@ CONFIG_8139TOO_8129=y
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
# CONFIG_ABP060MG is not set
# CONFIG_ACCESSIBILITY is not set
# CONFIG_ACER_WIRELESS is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index a24545cb3..53a3ddb3c 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -10,8 +10,9 @@ CONFIG_8139TOO_8129=y
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
# CONFIG_ABP060MG is not set
-# CONFIG_ACCESSIBILITY is not set
+CONFIG_ACCESSIBILITY=y
# CONFIG_ACERHDF is not set
# CONFIG_ACER_WIRELESS is not set
CONFIG_ACER_WMI=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 5d60cda8d..bb4fa79b7 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -10,8 +10,9 @@ CONFIG_8139TOO_8129=y
CONFIG_8139TOO=m
# CONFIG_8139TOO_PIO is not set
# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_A11Y_BRAILLE_CONSOLE is not set
# CONFIG_ABP060MG is not set
-# CONFIG_ACCESSIBILITY is not set
+CONFIG_ACCESSIBILITY=y
# CONFIG_ACERHDF is not set
# CONFIG_ACER_WIRELESS is not set
CONFIG_ACER_WMI=m
diff --git a/kernel.spec b/kernel.spec
index 00e8d9fe1..cefaecb60 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,7 +85,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 0
-%global distro_build 0.rc0.20211109gitd2f38a3c6507.9
+%global distro_build 0.rc0.20211110gitcb690f5238d7.10
%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.rc0.20211109gitd2f38a3c6507.9
+%define pkgrelease 0.rc0.20211110gitcb690f5238d7.10
# This is needed to do merge window version magic
%define patchlevel 16
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20211109gitd2f38a3c6507.9%{?buildid}%{?dist}
+%define specrelease 0.rc0.20211110gitcb690f5238d7.10%{?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.15-11645-gd2f38a3c6507.tar.xz
+Source0: linux-5.15-11863-gcb690f5238d7.tar.xz
Source1: Makefile.rhelver
@@ -1374,8 +1374,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.15-11645-gd2f38a3c6507 -c
-mv linux-5.15-11645-gd2f38a3c6507 linux-%{KVERREL}
+%setup -q -n kernel-5.15-11863-gcb690f5238d7 -c
+mv linux-5.15-11863-gcb690f5238d7 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2184,7 +2184,7 @@ InitBuildVars
%global perf_build_extra_opts CORESIGHT=1
%endif
%global perf_make \
- %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
+ %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
%if %{with_perf}
# perf
# make sure check-headers.sh is executable
@@ -2972,10 +2972,13 @@ fi
#
#
%changelog
-* Tue Nov 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211109gitd2f38a3c6507.9]
+* Wed Nov 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211110gitcb690f5238d7.10]
- arm64: cpufeature: Export this_cpu_has_cap helper (Arnd Bergmann)
- drm/virtio: Fix NULL dereference error in virtio_gpu_poll (Vivek Kasireddy)
+* Wed Nov 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211110gitcb690f5238d7.9]
+- redhat: configs: move CONFIG_ACCESSIBILITY from fedora to common (John W. Linville)
+
* Tue Nov 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211109gitd2f38a3c6507.8]
- Filter updates for hid-playstation on Fedora (Justin M. Forbes)
- Revert "Force DWARF4 because crash does not support DWARF5 yet" (Lianbo Jiang)
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index ddee6ef39..93610d518 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -1583,7 +1583,7 @@ index 75dbe77b0b4b..029ff8576f8e 100644
err_netlink:
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 838b5e2058be..2598901296f2 100644
+index 4b5de8f5435a..798e401a2196 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -244,6 +244,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -2193,10 +2193,10 @@ index 6b5d36babfcc..fd4a5d66a9d0 100644
enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var)
{
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index e5359b09de1d..60b097643f45 100644
+index 968b4c4fe65b..4c34135b7fee 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
-@@ -530,4 +530,21 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
+@@ -495,4 +495,21 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
/* OTHER_WRITABLE? Generally considered a bad idea. */ \
BUILD_BUG_ON_ZERO((perms) & 2) + \
(perms))
diff --git a/sources b/sources
index a715b0a69..3bb313b00 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.15-11645-gd2f38a3c6507.tar.xz) = 32ccfee21d0b221037696e392623981511457258627e565faa084022d749069551b85406707782ea06d9308938316c6170d983f875b4e0876acb7a6ad6090967
-SHA512 (kernel-abi-stablelists-5.16.0-0.rc0.20211109gitd2f38a3c6507.9.tar.bz2) = 4702190598df5439774e01ad2071dff075d989a60e7356f3c85f1a5a4cb692a0ee43d728371c690eb4f2161fcb0ce1ff4b5f14fa3891d74de1f8293cb7f0ebb7
-SHA512 (kernel-kabi-dw-5.16.0-0.rc0.20211109gitd2f38a3c6507.9.tar.bz2) = 8e06c53dd3b27a3980c9cbbfca86b12ddff0961c1534b56dc6bc292752dfa3dca455a5adbce56c559a4470563df868c62dec76d4ff06df474eef2392e22f8917
+SHA512 (linux-5.15-11863-gcb690f5238d7.tar.xz) = 6c14780cc8161ff66c21f621572d7a6ebfc72b6c95c7fad9f04ee3809b270e10849009cc8bc236bff22bc29417df5210f3f66076743cbf2646a0253126f58a26
+SHA512 (kernel-abi-stablelists-5.16.0-0.rc0.20211110gitcb690f5238d7.10.tar.bz2) = e9ff23edb5c3b48e02d69c9313f1f6904c4262bcaf031f664e3ff13d11087158013d24c3dba3f71eaa0f707ff9a2cf59dbacb60ee1eba6c6ffcedd514f7d9731
+SHA512 (kernel-kabi-dw-5.16.0-0.rc0.20211110gitcb690f5238d7.10.tar.bz2) = 4629798e31ddfb6f2077a5d7ea0ec0b85609be5f760e48e26f4db7b7da1fade7e7825b124eab2c8dbe58dedbdf6b54601580937933a26213f067bb60240f81c4