summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-01-03 10:11:38 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-01-03 10:11:38 -0600
commit853a1bdee228fd49f2844364dcfa7df65ef40d4b (patch)
tree725f8c111477b1ce77cbc36dd85e34f0dfc18995
parent2a0e3107b684eb296b079d3b2a3ca4dff219e97e (diff)
downloadkernel-853a1bdee228fd49f2844364dcfa7df65ef40d4b.tar.gz
kernel-853a1bdee228fd49f2844364dcfa7df65ef40d4b.tar.xz
kernel-853a1bdee228fd49f2844364dcfa7df65ef40d4b.zip
kernel-5.16-0.rc8.55
* Mon Jan 03 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc8.55] - redhat/configs: enable CONFIG_INPUT_KEYBOARD for AARCH64 (Vitaly Kuznetsov) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-fedora.config4
-rw-r--r--kernel-aarch64-debug-rhel.config7
-rw-r--r--kernel-aarch64-fedora.config4
-rw-r--r--kernel-aarch64-rhel.config7
-rwxr-xr-xkernel.spec17
-rw-r--r--patch-5.16-redhat.patch2
-rw-r--r--sources6
8 files changed, 27 insertions, 22 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 88b3c1699..d7191068b 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 = 52
+RHEL_RELEASE = 55
#
# Early y+1 numbering
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 59175f523..686a7e99e 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -3343,7 +3343,7 @@ CONFIG_KEYBOARD_ADC=m
# CONFIG_KEYBOARD_ADP5588 is not set
# CONFIG_KEYBOARD_ADP5589 is not set
# CONFIG_KEYBOARD_APPLESPI is not set
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_BCM is not set
# CONFIG_KEYBOARD_CAP11XX is not set
CONFIG_KEYBOARD_CROS_EC=m
@@ -6434,7 +6434,7 @@ CONFIG_SERIO_ARC_PS2=m
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_GPIO_PS2 is not set
# CONFIG_SERIO_I8042 is not set
-# CONFIG_SERIO_LIBPS2 is not set
+CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_OLPC_APSP is not set
# CONFIG_SERIO_PARKBD is not set
# CONFIG_SERIO_PCIPS2 is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 33be16217..073d24b1c 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2293,7 +2293,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
# CONFIG_INPUT_IQS626A is not set
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
+CONFIG_INPUT_KEYBOARD=y
CONFIG_INPUT_KEYSPAN_REMOTE=m
# CONFIG_INPUT_KXTJ9 is not set
CONFIG_INPUT_LEDS=y
@@ -2625,7 +2625,7 @@ CONFIG_KEXEC=y
# CONFIG_KEYBOARD_ADP5588 is not set
# CONFIG_KEYBOARD_ADP5589 is not set
# CONFIG_KEYBOARD_APPLESPI is not set
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_BCM is not set
# CONFIG_KEYBOARD_CAP11XX is not set
# CONFIG_KEYBOARD_CYPRESS_SF is not set
@@ -2650,6 +2650,7 @@ CONFIG_KEXEC=y
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_TCA6416 is not set
# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_TEGRA is not set
# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
@@ -5068,7 +5069,7 @@ CONFIG_SERIO_ARC_PS2=m
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_GPIO_PS2 is not set
# CONFIG_SERIO_I8042 is not set
-# CONFIG_SERIO_LIBPS2 is not set
+CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_OLPC_APSP is not set
# CONFIG_SERIO_PARKBD is not set
# CONFIG_SERIO_PCIPS2 is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 8f661a773..1245fccaa 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -3320,7 +3320,7 @@ CONFIG_KEYBOARD_ADC=m
# CONFIG_KEYBOARD_ADP5588 is not set
# CONFIG_KEYBOARD_ADP5589 is not set
# CONFIG_KEYBOARD_APPLESPI is not set
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_BCM is not set
# CONFIG_KEYBOARD_CAP11XX is not set
CONFIG_KEYBOARD_CROS_EC=m
@@ -6410,7 +6410,7 @@ CONFIG_SERIO_ARC_PS2=m
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_GPIO_PS2 is not set
# CONFIG_SERIO_I8042 is not set
-# CONFIG_SERIO_LIBPS2 is not set
+CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_OLPC_APSP is not set
# CONFIG_SERIO_PARKBD is not set
# CONFIG_SERIO_PCIPS2 is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 4563fe819..6bed2d158 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -2277,7 +2277,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
# CONFIG_INPUT_IQS626A is not set
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_KEYBOARD is not set
+CONFIG_INPUT_KEYBOARD=y
CONFIG_INPUT_KEYSPAN_REMOTE=m
# CONFIG_INPUT_KXTJ9 is not set
CONFIG_INPUT_LEDS=y
@@ -2604,7 +2604,7 @@ CONFIG_KEXEC=y
# CONFIG_KEYBOARD_ADP5588 is not set
# CONFIG_KEYBOARD_ADP5589 is not set
# CONFIG_KEYBOARD_APPLESPI is not set
-# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_BCM is not set
# CONFIG_KEYBOARD_CAP11XX is not set
# CONFIG_KEYBOARD_CYPRESS_SF is not set
@@ -2629,6 +2629,7 @@ CONFIG_KEXEC=y
# CONFIG_KEYBOARD_SUNKBD is not set
# CONFIG_KEYBOARD_TCA6416 is not set
# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_TEGRA is not set
# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
# CONFIG_KEYBOARD_XTKBD is not set
CONFIG_KEY_DH_OPERATIONS=y
@@ -5046,7 +5047,7 @@ CONFIG_SERIO_ARC_PS2=m
# CONFIG_SERIO_CT82C710 is not set
# CONFIG_SERIO_GPIO_PS2 is not set
# CONFIG_SERIO_I8042 is not set
-# CONFIG_SERIO_LIBPS2 is not set
+CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_OLPC_APSP is not set
# CONFIG_SERIO_PARKBD is not set
# CONFIG_SERIO_PCIPS2 is not set
diff --git a/kernel.spec b/kernel.spec
index 6ebb4bee2..f70eeb3a4 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,9 +85,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.rc7.20211231git4f3d93c6eaff.52
+%global distro_build 0.rc8.55
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
%define rpmversion 5.16.0
%define patchversion 5.16
-%define pkgrelease 0.rc7.20211231git4f3d93c6eaff.52
+%define pkgrelease 0.rc8.55
# This is needed to do merge window version magic
%define patchlevel 16
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc7.20211231git4f3d93c6eaff.52%{?buildid}%{?dist}
+%define specrelease 0.rc8.55%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -689,7 +689,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-rc7-99-g4f3d93c6eaff.tar.xz
+Source0: linux-5.16-rc8.tar.xz
Source1: Makefile.rhelver
@@ -1383,8 +1383,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.16-rc7-99-g4f3d93c6eaff -c
-mv linux-5.16-rc7-99-g4f3d93c6eaff linux-%{KVERREL}
+%setup -q -n kernel-5.16-rc8 -c
+mv linux-5.16-rc8 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2981,6 +2981,9 @@ fi
#
#
%changelog
+* Mon Jan 03 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc8.55]
+- redhat/configs: enable CONFIG_INPUT_KEYBOARD for AARCH64 (Vitaly Kuznetsov)
+
* Fri Dec 24 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc6.20211224git7a29b11da965.45]
- Fedora configs for 5.16 pt 1 (Justin M. Forbes)
- redhat/configs: NFS: disable UDP, insecure enctypes (Benjamin Coddington) [1952863]
diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch
index 029143a7b..d68cc58e9 100644
--- a/patch-5.16-redhat.patch
+++ b/patch-5.16-redhat.patch
@@ -128,7 +128,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 17b4319ad2ff..f6c96ef725a2 100644
+index 16d7f83ac368..52307591aa03 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index ed04ba06e..4bb34ddc3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.16-rc7-99-g4f3d93c6eaff.tar.xz) = 834f74f69b8d36913e98c34552415d93162ed0620949b98b1498d05a5a3e82f8c7ee96d857b5f48728f1320b55a125f00d8c16a2e5786b973f0a7f86971a1687
-SHA512 (kernel-abi-stablelists-5.16.0-0.rc7.20211231git4f3d93c6eaff.52.tar.bz2) = 3a45e40e48df8bac7e8b468e7baaaf9ab6dfd5c627cd02fe30336af5c49a753550cbb3d412352f53662331af9b254cd112471e91a87a61c387ac1baf4c405b8a
-SHA512 (kernel-kabi-dw-5.16.0-0.rc7.20211231git4f3d93c6eaff.52.tar.bz2) = 077bef810070dc7ab6a179f901a26583277deb44719f4bc384a86a75ef6a3080aed25988895f422e2e718c37ac043ad845e43f58a8e024cedbf6baa16f5d7ea9
+SHA512 (linux-5.16-rc8.tar.xz) = 38d4bf260a9cd996182f6393e9c2fefa9af84a99c5122c7b9bbfe8cb6285ef08fbb43db430a7d21eec4a77c567ee5e51467af72f39d3f66f1491b5584b9286f0
+SHA512 (kernel-abi-stablelists-5.16.0-0.rc8.55.tar.bz2) = 43146b99082bc33689d8520afbc4562fe577acc4cdabec2de21e1883cf2e78dd9f39582f5ed74723869e3eda55a6c5faac7a1a1e26a240d0496ca96815b7a818
+SHA512 (kernel-kabi-dw-5.16.0-0.rc8.55.tar.bz2) = 47e2ce1441ba4393563121d8b05dc60858a83d2235d8814bea962bb8acaa965e796167978c144065109a2325f2da7332a8d28d5ff445d869b953cdcd8d32159b