From: Linus Torvalds Date: Fri, 3 Jan 2025 23:09:12 +0000 (-0800) Subject: Merge tag 'sched_ext-for-6.13-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/63676eefb7a026d04b51dcb7aaf54f358517a2ec?hp=-c Merge tag 'sched_ext-for-6.13-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext Pull sched_ext fixes from Tejun Heo: - Fix a bug where bpf_iter_scx_dsq_new() was not initializing the iterator's flags and could inadvertently enable e.g. reverse iteration - Fix a bug where scx_ops_bypass() could call irq_restore twice - Add Andrea and Changwoo as maintainers for better review coverage - selftests and tools/sched_ext build and other fixes * tag 'sched_ext-for-6.13-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext: sched_ext: Fix dsq_local_on selftest sched_ext: initialize kit->cursor.flags sched_ext: Fix invalid irq restore in scx_ops_bypass() MAINTAINERS: add me as reviewer for sched_ext MAINTAINERS: add self as reviewer for sched_ext scx: Fix maximal BPF selftest prog sched_ext: fix application of sizeof to pointer selftests/sched_ext: fix build after renames in sched_ext API sched_ext: Add __weak to fix the build errors --- 63676eefb7a026d04b51dcb7aaf54f358517a2ec diff --combined MAINTAINERS index 52378f994294,cbfa4e97a3ff..85c8a68d11d8 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -1797,6 -1797,7 +1797,6 @@@ F: include/uapi/linux/if_arcnet. ARM AND ARM64 SoC SUB-ARCHITECTURES (COMMON PARTS) M: Arnd Bergmann -M: Olof Johansson L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: soc@lists.linux.dev S: Maintained @@@ -3375,8 -3376,6 +3375,8 @@@ S: Maintaine T: git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git F: Documentation/arch/arm64/ F: arch/arm64/ +F: drivers/virt/coco/arm-cca-guest/ +F: drivers/virt/coco/pkvm-guest/ F: tools/testing/selftests/arm64/ X: arch/arm64/boot/dts/ @@@ -3607,7 -3606,6 +3607,7 @@@ F: drivers/phy/qualcomm/phy-ath79-usb. ATHEROS ATH GENERIC UTILITIES M: Kalle Valo +M: Jeff Johnson L: linux-wireless@vger.kernel.org S: Supported F: drivers/net/wireless/ath/* @@@ -3893,7 -3891,7 +3893,7 @@@ W: http://www.baycom.org/~tom/ham/ham.h F: drivers/net/hamradio/baycom* BCACHE (BLOCK LAYER CACHE) -M: Coly Li +M: Coly Li M: Kent Overstreet L: linux-bcache@vger.kernel.org S: Maintained @@@ -7347,7 -7345,7 +7347,7 @@@ F: drivers/gpu/drm/panel/panel-novatek- DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS M: Karol Herbst M: Lyude Paul -M: Danilo Krummrich +M: Danilo Krummrich L: dri-devel@lists.freedesktop.org L: nouveau@lists.freedesktop.org S: Supported @@@ -8453,7 -8451,7 +8453,7 @@@ F: include/video/s1d13xxxfb. EROFS FILE SYSTEM M: Gao Xiang M: Chao Yu -R: Yue Hu +R: Yue Hu R: Jeffle Xu R: Sandeep Dhavale L: linux-erofs@lists.ozlabs.org @@@ -8924,7 -8922,7 +8924,7 @@@ F: include/linux/arm_ffa. FIRMWARE LOADER (request_firmware) M: Luis Chamberlain M: Russ Weight -M: Danilo Krummrich +M: Danilo Krummrich L: linux-kernel@vger.kernel.org S: Maintained F: Documentation/firmware_class/ @@@ -15345,7 -15343,7 +15345,7 @@@ M: Daniel Machon @@@ -16269,7 -16267,6 +16269,7 @@@ F: Documentation/devicetree/bindings/ne F: Documentation/networking/net_cachelines/net_device.rst F: drivers/connector/ F: drivers/net/ +F: drivers/ptp/ F: include/dt-bindings/net/ F: include/linux/cn_proc.h F: include/linux/etherdevice.h @@@ -16337,7 -16334,6 +16337,7 @@@ F: Documentation/networking F: Documentation/networking/net_cachelines/ F: Documentation/process/maintainer-netdev.rst F: Documentation/userspace-api/netlink/ +F: include/linux/ethtool.h F: include/linux/framer/framer-provider.h F: include/linux/framer/framer.h F: include/linux/in.h @@@ -16352,7 -16348,6 +16352,7 @@@ F: include/linux/rtnetlink. F: include/linux/seq_file_net.h F: include/linux/skbuff* F: include/net/ +F: include/uapi/linux/ethtool.h F: include/uapi/linux/genetlink.h F: include/uapi/linux/hsr_netlink.h F: include/uapi/linux/in.h @@@ -20907,6 -20902,8 +20907,8 @@@ F: kernel/sched SCHEDULER - SCHED_EXT R: Tejun Heo R: David Vernet + R: Andrea Righi + R: Changwoo Min L: linux-kernel@vger.kernel.org S: Maintained W: https://github.com/sched-ext/scx @@@ -22412,7 -22409,7 +22414,7 @@@ F: drivers/char/hw_random/jh7110-trng. STARFIVE WATCHDOG DRIVER M: Xingyu Wu -M: Samin Guo +M: Ziv Xu S: Supported F: Documentation/devicetree/bindings/watchdog/starfive* F: drivers/watchdog/starfive-wdt.c