diff --git a/Makefile.rhelver b/Makefile.rhelver index 87d46da..712e1b7 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 = 166 +RHEL_RELEASE = 169 # # Early y+1 numbering @@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.3 +RTBUILD:=.4 diff --git a/kernel-rt-x86_64-debug-rhel.config b/kernel-rt-x86_64-debug-rhel.config index 9935696..52b13ee 100644 --- a/kernel-rt-x86_64-debug-rhel.config +++ b/kernel-rt-x86_64-debug-rhel.config @@ -536,7 +536,7 @@ CONFIG_BT_HCIUART=m # CONFIG_BT_HCIUART_MRVL is not set CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m -CONFIG_BT_HS=y +# CONFIG_BT_HS is not set CONFIG_BT_INTEL=m # CONFIG_BT_LEDS is not set CONFIG_BT_LE=y @@ -890,7 +890,7 @@ CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -# CONFIG_CRYPTO_DEV_QAT_4XXX is not set +CONFIG_CRYPTO_DEV_QAT_4XXX=m CONFIG_CRYPTO_DEV_QAT_C3XXX=m CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m CONFIG_CRYPTO_DEV_QAT_C62X=m @@ -3379,10 +3379,10 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_VMMOUSE=y CONFIG_MOUSE_PS2=y -CONFIG_MOUSE_SERIAL=m +# CONFIG_MOUSE_SERIAL is not set CONFIG_MOUSE_SYNAPTICS_I2C=m CONFIG_MOUSE_SYNAPTICS_USB=m -CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_VSXXXAA is not set # CONFIG_MOXA_INTELLIO is not set # CONFIG_MOXA_SMARTIO is not set # CONFIG_MOXTET is not set @@ -5153,7 +5153,7 @@ CONFIG_SERIO_LIBPS2=y # CONFIG_SERIO_PCIPS2 is not set # CONFIG_SERIO_PS2MULT is not set CONFIG_SERIO_RAW=m -CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_SERPORT=m CONFIG_SERIO=y # CONFIG_SFC_FALCON is not set CONFIG_SFC=m @@ -5573,6 +5573,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_WM8776 is not set # CONFIG_SND_SOC_WM8782 is not set CONFIG_SND_SOC_WM8804_I2C=m +CONFIG_SND_SOC_WM8804=m # CONFIG_SND_SOC_WM8804_SPI is not set # CONFIG_SND_SOC_WM8903 is not set # CONFIG_SND_SOC_WM8904 is not set diff --git a/kernel-rt-x86_64-rhel.config b/kernel-rt-x86_64-rhel.config index eb953fb..10199e1 100644 --- a/kernel-rt-x86_64-rhel.config +++ b/kernel-rt-x86_64-rhel.config @@ -536,7 +536,7 @@ CONFIG_BT_HCIUART=m # CONFIG_BT_HCIUART_MRVL is not set CONFIG_BT_HCIVHCI=m CONFIG_BT_HIDP=m -CONFIG_BT_HS=y +# CONFIG_BT_HS is not set CONFIG_BT_INTEL=m # CONFIG_BT_LEDS is not set CONFIG_BT_LE=y @@ -890,7 +890,7 @@ CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m CONFIG_CRYPTO_DEV_PADLOCK_AES=m CONFIG_CRYPTO_DEV_PADLOCK=m CONFIG_CRYPTO_DEV_PADLOCK_SHA=m -# CONFIG_CRYPTO_DEV_QAT_4XXX is not set +CONFIG_CRYPTO_DEV_QAT_4XXX=m CONFIG_CRYPTO_DEV_QAT_C3XXX=m CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m CONFIG_CRYPTO_DEV_QAT_C62X=m @@ -3360,10 +3360,10 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y CONFIG_MOUSE_PS2_TRACKPOINT=y CONFIG_MOUSE_PS2_VMMOUSE=y CONFIG_MOUSE_PS2=y -CONFIG_MOUSE_SERIAL=m +# CONFIG_MOUSE_SERIAL is not set CONFIG_MOUSE_SYNAPTICS_I2C=m CONFIG_MOUSE_SYNAPTICS_USB=m -CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_VSXXXAA is not set # CONFIG_MOXA_INTELLIO is not set # CONFIG_MOXA_SMARTIO is not set # CONFIG_MOXTET is not set @@ -5133,7 +5133,7 @@ CONFIG_SERIO_LIBPS2=y # CONFIG_SERIO_PCIPS2 is not set # CONFIG_SERIO_PS2MULT is not set CONFIG_SERIO_RAW=m -CONFIG_SERIO_SERPORT=y +CONFIG_SERIO_SERPORT=m CONFIG_SERIO=y # CONFIG_SFC_FALCON is not set CONFIG_SFC=m @@ -5551,6 +5551,7 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_WM8776 is not set # CONFIG_SND_SOC_WM8782 is not set CONFIG_SND_SOC_WM8804_I2C=m +CONFIG_SND_SOC_WM8804=m # CONFIG_SND_SOC_WM8804_SPI is not set # CONFIG_SND_SOC_WM8903 is not set # CONFIG_SND_SOC_WM8904 is not set diff --git a/kernel.spec b/kernel.spec index e2e1738..d7062f3 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc2.166 +%global distro_build 0.rc2.169 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -105,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.12.0 -%define pkgrelease 0.rc2.166.rt9.3 +%define pkgrelease 0.rc2.169.rt1.4 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.166.rt9.3%{?buildid}%{?dist} +%define specrelease 0.rc2.169.rt1.4%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -627,7 +627,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.12.0-0.rc2.166.rt9.3.tar.xz +Source0: linux-5.12.0-0.rc2.169.rt1.4.tar.xz Source1: Makefile.rhelver @@ -1315,8 +1315,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.12.0-0.rc2.166.rt9.3 -c -mv linux-5.12.0-0.rc2.166.rt9.3 linux-%{KVERREL} +%setup -q -n kernel-5.12.0-0.rc2.169.rt1.4 -c +mv linux-5.12.0-0.rc2.169.rt1.4 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2885,8 +2885,8 @@ fi # # %changelog -* Wed Mar 10 2021 Juri Lelli [5.12.0-0.rc2.166.rt9.3] -- kernel-5.12.0-0.rc2.20210308git144c79ef3353.166 rebase +* Tue Mar 16 2021 Juri Lelli [5.12.0-0.rc2.169.rt1.4] +- kernel-5.12.0-0.rc2.20210312gita74e6a014c9d.169 rebase - spec: Generate separate kernel-rt-kvm packages (Juri Lelli) - Add RT config options (Juri Lelli) - specfile: Add with_realtime (Juri Lelli) @@ -2915,6 +2915,7 @@ fi - leds: trigger: disable CPU trigger on -RT (Sebastian Andrzej Siewior) - jump-label: disable if stop_machine() is used (Thomas Gleixner) - arch/arm64: Add lazy preempt support (Anders Roxell) +- powerpc: Add support for lazy preemption (Thomas Gleixner) - arm: Add support for lazy preemption (Thomas Gleixner) - x86: Support for lazy preemption (Thomas Gleixner) - x86/entry: Use should_resched() in idtentry_exit_cond_resched() (Sebastian Andrzej Siewior) @@ -2951,6 +2952,7 @@ fi - mm/vmalloc: Another preempt disable region which sucks (Thomas Gleixner) - rcutorture: Avoid problematic critical section nesting on RT (Scott Wood) - locking: Make spinlock_t and rwlock_t a RCU section on RT (Sebastian Andrzej Siewior) +- rcu: Delay RCU-selftests (Sebastian Andrzej Siewior) - ptrace: fix ptrace_unfreeze_traced() race with rt-lock (Oleg Nesterov) - ptrace: fix ptrace vs tasklist_lock race (Sebastian Andrzej Siewior) - pid.h: include atomic.h (Grygorii Strashko) @@ -3020,24 +3022,26 @@ fi - locking/rtmutex: Move rt_mutex_init() outside of CONFIG_DEBUG_RT_MUTEXES (Sebastian Andrzej Siewior) - locking/rtmutex: Remove output from deadlock detector. (Sebastian Andrzej Siewior) - locking/rtmutex: Remove cruft (Sebastian Andrzej Siewior) -- firewire: ohci: Use tasklet_disable_in_atomic() in the two atomic user (Sebastian Andrzej Siewior) -- atm: eni: Use tasklet_disable_in_atomic() in the ->send() callback (Sebastian Andrzej Siewior) -- PCI: hv: Use tasklet_disable_in_atomic() (Sebastian Andrzej Siewior) -- ath9k: Use tasklet_disable_in_atomic(). (Sebastian Andrzej Siewior) -- net: sundance: Use tasklet_disable_in_atomic(). (Sebastian Andrzej Siewior) -- net: jme: Replace link-change tasklet with a worker (Sebastian Andrzej Siewior) - rcu: Prevent false positive softirq warning on RT (Thomas Gleixner) - tick/sched: Prevent false positive softirq pending warnings on RT (Thomas Gleixner) - softirq: Make softirq control and processing RT aware (Thomas Gleixner) - softirq: Move various protections into inline helpers (Thomas Gleixner) - irqtime: Make accounting correct on RT (Thomas Gleixner) - softirq: Add RT specific softirq accounting (Thomas Gleixner) +- tasklets: Switch tasklet_disable() to the sleep wait variant (Thomas Gleixner) +- firewire: ohci: Use tasklet_disable_in_atomic() where required (Sebastian Andrzej Siewior) +- PCI: hv: Use tasklet_disable_in_atomic() (Sebastian Andrzej Siewior) +- atm: eni: Use tasklet_disable_in_atomic() in the send() callback (Sebastian Andrzej Siewior) +- ath9k: Use tasklet_disable_in_atomic() (Sebastian Andrzej Siewior) +- net: sundance: Use tasklet_disable_in_atomic(). (Sebastian Andrzej Siewior) +- net: jme: Replace link-change tasklet with work (Sebastian Andrzej Siewior) - tasklets: Prevent tasklet_unlock_spin_wait() deadlock on RT (Thomas Gleixner) - tasklets: Replace spin wait in tasklet_kill() (Peter Zijlstra) - tasklets: Replace spin wait in tasklet_unlock_wait() (Peter Zijlstra) +- tasklets: Use spin wait in tasklet_disable() temporarily (Thomas Gleixner) - tasklets: Provide tasklet_disable_in_atomic() (Thomas Gleixner) - tasklets: Use static inlines for stub implementations (Thomas Gleixner) -- softirq: Replace barrier() with cpu_relax() in tasklet_unlock_wait() (Thomas Gleixner) +- tasklets: Replace barrier() with cpu_relax() in tasklet_unlock_wait() (Thomas Gleixner) - smp: Wake ksoftirqd on PREEMPT_RT instead do_softirq(). (Sebastian Andrzej Siewior) - tcp: Remove superfluous BH-disable around listening_hash (Sebastian Andrzej Siewior) - net: Move lockdep where it belongs (Thomas Gleixner) @@ -3079,6 +3083,27 @@ fi - timers: Move clearing of base::timer_running under base::lock (Thomas Gleixner) - highmem: Don't disable preemption on RT in kmap_atomic() (Sebastian Andrzej Siewior) +* Fri Mar 12 2021 Fedora Kernel Team [5.12.0-0.rc2.20210312gita74e6a014c9d.169] +- Set CONFIG_MOUSE_SERIAL=n by default (Patrick Talbert) + +* Wed Mar 10 2021 Fedora Kernel Team [5.12.0-0.rc2.20210310git05a59d79793d.167] +- Fedora: Turn on SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC option (Hans de Goede) +- Fedora: enable modules for surface devices (Dave Olsthoorn) +- Turn on SND_SOC_INTEL_SOUNDWIRE_SOF_MACH for Fedora again (Justin M. Forbes) +- common: fix WM8804 codec dependencies (Peter Robinson) +- Build SERIO_SERPORT as a module (Peter Robinson) +- input: touchscreen: move ELO and Wacom serial touchscreens to x86 (Peter Robinson) +- Sync serio touchscreens for non x86 architectures to the same as ARK (Peter Robinson) +- Only enable SERIO_LIBPS2 on x86 (Peter Robinson) +- Only enable PC keyboard controller and associated keyboard on x86 (Peter Robinson) +- Generic: Mouse: Tweak generic serial mouse options (Peter Robinson) +- Only enable PS2 Mouse options on x86 (Peter Robinson) +- Disable bluetooth highspeed by default (Peter Robinson) +- Fedora: A few more general updates for 5.12 window (Peter Robinson) +- Fedora: Updates for 5.12 merge window (Peter Robinson) +- Fedora: remove dead options that were removed upstream (Peter Robinson) +- Revert "mm/kmemleak: skip late_init if not skip disable" (Herton R. Krzesinski) + * Fri Mar 05 2021 Fedora Kernel Team [5.12.0-0.rc1.20210305git280d542f6ffa.164] - Revert "ARM: fix __get_user_check() in case uaccess_* calls are not inlined" (Herton R. Krzesinski) diff --git a/sources b/sources index bdcbc0a..96c5b09 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.12.0-0.rc2.166.rt9.3.tar.xz) = d42ecb0830624f59fd59bbf41b4d4efb474d440c032de33674f759786e245c0af0424383170b39387b415542d961b706db98ed353e41fa508f432543eef80c77 -SHA512 (kernel-abi-whitelists-5.12.0-0.rc2.166.tar.bz2) = b6d0ad9cb4d6255e77c9674e1bcf3f9d23d7e8652b3ac8dc243365a3caa3530ee3d78f6924eb8be63cbfeac2aab84013b218e15aed845f12d01da389e73f84cd -SHA512 (kernel-kabi-dw-5.12.0-0.rc2.166.tar.bz2) = a1822100f266ff7ace8d8ee5d57a46aaea98e386963882fb92e1b6e292197a33af202e1991e42d8d250de9864524d1e663821b6c55d4806129a02318b4fc8137 +SHA512 (linux-5.12.0-0.rc2.169.rt1.4.tar.xz) = cd85ce9fe0e71647a07d11bf09b342756d41abe72596b234aefbc57ab05fe4902722277e2ed6d2ac5c2a8ebeff9414e489d08bf4ea24ace0447d1f35d7590bbc +SHA512 (kernel-abi-whitelists-5.12.0-0.rc2.169.tar.bz2) = 2496e1e93b3d07858edf509466f41a67ad9e84ad7715b68d4a4d99aab12a17e27945cba8349e8c3dc6be0ecb8df6f6f5869d13c6525fcbbfb8d927584318f81c +SHA512 (kernel-kabi-dw-5.12.0-0.rc2.169.tar.bz2) = 9ac28003004f9d5a2e33cb5be67eb80d899b98d6c05d15a47bf946eadfc48e30320140cc6808d7f48800e4223f72162efe7fa16c7cd8f81dcb1206a8c8c55177