From 8155b4ef3466f0e289e8fcc9e6e62f3f4dceeac2 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 20 Dec 2024 16:19:19 +1100 Subject: [PATCH] Add linux-next specific files for 20241220 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 393 +++ Next/Trees | 395 +++ Next/merge.log | 8230 +++++++++++++++++++++++++++++++++++++++++++++ localversion-next | 1 + 4 files changed, 9019 insertions(+) create mode 100644 Next/SHA1s create mode 100644 Next/Trees create mode 100644 Next/merge.log create mode 100644 localversion-next diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..e9da1a6c53b9 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,393 @@ +Name SHA1 +---- ---- +origin 8faabc041a001140564f718dabe37753e88b37fa +fixes fac04efc5c793dccbd07e2d59af9f90b7fc0dca4 +ext4-fixes 4a622e4d477bb12ad5ed4abbc7ad1365de1fa347 +vfs-brauner-fixes 2b2fc0be98a828cf33a88a28e9745e8599fb05cf +fscrypt-current 8e929cb546ee42c9a61d24fae60605e9e3192354 +fsverity-current 8e929cb546ee42c9a61d24fae60605e9e3192354 +btrfs-fixes 1c4c399d5213b06acd9e536562b0ac0c558fb577 +vfs-fixes 678379e1d4f7443b170939525d3312cfc37bf86b +erofs-fixes 6422cde1b0d5a31b206b263417c1c2b3c80fe82c +nfsd-fixes 9048cf05a17a7bc26f0b8e2e53750b1237303970 +v9fs-fixes 684a64bf32b6e488004e0ad7f0d7e922798f65b6 +overlayfs-fixes 228a1157fb9fec47eb135b51c0202b574e079ebf +bcachefs ca2e7a3de895c703d2cbbd9b63c10d8adfba8228 +fscrypt 8e929cb546ee42c9a61d24fae60605e9e3192354 +afs abcbd3bfbbfe97a8912d0c929d4aa18f50d9bc52 +btrfs 0b76cc2fbe45f27106f73f4a9f943458695c70e8 +ceph 18d44c5d062b97b97bb0162d9742440518958dc1 +cifs 02ef599bb2475df767f0fe130b83ccea24609c40 +configfs 84147f4e84c4f4822006161c5ad43612ac906407 +ecryptfs fba133a3411847db49297c965218400c49571ebd +dlm 6784ed98fde5b7538fff6b329b686b119ca23d8b +erofs 0bc8061ffc733a0a246b8689b2d32a3e9204f43c +exfat d141e72aeffc5f1a4b2f2e144b683bf57d0d12d0 +exportfs adc218676eef25575469234709c2d87185ca223a +ext3 71358f64c41b969580eba6cae278fed8b631dabf +ext4 3e7c69cdb053f9edea95502853f35952ab6cbf06 +f2fs 76f01376df398304972bf337ba430a62062add31 +fsverity 8e929cb546ee42c9a61d24fae60605e9e3192354 +fuse 78f2560fc9fa5ccaaf23ac78edb732c08bad7a92 +gfs2 ead64b20f16e38443aded90dc8491d25f4f5bd39 +jfs a174706ba4dad895c40b1d2277bade16dfacdcd9 +ksmbd 466b2d40f60ce874cb9b56dc88bd1a0880a43786 +nfs bedb4e6088a886f587d2ea44e0c198c8ce2182c9 +nfs-anna 867da60d463bb2a3e28c9235c487e56e96cffa00 +nfsd 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +ntfs3 1f2bf7049f6ef6048b56b18d0033d3e77b28f973 +orangefs 96319dacaf15f666bcba7275953d780e23fe9e75 +overlayfs c8b359dddb418c60df1a69beea01d1b3322bfe83 +ubifs b29bf7119d6bbfd04aabb8d82b060fe2a33ef890 +v9fs e0260d530b73ee969ae971d14daa02376dcfc93f +v9fs-ericvh 684a64bf32b6e488004e0ad7f0d7e922798f65b6 +xfs bf354410af832232db8438afe006bb12675778bc +zonefs c4b3c1332f55c48785e6661cebeb7269a92a45fd +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner ef5bbd2a286805b0f97b5fa8616d28a84336ee7b +vfs 5cc68af412a9dd1554265bafca24b3047b6f48d5 +mm-hotfixes 1aefbedee74bf73bcc01dcde63e6eb70f344f4ba +fs-current 17261b76798a4e97194bbfc27c51f69e52ae52cd +kbuild-current fac04efc5c793dccbd07e2d59af9f90b7fc0dca4 +arc-current 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +arm-current 0c66c6f4e21cb22220cbd8821c5c73fc157d20dc +arm64-fixes ce03573a1917532da06057da9f8e74a2ee9e2ac9 +arm-soc-fixes f578281000c50cae991c40e1f68b2fc0b1b9e60e +davinci-current 9852d85ec9d492ebef56dc5f229416c925758edc +drivers-memory-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +sophgo-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +m68k-current 647619b6bd27d2b7c3c6055f3f0d996e61884202 +powerpc-fixes fac04efc5c793dccbd07e2d59af9f90b7fc0dca4 +s390-fixes 282da38b465395c930687974627c24f47ddce5ff +net 8faabc041a001140564f718dabe37753e88b37fa +bpf 716f2bca1ce93bb95364f1fc0555c1650507b588 +ipsec e952837f3ddb0ff726d5b582aa1aad9aa38d024d +netfilter 31f1b55d5d7e531cd827419e5d71c19f24de161c +ipvs 31f1b55d5d7e531cd827419e5d71c19f24de161c +wireless 146b6057e1fd28fb1a38d300bf76a38dfba7f9fb +ath f1d3334d604cc32db63f6e2b3283011e02294e54 +wpan eb09fbeb48709fe66c0d708aed81e910a577a30a +rdma-fixes 7179fe0074a3c962e43a9e51169304c4911989ed +sound-current 7b26bc6582b13a52a42a4a9765e8f30d58a81198 +sound-asoc-fixes 32c9c06adb5b157ef259233775a063a43746d699 +regmap-fixes fac04efc5c793dccbd07e2d59af9f90b7fc0dca4 +regulator-fixes 13221496065fa12fac4f8a8e725444679ffddb78 +spi-fixes 7f9a1eed1ad8b274ed9163a02cef891a90427237 +pci-current 774c71c52aa487001c7da9f93b10cedc9985c371 +driver-core.current 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +tty.current 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +usb.current 1b62f3cb74d2965e8f96f20241b1fe85017aa3e8 +usb-serial-fixes 8366e64a4454481339e7c56a8ad280161f2e441d +phy 9d23e48654620fdccfcc74cc2cef04eaf7353d07 +staging.current 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +iio-fixes f248a1066cf016e3ce6f9ef569b934c19a01c666 +counter-current fac04efc5c793dccbd07e2d59af9f90b7fc0dca4 +char-misc.current e16ebd9d839d1252ff15c29d37b0cf303ddd2662 +soundwire-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +thunderbolt-fixes 24740385cb0d6d22ab7fa7adf36546d5b3cdcf73 +input-current 1863f213d3e878d10589ebc0aae1c861c3b0f0c3 +crypto-current cd26cd65476711e2c69e0a049c0eeef4b743f5ac +vfio-fixes 9c7c5430bca36e9636eabbba0b3b53251479c7ab +kselftest-fixes 777f290ab328de333b85558bb6807a69a59b36ba +dmaengine-fixes dcbef0798eb825cd584f7a93f62bed63f7fbbfc9 +backlight-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +mtd-fixes 140054a25f85036ec847e722c76cc1bfaf3f0d96 +mfd-fixes 68f860426d500cfb697b505799244c7dfff604b1 +v4l-dvb-fixes 8b55f8818900c99dd4f55a59a103f5b29e41eb2c +reset-fixes 1f8af9712413f456849fdf3f3a782cbe099476d7 +mips-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +at91-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +omap-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +kvm-fixes 7d4050728c83aa63828494ad0f4d0eb4faf5f97a +kvms390-fixes cff59d8631e1409ffdd22d9d717e15810181b32c +hwmon-fixes dd471e25770e7e632f736b90db1e2080b2171668 +nvdimm-fixes 265e98f72bac6c41a4492d3e30a8e5fd22fe0779 +cxl-fixes 76467a94810c2aa4dd3096903291ac6df30c399e +dma-mapping-fixes 78b2770c935fc1434a95cc17613fe31165b02dfe +drivers-x86-fixes 185e1b1d91e419445d3fd99c1c0376a970438acf +samsung-krzk-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +pinctrl-samsung-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +devicetree-fixes 0f7ca6f69354e0c3923bbc28c92d0ecab4d50a3e +dt-krzk-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +scsi-fixes f103396ae31851d00b561ff9f8a32a441953ff8b +drm-fixes 87fd88332567e22986d4989d912a1e44f164dc7d +drm-intel-fixes 1622ed27d26ab4c234476be746aa55bcd39159dd +mmc-fixes 8d90a86ed053226a297ce062f4d9f4f521e05c4c +rtc-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +gnss-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +hyperv-fixes 175c71c2aceef173ae6d3dceb41edfc2ac0d5937 +risc-v-fixes 21f1b85c8912262adf51707e63614a114425eb10 +riscv-dt-fixes 8d19d5a76bf661bc5e0a09565834443eee99e60e +riscv-soc-fixes 48808b55b07c3cea64805267a5547f03e6452a9f +fpga-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +spdx e70140ba0d2b1a30467d4af6bcfe761327b9ec95 +gpio-brgl-fixes 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +gpio-intel-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +pinctrl-intel-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +auxdisplay-fixes 9852d85ec9d492ebef56dc5f229416c925758edc +kunit-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +memblock-fixes 180bbad698641873120a48857bb3b9f3166bf684 +renesas-fixes 124f4f1a18696c4198f9f903fd74034ea8b7d352 +perf-current 434fffa926b10706f2bde2db22979d68463302fc +efi-fixes 145ac100b63732291c0612528444d7f5ab593fb2 +zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb +battery-fixes b3ded6072c5600704cfa3ce3a8dc8718d34bda66 +iommufd-fixes 2ca704f55e22b7b00cc7025953091af3c82fa5c0 +rust-fixes 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +w1-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +pmdomain-fixes f64f610ec6ab59dd0391b03842cea3a4cd8ee34f +i2c-host-fixes 06b911b17b64e922f5a314b822364b607565326d +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +clk-fixes f4bf0b909a6bf64a2220a42a7c8b8c2ee1b77b89 +pwrseq-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +thead-dt-fixes 40384c840ea1944d7c5a392e8975ed088ecf0b37 +ftrace-fixes 166438a432d76c68d3f0da60667248f3c2303d6c +ring-buffer-fixes 8cd63406d08110c8098e1efda8aef7ddab4db348 +trace-fixes afd2627f727b89496d79a6b934a025fc916d4ded +tracefs-fixes 8b55572e51805184353ee7d587c720a51818fb82 +spacemit-fixes 81983758430957d9a5cb3333fe324fd70cf63e7e +tip-fixes 4022ad48f0b040867e91befd6265bcdab505a50d +slab-fixes b7ffecbe198e2dfc44abf92ceb90f46150f7527a +drm-msm-fixes 789384eb1437aed94155dc0eac8a8a6ba1baf578 +drm-misc-fixes 1b684ca15f9d78f45de3cdba7e19611387e16aa7 +mm-stable 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +mm-nonmm-stable 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +mm 45f41efd96f244596b63ce5f7ba80b775eb9e8db +kbuild 8f2db654f79c7fa579c64eda2b5db44553d6e513 +clang-format c147f663b6a5813b9860f3917cc473fb2c462d8d +perf 233157785a34612e5899be6edcc6a53ea682d379 +compiler-attributes 98f7e32f20d28ec452afb208f9cffc08448a2652 +dma-mapping aef7ee7649e02f7fc0d2e5e532f352496976dcb1 +asm-generic 0af8e32343f8d0db31f593464fc140eaef25a281 +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm 6139f7913689e081d4bf120d4e6de543c55ccb65 +arm64 d6ab634f1b323db6639b8b776f5d95ae747b342a +arm-perf f3edf03a4c59e59e52c0c1fd958f64a76a038302 +arm-soc 6c2bb9f225bc1cbe7275c0dbb21254f41dd0d1e0 +amlogic 4de5110762b94b9978fb8182a568572fb2194f8b +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed 2eff056a229e21d9e287a74f1305f947ff6b141b +at91 cf3011dfad42e7404c565edd172a2a6dbacabe23 +broadcom ed54a84051c67de533fac00c99db3843c54ffd3a +davinci 9852d85ec9d492ebef56dc5f229416c925758edc +drivers-memory ef683ac22848716b761a676337c845d9db93a784 +imx-mxs 4b534cfc654fbee1b97cadbf1e747b0e71ca32f9 +mediatek 3d7fdd8e38aafd4858935df2392762c1ab8fb40f +mvebu 5f55ff35bfaa3d5c06a1b4130fd197ac0c671f2b +omap 2179717e0b0c5d1934d98a2079a605751f6da6a4 +qcom e43857dccff0b7f2e13a9edf394f1283c116a4df +renesas 9f197ec80b0a2f5b62b5fe73b42f6c9afb3ceef6 +reset 3d99f9231bedcf9acfb965a97645a8ecfa93a40d +rockchip 67ab119bd11300d6c47577d3c9ae9c822c33cb32 +samsung-krzk 51a4b945a726c649560ebdf7a5e044f998138d53 +scmi 6647416db021bfe1e0e987c4646bbdafa048c194 +sophgo 40384c840ea1944d7c5a392e8975ed088ecf0b37 +spacemit f187e72262c3245bc032a1a0f106784fb8562a0b +stm32 b7ebfb84a09de6b44492974339654d8ffc5ad9e1 +sunxi 20296f8baa25839585b9060079946f7333a5c5aa +tee a7562ff028797d64dbfdff141f1cb724c245b305 +tegra ca398b41b0a307a961593ab58a1090c8cb3174ae +thead-dt c95c1362e5bcd90c45987828bbef02236d181ffd +ti 40384c840ea1944d7c5a392e8975ed088ecf0b37 +xilinx 18b1e1ae30c7eab3cf1e7d9d6de8f0f70da283f3 +clk 2ca8b22801f8a2ed5300cdca0b7c4aaac70b6761 +clk-imx 81a206d736c19139d3863b79e7174f9e98b45499 +clk-renesas 0399362e523db96b72ed898bfea66cee53266658 +csky 2b48804336be69272d43939ff0dc3b0c0a703395 +loongarch 7f71507851fc7764b36a3221839607d3a45c2025 +m68k e419ddeabe7edd89650a19f411f928eea12b35b1 +m68knommu f70638ebe076a55c51af0bab88036864d0824f3b +microblaze 40384c840ea1944d7c5a392e8975ed088ecf0b37 +mips 40384c840ea1944d7c5a392e8975ed088ecf0b37 +openrisc c8f8d4344d50d72181207ee73175bba567c25f58 +parisc-hd df195d931a33889c96c0efebbbc6f3b747c145c6 +powerpc 3a7a53c8d4813ef510a731f529b8c58208ab8896 +risc-v fac04efc5c793dccbd07e2d59af9f90b7fc0dca4 +riscv-dt 708d55db3edbe2ccf88d94b5f2e2b404bc0ba37c +riscv-soc a5362510bafcb3318cb8a5b49caca8f5093d4d85 +s390 5c06b9849b20e30e2123df554c828535c327cd2e +sh 63e72e551942642c48456a4134975136cdcb9b3c +sparc b6370b338e71cf24c61e33880b8f1a0dd5ad0a44 +uml bed2cc482600296fe04edbc38005ba2851449c10 +xtensa d14b9a713b3458ce4908ca883c7277f0863cfe21 +fs-next 798a556a8e897d2b2bd4b461a77750705c04b3ef +printk 9022df7f5e051091c832b00865cf5b917c26efb3 +pci 9e1b45d7a5bc0ad20f6b5267992da422884b916e +pstore 9852d85ec9d492ebef56dc5f229416c925758edc +hid 2f18ba6583d10345c33db130eea50b20526311da +i2c 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +i2c-host ee5da79b4f2a24a90417b0ae661971c0a12f2a48 +i3c 6cf7b65f7029914dc0cd7db86fac9ee5159008c6 +dmi 4d1b28a8119c615f1e932520f9ee1f80bdda5204 +hwmon-staging de076198d1e4934c5fc17aa52d5f1884f469ce1a +jc_docs a3828074b04ae9ead45ef32c04267be84acd9e51 +v4l-dvb 40ed9e9b2808beeb835bd0ed971fb364c285d39c +v4l-dvb-next b36c41c51e9d763393634359b90f02414ef470a3 +pm 432f1f00f78e341348501a10418a25a02e0cde59 +cpufreq-arm a28276cac1f007b4953c66a14aa476492767da4b +cpupower 9d6c0e58514f8b57cd9c2c755e41623d6a966025 +devfreq 1f8ac4b95feeaf1271295e0ae3db335984aafd77 +pmdomain 094041b176546a82db2ecc84b7a7d31d43d4ffb9 +opp e0460b08c67a3d0e553cc30210eaf34ace224ccd +thermal 7d8abc5f3b5ce0f53d499279d8defc0f72bf7557 +rdma 1950af31dc66487ac21287cea5edc92738e7c8c8 +net-next 07e5c4eb94e6aba96fa11b424b39c5e5576a7713 +bpf-next c2ce3bb13ae7f4445a5e8fb12254b2dacefd309c +ipsec-next 59af653a6998ce0a79aa7f8851b0d5ecc667579b +mlx5-next aeb3ec99026979287266e4b5a1194789c1488c1a +netfilter-next 4b252f2dab2ebb654eebbb2aee980ab8373b2295 +ipvs-next f3674384709b69c5cd8c4597b8bd73ea7bd0236f +bluetooth 514e14b1a7c38520c955e59ec0ce09270cc4853c +wireless-next 8ab3bf4764136e8ad8d1064c304be50297bcf9ad +ath-next 578f6fc55c2ced5f68a7f87edbf6db3663dc6b57 +wpan-next aad4b41a34191b07ad0cb78b4009b46fd23382f7 +wpan-staging aad4b41a34191b07ad0cb78b4009b46fd23382f7 +mtd 02ba194feacb994d6ed8dd60550a2dcf213e256d +nand 1a50e3612de9187857f55ee14a573f7f8e7d4ebc +spi-nor 93e00ccab5f7da0c479bbdc6fc08c7e42f07eb5e +crypto f916e44487f56df4827069ff3a2070c0746dc511 +drm 301e2772295e8de0cf8acdd9ddb1824b546375a5 +drm-exynos a46b488102549ef358a37b823d916856fef31a33 +drm-misc 74ef9527bd87ead62deabe749a6d867af748d448 +amdgpu a317017f47f6525dff59517dadb2af30b5f58f57 +drm-intel 96bd1d50bfd30cb1e49aa6650d120946572d97af +drm-msm 86313a9cd152330c634b25d826a281c6a002eb77 +drm-msm-lumag d82c9281189d2b27642ede2760db495379503b86 +drm-xe a8d0aa0e7fcd20c9f1992688c0f0d07a68287403 +etnaviv 6bef484c5e9a5d3937a4bdf56e0f08f25517f8a0 +fbdev 40384c840ea1944d7c5a392e8975ed088ecf0b37 +regmap eb708cd631a8dca17ff004ccc39bbeb096c1db22 +sound 42d28736a5a4c3f499bb2d4b7fd84e334bdd5489 +ieee1394 ce4339d021c404374904f1e89a3552af1fe609dc +sound-asoc 45f61115972c947550e7dcff1adadb78bd046a37 +modules f3fda0dfea98dca05277d687250f3398d2332f73 +input e36def244b930524fc2f672cebb7d44a2bbcbfd3 +block 3af068412d79f2e1b8c394cde2a54ce84c8df143 +device-mapper 0bb1968da2737ba68fd63857d1af2b301a18d3bf +libata 7b64859fde26ea4bb662db7401c8ebec5ac7f8b5 +pcmcia 0630e3bc0e91b57288921df2927859b23184ca45 +mmc 741521fa273fdd119f149dd208d7b60fc9400bb5 +mfd 1061081cbe930f97ad54e820ad1996f55d93c57f +backlight 40384c840ea1944d7c5a392e8975ed088ecf0b37 +battery de68987480cb92702eab14cf62ec2aa1bae5c867 +regulator 8100d74e2ea1d2e4e5abbe9062ed809e1b2824aa +security 7a9b65ab0abd52ae646ba327522315d7500a7d4f +apparmor 40384c840ea1944d7c5a392e8975ed088ecf0b37 +integrity 08ae3e5f5fc8edb9bd0c7ef9696ff29ef18b26ef +selinux f453a5d339ea6e817b846d39eb3cfc5d648a41fe +smack 6f71ad02aae83f7032255863e374acadaa852bea +tomoyo 0476fd4ff45261744da6bb2df2f8080571902bf0 +tpmdd 2ba9f676d0a2e408aef14d679984c26373bf37b7 +watchdog 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +iommu 1a28a96a0d6dc944ff8934d585e913aa1004c8be +audit 8bea8f86f7a13b836e48df1394bfd9a20677b0a2 +devicetree 4c2a458eb5c0de1ba120ac03374290068e39c418 +dt-krzk 5aab15cd47945a85dc65c2eebbe3d3d3ac353abf +mailbox 7f9e19f207be0c534d517d65e01417ba968cdd34 +spi 36e011f3e1b0ba429b63c00457c367966b04fd49 +tip 1c875bc67cc93c157f81c39b7a2dc10f3c78df1d +clockevents 08b97fbd13de79744b31d2b3c8a0ab1a409b94fa +edac e3e7a5a35d6ed0efaa741231f2884a46d81d94df +ftrace 7dbc10961c8af4d7cc7d47f259f14c95d870ac98 +rcu 4b5c2205526cc1579b840893b98eb7545220f7cf +paulmck b6f62437f43156e376069c4bf46c459ce97c0568 +kvm a066bad89c6c79890bb8f45aef8662dcd0562a62 +kvm-arm 60ad25e14ab5a4e56c8bf7f7d6846eacb9cd53df +kvms390 7a1f3143377adb655a3912b8dea714949f819fa3 +kvm-ppc fac04efc5c793dccbd07e2d59af9f90b7fc0dca4 +kvm-riscv ea6398a5af81e3e7fb3da5d261694d479a321fd9 +kvm-x86 13e98294d7cec978e31138d16824f50556a62d17 +xen-tip fac04efc5c793dccbd07e2d59af9f90b7fc0dca4 +percpu 87d6aab2389e5ce0197d8257d5f8ee965a67c4cd +workqueues de35994ecd2dd6148ab5a6c5050a1670a04dec77 +sched-ext 471069f5ae88b5318d0f73813215f7ca60feb6e6 +drivers-x86 9e0894d07072e50b83ef077ce91e504bdb7484a3 +chrome-platform a0355d4d55f31c34d957ab1d94a5776ce235f786 +chrome-platform-firmware 7543d5702c2cfe0e8e8bc8bf4fe8cd44f08d6d39 +hsi 40384c840ea1944d7c5a392e8975ed088ecf0b37 +leds-lj 29df7025cff00dd9fa7cacbec979ede97ee775eb +ipmi 7868b3a94045a6c45b7dfb03945c195106bc77df +driver-core 5bcc8bfe841b29f7d62f4bb7738bb085ecc51aad +usb 362a7993ed0173e70859d0a624d8ffa968b2cea0 +thunderbolt b5d175beb4d31bfe7dec6fb140623ad91ee50e96 +usb-serial 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +tty 30691a59c85c48575b04e849f675660fd8060cad +char-misc 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +accel f03eee5fc922158654405318a02db9982c0ddf07 +coresight 56e14a21cee4ea6074b956a9ff2e406de5ad6548 +fastrpc 9f86299512e04b24fb0b4a49849affbb397780e1 +fpga 46b155acbf4ee4ebf6bd7d5661b08762220ab894 +icc e20f7bfcd21ef62811085c19ad36fe7a0d67ae71 +iio 4d112ebd02d10faf202aa8335b06de0aca8b536b +phy-next b6096751a652a7e7526d4b3d59971a40c3287ef7 +soundwire 40384c840ea1944d7c5a392e8975ed088ecf0b37 +extcon 7041ed0dde8319991b59003c414f0bda5192b041 +gnss 40384c840ea1944d7c5a392e8975ed088ecf0b37 +vfio fe4bf8d0b6716a423b16495d55b35d3fe515905d +w1 0f28374e99a46bfb5ece60af0791ccc840a6aa89 +spmi a45e4aa263d60aea8ff00629c16e8ef7919fb0b5 +staging f9e7f3f9620b13d76ed16399b46b29cab1a398f2 +counter-next fac04efc5c793dccbd07e2d59af9f90b7fc0dca4 +siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed +mux 49a9b01803e4711b10b5d26c731d705bbe3dad3d +dmaengine 9d880452fb3edc4645e28264381ce35606fb1b19 +cgroup 9b496a8bbed9cc292b0dfd796f38ec58b6d0375f +scsi 1fb3855b8a12b187d6d1b3746a1ef80dbb79112e +scsi-mkp c9a71ca13f71bf0d32664a1e7d1f00378811d59c +vhost 6a39bb15b3d1c355ab198d41f9590379d734f0bb +rpmsg dbb9c372555c0b2a5a9264418bfba6d017752808 +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 83a9752729c455a6bd9b7cf62198506180691931 +gpio-intel 12b0e305f50988b0c75f052f86d51b5353108ca5 +pinctrl 38867d5de5f12203154762b7ec3008a8c93150cd +pinctrl-intel 40384c840ea1944d7c5a392e8975ed088ecf0b37 +pinctrl-renesas 53967d9c146d783dcf019d0466a77119162b49b9 +pinctrl-samsung 0ebb1e9e1b12ddcb86105a14b59ccbed76b6ce00 +pwm cce16e7f6216227964cda25f5f23634bce2c500f +ktest 2351e8c65404aabc433300b6bf90c7a37e8bbc4d +kselftest bd812d2858532cf5fc50e37a1c5d5c6b3cdbb3a3 +kunit 40384c840ea1944d7c5a392e8975ed088ecf0b37 +kunit-next 40384c840ea1944d7c5a392e8975ed088ecf0b37 +livepatching 7e17e80c3a7eb2734795f66ba946f933412d597f +rtc e0779a0dcf41a6452ac0a169cd96863feb5787c7 +nvdimm f3dd9ae7f03aefa5bb12a4606f3d6cca87863622 +at24 40384c840ea1944d7c5a392e8975ed088ecf0b37 +ntb c620f56c70eb1b3dbabf7c21a02df83a61ff36fb +seccomp 8cf8dfceebdaf282da8a836b2bb578808a12698c +fsi c5eeb63edac9497f9a0d46d3b75cf8b293771ecf +slimbus 40384c840ea1944d7c5a392e8975ed088ecf0b37 +nvmem ea4ef69b81f044df07cf1ceec91313d8057da065 +xarray 6684aba0780da9f505c202f27e68ee6d18c0aa66 +hyperv 13546de23445986463641d2386c3fd41883a39d3 +auxdisplay 93b216cb312dcaee19de19efab6025481e5df4ae +kgdb 24b2455fe8fce17258fab4bb945d8e6929baeb77 +hmm 40384c840ea1944d7c5a392e8975ed088ecf0b37 +cfi 40384c840ea1944d7c5a392e8975ed088ecf0b37 +mhi 33c792a22879d0c8d50e71da08f17b5a60ed1e7b +memblock 98b7beba1ee6fb4ee755812e6c06cfc9084e7430 +cxl e2b952ffafced49fa6bd5cdc90f472b8bd932b5d +zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a +efi ec4696925da6b9baec38345184403ce9e29a2e48 +unicode 6b56a63d286f6f57066c4b5648d8fbec9510beae +slab c44d336ad5ba0f0ca8a53ad67a41c4f949d9059c +random d18c13697b4dcbf6a8f06c3d8e564c4f5ad1477c +landlock 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8 +rust 0c5928deada15a8d075516e6e0d9ee19011bb000 +sysctl 9c738dae9534fbdf77c250132cba04e0822983b3 +execve c7c1167fcbbddbfec97788469efd4e37327e9197 +bitmap af206905fa22cea13685dd7f166ba21ab0ccb0d7 +hte 9e4259716f60c96c069a38e826884ad783dc4eb4 +kspp 7a059073b08a71f74904f7dcbd0382bd359b6354 +kspp-gustavo 6613476e225e090cc9aad49be7fa504e290dd33d +nolibc 40384c840ea1944d7c5a392e8975ed088ecf0b37 +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd 11534b4de2a1bcc438ed90d031184c9c847e8560 +turbostat 75de0ab82fb4b67955be83fef3ce302c9b977504 +pwrseq 93e3c990fcd90e578fd23b572a6c89020c7a453e +capabilities-next d48da4d5ed7b4a022a4e54f210575baac71f58af +ipe d881f0eb6f2327af765529bb073da03d1c07f4fe +kcsan b86f7c9fad06b960f3ac5594cb3838a7eaeb1892 +crc 72914faebaabd77d8a471af4662ca0b938011c49 +kthread fc7d29fc87711c4e5a850e7498045991688e9785 +header_cleanup 5f4c01f1e3c7b0c8d1e5dd6f080531de7aa5e47b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..34a7e2ce5af5 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,395 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +ext4-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#fixes +vfs-brauner-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.fixes +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +overlayfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes +bcachefs git git://evilpiepirate.org/bcachefs.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +exportfs git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#exportfs-next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +v9fs-ericvh git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs-brauner git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +fs-current git linux-next +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +sophgo-fixes git https://github.com/sophgo/linux.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +ath git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-current +wpan git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/media-ci/media-pending.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes +drm-intel-fixes git https://gitlab.freedesktop.org/drm/i915/kernel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +auxdisplay-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools#perf-tools +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +iommufd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes git https://github.com/Rust-for-Linux/linux.git#rust-fixes +w1-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +i2c-host-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-fixes +sparc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus +clk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-fixes +pwrseq-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current +thead-dt-fixes git https://github.com/pdp7/linux.git#thead-dt-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ftrace/fixes +ring-buffer-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ring-buffer/fixes +trace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#trace/fixes +tracefs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#tracefs/fixes +spacemit-fixes git https://github.com/spacemit-com/linux#fixes +tip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#tip/urgent +slab-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next-fixes +drm-msm-fixes git https://gitlab.freedesktop.org/drm/msm.git#msm-fixes +drm-misc-fixes git https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc git https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +broadcom git https://github.com/Broadcom/stblinux.git#next +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sophgo git https://github.com/sophgo/linux.git#for-next +spacemit git https://github.com/spacemit-com/linux#for-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +thead-dt git https://github.com/pdp7/linux.git#thead-dt-for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-next +uml git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fs-next git linux-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i2c-host git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media-ci/media-pending.git#next +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +pmdomain git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +ath-next git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-next +wpan-next git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git https://gitlab.freedesktop.org/drm/kernel.git#drm-next +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc git https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git https://gitlab.freedesktop.org/drm/i915/kernel#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +drm-xe git https://gitlab.freedesktop.org/drm/xe/kernel#drm-xe-next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 git https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git git://git.code.sf.net/p/tomoyo/tomoyo.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git https://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git#next +paulmck git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#non-rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +kvm-riscv git https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 git https://github.com/kvm-x86/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sched-ext git git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +chrome-platform-firmware git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc git git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +w1 git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +spmi git git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +siox git git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#siox/for-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#pwm/for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#for-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git#sysctl-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +nolibc git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#nolibc +tsm git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux#tsm-next +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +turbostat git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +pwrseq git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next +capabilities-next git git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git#caps-next +ipe git https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git#next +kcsan git git://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git#next +crc git git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#crc-next +kthread git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#for-next +header_cleanup git git://evilpiepirate.org/bcachefs.git#header_cleanup diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..5700ad7a74fc --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8230 @@ +$ date -R +Fri, 20 Dec 2024 08:57:25 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 82% (4025/4877) Updating files: 83% (4048/4877) Updating files: 84% (4097/4877) Updating files: 85% (4146/4877) Updating files: 86% (4195/4877) Updating files: 87% (4243/4877) Updating files: 88% (4292/4877) Updating files: 89% (4341/4877) Updating files: 90% (4390/4877) Updating files: 91% (4439/4877) Updating files: 92% (4487/4877) Updating files: 93% (4536/4877) Updating files: 94% (4585/4877) Updating files: 95% (4634/4877) Updating files: 96% (4682/4877) Updating files: 97% (4731/4877) Updating files: 98% (4780/4877) Updating files: 99% (4829/4877) Updating files: 100% (4877/4877) Updating files: 100% (4877/4877), done. +HEAD is now at eabcdba3ad40 Merge tag 'for-6.13-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux +Merging origin/master (8faabc041a00 Merge tag 'net-6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating eabcdba3ad40..8faabc041a00 +Fast-forward (no commit created; -m option ignored) + drivers/mmc/host/mtk-sd.c | 2 + + drivers/mmc/host/sdhci-tegra.c | 1 - + drivers/net/can/m_can/m_can.c | 36 ++++++--- + drivers/net/can/m_can/m_can.h | 1 + + drivers/net/can/m_can/m_can_pci.c | 1 + + drivers/net/ethernet/broadcom/bgmac-platform.c | 5 +- + .../chelsio/inline_crypto/chtls/chtls_main.c | 5 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 2 + + drivers/net/ethernet/intel/idpf/idpf_dev.c | 3 + + drivers/net/ethernet/intel/idpf/idpf_txrx.c | 29 +++++--- + drivers/net/ethernet/intel/idpf/idpf_txrx.h | 8 +- + drivers/net/ethernet/intel/idpf/idpf_vf_dev.c | 3 + + drivers/net/ethernet/marvell/octeontx2/nic/rep.c | 5 +- + drivers/net/ethernet/mscc/ocelot.c | 2 +- + drivers/net/ethernet/oa_tc6.c | 11 ++- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 5 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 1 + + drivers/net/ethernet/renesas/rswitch.c | 68 +++++++++-------- + drivers/net/ethernet/renesas/rswitch.h | 13 +--- + drivers/net/mdio/fwnode_mdio.c | 13 +++- + drivers/net/netdevsim/health.c | 2 + + drivers/net/netdevsim/netdev.c | 4 +- + drivers/net/phy/aquantia/aquantia_leds.c | 2 +- + drivers/net/phy/intel-xway.c | 2 +- + drivers/net/phy/mxl-gpy.c | 2 +- + drivers/net/team/team_core.c | 10 ++- + drivers/net/tun.c | 2 +- + drivers/net/usb/qmi_wwan.c | 1 + + drivers/pwm/pwm-stm32.c | 2 +- + fs/smb/server/connection.c | 18 ++++- + fs/smb/server/connection.h | 1 - + fs/smb/server/server.c | 7 +- + fs/smb/server/server.h | 1 + + fs/smb/server/smb2pdu.c | 2 + + fs/smb/server/transport_ipc.c | 5 +- + net/core/netdev-genl.c | 19 ++--- + net/core/rtnetlink.c | 5 +- + net/dsa/tag.h | 16 ++-- + net/mctp/route.c | 36 ++++++--- + net/mctp/test/route-test.c | 86 ++++++++++++++++++++++ + net/netfilter/ipset/ip_set_list_set.c | 3 + + net/netfilter/ipvs/ip_vs_conn.c | 4 +- + net/psample/psample.c | 9 ++- + net/smc/af_smc.c | 18 ++++- + net/smc/smc_clc.c | 17 ++++- + net/smc/smc_clc.h | 22 +++++- + net/smc/smc_core.c | 9 ++- + rust/kernel/net/phy.rs | 4 +- + tools/net/ynl/lib/ynl.py | 6 +- + tools/testing/selftests/drivers/net/queues.py | 23 +++--- + tools/testing/selftests/drivers/net/stats.py | 19 ++++- + tools/testing/selftests/net/lib/py/ynl.py | 16 ++-- + .../selftests/net/openvswitch/openvswitch.sh | 6 +- + 55 files changed, 433 insertions(+), 168 deletions(-) +Merging fixes/fixes (fac04efc5c79 Linux 6.13-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging ext4-fixes/fixes (4a622e4d477b ext4: fix FS_IOC_GETFSMAP handling) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes +Already up to date. +Merging vfs-brauner-fixes/vfs.fixes (2b2fc0be98a8 fs: fix missing declaration of init_files) +$ git merge -m Merge branch 'vfs.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Merge made by the 'ort' strategy. + fs/file.c | 1 + + fs/hfs/super.c | 4 ++- + fs/iomap/buffered-io.c | 66 +++++++++++++++++++++++++++++++++++++++++++------- + fs/jbd2/commit.c | 4 +-- + fs/jbd2/revoke.c | 2 +- + fs/namespace.c | 10 ++++++-- + fs/qnx6/inode.c | 11 +++------ + include/linux/iomap.h | 2 +- + 8 files changed, 77 insertions(+), 23 deletions(-) +Merging fscrypt-current/for-current (8e929cb546ee Linux 6.12-rc3) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (8e929cb546ee Linux 6.12-rc3) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging btrfs-fixes/next-fixes (1c4c399d5213 Merge branch 'misc-6.13' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (678379e1d4f7 close_range(): fix the logics in descriptor table trimming) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (6422cde1b0d5 erofs: use buffered I/O for file-backed mounts by default) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (9048cf05a17a NFSD: fix management of pending async copies) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Merge made by the 'ort' strategy. + fs/nfsd/export.c | 31 ++++++------------------------- + fs/nfsd/export.h | 4 ++-- + fs/nfsd/nfs4proc.c | 13 ++++++++----- + 3 files changed, 16 insertions(+), 32 deletions(-) +Merging v9fs-fixes/fixes/next (684a64bf32b6 Merge tag 'nfs-for-6.12-1' of git://git.linux-nfs.org/projects/anna/linux-nfs) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging overlayfs-fixes/ovl-fixes (228a1157fb9f Merge tag '6.13-rc-part1-SMB3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging bcachefs/for-next (ca2e7a3de895 bcachefs: Fix assert for online fsck) +$ git merge -m Merge branch 'for-next' of git://evilpiepirate.org/bcachefs.git bcachefs/for-next +Auto-merging fs/bcachefs/Kconfig +Auto-merging fs/bcachefs/ec.c +Auto-merging fs/fs_parser.c +Auto-merging include/linux/fs_parser.h +Auto-merging include/linux/min_heap.h +Merge made by the 'ort' strategy. + Documentation/filesystems/bcachefs/CodingStyle.rst | 2 +- + fs/bcachefs/Kconfig | 2 +- + fs/bcachefs/Makefile | 1 + + fs/bcachefs/acl.c | 11 +- + fs/bcachefs/alloc_background.c | 557 +++++++------- + fs/bcachefs/alloc_background.h | 18 +- + fs/bcachefs/alloc_background_format.h | 4 +- + fs/bcachefs/alloc_foreground.c | 304 +++----- + fs/bcachefs/alloc_foreground.h | 4 +- + fs/bcachefs/backpointers.c | 840 +++++++++++++-------- + fs/bcachefs/backpointers.h | 97 ++- + fs/bcachefs/bbpos.h | 2 +- + fs/bcachefs/bcachefs.h | 70 +- + fs/bcachefs/bcachefs_format.h | 57 +- + fs/bcachefs/bkey.h | 7 - + fs/bcachefs/bkey_methods.c | 29 +- + fs/bcachefs/bkey_methods.h | 15 +- + fs/bcachefs/bkey_types.h | 28 + + fs/bcachefs/btree_cache.c | 51 +- + fs/bcachefs/btree_cache.h | 12 +- + fs/bcachefs/btree_gc.c | 167 +--- + fs/bcachefs/btree_io.c | 185 +++-- + fs/bcachefs/btree_iter.c | 591 +++++++++------ + fs/bcachefs/btree_iter.h | 133 ++-- + fs/bcachefs/btree_journal_iter.c | 237 +++++- + fs/bcachefs/btree_journal_iter.h | 22 +- + fs/bcachefs/btree_journal_iter_types.h | 36 + + fs/bcachefs/btree_key_cache.c | 57 +- + fs/bcachefs/btree_locking.c | 2 +- + fs/bcachefs/btree_locking.h | 6 +- + fs/bcachefs/btree_node_scan.c | 153 ++-- + fs/bcachefs/btree_node_scan_types.h | 1 - + fs/bcachefs/btree_trans_commit.c | 205 ++--- + fs/bcachefs/btree_types.h | 3 + + fs/bcachefs/btree_update.c | 74 +- + fs/bcachefs/btree_update.h | 29 +- + fs/bcachefs/btree_update_interior.c | 262 ++++--- + fs/bcachefs/btree_update_interior.h | 3 +- + fs/bcachefs/btree_write_buffer.c | 81 +- + fs/bcachefs/buckets.c | 131 ++-- + fs/bcachefs/buckets.h | 30 +- + fs/bcachefs/buckets_types.h | 2 +- + fs/bcachefs/chardev.c | 219 +----- + fs/bcachefs/checksum.c | 10 +- + fs/bcachefs/checksum.h | 2 +- + fs/bcachefs/compress.c | 96 ++- + fs/bcachefs/darray.h | 2 +- + fs/bcachefs/data_update.c | 76 +- + fs/bcachefs/debug.c | 4 +- + fs/bcachefs/dirent.c | 10 +- + fs/bcachefs/dirent.h | 4 +- + fs/bcachefs/disk_accounting.c | 150 ++-- + fs/bcachefs/disk_accounting.h | 73 +- + fs/bcachefs/ec.c | 275 +++---- + fs/bcachefs/ec.h | 5 +- + fs/bcachefs/errcode.h | 20 +- + fs/bcachefs/error.c | 187 +++-- + fs/bcachefs/error.h | 58 +- + fs/bcachefs/extent_update.c | 4 +- + fs/bcachefs/extents.c | 290 +++---- + fs/bcachefs/extents.h | 18 +- + fs/bcachefs/extents_format.h | 15 +- + fs/bcachefs/fs-common.c | 98 ++- + fs/bcachefs/fs-common.h | 2 + + fs/bcachefs/fs-io-buffered.c | 45 +- + fs/bcachefs/fs-io-direct.c | 5 + + fs/bcachefs/fs-io-pagecache.c | 4 +- + fs/bcachefs/fs-io.c | 54 +- + fs/bcachefs/fs-ioctl.c | 7 +- + fs/bcachefs/fs.c | 88 ++- + fs/bcachefs/fs.h | 1 + + fs/bcachefs/fsck.c | 645 +++++++++------- + fs/bcachefs/fsck.h | 11 + + fs/bcachefs/inode.c | 169 +++-- + fs/bcachefs/inode.h | 43 +- + fs/bcachefs/inode_format.h | 15 +- + fs/bcachefs/io_misc.c | 22 +- + fs/bcachefs/io_read.c | 246 +++--- + fs/bcachefs/io_read.h | 28 +- + fs/bcachefs/io_write.c | 102 +-- + fs/bcachefs/journal.c | 162 ++-- + fs/bcachefs/journal.h | 9 +- + fs/bcachefs/journal_io.c | 231 +++--- + fs/bcachefs/journal_io.h | 2 +- + fs/bcachefs/journal_reclaim.c | 19 +- + fs/bcachefs/journal_types.h | 5 + + fs/bcachefs/logged_ops.c | 11 +- + fs/bcachefs/logged_ops_format.h | 5 + + fs/bcachefs/lru.c | 4 +- + fs/bcachefs/lru.h | 2 +- + fs/bcachefs/move.c | 184 +++-- + fs/bcachefs/move.h | 5 +- + fs/bcachefs/movinggc.c | 6 +- + fs/bcachefs/opts.c | 26 +- + fs/bcachefs/opts.h | 61 +- + fs/bcachefs/quota.c | 2 +- + fs/bcachefs/quota.h | 4 +- + fs/bcachefs/rcu_pending.c | 38 +- + fs/bcachefs/rebalance.c | 266 ++++++- + fs/bcachefs/rebalance.h | 10 + + fs/bcachefs/rebalance_format.h | 53 ++ + fs/bcachefs/rebalance_types.h | 2 - + fs/bcachefs/recovery.c | 218 ++++-- + fs/bcachefs/recovery.h | 2 +- + fs/bcachefs/recovery_passes.c | 108 ++- + fs/bcachefs/recovery_passes.h | 1 + + fs/bcachefs/recovery_passes_types.h | 92 +-- + fs/bcachefs/reflink.c | 498 +++++++++--- + fs/bcachefs/reflink.h | 20 +- + fs/bcachefs/reflink_format.h | 7 +- + fs/bcachefs/sb-clean.c | 6 +- + fs/bcachefs/sb-counters_format.h | 165 ++-- + fs/bcachefs/sb-downgrade.c | 25 +- + fs/bcachefs/sb-errors_format.h | 52 +- + fs/bcachefs/snapshot.c | 506 ++++++------- + fs/bcachefs/snapshot.h | 17 +- + fs/bcachefs/str_hash.c | 286 +++++++ + fs/bcachefs/str_hash.h | 28 +- + fs/bcachefs/subvolume.c | 18 +- + fs/bcachefs/subvolume.h | 19 +- + fs/bcachefs/subvolume_types.h | 2 +- + fs/bcachefs/super-io.c | 72 +- + fs/bcachefs/super-io.h | 21 +- + fs/bcachefs/super.c | 48 +- + fs/bcachefs/super.h | 10 - + fs/bcachefs/sysfs.c | 60 +- + fs/bcachefs/tests.c | 26 +- + fs/bcachefs/trace.h | 77 +- + fs/bcachefs/util.h | 22 + + fs/bcachefs/varint.c | 5 +- + fs/bcachefs/xattr.c | 13 +- + fs/bcachefs/xattr.h | 5 +- + fs/fs_parser.c | 3 +- + include/linux/fs_parser.h | 2 + + include/linux/min_heap.h | 4 +- + 135 files changed, 6675 insertions(+), 4494 deletions(-) + create mode 100644 fs/bcachefs/btree_journal_iter_types.h + create mode 100644 fs/bcachefs/rebalance_format.h + create mode 100644 fs/bcachefs/str_hash.c +Merging fscrypt/for-next (8e929cb546ee Linux 6.12-rc3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (0b76cc2fbe45 Merge branch 'for-next-next-v6.13-20241218' into for-next-20241218) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. + fs/btrfs/Kconfig | 1 + + fs/btrfs/Makefile | 2 +- + fs/btrfs/backref.c | 93 +--- + fs/btrfs/backref.h | 16 +- + fs/btrfs/bio.c | 3 +- + fs/btrfs/block-group.c | 16 +- + fs/btrfs/block-rsv.c | 10 +- + fs/btrfs/btrfs_inode.h | 2 +- + fs/btrfs/ctree.c | 78 +-- + fs/btrfs/ctree.h | 29 - + fs/btrfs/delalloc-space.c | 2 +- + fs/btrfs/delayed-ref.c | 44 +- + fs/btrfs/delayed-ref.h | 1 + + fs/btrfs/direct-io.c | 3 +- + fs/btrfs/disk-io.c | 22 +- + fs/btrfs/disk-io.h | 2 +- + fs/btrfs/extent-tree.c | 201 +++---- + fs/btrfs/extent-tree.h | 7 +- + fs/btrfs/extent_io.c | 81 ++- + fs/btrfs/file.c | 95 ++-- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/fs.c | 130 +++++ + fs/btrfs/fs.h | 27 + + fs/btrfs/inode.c | 358 ++++++++---- + fs/btrfs/ioctl.c | 98 +--- + fs/btrfs/ioctl.h | 1 - + fs/btrfs/locking.h | 5 + + fs/btrfs/misc.h | 28 + + fs/btrfs/ordered-data.c | 63 ++- + fs/btrfs/ordered-data.h | 9 + + fs/btrfs/qgroup.c | 24 +- + fs/btrfs/raid-stripe-tree.c | 4 - + fs/btrfs/relocation.c | 366 ++++++------- + fs/btrfs/scrub.c | 142 ++--- + fs/btrfs/send.c | 9 +- + fs/btrfs/space-info.c | 69 ++- + fs/btrfs/space-info.h | 15 +- + fs/btrfs/subpage.c | 48 +- + fs/btrfs/super.c | 20 +- + fs/btrfs/sysfs.c | 173 +++++- + fs/btrfs/sysfs.h | 5 + + fs/btrfs/tests/btrfs-tests.c | 18 + + fs/btrfs/tests/btrfs-tests.h | 6 + + fs/btrfs/tests/delayed-refs-tests.c | 1015 +++++++++++++++++++++++++++++++++++ + fs/btrfs/transaction.c | 3 +- + fs/btrfs/transaction.h | 18 +- + fs/btrfs/tree-checker.c | 99 ++++ + fs/btrfs/tree-checker.h | 3 + + fs/btrfs/volumes.c | 182 +++++-- + fs/btrfs/volumes.h | 17 + + fs/btrfs/zoned.c | 154 +++++- + fs/btrfs/zoned.h | 7 + + include/trace/events/btrfs.h | 3 +- + 53 files changed, 2781 insertions(+), 1048 deletions(-) + create mode 100644 fs/btrfs/tests/delayed-refs-tests.c +Merging ceph/master (18d44c5d062b ceph: allocate sparse_ext map only for sparse reads) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + fs/ceph/file.c | 77 +++++++++++++++++++++++++-------------------------- + fs/ceph/mds_client.c | 9 +++--- + fs/ceph/super.c | 2 ++ + net/ceph/osd_client.c | 2 ++ + 4 files changed, 46 insertions(+), 44 deletions(-) +Merging cifs/for-next (02ef599bb247 smb: enable reuse of deferred file handles for write operations) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/smb/client/Kconfig | 1 - + fs/smb/client/cifsfs.c | 2 +- + fs/smb/client/connect.c | 36 ++++++++++++++++++++++++++---------- + fs/smb/client/file.c | 6 +++++- + fs/smb/client/smb2pdu.c | 5 ++++- + 5 files changed, 36 insertions(+), 14 deletions(-) +Merging configfs/for-next (84147f4e84c4 configfs: improve item creation performance) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'ort' strategy. + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 1 - + fs/ecryptfs/keystore.c | 4 ++-- + 3 files changed, 3 insertions(+), 4 deletions(-) +Merging dlm/next (6784ed98fde5 dlm: return -ENOENT if no comm was found) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'ort' strategy. + fs/dlm/config.c | 2 +- + fs/dlm/lock.c | 46 ++++++++++++++++++++++++++++++---------------- + fs/dlm/lowcomms.c | 3 ++- + 3 files changed, 33 insertions(+), 18 deletions(-) +Merging erofs/dev (0bc8061ffc73 erofs: handle NONHEAD !delta[1] lclusters gracefully) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (d141e72aeffc exfat: fix the new buffer was not zeroed before writing) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/dir.c | 3 ++- + fs/exfat/fatent.c | 2 ++ + fs/exfat/file.c | 6 ++++++ + fs/exfat/namei.c | 4 ++-- + 4 files changed, 12 insertions(+), 3 deletions(-) +Merging exportfs/exportfs-next (adc218676eef Linux 6.12) +$ git merge -m Merge branch 'exportfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs/exportfs-next +Already up to date. +Merging ext3/for_next (71358f64c41b Merge inotify strcpy hardening.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/xfs/xfs_file.c +Merge made by the 'ort' strategy. + fs/binfmt_elf.c | 4 +- + fs/binfmt_elf_fdpic.c | 4 +- + fs/btrfs/ioctl.c | 9 +++ + fs/btrfs/super.c | 2 +- + fs/exec.c | 8 +- + fs/ext4/file.c | 3 + + fs/ext4/super.c | 3 + + fs/fcntl.c | 4 +- + fs/isofs/compress.c | 12 ++- + fs/notify/fanotify/fanotify.c | 31 ++++++-- + fs/notify/fanotify/fanotify.h | 15 ++++ + fs/notify/fanotify/fanotify_user.c | 150 ++++++++++++++++++++++++++++------- + fs/notify/fsnotify.c | 83 ++++++++++++++++++- + fs/notify/inotify/inotify_fsnotify.c | 2 +- + fs/open.c | 62 +++++++++++---- + fs/xfs/xfs_file.c | 13 +++ + fs/xfs/xfs_super.c | 2 +- + include/linux/fanotify.h | 18 +++-- + include/linux/fs.h | 72 +++++++++++++++-- + include/linux/fsnotify.h | 78 ++++++++++++++---- + include/linux/fsnotify_backend.h | 53 ++++++++++++- + include/linux/mm.h | 1 + + include/uapi/asm-generic/fcntl.h | 1 - + include/uapi/linux/fanotify.h | 18 +++++ + kernel/fork.c | 12 +-- + mm/filemap.c | 86 ++++++++++++++++++++ + mm/memory.c | 19 +++++ + mm/nommu.c | 7 ++ + mm/readahead.c | 14 ++++ + security/selinux/hooks.c | 3 +- + 30 files changed, 675 insertions(+), 114 deletions(-) +Merging ext4/dev (3e7c69cdb053 jbd2: Fix comment describing journal_init_common()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (76f01376df39 f2fs: ensure that node info flags are always initialized) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + fs/f2fs/compress.c | 28 ++++++++++++++--------- + fs/f2fs/data.c | 55 +++++++++++++++++++-------------------------- + fs/f2fs/f2fs.h | 7 +++++- + fs/f2fs/gc.c | 11 +++++---- + fs/f2fs/inline.c | 2 +- + fs/f2fs/node.c | 1 + + include/trace/events/f2fs.h | 39 ++++++++++++++++---------------- + 7 files changed, 74 insertions(+), 69 deletions(-) +Merging fsverity/for-next (8e929cb546ee Linux 6.12-rc3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (78f2560fc9fa fuse: Set *nbytesp=0 in fuse_get_user_pages on allocation failure) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'ort' strategy. + fs/fuse/file.c | 31 +++++++++++++++++++------------ + 1 file changed, 19 insertions(+), 12 deletions(-) +Merging gfs2/for-next (ead64b20f16e gfs2: reorder capability check last) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/quota.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging jfs/jfs-next (a174706ba4da jfs: add a check to prevent array-index-out-of-bounds in dbAdjTree) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (466b2d40f60c Merge tag 'v6.13-rc3-ksmbd-server-fixes' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (bedb4e6088a8 fs/nfs: fix missing declaration of nfs_idmap_cache_timeout) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Merge made by the 'ort' strategy. + fs/nfs/pnfs.c | 2 +- + fs/nfs/super.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging nfs-anna/linux-next (867da60d463b nfs: avoid i_lock contention in nfs_clear_invalid_mapping) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Already up to date. +Merging ntfs3/master (1f2bf7049f6e ntfs3: Remove an access to page->index) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Merge made by the 'ort' strategy. + fs/ntfs3/frecord.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging orangefs/for-next (96319dacaf15 orangefs: Constify struct kobj_type) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (c8b359dddb41 ovl: Filter invalid inodes with missing lookup function) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (b29bf7119d6b jffs2: Fix rtime decompressor) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (e0260d530b73 net/9p/usbg: allow building as standalone module) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (684a64bf32b6 Merge tag 'nfs-for-6.12-1' of git://git.linux-nfs.org/projects/anna/linux-nfs) +$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (bf354410af83 Merge tag 'xfs-6.13-fixes_2024-12-12' of https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux into next-rc) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Already up to date. +Merging vfs-brauner/vfs.all (ef5bbd2a2868 Merge branch 'vfs-6.14.mount' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging MAINTAINERS +Auto-merging fs/open.c +Auto-merging fs/smb/client/file.c +Auto-merging fs/smb/client/smb2pdu.c +Auto-merging fs/smb/server/smb_common.c +Auto-merging include/linux/fs.h +Auto-merging kernel/trace/trace.h +Merge made by the 'ort' strategy. + Documentation/filesystems/fiemap.rst | 45 +- + Documentation/security/credentials.rst | 5 - + MAINTAINERS | 7 + + drivers/crypto/ccp/sev-dev.c | 2 +- + fs/9p/vfs_addr.c | 8 +- + fs/afs/Makefile | 1 + + fs/afs/callback.c | 4 +- + fs/afs/dir.c | 836 +++++++++++---------- + fs/afs/dir_edit.c | 385 ++++++---- + fs/afs/dir_search.c | 227 ++++++ + fs/afs/file.c | 258 ++++--- + fs/afs/fs_operation.c | 113 ++- + fs/afs/fsclient.c | 62 +- + fs/afs/inode.c | 140 +++- + fs/afs/internal.h | 143 +++- + fs/afs/main.c | 2 +- + fs/afs/mntpt.c | 22 +- + fs/afs/rotate.c | 4 +- + fs/afs/rxrpc.c | 37 +- + fs/afs/super.c | 4 +- + fs/afs/validation.c | 31 +- + fs/afs/vlclient.c | 1 + + fs/afs/write.c | 16 +- + fs/afs/xdr_fs.h | 2 +- + fs/afs/yfsclient.c | 49 +- + fs/backing-file.c | 20 +- + fs/cachefiles/io.c | 4 + + fs/cachefiles/xattr.c | 9 +- + fs/ceph/addr.c | 13 +- + fs/ext4/inode.c | 3 +- + fs/ext4/namei.c | 4 +- + fs/fhandle.c | 115 ++- + fs/file.c | 22 +- + fs/file_table.c | 7 +- + fs/fs_context.c | 2 +- + fs/libfs.c | 159 ++-- + fs/mount.h | 46 +- + fs/namei.c | 34 +- + fs/namespace.c | 214 ++++-- + fs/netfs/Makefile | 5 +- + fs/netfs/buffered_read.c | 266 +++---- + fs/netfs/direct_read.c | 80 +- + fs/netfs/direct_write.c | 10 +- + fs/netfs/internal.h | 36 +- + fs/netfs/main.c | 6 +- + fs/netfs/misc.c | 155 ++-- + fs/netfs/objects.c | 21 +- + fs/netfs/read_collect.c | 708 +++++++++-------- + fs/netfs/read_pgpriv2.c | 35 +- + fs/netfs/read_retry.c | 211 +++--- + fs/netfs/read_single.c | 195 +++++ + fs/netfs/rolling_buffer.c | 225 ++++++ + fs/netfs/stats.c | 4 +- + fs/netfs/write_collect.c | 278 ++----- + fs/netfs/write_issue.c | 239 +++++- + fs/netfs/write_retry.c | 233 ++++++ + fs/nfs/fscache.c | 6 +- + fs/nfs/fscache.h | 3 +- + fs/nfsd/auth.c | 3 +- + fs/nfsd/filecache.c | 2 +- + fs/nfsd/nfs4recover.c | 3 +- + fs/nfsd/nfsfh.c | 1 - + fs/nsfs.c | 5 +- + fs/open.c | 11 +- + fs/overlayfs/dir.c | 4 +- + fs/overlayfs/util.c | 4 +- + fs/pidfs.c | 296 +++++++- + fs/pnode.c | 8 +- + fs/proc/kcore.c | 81 +- + fs/proc/namespaces.c | 2 +- + fs/smb/client/cifssmb.c | 12 +- + fs/smb/client/file.c | 3 +- + fs/smb/client/smb2ops.c | 2 +- + fs/smb/client/smb2pdu.c | 14 +- + fs/smb/server/smb_common.c | 10 +- + include/linux/cred.h | 43 +- + include/linux/exportfs.h | 20 + + include/linux/fiemap.h | 16 +- + include/linux/folio_queue.h | 12 +- + include/linux/fs.h | 16 +- + include/linux/mount.h | 5 +- + include/linux/netfs.h | 55 +- + include/linux/pid.h | 5 +- + include/linux/pid_namespace.h | 10 +- + include/linux/pidfs.h | 2 + + include/linux/pseudo_fs.h | 1 + + include/linux/rculist.h | 44 ++ + include/linux/rolling_buffer.h | 61 ++ + include/linux/seqlock.h | 2 +- + include/trace/events/afs.h | 210 +++++- + include/trace/events/cachefiles.h | 13 +- + include/trace/events/netfs.h | 96 +-- + include/uapi/linux/fiemap.h | 47 +- + kernel/cred.c | 50 -- + kernel/gen_kheaders.sh | 1 + + kernel/pid.c | 139 +++- + kernel/pid_namespace.c | 43 +- + kernel/sysctl.c | 9 - + kernel/trace/pid_list.c | 2 +- + kernel/trace/trace.h | 2 - + kernel/trace/trace_sched_switch.c | 2 +- + kernel/watch_queue.c | 4 +- + lib/kunit_iov_iter.c | 4 +- + mm/shmem.c | 10 +- + samples/vfs/.gitignore | 2 + + samples/vfs/Makefile | 2 +- + samples/vfs/mountinfo.c | 273 +++++++ + samples/vfs/test-list-all-mounts.c | 235 ++++++ + security/apparmor/apparmorfs.c | 2 +- + .../selftests/{ => filesystems}/nsfs/.gitignore | 1 + + .../selftests/{ => filesystems}/nsfs/Makefile | 4 +- + .../selftests/{ => filesystems}/nsfs/config | 0 + .../selftests/filesystems/nsfs/iterate_mntns.c | 149 ++++ + .../selftests/{ => filesystems}/nsfs/owner.c | 0 + .../selftests/{ => filesystems}/nsfs/pidns.c | 0 + .../selftests/filesystems/statmount/Makefile | 2 +- + .../filesystems/statmount/listmount_test.c | 66 ++ + tools/testing/selftests/pid_namespace/.gitignore | 1 + + tools/testing/selftests/pid_namespace/Makefile | 2 +- + tools/testing/selftests/pid_namespace/pid_max.c | 358 +++++++++ + tools/testing/selftests/pidfd/.gitignore | 1 + + tools/testing/selftests/pidfd/Makefile | 3 +- + tools/testing/selftests/pidfd/pidfd.h | 40 +- + .../selftests/pidfd/pidfd_file_handle_test.c | 503 +++++++++++++ + tools/testing/selftests/pidfd/pidfd_setns_test.c | 47 +- + tools/testing/selftests/pidfd/pidfd_wait.c | 47 +- + 126 files changed, 6278 insertions(+), 2617 deletions(-) + create mode 100644 fs/afs/dir_search.c + create mode 100644 fs/netfs/read_single.c + create mode 100644 fs/netfs/rolling_buffer.c + create mode 100644 fs/netfs/write_retry.c + create mode 100644 include/linux/rolling_buffer.h + create mode 100644 samples/vfs/mountinfo.c + create mode 100644 samples/vfs/test-list-all-mounts.c + rename tools/testing/selftests/{ => filesystems}/nsfs/.gitignore (78%) + rename tools/testing/selftests/{ => filesystems}/nsfs/Makefile (50%) + rename tools/testing/selftests/{ => filesystems}/nsfs/config (100%) + create mode 100644 tools/testing/selftests/filesystems/nsfs/iterate_mntns.c + rename tools/testing/selftests/{ => filesystems}/nsfs/owner.c (100%) + rename tools/testing/selftests/{ => filesystems}/nsfs/pidns.c (100%) + create mode 100644 tools/testing/selftests/filesystems/statmount/listmount_test.c + create mode 100644 tools/testing/selftests/pid_namespace/pid_max.c + create mode 100644 tools/testing/selftests/pidfd/pidfd_file_handle_test.c +Merging vfs/for-next (5cc68af412a9 fs/overlayfs/namei.c: get rid of include ../internal.h) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Merge made by the 'ort' strategy. + fs/overlayfs/namei.c | 2 -- + 1 file changed, 2 deletions(-) +Merging mm-hotfixes/mm-hotfixes-unstable (1aefbedee74b ocfs2: fix slab-use-after-free due to dangling pointer dqi_priv) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + .mailmap | 3 +- + Documentation/admin-guide/mm/transhuge.rst | 2 +- + Documentation/mm/process_addrs.rst | 850 +++++++++++++++++++++++++++++ + arch/arc/Kconfig | 1 + + arch/arc/include/asm/cachetype.h | 8 + + drivers/block/zram/zram_drv.c | 15 +- + fs/hugetlbfs/inode.c | 2 +- + fs/nilfs2/btnode.c | 1 + + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/inode.c | 13 +- + fs/nilfs2/namei.c | 5 + + fs/nilfs2/nilfs.h | 1 + + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/localalloc.c | 27 +- + fs/ocfs2/quota_global.c | 2 +- + fs/ocfs2/quota_local.c | 1 + + fs/proc/task_mmu.c | 2 +- + include/linux/alloc_tag.h | 9 +- + include/linux/cacheinfo.h | 6 + + include/linux/highmem.h | 8 +- + include/linux/memfd.h | 14 + + include/linux/mm.h | 88 ++- + include/linux/mm_types.h | 30 + + include/linux/page-flags.h | 12 +- + include/linux/swap.h | 1 + + include/linux/vmstat.h | 2 +- + kernel/fork.c | 13 +- + kernel/kcov.c | 2 +- + lib/alloc_tag.c | 41 +- + lib/maple_tree.c | 1 + + mm/huge_memory.c | 19 +- + mm/hugetlb.c | 21 +- + mm/internal.h | 6 - + mm/kmemleak.c | 2 +- + mm/memfd.c | 2 +- + mm/memory.c | 18 +- + mm/mmap.c | 6 +- + mm/page_alloc.c | 6 +- + mm/pgtable-generic.c | 2 +- + mm/readahead.c | 6 +- + mm/shmem.c | 22 +- + mm/vma.c | 5 +- + mm/vmalloc.c | 6 +- + mm/vmscan.c | 15 +- + tools/testing/selftests/memfd/memfd_test.c | 57 +- + 45 files changed, 1217 insertions(+), 140 deletions(-) + create mode 100644 arch/arc/include/asm/cachetype.h +Merging fs-current (17261b76798a Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. + fs/file.c | 1 + + fs/hfs/super.c | 4 ++- + fs/iomap/buffered-io.c | 66 +++++++++++++++++++++++++++++++++++++++++++------- + fs/jbd2/commit.c | 4 +-- + fs/jbd2/revoke.c | 2 +- + fs/namespace.c | 10 ++++++-- + fs/nfsd/export.c | 31 +++++------------------- + fs/nfsd/export.h | 4 +-- + fs/nfsd/nfs4proc.c | 13 ++++++---- + fs/qnx6/inode.c | 11 +++------ + include/linux/iomap.h | 2 +- + 11 files changed, 93 insertions(+), 55 deletions(-) +Merging kbuild-current/fixes (fac04efc5c79 Linux 6.13-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (ce03573a1917 kselftest/arm64: abi: fix SVCR detection) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (f578281000c5 Merge tag 'ffa-fix-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging davinci-current/davinci/for-current (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging sophgo-fixes/fixes (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (647619b6bd27 m68k: defconfig: Update defconfigs for v6.12-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (fac04efc5c79 Linux 6.13-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (282da38b4653 s390/mm: Consider KMSAN modules metadata for paging levels) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging net/main (8faabc041a00 Merge tag 'net-6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Already up to date. +Merging bpf/master (716f2bca1ce9 selftests/bpf: Fix compilation error in get_uprobe_offset()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + kernel/bpf/verifier.c | 6 +++++- + tools/testing/selftests/bpf/sdt.h | 2 ++ + tools/testing/selftests/bpf/trace_helpers.c | 4 ++++ + 3 files changed, 11 insertions(+), 1 deletion(-) +Merging ipsec/master (e952837f3ddb xfrm: state: fix out-of-bounds read during lookup) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/xfrm/xfrm_replay.c | 10 +++--- + net/xfrm/xfrm_state.c | 89 +++++++++++++++++++++++++++++++++++++++----------- + 2 files changed, 76 insertions(+), 23 deletions(-) +Merging netfilter/main (31f1b55d5d7e net :mana :Request a V2 response version for MANA_QUERY_GF_STAT) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (31f1b55d5d7e net :mana :Request a V2 response version for MANA_QUERY_GF_STAT) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (146b6057e1fd wifi: cw1200: Fix potential NULL dereference) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 14 +++++++-- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 41 +++++++++++++++++++++++-- + drivers/net/wireless/st/cw1200/cw1200_spi.c | 2 +- + 6 files changed, 53 insertions(+), 7 deletions(-) +Merging ath/for-current (f1d3334d604c wifi: cfg80211: sme: init n_channels before channels[] access) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Already up to date. +Merging wpan/master (eb09fbeb4870 mac802154: check local interfaces before deleting sdata list) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Merge made by the 'ort' strategy. + drivers/net/ieee802154/ca8210.c | 6 +++++- + net/mac802154/iface.c | 4 ++++ + 2 files changed, 9 insertions(+), 1 deletion(-) +Merging rdma-fixes/for-rc (7179fe0074a3 RDMA/bnxt_re: Fix reporting hw_ver in query_device) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'ort' strategy. + drivers/infiniband/core/cma.c | 16 +++++++ + drivers/infiniband/core/uverbs_cmd.c | 16 +++---- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 50 +++++++++++----------- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 4 ++ + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 70 ++++++++++++++++++------------- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 4 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 5 +++ + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 1 + + drivers/infiniband/hw/mlx5/main.c | 6 ++- + include/linux/mlx5/driver.h | 6 +++ + 10 files changed, 114 insertions(+), 64 deletions(-) +Merging sound-current/for-linus (7b26bc6582b1 Merge tag 'asoc-fix-v6.12-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (32c9c06adb5b ASoC: mediatek: disable buffer pre-allocation) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/realtek,rt5645.yaml | 2 +- + sound/soc/amd/ps/pci-ps.c | 17 ++++++++++++++- + sound/soc/codecs/rt722-sdca.c | 7 +++++- + sound/soc/intel/boards/sof_sdw.c | 23 +++++++++++++++++--- + .../soc/mediatek/common/mtk-afe-platform-driver.c | 4 ++-- + sound/soc/sof/intel/hda-dai.c | 25 ++++++++++++++++------ + sound/soc/sof/intel/hda.h | 2 -- + 7 files changed, 64 insertions(+), 16 deletions(-) +Merging regmap-fixes/for-linus (fac04efc5c79 Linux 6.13-rc2) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (13221496065f regulator: rename regulator-uv-survival-time-ms according to DT binding) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/of_regulator.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi-fixes/for-linus (7f9a1eed1ad8 spi: rockchip-sfc: Fix error in remove progress) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-rockchip-sfc.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging pci-current/for-linus (774c71c52aa4 PCI/bwctrl: Enable only if more than one speed is supported) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Merge made by the 'ort' strategy. + drivers/pci/pci.c | 6 ++++-- + drivers/pci/pcie/portdrv.c | 4 +++- + 2 files changed, 7 insertions(+), 3 deletions(-) +Merging driver-core.current/driver-core-linus (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (1b62f3cb74d2 Merge tag 'thunderbolt-for-v6.13-rc4' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/thunderbolt/nhi.c | 8 ++++++++ + drivers/thunderbolt/nhi.h | 4 ++++ + drivers/thunderbolt/retimer.c | 19 +++++++++++++++---- + drivers/thunderbolt/tb.c | 41 +++++++++++++++++++++++++++++++++++++++++ + drivers/usb/host/xhci-mem.c | 2 +- + drivers/usb/host/xhci-ring.c | 2 -- + drivers/usb/serial/option.c | 27 +++++++++++++++++++++++++++ + 7 files changed, 96 insertions(+), 7 deletions(-) +Merging usb-serial-fixes/usb-linus (8366e64a4454 USB: serial: option: add Telit FE910C04 rmnet compositions) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (9d23e4865462 phy: rockchip: samsung-hdptx: Set drvdata before enabling runtime PM) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'ort' strategy. + drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 6 ++++++ + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 2 +- + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 2 +- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 3 ++- + drivers/phy/st/phy-stm32-combophy.c | 21 +++++++++++++++------ + 5 files changed, 25 insertions(+), 9 deletions(-) +Merging staging.current/staging-linus (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (f248a1066cf0 iio: light: as73211: fix channel handling in only-color triggered buffer) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + .../devicetree/bindings/iio/dac/adi,ad5791.yaml | 2 +- + .../devicetree/bindings/iio/st,st-sensors.yaml | 1 + + drivers/iio/adc/ad4695.c | 98 +++++++++++++++------- + drivers/iio/adc/ad7124.c | 3 + + drivers/iio/adc/ad7173.c | 10 ++- + drivers/iio/adc/ad7606.c | 48 ++++++----- + drivers/iio/adc/ad7606.h | 2 +- + drivers/iio/adc/ad9467.c | 15 +++- + drivers/iio/adc/at91_adc.c | 2 +- + drivers/iio/adc/rockchip_saradc.c | 2 + + drivers/iio/adc/stm32-dfsdm-adc.c | 13 +-- + drivers/iio/adc/ti-ads1119.c | 4 +- + drivers/iio/adc/ti-ads124s08.c | 4 +- + drivers/iio/adc/ti-ads1298.c | 2 + + drivers/iio/adc/ti-ads8688.c | 2 +- + drivers/iio/dummy/iio_simple_dummy_buffer.c | 2 +- + drivers/iio/gyro/fxas21002c_core.c | 11 ++- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 1 + + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 22 ++++- + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 3 +- + drivers/iio/imu/kmx61.c | 2 +- + drivers/iio/inkern.c | 2 +- + drivers/iio/light/as73211.c | 24 +++++- + drivers/iio/light/bh1745.c | 2 + + drivers/iio/light/hid-sensor-prox.c | 1 + + drivers/iio/light/vcnl4035.c | 2 +- + drivers/iio/pressure/zpa2326.c | 2 + + drivers/iio/temperature/tmp006.c | 2 + + drivers/iio/test/Kconfig | 2 +- + drivers/iio/test/iio-test-rescale.c | 4 + + drivers/staging/iio/frequency/ad9832.c | 2 +- + drivers/staging/iio/frequency/ad9834.c | 2 +- + 32 files changed, 210 insertions(+), 84 deletions(-) +Merging counter-current/counter-current (fac04efc5c79 Linux 6.13-rc2) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (e16ebd9d839d Merge tag 'mhi-fixes-for-v6.13' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mani/mhi into char-misc-linus) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Merge made by the 'ort' strategy. + drivers/bus/mhi/host/pci_generic.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging soundwire-fixes/fixes (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (24740385cb0d thunderbolt: Improve redrive mode handling) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (1863f213d3e8 Input: mma8450 - add chip ID check in probe) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/joystick/xpad.c | 1 + + drivers/input/misc/mma8450.c | 16 +++++++++++++++- + drivers/input/misc/nxp-bbnsm-pwrkey.c | 8 ++++++++ + 3 files changed, 24 insertions(+), 1 deletion(-) +Merging crypto-current/master (cd26cd654767 crypto: hisilicon/debugfs - fix the struct pointer incorrectly offset problem) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (9c7c5430bca3 vfio/mlx5: Align the page tracking max message size with the device capability) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (777f290ab328 selftests/ftrace: adjust offset for kprobe syntax error test) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (dcbef0798eb8 dmaengine: amd: qdma: Remove using the private get and set dma_ops APIs) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. + drivers/dma/amd/qdma/qdma.c | 28 ++++++++++++---------------- + drivers/dma/apple-admac.c | 7 ++----- + drivers/dma/at_xdmac.c | 2 ++ + drivers/dma/dw/acpi.c | 6 ++++-- + drivers/dma/dw/internal.h | 8 ++++++++ + drivers/dma/dw/pci.c | 4 ++-- + drivers/dma/loongson2-apb-dma.c | 2 +- + include/linux/dmaengine.h | 13 ++++++++++--- + include/linux/platform_data/amd_qdma.h | 2 ++ + 9 files changed, 43 insertions(+), 29 deletions(-) +Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (140054a25f85 mtd: rawnand: omap2: Fix build warnings with W=1) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/arasan-nand-controller.c | 11 +++++++++-- + drivers/mtd/nand/raw/atmel/pmecc.c | 4 +--- + drivers/mtd/nand/raw/diskonchip.c | 2 +- + drivers/mtd/nand/raw/omap2.c | 16 ++++++++++++++++ + 4 files changed, 27 insertions(+), 6 deletions(-) +Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range) +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (8b55f8818900 media: mediatek: vcodec: mark vdec_vp9_slice_map_counts_eob_coef noinline) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + drivers/media/dvb-frontends/dib3000mb.c | 2 +- + .../media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging reset-fixes/reset/fixes (1f8af9712413 reset: rzg2l-usbphy-ctrl: Assign proper of node to the allocated device) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Auto-merging drivers/reset/reset-rzg2l-usbphy-ctrl.c +Merge made by the 'ort' strategy. + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 1 + + 1 file changed, 1 insertion(+) +Merging mips-fixes/mips-fixes (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (7d4050728c83 Merge tag 'vfs-6.13-rc1.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (cff59d8631e1 s390/uv: Panic for set and remove shared access UVC errors) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (dd471e25770e hwmon: (tmp513) Fix interpretation of values of Temperature Result and Limit Registers) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/tmp513.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (265e98f72bac acpi: nfit: vmalloc-out-of-bounds Read in acpi_nfit_ctl) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (76467a94810c cxl/region: Fix region creation for greater than x2 switches) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (78b2770c935f dma-mapping: fix tracing dma_alloc/free with vmalloc'd memory) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (185e1b1d91e4 platform/x86: mlx-platform: call pci_dev_put() to balance the refcount) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Merge made by the 'ort' strategy. + drivers/platform/x86/mlx-platform.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging samsung-krzk-fixes/fixes (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (0f7ca6f69354 of/irq: Fix using uninitialized variable @addr_len in API of_irq_parse_one()) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Auto-merging drivers/of/base.c +Auto-merging drivers/of/unittest.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/crypto/fsl,sec-v4.0.yaml | 10 +++--- + .../bindings/mtd/partitions/fixed-partitions.yaml | 2 +- + .../bindings/soc/fsl/fsl,qman-portal.yaml | 2 ++ + drivers/of/address.c | 5 +-- + drivers/of/base.c | 15 ++++++--- + drivers/of/empty_root.dts | 9 ++++- + drivers/of/irq.c | 2 ++ + drivers/of/property.c | 2 -- + drivers/of/unittest-data/tests-address.dtsi | 2 ++ + drivers/of/unittest.c | 39 ++++++++++++++++++++++ + 10 files changed, 73 insertions(+), 15 deletions(-) +Merging dt-krzk-fixes/fixes (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (f103396ae318 scsi: ufs: core: Update compl_time_stamp_local_clock after completing a cqe) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (87fd88332567 Merge tag 'drm-misc-fixes-2024-12-19' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +-- + arch/powerpc/configs/pmac32_defconfig | 1 + + arch/powerpc/configs/ppc6xx_defconfig | 1 + + drivers/accel/ivpu/ivpu_gem.c | 2 +- + drivers/accel/ivpu/ivpu_mmu_context.c | 10 ++++-- + drivers/accel/ivpu/ivpu_pm.c | 2 +- + drivers/auxdisplay/Kconfig | 2 +- + drivers/dma-buf/dma-buf.c | 2 +- + drivers/dma-buf/udmabuf.c | 43 ++++++++++++++--------- + drivers/gpu/drm/Kconfig | 4 +++ + drivers/gpu/drm/display/drm_dp_tunnel.c | 10 +++--- + drivers/gpu/drm/drm_modes.c | 11 +++--- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 5 +++ + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 41 +++++++++++++++++++-- + drivers/gpu/drm/panel/panel-himax-hx83102.c | 2 ++ + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 4 +-- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 1 + + drivers/gpu/drm/panel/panel-synaptics-r63353.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 3 +- + drivers/macintosh/Kconfig | 1 + + drivers/staging/fbtft/Kconfig | 1 + + drivers/video/fbdev/Kconfig | 18 +++++++--- + drivers/video/fbdev/core/Kconfig | 3 +- + 23 files changed, 126 insertions(+), 47 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (1622ed27d26a i915/guc: Accumulate active runtime on gt reset) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (8d90a86ed053 mmc: sdhci-msm: fix crypto key eviction) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/host/sdhci-msm.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) +Merging rtc-fixes/rtc-fixes (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (175c71c2acee tools/hv: reduce resource usage in hv_kvp_daemon) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging risc-v-fixes/fixes (21f1b85c8912 riscv: mm: Do not call pmd dtor on vmemmap page table teardown) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging riscv-dt-fixes/riscv-dt-fixes (8d19d5a76bf6 riscv: dts: starfive: Fix a typo in StarFive JH7110 pin function definitions) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/starfive/jh7110-pinfunc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging riscv-soc-fixes/riscv-soc-fixes (48808b55b07c firmware: microchip: fix UL_IAP lock check in mpfs_auto_update_state()) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Merge made by the 'ort' strategy. + drivers/firmware/microchip/mpfs-auto-update.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (e70140ba0d2b Get rid of 'remove_new' relic from platform driver struct) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging memblock-fixes/fixes (180bbad69864 arch_numa: Restore nid checks before registering a memblock with a node) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging renesas-fixes/fixes (124f4f1a1869 MAINTAINERS: Re-add cancelled Renesas driver sections) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging perf-current/perf-tools (434fffa926b1 perf probe: Fix uninitialized variable) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (145ac100b637 efi/esrt: remove esre_attribute::store()) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Already up to date. +Merging battery-fixes/fixes (b3ded6072c56 power: supply: bq24190: Fix BQ24296 Vbus regulator support) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Merge made by the 'ort' strategy. + drivers/power/supply/bq24190_charger.c | 12 +++++++--- + drivers/power/supply/cros_charge-control.c | 36 ++++++++++++++++++++++-------- + drivers/power/supply/gpio-charger.c | 8 +++++++ + 3 files changed, 44 insertions(+), 12 deletions(-) +Merging iommufd-fixes/for-rc (2ca704f55e22 iommu/arm-smmu-v3: Improve uAPI comment for IOMMU_HW_INFO_TYPE_ARM_SMMUV3) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging w1-fixes/fixes (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (f64f610ec6ab pmdomain: core: add dummy release function to genpd device) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pmdomain/core.c | 6 ++++++ + drivers/pmdomain/imx/gpcv2.c | 4 ++-- + 2 files changed, 8 insertions(+), 2 deletions(-) +Merging i2c-host-fixes/i2c/i2c-host-fixes (06b911b17b64 i2c: imx: add imx7d compatible string for applying erratum ERR007805) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-imx.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) +Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (f4bf0b909a6b clk: thead: Fix TH1520 emmc and shdci clock rate) +$ git merge -m Merge branch 'clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Merge made by the 'ort' strategy. + drivers/clk/thead/clk-th1520-ap.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) +Merging pwrseq-fixes/pwrseq/for-current (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'pwrseq/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current +Already up to date. +Merging thead-dt-fixes/thead-dt-fixes (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of https://github.com/pdp7/linux.git thead-dt-fixes/thead-dt-fixes +Already up to date. +Merging ftrace-fixes/ftrace/fixes (166438a432d7 ftrace: Do not find "true_parent" if HAVE_DYNAMIC_FTRACE_WITH_ARGS is not set) +$ git merge -m Merge branch 'ftrace/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes +Already up to date. +Merging ring-buffer-fixes/ring-buffer/fixes (8cd63406d081 trace/ring-buffer: Do not use TP_printk() formatting for boot mapped buffers) +$ git merge -m Merge branch 'ring-buffer/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ring-buffer-fixes/ring-buffer/fixes +Auto-merging kernel/trace/trace.c +Merge made by the 'ort' strategy. + kernel/trace/ring_buffer.c | 6 +++++- + kernel/trace/trace.c | 9 +++++++++ + 2 files changed, 14 insertions(+), 1 deletion(-) +Merging trace-fixes/trace/fixes (afd2627f727b tracing: Check "%s" dereference via the field and not the TP_printk format) +$ git merge -m Merge branch 'trace/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes +Already up to date. +Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test) +$ git merge -m Merge branch 'tracefs/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes +Already up to date. +Merging spacemit-fixes/fixes (819837584309 Linux 6.12-rc5) +$ git merge -m Merge branch 'fixes' of https://github.com/spacemit-com/linux spacemit-fixes/fixes +Already up to date. +Merging tip-fixes/tip/urgent (4022ad48f0b0 Merge branch into tip/master: 'x86/urgent') +$ git merge -m Merge branch 'tip/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Merge made by the 'ort' strategy. + arch/x86/kernel/cet.c | 30 ++++++++++++++++++++++++++++++ + drivers/pci/msi/irqdomain.c | 7 +++++-- + drivers/pci/msi/msi.c | 4 ++++ + drivers/virt/coco/tdx-guest/tdx-guest.c | 4 +--- + include/linux/sched.h | 3 ++- + kernel/locking/rtmutex.c | 18 ++++++++++++++++-- + kernel/locking/rtmutex_api.c | 2 +- + 7 files changed, 59 insertions(+), 9 deletions(-) +Merging slab-fixes/slab/for-next-fixes (b7ffecbe198e memcg: slub: fix SUnreclaim for post charged objects) +$ git merge -m Merge branch 'slab/for-next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes +Already up to date. +Merging drm-msm-fixes/msm-fixes (789384eb1437 drm/msm/dpu: check dpu_plane_atomic_print_state() for valid sspp) +$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes +Merge made by the 'ort' strategy. + .../bindings/display/msm/qcom,sa8775p-mdss.yaml | 3 ++- + drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 4 ++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 15 +++++++++------ + drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 3 --- + drivers/gpu/drm/msm/dp/dp_audio.c | 2 +- + drivers/gpu/drm/msm/dp/dp_catalog.c | 1 - + drivers/gpu/drm/msm/dp/dp_ctrl.c | 2 +- + drivers/gpu/drm/msm/dp/dp_utils.c | 10 +--------- + drivers/gpu/drm/msm/dp/dp_utils.h | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8998.c | 2 +- + 10 files changed, 18 insertions(+), 26 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (1b684ca15f9d drm/sched: Fix drm_sched_fini() docu generation) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging mm-stable/mm-stable (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm/mm-everything (45f41efd96f2 foo) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging MAINTAINERS +Auto-merging include/linux/compiler.h +Auto-merging include/linux/sched.h +Merge made by the 'ort' strategy. + Documentation/accounting/delay-accounting.rst | 38 +- + Documentation/admin-guide/kernel-parameters.txt | 7 + + Documentation/admin-guide/mm/transhuge.rst | 82 ++- + Documentation/core-api/min_heap.rst | 2 + + Documentation/core-api/xarray.rst | 24 +- + Documentation/mm/process_addrs.rst | 4 + + MAINTAINERS | 24 +- + arch/alpha/lib/fpreg.c | 1 - + arch/arm/mach-pxa/sharpsl_pm.c | 8 +- + arch/m68k/configs/amiga_defconfig | 1 - + arch/m68k/configs/apollo_defconfig | 1 - + arch/m68k/configs/atari_defconfig | 1 - + arch/m68k/configs/bvme6000_defconfig | 1 - + arch/m68k/configs/hp300_defconfig | 1 - + arch/m68k/configs/mac_defconfig | 1 - + arch/m68k/configs/multi_defconfig | 1 - + arch/m68k/configs/mvme147_defconfig | 1 - + arch/m68k/configs/mvme16x_defconfig | 1 - + arch/m68k/configs/q40_defconfig | 1 - + arch/m68k/configs/sun3_defconfig | 1 - + arch/m68k/configs/sun3x_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/kvm/book3s_hv.c | 2 +- + arch/powerpc/platforms/powernv/memtrace.c | 31 +- + arch/powerpc/platforms/pseries/papr_scm.c | 2 +- + arch/s390/Kconfig | 1 + + arch/s390/kernel/crash_dump.c | 39 +- + arch/s390/kernel/lgr.c | 2 +- + arch/s390/kernel/time.c | 4 +- + arch/s390/kernel/topology.c | 2 +- + arch/s390/mm/cmm.c | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/percpu.h | 38 +- + arch/x86/include/asm/tlb.h | 20 + + arch/x86/kernel/kgdb.c | 2 +- + arch/x86/kernel/paravirt.c | 7 + + arch/x86/kernel/setup.c | 5 +- + arch/x86/mm/pgtable.c | 10 +- + drivers/accel/habanalabs/common/device.c | 2 +- + drivers/accel/habanalabs/common/habanalabs_drv.c | 3 +- + drivers/acpi/acpi_extlog.c | 14 + + drivers/block/xen-blkback/blkback.c | 2 +- + drivers/block/zram/zram_drv.c | 311 +++++---- + drivers/block/zram/zram_drv.h | 5 +- + drivers/gpu/drm/xe/xe_device.c | 2 +- + drivers/infiniband/hw/hfi1/iowait.h | 2 +- + drivers/infiniband/hw/usnic/usnic_abi.h | 2 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 2 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- + drivers/scsi/cxlflash/superpipe.c | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 18 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 8 +- + drivers/scsi/lpfc/lpfc_nvme.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 4 +- + drivers/scsi/lpfc/lpfc_vmid.c | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 2 +- + drivers/virtio/virtio_mem.c | 103 ++- + fs/bcachefs/util.h | 2 +- + fs/ceph/quota.c | 2 +- + fs/exec.c | 14 +- + fs/fs-writeback.c | 3 + + fs/fuse/file.c | 360 +---------- + fs/fuse/fuse_i.h | 3 - + fs/hugetlbfs/inode.c | 5 - + fs/ocfs2/alloc.c | 142 ++--- + fs/ocfs2/alloc.h | 8 +- + fs/ocfs2/aops.c | 337 +++++----- + fs/ocfs2/aops.h | 17 +- + fs/ocfs2/cluster/heartbeat.c | 28 +- + fs/ocfs2/cluster/masklog.h | 2 +- + fs/ocfs2/cluster/quorum.c | 6 +- + fs/ocfs2/cluster/tcp.c | 8 +- + fs/ocfs2/dlm/dlmapi.h | 2 +- + fs/ocfs2/dlm/dlmrecovery.c | 6 +- + fs/ocfs2/dlmfs/dlmfs.c | 23 +- + fs/ocfs2/dlmglue.c | 28 +- + fs/ocfs2/dlmglue.h | 6 +- + fs/ocfs2/file.c | 8 +- + fs/ocfs2/inode.c | 4 +- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/journal.c | 2 +- + fs/ocfs2/mmap.c | 18 +- + fs/ocfs2/move_extents.c | 8 +- + fs/ocfs2/ocfs2_fs.h | 8 +- + fs/ocfs2/ocfs2_ioctl.h | 2 +- + fs/ocfs2/ocfs2_lockid.h | 2 +- + fs/ocfs2/ocfs2_trace.h | 20 +- + fs/ocfs2/refcounttree.c | 41 +- + fs/ocfs2/reservations.h | 4 +- + fs/ocfs2/stack_o2cb.c | 2 +- + fs/ocfs2/stackglue.h | 2 +- + fs/ocfs2/super.c | 587 ++++++++--------- + fs/ocfs2/symlink.c | 16 +- + fs/ocfs2/xattr.c | 10 +- + fs/proc/Kconfig | 19 + + fs/proc/vmcore.c | 283 +++++++-- + fs/squashfs/super.c | 2 +- + include/asm-generic/early_ioremap.h | 2 +- + include/asm-generic/percpu.h | 39 +- + include/asm-generic/syscall.h | 2 +- + include/linux/bitmap.h | 2 +- + include/linux/compiler.h | 13 + + include/linux/compiler_types.h | 2 +- + include/linux/crash_dump.h | 41 ++ + include/linux/delayacct.h | 7 + + include/linux/gfp.h | 8 - + include/linux/huge_mm.h | 2 + + include/linux/hugetlb.h | 6 + + include/linux/kasan.h | 2 - + include/linux/kcore.h | 13 - + include/linux/list_lru.h | 44 +- + include/linux/memcontrol.h | 43 +- + include/linux/memfd.h | 23 +- + include/linux/migrate.h | 6 +- + include/linux/min_heap.h | 72 ++- + include/linux/minmax.h | 219 +++---- + include/linux/mm.h | 75 +-- + include/linux/mm_inline.h | 105 ++-- + include/linux/mm_types.h | 20 +- + include/linux/mmap_lock.h | 126 ++-- + include/linux/mmzone.h | 88 ++- + include/linux/page-isolation.h | 2 +- + include/linux/page_ref.h | 9 +- + include/linux/pagemap.h | 32 +- + include/linux/part_stat.h | 2 +- + include/linux/percpu-defs.h | 6 +- + include/linux/pgtable.h | 9 +- + include/linux/sched.h | 3 + + include/linux/sched/hotplug.h | 4 - + include/linux/seqlock.h | 22 + + include/linux/swap_cgroup.h | 14 +- + include/linux/task_work.h | 3 - + include/linux/types.h | 2 +- + include/net/snmp.h | 5 +- + include/trace/events/mmap_lock.h | 32 +- + include/uapi/linux/taskstats.h | 9 + + init/Kconfig | 3 + + init/do_mounts_initrd.c | 2 +- + kernel/cpu.c | 9 +- + kernel/delayacct.c | 37 +- + kernel/fork.c | 14 +- + kernel/irq_work.c | 2 +- + kernel/locking/percpu-rwsem.c | 2 +- + kernel/rcu/tiny.c | 2 +- + kernel/rcu/tree.c | 4 +- + kernel/resource.c | 3 +- + kernel/sched/core.c | 24 +- + kernel/sched/stats.h | 5 +- + kernel/task_work.c | 14 +- + kernel/ucount.c | 8 +- + kernel/watchdog.c | 2 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 34 +- + lib/Makefile | 2 +- + lib/fault-inject.c | 28 +- + lib/kunit_iov_iter.c | 3 - + lib/maple_tree.c | 73 +-- + lib/math/Makefile | 1 + + lib/math/tests/Makefile | 1 + + lib/math/tests/int_sqrt_kunit.c | 66 ++ + lib/rhashtable.c | 2 +- + lib/test_maple_tree.c | 56 ++ + lib/test_min_heap.c | 30 +- + lib/test_xarray.c | 692 +++++++++++++-------- + lib/xarray.c | 78 +-- + mm/Kconfig | 15 + + mm/Makefile | 1 + + mm/cma.h | 2 +- + mm/compaction.c | 2 + + mm/damon/core.c | 7 +- + mm/damon/tests/vaddr-kunit.h | 2 +- + mm/early_ioremap.c | 8 +- + mm/filemap.c | 19 - + mm/gup.c | 91 ++- + mm/huge_memory.c | 17 +- + mm/hugetlb.c | 128 ++-- + mm/hugetlb_cgroup.c | 1 - + mm/init-mm.c | 2 +- + mm/internal.h | 60 +- + mm/kasan/generic.c | 18 +- + mm/kasan/kasan_test_c.c | 4 +- + mm/khugepaged.c | 45 +- + mm/kmemleak.c | 4 +- + mm/madvise.c | 7 +- + mm/memcontrol-v1.c | 16 +- + mm/memcontrol.c | 107 ++-- + mm/memfd.c | 44 +- + mm/memory.c | 285 ++++++--- + mm/memory_hotplug.c | 15 +- + mm/mempolicy.c | 53 +- + mm/migrate.c | 16 +- + mm/mmap.c | 564 +++++------------ + mm/mmap_lock.c | 50 +- + mm/mmu_gather.c | 9 +- + mm/mseal.c | 6 +- + mm/page-writeback.c | 55 +- + mm/page_alloc.c | 133 +++- + mm/page_frag_cache.c | 6 +- + mm/page_idle.c | 10 +- + mm/page_isolation.c | 12 +- + mm/pt_reclaim.c | 71 +++ + mm/readahead.c | 27 +- + mm/rodata_test.c | 7 +- + mm/shmem.c | 221 ++++--- + mm/slub.c | 12 +- + mm/swap.c | 72 ++- + mm/swap_cgroup.c | 233 +++---- + mm/userfaultfd.c | 55 +- + mm/util.c | 17 + + mm/vma.c | 486 +++++++++++++-- + mm/vma.h | 46 +- + mm/vma_internal.h | 1 + + mm/vmscan.c | 436 ++++++------- + mm/workingset.c | 65 +- + mm/zswap.c | 2 +- + net/bluetooth/mgmt.c | 2 +- + net/mpls/internal.h | 4 +- + net/netfilter/nf_conntrack_proto_sctp.c | 21 +- + samples/Kconfig | 2 + + samples/Makefile | 2 + + samples/damon/Kconfig | 30 + + samples/damon/Makefile | 4 + + samples/damon/prcl.c | 136 ++++ + samples/damon/wsse.c | 116 ++++ + samples/livepatch/livepatch-callbacks-busymod.c | 3 +- + samples/livepatch/livepatch-shadow-fix1.c | 3 +- + samples/livepatch/livepatch-shadow-mod.c | 15 +- + scripts/checkpatch.pl | 10 +- + scripts/coccinelle/misc/secs_to_jiffies.cocci | 22 + + scripts/spelling.txt | 37 ++ + sound/usb/line6/toneport.c | 2 +- + tools/accounting/getdelays.c | 59 +- + tools/accounting/procacct.c | 5 +- + tools/testing/radix-tree/multiorder.c | 4 + + tools/testing/selftests/mm/.gitignore | 4 +- + tools/testing/selftests/mm/Makefile | 7 +- + tools/testing/selftests/mm/guard-pages.c | 73 ++- + tools/testing/selftests/mm/ksm_tests.c | 2 +- + tools/testing/selftests/mm/mremap_test.c | 17 +- + tools/testing/selftests/mm/mseal_test.c | 8 +- + tools/testing/selftests/mm/pagemap_ioctl.c | 118 ++-- + tools/testing/selftests/mm/pkey-arm64.h | 6 +- + tools/testing/selftests/mm/pkey-helpers.h | 61 +- + tools/testing/selftests/mm/pkey-powerpc.h | 4 +- + tools/testing/selftests/mm/pkey-x86.h | 6 +- + tools/testing/selftests/mm/pkey_sighandler_tests.c | 32 +- + tools/testing/selftests/mm/pkey_util.c | 40 ++ + tools/testing/selftests/mm/protection_keys.c | 212 +++---- + tools/testing/selftests/mm/seal_elf.c | 137 ---- + tools/testing/selftests/mm/soft-dirty.c | 2 +- + tools/testing/selftests/mm/thp_settings.c | 4 +- + tools/testing/selftests/mm/thp_settings.h | 4 +- + tools/testing/selftests/mm/uffd-unit-tests.c | 4 +- + tools/testing/selftests/mm/vm_util.c | 2 +- + tools/testing/selftests/mm/write_to_hugetlbfs.c | 2 +- + tools/testing/selftests/pidfd/pidfd_test.c | 2 +- + tools/testing/vma/vma.c | 68 +- + tools/testing/vma/vma_internal.h | 158 ++++- + usr/include/headers_check.pl | 4 - + 261 files changed, 5811 insertions(+), 4426 deletions(-) + create mode 100644 lib/math/tests/int_sqrt_kunit.c + create mode 100644 mm/pt_reclaim.c + create mode 100644 samples/damon/Kconfig + create mode 100644 samples/damon/Makefile + create mode 100644 samples/damon/prcl.c + create mode 100644 samples/damon/wsse.c + create mode 100644 scripts/coccinelle/misc/secs_to_jiffies.cocci + create mode 100644 tools/testing/selftests/mm/pkey_util.c + delete mode 100644 tools/testing/selftests/mm/seal_elf.c +$ git am -3 ../patches/0001-fix-up-for-mm-replace-free-hugepage-folios-after-mig.patch +Applying: fix up for "mm: replace free hugepage folios after migration" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/hugetlb.h +$ git add -A . +$ git commit -v -a --amend +[master b86e29c311ae] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Fri Dec 20 10:04:22 2024 +1100 +Merging kbuild/for-next (8f2db654f79c kbuild: suppress stdout from merge_config for silent builds) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging usr/include/headers_check.pl +Merge made by the 'ort' strategy. + scripts/Makefile.defconf | 13 +++++++------ + scripts/kconfig/Makefile | 4 +++- + scripts/package/builddeb | 24 ++++++++++++++++-------- + scripts/package/install-extmod-build | 33 +++++++++------------------------ + scripts/package/mkdebian | 7 +++++++ + usr/include/Makefile | 2 +- + usr/include/headers_check.pl | 5 ++--- + 7 files changed, 45 insertions(+), 43 deletions(-) +Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf-tools-next (233157785a34 perf python: Correctly throw IndexError) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Merge made by the 'ort' strategy. + tools/bpf/bpftool/Makefile | 7 + + tools/build/Makefile.feature | 46 +- + tools/build/feature/Makefile | 6 +- + tools/build/feature/test-all.c | 15 +- + tools/build/feature/test-libelf-zstd.c | 9 + + tools/lib/api/fs/fs.c | 6 +- + tools/lib/perf/Documentation/libperf.txt | 1 - + tools/lib/perf/cpumap.c | 131 ++--- + tools/lib/perf/evlist.c | 2 +- + tools/lib/perf/include/internal/cpumap.h | 4 - + tools/lib/perf/include/perf/cpumap.h | 6 +- + tools/lib/perf/libperf.map | 1 - + tools/perf/Documentation/perf-config.txt | 2 +- + tools/perf/Documentation/perf-ftrace.txt | 11 + + tools/perf/Documentation/perf-intel-pt.txt | 596 +++++++++++++-------- + tools/perf/Documentation/perf-record.txt | 4 + + tools/perf/Makefile.config | 93 ++-- + tools/perf/Makefile.perf | 7 +- + tools/perf/arch/powerpc/util/perf_regs.c | 3 +- + tools/perf/arch/x86/util/Build | 2 +- + tools/perf/bench/inject-buildid.c | 13 +- + tools/perf/builtin-annotate.c | 1 + + tools/perf/builtin-diff.c | 1 + + tools/perf/builtin-ftrace.c | 131 ++++- + tools/perf/builtin-kmem.c | 12 +- + tools/perf/builtin-kvm.c | 61 --- + tools/perf/builtin-kwork.c | 7 +- + tools/perf/builtin-lock.c | 137 +---- + tools/perf/builtin-mem.c | 1 + + tools/perf/builtin-record.c | 6 +- + tools/perf/builtin-sched.c | 1 + + tools/perf/builtin-script.c | 313 +---------- + tools/perf/builtin-stat.c | 27 - + tools/perf/builtin-trace.c | 80 ++- + tools/perf/builtin.h | 6 - + tools/perf/perf.h | 2 +- + .../arch/arm64/arm/neoverse-n2-v2/exception.json | 2 +- + .../arch/arm64/arm/neoverse-n2-v2/general.json | 2 +- + .../arch/arm64/arm/neoverse-n2-v2/l1d_cache.json | 6 +- + .../arch/arm64/arm/neoverse-n2-v2/l2_cache.json | 14 +- + .../arch/arm64/arm/neoverse-n2-v2/l3_cache.json | 4 +- + .../arch/arm64/arm/neoverse-n2-v2/ll_cache.json | 4 +- + .../arch/arm64/arm/neoverse-n2-v2/memory.json | 2 +- + .../arch/arm64/arm/neoverse-n2-v2/metrics.json | 93 ++-- + .../arch/arm64/arm/neoverse-n2-v2/retired.json | 4 +- + .../arm64/arm/neoverse-n2-v2/spec_operation.json | 14 +- + .../arch/arm64/arm/neoverse-n2-v2/stall.json | 8 +- + .../arch/arm64/arm/neoverse-n2-v2/tlb.json | 4 +- + tools/perf/pmu-events/jevents.py | 5 +- + .../perf/scripts/python/Perf-Trace-Util/Context.c | 20 +- + tools/perf/scripts/python/mem-phys-addr.py | 179 ++++--- + tools/perf/tests/Build | 6 +- + tools/perf/tests/builtin-test.c | 2 - + tools/perf/tests/cpumap.c | 54 +- + tools/perf/tests/parse-events.c | 25 +- + .../tests/shell/base_probe/test_invalid_options.sh | 5 +- + .../tests/shell/base_probe/test_line_semantics.sh | 5 +- + tools/perf/tests/shell/common/init.sh | 5 +- + tools/perf/tests/shell/stat+std_output.sh | 2 +- + tools/perf/tests/shell/test_intel_pt.sh | 28 + + tools/perf/tests/sigtrap.c | 20 +- + tools/perf/tests/stat.c | 16 +- + tools/perf/tests/switch-tracking.c | 2 +- + tools/perf/tests/tests-scripts.c | 2 +- + tools/perf/tests/tests.h | 10 + + tools/perf/tests/workloads/landlock.c | 2 +- + tools/perf/trace/beauty/arch_errno_names.sh | 3 +- + tools/perf/ui/browsers/scripts.c | 177 +++++- + tools/perf/util/Build | 7 +- + tools/perf/util/annotate.h | 1 + + tools/perf/util/arm-spe-decoder/arm-spe-decoder.h | 9 + + tools/perf/util/arm-spe.c | 86 ++- + tools/perf/util/auxtrace.c | 67 ++- + tools/perf/util/auxtrace.h | 6 +- + tools/perf/util/bpf-event.c | 10 +- + tools/perf/util/bpf_ftrace.c | 3 + + tools/perf/util/bpf_kwork.c | 2 +- + tools/perf/util/bpf_kwork_top.c | 2 +- + tools/perf/util/bpf_lock_contention.c | 2 +- + tools/perf/util/bpf_skel/func_latency.bpf.c | 27 +- + tools/perf/util/bpf_skel/kwork_top.bpf.c | 4 +- + tools/perf/util/btf.c | 27 + + tools/perf/util/btf.h | 10 + + tools/perf/util/cgroup.c | 2 +- + tools/perf/util/config.c | 27 + + tools/perf/util/data-convert-bt.c | 10 +- + tools/perf/util/data-convert-json.c | 8 +- + tools/perf/util/disasm.c | 5 +- + tools/perf/util/dlfilter.c | 3 +- + tools/perf/util/env.c | 26 +- + tools/perf/util/env.h | 6 +- + tools/perf/util/evsel.c | 234 ++++++-- + tools/perf/util/evsel.h | 12 +- + tools/perf/util/evsel_config.h | 1 + + tools/perf/util/evsel_fprintf.c | 4 +- + tools/perf/util/expr.c | 5 +- + tools/perf/util/ftrace.h | 3 + + tools/perf/util/header.c | 8 +- + tools/perf/util/intel-pt-decoder/Build | 18 +- + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 3 - + tools/perf/util/kvm-stat.c | 70 +++ + tools/perf/util/kvm-stat.h | 3 + + tools/perf/util/kwork.h | 7 +- + tools/perf/util/lock-contention.c | 143 +++++ + tools/perf/util/lock-contention.h | 18 +- + tools/perf/util/mem-events.c | 5 +- + tools/perf/util/parse-events.c | 26 +- + tools/perf/util/parse-events.h | 1 + + tools/perf/util/parse-events.l | 1 + + tools/perf/util/path.c | 10 + + tools/perf/util/path.h | 1 + + tools/perf/util/perf_event_attr_fprintf.c | 7 +- + tools/perf/util/pmu.c | 31 +- + tools/perf/util/probe-event.c | 32 +- + tools/perf/util/probe-event.h | 1 + + tools/perf/util/probe-finder.c | 15 + + tools/perf/util/probe-finder.h | 5 + + tools/perf/util/python.c | 341 +++++------- + .../perf/util/scripting-engines/trace-event-perl.c | 3 +- + .../util/scripting-engines/trace-event-python.c | 66 +-- + tools/perf/util/session.c | 1 + + tools/perf/util/sort.c | 33 +- + tools/perf/util/stat.h | 3 +- + tools/perf/util/string.c | 15 +- + tools/perf/util/svghelper.c | 1 + + tools/perf/util/synthetic-events.c | 14 +- + tools/perf/util/trace-event-parse.c | 2 +- + tools/perf/util/trace-event-scripting.c | 187 ++++++- + tools/perf/util/trace-event.h | 7 +- + 129 files changed, 2493 insertions(+), 1670 deletions(-) + create mode 100644 tools/build/feature/test-libelf-zstd.c + create mode 100644 tools/perf/util/btf.c + create mode 100644 tools/perf/util/btf.h + create mode 100644 tools/perf/util/kvm-stat.c + create mode 100644 tools/perf/util/lock-contention.c +Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (aef7ee7649e0 dma-debug: fix physical address calculation for struct dma_debug_entry) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (0af8e32343f8 empty include/asm-generic/vga.h) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (6139f7913689 Merge branches 'fixes' and 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (d6ab634f1b32 Merge branches 'for-next/cpufeature', 'for-next/docs', 'for-next/misc' and 'for-next/mm' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging arch/arm64/include/asm/el2_setup.h +Auto-merging arch/arm64/kvm/at.c +Auto-merging arch/arm64/kvm/hyp/nvhe/pkvm.c +Merge made by the 'ort' strategy. + Documentation/arch/arm64/booting.rst | 12 +++++++++ + arch/arm64/Kconfig | 39 +++-------------------------- + arch/arm64/include/asm/assembler.h | 14 ++++------- + arch/arm64/include/asm/cpucaps.h | 2 ++ + arch/arm64/include/asm/cpufeature.h | 6 ++--- + arch/arm64/include/asm/el2_setup.h | 6 ++--- + arch/arm64/include/asm/kvm_arm.h | 2 -- + arch/arm64/include/asm/kvm_emulate.h | 40 +++++++++++++++--------------- + arch/arm64/include/asm/kvm_nested.h | 8 +++--- + arch/arm64/include/asm/kvm_pgtable.h | 3 +-- + arch/arm64/include/asm/mmu.h | 3 --- + arch/arm64/include/asm/pgtable-hwdef.h | 12 +-------- + arch/arm64/include/asm/pgtable-prot.h | 7 ++++++ + arch/arm64/include/asm/pgtable.h | 17 +++---------- + arch/arm64/include/asm/sparsemem.h | 5 +++- + arch/arm64/include/asm/sysreg.h | 6 ----- + arch/arm64/kernel/cpufeature.c | 19 +++++++------- + arch/arm64/kernel/pi/idreg-override.c | 9 +++++++ + arch/arm64/kernel/pi/map_kernel.c | 6 +++++ + arch/arm64/kvm/arm.c | 8 +++--- + arch/arm64/kvm/at.c | 6 ++--- + arch/arm64/kvm/emulate-nested.c | 2 +- + arch/arm64/kvm/fpsimd.c | 2 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 4 +-- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 4 +-- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 2 +- + arch/arm64/kvm/hyp/nvhe/switch.c | 6 ++--- + arch/arm64/kvm/hyp/pgtable.c | 33 ++++++++----------------- + arch/arm64/kvm/hyp/vhe/switch.c | 16 ++++++------ + arch/arm64/mm/hugetlbpage.c | 12 +++++++++ + arch/arm64/mm/init.c | 7 +++++- + arch/arm64/mm/pgd.c | 9 ++++--- + arch/arm64/mm/proc.S | 7 +++--- + arch/arm64/tools/gen-sysreg.awk | 2 +- + arch/arm64/tools/sysreg | 44 ++++++++++++++++----------------- + scripts/gdb/linux/constants.py.in | 1 - + tools/arch/arm64/include/asm/sysreg.h | 6 ----- + 37 files changed, 177 insertions(+), 210 deletions(-) +Merging arm-perf/for-next/perf (f3edf03a4c59 perf: imx9_perf: Introduce AXI filter version to refactor the driver and better extension) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Merge made by the 'ort' strategy. + Documentation/admin-guide/perf/dwc_pcie_pmu.rst | 6 +- + Documentation/admin-guide/perf/hisi-pmu.rst | 5 +- + Documentation/admin-guide/perf/index.rst | 2 + + .../admin-guide/perf/mrvl-odyssey-ddr-pmu.rst | 80 ++++ + .../admin-guide/perf/mrvl-odyssey-tad-pmu.rst | 37 ++ + Documentation/admin-guide/perf/nvidia-pmu.rst | 52 +- + drivers/perf/arm-cmn.c | 4 +- + drivers/perf/arm_cspmu/nvidia_cspmu.c | 75 +-- + drivers/perf/dwc_pcie_pmu.c | 72 +-- + drivers/perf/fsl_imx9_ddr_perf.c | 33 +- + drivers/perf/hisilicon/hisi_uncore_cpa_pmu.c | 42 +- + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 61 +-- + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 48 +- + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 44 +- + drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 53 +-- + drivers/perf/hisilicon/hisi_uncore_pmu.c | 160 +++++-- + drivers/perf/hisilicon/hisi_uncore_pmu.h | 49 +- + drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c | 43 +- + drivers/perf/hisilicon/hisi_uncore_uc_pmu.c | 45 +- + drivers/perf/marvell_cn10k_ddr_pmu.c | 528 ++++++++++++++++++--- + drivers/perf/marvell_cn10k_tad_pmu.c | 66 ++- + 21 files changed, 1007 insertions(+), 498 deletions(-) + create mode 100644 Documentation/admin-guide/perf/mrvl-odyssey-ddr-pmu.rst + create mode 100644 Documentation/admin-guide/perf/mrvl-odyssey-tad-pmu.rst +Merging arm-soc/for-next (6c2bb9f225bc Merge branch 'soc/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/blaize.yaml | 40 ++++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 9 + + arch/arm/boot/dts/nuvoton/nuvoton-npcm730-gbs.dts | 6 +- + .../dts/nuvoton/nuvoton-npcm750-runbmc-olympus.dts | 2 +- + arch/arm64/Kconfig.platforms | 5 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/blaize/Makefile | 2 + + arch/arm64/boot/dts/blaize/blaize-blzp1600-cb2.dts | 83 +++++++++ + .../arm64/boot/dts/blaize/blaize-blzp1600-som.dtsi | 23 +++ + arch/arm64/boot/dts/blaize/blaize-blzp1600.dtsi | 205 +++++++++++++++++++++ + arch/arm64/configs/defconfig | 2 + + 12 files changed, 376 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/blaize.yaml + create mode 100644 arch/arm64/boot/dts/blaize/Makefile + create mode 100644 arch/arm64/boot/dts/blaize/blaize-blzp1600-cb2.dts + create mode 100644 arch/arm64/boot/dts/blaize/blaize-blzp1600-som.dtsi + create mode 100644 arch/arm64/boot/dts/blaize/blaize-blzp1600.dtsi +Merging amlogic/for-next (4de5110762b9 Merge branch 'v6.14/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + .../bindings/soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml | 14 ++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 3 +-- + arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p230.dts | 3 +-- + arch/arm64/boot/dts/amlogic/meson-gxl-s905d-p231.dts | 3 +-- + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 3 +-- + arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 3 +-- + arch/arm64/boot/dts/amlogic/meson-gxm-q201.dts | 3 +-- + 7 files changed, 20 insertions(+), 12 deletions(-) +Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Already up to date. +Merging aspeed/for-next (2eff056a229e ARM: dts: aspeed: Blueridge and Fuji: Fix LED node names) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 2 + + arch/arm/boot/dts/aspeed/Makefile | 2 + + .../dts/aspeed/aspeed-bmc-ampere-mtjefferson.dts | 622 ++ + .../dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts | 18 +- + .../dts/aspeed/aspeed-bmc-facebook-catalina.dts | 181 +- + .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 45 +- + .../dts/aspeed/aspeed-bmc-facebook-minerva.dts | 557 +- + .../dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 1035 +++- + .../boot/dts/aspeed/aspeed-bmc-ibm-blueridge.dts | 41 +- + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 27 + + arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts | 111 +- + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts | 12 +- + arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-sbp1.dts | 6086 ++++++++++++++++++++ + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 23 +- + arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts | 8 +- + .../arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts | 6 +- + arch/arm/boot/dts/aspeed/aspeed-bmc-vegman.dtsi | 2 +- + arch/arm/boot/dts/aspeed/aspeed-g4.dtsi | 93 +- + arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 109 +- + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 249 +- + 20 files changed, 8571 insertions(+), 658 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjefferson.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-sbp1.dts +Merging at91/at91-next (cf3011dfad42 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/atmel-at91.yaml | 7 + + .../devicetree/bindings/arm/atmel-sysregs.txt | 14 +- + .../bindings/clock/atmel,at91rm9200-pmc.yaml | 2 + + .../bindings/clock/atmel,at91sam9x5-sckc.yaml | 1 + + .../boot/dts/microchip/at91-sam9x75_curiosity.dts | 54 +- + .../boot/dts/microchip/at91-sama5d27_wlsom1_ek.dts | 1 + + .../boot/dts/microchip/at91-sama5d29_curiosity.dts | 1 + + arch/arm/boot/dts/microchip/sam9x60.dtsi | 12 + + arch/arm/boot/dts/microchip/sam9x7.dtsi | 38 + + arch/arm/boot/dts/microchip/sama7d65-pinfunc.h | 947 +++++++++++++++++++++ + arch/arm/boot/dts/microchip/sama7d65.dtsi | 145 ++++ + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/sama7_defconfig | 1 + + arch/arm/mach-at91/Kconfig | 9 + + arch/arm/mach-at91/pm.c | 31 +- + drivers/clk/at91/sckc.c | 24 +- + drivers/soc/atmel/soc.c | 2 +- + include/dt-bindings/clock/at91.h | 8 + + 18 files changed, 1267 insertions(+), 31 deletions(-) + create mode 100644 arch/arm/boot/dts/microchip/sama7d65-pinfunc.h + create mode 100644 arch/arm/boot/dts/microchip/sama7d65.dtsi +Merging broadcom/next (ed54a84051c6 Merge branch 'devicetree/next' into devicetree-arm64/next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/broadcom/Makefile | 1 + + .../arm/boot/dts/broadcom/bcm53015-meraki-mr26.dts | 20 ++ + .../dts/broadcom/bcm53340-ubnt-unifi-switch8.dts | 1 - + .../boot/dts/broadcom/bcm6846-genexis-xg6846b.dts | 244 +++++++++++++++++++++ + arch/arm/boot/dts/broadcom/bcm6846.dtsi | 120 ++++++++++ + arch/arm/boot/dts/broadcom/bcm953012hr.dts | 1 - + arch/arm/boot/dts/broadcom/bcm953012k.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958522er.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958525er.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958525xmc.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958622hr.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958623hr.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958625hr.dts | 1 - + arch/arm/boot/dts/broadcom/bcm958625k.dts | 1 - + arch/arm/boot/dts/broadcom/bcm988312hr.dts | 1 - + arch/arm64/boot/dts/broadcom/Makefile | 1 + + arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts | 37 ++++ + arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 42 ++++ + arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 193 +++++++++++++++- + arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 1 + + .../dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts | 12 +- + .../dts/broadcom/bcmbca/bcm4906-zyxel-ex3510b.dts | 196 +++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 18 +- + .../arm64/boot/dts/broadcom/northstar2/ns2-svk.dts | 2 - + .../arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts | 1 - + arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 - + 28 files changed, 876 insertions(+), 29 deletions(-) + create mode 100644 arch/arm/boot/dts/broadcom/bcm6846-genexis-xg6846b.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-zyxel-ex3510b.dts +Merging davinci/davinci/for-next (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (ef683ac22848 Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Auto-merging drivers/memory/omap-gpmc.c +Merge made by the 'ort' strategy. + drivers/memory/omap-gpmc.c | 33 ++----- + drivers/memory/ti-aemif.c | 192 ++++++++++++++++++++++++---------------- + include/linux/memory/ti-aemif.h | 32 +++++++ + include/linux/omap-gpmc.h | 4 - + 4 files changed, 155 insertions(+), 106 deletions(-) + create mode 100644 include/linux/memory/ti-aemif.h +Merging imx-mxs/for-next (4b534cfc654f Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 9 + + MAINTAINERS | 13 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi | 61 +- + arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx7d-mba7.dts | 3 +- + arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imxrt1050.dtsi | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 + + arch/arm64/boot/dts/freescale/Makefile | 13 + + arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi | 2 +- + .../freescale/imx8mp-aristainetos3-adpismarc.dts | 37 + + .../imx8mp-aristainetos3-helios-lvds.dtso | 113 ++ + .../dts/freescale/imx8mp-aristainetos3-helios.dts | 98 ++ + .../freescale/imx8mp-aristainetos3-proton2s.dts | 161 +++ + .../freescale/imx8mp-aristainetos3a-som-v1.dtsi | 1107 ++++++++++++++++++++ + .../freescale/imx8mp-evk-imx-lvds-hdmi-common.dtsi | 29 + + .../imx8mp-evk-lvds0-imx-dlvds-hdmi-channel0.dtso | 44 + + .../imx8mp-evk-lvds0-imx-lvds-hdmi-common.dtsi | 43 + + .../freescale/imx8mp-evk-lvds0-imx-lvds-hdmi.dtso | 28 + + .../imx8mp-evk-lvds1-imx-dlvds-hdmi-channel0.dtso | 44 + + .../imx8mp-evk-lvds1-imx-lvds-hdmi-common.dtsi | 43 + + .../freescale/imx8mp-evk-lvds1-imx-lvds-hdmi.dtso | 28 + + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 6 + + .../freescale/imx8mp-skov-revb-mi1010ait-1cp1.dts | 8 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 2 +- + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 - + arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts | 5 + + arch/arm64/boot/dts/freescale/imx95.dtsi | 2 +- + arch/arm64/configs/defconfig | 1 + + drivers/soc/imx/Makefile | 2 +- + drivers/soc/imx/soc-imx9.c | 128 +++ + 38 files changed, 1981 insertions(+), 76 deletions(-) + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-aristainetos3-adpismarc.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-aristainetos3-helios-lvds.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-aristainetos3-helios.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-aristainetos3-proton2s.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-aristainetos3a-som-v1.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-imx-lvds-hdmi-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-lvds0-imx-dlvds-hdmi-channel0.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-lvds0-imx-lvds-hdmi-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-lvds0-imx-lvds-hdmi.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-lvds1-imx-dlvds-hdmi-channel0.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-lvds1-imx-lvds-hdmi-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-lvds1-imx-lvds-hdmi.dtso + create mode 100644 drivers/soc/imx/soc-imx9.c +Merging mediatek/for-next (3d7fdd8e38aa arm64: dts: mediatek: mt8195: Remove suspend-breaking reset from pcie1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/mediatek.yaml | 54 + + arch/arm64/boot/dts/mediatek/Makefile | 14 + + arch/arm64/boot/dts/mediatek/mt6359.dtsi | 1 + + .../dts/mediatek/mt7986a-bananapi-bpi-r3-sata.dtso | 34 + + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 29 +- + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 25 +- + .../dts/mediatek/mt8183-kukui-jacuzzi-damu.dts | 4 + + .../dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts | 15 + + .../dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi | 15 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 9 +- + arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 4 - + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 + + .../dts/mediatek/mt8186-corsola-chinchou-sku0.dts | 18 + + .../dts/mediatek/mt8186-corsola-chinchou-sku1.dts | 35 + + .../dts/mediatek/mt8186-corsola-chinchou-sku16.dts | 29 + + .../boot/dts/mediatek/mt8186-corsola-chinchou.dtsi | 321 ++++++ + .../dts/mediatek/mt8186-corsola-starmie-sku0.dts | 31 + + .../dts/mediatek/mt8186-corsola-starmie-sku1.dts | 31 + + .../boot/dts/mediatek/mt8186-corsola-starmie.dtsi | 472 ++++++++ + arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi | 8 +- + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 8 +- + .../boot/dts/mediatek/mt8188-geralt-ciri-sku0.dts | 32 + + .../boot/dts/mediatek/mt8188-geralt-ciri-sku1.dts | 59 + + .../boot/dts/mediatek/mt8188-geralt-ciri-sku2.dts | 59 + + .../boot/dts/mediatek/mt8188-geralt-ciri-sku3.dts | 32 + + .../boot/dts/mediatek/mt8188-geralt-ciri-sku4.dts | 48 + + .../boot/dts/mediatek/mt8188-geralt-ciri-sku5.dts | 72 ++ + .../boot/dts/mediatek/mt8188-geralt-ciri-sku6.dts | 72 ++ + .../boot/dts/mediatek/mt8188-geralt-ciri-sku7.dts | 48 + + .../boot/dts/mediatek/mt8188-geralt-ciri.dtsi | 316 ++++++ + arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi | 1156 ++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8188.dtsi | 7 + + arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 3 - + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 2 - + arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 9 - + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 3 - + .../boot/dts/mediatek/mt8390-genio-700-evk.dts | 48 + + .../boot/dts/mediatek/mt8395-genio-1200-evk.dts | 2 - + .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 2 - + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 11 +- + arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 2 - + 41 files changed, 3049 insertions(+), 93 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sata.dtso + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-chinchou-sku0.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-chinchou-sku1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-chinchou-sku16.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-chinchou.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-starmie-sku0.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-starmie-sku1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-starmie.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi +Merging mvebu/for-next (5f55ff35bfaa Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (2179717e0b0c Merge branch 'omap-for-v6.14/drivers' into tmp/omap-next-20241213.091057) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mfd/syscon.yaml | 1 + + arch/arm/boot/dts/ti/omap/dra7-l4.dtsi | 2 ++ + arch/arm/boot/dts/ti/omap/omap3-gta04.dtsi | 16 ++++++++++++++-- + arch/arm/mach-omap2/powerdomain.c | 2 +- + arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 5 +++++ + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 10 ++++++++-- + drivers/input/touchscreen/tsc2007.h | 2 ++ + drivers/input/touchscreen/tsc2007_core.c | 5 ++--- + 8 files changed, 35 insertions(+), 8 deletions(-) +Merging qcom/for-next (e43857dccff0 Merge branches 'arm64-defconfig-for-6.14', 'arm64-fixes-for-6.13', 'arm64-for-6.14', 'clk-for-6.14', 'drivers-fixes-for-6.13' and 'drivers-for-6.14' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/qcom-soc.yaml | 3 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 41 + + .../devicetree/bindings/clock/qcom,qcs615-gcc.yaml | 59 + + .../bindings/clock/qcom,sc7280-lpasscorecc.yaml | 27 +- + .../devicetree/bindings/firmware/qcom,scm.yaml | 1 + + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + + arch/arm64/boot/dts/qcom/Makefile | 6 + + arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts | 59 + + arch/arm64/boot/dts/qcom/ipq5424.dtsi | 305 ++ + arch/arm64/boot/dts/qcom/qcs615-ride.dts | 242 ++ + arch/arm64/boot/dts/qcom/qcs615.dtsi | 3157 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/qcs8300-ride.dts | 235 ++ + arch/arm64/boot/dts/qcom/qcs8300.dtsi | 1405 +++++++++ + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sar2130p-qar2130p.dts | 558 ++++ + arch/arm64/boot/dts/qcom/sar2130p.dtsi | 3123 +++++++++++++++++++ + arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 1351 +++++++++ + .../dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts | 16 + + .../boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 16 + + arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 20 + + .../boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 301 +- + .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 8 + + .../boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 519 +++- + arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi | 4 + + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 8 + + arch/arm64/boot/dts/qcom/x1e80100.dtsi | 212 +- + arch/arm64/configs/defconfig | 3 + + drivers/soc/qcom/pmic_glink.c | 72 +- + include/dt-bindings/clock/qcom,qcs615-gcc.h | 211 ++ + 29 files changed, 11888 insertions(+), 79 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,qcs615-gcc.yaml + create mode 100644 arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq5424.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcs615-ride.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs615.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcs8300-ride.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs8300.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sar2130p-qar2130p.dts + create mode 100644 arch/arm64/boot/dts/qcom/sar2130p.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/x1e001de-devkit.dts + create mode 100644 include/dt-bindings/clock/qcom,qcs615-gcc.h +Merging renesas/next (9f197ec80b0a Merge branch 'renesas-dts-for-v6.14' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../bindings/clock/renesas,rzv2h-cpg.yaml | 15 +- + .../devicetree/bindings/soc/renesas/renesas.yaml | 33 +- + arch/arm/boot/dts/renesas/r7s72100.dtsi | 10 + + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm64/boot/dts/renesas/Makefile | 12 +- + .../boot/dts/renesas/r8a779a0-falcon-ethernet.dtsi | 242 +++++++++++++ + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 10 - + .../dts/renesas/r8a779g2-white-hawk-single.dts | 62 +--- + .../dts/renesas/r8a779g3-white-hawk-single.dts | 16 + + arch/arm64/boot/dts/renesas/r8a779g3.dtsi | 12 + + .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts | 298 +++++++++++++++- + arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 73 ++++ + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 237 +++++++++++++ + arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 374 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/r9a09g047e37.dtsi | 18 + + arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 18 + + arch/arm64/boot/dts/renesas/r9a09g047e57.dtsi | 13 + + arch/arm64/boot/dts/renesas/renesas-smarc2.dtsi | 24 ++ + arch/arm64/boot/dts/renesas/rzg3e-smarc-som.dtsi | 28 ++ + arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 56 ++- + arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 83 ++++- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 18 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 5 + + ...a7212.dtso => white-hawk-ard-audio-da7212.dtso} | 6 +- + arch/arm64/boot/dts/renesas/white-hawk-single.dtsi | 73 ++++ + arch/arm64/configs/defconfig | 2 + + drivers/soc/renesas/Kconfig | 5 + + include/dt-bindings/clock/renesas,r9a09g047-cpg.h | 21 ++ + 28 files changed, 1652 insertions(+), 113 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g3-white-hawk-single.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g3.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a09g047.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a09g047e37.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a09g047e57.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/renesas-smarc2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg3e-smarc-som.dtsi + rename arch/arm64/boot/dts/renesas/{r8a779g0-white-hawk-ard-audio-da7212.dtso => white-hawk-ard-audio-da7212.dtso} (96%) + create mode 100644 arch/arm64/boot/dts/renesas/white-hawk-single.dtsi + create mode 100644 include/dt-bindings/clock/renesas,r9a09g047-cpg.h +Merging reset/reset/next (3d99f9231bed reset: amlogic: add support for A1 SoC in auxiliary reset driver) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Auto-merging drivers/reset/amlogic/reset-meson-aux.c +Merge made by the 'ort' strategy. + drivers/reset/amlogic/reset-meson-aux.c | 18 +++++++++++ + .../reset/amlogic,meson-a1-audio-reset.h | 36 ++++++++++++++++++++++ + 2 files changed, 54 insertions(+) + create mode 100644 include/dt-bindings/reset/amlogic,meson-a1-audio-reset.h +Merging rockchip/for-next (67ab119bd113 Merge branch 'v6.14-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts | 25 ++++++++- + arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 61 ++++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 2 + + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 5 ++ + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 +- + 7 files changed, 96 insertions(+), 3 deletions(-) +Merging samsung-krzk/for-next (51a4b945a726 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../bindings/arm/samsung/samsung-boards.yaml | 3 + + .../bindings/clock/samsung,exynos990-clock.yaml | 121 ++ + .../bindings/soc/samsung/exynos-pmu.yaml | 1 + + MAINTAINERS | 3 + + arch/arm64/boot/dts/exynos/Makefile | 3 + + arch/arm64/boot/dts/exynos/exynos8895.dtsi | 38 +- + arch/arm64/boot/dts/exynos/exynos990-r8s.dts | 115 ++ + .../boot/dts/exynos/exynos990-x1s-common.dtsi | 98 ++ + arch/arm64/boot/dts/exynos/exynos990-x1s.dts | 28 + + arch/arm64/boot/dts/exynos/exynos990-x1slte.dts | 28 + + arch/arm64/boot/dts/exynos/exynos990.dtsi | 14 + + arch/arm64/boot/dts/exynos/exynosautov920.dtsi | 83 ++ + arch/arm64/boot/dts/exynos/google/gs101.dtsi | 5 +- + arch/arm64/configs/defconfig | 1 + + drivers/clk/samsung/Makefile | 1 + + drivers/clk/samsung/clk-exynos990.c | 1343 ++++++++++++++++++++ + drivers/clk/samsung/clk-pll.c | 14 +- + drivers/clk/samsung/clk-pll.h | 3 + + include/dt-bindings/clock/samsung,exynos990.h | 236 ++++ + 19 files changed, 2134 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos990-clock.yaml + create mode 100644 arch/arm64/boot/dts/exynos/exynos990-r8s.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos990-x1s-common.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos990-x1s.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos990-x1slte.dts + create mode 100644 drivers/clk/samsung/clk-exynos990.c + create mode 100644 include/dt-bindings/clock/samsung,exynos990.h +Merging scmi/for-linux-next (6647416db021 Merge branch 'for-next/scmi/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + drivers/firmware/arm_scmi/common.h | 4 +- + drivers/firmware/arm_scmi/driver.c | 74 ++++++++++++++++------ + drivers/firmware/arm_scmi/transports/mailbox.c | 1 + + drivers/firmware/arm_scmi/transports/smc.c | 1 + + drivers/firmware/arm_scmi/transports/virtio.c | 1 + + drivers/firmware/arm_scmi/vendors/imx/imx-sm-bbm.c | 5 +- + .../firmware/arm_scmi/vendors/imx/imx-sm-misc.c | 5 +- + include/linux/scmi_imx_protocol.h | 9 +-- + 8 files changed, 71 insertions(+), 29 deletions(-) +Merging sophgo/for-next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Already up to date. +Merging spacemit/for-next (f187e72262c3 MAINTAINERS: setup support for SpacemiT SoC tree) +$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 9 +++++++++ + 1 file changed, 9 insertions(+) +Merging stm32/stm32-next (b7ebfb84a09d arm64: dts: st: enable imx335/csi/dcmipp pipeline on stm32mp257f-ev1) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/stm32/stm32.yaml | 7 + + arch/arm/boot/dts/st/Makefile | 1 + + arch/arm/boot/dts/st/stm32mp131.dtsi | 40 +++ + arch/arm/boot/dts/st/stm32mp135f-dk.dts | 12 + + arch/arm/boot/dts/st/stm32mp13xx-dhcor-som.dtsi | 16 +- + arch/arm/boot/dts/st/stm32mp151.dtsi | 43 +++- + arch/arm/boot/dts/st/stm32mp153c-lxa-tac-gen3.dts | 267 +++++++++++++++++++++ + arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 9 + + arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen1.dts | 84 +++++++ + arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen2.dts | 84 +++++++ + arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 100 +------- + arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02.dtsi | 12 - + arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi | 10 - + .../arm/boot/dts/st/stm32mp15xx-dhcom-picoitx.dtsi | 10 - + arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi | 7 + + arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 18 ++ + arch/arm64/boot/dts/st/stm32mp251.dtsi | 234 ++++++++++++++++++ + arch/arm64/boot/dts/st/stm32mp257f-ev1.dts | 97 ++++++++ + include/linux/bus/stm32_firewall_device.h | 2 +- + 19 files changed, 923 insertions(+), 130 deletions(-) + create mode 100644 arch/arm/boot/dts/st/stm32mp153c-lxa-tac-gen3.dts +Merging sunxi/sunxi/for-next (20296f8baa25 ARM: dts: suniv: f1c100s: Activate Audio Codec for Lichee Pi Nano) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + .../dts/allwinner/suniv-f1c100s-licheepi-nano.dts | 8 ++++++++ + arch/arm/boot/dts/allwinner/suniv-f1c100s.dtsi | 24 ++++++++++++++++++++++ + 2 files changed, 32 insertions(+) +Merging tee/next (a7562ff02879 Merge branch 'optee_for_v6.14' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. + drivers/tee/optee/smc_abi.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging tegra/for-next (ca398b41b0a3 Merge branch for-6.14/arm/dt into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi | 2 ++ + 1 file changed, 2 insertions(+) +Merging thead-dt/thead-dt-for-next (c95c1362e5bc riscv: dts: thead: Add mailbox node) +$ git merge -m Merge branch 'thead-dt-for-next' of https://github.com/pdp7/linux.git thead-dt/thead-dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/thead/th1520.dtsi | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) +Merging ti/ti-next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (18b1e1ae30c7 arm64: zynqmp: add clock-output-names property in clock nodes) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) +Merging clk/clk-next (2ca8b22801f8 Merge branch 'clk-fixes' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/renesas,5p35023.yaml | 1 + + drivers/clk/clk-versaclock3.c | 67 ++++++++++++++++------ + drivers/clk/clk.c | 4 +- + drivers/clk/davinci/pll.c | 32 +---------- + drivers/clk/mediatek/clk-mt2701-aud.c | 10 ++++ + drivers/clk/mediatek/clk-mt2701-bdp.c | 1 + + drivers/clk/mediatek/clk-mt2701-img.c | 1 + + drivers/clk/mediatek/clk-mt2701-mm.c | 1 + + drivers/clk/mediatek/clk-mt2701-vdec.c | 1 + + drivers/clk/mmp/clk-pxa1908-apbc.c | 4 +- + drivers/clk/mmp/clk-pxa1908-apbcp.c | 4 +- + drivers/clk/mmp/clk-pxa1908-mpmu.c | 4 +- + include/linux/platform_data/clk-davinci-pll.h | 21 ------- + 13 files changed, 76 insertions(+), 75 deletions(-) + delete mode 100644 include/linux/platform_data/clk-davinci-pll.h +Merging clk-imx/for-next (81a206d736c1 clk: imx: imx8-acm: Fix return value check in clk_imx_acm_attach_pm_domains()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (0399362e523d clk: renesas: r9a09g047: Add I2C clocks/resets) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/Kconfig | 7 +- + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a779h0-cpg-mssr.c | 4 + + drivers/clk/renesas/r9a06g032-clocks.c | 29 +++++- + drivers/clk/renesas/r9a08g045-cpg.c | 47 +++++++++ + drivers/clk/renesas/r9a09g047-cpg.c | 148 +++++++++++++++++++++++++++ + drivers/clk/renesas/r9a09g057-cpg.c | 174 +++++++++++++++++++++++++------- + drivers/clk/renesas/renesas-cpg-mssr.c | 2 +- + drivers/clk/renesas/rzv2h-cpg.c | 149 +++++++++++++++++++++++++-- + drivers/clk/renesas/rzv2h-cpg.h | 32 +++++- + 10 files changed, 539 insertions(+), 54 deletions(-) + create mode 100644 drivers/clk/renesas/r9a09g047-cpg.c +Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Merge made by the 'ort' strategy. + arch/csky/mm/fault.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging loongarch/loongarch-next (7f71507851fc LoongArch: KVM: Protect kvm_io_bus_{read,write}() with SRCU) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (e419ddeabe7e m68k: Use kernel's generic muldi3 libgcc function) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'ort' strategy. + arch/Kconfig | 8 ++++ + arch/m68k/Kconfig | 2 + + arch/m68k/include/asm/libgcc.h | 20 +++++++++ + arch/m68k/lib/Makefile | 2 +- + arch/m68k/lib/muldi3.c | 97 ------------------------------------------ + include/linux/libgcc.h | 4 ++ + 6 files changed, 35 insertions(+), 98 deletions(-) + create mode 100644 arch/m68k/include/asm/libgcc.h + delete mode 100644 arch/m68k/lib/muldi3.c +Merging m68knommu/for-next (f70638ebe076 m68k: coldfire: Use proper clock rate for timers) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/coldfire/m5441x.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) +Merging microblaze/next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (c8f8d4344d50 openrisc: Fix misalignments in head.S) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (df195d931a33 parisc: Remove memcpy_toio and memset_io) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/include/asm/io.h | 4 ---- + arch/parisc/kernel/parisc_ksyms.c | 2 -- + arch/parisc/lib/io.c | 47 --------------------------------------- + 3 files changed, 53 deletions(-) +Merging powerpc/next (3a7a53c8d481 selftests/powerpc: Fix typo in test-vphn.c) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Merge made by the 'ort' strategy. + arch/powerpc/include/asm/time.h | 2 +- + arch/powerpc/kernel/misc_32.S | 26 ------------------------ + arch/powerpc/xmon/xmon.c | 6 +++--- + tools/testing/selftests/powerpc/vphn/test-vphn.c | 2 +- + 4 files changed, 5 insertions(+), 31 deletions(-) +Merging risc-v/for-next (fac04efc5c79 Linux 6.13-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging riscv-dt/riscv-dt-for-next (708d55db3edb riscv: dts: starfive: jh7110-milkv-mars: enable usb0 host function) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts | 18 +++++++++++++++++- + arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts | 18 +++++++++++++++++- + 2 files changed, 34 insertions(+), 2 deletions(-) +Merging riscv-soc/riscv-soc-for-next (a5362510bafc Merge branch 'riscv-config-for-next' into riscv-soc-for-next) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Merge made by the 'ort' strategy. + arch/riscv/configs/defconfig | 2 ++ + 1 file changed, 2 insertions(+) +Merging s390/for-next (5c06b9849b20 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/Kconfig +Merge made by the 'ort' strategy. + arch/s390/Kconfig | 28 +---- + arch/s390/Makefile | 9 -- + arch/s390/boot/boot.h | 1 - + arch/s390/boot/startup.c | 13 +- + arch/s390/boot/vmem.c | 20 +-- + arch/s390/configs/kasan.config | 2 +- + arch/s390/include/asm/abs_lowcore.h | 4 +- + arch/s390/include/asm/atomic.h | 68 +++++++++- + arch/s390/include/asm/atomic_ops.h | 121 ++++++++++++++---- + arch/s390/include/asm/checksum.h | 2 +- + arch/s390/include/asm/debug.h | 7 ++ + arch/s390/include/asm/diag.h | 1 + + arch/s390/include/asm/fpu-insn.h | 14 +-- + arch/s390/include/asm/hugetlb.h | 23 ++-- + arch/s390/include/asm/page-states.h | 3 +- + arch/s390/include/asm/pgtable.h | 126 ++++++++++--------- + arch/s390/include/asm/preempt.h | 83 +++++-------- + arch/s390/include/asm/sclp.h | 34 +++++ + arch/s390/include/uapi/asm/diag.h | 24 ++++ + arch/s390/kernel/Makefile | 3 +- + arch/s390/kernel/abs_lowcore.c | 1 + + arch/s390/kernel/debug.c | 241 +++++++++++++++++++++++++++++------- + arch/s390/kernel/diag/Makefile | 1 + + arch/s390/kernel/{ => diag}/diag.c | 3 +- + arch/s390/kernel/diag/diag324.c | 224 +++++++++++++++++++++++++++++++++ + arch/s390/kernel/diag/diag_ioctl.h | 10 ++ + arch/s390/kernel/diag/diag_misc.c | 54 ++++++++ + arch/s390/kernel/entry.S | 20 +-- + arch/s390/kernel/os_info.c | 1 + + arch/s390/kernel/setup.c | 33 ++--- + arch/s390/kernel/vdso64/Makefile | 2 +- + arch/s390/kernel/vmcore_info.c | 3 +- + arch/s390/lib/mem.S | 15 +-- + arch/s390/mm/init.c | 9 ++ + arch/s390/mm/maccess.c | 1 + + arch/s390/mm/mmap.c | 42 ++++--- + arch/s390/mm/pageattr.c | 6 - + arch/s390/mm/pgtable.c | 2 - + arch/s390/mm/vmem.c | 8 -- + arch/s390/pci/Makefile | 2 +- + arch/s390/pci/pci_event.c | 21 +++- + arch/s390/pci/pci_report.c | 158 +++++++++++++++++++++++ + arch/s390/pci/pci_report.h | 16 +++ + drivers/s390/char/sclp.h | 18 +-- + drivers/s390/char/sclp_early.c | 2 + + drivers/s390/char/sclp_pci.c | 19 --- + 46 files changed, 1101 insertions(+), 397 deletions(-) + create mode 100644 arch/s390/include/uapi/asm/diag.h + create mode 100644 arch/s390/kernel/diag/Makefile + rename arch/s390/kernel/{ => diag}/diag.c (98%) + create mode 100644 arch/s390/kernel/diag/diag324.c + create mode 100644 arch/s390/kernel/diag/diag_ioctl.h + create mode 100644 arch/s390/kernel/diag/diag_misc.c + create mode 100644 arch/s390/pci/pci_report.c + create mode 100644 arch/s390/pci/pci_report.h +Merging sh/for-next (63e72e551942 sh: intc: Fix use-after-free bug in register_intc_controller()) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (b6370b338e71 sparc/vdso: Add helper function for 64-bit right shift on 32-bit target) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (bed2cc482600 hostfs: Fix the NULL vs IS_ERR() bug for __filemap_get_folio()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (d14b9a713b34 xtensa/simdisk: Use str_write_read() helper in simdisk_transfer()) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Auto-merging arch/xtensa/kernel/setup.c +Merge made by the 'ort' strategy. + arch/xtensa/include/asm/processor.h | 4 +--- + arch/xtensa/kernel/setup.c | 2 +- + arch/xtensa/platforms/iss/simdisk.c | 3 ++- + 3 files changed, 4 insertions(+), 5 deletions(-) +Merging fs-next (798a556a8e89 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging MAINTAINERS +Auto-merging fs/bcachefs/util.h +Auto-merging fs/exec.c +Auto-merging fs/fuse/file.c +Auto-merging include/linux/min_heap.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/seqlock.h +Auto-merging kernel/fork.c +Auto-merging lib/kunit_iov_iter.c +Auto-merging mm/filemap.c +Auto-merging mm/memory.c +Auto-merging mm/readahead.c +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + Documentation/filesystems/bcachefs/CodingStyle.rst | 2 +- + Documentation/filesystems/fiemap.rst | 45 +- + Documentation/security/credentials.rst | 5 - + MAINTAINERS | 7 + + drivers/crypto/ccp/sev-dev.c | 2 +- + fs/9p/vfs_addr.c | 8 +- + fs/afs/Makefile | 1 + + fs/afs/callback.c | 4 +- + fs/afs/dir.c | 836 ++++++++-------- + fs/afs/dir_edit.c | 385 +++++--- + fs/afs/dir_search.c | 227 +++++ + fs/afs/file.c | 258 ++--- + fs/afs/fs_operation.c | 113 ++- + fs/afs/fsclient.c | 62 +- + fs/afs/inode.c | 140 ++- + fs/afs/internal.h | 143 ++- + fs/afs/main.c | 2 +- + fs/afs/mntpt.c | 22 +- + fs/afs/rotate.c | 4 +- + fs/afs/rxrpc.c | 37 +- + fs/afs/super.c | 4 +- + fs/afs/validation.c | 31 +- + fs/afs/vlclient.c | 1 + + fs/afs/write.c | 16 +- + fs/afs/xdr_fs.h | 2 +- + fs/afs/yfsclient.c | 49 +- + fs/backing-file.c | 20 +- + fs/bcachefs/Kconfig | 2 +- + fs/bcachefs/Makefile | 1 + + fs/bcachefs/acl.c | 11 +- + fs/bcachefs/alloc_background.c | 557 +++++------ + fs/bcachefs/alloc_background.h | 18 +- + fs/bcachefs/alloc_background_format.h | 4 +- + fs/bcachefs/alloc_foreground.c | 304 +++--- + fs/bcachefs/alloc_foreground.h | 4 +- + fs/bcachefs/backpointers.c | 840 +++++++++------- + fs/bcachefs/backpointers.h | 97 +- + fs/bcachefs/bbpos.h | 2 +- + fs/bcachefs/bcachefs.h | 70 +- + fs/bcachefs/bcachefs_format.h | 57 +- + fs/bcachefs/bkey.h | 7 - + fs/bcachefs/bkey_methods.c | 29 +- + fs/bcachefs/bkey_methods.h | 15 +- + fs/bcachefs/bkey_types.h | 28 + + fs/bcachefs/btree_cache.c | 51 +- + fs/bcachefs/btree_cache.h | 12 +- + fs/bcachefs/btree_gc.c | 167 +--- + fs/bcachefs/btree_io.c | 185 ++-- + fs/bcachefs/btree_iter.c | 591 +++++++----- + fs/bcachefs/btree_iter.h | 133 ++- + fs/bcachefs/btree_journal_iter.c | 237 ++++- + fs/bcachefs/btree_journal_iter.h | 22 +- + fs/bcachefs/btree_journal_iter_types.h | 36 + + fs/bcachefs/btree_key_cache.c | 57 +- + fs/bcachefs/btree_locking.c | 2 +- + fs/bcachefs/btree_locking.h | 6 +- + fs/bcachefs/btree_node_scan.c | 153 ++- + fs/bcachefs/btree_node_scan_types.h | 1 - + fs/bcachefs/btree_trans_commit.c | 205 ++-- + fs/bcachefs/btree_types.h | 3 + + fs/bcachefs/btree_update.c | 74 +- + fs/bcachefs/btree_update.h | 29 +- + fs/bcachefs/btree_update_interior.c | 262 ++--- + fs/bcachefs/btree_update_interior.h | 3 +- + fs/bcachefs/btree_write_buffer.c | 81 +- + fs/bcachefs/buckets.c | 131 +-- + fs/bcachefs/buckets.h | 30 +- + fs/bcachefs/buckets_types.h | 2 +- + fs/bcachefs/chardev.c | 219 +---- + fs/bcachefs/checksum.c | 10 +- + fs/bcachefs/checksum.h | 2 +- + fs/bcachefs/compress.c | 96 +- + fs/bcachefs/darray.h | 2 +- + fs/bcachefs/data_update.c | 76 +- + fs/bcachefs/debug.c | 4 +- + fs/bcachefs/dirent.c | 10 +- + fs/bcachefs/dirent.h | 4 +- + fs/bcachefs/disk_accounting.c | 150 +-- + fs/bcachefs/disk_accounting.h | 73 +- + fs/bcachefs/ec.c | 275 +++--- + fs/bcachefs/ec.h | 5 +- + fs/bcachefs/errcode.h | 20 +- + fs/bcachefs/error.c | 187 ++-- + fs/bcachefs/error.h | 58 +- + fs/bcachefs/extent_update.c | 4 +- + fs/bcachefs/extents.c | 290 ++---- + fs/bcachefs/extents.h | 18 +- + fs/bcachefs/extents_format.h | 15 +- + fs/bcachefs/fs-common.c | 98 +- + fs/bcachefs/fs-common.h | 2 + + fs/bcachefs/fs-io-buffered.c | 45 +- + fs/bcachefs/fs-io-direct.c | 5 + + fs/bcachefs/fs-io-pagecache.c | 4 +- + fs/bcachefs/fs-io.c | 54 +- + fs/bcachefs/fs-ioctl.c | 7 +- + fs/bcachefs/fs.c | 88 +- + fs/bcachefs/fs.h | 1 + + fs/bcachefs/fsck.c | 645 +++++++------ + fs/bcachefs/fsck.h | 11 + + fs/bcachefs/inode.c | 169 ++-- + fs/bcachefs/inode.h | 43 +- + fs/bcachefs/inode_format.h | 15 +- + fs/bcachefs/io_misc.c | 22 +- + fs/bcachefs/io_read.c | 246 +++-- + fs/bcachefs/io_read.h | 28 +- + fs/bcachefs/io_write.c | 102 +- + fs/bcachefs/journal.c | 162 +++- + fs/bcachefs/journal.h | 9 +- + fs/bcachefs/journal_io.c | 231 +++-- + fs/bcachefs/journal_io.h | 2 +- + fs/bcachefs/journal_reclaim.c | 19 +- + fs/bcachefs/journal_types.h | 5 + + fs/bcachefs/logged_ops.c | 11 +- + fs/bcachefs/logged_ops_format.h | 5 + + fs/bcachefs/lru.c | 4 +- + fs/bcachefs/lru.h | 2 +- + fs/bcachefs/move.c | 184 ++-- + fs/bcachefs/move.h | 5 +- + fs/bcachefs/movinggc.c | 6 +- + fs/bcachefs/opts.c | 26 +- + fs/bcachefs/opts.h | 61 +- + fs/bcachefs/quota.c | 2 +- + fs/bcachefs/quota.h | 4 +- + fs/bcachefs/rcu_pending.c | 38 +- + fs/bcachefs/rebalance.c | 266 ++++- + fs/bcachefs/rebalance.h | 10 + + fs/bcachefs/rebalance_format.h | 53 + + fs/bcachefs/rebalance_types.h | 2 - + fs/bcachefs/recovery.c | 218 +++-- + fs/bcachefs/recovery.h | 2 +- + fs/bcachefs/recovery_passes.c | 108 ++- + fs/bcachefs/recovery_passes.h | 1 + + fs/bcachefs/recovery_passes_types.h | 92 +- + fs/bcachefs/reflink.c | 498 +++++++--- + fs/bcachefs/reflink.h | 20 +- + fs/bcachefs/reflink_format.h | 7 +- + fs/bcachefs/sb-clean.c | 6 +- + fs/bcachefs/sb-counters_format.h | 165 ++-- + fs/bcachefs/sb-downgrade.c | 25 +- + fs/bcachefs/sb-errors_format.h | 52 +- + fs/bcachefs/snapshot.c | 506 +++++----- + fs/bcachefs/snapshot.h | 17 +- + fs/bcachefs/str_hash.c | 286 ++++++ + fs/bcachefs/str_hash.h | 28 +- + fs/bcachefs/subvolume.c | 18 +- + fs/bcachefs/subvolume.h | 19 +- + fs/bcachefs/subvolume_types.h | 2 +- + fs/bcachefs/super-io.c | 72 +- + fs/bcachefs/super-io.h | 21 +- + fs/bcachefs/super.c | 48 +- + fs/bcachefs/super.h | 10 - + fs/bcachefs/sysfs.c | 60 +- + fs/bcachefs/tests.c | 26 +- + fs/bcachefs/trace.h | 77 +- + fs/bcachefs/util.h | 22 + + fs/bcachefs/varint.c | 5 +- + fs/bcachefs/xattr.c | 13 +- + fs/bcachefs/xattr.h | 5 +- + fs/binfmt_elf.c | 4 +- + fs/binfmt_elf_fdpic.c | 4 +- + fs/btrfs/Kconfig | 1 + + fs/btrfs/Makefile | 2 +- + fs/btrfs/backref.c | 93 +- + fs/btrfs/backref.h | 16 +- + fs/btrfs/bio.c | 3 +- + fs/btrfs/block-group.c | 16 +- + fs/btrfs/block-rsv.c | 10 +- + fs/btrfs/btrfs_inode.h | 2 +- + fs/btrfs/ctree.c | 78 +- + fs/btrfs/ctree.h | 29 - + fs/btrfs/delalloc-space.c | 2 +- + fs/btrfs/delayed-ref.c | 44 +- + fs/btrfs/delayed-ref.h | 1 + + fs/btrfs/direct-io.c | 3 +- + fs/btrfs/disk-io.c | 22 +- + fs/btrfs/disk-io.h | 2 +- + fs/btrfs/extent-tree.c | 201 ++-- + fs/btrfs/extent-tree.h | 7 +- + fs/btrfs/extent_io.c | 81 +- + fs/btrfs/file.c | 95 +- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/fs.c | 130 +++ + fs/btrfs/fs.h | 27 + + fs/btrfs/inode.c | 358 ++++--- + fs/btrfs/ioctl.c | 107 +-- + fs/btrfs/ioctl.h | 1 - + fs/btrfs/locking.h | 5 + + fs/btrfs/misc.h | 28 + + fs/btrfs/ordered-data.c | 63 +- + fs/btrfs/ordered-data.h | 9 + + fs/btrfs/qgroup.c | 24 +- + fs/btrfs/raid-stripe-tree.c | 4 - + fs/btrfs/relocation.c | 366 +++---- + fs/btrfs/scrub.c | 142 +-- + fs/btrfs/send.c | 9 +- + fs/btrfs/space-info.c | 69 +- + fs/btrfs/space-info.h | 15 +- + fs/btrfs/subpage.c | 48 +- + fs/btrfs/super.c | 22 +- + fs/btrfs/sysfs.c | 173 +++- + fs/btrfs/sysfs.h | 5 + + fs/btrfs/tests/btrfs-tests.c | 18 + + fs/btrfs/tests/btrfs-tests.h | 6 + + fs/btrfs/tests/delayed-refs-tests.c | 1015 ++++++++++++++++++++ + fs/btrfs/transaction.c | 3 +- + fs/btrfs/transaction.h | 18 +- + fs/btrfs/tree-checker.c | 99 ++ + fs/btrfs/tree-checker.h | 3 + + fs/btrfs/volumes.c | 182 ++-- + fs/btrfs/volumes.h | 17 + + fs/btrfs/zoned.c | 154 ++- + fs/btrfs/zoned.h | 7 + + fs/cachefiles/io.c | 4 + + fs/cachefiles/xattr.c | 9 +- + fs/ceph/addr.c | 13 +- + fs/ceph/file.c | 77 +- + fs/ceph/mds_client.c | 9 +- + fs/ceph/super.c | 2 + + fs/dlm/config.c | 2 +- + fs/dlm/lock.c | 46 +- + fs/dlm/lowcomms.c | 3 +- + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 1 - + fs/ecryptfs/keystore.c | 4 +- + fs/exec.c | 8 +- + fs/exfat/dir.c | 3 +- + fs/exfat/fatent.c | 2 + + fs/exfat/file.c | 6 + + fs/exfat/namei.c | 4 +- + fs/ext4/file.c | 3 + + fs/ext4/inode.c | 3 +- + fs/ext4/namei.c | 4 +- + fs/ext4/super.c | 3 + + fs/f2fs/compress.c | 28 +- + fs/f2fs/data.c | 55 +- + fs/f2fs/f2fs.h | 7 +- + fs/f2fs/gc.c | 11 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/node.c | 1 + + fs/fcntl.c | 4 +- + fs/fhandle.c | 115 ++- + fs/file.c | 22 +- + fs/file_table.c | 7 +- + fs/fs_context.c | 2 +- + fs/fs_parser.c | 3 +- + fs/fuse/file.c | 31 +- + fs/gfs2/quota.h | 4 +- + fs/isofs/compress.c | 12 +- + fs/libfs.c | 159 +-- + fs/mount.h | 46 +- + fs/namei.c | 34 +- + fs/namespace.c | 214 +++-- + fs/netfs/Makefile | 5 +- + fs/netfs/buffered_read.c | 266 ++--- + fs/netfs/direct_read.c | 80 +- + fs/netfs/direct_write.c | 10 +- + fs/netfs/internal.h | 36 +- + fs/netfs/main.c | 6 +- + fs/netfs/misc.c | 155 ++- + fs/netfs/objects.c | 21 +- + fs/netfs/read_collect.c | 708 ++++++++------ + fs/netfs/read_pgpriv2.c | 35 +- + fs/netfs/read_retry.c | 211 ++-- + fs/netfs/read_single.c | 195 ++++ + fs/netfs/rolling_buffer.c | 225 +++++ + fs/netfs/stats.c | 4 +- + fs/netfs/write_collect.c | 278 +----- + fs/netfs/write_issue.c | 239 ++++- + fs/netfs/write_retry.c | 233 +++++ + fs/nfs/fscache.c | 6 +- + fs/nfs/fscache.h | 3 +- + fs/nfs/pnfs.c | 2 +- + fs/nfs/super.c | 1 + + fs/nfsd/auth.c | 3 +- + fs/nfsd/filecache.c | 2 +- + fs/nfsd/nfs4recover.c | 3 +- + fs/nfsd/nfsfh.c | 1 - + fs/notify/fanotify/fanotify.c | 31 +- + fs/notify/fanotify/fanotify.h | 15 + + fs/notify/fanotify/fanotify_user.c | 150 ++- + fs/notify/fsnotify.c | 83 +- + fs/notify/inotify/inotify_fsnotify.c | 2 +- + fs/nsfs.c | 5 +- + fs/ntfs3/frecord.c | 3 +- + fs/open.c | 73 +- + fs/overlayfs/dir.c | 4 +- + fs/overlayfs/namei.c | 2 - + fs/overlayfs/util.c | 4 +- + fs/pidfs.c | 296 +++++- + fs/pnode.c | 8 +- + fs/proc/kcore.c | 81 +- + fs/proc/namespaces.c | 2 +- + fs/smb/client/Kconfig | 1 - + fs/smb/client/cifsfs.c | 2 +- + fs/smb/client/cifssmb.c | 12 +- + fs/smb/client/connect.c | 36 +- + fs/smb/client/file.c | 9 +- + fs/smb/client/smb2ops.c | 2 +- + fs/smb/client/smb2pdu.c | 19 +- + fs/smb/server/smb_common.c | 10 +- + fs/xfs/xfs_file.c | 13 + + fs/xfs/xfs_super.c | 2 +- + include/linux/cred.h | 43 +- + include/linux/exportfs.h | 20 + + include/linux/fanotify.h | 18 +- + include/linux/fiemap.h | 16 +- + include/linux/folio_queue.h | 12 +- + include/linux/fs.h | 88 +- + include/linux/fs_parser.h | 2 + + include/linux/fsnotify.h | 78 +- + include/linux/fsnotify_backend.h | 53 +- + include/linux/min_heap.h | 4 +- + include/linux/mm.h | 1 + + include/linux/mount.h | 5 +- + include/linux/netfs.h | 55 +- + include/linux/pid.h | 5 +- + include/linux/pid_namespace.h | 10 +- + include/linux/pidfs.h | 2 + + include/linux/pseudo_fs.h | 1 + + include/linux/rculist.h | 44 + + include/linux/rolling_buffer.h | 61 ++ + include/linux/seqlock.h | 2 +- + include/trace/events/afs.h | 210 +++- + include/trace/events/btrfs.h | 3 +- + include/trace/events/cachefiles.h | 13 +- + include/trace/events/f2fs.h | 39 +- + include/trace/events/netfs.h | 96 +- + include/uapi/asm-generic/fcntl.h | 1 - + include/uapi/linux/fanotify.h | 18 + + include/uapi/linux/fiemap.h | 47 +- + kernel/cred.c | 50 - + kernel/fork.c | 12 +- + kernel/gen_kheaders.sh | 1 + + kernel/pid.c | 139 ++- + kernel/pid_namespace.c | 43 +- + kernel/sysctl.c | 9 - + kernel/trace/pid_list.c | 2 +- + kernel/trace/trace.h | 2 - + kernel/trace/trace_sched_switch.c | 2 +- + kernel/watch_queue.c | 4 +- + lib/kunit_iov_iter.c | 4 +- + mm/filemap.c | 86 ++ + mm/memory.c | 19 + + mm/nommu.c | 7 + + mm/readahead.c | 14 + + mm/shmem.c | 10 +- + net/ceph/osd_client.c | 2 + + samples/vfs/.gitignore | 2 + + samples/vfs/Makefile | 2 +- + samples/vfs/mountinfo.c | 273 ++++++ + samples/vfs/test-list-all-mounts.c | 235 +++++ + security/apparmor/apparmorfs.c | 2 +- + security/selinux/hooks.c | 3 +- + .../selftests/{ => filesystems}/nsfs/.gitignore | 1 + + .../selftests/{ => filesystems}/nsfs/Makefile | 4 +- + .../selftests/{ => filesystems}/nsfs/config | 0 + .../selftests/filesystems/nsfs/iterate_mntns.c | 149 +++ + .../selftests/{ => filesystems}/nsfs/owner.c | 0 + .../selftests/{ => filesystems}/nsfs/pidns.c | 0 + .../selftests/filesystems/statmount/Makefile | 2 +- + .../filesystems/statmount/listmount_test.c | 66 ++ + tools/testing/selftests/pid_namespace/.gitignore | 1 + + tools/testing/selftests/pid_namespace/Makefile | 2 +- + tools/testing/selftests/pid_namespace/pid_max.c | 358 +++++++ + tools/testing/selftests/pidfd/.gitignore | 1 + + tools/testing/selftests/pidfd/Makefile | 3 +- + tools/testing/selftests/pidfd/pidfd.h | 40 +- + .../selftests/pidfd/pidfd_file_handle_test.c | 503 ++++++++++ + tools/testing/selftests/pidfd/pidfd_setns_test.c | 47 +- + tools/testing/selftests/pidfd/pidfd_wait.c | 47 +- + 370 files changed, 16638 insertions(+), 8443 deletions(-) + create mode 100644 fs/afs/dir_search.c + create mode 100644 fs/bcachefs/btree_journal_iter_types.h + create mode 100644 fs/bcachefs/rebalance_format.h + create mode 100644 fs/bcachefs/str_hash.c + create mode 100644 fs/btrfs/tests/delayed-refs-tests.c + create mode 100644 fs/netfs/read_single.c + create mode 100644 fs/netfs/rolling_buffer.c + create mode 100644 fs/netfs/write_retry.c + create mode 100644 include/linux/rolling_buffer.h + create mode 100644 samples/vfs/mountinfo.c + create mode 100644 samples/vfs/test-list-all-mounts.c + rename tools/testing/selftests/{ => filesystems}/nsfs/.gitignore (78%) + rename tools/testing/selftests/{ => filesystems}/nsfs/Makefile (50%) + rename tools/testing/selftests/{ => filesystems}/nsfs/config (100%) + create mode 100644 tools/testing/selftests/filesystems/nsfs/iterate_mntns.c + rename tools/testing/selftests/{ => filesystems}/nsfs/owner.c (100%) + rename tools/testing/selftests/{ => filesystems}/nsfs/pidns.c (100%) + create mode 100644 tools/testing/selftests/filesystems/statmount/listmount_test.c + create mode 100644 tools/testing/selftests/pid_namespace/pid_max.c + create mode 100644 tools/testing/selftests/pidfd/pidfd_file_handle_test.c +Merging printk/for-next (9022df7f5e05 Merge branch 'for-6.14-cpu_sync-fixup' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. + kernel/printk/internal.h | 6 ++++++ + kernel/printk/printk.c | 7 ++++++- + kernel/printk/printk_safe.c | 16 ++++++---------- + 3 files changed, 18 insertions(+), 11 deletions(-) +Merging pci/next (9e1b45d7a5bc Merge branch 'controller/xilinx-cpm') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging drivers/clk/clk-en7523.c +Auto-merging drivers/pci/msi/msi.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/pci/xilinx-versal-cpm.yaml | 1 + + drivers/ata/ahci.c | 2 +- + drivers/ata/ata_piix.c | 2 +- + drivers/ata/pata_rdc.c | 2 +- + drivers/ata/sata_sil24.c | 2 +- + drivers/ata/sata_sis.c | 2 +- + drivers/ata/sata_uli.c | 2 +- + drivers/ata/sata_vsc.c | 2 +- + drivers/clk/clk-en7523.c | 1 - + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 4 +- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 2 +- + drivers/misc/cardreader/rtsx_pcr.c | 2 +- + drivers/misc/pci_endpoint_test.c | 107 ++++++++++++++++++ + drivers/misc/tifm_7xx1.c | 6 +- + drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 2 +- + drivers/ntb/hw/amd/ntb_hw_amd.c | 4 +- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/pci/controller/dwc/pcie-artpec6.c | 13 +++ + drivers/pci/controller/dwc/pcie-designware-ep.c | 54 ++++++--- + drivers/pci/controller/dwc/pcie-designware.c | 5 +- + drivers/pci/controller/dwc/pcie-designware.h | 2 +- + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 62 +++++++++- + drivers/pci/controller/pcie-mediatek-gen3.c | 125 ++++++++++++++------- + drivers/pci/controller/pcie-rockchip-ep.c | 4 + + drivers/pci/controller/pcie-xilinx-cpm.c | 50 +++++++-- + drivers/pci/devres.c | 40 ++----- + drivers/pci/endpoint/functions/pci-epf-test.c | 19 ++++ + drivers/pci/endpoint/pci-epc-core.c | 37 +++--- + drivers/pci/endpoint/pci-epf-core.c | 1 + + drivers/pci/hotplug/acpiphp_ibm.c | 6 +- + drivers/pci/msi/api.c | 2 +- + drivers/pci/msi/msi.c | 2 +- + drivers/pci/p2pdma.c | 6 +- + drivers/pci/pci-sysfs.c | 42 +++---- + drivers/pci/pci.c | 99 ++++++++++------ + drivers/pci/pcie/aspm.c | 35 +++++- + drivers/pci/vpd.c | 14 +-- + drivers/vfio/pci/vfio_pci_core.c | 2 +- + drivers/vfio/pci/vfio_pci_intrs.c | 10 +- + drivers/xen/xen-pciback/conf_space_header.c | 2 +- + include/linux/pci-epf.h | 4 +- + include/linux/pci.h | 2 + + include/uapi/linux/pci_regs.h | 2 +- + include/uapi/linux/pcitest.h | 1 + + tools/pci/pcitest.c | 16 ++- + tools/pci/pcitest.sh | 1 + + 46 files changed, 572 insertions(+), 231 deletions(-) +Merging pstore/for-next/pstore (9852d85ec9d4 Linux 6.12-rc1) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (2f18ba6583d1 Merge branch 'for-6.13/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. + drivers/hid/hid-core.c | 27 +++++++----------- + drivers/hid/hid-ids.h | 3 +- + drivers/hid/hid-multitouch.c | 6 +--- + drivers/hid/hid-roccat-arvo.c | 20 +++++++------- + drivers/hid/hid-roccat-common.h | 22 +++++++-------- + drivers/hid/hid-roccat-isku.c | 22 +++++++-------- + drivers/hid/hid-roccat-kone.c | 22 +++++++-------- + drivers/hid/hid-roccat-koneplus.c | 42 ++++++++++++++-------------- + drivers/hid/hid-roccat-konepure.c | 4 +-- + drivers/hid/hid-roccat-kovaplus.c | 38 +++++++++++++------------- + drivers/hid/hid-roccat-lua.c | 10 +++---- + drivers/hid/hid-roccat-pyra.c | 50 +++++++++++++++++----------------- + drivers/hid/hid-roccat-ryos.c | 4 +-- + drivers/hid/hid-roccat-savu.c | 4 +-- + drivers/hid/i2c-hid/i2c-hid-core.c | 12 +++++++- + drivers/hid/wacom_sys.c | 24 ++++++++-------- + tools/testing/selftests/hid/.gitignore | 1 + + 17 files changed, 157 insertions(+), 154 deletions(-) +Merging i2c/i2c/for-next (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Already up to date. +Merging i2c-host/i2c/i2c-host (ee5da79b4f2a i2c: imx: make controller available until system suspend_noirq() and from resume_noirq()) +$ git merge -m Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host +Auto-merging drivers/i2c/busses/i2c-imx.c +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-imx.c | 62 ++++++++++++++++++++++++++++++++++++++----- + drivers/i2c/busses/i2c-keba.c | 8 ++---- + 2 files changed, 57 insertions(+), 13 deletions(-) +Merging i3c/i3c/next (6cf7b65f7029 i3c: Use i3cdev->desc->info instead of calling i3c_device_get_info() to avoid deadlock) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (de076198d1e4 hwmon: (pmbus/crps) Add Intel CRPS185 power supply) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/hwmon/lm75.yaml | 1 + + .../devicetree/bindings/trivial-devices.yaml | 2 + + Documentation/hwmon/asus_ec_sensors.rst | 1 + + Documentation/hwmon/crps.rst | 97 +++++ + Documentation/hwmon/index.rst | 2 + + Documentation/hwmon/isl28022.rst | 3 +- + Documentation/hwmon/lm75.rst | 8 +- + Documentation/hwmon/nct6683.rst | 23 +- + Documentation/hwmon/pmbus-core.rst | 35 ++ + Documentation/hwmon/tps25990.rst | 147 +++++++ + MAINTAINERS | 11 +- + drivers/hwmon/asus-ec-sensors.c | 13 + + drivers/hwmon/chipcap2.c | 63 +-- + drivers/hwmon/hwmon.c | 21 +- + drivers/hwmon/isl28022.c | 11 +- + drivers/hwmon/lm75.c | 13 + + drivers/hwmon/nct6683.c | 3 + + drivers/hwmon/nct6775-core.c | 6 +- + drivers/hwmon/occ/p9_sbe.c | 4 +- + drivers/hwmon/pmbus/Kconfig | 26 ++ + drivers/hwmon/pmbus/Makefile | 2 + + drivers/hwmon/pmbus/crps.c | 74 ++++ + drivers/hwmon/pmbus/pmbus.h | 4 + + drivers/hwmon/pmbus/pmbus_core.c | 94 ++++- + drivers/hwmon/pmbus/tps25990.c | 436 +++++++++++++++++++++ + drivers/hwmon/raspberrypi-hwmon.c | 22 ++ + drivers/hwmon/tmp108.c | 13 +- + include/linux/pmbus.h | 14 + + include/linux/thermal.h | 4 + + 29 files changed, 1052 insertions(+), 101 deletions(-) + create mode 100644 Documentation/hwmon/crps.rst + create mode 100644 Documentation/hwmon/tps25990.rst + create mode 100644 drivers/hwmon/pmbus/crps.c + create mode 100644 drivers/hwmon/pmbus/tps25990.c +Merging jc_docs/docs-next (a3828074b04a Merge branch 'docs-mw' into docs-next) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging MAINTAINERS +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/accounting/taskstats-struct.rst | 2 +- + Documentation/admin-guide/README.rst | 4 +- + Documentation/admin-guide/blockdev/zram.rst | 6 +- + Documentation/admin-guide/braille-console.rst | 4 +- + Documentation/admin-guide/index.rst | 190 ++++++--- + Documentation/admin-guide/nvme-multipath.rst | 72 ++++ + Documentation/admin-guide/sysctl/fs.rst | 2 +- + Documentation/admin-guide/sysrq.rst | 20 +- + Documentation/arch/x86/boot.rst | 369 ++++++++-------- + Documentation/core-api/index.rst | 1 + + Documentation/core-api/kref.rst | 7 +- + Documentation/core-api/parser.rst | 17 + + Documentation/dev-tools/index.rst | 5 +- + Documentation/filesystems/iomap/operations.rst | 2 +- + Documentation/filesystems/overlayfs.rst | 2 +- + Documentation/filesystems/porting.rst | 2 +- + Documentation/process/5.Posting.rst | 4 + + .../driver_development_debugging_guide.rst | 20 +- + .../debugging}/gdb-kernel-debugging.rst | 0 + Documentation/process/debugging/index.rst | 2 + + .../{dev-tools => process/debugging}/kgdb.rst | 50 +-- + Documentation/process/email-clients.rst | 8 +- + Documentation/scheduler/sched-deadline.rst | 13 +- + Documentation/scheduler/sched-ext.rst | 6 +- + Documentation/scheduler/sched-rt-group.rst | 8 +- + Documentation/trace/rv/runtime-verification.rst | 4 +- + .../translations/it_IT/process/email-clients.rst | 8 +- + .../translations/sp_SP/process/3.Early-stage.rst | 234 ++++++++++- + .../translations/sp_SP/process/4.Coding.rst | 463 ++++++++++++++++++++- + .../translations/sp_SP/process/5.Posting.rst | 388 ++++++++++++++++- + .../translations/sp_SP/process/6.Followthrough.rst | 223 +++++++++- + .../sp_SP/process/7.AdvancedTopics.rst | 207 ++++++++- + .../translations/sp_SP/process/8.Conclusion.rst | 75 +++- + .../sp_SP/process/development-process.rst | 21 +- + .../translations/sp_SP/process/email-clients.rst | 8 +- + Documentation/translations/sp_SP/process/index.rst | 2 +- + .../translations/zh_CN/admin-guide/sysrq.rst | 22 +- + .../translations/zh_CN/process/email-clients.rst | 8 +- + .../translations/zh_TW/admin-guide/sysrq.rst | 22 +- + .../translations/zh_TW/process/email-clients.rst | 8 +- + Documentation/virt/kvm/api.rst | 2 +- + MAINTAINERS | 2 +- + include/linux/kref.h | 48 ++- + include/linux/tty_driver.h | 2 +- + lib/Kconfig.debug | 2 +- + lib/Kconfig.kgdb | 2 +- + lib/parser.c | 5 +- + 47 files changed, 2164 insertions(+), 408 deletions(-) + create mode 100644 Documentation/admin-guide/nvme-multipath.rst + create mode 100644 Documentation/core-api/parser.rst + rename Documentation/{dev-tools => process/debugging}/gdb-kernel-debugging.rst (100%) + rename Documentation/{dev-tools => process/debugging}/kgdb.rst (96%) +Merging v4l-dvb/next (40ed9e9b2808 media: uvcvideo: Announce the user our deprecation intentions) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Auto-merging MAINTAINERS +Auto-merging drivers/media/i2c/ds90ub913.c +Auto-merging drivers/media/i2c/ds90ub953.c +Auto-merging drivers/media/i2c/ds90ub960.c +Auto-merging drivers/media/pci/intel/ipu6/ipu6-buttress.c +Auto-merging drivers/media/pci/intel/ipu6/ipu6-cpd.c +Auto-merging drivers/media/pci/intel/ipu6/ipu6-isys.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/ipu3.rst | 6 +- + .../devicetree/bindings/media/i2c/sony,imx290.yaml | 2 + + .../bindings/media/qcom,sc7280-camss.yaml | 425 +++++ + .../bindings/media/qcom,sc8280xp-camss.yaml | 40 +- + .../bindings/media/qcom,sdm845-camss.yaml | 20 +- + .../bindings/media/qcom,sm8250-camss.yaml | 28 +- + .../devicetree/bindings/media/st,stm32-dcmipp.yaml | 53 +- + .../bindings/media/st,stm32mp25-csi.yaml | 125 ++ + .../bindings/media/video-interfaces.yaml | 21 + + Documentation/driver-api/media/tx-rx.rst | 9 +- + MAINTAINERS | 25 +- + drivers/media/common/b2c2/flexcop-common.h | 4 - + drivers/media/common/b2c2/flexcop-misc.c | 13 - + drivers/media/dvb-frontends/cxd2841er.c | 8 +- + drivers/media/i2c/ccs/ccs-core.c | 18 +- + drivers/media/i2c/ccs/ccs-data.c | 15 +- + drivers/media/i2c/ds90ub913.c | 26 +- + drivers/media/i2c/ds90ub953.c | 56 +- + drivers/media/i2c/ds90ub960.c | 188 ++- + drivers/media/i2c/imx208.c | 2 +- + drivers/media/i2c/imx290.c | 81 +- + drivers/media/i2c/imx296.c | 2 + + drivers/media/i2c/imx412.c | 42 +- + drivers/media/i2c/ov2740.c | 58 +- + drivers/media/i2c/ov5640.c | 1 + + drivers/media/i2c/ov9282.c | 2 +- + drivers/media/pci/b2c2/flexcop-dma.c | 17 - + drivers/media/pci/cx18/cx18-gpio.c | 15 - + drivers/media/pci/cx18/cx18-gpio.h | 1 - + drivers/media/pci/intel/ipu6/ipu6-buttress.c | 8 +- + drivers/media/pci/intel/ipu6/ipu6-cpd.c | 2 +- + drivers/media/pci/intel/ipu6/ipu6-isys.c | 1 + + drivers/media/pci/mgb4/mgb4_core.c | 4 +- + drivers/media/pci/mgb4/mgb4_core.h | 3 - + drivers/media/pci/mgb4/mgb4_sysfs_in.c | 12 +- + drivers/media/pci/mgb4/mgb4_vin.c | 20 +- + drivers/media/pci/mgb4/mgb4_vin.h | 4 +- + drivers/media/pci/mgb4/mgb4_vout.c | 14 +- + drivers/media/platform/broadcom/bcm2835-unicam.c | 42 +- + drivers/media/platform/marvell/mcam-core.c | 7 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 77 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.h | 1 + + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 537 +++---- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.h | 29 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 2 + + .../media/platform/mediatek/mdp3/mtk-mdp3-core.h | 1 + + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 7 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 13 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 5 + + drivers/media/platform/qcom/camss/camss-csiphy.h | 7 + + drivers/media/platform/qcom/camss/camss-vfe.c | 8 +- + drivers/media/platform/qcom/camss/camss.c | 514 +++++- + drivers/media/platform/qcom/camss/camss.h | 5 +- + drivers/media/platform/renesas/rcar-csi2.c | 91 +- + drivers/media/platform/rockchip/rga/rga-buf.c | 2 +- + drivers/media/platform/rockchip/rga/rga-hw.c | 2 +- + drivers/media/platform/rockchip/rga/rga-hw.h | 2 +- + drivers/media/platform/rockchip/rga/rga.c | 2 +- + drivers/media/platform/rockchip/rga/rga.h | 2 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 4 +- + .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 3 + + .../platform/samsung/exynos4-is/fimc-is-errno.c | 131 -- + .../platform/samsung/exynos4-is/fimc-is-errno.h | 1 - + .../media/platform/samsung/exynos4-is/mipi-csis.c | 10 +- + .../media/platform/samsung/s3c-camif/camif-core.c | 13 +- + drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 7 +- + drivers/media/platform/st/stm32/Kconfig | 14 + + drivers/media/platform/st/stm32/Makefile | 1 + + drivers/media/platform/st/stm32/stm32-csi.c | 1137 +++++++++++++ + .../media/platform/st/stm32/stm32-dcmipp/Makefile | 2 +- + .../st/stm32/stm32-dcmipp/dcmipp-bytecap.c | 128 +- + .../st/stm32/stm32-dcmipp/dcmipp-byteproc.c | 117 +- + .../platform/st/stm32/stm32-dcmipp/dcmipp-common.h | 4 +- + .../platform/st/stm32/stm32-dcmipp/dcmipp-core.c | 122 +- + .../platform/st/stm32/stm32-dcmipp/dcmipp-input.c | 540 +++++++ + .../st/stm32/stm32-dcmipp/dcmipp-parallel.c | 440 ----- + drivers/media/platform/verisilicon/hantro.h | 9 + + drivers/media/platform/verisilicon/hantro_g2.c | 2 +- + .../media/platform/verisilicon/hantro_postproc.c | 32 +- + drivers/media/platform/verisilicon/hantro_v4l2.c | 21 + + drivers/media/platform/verisilicon/imx8m_vpu_hw.c | 10 +- + .../verisilicon/rockchip_vpu981_hw_av1_dec.c | 9 +- + drivers/media/radio/Kconfig | 4 - + drivers/media/radio/Makefile | 1 - + drivers/media/radio/wl128x/Kconfig | 15 - + drivers/media/radio/wl128x/Makefile | 7 - + drivers/media/radio/wl128x/fmdrv.h | 229 --- + drivers/media/radio/wl128x/fmdrv_common.c | 1676 -------------------- + drivers/media/radio/wl128x/fmdrv_common.h | 389 ----- + drivers/media/radio/wl128x/fmdrv_rx.c | 820 ---------- + drivers/media/radio/wl128x/fmdrv_rx.h | 45 - + drivers/media/radio/wl128x/fmdrv_tx.c | 413 ----- + drivers/media/radio/wl128x/fmdrv_tx.h | 24 - + drivers/media/radio/wl128x/fmdrv_v4l2.c | 604 ------- + drivers/media/radio/wl128x/fmdrv_v4l2.h | 20 - + drivers/media/rc/iguanair.c | 4 +- + drivers/media/rc/imon_raw.c | 2 +- + drivers/media/rc/mceusb.c | 5 +- + drivers/media/tuners/fc0013.c | 64 - + drivers/media/tuners/fc0013.h | 11 - + drivers/media/usb/cx231xx/cx231xx-avcore.c | 1 - + drivers/media/usb/dvb-usb-v2/lmedm04.c | 12 +- + drivers/media/usb/uvc/uvc_ctrl.c | 88 +- + drivers/media/usb/uvc/uvc_driver.c | 280 ++-- + drivers/media/usb/uvc/uvc_queue.c | 9 +- + drivers/media/usb/uvc/uvc_status.c | 8 +- + drivers/media/usb/uvc/uvc_v4l2.c | 164 +- + drivers/media/usb/uvc/uvc_video.c | 32 +- + drivers/media/usb/uvc/uvcvideo.h | 14 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 43 +- + drivers/media/v4l2-core/v4l2-mc.c | 2 +- + drivers/soc/mediatek/mtk-cmdq-helper.c | 18 - + drivers/staging/media/max96712/max96712.c | 4 +- + include/dt-bindings/media/video-interfaces.h | 7 + + include/linux/soc/mediatek/mtk-cmdq.h | 13 - + include/media/v4l2-mediabus.h | 21 + + 116 files changed, 4392 insertions(+), 6141 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/qcom,sc7280-camss.yaml + create mode 100644 Documentation/devicetree/bindings/media/st,stm32mp25-csi.yaml + create mode 100644 drivers/media/platform/st/stm32/stm32-csi.c + create mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-input.c + delete mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-parallel.c + delete mode 100644 drivers/media/radio/wl128x/Kconfig + delete mode 100644 drivers/media/radio/wl128x/Makefile + delete mode 100644 drivers/media/radio/wl128x/fmdrv.h + delete mode 100644 drivers/media/radio/wl128x/fmdrv_common.c + delete mode 100644 drivers/media/radio/wl128x/fmdrv_common.h + delete mode 100644 drivers/media/radio/wl128x/fmdrv_rx.c + delete mode 100644 drivers/media/radio/wl128x/fmdrv_rx.h + delete mode 100644 drivers/media/radio/wl128x/fmdrv_tx.c + delete mode 100644 drivers/media/radio/wl128x/fmdrv_tx.h + delete mode 100644 drivers/media/radio/wl128x/fmdrv_v4l2.c + delete mode 100644 drivers/media/radio/wl128x/fmdrv_v4l2.h +Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init()) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (432f1f00f78e Merge branches 'pm-em', 'pm-sleep' and 'pm-cpufreq' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/pm/amd-pstate.rst | 4 +- + drivers/acpi/Kconfig | 4 +- + drivers/acpi/battery.c | 14 ++-- + drivers/acpi/bgrt.c | 6 +- + drivers/acpi/dptf/dptf_pch_fivr.c | 1 + + drivers/acpi/dptf/dptf_power.c | 2 + + drivers/acpi/dptf/int340x_thermal.c | 6 ++ + drivers/acpi/fan.h | 1 + + drivers/acpi/fan_core.c | 10 ++- + drivers/acpi/osl.c | 22 ++++++- + drivers/acpi/sysfs.c | 8 +-- + drivers/base/power/main.c | 2 +- + drivers/base/power/sysfs.c | 1 - + drivers/cpufreq/amd-pstate.c | 50 +++++++------- + drivers/cpufreq/cpufreq.c | 2 +- + drivers/cpufreq/intel_pstate.c | 60 +++++++++-------- + drivers/idle/intel_idle.c | 1 + + drivers/platform/loongarch/Kconfig | 2 +- + drivers/powercap/intel_rapl_common.c | 1 + + .../intel/int340x_thermal/int3400_thermal.c | 1 + + .../intel/int340x_thermal/int3403_thermal.c | 1 + + .../int340x_thermal/processor_thermal_device.h | 1 + + .../int340x_thermal/processor_thermal_device_pci.c | 1 + + drivers/thermal/thermal_thresholds.c | 76 ++++++++++++---------- + include/linux/energy_model.h | 2 + + include/linux/pm_wakeup.h | 17 +++++ + include/uapi/linux/thermal.h | 4 +- + kernel/power/autosleep.c | 1 - + kernel/power/energy_model.c | 17 +++++ + kernel/sched/cpufreq_schedutil.c | 37 +++-------- + 30 files changed, 211 insertions(+), 144 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (a28276cac1f0 dt-bindings: cpufreq: Document support for Airoha EN7581 CPUFreq) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + .../bindings/cpufreq/airoha,en7581-cpufreq.yaml | 55 ++++++++++++++++++++++ + drivers/cpufreq/Kconfig | 2 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 2 - + drivers/cpufreq/scmi-cpufreq.c | 45 ++++++++++++++++++ + 4 files changed, 101 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/cpufreq/airoha,en7581-cpufreq.yaml +Merging cpupower/cpupower (9d6c0e58514f cpupower: fix TSC MHz calculation) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'ort' strategy. + tools/power/cpupower/Makefile | 8 ++++++++ + tools/power/cpupower/utils/idle_monitor/hsw_ext_idle.c | 4 ++-- + tools/power/cpupower/utils/idle_monitor/mperf_monitor.c | 17 ++++++++++------- + tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 2 +- + tools/power/cpupower/utils/idle_monitor/snb_idle.c | 4 ++-- + tools/testing/selftests/cpufreq/.gitignore | 2 ++ + tools/testing/selftests/cpufreq/Makefile | 1 + + 7 files changed, 26 insertions(+), 12 deletions(-) + create mode 100644 tools/testing/selftests/cpufreq/.gitignore +Merging devfreq/devfreq-next (1f8ac4b95fee PM / devfreq: Switch back to struct platform_driver::remove()) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Auto-merging drivers/devfreq/event/exynos-nocp.c +CONFLICT (content): Merge conflict in drivers/devfreq/event/exynos-nocp.c +Auto-merging drivers/devfreq/event/exynos-ppmu.c +CONFLICT (content): Merge conflict in drivers/devfreq/event/exynos-ppmu.c +Auto-merging drivers/devfreq/mtk-cci-devfreq.c +CONFLICT (content): Merge conflict in drivers/devfreq/mtk-cci-devfreq.c +Auto-merging drivers/devfreq/rk3399_dmc.c +CONFLICT (content): Merge conflict in drivers/devfreq/rk3399_dmc.c +Auto-merging drivers/devfreq/sun8i-a33-mbus.c +CONFLICT (content): Merge conflict in drivers/devfreq/sun8i-a33-mbus.c +Resolved 'drivers/devfreq/event/exynos-nocp.c' using previous resolution. +Resolved 'drivers/devfreq/event/exynos-ppmu.c' using previous resolution. +Resolved 'drivers/devfreq/mtk-cci-devfreq.c' using previous resolution. +Resolved 'drivers/devfreq/rk3399_dmc.c' using previous resolution. +Resolved 'drivers/devfreq/sun8i-a33-mbus.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 299285bf13c7] Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/devfreq/devfreq-event.c | 8 ++------ + drivers/devfreq/event/exynos-nocp.c | 4 ++-- + drivers/devfreq/event/exynos-ppmu.c | 4 ++-- + drivers/devfreq/mtk-cci-devfreq.c | 2 +- + drivers/devfreq/rk3399_dmc.c | 6 +++--- + drivers/devfreq/sun8i-a33-mbus.c | 2 +- + 6 files changed, 11 insertions(+), 15 deletions(-) +Merging pmdomain/next (094041b17654 pmdomain: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Merge made by the 'ort' strategy. + .../bindings/power/domain-idle-state.yaml | 5 ++ + drivers/cpuidle/cpuidle-psci-domain.c | 1 + + drivers/pmdomain/core.c | 15 +++- + drivers/pmdomain/imx/gpcv2.c | 2 + + drivers/pmdomain/imx/imx8m-blk-ctrl.c | 1 + + drivers/pmdomain/imx/imx8mp-blk-ctrl.c | 1 + + drivers/pmdomain/ti/ti_sci_pm_domains.c | 81 ++++++++++++++++++++++ + include/linux/pm_domain.h | 1 + + 8 files changed, 104 insertions(+), 3 deletions(-) +Merging opp/opp/linux-next (e0460b08c67a OPP: fix dev_pm_opp_find_bw_*() when bandwidth table not initialized) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Auto-merging drivers/opp/core.c +Auto-merging include/linux/pm_opp.h +Merge made by the 'ort' strategy. + drivers/opp/core.c | 82 +++++++++++++++++++++++++++++++++++++++----------- + include/linux/pm_opp.h | 7 +++++ + 2 files changed, 72 insertions(+), 17 deletions(-) +Merging thermal/thermal/linux-next (7d8abc5f3b5c thermal/drivers/imx_sc_thermal: Use dev_err_probe) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging rdma/for-next (1950af31dc66 RDMA/bnxt_re: Remove unnecessary header file inclusion) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/hw/bnxt_re/ib_verbs.c +Merge made by the 'ort' strategy. + drivers/infiniband/hw/bnxt_re/hw_counters.c | 9 - + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 2 - + drivers/infiniband/hw/bnxt_re/main.c | 84 ++--- + drivers/infiniband/hw/cxgb4/device.c | 6 +- + drivers/infiniband/hw/erdma/Kconfig | 2 +- + drivers/infiniband/hw/erdma/erdma.h | 8 +- + drivers/infiniband/hw/erdma/erdma_cm.c | 71 ++-- + drivers/infiniband/hw/erdma/erdma_cq.c | 65 ++++ + drivers/infiniband/hw/erdma/erdma_hw.h | 135 ++++++- + drivers/infiniband/hw/erdma/erdma_main.c | 44 ++- + drivers/infiniband/hw/erdma/erdma_qp.c | 299 ++++++++++++---- + drivers/infiniband/hw/erdma/erdma_verbs.c | 528 +++++++++++++++++++++++++--- + drivers/infiniband/hw/erdma/erdma_verbs.h | 166 +++++++-- + drivers/infiniband/hw/mlx4/cq.c | 6 +- + drivers/infiniband/hw/mlx4/main.c | 8 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 18 +- + drivers/infiniband/hw/mlx4/mr.c | 286 +-------------- + drivers/infiniband/hw/mlx4/qp.c | 12 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 6 + + drivers/infiniband/hw/mlx5/odp.c | 6 +- + drivers/infiniband/hw/mlx5/restrack.c | 9 + + include/rdma/ib_verbs.h | 2 + + 22 files changed, 1226 insertions(+), 546 deletions(-) +Merging net-next/main (07e5c4eb94e6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging MAINTAINERS +Auto-merging scripts/checkpatch.pl +Merge made by the 'ort' strategy. + Documentation/core-api/packing.rst | 118 ++- + .../devicetree/bindings/net/nxp,s32-dwmac.yaml | 105 ++ + .../devicetree/bindings/net/snps,dwmac.yaml | 1 + + .../devicetree/bindings/net/ti,dp83822.yaml | 27 + + Documentation/netlink/genetlink-c.yaml | 3 + + Documentation/netlink/genetlink-legacy.yaml | 3 + + Documentation/netlink/netlink-raw.yaml | 2 +- + Documentation/netlink/specs/ethtool.yaml | 436 +++++++- + Documentation/netlink/specs/rt_link.yaml | 3 + + Documentation/netlink/specs/rt_route.yaml | 7 + + Documentation/netlink/specs/rt_rule.yaml | 12 + + Documentation/networking/bonding.rst | 8 +- + Documentation/networking/ethtool-netlink.rst | 82 +- + Documentation/networking/ip-sysctl.rst | 14 + + .../net_cachelines/netns_ipv4_sysctl.rst | 1 + + Documentation/networking/netconsole.rst | 5 +- + Documentation/networking/timestamping.rst | 38 +- + Documentation/networking/tls.rst | 36 + + Documentation/userspace-api/netlink/c-code-gen.rst | 4 +- + MAINTAINERS | 12 +- + Makefile | 4 + + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/mips/include/uapi/asm/socket.h | 2 + + arch/parisc/include/uapi/asm/socket.h | 2 + + arch/sparc/include/uapi/asm/socket.h | 2 + + drivers/isdn/mISDN/core.c | 14 - + drivers/isdn/mISDN/core.h | 1 - + drivers/net/bareudp.c | 16 +- + drivers/net/can/sja1000/sja1000_platform.c | 15 +- + drivers/net/dsa/b53/b53_common.c | 13 +- + drivers/net/dsa/b53/b53_priv.h | 1 + + drivers/net/dsa/bcm_sf2.c | 1 + + drivers/net/dsa/microchip/ksz_common.c | 26 +- + drivers/net/dsa/mt7530.c | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 50 +- + drivers/net/dsa/mv88e6xxx/chip.h | 1 + + drivers/net/dsa/qca/qca8k-8xxx.c | 5 +- + drivers/net/dsa/qca/qca8k.h | 2 +- + drivers/net/dsa/sja1105/sja1105_static_config.c | 8 +- + drivers/net/ethernet/Kconfig | 2 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 16 +- + drivers/net/ethernet/cadence/macb_main.c | 14 +- + drivers/net/ethernet/freescale/Kconfig | 3 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 3 +- + drivers/net/ethernet/freescale/fec.h | 2 - + drivers/net/ethernet/freescale/fec_main.c | 16 +- + drivers/net/ethernet/freescale/fman/fman.c | 35 +- + drivers/net/ethernet/freescale/ucc_geth.c | 600 +++++------ + drivers/net/ethernet/freescale/ucc_geth.h | 22 +- + drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 76 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 14 - + drivers/net/ethernet/google/gve/gve_adminq.h | 1 - + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 6 +- + drivers/net/ethernet/hisilicon/hibmcge/Makefile | 3 +- + .../net/ethernet/hisilicon/hibmcge/hbg_common.h | 29 + + .../net/ethernet/hisilicon/hibmcge/hbg_debugfs.c | 160 +++ + .../net/ethernet/hisilicon/hibmcge/hbg_debugfs.h | 12 + + drivers/net/ethernet/hisilicon/hibmcge/hbg_err.c | 134 +++ + drivers/net/ethernet/hisilicon/hibmcge/hbg_err.h | 13 + + .../net/ethernet/hisilicon/hibmcge/hbg_ethtool.c | 181 ++++ + drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.c | 48 +- + drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.h | 6 +- + drivers/net/ethernet/hisilicon/hibmcge/hbg_main.c | 199 +++- + drivers/net/ethernet/hisilicon/hibmcge/hbg_mdio.c | 15 + + drivers/net/ethernet/hisilicon/hibmcge/hbg_reg.h | 39 + + drivers/net/ethernet/huawei/hinic/hinic_port.c | 2 +- + drivers/net/ethernet/intel/Kconfig | 1 + + drivers/net/ethernet/intel/ice/Makefile | 3 +- + drivers/net/ethernet/intel/ice/devlink/devlink.c | 2 +- + drivers/net/ethernet/intel/ice/devlink/health.c | 269 +++++ + drivers/net/ethernet/intel/ice/devlink/health.h | 58 ++ + .../intel/ice/devlink/{devlink_port.c => port.c} | 2 +- + .../intel/ice/devlink/{devlink_port.h => port.h} | 0 + drivers/net/ethernet/intel/ice/ice.h | 2 + + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 11 +- + drivers/net/ethernet/intel/ice/ice_base.c | 6 +- + drivers/net/ethernet/intel/ice/ice_common.c | 293 ++---- + drivers/net/ethernet/intel/ice/ice_common.h | 5 +- + drivers/net/ethernet/intel/ice/ice_eswitch.h | 2 +- + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 49 +- + drivers/net/ethernet/intel/ice/ice_main.c | 26 +- + drivers/net/ethernet/intel/ice/ice_repr.c | 2 +- + drivers/net/ethernet/intel/ice/ice_sf_eth.c | 2 +- + drivers/net/ethernet/lantiq_etop.c | 25 +- + drivers/net/ethernet/marvell/mvneta.c | 27 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 25 +- + .../net/ethernet/marvell/octeon_ep/octep_main.c | 39 + + .../net/ethernet/marvell/octeon_ep/octep_main.h | 1 + + .../ethernet/marvell/octeon_ep/octep_pfvf_mbox.c | 23 +- + .../ethernet/marvell/octeon_ep/octep_pfvf_mbox.h | 6 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 4 + + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 68 +- + .../net/ethernet/marvell/octeontx2/nic/Makefile | 1 + + .../ethernet/marvell/octeontx2/nic/cn10k_ipsec.c | 1056 ++++++++++++++++++++ + .../ethernet/marvell/octeontx2/nic/cn10k_ipsec.h | 265 +++++ + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 114 ++- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 28 +- + .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 3 + + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 19 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 66 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 3 + + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/rl.c | 4 + + drivers/net/ethernet/mellanox/mlxsw/core.h | 1 + + drivers/net/ethernet/mellanox/mlxsw/pci.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 10 + + .../net/ethernet/mellanox/mlxsw/spectrum_trap.c | 2 +- + drivers/net/ethernet/mscc/ocelot_net.c | 3 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic.h | 3 - + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 40 + + drivers/net/ethernet/pensando/ionic/ionic_if.h | 22 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 9 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 3 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 20 +- + drivers/net/ethernet/realtek/r8169.h | 5 +- + drivers/net/ethernet/realtek/r8169_main.c | 94 +- + drivers/net/ethernet/realtek/r8169_phy_config.c | 15 +- + drivers/net/ethernet/realtek/rtase/rtase.h | 1 + + drivers/net/ethernet/realtek/rtase/rtase_main.c | 14 +- + drivers/net/ethernet/renesas/rswitch.c | 119 ++- + drivers/net/ethernet/renesas/rswitch.h | 48 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/common.h | 16 +- + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 11 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 15 +- + .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 22 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 30 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c | 202 ++++ + .../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 19 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 18 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h | 3 + + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 5 + + drivers/net/ethernet/stmicro/stmmac/hwif.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 17 +- + drivers/net/ethernet/stmicro/stmmac/mmc.h | 3 + + drivers/net/ethernet/stmicro/stmmac/stmmac_est.h | 2 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 3 + + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 11 - + drivers/net/ethernet/sun/niu.c | 22 +- + drivers/net/geneve.c | 12 +- + drivers/net/mctp/mctp-i2c.c | 3 +- + drivers/net/mdio/mdio-octeon.c | 25 +- + drivers/net/netconsole.c | 60 +- + drivers/net/pcs/pcs-lynx.c | 22 + + drivers/net/pcs/pcs-mtk-lynxi.c | 16 + + drivers/net/pcs/pcs-xpcs.c | 28 + + drivers/net/phy/bcm84881.c | 10 + + drivers/net/phy/dp83822.c | 106 +- + drivers/net/phy/marvell.c | 52 +- + drivers/net/phy/phy-c45.c | 14 +- + drivers/net/phy/phy.c | 62 +- + drivers/net/phy/phy_device.c | 10 + + drivers/net/phy/phylink.c | 359 +++++-- + drivers/net/phy/spi_ks8995.c | 8 +- + drivers/net/tap.c | 6 +- + drivers/net/tun.c | 20 +- + drivers/net/usb/lan78xx.c | 938 +++++++++-------- + drivers/net/veth.c | 4 +- + drivers/net/vrf.c | 49 +- + drivers/net/vxlan/vxlan_core.c | 183 ++-- + drivers/net/wan/framer/framer-core.c | 23 +- + drivers/net/wwan/t7xx/t7xx_pci.c | 23 +- + include/linux/bpf.h | 12 +- + include/linux/etherdevice.h | 18 +- + include/linux/ethtool.h | 10 +- + include/linux/filter.h | 9 +- + include/linux/if_vlan.h | 28 +- + include/linux/igmp.h | 2 + + include/linux/ktime.h | 5 + + include/linux/mlx5/mlx5_ifc.h | 59 +- + include/linux/net_tstamp.h | 29 + + include/linux/netdevice.h | 65 +- + include/linux/netfilter/x_tables.h | 2 +- + include/linux/netfilter_netdev.h | 3 +- + include/linux/netpoll.h | 2 +- + include/linux/packing.h | 425 ++++++++ + include/linux/phy.h | 59 +- + include/linux/phylink.h | 17 + + include/linux/ptp_clock_kernel.h | 4 +- + include/linux/ptr_ring.h | 21 +- + include/linux/rfkill.h | 2 +- + include/linux/rtnetlink.h | 8 +- + include/linux/skb_array.h | 17 +- + include/linux/skbuff.h | 49 +- + include/linux/stmmac.h | 10 +- + include/linux/wwan.h | 2 +- + include/net/addrconf.h | 21 + + include/net/cfg80211.h | 2 +- + include/net/devlink.h | 13 + + include/net/dropreason-core.h | 36 + + include/net/dsa.h | 2 + + include/net/dst.h | 11 +- + include/net/genetlink.h | 6 +- + include/net/inet_sock.h | 2 +- + include/net/inet_timewait_sock.h | 4 + + include/net/inetpeer.h | 12 +- + include/net/ip.h | 2 +- + include/net/ipv6.h | 2 +- + include/net/iucv/iucv.h | 30 +- + include/net/netfilter/nf_tproxy.h | 4 +- + include/net/netlink.h | 44 +- + include/net/netmem.h | 78 +- + include/net/netns/ipv4.h | 1 + + include/net/page_pool/helpers.h | 73 +- + include/net/page_pool/types.h | 11 +- + include/net/pkt_cls.h | 4 +- + include/net/sch_generic.h | 8 + + include/net/sock.h | 8 +- + include/net/tcp.h | 2 +- + include/net/tls.h | 3 + + include/net/vxlan.h | 1 + + include/net/xdp.h | 95 +- + include/net/xdp_sock_drv.h | 11 +- + include/net/xsk_buff_pool.h | 4 +- + include/trace/events/fib6.h | 8 +- + include/trace/events/rxrpc.h | 880 +++++++++++++--- + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/ethtool_netlink.h | 893 +---------------- + include/uapi/linux/ethtool_netlink_generated.h | 818 +++++++++++++++ + include/uapi/linux/fib_rules.h | 2 + + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/net_tstamp.h | 11 + + include/uapi/linux/rtnetlink.h | 11 +- + include/uapi/linux/snmp.h | 5 + + kernel/bpf/cpumap.c | 2 +- + kernel/bpf/devmap.c | 8 +- + lib/packing.c | 293 ++++-- + lib/packing_test.c | 61 ++ + lib/win_minmax.c | 1 + + net/bpf/test_run.c | 4 +- + net/bridge/br_fdb.c | 3 +- + net/bridge/br_sysfs_br.c | 6 +- + net/can/raw.c | 2 +- + net/core/dev.c | 20 +- + net/core/dev.h | 3 + + net/core/dev_ioctl.c | 47 +- + net/core/devmem.c | 10 +- + net/core/fib_rules.c | 2 + + net/core/filter.c | 46 +- + net/core/netpoll.c | 10 +- + net/core/page_pool.c | 139 ++- + net/core/pktgen.c | 7 +- + net/core/rtnetlink.c | 116 +-- + net/core/skbuff.c | 2 +- + net/core/sock.c | 26 +- + net/core/timestamping.c | 52 +- + net/core/xdp.c | 149 +-- + net/devlink/health.c | 67 ++ + net/dsa/port.c | 16 + + net/dsa/user.c | 15 +- + net/ethtool/Makefile | 2 +- + net/ethtool/common.c | 148 ++- + net/ethtool/common.h | 13 + + net/ethtool/netlink.c | 24 +- + net/ethtool/netlink.h | 8 +- + net/ethtool/ts.h | 20 + + net/ethtool/tsconfig.c | 444 ++++++++ + net/ethtool/tsinfo.c | 358 ++++++- + net/ipv4/fib_rules.c | 6 + + net/ipv4/fib_trie.c | 4 +- + net/ipv4/icmp.c | 9 +- + net/ipv4/igmp.c | 64 ++ + net/ipv4/inetpeer.c | 31 +- + net/ipv4/ip_fragment.c | 15 +- + net/ipv4/ip_output.c | 17 +- + net/ipv4/ip_sockglue.c | 2 +- + net/ipv4/raw.c | 2 +- + net/ipv4/route.c | 17 +- + net/ipv4/sysctl_net_ipv4.c | 10 + + net/ipv4/tcp_ipv4.c | 7 +- + net/ipv4/tcp_minisocks.c | 7 +- + net/ipv6/addrconf.c | 29 +- + net/ipv6/fib6_rules.c | 57 +- + net/ipv6/icmp.c | 6 +- + net/ipv6/ioam6_iptunnel.c | 75 +- + net/ipv6/ip6_output.c | 22 +- + net/ipv6/mcast.c | 98 +- + net/ipv6/ndisc.c | 8 +- + net/ipv6/ping.c | 1 + + net/ipv6/raw.c | 3 +- + net/ipv6/route.c | 20 +- + net/ipv6/rpl_iptunnel.c | 46 +- + net/ipv6/seg6_iptunnel.c | 85 +- + net/ipv6/udp.c | 1 + + net/l2tp/l2tp_eth.c | 9 +- + net/mctp/device.c | 50 +- + net/mptcp/pm_netlink.c | 46 +- + net/mptcp/pm_userspace.c | 295 +++--- + net/mptcp/protocol.h | 7 +- + net/packet/af_packet.c | 2 +- + net/rxrpc/Makefile | 1 + + net/rxrpc/af_rxrpc.c | 4 +- + net/rxrpc/ar-internal.h | 342 +++++-- + net/rxrpc/call_accept.c | 22 +- + net/rxrpc/call_event.c | 395 ++++---- + net/rxrpc/call_object.c | 66 +- + net/rxrpc/conn_client.c | 26 +- + net/rxrpc/conn_event.c | 40 +- + net/rxrpc/conn_object.c | 14 +- + net/rxrpc/input.c | 708 ++++++++----- + net/rxrpc/input_rack.c | 418 ++++++++ + net/rxrpc/insecure.c | 5 +- + net/rxrpc/io_thread.c | 117 ++- + net/rxrpc/local_object.c | 3 - + net/rxrpc/misc.c | 4 +- + net/rxrpc/output.c | 596 +++++++---- + net/rxrpc/peer_event.c | 114 ++- + net/rxrpc/peer_object.c | 30 +- + net/rxrpc/proc.c | 61 +- + net/rxrpc/protocol.h | 13 +- + net/rxrpc/recvmsg.c | 18 +- + net/rxrpc/rtt.c | 103 +- + net/rxrpc/rxkad.c | 59 +- + net/rxrpc/rxperf.c | 2 +- + net/rxrpc/security.c | 4 +- + net/rxrpc/sendmsg.c | 100 +- + net/rxrpc/sysctl.c | 6 +- + net/rxrpc/txbuf.c | 127 +-- + net/sched/sch_cake.c | 43 +- + net/sched/sch_codel.c | 5 +- + net/sched/sch_fq.c | 14 +- + net/sched/sch_fq_codel.c | 3 +- + net/sched/sch_fq_pie.c | 6 +- + net/sched/sch_generic.c | 4 +- + net/sched/sch_gred.c | 4 +- + net/sched/sch_pie.c | 5 +- + net/sched/sch_red.c | 4 +- + net/sched/sch_sfb.c | 4 +- + net/sched/sch_sfq.c | 4 + + net/smc/af_smc.c | 5 +- + net/smc/smc_core.c | 5 + + net/smc/smc_core.h | 11 +- + net/smc/smc_ib.c | 3 +- + net/smc/smc_llc.c | 21 +- + net/smc/smc_wr.c | 42 +- + net/socket.c | 11 + + net/tipc/name_table.c | 4 +- + net/tipc/name_table.h | 2 + + net/tls/tls.h | 3 +- + net/tls/tls_device.c | 2 +- + net/tls/tls_main.c | 71 +- + net/tls/tls_proc.c | 5 + + net/tls/tls_sw.c | 140 ++- + net/unix/af_unix.c | 196 ++-- + rust/kernel/net/phy.rs | 4 +- + scripts/.gitignore | 1 + + scripts/Makefile | 2 +- + scripts/checkpatch.pl | 2 + + scripts/gen_packed_field_checks.c | 37 + + tools/include/uapi/asm-generic/socket.h | 2 + + tools/net/ynl/ynl-gen-c.py | 147 ++- + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/busy_poller.c | 88 +- + tools/testing/selftests/net/cmsg_sender.c | 11 +- + tools/testing/selftests/net/cmsg_so_priority.sh | 151 +++ + tools/testing/selftests/net/fdb_notify.sh | 6 +- + tools/testing/selftests/net/fib_rule_tests.sh | 31 + + tools/testing/selftests/net/forwarding/Makefile | 1 + + .../net/forwarding/bridge_vlan_unaware.sh | 25 +- + tools/testing/selftests/net/forwarding/lib.sh | 7 - + .../selftests/net/forwarding/vxlan_reserved.sh | 352 +++++++ + tools/testing/selftests/net/lib.sh | 41 +- + .../packetdrill/tcp_blocking_blocking-accept.pkt | 18 + + .../packetdrill/tcp_blocking_blocking-connect.pkt | 13 + + .../net/packetdrill/tcp_blocking_blocking-read.pkt | 29 + + .../packetdrill/tcp_blocking_blocking-write.pkt | 35 + + ...tcp_close_close-local-close-then-remote-fin.pkt | 23 + + .../packetdrill/tcp_close_close-on-syn-sent.pkt | 21 + + .../tcp_close_close-remote-fin-then-close.pkt | 36 + + .../net/packetdrill/tcp_ecn_ecn-uses-ect0.pkt | 21 + + .../net/packetdrill/tcp_eor_no-coalesce-large.pkt | 38 + + .../packetdrill/tcp_eor_no-coalesce-retrans.pkt | 72 ++ + .../net/packetdrill/tcp_eor_no-coalesce-small.pkt | 36 + + .../packetdrill/tcp_eor_no-coalesce-subsequent.pkt | 66 ++ + .../tcp_fast_recovery_prr-ss-10pkt-lost-1.pkt | 72 ++ + ...p_fast_recovery_prr-ss-30pkt-lost-1_4-11_16.pkt | 50 + + .../tcp_fast_recovery_prr-ss-30pkt-lost1_4.pkt | 43 + + ...ast_recovery_prr-ss-ack-below-snd_una-cubic.pkt | 41 + + ...p_limited_transmit_limited-transmit-no-sack.pkt | 53 + + .../tcp_limited_transmit_limited-transmit-sack.pkt | 50 + + .../net/packetdrill/tcp_nagle_https_client.pkt | 40 + + .../net/packetdrill/tcp_nagle_sendmsg_msg_more.pkt | 66 ++ + .../packetdrill/tcp_nagle_sockopt_cork_nodelay.pkt | 43 + + .../tcp_sack_sack-route-refresh-ip-tos.pkt | 37 + + ...tcp_sack_sack-shift-sacked-2-6-8-3-9-nofack.pkt | 64 ++ + .../tcp_sack_sack-shift-sacked-7-3-4-8-9-fack.pkt | 66 ++ + .../tcp_sack_sack-shift-sacked-7-5-6-8-9-fack.pkt | 62 ++ + .../packetdrill/tcp_sendfile_sendfile-simple.pkt | 26 + + .../tcp_splice_tcp_splice_loop_test.pkt | 20 + + ...cp_syscall_bad_arg_fastopen-invalid-buf-ptr.pkt | 42 + + .../tcp_syscall_bad_arg_sendmsg-empty-iov.pkt | 30 + + ...tcp_syscall_bad_arg_syscall-invalid-buf-ptr.pkt | 25 + + .../tcp_tcp_info_tcp-info-last_data_recv.pkt | 20 + + .../tcp_tcp_info_tcp-info-rwnd-limited.pkt | 54 + + .../tcp_tcp_info_tcp-info-sndbuf-limited.pkt | 38 + + .../tcp_timestamping_client-only-last-byte.pkt | 92 ++ + .../net/packetdrill/tcp_timestamping_partial.pkt | 91 ++ + .../net/packetdrill/tcp_timestamping_server.pkt | 145 +++ + .../net/packetdrill/tcp_ts_recent_fin_tsval.pkt | 23 + + .../net/packetdrill/tcp_ts_recent_invalid_ack.pkt | 25 + + .../net/packetdrill/tcp_ts_recent_reset_tsval.pkt | 25 + + .../tcp_user_timeout_user-timeout-probe.pkt | 37 + + .../packetdrill/tcp_user_timeout_user_timeout.pkt | 32 + + .../tcp_validate_validate-established-no-flags.pkt | 24 + + tools/testing/selftests/net/tls.c | 478 ++++++++- + tools/testing/selftests/net/udpgso_bench.sh | 3 + + .../tc-testing/scripts/sfq_rejects_limit_1.py | 21 + + .../selftests/tc-testing/tc-tests/qdiscs/sfq.json | 20 + + 418 files changed, 16983 insertions(+), 5600 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml + create mode 100644 drivers/net/ethernet/hisilicon/hibmcge/hbg_debugfs.c + create mode 100644 drivers/net/ethernet/hisilicon/hibmcge/hbg_debugfs.h + create mode 100644 drivers/net/ethernet/hisilicon/hibmcge/hbg_err.c + create mode 100644 drivers/net/ethernet/hisilicon/hibmcge/hbg_err.h + create mode 100644 drivers/net/ethernet/intel/ice/devlink/health.c + create mode 100644 drivers/net/ethernet/intel/ice/devlink/health.h + rename drivers/net/ethernet/intel/ice/devlink/{devlink_port.c => port.c} (99%) + rename drivers/net/ethernet/intel/ice/devlink/{devlink_port.h => port.h} (100%) + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/cn10k_ipsec.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/nic/cn10k_ipsec.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c + create mode 100644 include/uapi/linux/ethtool_netlink_generated.h + create mode 100644 net/ethtool/ts.h + create mode 100644 net/ethtool/tsconfig.c + create mode 100644 net/rxrpc/input_rack.c + create mode 100644 scripts/gen_packed_field_checks.c + create mode 100755 tools/testing/selftests/net/cmsg_so_priority.sh + create mode 100755 tools/testing/selftests/net/forwarding/vxlan_reserved.sh + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-accept.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-connect.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-read.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_blocking_blocking-write.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_close_close-local-close-then-remote-fin.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_close_close-on-syn-sent.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_close_close-remote-fin-then-close.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_ecn_ecn-uses-ect0.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_eor_no-coalesce-large.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_eor_no-coalesce-retrans.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_eor_no-coalesce-small.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_eor_no-coalesce-subsequent.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_fast_recovery_prr-ss-10pkt-lost-1.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_fast_recovery_prr-ss-30pkt-lost-1_4-11_16.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_fast_recovery_prr-ss-30pkt-lost1_4.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_fast_recovery_prr-ss-ack-below-snd_una-cubic.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_limited_transmit_limited-transmit-no-sack.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_limited_transmit_limited-transmit-sack.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_nagle_https_client.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_nagle_sendmsg_msg_more.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_nagle_sockopt_cork_nodelay.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_sack_sack-route-refresh-ip-tos.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_sack_sack-shift-sacked-2-6-8-3-9-nofack.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_sack_sack-shift-sacked-7-3-4-8-9-fack.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_sack_sack-shift-sacked-7-5-6-8-9-fack.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_sendfile_sendfile-simple.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_splice_tcp_splice_loop_test.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_syscall_bad_arg_fastopen-invalid-buf-ptr.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_syscall_bad_arg_sendmsg-empty-iov.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_syscall_bad_arg_syscall-invalid-buf-ptr.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_tcp_info_tcp-info-last_data_recv.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_tcp_info_tcp-info-rwnd-limited.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_tcp_info_tcp-info-sndbuf-limited.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_timestamping_client-only-last-byte.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_timestamping_partial.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_timestamping_server.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_ts_recent_fin_tsval.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_ts_recent_invalid_ack.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_ts_recent_reset_tsval.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_user_timeout_user-timeout-probe.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_user_timeout_user_timeout.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_validate_validate-established-no-flags.pkt + create mode 100755 tools/testing/selftests/tc-testing/scripts/sfq_rejects_limit_1.py +Merging bpf-next/for-next (c2ce3bb13ae7 Merge branch 'bpf-next/net' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging include/linux/bpf.h +Auto-merging kernel/bpf/verifier.c +Auto-merging net/bpf/test_run.c +Merge made by the 'ort' strategy. + include/linux/bpf.h | 17 + + include/linux/bpf_verifier.h | 26 +- + include/uapi/linux/bpf.h | 10 + + kernel/bpf/btf.c | 11 +- + kernel/bpf/helpers.c | 21 + + kernel/bpf/log.c | 21 +- + kernel/bpf/syscall.c | 2 +- + kernel/bpf/verifier.c | 946 +++++++++++++++------ + kernel/trace/bpf_trace.c | 33 +- + net/bpf/test_run.c | 1 + + samples/bpf/Makefile | 2 +- + samples/bpf/xdp2skb_meta_kern.c | 1 - + scripts/link-vmlinux.sh | 6 +- + security/bpf/hooks.c | 1 - + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 9 +- + tools/bpf/bpftool/bash-completion/bpftool | 7 +- + tools/bpf/bpftool/btf.c | 51 +- + tools/bpf/bpftool/feature.c | 23 + + tools/bpf/resolve_btfids/main.c | 12 +- + tools/include/linux/filter.h | 10 + + tools/include/uapi/linux/bpf.h | 10 + + tools/lib/bpf/bpf.c | 3 +- + tools/lib/bpf/bpf.h | 5 +- + tools/lib/bpf/btf.c | 2 +- + tools/lib/bpf/libbpf.h | 5 + + tools/lib/bpf/libbpf.map | 4 + + tools/lib/bpf/linker.c | 248 ++++-- + tools/lib/bpf/usdt.c | 2 +- + tools/testing/selftests/bpf/.gitignore | 1 - + tools/testing/selftests/bpf/Makefile | 73 +- + .../selftests/bpf/bpf_test_modorder_x/Makefile | 19 - + .../selftests/bpf/bpf_test_modorder_y/Makefile | 19 - + .../testing/selftests/bpf/bpf_test_no_cfi/Makefile | 19 - + tools/testing/selftests/bpf/bpf_testmod/Makefile | 20 - + tools/testing/selftests/bpf/config | 1 + + tools/testing/selftests/bpf/network_helpers.c | 2 +- + tools/testing/selftests/bpf/network_helpers.h | 96 +++ + .../prog_tests/cgroup_skb_direct_packet_access.c | 28 + + .../testing/selftests/bpf/prog_tests/core_reloc.c | 2 +- + tools/testing/selftests/bpf/prog_tests/fd_array.c | 441 ++++++++++ + .../selftests/bpf/prog_tests/fill_link_info.c | 4 + + .../selftests/bpf/prog_tests/flow_dissector.c | 329 +++++-- + .../bpf/prog_tests/flow_dissector_classification.c | 792 +++++++++++++++++ + .../testing/selftests/bpf/prog_tests/sockopt_sk.c | 2 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + .../testing/selftests/bpf/prog_tests/xdp_bonding.c | 2 +- + .../bpf/prog_tests/xdp_context_test_run.c | 87 ++ + .../selftests/bpf/prog_tests/xdp_do_redirect.c | 2 +- + .../selftests/bpf/prog_tests/xdp_flowtable.c | 2 +- + .../selftests/bpf/prog_tests/xdp_metadata.c | 21 +- + tools/testing/selftests/bpf/progs/bad_struct_ops.c | 2 +- + tools/testing/selftests/bpf/progs/cb_refs.c | 2 +- + .../bpf/progs/cgroup_skb_direct_packet_access.c | 15 + + tools/testing/selftests/bpf/progs/epilogue_exit.c | 4 +- + .../selftests/bpf/progs/epilogue_tailcall.c | 4 +- + .../testing/selftests/bpf/progs/exceptions_fail.c | 4 +- + tools/testing/selftests/bpf/progs/irq.c | 444 ++++++++++ + tools/testing/selftests/bpf/progs/iters_testmod.c | 2 +- + tools/testing/selftests/bpf/progs/jit_probe_mem.c | 2 +- + .../selftests/bpf/progs/kfunc_call_destructive.c | 2 +- + .../testing/selftests/bpf/progs/kfunc_call_fail.c | 2 +- + .../testing/selftests/bpf/progs/kfunc_call_race.c | 2 +- + .../testing/selftests/bpf/progs/kfunc_call_test.c | 2 +- + .../selftests/bpf/progs/kfunc_call_test_subprog.c | 2 +- + .../testing/selftests/bpf/progs/local_kptr_stash.c | 2 +- + tools/testing/selftests/bpf/progs/map_kptr.c | 2 +- + tools/testing/selftests/bpf/progs/map_kptr_fail.c | 2 +- + tools/testing/selftests/bpf/progs/missed_kprobe.c | 2 +- + .../selftests/bpf/progs/missed_kprobe_recursion.c | 2 +- + tools/testing/selftests/bpf/progs/nested_acquire.c | 2 +- + tools/testing/selftests/bpf/progs/preempt_lock.c | 28 +- + tools/testing/selftests/bpf/progs/pro_epilogue.c | 4 +- + .../selftests/bpf/progs/pro_epilogue_goto_start.c | 4 +- + tools/testing/selftests/bpf/progs/sock_addr_kern.c | 2 +- + .../selftests/bpf/progs/struct_ops_detach.c | 2 +- + .../selftests/bpf/progs/struct_ops_forgotten_cb.c | 2 +- + .../selftests/bpf/progs/struct_ops_maybe_null.c | 2 +- + .../bpf/progs/struct_ops_maybe_null_fail.c | 2 +- + .../selftests/bpf/progs/struct_ops_module.c | 2 +- + .../selftests/bpf/progs/struct_ops_multi_pages.c | 2 +- + .../selftests/bpf/progs/struct_ops_nulled_out_cb.c | 2 +- + .../selftests/bpf/progs/struct_ops_private_stack.c | 2 +- + .../bpf/progs/struct_ops_private_stack_fail.c | 2 +- + .../bpf/progs/struct_ops_private_stack_recur.c | 2 +- + tools/testing/selftests/bpf/progs/syscall.c | 6 +- + .../selftests/bpf/progs/test_cls_redirect.c | 2 +- + .../selftests/bpf/progs/test_cls_redirect.h | 2 +- + .../selftests/bpf/progs/test_cls_redirect_dynptr.c | 2 +- + .../selftests/bpf/progs/test_fill_link_info.c | 13 +- + .../bpf/progs/test_kfunc_param_nullable.c | 2 +- + .../selftests/bpf/progs/test_module_attach.c | 2 +- + .../selftests/bpf/progs/test_tp_btf_nullable.c | 2 +- + tools/testing/selftests/bpf/progs/test_xdp_meta.c | 4 +- + .../testing/selftests/bpf/progs/unsupported_ops.c | 2 +- + .../selftests/bpf/progs/verifier_spin_lock.c | 2 +- + tools/testing/selftests/bpf/progs/wq.c | 2 +- + tools/testing/selftests/bpf/progs/wq_failures.c | 2 +- + tools/testing/selftests/bpf/test_flow_dissector.c | 780 ----------------- + tools/testing/selftests/bpf/test_flow_dissector.sh | 178 ---- + .../bpf/{bpf_testmod => test_kmods}/.gitignore | 0 + tools/testing/selftests/bpf/test_kmods/Makefile | 21 + + .../bpf_test_modorder_x.c | 0 + .../bpf_test_modorder_y.c | 0 + .../bpf_test_no_cfi.c | 0 + .../bpf_testmod-events.h | 0 + .../bpf/{bpf_testmod => test_kmods}/bpf_testmod.c | 0 + .../bpf/{bpf_testmod => test_kmods}/bpf_testmod.h | 0 + .../bpf_testmod_kfunc.h | 0 + tools/testing/selftests/bpf/test_progs.c | 15 + + tools/testing/selftests/bpf/test_progs.h | 15 + + tools/testing/selftests/bpf/test_tc_tunnel.sh | 1 + + tools/testing/selftests/bpf/test_xdp_meta.sh | 58 -- + tools/testing/selftests/bpf/veristat.c | 64 +- + tools/testing/selftests/bpf/xdp_hw_metadata.c | 5 +- + 114 files changed, 3474 insertions(+), 1718 deletions(-) + delete mode 100644 tools/testing/selftests/bpf/bpf_test_modorder_x/Makefile + delete mode 100644 tools/testing/selftests/bpf/bpf_test_modorder_y/Makefile + delete mode 100644 tools/testing/selftests/bpf/bpf_test_no_cfi/Makefile + delete mode 100644 tools/testing/selftests/bpf/bpf_testmod/Makefile + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_skb_direct_packet_access.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/fd_array.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/flow_dissector_classification.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_skb_direct_packet_access.c + create mode 100644 tools/testing/selftests/bpf/progs/irq.c + delete mode 100644 tools/testing/selftests/bpf/test_flow_dissector.c + delete mode 100755 tools/testing/selftests/bpf/test_flow_dissector.sh + rename tools/testing/selftests/bpf/{bpf_testmod => test_kmods}/.gitignore (100%) + create mode 100644 tools/testing/selftests/bpf/test_kmods/Makefile + rename tools/testing/selftests/bpf/{bpf_test_modorder_x => test_kmods}/bpf_test_modorder_x.c (100%) + rename tools/testing/selftests/bpf/{bpf_test_modorder_y => test_kmods}/bpf_test_modorder_y.c (100%) + rename tools/testing/selftests/bpf/{bpf_test_no_cfi => test_kmods}/bpf_test_no_cfi.c (100%) + rename tools/testing/selftests/bpf/{bpf_testmod => test_kmods}/bpf_testmod-events.h (100%) + rename tools/testing/selftests/bpf/{bpf_testmod => test_kmods}/bpf_testmod.c (100%) + rename tools/testing/selftests/bpf/{bpf_testmod => test_kmods}/bpf_testmod.h (100%) + rename tools/testing/selftests/bpf/{bpf_testmod => test_kmods}/bpf_testmod_kfunc.h (100%) + delete mode 100755 tools/testing/selftests/bpf/test_xdp_meta.sh +Merging ipsec-next/master (59af653a6998 Merge branch 'Add IP-TFS mode to xfrm') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Auto-merging include/uapi/linux/snmp.h +Auto-merging net/xfrm/xfrm_state.c +Merge made by the 'ort' strategy. + include/net/xfrm.h | 44 + + include/uapi/linux/in.h | 2 + + include/uapi/linux/ip.h | 16 + + include/uapi/linux/ipsec.h | 3 +- + include/uapi/linux/snmp.h | 2 + + include/uapi/linux/xfrm.h | 9 +- + net/ipv4/esp4.c | 3 +- + net/ipv6/esp6.c | 3 +- + net/netfilter/nft_xfrm.c | 3 +- + net/xfrm/Kconfig | 16 + + net/xfrm/Makefile | 1 + + net/xfrm/trace_iptfs.h | 218 ++++ + net/xfrm/xfrm_compat.c | 10 +- + net/xfrm/xfrm_device.c | 4 +- + net/xfrm/xfrm_input.c | 18 +- + net/xfrm/xfrm_iptfs.c | 2764 ++++++++++++++++++++++++++++++++++++++++++++ + net/xfrm/xfrm_output.c | 6 + + net/xfrm/xfrm_policy.c | 26 +- + net/xfrm/xfrm_proc.c | 2 + + net/xfrm/xfrm_state.c | 84 ++ + net/xfrm/xfrm_user.c | 77 ++ + 21 files changed, 3292 insertions(+), 19 deletions(-) + create mode 100644 net/xfrm/trace_iptfs.h + create mode 100644 net/xfrm/xfrm_iptfs.c +Merging mlx5-next/mlx5-next (aeb3ec990269 net/mlx5: Add device cap abs_native_port_num) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/main (4b252f2dab2e Merge branch 'selftests-net-packetdrill-import-multiple-tests') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (f3674384709b Merge branch 'net-smc-two-features-for-smc-r') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (514e14b1a7c3 Bluetooth: MGMT: Mark LL Privacy as stable) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging net/bluetooth/hci_core.c +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/iso.c +Auto-merging net/bluetooth/mgmt.c +Merge made by the 'ort' strategy. + include/net/bluetooth/hci.h | 1 - + include/net/bluetooth/hci_core.h | 11 +-- + net/bluetooth/hci_sync.c | 63 ++++++++------- + net/bluetooth/iso.c | 36 +++++++++ + net/bluetooth/mgmt.c | 171 +++++++++------------------------------ + 5 files changed, 113 insertions(+), 169 deletions(-) +Merging wireless-next/for-next (8ab3bf476413 wifi: wlcore: sysfs: constify 'struct bin_attribute') +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Auto-merging include/net/cfg80211.h +Auto-merging include/net/mac80211.h +Auto-merging net/mac80211/cfg.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/iface.c +Auto-merging net/mac80211/util.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/sme.c +Auto-merging net/wireless/tests/scan.c +Auto-merging net/wireless/util.c +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath11k/core.c | 132 ++ + drivers/net/wireless/ath/ath11k/core.h | 4 +- + drivers/net/wireless/ath/ath11k/dp.h | 1 - + drivers/net/wireless/ath/ath11k/dp_rx.c | 14 +- + drivers/net/wireless/ath/ath11k/hal.h | 6 +- + drivers/net/wireless/ath/ath11k/hal_rx.c | 3 +- + drivers/net/wireless/ath/ath11k/hw.h | 1 + + drivers/net/wireless/ath/ath11k/mac.c | 7 +- + drivers/net/wireless/ath/ath11k/mhi.c | 1 + + drivers/net/wireless/ath/ath11k/pci.c | 3 + + drivers/net/wireless/ath/ath11k/pcic.c | 13 +- + drivers/net/wireless/ath/ath11k/qmi.c | 8 +- + drivers/net/wireless/ath/ath11k/wow.c | 6 +- + drivers/net/wireless/ath/ath12k/core.c | 486 ++++- + drivers/net/wireless/ath/ath12k/core.h | 134 +- + drivers/net/wireless/ath/ath12k/debug.c | 6 +- + drivers/net/wireless/ath/ath12k/debug.h | 5 +- + .../net/wireless/ath/ath12k/debugfs_htt_stats.c | 681 ++++++- + .../net/wireless/ath/ath12k/debugfs_htt_stats.h | 218 ++- + drivers/net/wireless/ath/ath12k/dp.c | 70 +- + drivers/net/wireless/ath/ath12k/dp.h | 3 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 96 +- + drivers/net/wireless/ath/ath12k/dp_rx.h | 6 +- + drivers/net/wireless/ath/ath12k/hal_desc.h | 2 +- + drivers/net/wireless/ath/ath12k/hal_rx.c | 12 +- + drivers/net/wireless/ath/ath12k/mac.c | 1999 +++++++++++++++----- + drivers/net/wireless/ath/ath12k/mac.h | 16 +- + drivers/net/wireless/ath/ath12k/pci.c | 10 + + drivers/net/wireless/ath/ath12k/peer.c | 223 ++- + drivers/net/wireless/ath/ath12k/peer.h | 23 +- + drivers/net/wireless/ath/ath12k/qmi.c | 167 +- + drivers/net/wireless/ath/ath12k/qmi.h | 20 + + drivers/net/wireless/ath/ath12k/wmi.c | 207 +- + drivers/net/wireless/ath/ath12k/wmi.h | 115 ++ + drivers/net/wireless/ath/ath6kl/cfg80211.c | 1 + + drivers/net/wireless/ath/ath9k/antenna.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_mci.c | 4 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 2 + + drivers/net/wireless/ath/ath9k/channel.c | 2 +- + drivers/net/wireless/ath/ath9k/common-spectral.c | 2 +- + drivers/net/wireless/ath/ath9k/debug.c | 1 + + drivers/net/wireless/ath/ath9k/debug.h | 1 + + drivers/net/wireless/ath/ath9k/dfs.c | 2 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 4 +- + drivers/net/wireless/ath/ath9k/hw.h | 2 +- + drivers/net/wireless/ath/ath9k/link.c | 33 +- + drivers/net/wireless/ath/ath9k/mac.h | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 5 +- + drivers/net/wireless/ath/ath9k/wow.c | 6 +- + drivers/net/wireless/ath/ath9k/xmit.c | 2 +- + drivers/net/wireless/ath/wcn36xx/main.c | 5 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 5 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 8 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwil.h | 2 + + .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 3 + + .../net/wireless/intel/iwlwifi/mvm/vendor-cmd.c | 6 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +- + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 2 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 2 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/core.h | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/core.c | 20 + + drivers/net/wireless/realtek/rtlwifi/base.c | 13 +- + drivers/net/wireless/realtek/rtlwifi/base.h | 1 - + drivers/net/wireless/realtek/rtlwifi/pci.c | 61 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 7 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 4 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 12 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 12 - + drivers/net/wireless/realtek/rtw88/rtw8812au.c | 68 +- + drivers/net/wireless/realtek/rtw88/rtw8821au.c | 52 +- + drivers/net/wireless/realtek/rtw88/rtw8822bu.c | 6 + + drivers/net/wireless/realtek/rtw88/usb.c | 72 +- + drivers/net/wireless/realtek/rtw89/acpi.c | 47 + + drivers/net/wireless/realtek/rtw89/acpi.h | 9 + + drivers/net/wireless/realtek/rtw89/cam.c | 32 +- + drivers/net/wireless/realtek/rtw89/cam.h | 5 + + drivers/net/wireless/realtek/rtw89/core.c | 164 +- + drivers/net/wireless/realtek/rtw89/core.h | 145 ++ + drivers/net/wireless/realtek/rtw89/debug.c | 4 + + drivers/net/wireless/realtek/rtw89/fw.c | 266 ++- + drivers/net/wireless/realtek/rtw89/fw.h | 69 +- + drivers/net/wireless/realtek/rtw89/mac.c | 79 +- + drivers/net/wireless/realtek/rtw89/mac.h | 43 + + drivers/net/wireless/realtek/rtw89/mac80211.c | 289 ++- + drivers/net/wireless/realtek/rtw89/mac_be.c | 15 + + drivers/net/wireless/realtek/rtw89/pci.c | 16 +- + drivers/net/wireless/realtek/rtw89/pci.h | 9 + + drivers/net/wireless/realtek/rtw89/pci_be.c | 1 + + drivers/net/wireless/realtek/rtw89/phy.c | 315 ++- + drivers/net/wireless/realtek/rtw89/phy.h | 33 +- + drivers/net/wireless/realtek/rtw89/ps.c | 42 +- + drivers/net/wireless/realtek/rtw89/ps.h | 4 +- + drivers/net/wireless/realtek/rtw89/reg.h | 4 + + drivers/net/wireless/realtek/rtw89/regd.c | 57 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 6 +- + drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c | 2 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 7 +- + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 3 + + .../net/wireless/realtek/rtw89/rtw8852b_common.c | 50 +- + drivers/net/wireless/realtek/rtw89/rtw8852bt.c | 3 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 54 +- + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 6 +- + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 21 +- + drivers/net/wireless/realtek/rtw89/sar.c | 55 +- + drivers/net/wireless/realtek/rtw89/ser.c | 1 + + drivers/net/wireless/realtek/rtw89/txrx.h | 3 + + drivers/net/wireless/realtek/rtw89/wow.c | 11 +- + drivers/net/wireless/ti/wlcore/sysfs.c | 4 +- + drivers/net/wireless/ti/wlcore/testmode.c | 2 +- + drivers/net/wireless/virtual/mac80211_hwsim.c | 39 + + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3 +- + include/net/cfg80211.h | 6 +- + include/net/mac80211.h | 2 +- + net/mac80211/cfg.c | 16 +- + net/mac80211/debugfs.c | 4 +- + net/mac80211/driver-ops.h | 7 +- + net/mac80211/ethtool.c | 22 +- + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/iface.c | 25 +- + net/mac80211/main.c | 9 +- + net/mac80211/rx.c | 4 +- + net/mac80211/trace.h | 10 +- + net/mac80211/util.c | 29 +- + net/wireless/chan.c | 4 +- + net/wireless/core.c | 42 +- + net/wireless/mlme.c | 8 +- + net/wireless/nl80211.c | 203 +- + net/wireless/pmsr.c | 4 +- + net/wireless/rdev-ops.h | 7 +- + net/wireless/reg.c | 53 +- + net/wireless/scan.c | 40 +- + net/wireless/sme.c | 12 +- + net/wireless/tests/scan.c | 2 + + net/wireless/trace.h | 44 +- + net/wireless/util.c | 7 +- + net/wireless/wext-compat.c | 317 ++-- + net/wireless/wext-sme.c | 43 +- + 145 files changed, 6347 insertions(+), 1645 deletions(-) +Merging ath-next/for-next (578f6fc55c2c wifi: ath12k: Fix spelling mistake "requestted" -> "requested") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Merge made by the 'ort' strategy. + .../bindings/net/wireless/qcom,ath12k-wsi.yaml | 204 +++++++ + drivers/net/wireless/ath/ath12k/core.c | 293 ++++++++- + drivers/net/wireless/ath/ath12k/core.h | 46 +- + drivers/net/wireless/ath/ath12k/dp.c | 14 + + drivers/net/wireless/ath/ath12k/dp.h | 18 +- + drivers/net/wireless/ath/ath12k/dp_mon.c | 156 ++--- + drivers/net/wireless/ath/ath12k/dp_rx.c | 225 +++++-- + drivers/net/wireless/ath/ath12k/fw.h | 3 + + drivers/net/wireless/ath/ath12k/hal.c | 2 +- + drivers/net/wireless/ath/ath12k/hal.h | 2 +- + drivers/net/wireless/ath/ath12k/hal_desc.h | 4 +- + drivers/net/wireless/ath/ath12k/hal_rx.h | 14 +- + drivers/net/wireless/ath/ath12k/mac.c | 665 +++++++++++++++++---- + drivers/net/wireless/ath/ath12k/mac.h | 3 + + drivers/net/wireless/ath/ath12k/peer.c | 2 + + drivers/net/wireless/ath/ath12k/peer.h | 3 + + drivers/net/wireless/ath/ath12k/qmi.c | 324 ++++++++-- + drivers/net/wireless/ath/ath12k/qmi.h | 1 + + drivers/net/wireless/ath/ath12k/wmi.c | 208 ++++++- + drivers/net/wireless/ath/ath12k/wmi.h | 56 ++ + drivers/net/wireless/ath/ath9k/ath9k.h | 8 +- + drivers/net/wireless/ath/ath9k/beacon.c | 2 +- + drivers/net/wireless/ath/ath9k/channel.c | 29 +- + drivers/net/wireless/ath/ath9k/hw.c | 25 +- + drivers/net/wireless/ath/ath9k/hw.h | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 9 +- + drivers/net/wireless/ath/ath9k/recv.c | 4 +- + drivers/net/wireless/ath/ath9k/xmit.c | 52 +- + 28 files changed, 1913 insertions(+), 461 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath12k-wsi.yaml +Merging wpan-next/master (aad4b41a3419 Documentation: ieee802154: fix grammar) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Merge made by the 'ort' strategy. + Documentation/networking/ieee802154.rst | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) +Merging wpan-staging/staging (aad4b41a3419 Documentation: ieee802154: fix grammar) +$ git merge -m Merge branch 'staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (02ba194feacb mtd: mchp48l640: add support for Fujitsu MB85RS128TY FRAM) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + .../bindings/mtd/microchip,mchp48l640.yaml | 5 ++-- + drivers/mtd/devices/mchp48l640.c | 28 +++++++++++++++++++--- + drivers/mtd/devices/phram.c | 13 ++++++---- + 3 files changed, 37 insertions(+), 9 deletions(-) +Merging nand/nand/next (1a50e3612de9 mtd: spinand: Add support for SkyHigh S35ML-3 family) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/davinci-nand.txt | 94 ------------- + .../devicetree/bindings/mtd/ti,davinci-nand.yaml | 124 +++++++++++++++++ + drivers/mtd/nand/onenand/onenand_base.c | 1 + + drivers/mtd/nand/raw/davinci_nand.c | 4 + + drivers/mtd/nand/spi/Makefile | 2 +- + drivers/mtd/nand/spi/core.c | 25 +++- + drivers/mtd/nand/spi/foresee.c | 10 ++ + drivers/mtd/nand/spi/skyhigh.c | 147 +++++++++++++++++++++ + include/linux/mtd/spinand.h | 2 + + 9 files changed, 309 insertions(+), 100 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mtd/davinci-nand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/ti,davinci-nand.yaml + create mode 100644 drivers/mtd/nand/spi/skyhigh.c +Merging spi-nor/spi-nor/next (93e00ccab5f7 mtd: spi-nor: macronix: remove mx25u25635f from parts list to enable SFDP) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 4 ++++ + drivers/mtd/spi-nor/atmel.c | 4 ++++ + drivers/mtd/spi-nor/core.c | 19 ++++++++++++------- + drivers/mtd/spi-nor/macronix.c | 9 ++------- + 4 files changed, 22 insertions(+), 14 deletions(-) +Merging crypto/master (f916e44487f5 crypto: keywrap - remove assignment of 0 to cra_alignmask) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/crypto/qcom,inline-crypto-engine.yaml | 1 + + .../devicetree/bindings/crypto/qcom,prng.yaml | 1 + + .../devicetree/bindings/crypto/qcom-qce.yaml | 1 + + MAINTAINERS | 2 +- + arch/x86/crypto/aegis128-aesni-glue.c | 1 - + arch/x86/crypto/blowfish_glue.c | 1 - + arch/x86/crypto/camellia_glue.c | 1 - + arch/x86/crypto/des3_ede_glue.c | 1 - + arch/x86/crypto/twofish_glue.c | 1 - + crypto/aegis128-core.c | 2 - + crypto/algapi.c | 31 +- + crypto/anubis.c | 14 +- + crypto/aria_generic.c | 37 +- + crypto/keywrap.c | 1 - + crypto/khazad.c | 17 +- + crypto/seed.c | 48 +- + crypto/sig.c | 4 +- + crypto/skcipher.c | 185 +- + crypto/tea.c | 83 +- + drivers/crypto/Kconfig | 17 - + drivers/crypto/Makefile | 2 - + drivers/crypto/caam/blob_gen.c | 3 +- + drivers/crypto/ccp/dbc.c | 53 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 12 + + drivers/crypto/hisilicon/qm.c | 58 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 12 + + drivers/crypto/hisilicon/zip/Makefile | 2 +- + drivers/crypto/hisilicon/zip/dae_main.c | 262 +++ + drivers/crypto/hisilicon/zip/zip.h | 8 + + drivers/crypto/hisilicon/zip/zip_main.c | 51 +- + drivers/crypto/n2_asm.S | 96 - + drivers/crypto/n2_core.c | 2168 -------------------- + drivers/crypto/n2_core.h | 232 --- + drivers/crypto/qce/aead.c | 2 +- + drivers/crypto/qce/core.c | 131 +- + drivers/crypto/qce/core.h | 9 +- + drivers/crypto/qce/dma.c | 22 +- + drivers/crypto/qce/dma.h | 3 +- + drivers/crypto/qce/sha.c | 8 +- + drivers/crypto/qce/skcipher.c | 2 +- + drivers/crypto/tegra/tegra-se-aes.c | 7 +- + drivers/crypto/tegra/tegra-se-hash.c | 7 +- + include/crypto/internal/skcipher.h | 12 - + include/linux/hisi_acc_qm.h | 5 + + 44 files changed, 619 insertions(+), 2997 deletions(-) + create mode 100644 drivers/crypto/hisilicon/zip/dae_main.c + delete mode 100644 drivers/crypto/n2_asm.S + delete mode 100644 drivers/crypto/n2_core.c + delete mode 100644 drivers/crypto/n2_core.h +Merging drm/drm-next (301e2772295e Merge tag 'drm-intel-gt-next-2024-12-18' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging MAINTAINERS +Auto-merging drivers/accel/habanalabs/common/habanalabs_drv.c +Auto-merging drivers/accel/ivpu/ivpu_pm.c +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/xe/tests/xe_migrate.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c +Auto-merging drivers/gpu/drm/xe/xe_pt.c +Auto-merging drivers/gpu/drm/xe/xe_reg_sr.c +Merge made by the 'ort' strategy. + Documentation/accel/amdxdna/amdnpu.rst | 281 +++++++ + Documentation/accel/amdxdna/index.rst | 11 + + Documentation/accel/index.rst | 1 + + .../bindings/display/brcm,bcm2711-hdmi.yaml | 2 + + .../bindings/display/brcm,bcm2835-hvs.yaml | 5 +- + .../bindings/display/brcm,bcm2835-pixelvalve0.yaml | 3 + + .../bindings/display/brcm,bcm2835-txp.yaml | 5 +- + .../bindings/display/brcm,bcm2835-vc4.yaml | 1 + + .../bindings/display/panel/samsung,atna33xc20.yaml | 2 + + Documentation/gpu/drm-kms-helpers.rst | 3 + + Documentation/gpu/xe/index.rst | 1 + + Documentation/gpu/xe/xe_devcoredump.rst | 14 + + MAINTAINERS | 14 +- + drivers/accel/Kconfig | 1 + + drivers/accel/Makefile | 1 + + drivers/accel/amdxdna/Kconfig | 18 + + drivers/accel/amdxdna/Makefile | 21 + + drivers/accel/amdxdna/TODO | 5 + + drivers/accel/amdxdna/aie2_ctx.c | 900 +++++++++++++++++++++ + drivers/accel/amdxdna/aie2_error.c | 360 +++++++++ + drivers/accel/amdxdna/aie2_message.c | 791 ++++++++++++++++++ + drivers/accel/amdxdna/aie2_msg_priv.h | 370 +++++++++ + drivers/accel/amdxdna/aie2_pci.c | 762 +++++++++++++++++ + drivers/accel/amdxdna/aie2_pci.h | 259 ++++++ + drivers/accel/amdxdna/aie2_psp.c | 146 ++++ + drivers/accel/amdxdna/aie2_smu.c | 119 +++ + drivers/accel/amdxdna/aie2_solver.c | 330 ++++++++ + drivers/accel/amdxdna/aie2_solver.h | 154 ++++ + drivers/accel/amdxdna/amdxdna_ctx.c | 553 +++++++++++++ + drivers/accel/amdxdna/amdxdna_ctx.h | 162 ++++ + drivers/accel/amdxdna/amdxdna_gem.c | 622 ++++++++++++++ + drivers/accel/amdxdna/amdxdna_gem.h | 65 ++ + drivers/accel/amdxdna/amdxdna_mailbox.c | 576 +++++++++++++ + drivers/accel/amdxdna/amdxdna_mailbox.h | 124 +++ + drivers/accel/amdxdna/amdxdna_mailbox_helper.c | 61 ++ + drivers/accel/amdxdna/amdxdna_mailbox_helper.h | 42 + + drivers/accel/amdxdna/amdxdna_pci_drv.c | 409 ++++++++++ + drivers/accel/amdxdna/amdxdna_pci_drv.h | 123 +++ + drivers/accel/amdxdna/amdxdna_sysfs.c | 67 ++ + drivers/accel/amdxdna/npu1_regs.c | 101 +++ + drivers/accel/amdxdna/npu2_regs.c | 118 +++ + drivers/accel/amdxdna/npu4_regs.c | 118 +++ + drivers/accel/amdxdna/npu5_regs.c | 118 +++ + drivers/accel/habanalabs/common/habanalabs_drv.c | 1 - + drivers/accel/ivpu/ivpu_drv.c | 8 - + drivers/accel/ivpu/ivpu_pm.c | 2 +- + drivers/accel/qaic/qaic_drv.c | 1 - + drivers/accel/qaic/sahara.c | 3 +- + drivers/gpu/drm/Kconfig | 76 +- + drivers/gpu/drm/Makefile | 10 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h | 1 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 + + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 1 - + drivers/gpu/drm/arm/hdlcd_drv.c | 3 +- + drivers/gpu/drm/arm/malidp_drv.c | 3 +- + drivers/gpu/drm/armada/armada_drv.c | 3 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 +- + drivers/gpu/drm/ast/ast_drv.c | 3 +- + drivers/gpu/drm/ast/ast_drv.h | 1 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 3 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 28 - + .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.h | 3 - + drivers/gpu/drm/bridge/chipone-icn6211.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +- + drivers/gpu/drm/clients/Kconfig | 73 ++ + drivers/gpu/drm/clients/Makefile | 5 + + .../gpu/drm/clients/drm_client_internal.h | 4 +- + drivers/gpu/drm/{ => clients}/drm_client_setup.c | 5 +- + drivers/gpu/drm/{ => clients}/drm_fbdev_client.c | 4 +- + drivers/gpu/drm/display/drm_dp_helper.c | 125 ++- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 88 +- + drivers/gpu/drm/drm_of.c | 4 +- + drivers/gpu/drm/drm_panel_backlight_quirks.c | 94 +++ + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 3 +- + drivers/gpu/drm/gma500/psb_drv.c | 3 +- + drivers/gpu/drm/gma500/psb_drv.h | 1 - + drivers/gpu/drm/gud/gud_drv.c | 3 +- + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 3 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1 - + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +- + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 7 + + drivers/gpu/drm/i915/display/intel_tc.c | 39 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 3 - + .../gpu/drm/i915/gt/intel_execlists_submission.c | 9 - + drivers/gpu/drm/i915/gt/selftest_rps.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 12 +- + drivers/gpu/drm/i915/i915_driver.c | 1 - + drivers/gpu/drm/i915/i915_driver.h | 1 - + drivers/gpu/drm/i915/i915_gpu_error.c | 1 - + drivers/gpu/drm/i915/i915_mm.c | 4 +- + drivers/gpu/drm/i915/i915_pmu.c | 50 +- + drivers/gpu/drm/i915/i915_pmu.h | 4 +- + drivers/gpu/drm/imagination/pvr_drv.c | 1 - + drivers/gpu/drm/imagination/pvr_drv.h | 1 - + drivers/gpu/drm/imx/dcss/dcss-kms.c | 3 +- + drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 3 +- + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 3 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 3 +- + drivers/gpu/drm/kmb/kmb_drv.c | 3 +- + drivers/gpu/drm/kmb/kmb_drv.h | 1 - + drivers/gpu/drm/lima/lima_drv.c | 1 - + drivers/gpu/drm/logicvc/logicvc_drm.c | 3 +- + drivers/gpu/drm/loongson/lsdc_drv.c | 10 +- + drivers/gpu/drm/mcde/mcde_drv.c | 3 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +- + drivers/gpu/drm/meson/meson_drv.c | 3 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - + drivers/gpu/drm/msm/msm_drv.c | 3 +- + drivers/gpu/drm/mxsfb/lcdif_drv.c | 3 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 3 +- + drivers/gpu/drm/nouveau/include/nvif/log.h | 51 ++ + drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 21 + + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 16 + + drivers/gpu/drm/nouveau/nouveau_debugfs.h | 16 + + drivers/gpu/drm/nouveau/nouveau_drm.c | 45 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 1 - + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 508 +++++++++++- + drivers/gpu/drm/omapdrm/omap_drv.c | 2 - + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- + drivers/gpu/drm/panel/panel-edp.c | 8 + + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 1 - + drivers/gpu/drm/panfrost/panfrost_gpu.c | 4 + + drivers/gpu/drm/panthor/panthor_device.c | 22 +- + drivers/gpu/drm/panthor/panthor_drv.c | 1 - + drivers/gpu/drm/panthor/panthor_fw.c | 78 +- + drivers/gpu/drm/panthor/panthor_gpu.c | 9 + + drivers/gpu/drm/panthor/panthor_mmu.c | 23 +- + drivers/gpu/drm/pl111/pl111_drv.c | 3 +- + drivers/gpu/drm/qxl/Kconfig | 1 + + drivers/gpu/drm/qxl/qxl_drv.c | 3 +- + drivers/gpu/drm/qxl/qxl_drv.h | 8 +- + drivers/gpu/drm/qxl/qxl_release.c | 68 +- + drivers/gpu/drm/radeon/Kconfig | 1 + + drivers/gpu/drm/radeon/radeon.h | 7 +- + drivers/gpu/drm/radeon/radeon_cs.c | 45 +- + drivers/gpu/drm/radeon/radeon_drv.c | 3 +- + drivers/gpu/drm/radeon/radeon_drv.h | 1 - + drivers/gpu/drm/radeon/radeon_gem.c | 39 +- + drivers/gpu/drm/radeon/radeon_object.c | 25 +- + drivers/gpu/drm/radeon/radeon_object.h | 2 +- + drivers/gpu/drm/radeon/radeon_vm.c | 10 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 3 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 3 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 6 +- + drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 3 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 216 ++++- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 5 + + drivers/gpu/drm/solomon/ssd130x.c | 4 +- + drivers/gpu/drm/sprd/sprd_drm.c | 2 - + drivers/gpu/drm/sti/sti_drv.c | 4 +- + drivers/gpu/drm/stm/drv.c | 3 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 3 +- + drivers/gpu/drm/tegra/drm.c | 4 +- + drivers/gpu/drm/tidss/tidss_dispc.c | 28 +- + drivers/gpu/drm/tidss/tidss_drv.c | 5 +- + drivers/gpu/drm/tidss/tidss_drv.h | 5 +- + drivers/gpu/drm/tidss/tidss_irq.c | 34 +- + drivers/gpu/drm/tidss/tidss_irq.h | 4 +- + drivers/gpu/drm/tidss/tidss_plane.c | 8 + + drivers/gpu/drm/tidss/tidss_plane.h | 2 + + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 3 +- + drivers/gpu/drm/tiny/Makefile | 2 +- + drivers/gpu/drm/tiny/arcpgu.c | 6 +- + drivers/gpu/drm/tiny/bochs.c | 3 +- + drivers/gpu/drm/tiny/{cirrus.c => cirrus-qemu.c} | 10 +- + drivers/gpu/drm/tiny/gm12u320.c | 4 +- + drivers/gpu/drm/tiny/hx8357d.c | 3 +- + drivers/gpu/drm/tiny/ili9163.c | 3 +- + drivers/gpu/drm/tiny/ili9225.c | 3 +- + drivers/gpu/drm/tiny/ili9341.c | 3 +- + drivers/gpu/drm/tiny/ili9486.c | 3 +- + drivers/gpu/drm/tiny/mi0283qt.c | 3 +- + drivers/gpu/drm/tiny/ofdrm.c | 4 +- + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 3 +- + drivers/gpu/drm/tiny/repaper.c | 3 +- + drivers/gpu/drm/tiny/sharp-memory.c | 3 +- + drivers/gpu/drm/tiny/simpledrm.c | 4 +- + drivers/gpu/drm/tiny/st7586.c | 3 +- + drivers/gpu/drm/tiny/st7735r.c | 3 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 54 +- + drivers/gpu/drm/tve200/tve200_drv.c | 3 +- + drivers/gpu/drm/udl/udl_drv.c | 3 +- + drivers/gpu/drm/udl/udl_drv.h | 1 - + drivers/gpu/drm/v3d/v3d_debugfs.c | 4 +- + drivers/gpu/drm/v3d/v3d_drv.c | 3 +- + drivers/gpu/drm/v3d/v3d_drv.h | 8 + + drivers/gpu/drm/v3d/v3d_perfmon.c | 57 +- + drivers/gpu/drm/v3d/v3d_regs.h | 29 +- + drivers/gpu/drm/v3d/v3d_sched.c | 14 +- + drivers/gpu/drm/v3d/v3d_submit.c | 10 + + drivers/gpu/drm/vboxvideo/vbox_drv.c | 3 +- + drivers/gpu/drm/vboxvideo/vbox_drv.h | 1 - + drivers/gpu/drm/vc4/tests/vc4_mock.c | 8 +- + drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 106 +-- + drivers/gpu/drm/vc4/vc4_crtc.c | 96 ++- + drivers/gpu/drm/vc4/vc4_drv.c | 24 +- + drivers/gpu/drm/vc4/vc4_drv.h | 54 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 107 ++- + drivers/gpu/drm/vc4/vc4_hdmi.h | 4 + + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 640 +++++++++++++++ + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 217 +++++ + drivers/gpu/drm/vc4/vc4_hvs.c | 737 +++++++++++++++-- + drivers/gpu/drm/vc4/vc4_kms.c | 105 ++- + drivers/gpu/drm/vc4/vc4_plane.c | 868 +++++++++++++++++++- + drivers/gpu/drm/vc4/vc4_regs.h | 297 +++++++ + drivers/gpu/drm/vc4/vc4_txp.c | 91 ++- + drivers/gpu/drm/vgem/vgem_drv.c | 2 - + drivers/gpu/drm/virtio/virtgpu_drv.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 21 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 23 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 24 + + drivers/gpu/drm/virtio/virtgpu_plane.c | 125 ++- + drivers/gpu/drm/virtio/virtgpu_prime.c | 178 +++- + drivers/gpu/drm/virtio/virtgpu_vq.c | 35 + + drivers/gpu/drm/vkms/vkms_composer.c | 310 +++++-- + drivers/gpu/drm/vkms/vkms_crtc.c | 6 +- + drivers/gpu/drm/vkms/vkms_drv.c | 9 +- + drivers/gpu/drm/vkms/vkms_drv.h | 63 +- + drivers/gpu/drm/vkms/vkms_formats.c | 413 +++++++--- + drivers/gpu/drm/vkms/vkms_formats.h | 4 +- + drivers/gpu/drm/vkms/vkms_output.c | 49 +- + drivers/gpu/drm/vkms/vkms_plane.c | 19 +- + drivers/gpu/drm/vkms/vkms_writeback.c | 5 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 1 - + drivers/gpu/drm/xe/Makefile | 5 +- + drivers/gpu/drm/xe/abi/guc_actions_abi.h | 20 + + drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 38 + + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 14 + + drivers/gpu/drm/xe/display/ext/i915_irq.c | 13 +- + drivers/gpu/drm/xe/display/intel_bo.c | 25 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 12 +- + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 2 + + drivers/gpu/drm/xe/regs/xe_oa_regs.h | 9 +- + drivers/gpu/drm/xe/regs/xe_pmt.h | 19 + + drivers/gpu/drm/xe/tests/xe_bo.c | 7 + + drivers/gpu/drm/xe/tests/xe_migrate.c | 13 +- + drivers/gpu/drm/xe/xe_assert.h | 8 +- + drivers/gpu/drm/xe/xe_bo.c | 182 ++++- + drivers/gpu/drm/xe/xe_bo.h | 33 +- + drivers/gpu/drm/xe/xe_bo_evict.c | 14 +- + drivers/gpu/drm/xe/xe_bo_types.h | 6 +- + drivers/gpu/drm/xe/xe_devcoredump.c | 121 ++- + drivers/gpu/drm/xe/xe_devcoredump.h | 7 +- + drivers/gpu/drm/xe/xe_devcoredump_types.h | 10 +- + drivers/gpu/drm/xe/xe_device.c | 9 +- + drivers/gpu/drm/xe/xe_device_types.h | 57 +- + drivers/gpu/drm/xe/xe_drm_client.c | 80 +- + drivers/gpu/drm/xe/xe_drv.h | 1 - + drivers/gpu/drm/xe/xe_exec_queue.c | 7 + + drivers/gpu/drm/xe/xe_ggtt.c | 35 +- + drivers/gpu/drm/xe/xe_gpu_scheduler.h | 10 +- + drivers/gpu/drm/xe/xe_gsc_proxy.c | 47 +- + drivers/gpu/drm/xe/xe_gt.c | 4 +- + drivers/gpu/drm/xe/xe_gt_pagefault.c | 1 - + drivers/gpu/drm/xe/xe_gt_printk.h | 31 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 78 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 3 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config_types.h | 2 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 5 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_helpers.h | 2 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c | 27 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 63 ++ + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 2 + + drivers/gpu/drm/xe/xe_gt_stats.h | 8 +- + drivers/gpu/drm/xe/xe_gt_stats_types.h | 15 + + drivers/gpu/drm/xe/xe_gt_throttle.c | 2 + + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 13 +- + drivers/gpu/drm/xe/xe_gt_types.h | 4 +- + drivers/gpu/drm/xe/xe_guc.c | 320 +++++++- + drivers/gpu/drm/xe/xe_guc_ads.c | 11 +- + drivers/gpu/drm/xe/xe_guc_capture.c | 33 +- + drivers/gpu/drm/xe/xe_guc_capture.h | 6 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 32 +- + drivers/gpu/drm/xe/xe_guc_fwif.h | 1 + + drivers/gpu/drm/xe/xe_guc_klv_helpers.c | 2 + + drivers/gpu/drm/xe/xe_guc_submit.c | 151 ++-- + drivers/gpu/drm/xe/xe_guc_types.h | 10 + + drivers/gpu/drm/xe/xe_heci_gsc.c | 8 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 11 +- + drivers/gpu/drm/xe/xe_hw_engine.h | 4 +- + drivers/gpu/drm/xe/xe_hw_engine_types.h | 2 - + drivers/gpu/drm/xe/xe_irq.c | 37 +- + drivers/gpu/drm/xe/xe_lrc.c | 29 + + drivers/gpu/drm/xe/xe_lrc.h | 4 + + drivers/gpu/drm/xe/xe_macros.h | 12 +- + drivers/gpu/drm/xe/xe_memirq.c | 26 +- + drivers/gpu/drm/xe/xe_module.c | 2 +- + drivers/gpu/drm/xe/xe_oa.c | 55 +- + drivers/gpu/drm/xe/xe_oa_types.h | 2 +- + drivers/gpu/drm/xe/xe_pm.c | 3 - + drivers/gpu/drm/xe/xe_pt.c | 3 + + drivers/gpu/drm/xe/xe_query.c | 4 +- + drivers/gpu/drm/xe/xe_reg_sr.c | 53 -- + drivers/gpu/drm/xe/xe_reg_whitelist.c | 37 + + drivers/gpu/drm/xe/xe_sriov.c | 4 + + drivers/gpu/drm/xe/xe_sriov_pf_helpers.h | 2 +- + drivers/gpu/drm/xe/xe_sriov_types.h | 17 + + drivers/gpu/drm/xe/xe_sriov_vf.c | 263 ++++++ + drivers/gpu/drm/xe/xe_sriov_vf.h | 14 + + drivers/gpu/drm/xe/xe_trace.h | 11 +- + drivers/gpu/drm/xe/xe_trace_bo.h | 5 + + drivers/gpu/drm/xe/xe_trace_lrc.c | 9 + + drivers/gpu/drm/xe/xe_trace_lrc.h | 52 ++ + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 53 +- + drivers/gpu/drm/xe/xe_vm.c | 33 +- + drivers/gpu/drm/xe/xe_vm.h | 1 - + drivers/gpu/drm/xe/xe_vm_doc.h | 22 +- + drivers/gpu/drm/xe/xe_vsec.c | 233 ++++++ + drivers/gpu/drm/xe/xe_vsec.h | 11 + + drivers/gpu/drm/xe/xe_wa.c | 6 + + drivers/gpu/drm/xe/xe_wa_oob.rules | 1 + + drivers/gpu/drm/xen/xen_drm_front.c | 6 - + drivers/gpu/drm/xlnx/zynqmp_kms.c | 3 +- + include/drm/{ => clients}/drm_client_setup.h | 0 + include/drm/display/drm_dp_helper.h | 5 + + include/drm/drm_drv.h | 2 - + include/drm/drm_utils.h | 4 + + include/drm/intel/xe_pciids.h | 235 ++++++ + include/drm/ttm/ttm_bo.h | 2 + + include/trace/events/amdxdna.h | 101 +++ + include/uapi/drm/amdxdna_accel.h | 436 ++++++++++ + include/uapi/drm/v3d_drm.h | 18 + + include/uapi/drm/xe_drm.h | 9 + + 344 files changed, 16606 insertions(+), 1806 deletions(-) + create mode 100644 Documentation/accel/amdxdna/amdnpu.rst + create mode 100644 Documentation/accel/amdxdna/index.rst + create mode 100644 Documentation/gpu/xe/xe_devcoredump.rst + create mode 100644 drivers/accel/amdxdna/Kconfig + create mode 100644 drivers/accel/amdxdna/Makefile + create mode 100644 drivers/accel/amdxdna/TODO + create mode 100644 drivers/accel/amdxdna/aie2_ctx.c + create mode 100644 drivers/accel/amdxdna/aie2_error.c + create mode 100644 drivers/accel/amdxdna/aie2_message.c + create mode 100644 drivers/accel/amdxdna/aie2_msg_priv.h + create mode 100644 drivers/accel/amdxdna/aie2_pci.c + create mode 100644 drivers/accel/amdxdna/aie2_pci.h + create mode 100644 drivers/accel/amdxdna/aie2_psp.c + create mode 100644 drivers/accel/amdxdna/aie2_smu.c + create mode 100644 drivers/accel/amdxdna/aie2_solver.c + create mode 100644 drivers/accel/amdxdna/aie2_solver.h + create mode 100644 drivers/accel/amdxdna/amdxdna_ctx.c + create mode 100644 drivers/accel/amdxdna/amdxdna_ctx.h + create mode 100644 drivers/accel/amdxdna/amdxdna_gem.c + create mode 100644 drivers/accel/amdxdna/amdxdna_gem.h + create mode 100644 drivers/accel/amdxdna/amdxdna_mailbox.c + create mode 100644 drivers/accel/amdxdna/amdxdna_mailbox.h + create mode 100644 drivers/accel/amdxdna/amdxdna_mailbox_helper.c + create mode 100644 drivers/accel/amdxdna/amdxdna_mailbox_helper.h + create mode 100644 drivers/accel/amdxdna/amdxdna_pci_drv.c + create mode 100644 drivers/accel/amdxdna/amdxdna_pci_drv.h + create mode 100644 drivers/accel/amdxdna/amdxdna_sysfs.c + create mode 100644 drivers/accel/amdxdna/npu1_regs.c + create mode 100644 drivers/accel/amdxdna/npu2_regs.c + create mode 100644 drivers/accel/amdxdna/npu4_regs.c + create mode 100644 drivers/accel/amdxdna/npu5_regs.c + create mode 100644 drivers/gpu/drm/clients/Kconfig + create mode 100644 drivers/gpu/drm/clients/Makefile + rename include/drm/drm_fbdev_client.h => drivers/gpu/drm/clients/drm_client_internal.h (85%) + rename drivers/gpu/drm/{ => clients}/drm_client_setup.c (96%) + rename drivers/gpu/drm/{ => clients}/drm_fbdev_client.c (98%) + create mode 100644 drivers/gpu/drm/drm_panel_backlight_quirks.c + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/log.h + rename drivers/gpu/drm/tiny/{cirrus.c => cirrus-qemu.c} (99%) + create mode 100644 drivers/gpu/drm/xe/regs/xe_pmt.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_stats_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_vf.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_vf.h + create mode 100644 drivers/gpu/drm/xe/xe_trace_lrc.c + create mode 100644 drivers/gpu/drm/xe/xe_trace_lrc.h + create mode 100644 drivers/gpu/drm/xe/xe_vsec.c + create mode 100644 drivers/gpu/drm/xe/xe_vsec.h + rename include/drm/{ => clients}/drm_client_setup.h (100%) + create mode 100644 include/drm/intel/xe_pciids.h + create mode 100644 include/trace/events/amdxdna.h + create mode 100644 include/uapi/drm/amdxdna_accel.h +Merging drm-exynos/for-linux-next (a46b48810254 drm/exynos: Remove unnecessary checking) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging drm-misc/for-linux-next (74ef9527bd87 drm/amdgpu: track bo memory stats at runtime) + 314d44bc8eaa ("drm/sched: Fix drm_sched_fini() docu generation") +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/drm_modes.c +Auto-merging drivers/gpu/drm/msm/dp/dp_audio.c +Auto-merging drivers/gpu/drm/xe/xe_drm_client.c +Merge made by the 'ort' strategy. + .../display/bridge/renesas,dsi-csi2-tx.yaml | 1 + + .../bindings/display/bridge/ti,sn65dsi83.yaml | 34 +- + .../bindings/display/panel/panel-lvds.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 6 + + .../devicetree/bindings/display/renesas,du.yaml | 67 +- + .../rockchip/rockchip,rk3588-mipi-dsi2.yaml | 120 +++ + .../bindings/display/xlnx/xlnx,zynqmp-dpsub.yaml | 10 +- + Documentation/gpu/drm-usage-stats.rst | 54 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 7 +- + drivers/accel/amdxdna/Makefile | 4 +- + drivers/accel/amdxdna/TODO | 2 - + drivers/accel/amdxdna/aie2_ctx.c | 16 +- + drivers/accel/amdxdna/aie2_message.c | 43 +- + drivers/accel/amdxdna/aie2_pci.c | 256 ++++- + drivers/accel/amdxdna/aie2_pci.h | 68 +- + drivers/accel/amdxdna/aie2_pm.c | 108 ++ + drivers/accel/amdxdna/aie2_smu.c | 85 +- + drivers/accel/amdxdna/aie2_solver.c | 60 +- + drivers/accel/amdxdna/aie2_solver.h | 1 + + drivers/accel/amdxdna/amdxdna_ctx.c | 53 +- + drivers/accel/amdxdna/amdxdna_gem.c | 2 +- + drivers/accel/amdxdna/amdxdna_mailbox.c | 61 +- + drivers/accel/amdxdna/amdxdna_pci_drv.c | 28 +- + drivers/accel/amdxdna/amdxdna_pci_drv.h | 26 +- + drivers/accel/amdxdna/npu1_regs.c | 31 +- + drivers/accel/amdxdna/npu2_regs.c | 17 +- + drivers/accel/amdxdna/npu4_regs.c | 34 +- + drivers/accel/amdxdna/npu5_regs.c | 17 +- + drivers/accel/amdxdna/npu6_regs.c | 114 +++ + drivers/gpu/drm/Kconfig | 5 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 111 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 209 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 5 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 2 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 4 +- + drivers/gpu/drm/bridge/chrontel-ch7033.c | 2 +- + drivers/gpu/drm/bridge/ite-it6263.c | 27 +- + drivers/gpu/drm/bridge/ite-it6505.c | 2 +- + drivers/gpu/drm/bridge/ite-it66121.c | 2 + + drivers/gpu/drm/bridge/lontium-lt8912b.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 6 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 2 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 8 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 4 +- + drivers/gpu/drm/bridge/sii902x.c | 4 +- + drivers/gpu/drm/bridge/sii9234.c | 4 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 4 +- + drivers/gpu/drm/bridge/synopsys/Kconfig | 6 + + drivers/gpu/drm/bridge/synopsys/Makefile | 1 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 12 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 1030 ++++++++++++++++++++ + drivers/gpu/drm/bridge/tc358767.c | 2 +- + drivers/gpu/drm/bridge/tc358768.c | 4 +- + drivers/gpu/drm/bridge/ti-dlpc3433.c | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 147 ++- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 4 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 2 +- + drivers/gpu/drm/clients/Kconfig | 50 + + drivers/gpu/drm/clients/Makefile | 3 + + drivers/gpu/drm/clients/drm_client_internal.h | 6 + + drivers/gpu/drm/clients/drm_client_setup.c | 29 +- + drivers/gpu/drm/clients/drm_log.c | 420 ++++++++ + drivers/gpu/drm/display/drm_bridge_connector.c | 16 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 2 +- + drivers/gpu/drm/display/drm_hdmi_state_helper.c | 29 + + drivers/gpu/drm/drm_connector.c | 169 +++- + drivers/gpu/drm/drm_draw.c | 233 +++++ + drivers/gpu/drm/drm_draw_internal.h | 56 ++ + drivers/gpu/drm/drm_edid.c | 6 + + drivers/gpu/drm/drm_file.c | 23 +- + drivers/gpu/drm/drm_mode_config.c | 9 + + drivers/gpu/drm/drm_modes.c | 3 +- + drivers/gpu/drm/drm_panel.c | 1 + + drivers/gpu/drm/drm_panic.c | 269 +---- + drivers/gpu/drm/exynos/exynos_hdmi.c | 2 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 + + drivers/gpu/drm/i2c/ch7006_drv.c | 2 +- + drivers/gpu/drm/i2c/sil164_drv.c | 2 +- + drivers/gpu/drm/i2c/tda9950.c | 4 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- + drivers/gpu/drm/i915/display/intel_audio.c | 3 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +- + drivers/gpu/drm/i915/i915_drm_client.c | 1 + + drivers/gpu/drm/msm/dp/dp_audio.c | 2 + + drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 1 + + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 1 + + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 1 + + drivers/gpu/drm/panel/panel-simple.c | 102 ++ + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 9 +- + drivers/gpu/drm/panthor/panthor_devfreq.c | 12 +- + drivers/gpu/drm/panthor/panthor_devfreq.h | 4 +- + drivers/gpu/drm/panthor/panthor_device.c | 68 +- + drivers/gpu/drm/panthor/panthor_device.h | 37 + + drivers/gpu/drm/panthor/panthor_drv.c | 5 +- + drivers/gpu/drm/panthor/panthor_fw.c | 68 +- + drivers/gpu/drm/panthor/panthor_gpu.c | 14 +- + drivers/gpu/drm/panthor/panthor_mmu.c | 3 +- + drivers/gpu/drm/panthor/panthor_sched.c | 22 +- + drivers/gpu/drm/radeon/radeon_audio.c | 2 + + drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 18 + + drivers/gpu/drm/renesas/rcar-du/rcar_du_group.c | 24 +- + drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 4 +- + .../gpu/drm/renesas/rcar-du/rcar_mipi_dsi_regs.h | 1 - + drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c | 8 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 18 + + drivers/gpu/drm/rockchip/Kconfig | 10 + + drivers/gpu/drm/rockchip/Makefile | 1 + + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.h | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c | 487 +++++++++ + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 147 ++- + drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- + drivers/gpu/drm/rockchip/inno_hdmi.h | 2 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 2 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 7 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 369 ++++++- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 23 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_lvds.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_rgb.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 219 ++++- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 2 + + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 32 +- + drivers/gpu/drm/tests/drm_connector_test.c | 463 +++++++++ + drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 409 +++++--- + drivers/gpu/drm/tests/drm_kunit_edid.h | 102 ++ + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 1 + + drivers/gpu/drm/v3d/v3d_bo.c | 4 - + drivers/gpu/drm/v3d/v3d_mmu.c | 8 +- + drivers/gpu/drm/v3d/v3d_performance_counters.h | 12 +- + drivers/gpu/drm/v3d/v3d_sched.c | 12 +- + drivers/gpu/drm/v3d/v3d_submit.c | 9 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 9 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 2 +- + drivers/gpu/drm/vc4/vc4_plane.c | 5 +- + drivers/gpu/drm/xe/xe_drm_client.c | 1 + + drivers/gpu/drm/xlnx/Kconfig | 9 + + drivers/gpu/drm/xlnx/Makefile | 1 + + drivers/gpu/drm/xlnx/zynqmp_disp.c | 48 - + drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 7 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 56 +- + drivers/gpu/drm/xlnx/zynqmp_dp.h | 7 + + drivers/gpu/drm/xlnx/zynqmp_dp_audio.c | 447 +++++++++ + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 39 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 15 +- + include/drm/bridge/dw_mipi_dsi2.h | 95 ++ + include/drm/display/drm_hdmi_state_helper.h | 4 + + include/drm/drm_connector.h | 11 +- + include/drm/drm_file.h | 1 + + include/drm/drm_gem.h | 14 +- + include/uapi/drm/amdxdna_accel.h | 79 +- + include/uapi/drm/panthor_drm.h | 9 + + include/uapi/drm/qaic_accel.h | 2 +- + lib/fonts/Kconfig | 2 +- + 182 files changed, 6739 insertions(+), 1290 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,rk3588-mipi-dsi2.yaml + create mode 100644 drivers/accel/amdxdna/aie2_pm.c + create mode 100644 drivers/accel/amdxdna/npu6_regs.c + create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c + create mode 100644 drivers/gpu/drm/clients/drm_log.c + create mode 100644 drivers/gpu/drm/drm_draw.c + create mode 100644 drivers/gpu/drm/drm_draw_internal.h + create mode 100644 drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c + create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dp_audio.c + create mode 100644 include/drm/bridge/dw_mipi_dsi2.h +Merging amdgpu/drm-next (a317017f47f6 drm/amd/display: Reapply fdedd77b0eb3) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 125 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 80 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 90 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 101 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 342 ++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 77 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 21 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 31 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 113 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 11 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 4 +- + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 10 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 29 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 42 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 39 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 34 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 48 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 59 +- + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 8 +- + drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/imu_v12_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 14 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 104 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 14 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 708 +++++++++++ + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h | 29 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 136 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 1 - + drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 11 +- + drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 81 ++ + drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 11 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 6 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 12 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 116 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 343 ++--- + drivers/gpu/drm/amd/amdgpu/si.c | 4 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 10 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 34 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 8 +- + drivers/gpu/drm/amd/amdgpu/soc24.c | 27 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 3 + + drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h | 24 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 265 ++-- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 17 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_14.c | 160 +++ + drivers/gpu/drm/amd/amdgpu/umc_v8_14.h | 51 + + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 8 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 33 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 34 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 121 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 34 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 79 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.h | 5 + + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c | 1118 +++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.h | 29 + + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 11 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 12 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 6 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 491 ++++++++ + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 58 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_debug.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 135 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 3 + + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 11 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 64 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 13 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 41 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 5 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 13 +- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 22 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 5 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 73 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 8 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 325 ++++- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 25 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 37 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 52 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 3 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 5 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 4 +- + .../amd/display/dc/clk_mgr/dcn35/dcn351_clk_mgr.c | 140 +++ + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 223 +++- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h | 4 + + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h | 41 +- + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 46 + + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h | 1 + + .../dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.c | 23 + + .../dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.h | 3 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 23 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 11 - + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 53 +- + drivers/gpu/drm/amd/display/dc/dc.h | 12 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 37 +- + drivers/gpu/drm/amd/display/dc/dc_plane.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 17 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 7 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 1 - + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 3 + + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 34 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 3 +- + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 34 +- + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 132 -- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 1 + + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 15 +- + .../drm/amd/display/dc/dml2/display_mode_core.c | 41 +- + .../display/dc/dml2/display_mode_core_structs.h | 109 +- + .../drm/amd/display/dc/dml2/display_mode_util.c | 6 +- + .../dc/dml2/dml21/dml21_translation_helper.c | 16 +- + .../drm/amd/display/dc/dml2/dml21/dml21_utils.c | 76 +- + .../dc/dml2/dml21/inc/bounding_boxes/dcn4_soc_bb.h | 3 +- + .../dc/dml2/dml21/inc/dml_top_display_cfg_types.h | 52 +- + .../dml2/dml21/inc/dml_top_soc_parameter_types.h | 2 + + .../amd/display/dc/dml2/dml21/inc/dml_top_types.h | 77 +- + .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c | 42 +- + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 1305 +++++++++++++------- + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.h | 2 +- + .../dml21/src/dml2_core/dml2_core_shared_types.h | 129 +- + .../dc/dml2/dml21/src/dml2_core/dml2_core_utils.c | 221 +++- + .../dc/dml2/dml21/src/dml2_core/dml2_core_utils.h | 6 +- + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 47 +- + .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 392 +++--- + .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h | 7 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.c | 1 - + .../dml2/dml21/src/dml2_top/dml2_top_interfaces.c | 51 + + .../dc/dml2/dml21/src/dml2_top/dml2_top_legacy.c | 4 + + .../dc/dml2/dml21/src/dml2_top/dml2_top_legacy.h | 9 + + .../dml21/src/dml2_top/dml2_top_optimization.c | 307 ----- + .../dml21/src/dml2_top/dml2_top_optimization.h | 33 - + .../dc/dml2/dml21/src/dml2_top/dml2_top_soc15.c | 1177 ++++++++++++++++++ + .../{dml_top_mcache.h => dml2_top_soc15.h} | 20 +- + .../dc/dml2/dml21/src/dml2_top/dml_top_mcache.c | 549 -------- + .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.c | 5 + + .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.h | 46 +- + .../dml21/src/inc/dml2_internal_shared_types.h | 60 +- + .../drm/amd/display/dc/dml2/dml2_mall_phantom.c | 2 +- + .../amd/display/dc/dml2/dml2_translation_helper.c | 54 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 35 +- + .../amd/display/dc/dml2/dml_display_rq_dlg_calc.c | 12 - + .../gpu/drm/amd/display/dc/dwb/dcn30/dcn30_dwb.c | 13 - + .../gpu/drm/amd/display/dc/dwb/dcn30/dcn30_dwb.h | 1 - + .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.c | 15 + + .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.h | 2 + + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c | 15 + + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h | 2 + + .../drm/amd/display/dc/hubp/dcn201/dcn201_hubp.c | 1 + + .../gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.c | 1 + + .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c | 17 + + .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.h | 2 + + .../gpu/drm/amd/display/dc/hubp/dcn31/dcn31_hubp.c | 1 + + .../gpu/drm/amd/display/dc/hubp/dcn32/dcn32_hubp.c | 3 +- + .../gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.c | 1 + + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 35 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h | 25 + + .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn301/dcn301_init.c | 1 - + .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 3 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 12 + + .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c | 3 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 1 + + .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 12 + + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 5 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 1 - + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 4 - + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 4 - + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 59 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 + + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 4 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 4 + + .../display/dc/link/protocols/link_dp_capability.c | 21 +- + .../gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.c | 18 + + .../gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.h | 7 + + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 4 +- + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 57 +- + .../display/dc/resource/dcn201/dcn201_resource.c | 4 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 4 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 116 +- + drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h | 16 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 3 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 154 ++- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 4 - + drivers/gpu/drm/amd/include/amd_shared.h | 4 +- + .../dcn/{dcn_2_0_3_offset.h => dcn_2_0_1_offset.h} | 4 +- + .../{dcn_2_0_3_sh_mask.h => dcn_2_0_1_sh_mask.h} | 4 +- + .../amd/include/asic_reg/umc/umc_8_14_0_offset.h | 29 + + .../amd/include/asic_reg/umc/umc_8_14_0_sh_mask.h | 37 + + drivers/gpu/drm/amd/include/atomfirmware.h | 17 +- + .../drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_5_0.h | 47 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 4 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 108 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 4 +- + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 8 +- + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 7 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 8 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 2 + + .../drm/amd/pm/powerplay/hwmgr/vega10_powertune.c | 5 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 86 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 8 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 3 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 3 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 20 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 3 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 19 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 26 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 38 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 2 +- + 310 files changed, 10532 insertions(+), 3789 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v8_14.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v8_14.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn351_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_interfaces.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_legacy.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_legacy.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_optimization.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_optimization.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_soc15.c + rename drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/{dml_top_mcache.h => dml2_top_soc15.h} (58%) + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top_mcache.c + rename drivers/gpu/drm/amd/include/asic_reg/dcn/{dcn_2_0_3_offset.h => dcn_2_0_1_offset.h} (99%) + rename drivers/gpu/drm/amd/include/asic_reg/dcn/{dcn_2_0_3_sh_mask.h => dcn_2_0_1_sh_mask.h} (99%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_14_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_8_14_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/vcn/irqsrcs_vcn_5_0.h +Merging drm-intel/for-linux-next (96bd1d50bfd3 drm/i915/display: drop unnecessary i915_drv.h includes) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_audio.c +Auto-merging drivers/gpu/drm/i915/display/intel_color.c +Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/display/intel_dsb.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dsb.c +Auto-merging drivers/gpu/drm/i915/display/intel_tc.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/xe_pm.c +Resolved 'drivers/gpu/drm/i915/display/intel_dp_mst.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_dsb.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e069bb813f8e] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_print.c | 23 + + drivers/gpu/drm/i915/Makefile | 5 +- + drivers/gpu/drm/i915/display/dvo_ns2501.c | 1 - + drivers/gpu/drm/i915/display/g4x_dp.c | 26 +- + drivers/gpu/drm/i915/display/g4x_dp.h | 6 - + drivers/gpu/drm/i915/display/g4x_hdmi.c | 1 + + drivers/gpu/drm/i915/display/hsw_ips.c | 20 +- + drivers/gpu/drm/i915/display/hsw_ips.h | 6 +- + drivers/gpu/drm/i915/display/i9xx_display_sr.c | 97 ++ + drivers/gpu/drm/i915/display/i9xx_display_sr.h | 14 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 1 + + drivers/gpu/drm/i915/display/i9xx_wm.c | 1 + + drivers/gpu/drm/i915/display/i9xx_wm_regs.h | 257 +++++ + drivers/gpu/drm/i915/display/icl_dsi.c | 5 +- + drivers/gpu/drm/i915/display/intel_acpi.c | 3 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 28 +- + drivers/gpu/drm/i915/display/intel_audio.c | 54 +- + drivers/gpu/drm/i915/display/intel_audio.h | 1 + + drivers/gpu/drm/i915/display/intel_backlight.c | 1 + + drivers/gpu/drm/i915/display/intel_bios.c | 15 +- + drivers/gpu/drm/i915/display/intel_bios.h | 8 - + drivers/gpu/drm/i915/display/intel_bw.c | 2 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 176 +--- + drivers/gpu/drm/i915/display/intel_color.c | 1 + + drivers/gpu/drm/i915/display/intel_combo_phy.c | 1 + + drivers/gpu/drm/i915/display/intel_crt.c | 163 ++- + drivers/gpu/drm/i915/display/intel_crt_regs.h | 50 + + drivers/gpu/drm/i915/display/intel_crtc.c | 1 + + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 14 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 6 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 16 +- + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 5 + + drivers/gpu/drm/i915/display/intel_ddi.c | 491 +++++---- + drivers/gpu/drm/i915/display/intel_ddi.h | 12 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 23 +- + drivers/gpu/drm/i915/display/intel_de.h | 18 +- + drivers/gpu/drm/i915/display/intel_display.c | 117 +-- + drivers/gpu/drm/i915/display/intel_display.h | 3 - + .../drm/i915/display/intel_display_conversion.c | 14 + + .../drm/i915/display/intel_display_conversion.h | 10 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 17 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 11 +- + .../i915/display/intel_display_debugfs_params.c | 3 +- + .../gpu/drm/i915/display/intel_display_device.c | 278 ++--- + .../gpu/drm/i915/display/intel_display_device.h | 155 +-- + .../gpu/drm/i915/display/intel_display_driver.c | 297 +++--- + .../gpu/drm/i915/display/intel_display_driver.h | 38 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 52 +- + .../gpu/drm/i915/display/intel_display_params.c | 13 +- + .../gpu/drm/i915/display/intel_display_params.h | 2 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 948 ++++++++--------- + drivers/gpu/drm/i915/display/intel_display_power.h | 29 +- + .../gpu/drm/i915/display/intel_display_power_map.c | 62 +- + .../drm/i915/display/intel_display_power_well.c | 567 +++++------ + .../drm/i915/display/intel_display_power_well.h | 35 +- + drivers/gpu/drm/i915/display/intel_display_reset.c | 4 +- + .../gpu/drm/i915/display/intel_display_snapshot.c | 4 +- + drivers/gpu/drm/i915/display/intel_display_trace.h | 2 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 36 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 4 - + drivers/gpu/drm/i915/display/intel_dmc_wl.c | 315 ++++-- + drivers/gpu/drm/i915/display/intel_dmc_wl.h | 14 +- + drivers/gpu/drm/i915/display/intel_dp.c | 1076 ++++++++++---------- + drivers/gpu/drm/i915/display/intel_dp.h | 32 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 3 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 3 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 40 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 694 +++++++------ + drivers/gpu/drm/i915/display/intel_dp_test.c | 1 - + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 3 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 8 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 1 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 1 + + drivers/gpu/drm/i915/display/intel_dpt.c | 4 +- + drivers/gpu/drm/i915/display/intel_dpt_common.c | 1 + + drivers/gpu/drm/i915/display/intel_drrs.c | 4 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 58 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 20 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 9 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 1 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 3 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 36 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 9 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 4 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 6 +- + drivers/gpu/drm/i915/display/intel_hti.c | 3 +- + drivers/gpu/drm/i915/display/intel_link_bw.c | 3 +- + drivers/gpu/drm/i915/display/intel_load_detect.c | 2 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 3 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 49 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 2 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 184 ++-- + drivers/gpu/drm/i915/display/intel_overlay.h | 19 +- + drivers/gpu/drm/i915/display/intel_panel.c | 7 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 2 + + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 27 +- + drivers/gpu/drm/i915/display/intel_pfit.c | 2 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 1 + + drivers/gpu/drm/i915/display/intel_plane_initial.c | 56 +- + drivers/gpu/drm/i915/display/intel_plane_initial.h | 4 +- + drivers/gpu/drm/i915/display/intel_pps.c | 174 ++-- + drivers/gpu/drm/i915/display/intel_psr.c | 88 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 12 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 1 + + drivers/gpu/drm/i915/display/intel_tc.c | 2 +- + drivers/gpu/drm/i915/display/intel_tv.c | 5 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 8 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 80 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 1 + + drivers/gpu/drm/i915/display/intel_vdsc_regs.h | 12 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 3 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 287 +++--- + drivers/gpu/drm/i915/display/skl_scaler.h | 11 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 51 +- + .../drm/i915/display/skl_universal_plane_regs.h | 15 + + drivers/gpu/drm/i915/display/skl_watermark.c | 857 +++++++++------- + drivers/gpu/drm/i915/display/skl_watermark.h | 5 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 28 +- + drivers/gpu/drm/i915/display/vlv_dsi.h | 7 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 19 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 4 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 3 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 17 +- + drivers/gpu/drm/i915/gvt/display.c | 81 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 21 +- + drivers/gpu/drm/i915/gvt/handlers.c | 45 +- + drivers/gpu/drm/i915/i915_driver.c | 132 ++- + drivers/gpu/drm/i915/i915_drv.h | 21 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- + drivers/gpu/drm/i915/i915_getparam.c | 5 +- + drivers/gpu/drm/i915/i915_irq.c | 12 +- + drivers/gpu/drm/i915/i915_reg.h | 378 +------ + drivers/gpu/drm/i915/i915_suspend.c | 141 --- + drivers/gpu/drm/i915/i915_suspend.h | 14 - + drivers/gpu/drm/i915/i915_trace.h | 28 - + drivers/gpu/drm/i915/intel_cpu_info.c | 44 + + drivers/gpu/drm/i915/intel_cpu_info.h | 13 + + drivers/gpu/drm/i915/intel_device_info.c | 9 + + drivers/gpu/drm/i915/intel_device_info.h | 5 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 2 + + drivers/gpu/drm/i915/intel_sbi.c | 22 +- + drivers/gpu/drm/i915/intel_sbi.h | 4 + + drivers/gpu/drm/i915/intel_uncore.c | 7 +- + drivers/gpu/drm/i915/intel_uncore.h | 2 + + drivers/gpu/drm/i915/intel_uncore_trace.c | 7 + + drivers/gpu/drm/i915/intel_uncore_trace.h | 49 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- + drivers/gpu/drm/i915/vlv_sideband.c | 28 +- + drivers/gpu/drm/i915/vlv_sideband.h | 3 + + drivers/gpu/drm/i915/vlv_suspend.c | 1 + + drivers/gpu/drm/xe/Makefile | 1 + + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 16 +- + .../{i915_trace.h => intel_uncore_trace.h} | 0 + drivers/gpu/drm/xe/display/xe_display.c | 116 ++- + drivers/gpu/drm/xe/display/xe_display.h | 2 + + drivers/gpu/drm/xe/display/xe_plane_initial.c | 8 +- + drivers/gpu/drm/xe/xe_pm.c | 4 +- + include/drm/drm_print.h | 2 + + include/drm/intel/pciids.h | 55 +- + 161 files changed, 5498 insertions(+), 4443 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/i9xx_display_sr.c + create mode 100644 drivers/gpu/drm/i915/display/i9xx_display_sr.h + create mode 100644 drivers/gpu/drm/i915/display/i9xx_wm_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_crt_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_conversion.c + delete mode 100644 drivers/gpu/drm/i915/i915_suspend.c + delete mode 100644 drivers/gpu/drm/i915/i915_suspend.h + create mode 100644 drivers/gpu/drm/i915/intel_cpu_info.c + create mode 100644 drivers/gpu/drm/i915/intel_cpu_info.h + create mode 100644 drivers/gpu/drm/i915/intel_uncore_trace.c + create mode 100644 drivers/gpu/drm/i915/intel_uncore_trace.h + rename drivers/gpu/drm/xe/compat-i915-headers/{i915_trace.h => intel_uncore_trace.h} (100%) +Merging drm-msm/msm-next (86313a9cd152 drm/msm/dpu: rework documentation comments) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (d82c9281189d drm/msm/dpu: include SSPP allocation state into the dumped state) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +Auto-merging drivers/gpu/drm/msm/msm_mdss.c +Merge made by the 'ort' strategy. + .../bindings/display/msm/dsi-controller-main.yaml | 2 + + .../bindings/display/msm/dsi-phy-14nm.yaml | 1 + + .../bindings/display/msm/qcom,sm6150-dpu.yaml | 108 ++++++ + .../bindings/display/msm/qcom,sm6150-mdss.yaml | 245 +++++++++++++ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 254 ++++++++++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 63 ++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 19 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 + + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 389 +++++++++++++++++---- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 13 + + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 89 +++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 14 + + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 2 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 21 ++ + drivers/gpu/drm/msm/msm_mdss.c | 79 +++-- + drivers/gpu/drm/msm/msm_mdss.h | 4 +- + drivers/gpu/drm/msm/registers/display/mdss.xml | 11 +- + 22 files changed, 1217 insertions(+), 107 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6150-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6150-mdss.yaml + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h +Merging drm-xe/drm-xe-next (a8d0aa0e7fcd drm/xe/pf: Use correct function to check LMEM provisioning) +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel drm-xe/drm-xe-next +Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy.c +Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h +Auto-merging drivers/gpu/drm/xe/xe_device.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 39 ++- + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 4 + + drivers/gpu/drm/xe/instructions/xe_mi_commands.h | 13 +- + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_lrc_layout.h | 3 + + drivers/gpu/drm/xe/tests/xe_bo.c | 16 +- + drivers/gpu/drm/xe/tests/xe_live_test_mod.c | 2 + + drivers/gpu/drm/xe/xe_bo.c | 12 +- + drivers/gpu/drm/xe/xe_devcoredump.c | 15 +- + drivers/gpu/drm/xe/xe_device.c | 4 +- + drivers/gpu/drm/xe/xe_device.h | 3 +- + drivers/gpu/drm/xe/xe_device_types.h | 8 + + drivers/gpu/drm/xe/xe_exec_queue.c | 4 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 2 + + drivers/gpu/drm/xe/xe_execlist.c | 10 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 2 +- + drivers/gpu/drm/xe/xe_guc.c | 30 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 7 +- + drivers/gpu/drm/xe/xe_irq.c | 323 +++++++++++++++++++--- + drivers/gpu/drm/xe/xe_irq.h | 8 + + drivers/gpu/drm/xe/xe_lrc.c | 24 +- + drivers/gpu/drm/xe/xe_lrc.h | 2 +- + drivers/gpu/drm/xe/xe_migrate.c | 11 +- + drivers/gpu/drm/xe/xe_oa.c | 34 ++- + drivers/gpu/drm/xe/xe_oa_types.h | 3 + + drivers/gpu/drm/xe/xe_query.c | 3 +- + drivers/gpu/drm/xe/xe_ring_ops.c | 6 +- + include/uapi/drm/xe_drm.h | 7 + + 28 files changed, 518 insertions(+), 80 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-drm-xe-ptl-Add-another-PTL-PCI-ID.patch +Applying: fix up for "drm/xe/ptl: Add another PTL PCI ID" +$ git reset HEAD^ +Unstaged changes after reset: +M include/drm/intel/pciids.h +$ git add -A . +$ git commit -v -a --amend +[master 735f67ad36d4] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel + Date: Fri Dec 20 12:14:07 2024 +1100 +Merging etnaviv/etnaviv/next (6bef484c5e9a drm/etnaviv: Add fdinfo support for memory stats) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 3 +-- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 12 +++++++++++- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 28 ++++++++++++++++++++++++++-- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 2 -- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 26 +++++++++++--------------- + 5 files changed, 49 insertions(+), 22 deletions(-) +Merging fbdev/for-next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +Merging regmap/for-next (eb708cd631a8 regmap: regmap_multi_reg_read(): make register list const) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/regcache-maple.c | 7 +++---- + drivers/base/regmap/regcache-rbtree.c | 10 ++++------ + drivers/base/regmap/regcache.c | 2 +- + drivers/base/regmap/regmap.c | 13 ++++++------- + include/linux/regmap.h | 2 +- + 5 files changed, 15 insertions(+), 19 deletions(-) +Merging sound/for-next (42d28736a5a4 ALSA: sonicvibes: Use str_on_off() helper in snd_sonicvibes_proc_read()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Merge made by the 'ort' strategy. + sound/core/seq/oss/seq_oss_init.c | 2 +- + sound/core/seq/seq_clientmgr.c | 7 +++++++ + sound/core/seq/seq_system.c | 25 +++++++++++++++++++++++-- + sound/core/seq/seq_ump_client.c | 2 -- + sound/pci/ac97/ac97_codec.c | 2 +- + sound/pci/cmipci.c | 2 +- + sound/pci/hda/hda_hwdep.c | 2 -- + sound/pci/hda/hda_sysfs.c | 2 +- + sound/pci/lola/lola_clock.c | 2 +- + sound/pci/sonicvibes.c | 6 +++--- + 10 files changed, 38 insertions(+), 14 deletions(-) +Merging ieee1394/for-next (ce4339d021c4 firewire: ohci: use generic power management) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Merge made by the 'ort' strategy. + drivers/firewire/ohci.c | 44 +++++++++++++------------------------------- + 1 file changed, 13 insertions(+), 31 deletions(-) +Merging sound-asoc/for-next (45f61115972c Merge remote-tracking branch 'asoc/for-6.14' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Auto-merging sound/soc/fsl/Kconfig +Merge made by the 'ort' strategy. + .../bindings/sound/allwinner,sun4i-a10-codec.yaml | 31 + + .../bindings/sound/mediatek,mt8188-mt6359.yaml | 16 +- + .../devicetree/bindings/sound/realtek,rt5682.yaml | 156 + + .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 19 +- + Documentation/devicetree/bindings/sound/rt5682.txt | 98 - + MAINTAINERS | 4 +- + drivers/firmware/cirrus/Kconfig | 20 + + drivers/firmware/cirrus/Makefile | 2 + + drivers/firmware/cirrus/test/Makefile | 23 + + drivers/firmware/cirrus/test/cs_dsp_mock_bin.c | 199 ++ + .../firmware/cirrus/test/cs_dsp_mock_mem_maps.c | 752 +++++ + drivers/firmware/cirrus/test/cs_dsp_mock_regmap.c | 367 +++ + drivers/firmware/cirrus/test/cs_dsp_mock_utils.c | 13 + + drivers/firmware/cirrus/test/cs_dsp_mock_wmfw.c | 473 +++ + drivers/firmware/cirrus/test/cs_dsp_test_bin.c | 2556 +++++++++++++++ + .../firmware/cirrus/test/cs_dsp_test_bin_error.c | 600 ++++ + .../firmware/cirrus/test/cs_dsp_test_callbacks.c | 688 ++++ + .../cirrus/test/cs_dsp_test_control_cache.c | 3282 ++++++++++++++++++++ + .../cirrus/test/cs_dsp_test_control_parse.c | 1851 +++++++++++ + .../firmware/cirrus/test/cs_dsp_test_control_rw.c | 2669 ++++++++++++++++ + drivers/firmware/cirrus/test/cs_dsp_test_wmfw.c | 2211 +++++++++++++ + .../firmware/cirrus/test/cs_dsp_test_wmfw_error.c | 1347 ++++++++ + drivers/firmware/cirrus/test/cs_dsp_tests.c | 14 + + include/dt-bindings/sound/qcom,wcd9335.h | 1 - + include/linux/firmware/cirrus/cs_dsp_test_utils.h | 160 + + include/sound/soc_sdw_utils.h | 2 + + include/uapi/sound/compress_params.h | 23 +- + include/uapi/sound/sof/tokens.h | 2 + + sound/soc/amd/ps/pci-ps.c | 16 +- + sound/soc/codecs/Makefile | 8 +- + sound/soc/codecs/ad193x-i2c.c | 3 +- + sound/soc/codecs/adau1761-i2c.c | 5 +- + sound/soc/codecs/adau1781-i2c.c | 5 +- + sound/soc/codecs/adau1977-i2c.c | 5 +- + sound/soc/codecs/alc5623.c | 10 +- + sound/soc/codecs/alc5632.c | 6 +- + sound/soc/codecs/cs35l56.c | 8 +- + sound/soc/codecs/cs42l43.c | 2 +- + sound/soc/codecs/cs42l51-i2c.c | 6 +- + sound/soc/codecs/cs42l84.c | 2 +- + sound/soc/codecs/es8323.c | 2 +- + sound/soc/codecs/max98088.c | 4 +- + sound/soc/codecs/max98090.c | 18 +- + sound/soc/codecs/max98095.c | 4 +- + sound/soc/codecs/ntp8835.c | 2 +- + sound/soc/codecs/ntp8918.c | 2 +- + sound/soc/codecs/pcm186x-i2c.c | 3 +- + sound/soc/codecs/pcm6240.c | 3 +- + sound/soc/codecs/rt715-sdw.c | 41 - + sound/soc/codecs/rt715.h | 3 - + sound/soc/codecs/sma1307.c | 4 +- + sound/soc/codecs/ssm2602-i2c.c | 5 +- + sound/soc/codecs/tas2562.c | 4 +- + sound/soc/codecs/tas2781-i2c.c | 71 +- + sound/soc/codecs/tas5720.c | 10 +- + sound/soc/codecs/tlv320adc3xxx.c | 4 +- + sound/soc/codecs/tlv320aic31xx.c | 6 +- + sound/soc/codecs/tlv320aic3x-i2c.c | 3 +- + sound/soc/codecs/tpa6130a2.c | 4 +- + sound/soc/codecs/uda1342.c | 2 +- + sound/soc/codecs/wcd9335.c | 2 + + sound/soc/codecs/wm8904.c | 13 +- + sound/soc/codecs/wm8985.c | 4 +- + sound/soc/fsl/Kconfig | 2 + + sound/soc/fsl/Makefile | 2 +- + sound/soc/fsl/fsl_asrc.c | 179 +- + sound/soc/fsl/fsl_asrc.h | 2 + + sound/soc/fsl/fsl_asrc_common.h | 70 + + sound/soc/fsl/fsl_asrc_m2m.c | 727 +++++ + sound/soc/fsl/fsl_easrc.c | 261 +- + sound/soc/fsl/fsl_easrc.h | 4 + + sound/soc/fsl/fsl_micfil.c | 33 +- + sound/soc/fsl/fsl_sai.c | 7 +- + sound/soc/fsl/fsl_sai.h | 3 + + sound/soc/fsl/fsl_utils.c | 45 + + sound/soc/fsl/fsl_utils.h | 5 + + sound/soc/fsl/fsl_xcvr.c | 404 ++- + sound/soc/fsl/fsl_xcvr.h | 13 + + sound/soc/generic/simple-card-utils.c | 70 +- + sound/soc/intel/boards/sof_sdw.c | 33 +- + sound/soc/intel/common/soc-acpi-intel-arl-match.c | 45 +- + sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 70 + + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 289 +- + sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 148 + + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 194 ++ + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 19 +- + sound/soc/mediatek/mt8365/Makefile | 2 +- + sound/soc/mediatek/mt8365/mt8365-mt6357.c | 11 +- + sound/soc/qcom/sdm845.c | 5 +- + sound/soc/renesas/rz-ssi.c | 226 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 28 - + sound/soc/sdca/Makefile | 2 +- + sound/soc/sdw_utils/soc_sdw_cs_amp.c | 46 + + sound/soc/sdw_utils/soc_sdw_utils.c | 13 +- + sound/soc/soc-core.c | 1 + + sound/soc/soc-pcm.c | 32 +- + sound/soc/soc-topology.c | 8 +- + sound/soc/sof/intel/hda-dai.c | 12 + + sound/soc/sof/intel/hda-pcm.c | 15 + + sound/soc/sof/intel/hda.c | 5 + + sound/soc/sof/ipc4-topology.c | 2 +- + sound/soc/sof/sof-audio.h | 1 + + sound/soc/sof/sof-priv.h | 8 - + sound/soc/sof/topology.c | 4 + + sound/soc/sunxi/sun4i-codec.c | 367 ++- + sound/soc/sunxi/sun4i-spdif.c | 24 +- + 106 files changed, 20643 insertions(+), 663 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5682.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/rt5682.txt + create mode 100644 drivers/firmware/cirrus/test/Makefile + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_bin.c + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_mem_maps.c + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_regmap.c + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_utils.c + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_mock_wmfw.c + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_bin.c + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_bin_error.c + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_callbacks.c + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_control_cache.c + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_control_parse.c + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_control_rw.c + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_wmfw.c + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_test_wmfw_error.c + create mode 100644 drivers/firmware/cirrus/test/cs_dsp_tests.c + create mode 100644 include/linux/firmware/cirrus/cs_dsp_test_utils.h + create mode 100644 sound/soc/fsl/fsl_asrc_m2m.c +Merging modules/modules-next (f3fda0dfea98 module: Put known GPL offenders in an array) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Merge made by the 'ort' strategy. + include/linux/vermagic.h | 6 +++--- + kernel/module/main.c | 23 ++++++++++++++--------- + 2 files changed, 17 insertions(+), 12 deletions(-) +Merging input/next (e36def244b93 Input: use guard notation in input core) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'ort' strategy. + drivers/input/Kconfig | 14 -- + drivers/input/Makefile | 1 - + drivers/input/evbug.c | 100 -------- + drivers/input/ff-core.c | 90 +++---- + drivers/input/ff-memless.c | 17 +- + drivers/input/input-mt.c | 34 +-- + drivers/input/input-poller.c | 4 +- + drivers/input/input.c | 339 ++++++++++---------------- + include/linux/platform_data/keyscan-davinci.h | 29 --- + 9 files changed, 184 insertions(+), 444 deletions(-) + delete mode 100644 drivers/input/evbug.c + delete mode 100644 include/linux/platform_data/keyscan-davinci.h +Merging block/for-next (3af068412d79 Merge branch 'for-6.14/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging drivers/scsi/pm8001/pm8001_init.c +Auto-merging fs/bcachefs/move.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + arch/um/drivers/ubd_kern.c | 1 - + block/Makefile | 2 - + block/bio-integrity.c | 84 +++++-- + block/blk-integrity.c | 10 +- + block/blk-mq-cpumap.c | 37 +++ + block/blk-mq-debugfs.c | 1 - + block/blk-mq-pci.c | 46 ---- + block/blk-mq-sched.c | 3 +- + block/blk-mq-virtio.c | 46 ---- + block/blk-mq.c | 10 +- + block/blk.h | 23 +- + block/elevator.c | 7 +- + block/fops.c | 45 +++- + block/genhd.c | 7 +- + drivers/block/amiflop.c | 1 - + drivers/block/aoe/aoeblk.c | 1 - + drivers/block/ataflop.c | 1 - + drivers/block/floppy.c | 1 - + drivers/block/loop.c | 3 +- + drivers/block/mtip32xx/mtip32xx.c | 1 - + drivers/block/nbd.c | 3 +- + drivers/block/null_blk/main.c | 27 +- + drivers/block/null_blk/null_blk.h | 1 + + drivers/block/ps3disk.c | 3 +- + drivers/block/rbd.c | 1 - + drivers/block/rnbd/rnbd-clt.c | 3 +- + drivers/block/rnbd/rnbd-srv.c | 2 +- + drivers/block/rnull.rs | 30 ++- + drivers/block/sunvdc.c | 2 +- + drivers/block/swim.c | 2 +- + drivers/block/swim3.c | 3 +- + drivers/block/ublk_drv.c | 1 - + drivers/block/virtio_blk.c | 5 +- + drivers/block/xen-blkfront.c | 1 - + drivers/block/z2ram.c | 1 - + drivers/cdrom/gdrom.c | 2 +- + drivers/md/bcache/movinggc.c | 2 +- + drivers/md/bcache/writeback.c | 2 +- + drivers/md/dm-rq.c | 2 +- + drivers/md/dm-verity-fec.c | 6 +- + drivers/md/dm-verity-target.c | 4 +- + drivers/memstick/core/ms_block.c | 3 +- + drivers/memstick/core/mspro_block.c | 3 +- + drivers/mmc/core/queue.c | 2 +- + drivers/mtd/mtd_blkdevs.c | 2 +- + drivers/mtd/ubi/block.c | 2 +- + drivers/nvme/host/apple.c | 1 - + drivers/nvme/host/core.c | 22 +- + drivers/nvme/host/fc.c | 1 - + drivers/nvme/host/pci.c | 3 +- + drivers/pci/pci-driver.c | 14 ++ + drivers/s390/block/dasd_genhd.c | 1 - + drivers/s390/block/scm_blk.c | 1 - + drivers/scsi/fnic/fnic_main.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas.h | 1 - + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 3 +- + drivers/scsi/mpi3mr/mpi3mr.h | 1 - + drivers/scsi/mpi3mr/mpi3mr_os.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/pm8001/pm8001_sas.h | 1 - + drivers/scsi/qla2xxx/qla_nvme.c | 3 +- + drivers/scsi/qla2xxx/qla_os.c | 4 +- + drivers/scsi/scsi_lib.c | 1 - + drivers/scsi/sd.c | 4 +- + drivers/scsi/smartpqi/smartpqi_init.c | 7 +- + drivers/scsi/virtio_scsi.c | 3 +- + drivers/virtio/virtio.c | 19 ++ + fs/bcachefs/move.c | 6 +- + include/linux/bio-integrity.h | 25 +- + include/linux/bio.h | 3 - + include/linux/blk-mq-pci.h | 11 - + include/linux/blk-mq-virtio.h | 11 - + include/linux/blk-mq.h | 3 +- + include/linux/blkdev.h | 6 + + include/linux/device/bus.h | 3 + + include/linux/fs.h | 1 + + include/linux/io_uring_types.h | 26 +- + include/linux/uio.h | 9 + + include/uapi/linux/fs.h | 9 + + include/uapi/linux/io_uring.h | 16 ++ + io_uring/alloc_cache.h | 13 + + io_uring/futex.c | 13 +- + io_uring/io_uring.c | 94 +++---- + io_uring/io_uring.h | 23 ++ + io_uring/kbuf.c | 228 ++++++----------- + io_uring/kbuf.h | 20 +- + io_uring/memmap.c | 399 +++++++++++++++--------------- + io_uring/memmap.h | 23 +- + io_uring/msg_ring.c | 7 - + io_uring/msg_ring.h | 1 - + io_uring/net.c | 35 +-- + io_uring/poll.c | 13 +- + io_uring/register.c | 91 ++++--- + io_uring/rsrc.c | 29 ++- + io_uring/rsrc.h | 4 + + io_uring/rw.c | 125 +++++++--- + io_uring/rw.h | 14 +- + io_uring/timeout.c | 5 +- + io_uring/uring_cmd.c | 20 +- + io_uring/waitid.c | 4 +- + kernel/trace/blktrace.c | 36 +-- + 103 files changed, 942 insertions(+), 933 deletions(-) + delete mode 100644 block/blk-mq-pci.c + delete mode 100644 block/blk-mq-virtio.c + delete mode 100644 include/linux/blk-mq-pci.h + delete mode 100644 include/linux/blk-mq-virtio.h +$ git am -3 ../patches/0001-fixup-for-block-remove-BLK_MQ_F_SHOULD_MERGE.patch +Applying: fixup for "block: remove BLK_MQ_F_SHOULD_MERGE" +$ git reset HEAD^ +Unstaged changes after reset: +M rust/kernel/block/mq/tag_set.rs +$ git add -A . +$ git commit -v -a --amend +[master 8eaf5c20fb82] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git + Date: Fri Dec 20 12:26:58 2024 +1100 +Merging device-mapper/for-next (0bb1968da273 dm array: fix cursor index when skipping across block boundaries) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Merge made by the 'ort' strategy. + drivers/md/persistent-data/dm-array.c | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) +Merging libata/for-next (7b64859fde26 ata: sata_gemini: Remove remaining reset glue) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Merge made by the 'ort' strategy. + drivers/ata/ata_generic.c | 2 +- + drivers/ata/pata_atp867x.c | 2 +- + drivers/ata/pata_piccolo.c | 2 +- + drivers/ata/sata_gemini.c | 32 -------------------------------- + drivers/ata/sata_gemini.h | 1 - + 5 files changed, 3 insertions(+), 36 deletions(-) +Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (741521fa273f mmc: sdhci-msm: convert to use custom crypto profile) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging Documentation/devicetree/bindings/crypto/qcom-qce.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/crypto/qcom-qce.yaml | 3 +- + .../bindings/mmc/amlogic,meson-mx-sdio.txt | 54 ---- + .../bindings/mmc/amlogic,meson-mx-sdio.yaml | 94 ++++++ + .../bindings/mmc/atmel,sama5d2-sdhci.yaml | 1 + + .../bindings/mmc/marvell,xenon-sdhci.yaml | 48 ++- + .../bindings/mmc/mmc-controller-common.yaml | 357 +++++++++++++++++++++ + .../devicetree/bindings/mmc/mmc-controller.yaml | 346 +------------------- + .../devicetree/bindings/mmc/mmc-slot.yaml | 49 +++ + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 10 +- + .../devicetree/bindings/mmc/sdhci-msm.yaml | 3 +- + .../devicetree/bindings/net/qcom,ethqos.yaml | 3 +- + .../bindings/remoteproc/qcom,sm6115-pas.yaml | 3 +- + drivers/mmc/core/core.c | 7 +- + drivers/mmc/core/host.c | 1 - + drivers/mmc/core/sdio.c | 2 + + drivers/mmc/host/bcm2835.c | 20 ++ + drivers/mmc/host/cqhci-crypto.c | 38 +-- + drivers/mmc/host/cqhci.h | 8 +- + drivers/mmc/host/mtk-sd.c | 21 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 2 - + drivers/mmc/host/rtsx_usb_sdmmc.c | 3 - + drivers/mmc/host/sdhci-acpi.c | 20 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 1 + + drivers/mmc/host/sdhci-msm.c | 94 ++++-- + drivers/mmc/host/tmio_mmc_core.c | 1 - + include/linux/mmc/core.h | 4 +- + include/linux/mmc/host.h | 8 + + 27 files changed, 691 insertions(+), 510 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdio.txt + create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-mx-sdio.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-controller-common.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/mmc-slot.yaml +Merging mfd/for-mfd-next (1061081cbe93 dt-bindings: mfd: Add MDIO interface to rtl9301-switch) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging Documentation/hwmon/index.rst +Auto-merging MAINTAINERS +Auto-merging drivers/mfd/cs42l43-i2c.c +Auto-merging drivers/mfd/cs42l43-sdw.c +Auto-merging drivers/mfd/cs42l43.c +CONFLICT (content): Merge conflict in drivers/mfd/cs42l43.c +Resolved 'drivers/mfd/cs42l43.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6e160337683c] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + + .../devicetree/bindings/mfd/qnap,ts433-mcu.yaml | 42 +++ + .../bindings/mfd/realtek,rtl9301-switch.yaml | 15 + + .../devicetree/bindings/mfd/rohm,bd71815-pmic.yaml | 20 +- + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/qnap-mcu-hwmon.rst | 27 ++ + MAINTAINERS | 9 + + drivers/hid/hid-sensor-hub.c | 21 +- + drivers/hwmon/Kconfig | 12 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/qnap-mcu-hwmon.c | 364 +++++++++++++++++++++ + drivers/input/misc/Kconfig | 12 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/qnap-mcu-input.c | 153 +++++++++ + drivers/leds/Kconfig | 11 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-qnap-mcu.c | 227 +++++++++++++ + drivers/mfd/Kconfig | 25 ++ + drivers/mfd/Makefile | 4 + + drivers/mfd/axp20x.c | 5 +- + drivers/mfd/cs42l43-i2c.c | 8 - + drivers/mfd/cs42l43-sdw.c | 10 - + drivers/mfd/cs42l43.c | 37 ++- + drivers/mfd/cs42l43.h | 1 - + drivers/mfd/da9052-core.c | 1 + + drivers/mfd/intel_soc_pmic_chtdc_ti.c | 2 +- + drivers/mfd/lpc_ich.c | 3 +- + drivers/mfd/qnap-mcu.c | 338 +++++++++++++++++++ + drivers/mfd/stpmic1.c | 6 +- + drivers/mfd/upboard-fpga.c | 325 ++++++++++++++++++ + include/linux/mfd/core.h | 2 +- + include/linux/mfd/da9052/da9052.h | 2 + + include/linux/mfd/qnap-mcu.h | 26 ++ + include/linux/mfd/upboard-fpga.h | 55 ++++ + 34 files changed, 1706 insertions(+), 62 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/qnap,ts433-mcu.yaml + create mode 100644 Documentation/hwmon/qnap-mcu-hwmon.rst + create mode 100644 drivers/hwmon/qnap-mcu-hwmon.c + create mode 100644 drivers/input/misc/qnap-mcu-input.c + create mode 100644 drivers/leds/leds-qnap-mcu.c + create mode 100644 drivers/mfd/qnap-mcu.c + create mode 100644 drivers/mfd/upboard-fpga.c + create mode 100644 include/linux/mfd/qnap-mcu.h + create mode 100644 include/linux/mfd/upboard-fpga.h +Merging backlight/for-backlight-next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (de68987480cb power: supply: gpio-charger: add support for default charge current limit) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging drivers/power/supply/bq24190_charger.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-power | 29 ++ + .../bindings/power/reset/atmel,sama5d2-shdwc.yaml | 3 + + .../devicetree/bindings/power/supply/bq24190.yaml | 1 + + .../bindings/power/supply/gpio-charger.yaml | 6 + + .../bindings/power/supply/ltc4162-l.yaml | 6 + + .../devicetree/bindings/trivial-devices.yaml | 2 + + drivers/power/reset/Kconfig | 4 +- + drivers/power/reset/as3722-poweroff.c | 2 - + drivers/power/reset/at91-sama5d2_shdwc.c | 1 + + drivers/power/reset/gpio-poweroff.c | 8 +- + drivers/power/supply/ab8500_btemp.c | 5 +- + drivers/power/supply/ab8500_chargalg.c | 5 +- + drivers/power/supply/ab8500_charger.c | 5 +- + drivers/power/supply/ab8500_fg.c | 33 +- + drivers/power/supply/apm_power.c | 6 +- + drivers/power/supply/bq2415x_charger.c | 34 +- + drivers/power/supply/bq24190_charger.c | 29 +- + drivers/power/supply/bq24257_charger.c | 8 +- + drivers/power/supply/bq27xxx_battery.c | 39 +- + drivers/power/supply/cros_charge-control.c | 208 ++++---- + drivers/power/supply/ds2760_battery.c | 8 +- + drivers/power/supply/ds2780_battery.c | 24 +- + drivers/power/supply/ds2781_battery.c | 24 +- + drivers/power/supply/ds2782_battery.c | 87 ++-- + drivers/power/supply/gpio-charger.c | 13 + + drivers/power/supply/ip5xxx_power.c | 572 +++++++++++++++------ + drivers/power/supply/ltc4162-l-charger.c | 432 ++++++++++++++-- + drivers/power/supply/max1720x_battery.c | 6 + + drivers/power/supply/mm8013.c | 2 +- + drivers/power/supply/olpc_battery.c | 11 +- + drivers/power/supply/power_supply.h | 31 ++ + drivers/power/supply/power_supply_core.c | 266 ++++++++-- + drivers/power/supply/power_supply_hwmon.c | 48 +- + drivers/power/supply/power_supply_sysfs.c | 191 +++++-- + drivers/power/supply/surface_battery.c | 4 +- + drivers/power/supply/test_power.c | 113 ++++ + include/linux/power/bq27xxx_battery.h | 1 + + include/linux/power_supply.h | 62 ++- + 38 files changed, 1736 insertions(+), 593 deletions(-) +Merging regulator/for-next (8100d74e2ea1 Merge remote-tracking branch 'regulator/for-6.14' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/mt6315-regulator.yaml | 6 - + .../bindings/regulator/nxp,pca9450-regulator.yaml | 1 + + drivers/regulator/bd96801-regulator.c | 130 ++++++++++++++++++--- + drivers/regulator/pca9450-regulator.c | 111 ++++++++++-------- + drivers/regulator/tps65219-regulator.c | 39 +------ + include/linux/regulator/pca9450.h | 1 + + 6 files changed, 187 insertions(+), 101 deletions(-) +Merging security/next (7a9b65ab0abd selftests: refactor the lsm `flags_overset_lsm_set_self_attr` test) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging kernel/auditsc.c +Auto-merging net/ipv4/ip_sockglue.c +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + drivers/android/binder.c | 25 +++++---- + fs/ceph/super.h | 3 +- + fs/ceph/xattr.c | 12 ++--- + fs/fuse/dir.c | 35 ++++++------ + fs/nfs/nfs4proc.c | 22 +++++--- + fs/nfsd/nfs4xdr.c | 22 ++++---- + include/linux/lsm_hook_defs.h | 13 +++-- + include/linux/security.h | 37 ++++++++----- + include/net/scm.h | 12 ++--- + kernel/audit.c | 33 ++++++------ + kernel/auditsc.c | 27 +++++----- + net/ipv4/ip_sockglue.c | 12 ++--- + net/netfilter/nf_conntrack_netlink.c | 20 +++---- + net/netfilter/nf_conntrack_standalone.c | 11 ++-- + net/netfilter/nfnetlink_queue.c | 22 ++++---- + net/netlabel/netlabel_unlabeled.c | 44 +++++++-------- + net/netlabel/netlabel_user.c | 10 ++-- + rust/helpers/security.c | 8 +-- + rust/kernel/security.rs | 38 ++++++------- + security/apparmor/include/secid.h | 7 ++- + security/apparmor/secid.c | 34 ++++++------ + security/security.c | 63 ++++++++++------------ + security/selinux/hooks.c | 49 +++++++++++------ + security/smack/smack_lsm.c | 52 ++++++++++-------- + .../testing/selftests/lsm/lsm_set_self_attr_test.c | 7 ++- + 25 files changed, 319 insertions(+), 299 deletions(-) +Merging apparmor/apparmor-next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (08ae3e5f5fc8 integrity: Use static_assert() to check struct sizes) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging selinux/next (f453a5d339ea Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + include/linux/lsm_audit.h | 2 ++ + security/lsm_audit.c | 3 +++ + security/selinux/Makefile | 7 +++---- + security/selinux/hooks.c | 8 ++++---- + security/selinux/include/security.h | 3 ++- + security/selinux/selinuxfs.c | 2 +- + security/selinux/ss/avtab.c | 11 +++++++++-- + security/selinux/ss/avtab.h | 2 +- + security/selinux/ss/conditional.c | 2 +- + security/selinux/ss/policydb.c | 5 +++++ + security/selinux/ss/services.c | 12 ++++++++---- + security/selinux/ss/sidtab.c | 4 ++-- + 12 files changed, 41 insertions(+), 20 deletions(-) +Merging smack/next (6f71ad02aae8 smack: deduplicate access to string conversion) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + security/smack/smack.h | 1 + + security/smack/smack_access.c | 10 ++++++++-- + security/smack/smack_lsm.c | 18 +----------------- + security/smack/smackfs.c | 26 +++++--------------------- + 4 files changed, 15 insertions(+), 40 deletions(-) +Merging tomoyo/master (0476fd4ff452 tomoyo: use realpath if symlink's pathname refers to procfs) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Merge made by the 'ort' strategy. + security/tomoyo/common.c | 2 +- + security/tomoyo/domain.c | 11 +++++++++-- + 2 files changed, 10 insertions(+), 3 deletions(-) +Merging tpmdd/next (2ba9f676d0a2 Merge tag 'drm-next-2024-11-29' of https://gitlab.freedesktop.org/drm/kernel) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (1a28a96a0d6d Merge branches 'riscv', 'core' and 'amd/amd-vi' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Merge made by the 'ort' strategy. + drivers/iommu/amd/amd_iommu.h | 4 +- + drivers/iommu/amd/amd_iommu_types.h | 41 ++- + drivers/iommu/amd/init.c | 229 ++++++++-------- + drivers/iommu/amd/iommu.c | 390 +++++++++++++++++++++------- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 12 +- + drivers/iommu/intel/iommu.c | 15 +- + drivers/iommu/iommu.c | 35 ++- + drivers/iommu/riscv/iommu-platform.c | 102 ++++++-- + include/linux/iommu.h | 5 - + 9 files changed, 573 insertions(+), 260 deletions(-) +Merging audit/next (8bea8f86f7a1 Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Merge made by the 'ort' strategy. + kernel/auditfilter.c | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) +Merging devicetree/for-next (4c2a458eb5c0 dt-bindings: interrupt-controller: arm,gic: Correct VGIC interrupt description) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging drivers/of/base.c +Auto-merging drivers/of/irq.c +Auto-merging drivers/of/unittest.c +Merge made by the 'ort' strategy. + .../bindings/interrupt-controller/arm,gic.yaml | 4 +- + .../interrupt-controller/riscv,imsics.yaml | 2 +- + .../bindings/power/raspberrypi,bcm2835-power.yaml | 42 +++++++++++++++++++ + .../bindings/soc/bcm/raspberrypi,bcm2835-power.txt | 47 ---------------------- + .../devicetree/bindings/timer/fsl,imxgpt.yaml | 3 +- + drivers/of/base.c | 16 +++----- + drivers/of/fdt.c | 16 ++------ + drivers/of/fdt_address.c | 2 +- + drivers/of/irq.c | 2 +- + drivers/of/platform.c | 23 +++++------ + drivers/of/unittest.c | 9 +++++ + include/linux/of_platform.h | 2 - + 12 files changed, 79 insertions(+), 89 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/raspberrypi,bcm2835-power.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/bcm/raspberrypi,bcm2835-power.txt +Merging dt-krzk/for-next (5aab15cd4794 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/marvell/mmp2-olpc-xo-1-75.dts | 4 ++-- + arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts | 2 +- + arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts | 2 +- + arch/arm64/boot/dts/sprd/sc2731.dtsi | 6 +++--- + arch/arm64/boot/dts/sprd/sc9863a.dtsi | 14 +++++++------- + arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 9 +++++++-- + 6 files changed, 21 insertions(+), 16 deletions(-) +Merging mailbox/for-next (7f9e19f207be mailbox: pcc: Check before sending MCTP PCC response ACK) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Already up to date. +Merging spi/for-next (36e011f3e1b0 Merge remote-tracking branch 'spi/for-6.14' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/misc/lwn,bk4-spi.yaml | 54 ++ + Documentation/devicetree/bindings/misc/lwn-bk4.txt | 26 - + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 1 + + .../devicetree/bindings/spi/spi-controller.yaml | 25 + + drivers/spi/Kconfig | 12 + + drivers/spi/Makefile | 1 + + drivers/spi/atmel-quadspi.c | 956 +++++++++++++++++++-- + drivers/spi/spi-cadence-quadspi.c | 49 +- + drivers/spi/spi-kspi2.c | 431 ++++++++++ + drivers/spi/spi-mxs.c | 2 + + drivers/spi/spi-rockchip-sfc.c | 209 ++++- + drivers/spi/spi-sc18is602.c | 34 +- + drivers/spi/spi-zynq-qspi.c | 13 +- + drivers/spi/spi.c | 41 +- + drivers/spi/spidev.c | 30 +- + 15 files changed, 1690 insertions(+), 194 deletions(-) + create mode 100644 Documentation/devicetree/bindings/misc/lwn,bk4-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/misc/lwn-bk4.txt + create mode 100644 drivers/spi/spi-kspi2.c +Merging tip/master (1c875bc67cc9 Merge branch into tip/master: 'x86/tdx') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/arm64/Kconfig +Auto-merging arch/x86/kernel/paravirt.c +Auto-merging drivers/idle/intel_idle.c +Auto-merging include/linux/compiler.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/seqlock.h +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/gup.c +Auto-merging tools/testing/vma/vma.c +Auto-merging tools/testing/vma/vma_internal.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.rst | 3 - + Documentation/admin-guide/kernel-parameters.txt | 241 +++++++- + Documentation/arch/x86/amd-memory-encryption.rst | 118 ++++ + Documentation/arch/x86/resctrl.rst | 10 + + Documentation/arch/x86/topology.rst | 4 + + Documentation/arch/x86/x86_64/boot-options.rst | 312 ---------- + .../arch/x86/x86_64/fake-numa-for-cpusets.rst | 2 +- + Documentation/arch/x86/x86_64/index.rst | 1 - + arch/arm/kernel/machine_kexec.c | 23 - + arch/arm64/Kconfig | 1 + + arch/arm64/kernel/machine_kexec.c | 31 - + arch/loongarch/include/asm/bug.h | 13 +- + arch/powerpc/include/asm/kexec.h | 1 - + arch/powerpc/kexec/core.c | 22 - + arch/powerpc/kexec/core_32.c | 1 + + arch/riscv/kernel/machine_kexec.c | 23 - + arch/s390/kernel/perf_cpum_cf.c | 2 +- + arch/s390/kernel/perf_cpum_sf.c | 6 +- + arch/s390/kernel/perf_pai_crypto.c | 2 +- + arch/s390/kernel/perf_pai_ext.c | 2 +- + arch/x86/Kconfig.debug | 2 +- + arch/x86/boot/compressed/kaslr.c | 4 - + arch/x86/coco/sev/core.c | 15 +- + arch/x86/coco/sev/shared.c | 16 +- + arch/x86/coco/tdx/Makefile | 2 +- + arch/x86/coco/tdx/debug.c | 69 +++ + arch/x86/coco/tdx/tdx.c | 44 +- + arch/x86/entry/entry_64.S | 9 +- + arch/x86/events/amd/core.c | 3 +- + arch/x86/events/amd/ibs.c | 64 +- + arch/x86/events/core.c | 3 +- + arch/x86/events/intel/core.c | 62 +- + arch/x86/events/intel/ds.c | 198 +++--- + arch/x86/events/intel/pt.c | 5 +- + arch/x86/events/intel/pt.h | 3 - + arch/x86/events/rapl.c | 413 ++++++++----- + arch/x86/hyperv/ivm.c | 2 +- + arch/x86/include/asm/alternative.h | 22 +- + arch/x86/include/asm/bug.h | 2 +- + arch/x86/include/asm/cpu_device_id.h | 51 +- + arch/x86/include/asm/cpufeature.h | 18 +- + arch/x86/include/asm/cpufeatures.h | 6 +- + arch/x86/include/asm/cpuid.h | 7 + + arch/x86/include/asm/fpu/xstate.h | 4 - + arch/x86/include/asm/init.h | 2 +- + arch/x86/include/asm/irq_stack.h | 4 +- + arch/x86/include/asm/kexec.h | 30 +- + arch/x86/include/asm/mmu.h | 2 + + arch/x86/include/asm/mmu_context.h | 1 + + arch/x86/include/asm/msr-index.h | 8 +- + arch/x86/include/asm/mtrr.h | 10 +- + arch/x86/include/asm/mwait.h | 1 - + arch/x86/include/asm/nospec-branch.h | 18 - + arch/x86/include/asm/paravirt.h | 7 - + arch/x86/include/asm/paravirt_types.h | 2 - + arch/x86/include/asm/perf_event.h | 16 +- + arch/x86/include/asm/processor.h | 1 + + arch/x86/include/asm/sections.h | 1 + + arch/x86/include/asm/setup.h | 2 +- + arch/x86/include/asm/shared/tdx.h | 38 +- + arch/x86/include/asm/special_insns.h | 8 +- + arch/x86/include/asm/tdx.h | 3 + + arch/x86/include/asm/tlbflush.h | 1 + + arch/x86/include/asm/topology.h | 1 + + arch/x86/kernel/acpi/cstate.c | 5 +- + arch/x86/kernel/alternative.c | 10 +- + arch/x86/kernel/apic/apic.c | 27 +- + arch/x86/kernel/callthunks.c | 6 + + arch/x86/kernel/cpu/amd.c | 18 +- + arch/x86/kernel/cpu/common.c | 85 +-- + arch/x86/kernel/cpu/debugfs.c | 1 + + arch/x86/kernel/cpu/intel.c | 5 - + arch/x86/kernel/cpu/match.c | 30 +- + arch/x86/kernel/cpu/mtrr/generic.c | 6 +- + arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +- + arch/x86/kernel/cpu/resctrl/core.c | 9 +- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 70 +++ + arch/x86/kernel/cpu/resctrl/internal.h | 11 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 94 ++- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 30 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 43 +- + arch/x86/kernel/cpu/topology.c | 2 +- + arch/x86/kernel/cpu/topology_common.c | 1 + + arch/x86/kernel/fpu/xstate.c | 26 +- + arch/x86/kernel/head64.c | 40 +- + arch/x86/kernel/head_64.S | 12 +- + arch/x86/kernel/hpet.c | 6 +- + arch/x86/kernel/ksysfs.c | 18 +- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 98 +-- + arch/x86/kernel/paravirt.c | 6 - + arch/x86/kernel/pci-dma.c | 4 - + arch/x86/kernel/process.c | 9 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/relocate_kernel_64.S | 158 +++-- + arch/x86/kernel/smpboot.c | 5 +- + arch/x86/kernel/tsc.c | 23 +- + arch/x86/kernel/vmlinux.lds.S | 43 +- + arch/x86/kvm/svm/sev.c | 2 +- + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/ioremap.c | 119 ++-- + arch/x86/mm/tlb.c | 59 +- + arch/x86/tools/relocs.c | 8 +- + arch/x86/virt/svm/sev.c | 667 ++++++++++++++++++--- + arch/x86/virt/vmx/tdx/tdx.c | 97 +-- + arch/x86/virt/vmx/tdx/tdx.h | 40 +- + arch/x86/virt/vmx/tdx/tdx_global_metadata.c | 48 ++ + arch/x86/virt/vmx/tdx/tdx_global_metadata.h | 25 + + arch/x86/xen/enlighten_pv.c | 11 +- + drivers/acpi/acpi_pad.c | 5 +- + drivers/dma/ioat/dca.c | 8 +- + drivers/edac/i10nm_base.c | 21 +- + drivers/edac/skx_base.c | 2 +- + drivers/idle/intel_idle.c | 6 +- + drivers/platform/x86/intel/pmc/core.c | 7 +- + include/linux/compiler-gcc.h | 12 - + include/linux/compiler.h | 37 +- + include/linux/instrumentation.h | 11 +- + include/linux/irq.h | 3 + + include/linux/mm_types.h | 1 + + include/linux/mod_devicetable.h | 2 + + include/linux/objtool.h | 126 ++-- + include/linux/objtool_types.h | 12 + + include/linux/perf_event.h | 32 +- + include/linux/sched.h | 9 + + include/linux/sched/isolation.h | 21 +- + include/linux/uprobes.h | 16 +- + kernel/events/core.c | 38 +- + kernel/events/uprobes.c | 225 +++++-- + kernel/irq/Kconfig | 6 + + kernel/irq/Makefile | 2 +- + kernel/irq/kexec.c | 36 ++ + kernel/irq/manage.c | 43 +- + kernel/rseq.c | 98 +++ + kernel/sched/core.c | 44 +- + kernel/sched/deadline.c | 119 +++- + kernel/sched/debug.c | 15 +- + kernel/sched/fair.c | 284 ++++----- + kernel/sched/features.h | 9 + + kernel/sched/isolation.c | 22 +- + kernel/sched/pelt.c | 4 +- + kernel/sched/sched.h | 22 +- + kernel/sched/topology.c | 8 +- + kernel/smp.c | 5 +- + kernel/trace/bpf_trace.c | 11 +- + lib/Kconfig.debug | 4 +- + mm/gup.c | 3 +- + tools/include/linux/objtool_types.h | 12 + + tools/objtool/arch/loongarch/special.c | 3 +- + tools/objtool/arch/powerpc/special.c | 3 +- + tools/objtool/arch/x86/special.c | 4 +- + tools/objtool/check.c | 442 ++++---------- + tools/objtool/include/objtool/check.h | 5 +- + tools/objtool/include/objtool/special.h | 3 +- + tools/testing/selftests/x86/lam.c | 2 +- + 155 files changed, 3344 insertions(+), 2442 deletions(-) + delete mode 100644 Documentation/arch/x86/x86_64/boot-options.rst + create mode 100644 arch/x86/coco/tdx/debug.c + create mode 100644 arch/x86/virt/vmx/tdx/tdx_global_metadata.c + create mode 100644 arch/x86/virt/vmx/tdx/tdx_global_metadata.h + create mode 100644 kernel/irq/kexec.c +Merging clockevents/timers/drivers/next (08b97fbd13de clocksource/drivers/arm_arch_timer: Use of_property_present() for non-boolean properties) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (e3e7a5a35d6e Merge edac-misc into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging drivers/edac/i10nm_base.c +CONFLICT (content): Merge conflict in drivers/edac/i10nm_base.c +Auto-merging drivers/edac/skx_base.c +Resolved 'drivers/edac/i10nm_base.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 41d9e71adeec] Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git +$ git diff -M --stat --summary HEAD^.. + drivers/edac/edac_mc.c | 2 +- + drivers/edac/edac_mc_sysfs.c | 6 +++--- + drivers/edac/i10nm_base.c | 12 ++++------- + drivers/edac/i5000_edac.c | 8 ++++---- + drivers/edac/skx_base.c | 9 +++----- + drivers/edac/skx_common.c | 49 ++++++++++++++++++++++++++++++-------------- + drivers/edac/skx_common.h | 3 +-- + 7 files changed, 50 insertions(+), 39 deletions(-) +Merging ftrace/for-next (7dbc10961c8a tracing/dynevent: Adopt guard() and scoped_guard()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging kernel/trace/trace_uprobe.c +Merge made by the 'ort' strategy. + kernel/kprobes.c | 239 +++++++++++++++++++----------------------- + kernel/trace/trace_dynevent.c | 33 +++--- + kernel/trace/trace_eprobe.c | 36 +++---- + kernel/trace/trace_kprobe.c | 18 ++-- + kernel/trace/trace_uprobe.c | 15 +-- + 5 files changed, 149 insertions(+), 192 deletions(-) +Merging rcu/next (4b5c2205526c Merge branches 'fixes.2024.12.14a', 'rcutorture.2024.12.14a', 'srcu.2024.12.14a' and 'torture-test.2024.12.14a' into rcu-merge.2024.12.14a) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging kernel/rcu/tree.c +CONFLICT (content): Merge conflict in kernel/rcu/tree.c +Recorded preimage for 'kernel/rcu/tree.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'kernel/rcu/tree.c'. +[master 2d119f6afa7a] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 90 +++++++- + MAINTAINERS | 10 +- + include/linux/rcupdate_wait.h | 11 + + include/linux/srcu.h | 21 +- + include/linux/srcutree.h | 8 +- + include/linux/torture.h | 2 +- + kernel/locking/locktorture.c | 6 +- + kernel/rcu/Kconfig.debug | 31 +++ + kernel/rcu/rcutorture.c | 237 +++++++++++++++++---- + kernel/rcu/refscale.c | 40 +++- + kernel/rcu/srcutree.c | 4 +- + kernel/rcu/tree.c | 3 + + kernel/rcu/tree_exp.h | 72 ++++--- + kernel/rcu/tree_plugin.h | 1 + + kernel/rcu/update.c | 4 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 25 ++- + .../selftests/rcutorture/configs/rcu/TREE03.boot | 1 + + 17 files changed, 465 insertions(+), 101 deletions(-) +Merging paulmck/non-rcu/next (b6f62437f431 Merge branches 'csd-lock.2024.10.11a', 'lkmm.2024.11.09a' and 'scftorture.2024.11.09a', tag 'nolibc.2024.11.01a' into HEAD) +$ git merge -m Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Merge made by the 'ort' strategy. + .../Documentation/herd-representation.txt | 49 ++++--- + tools/memory-model/README | 2 +- + tools/memory-model/linux-kernel.bell | 33 +++-- + tools/memory-model/linux-kernel.cat | 10 ++ + tools/memory-model/linux-kernel.cfg | 1 + + tools/memory-model/linux-kernel.def | 157 ++++++++++++--------- + 6 files changed, 155 insertions(+), 97 deletions(-) +Merging kvm/next (a066bad89c6c Merge tag 'kvm-selftests-treewide-6.14' of https://github.com/kvm-x86/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 12 +- + arch/arm64/include/uapi/asm/kvm.h | 3 - + arch/riscv/include/uapi/asm/kvm.h | 3 - + include/uapi/linux/kvm.h | 4 + + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 347 +-------------------- + tools/testing/selftests/kvm/Makefile.kvm | 330 ++++++++++++++++++++ + .../kvm/{aarch64 => arm64}/aarch32_id_regs.c | 10 +- + .../selftests/kvm/{aarch64 => arm64}/arch_timer.c | 0 + .../kvm/{aarch64 => arm64}/arch_timer_edge_cases.c | 0 + .../kvm/{aarch64 => arm64}/debug-exceptions.c | 4 +- + .../kvm/{aarch64 => arm64}/get-reg-list.c | 0 + .../selftests/kvm/{aarch64 => arm64}/hypercalls.c | 6 +- + .../selftests/kvm/{aarch64 => arm64}/mmio_abort.c | 0 + .../selftests/kvm/{aarch64 => arm64}/no-vgic-v3.c | 2 +- + .../kvm/{aarch64 => arm64}/page_fault_test.c | 0 + .../selftests/kvm/{aarch64 => arm64}/psci_test.c | 8 +- + .../selftests/kvm/{aarch64 => arm64}/set_id_regs.c | 22 +- + .../kvm/{aarch64 => arm64}/smccc_filter.c | 0 + .../kvm/{aarch64 => arm64}/vcpu_width_config.c | 0 + .../selftests/kvm/{aarch64 => arm64}/vgic_init.c | 0 + .../selftests/kvm/{aarch64 => arm64}/vgic_irq.c | 0 + .../kvm/{aarch64 => arm64}/vgic_lpi_stress.c | 0 + .../kvm/{aarch64 => arm64}/vpmu_counter_access.c | 19 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 2 +- + .../kvm/include/{aarch64 => arm64}/arch_timer.h | 0 + .../kvm/include/{aarch64 => arm64}/delay.h | 0 + .../selftests/kvm/include/{aarch64 => arm64}/gic.h | 0 + .../kvm/include/{aarch64 => arm64}/gic_v3.h | 0 + .../kvm/include/{aarch64 => arm64}/gic_v3_its.h | 0 + .../kvm/include/{aarch64 => arm64}/kvm_util_arch.h | 0 + .../kvm/include/{aarch64 => arm64}/processor.h | 0 + .../kvm/include/{aarch64 => arm64}/spinlock.h | 0 + .../kvm/include/{aarch64 => arm64}/ucall.h | 0 + .../kvm/include/{aarch64 => arm64}/vgic.h | 0 + tools/testing/selftests/kvm/include/kvm_util.h | 10 +- + .../kvm/include/{s390x => s390}/debug_print.h | 0 + .../include/{s390x => s390}/diag318_test_handler.h | 0 + .../kvm/include/{s390x => s390}/facility.h | 0 + .../kvm/include/{s390x => s390}/kvm_util_arch.h | 0 + .../kvm/include/{s390x => s390}/processor.h | 0 + .../selftests/kvm/include/{s390x => s390}/sie.h | 0 + .../selftests/kvm/include/{s390x => s390}/ucall.h | 0 + .../selftests/kvm/include/{x86_64 => x86}/apic.h | 2 - + .../selftests/kvm/include/{x86_64 => x86}/evmcs.h | 3 - + .../selftests/kvm/include/{x86_64 => x86}/hyperv.h | 3 - + .../kvm/include/{x86_64 => x86}/kvm_util_arch.h | 0 + .../selftests/kvm/include/{x86_64 => x86}/mce.h | 2 - + .../selftests/kvm/include/{x86_64 => x86}/pmu.h | 0 + .../kvm/include/{x86_64 => x86}/processor.h | 2 - + .../selftests/kvm/include/{x86_64 => x86}/sev.h | 0 + .../selftests/kvm/include/{x86_64 => x86}/svm.h | 6 - + .../kvm/include/{x86_64 => x86}/svm_util.h | 3 - + .../selftests/kvm/include/{x86_64 => x86}/ucall.h | 0 + .../selftests/kvm/include/{x86_64 => x86}/vmx.h | 2 - + .../selftests/kvm/lib/{aarch64 => arm64}/gic.c | 0 + .../kvm/lib/{aarch64 => arm64}/gic_private.h | 0 + .../selftests/kvm/lib/{aarch64 => arm64}/gic_v3.c | 0 + .../kvm/lib/{aarch64 => arm64}/gic_v3_its.c | 0 + .../kvm/lib/{aarch64 => arm64}/handlers.S | 0 + .../kvm/lib/{aarch64 => arm64}/processor.c | 8 +- + .../kvm/lib/{aarch64 => arm64}/spinlock.c | 0 + .../selftests/kvm/lib/{aarch64 => arm64}/ucall.c | 0 + .../selftests/kvm/lib/{aarch64 => arm64}/vgic.c | 0 + tools/testing/selftests/kvm/lib/kvm_util.c | 3 +- + tools/testing/selftests/kvm/lib/riscv/processor.c | 66 ++-- + .../kvm/lib/{s390x => s390}/diag318_test_handler.c | 0 + .../selftests/kvm/lib/{s390x => s390}/facility.c | 0 + .../selftests/kvm/lib/{s390x => s390}/processor.c | 0 + .../selftests/kvm/lib/{s390x => s390}/ucall.c | 0 + .../selftests/kvm/lib/{x86_64 => x86}/apic.c | 0 + .../selftests/kvm/lib/{x86_64 => x86}/handlers.S | 0 + .../selftests/kvm/lib/{x86_64 => x86}/hyperv.c | 0 + .../selftests/kvm/lib/{x86_64 => x86}/memstress.c | 2 +- + .../selftests/kvm/lib/{x86_64 => x86}/pmu.c | 0 + .../selftests/kvm/lib/{x86_64 => x86}/processor.c | 2 - + .../selftests/kvm/lib/{x86_64 => x86}/sev.c | 0 + .../selftests/kvm/lib/{x86_64 => x86}/svm.c | 1 - + .../selftests/kvm/lib/{x86_64 => x86}/ucall.c | 0 + .../selftests/kvm/lib/{x86_64 => x86}/vmx.c | 2 - + .../{max_guest_memory_test.c => mmu_stress_test.c} | 162 +++++++++- + tools/testing/selftests/kvm/riscv/arch_timer.c | 2 +- + tools/testing/selftests/kvm/riscv/ebreak_test.c | 2 +- + tools/testing/selftests/kvm/riscv/sbi_pmu_test.c | 2 +- + .../selftests/kvm/{s390x => s390}/cmma_test.c | 0 + tools/testing/selftests/kvm/{s390x => s390}/config | 0 + .../kvm/{s390x => s390}/cpumodel_subfuncs_test.c | 0 + .../selftests/kvm/{s390x => s390}/debug_test.c | 0 + .../testing/selftests/kvm/{s390x => s390}/memop.c | 0 + .../testing/selftests/kvm/{s390x => s390}/resets.c | 2 +- + .../kvm/{s390x => s390}/shared_zeropage_test.c | 0 + .../selftests/kvm/{s390x => s390}/sync_regs_test.c | 0 + .../testing/selftests/kvm/{s390x => s390}/tprot.c | 0 + .../selftests/kvm/{s390x => s390}/ucontrol_test.c | 0 + .../testing/selftests/kvm/set_memory_region_test.c | 6 +- + tools/testing/selftests/kvm/steal_time.c | 3 +- + .../selftests/kvm/{x86_64 => x86}/amx_test.c | 0 + .../kvm/{x86_64 => x86}/apic_bus_clock_test.c | 0 + .../selftests/kvm/{x86_64 => x86}/cpuid_test.c | 0 + .../kvm/{x86_64 => x86}/cr4_cpuid_sync_test.c | 0 + .../selftests/kvm/{x86_64 => x86}/debug_regs.c | 0 + .../dirty_log_page_splitting_test.c | 0 + .../exit_on_emulation_failure_test.c | 0 + .../kvm/{x86_64 => x86}/feature_msrs_test.c | 0 + .../kvm/{x86_64 => x86}/fix_hypercall_test.c | 0 + .../selftests/kvm/{x86_64 => x86}/flds_emulation.h | 0 + .../selftests/kvm/{x86_64 => x86}/hwcr_msr_test.c | 0 + .../selftests/kvm/{x86_64 => x86}/hyperv_clock.c | 0 + .../selftests/kvm/{x86_64 => x86}/hyperv_cpuid.c | 0 + .../selftests/kvm/{x86_64 => x86}/hyperv_evmcs.c | 0 + .../{x86_64 => x86}/hyperv_extended_hypercalls.c | 0 + .../kvm/{x86_64 => x86}/hyperv_features.c | 0 + .../selftests/kvm/{x86_64 => x86}/hyperv_ipi.c | 0 + .../kvm/{x86_64 => x86}/hyperv_svm_test.c | 0 + .../kvm/{x86_64 => x86}/hyperv_tlb_flush.c | 0 + .../selftests/kvm/{x86_64 => x86}/kvm_clock_test.c | 0 + .../selftests/kvm/{x86_64 => x86}/kvm_pv_test.c | 0 + .../kvm/{x86_64 => x86}/max_vcpuid_cap_test.c | 0 + .../kvm/{x86_64 => x86}/monitor_mwait_test.c | 0 + .../kvm/{x86_64 => x86}/nested_exceptions_test.c | 0 + .../kvm/{x86_64 => x86}/nx_huge_pages_test.c | 0 + .../kvm/{x86_64 => x86}/nx_huge_pages_test.sh | 0 + .../kvm/{x86_64 => x86}/platform_info_test.c | 0 + .../kvm/{x86_64 => x86}/pmu_counters_test.c | 0 + .../kvm/{x86_64 => x86}/pmu_event_filter_test.c | 0 + .../{x86_64 => x86}/private_mem_conversions_test.c | 0 + .../{x86_64 => x86}/private_mem_kvm_exits_test.c | 0 + .../kvm/{x86_64 => x86}/recalc_apic_map_test.c | 0 + .../kvm/{x86_64 => x86}/set_boot_cpu_id.c | 0 + .../selftests/kvm/{x86_64 => x86}/set_sregs_test.c | 0 + .../kvm/{x86_64 => x86}/sev_init2_tests.c | 0 + .../kvm/{x86_64 => x86}/sev_migrate_tests.c | 0 + .../selftests/kvm/{x86_64 => x86}/sev_smoke_test.c | 0 + .../smaller_maxphyaddr_emulation_test.c | 0 + .../selftests/kvm/{x86_64 => x86}/smm_test.c | 0 + .../selftests/kvm/{x86_64 => x86}/state_test.c | 0 + .../kvm/{x86_64 => x86}/svm_int_ctl_test.c | 0 + .../kvm/{x86_64 => x86}/svm_nested_shutdown_test.c | 0 + .../{x86_64 => x86}/svm_nested_soft_inject_test.c | 0 + .../kvm/{x86_64 => x86}/svm_vmcall_test.c | 0 + .../selftests/kvm/{x86_64 => x86}/sync_regs_test.c | 0 + .../kvm/{x86_64 => x86}/triple_fault_event_test.c | 0 + .../selftests/kvm/{x86_64 => x86}/tsc_msrs_test.c | 0 + .../kvm/{x86_64 => x86}/tsc_scaling_sync.c | 0 + .../kvm/{x86_64 => x86}/ucna_injection_test.c | 0 + .../kvm/{x86_64 => x86}/userspace_io_test.c | 0 + .../kvm/{x86_64 => x86}/userspace_msr_exit_test.c | 0 + .../kvm/{x86_64 => x86}/vmx_apic_access_test.c | 0 + .../{x86_64 => x86}/vmx_close_while_nested_test.c | 0 + .../kvm/{x86_64 => x86}/vmx_dirty_log_test.c | 0 + .../vmx_exception_with_invalid_guest_state.c | 0 + .../vmx_invalid_nested_guest_state.c | 0 + .../selftests/kvm/{x86_64 => x86}/vmx_msrs_test.c | 0 + .../{x86_64 => x86}/vmx_nested_tsc_scaling_test.c | 0 + .../kvm/{x86_64 => x86}/vmx_pmu_caps_test.c | 0 + .../{x86_64 => x86}/vmx_preemption_timer_test.c | 0 + .../{x86_64 => x86}/vmx_set_nested_state_test.c | 0 + .../kvm/{x86_64 => x86}/vmx_tsc_adjust_test.c | 0 + .../selftests/kvm/{x86_64 => x86}/xapic_ipi_test.c | 0 + .../kvm/{x86_64 => x86}/xapic_state_test.c | 0 + .../kvm/{x86_64 => x86}/xcr0_cpuid_test.c | 0 + .../kvm/{x86_64 => x86}/xen_shinfo_test.c | 0 + .../kvm/{x86_64 => x86}/xen_vmcall_test.c | 0 + .../selftests/kvm/{x86_64 => x86}/xss_msr_test.c | 0 + 164 files changed, 588 insertions(+), 481 deletions(-) + create mode 100644 tools/testing/selftests/kvm/Makefile.kvm + rename tools/testing/selftests/kvm/{aarch64 => arm64}/aarch32_id_regs.c (95%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/arch_timer.c (100%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/arch_timer_edge_cases.c (100%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/debug-exceptions.c (99%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/get-reg-list.c (100%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/hypercalls.c (98%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/mmio_abort.c (100%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/no-vgic-v3.c (98%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/page_fault_test.c (100%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/psci_test.c (96%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/set_id_regs.c (97%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/smccc_filter.c (100%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/vcpu_width_config.c (100%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/vgic_init.c (100%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/vgic_irq.c (100%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/vgic_lpi_stress.c (100%) + rename tools/testing/selftests/kvm/{aarch64 => arm64}/vpmu_counter_access.c (97%) + rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/arch_timer.h (100%) + rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/delay.h (100%) + rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/gic.h (100%) + rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/gic_v3.h (100%) + rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/gic_v3_its.h (100%) + rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/kvm_util_arch.h (100%) + rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/processor.h (100%) + rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/spinlock.h (100%) + rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/ucall.h (100%) + rename tools/testing/selftests/kvm/include/{aarch64 => arm64}/vgic.h (100%) + rename tools/testing/selftests/kvm/include/{s390x => s390}/debug_print.h (100%) + rename tools/testing/selftests/kvm/include/{s390x => s390}/diag318_test_handler.h (100%) + rename tools/testing/selftests/kvm/include/{s390x => s390}/facility.h (100%) + rename tools/testing/selftests/kvm/include/{s390x => s390}/kvm_util_arch.h (100%) + rename tools/testing/selftests/kvm/include/{s390x => s390}/processor.h (100%) + rename tools/testing/selftests/kvm/include/{s390x => s390}/sie.h (100%) + rename tools/testing/selftests/kvm/include/{s390x => s390}/ucall.h (100%) + rename tools/testing/selftests/kvm/include/{x86_64 => x86}/apic.h (98%) + rename tools/testing/selftests/kvm/include/{x86_64 => x86}/evmcs.h (99%) + rename tools/testing/selftests/kvm/include/{x86_64 => x86}/hyperv.h (99%) + rename tools/testing/selftests/kvm/include/{x86_64 => x86}/kvm_util_arch.h (100%) + rename tools/testing/selftests/kvm/include/{x86_64 => x86}/mce.h (94%) + rename tools/testing/selftests/kvm/include/{x86_64 => x86}/pmu.h (100%) + rename tools/testing/selftests/kvm/include/{x86_64 => x86}/processor.h (99%) + rename tools/testing/selftests/kvm/include/{x86_64 => x86}/sev.h (100%) + rename tools/testing/selftests/kvm/include/{x86_64 => x86}/svm.h (98%) + rename tools/testing/selftests/kvm/include/{x86_64 => x86}/svm_util.h (94%) + rename tools/testing/selftests/kvm/include/{x86_64 => x86}/ucall.h (100%) + rename tools/testing/selftests/kvm/include/{x86_64 => x86}/vmx.h (99%) + rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic.c (100%) + rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic_private.h (100%) + rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic_v3.c (100%) + rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/gic_v3_its.c (100%) + rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/handlers.S (100%) + rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/processor.c (98%) + rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/spinlock.c (100%) + rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/ucall.c (100%) + rename tools/testing/selftests/kvm/lib/{aarch64 => arm64}/vgic.c (100%) + rename tools/testing/selftests/kvm/lib/{s390x => s390}/diag318_test_handler.c (100%) + rename tools/testing/selftests/kvm/lib/{s390x => s390}/facility.c (100%) + rename tools/testing/selftests/kvm/lib/{s390x => s390}/processor.c (100%) + rename tools/testing/selftests/kvm/lib/{s390x => s390}/ucall.c (100%) + rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/apic.c (100%) + rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/handlers.S (100%) + rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/hyperv.c (100%) + rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/memstress.c (98%) + rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/pmu.c (100%) + rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/processor.c (99%) + rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/sev.c (100%) + rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/svm.c (99%) + rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/ucall.c (100%) + rename tools/testing/selftests/kvm/lib/{x86_64 => x86}/vmx.c (99%) + rename tools/testing/selftests/kvm/{max_guest_memory_test.c => mmu_stress_test.c} (60%) + rename tools/testing/selftests/kvm/{s390x => s390}/cmma_test.c (100%) + rename tools/testing/selftests/kvm/{s390x => s390}/config (100%) + rename tools/testing/selftests/kvm/{s390x => s390}/cpumodel_subfuncs_test.c (100%) + rename tools/testing/selftests/kvm/{s390x => s390}/debug_test.c (100%) + rename tools/testing/selftests/kvm/{s390x => s390}/memop.c (100%) + rename tools/testing/selftests/kvm/{s390x => s390}/resets.c (99%) + rename tools/testing/selftests/kvm/{s390x => s390}/shared_zeropage_test.c (100%) + rename tools/testing/selftests/kvm/{s390x => s390}/sync_regs_test.c (100%) + rename tools/testing/selftests/kvm/{s390x => s390}/tprot.c (100%) + rename tools/testing/selftests/kvm/{s390x => s390}/ucontrol_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/amx_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/apic_bus_clock_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/cpuid_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/cr4_cpuid_sync_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/debug_regs.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/dirty_log_page_splitting_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/exit_on_emulation_failure_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/feature_msrs_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/fix_hypercall_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/flds_emulation.h (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/hwcr_msr_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_clock.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_cpuid.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_evmcs.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_extended_hypercalls.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_features.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_ipi.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_svm_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/hyperv_tlb_flush.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/kvm_clock_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/kvm_pv_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/max_vcpuid_cap_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/monitor_mwait_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/nested_exceptions_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/nx_huge_pages_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/nx_huge_pages_test.sh (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/platform_info_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/pmu_counters_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/pmu_event_filter_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/private_mem_conversions_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/private_mem_kvm_exits_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/recalc_apic_map_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/set_boot_cpu_id.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/set_sregs_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/sev_init2_tests.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/sev_migrate_tests.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/sev_smoke_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/smaller_maxphyaddr_emulation_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/smm_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/state_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_int_ctl_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_nested_shutdown_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_nested_soft_inject_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/svm_vmcall_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/sync_regs_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/triple_fault_event_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/tsc_msrs_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/tsc_scaling_sync.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/ucna_injection_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/userspace_io_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/userspace_msr_exit_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_apic_access_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_close_while_nested_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_dirty_log_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_exception_with_invalid_guest_state.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_invalid_nested_guest_state.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_msrs_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_nested_tsc_scaling_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_pmu_caps_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_preemption_timer_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_set_nested_state_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/vmx_tsc_adjust_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/xapic_ipi_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/xapic_state_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/xcr0_cpuid_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/xen_shinfo_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/xen_vmcall_test.c (100%) + rename tools/testing/selftests/kvm/{x86_64 => x86}/xss_msr_test.c (100%) +Merging kvm-arm/next (60ad25e14ab5 KVM: arm64: Pass on SVE mapping failures) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (7a1f3143377a KVM: s390: selftests: Add regression tests for PFCR subfunctions) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-ppc/topic/ppc-kvm (fac04efc5c79 Linux 6.13-rc2) +$ git merge -m Merge branch 'topic/ppc-kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (ea6398a5af81 RISC-V: KVM: Fix csr_write -> csr_set for HVIEN PMU overflow bit) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Already up to date. +Merging kvm-x86/next (13e98294d7ce Merge branches 'fixes', 'misc', 'mmu', 'svm', 'vcpu_array' and 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/kvm/svm/sev.c +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 10 +- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/kvm-x86-ops.h | 2 +- + arch/x86/include/asm/kvm_host.h | 68 +- + arch/x86/kvm/cpuid.c | 997 ++++++++++++++------- + arch/x86/kvm/cpuid.h | 132 ++- + arch/x86/kvm/governed_features.h | 22 - + arch/x86/kvm/hyperv.c | 2 +- + arch/x86/kvm/kvm_emulate.h | 2 + + arch/x86/kvm/lapic.c | 29 +- + arch/x86/kvm/lapic.h | 1 + + arch/x86/kvm/mmu.h | 2 +- + arch/x86/kvm/mmu/mmu.c | 16 +- + arch/x86/kvm/mmu/mmu_internal.h | 4 + + arch/x86/kvm/mmu/spte.h | 17 + + arch/x86/kvm/mmu/tdp_mmu.c | 5 + + arch/x86/kvm/pmu.c | 1 - + arch/x86/kvm/reverse_cpuid.h | 23 +- + arch/x86/kvm/smm.c | 10 +- + arch/x86/kvm/svm/avic.c | 6 + + arch/x86/kvm/svm/nested.c | 22 +- + arch/x86/kvm/svm/pmu.c | 8 +- + arch/x86/kvm/svm/sev.c | 21 +- + arch/x86/kvm/svm/svm.c | 84 +- + arch/x86/kvm/svm/svm.h | 23 +- + arch/x86/kvm/trace.h | 17 +- + arch/x86/kvm/vmx/hyperv.h | 2 +- + arch/x86/kvm/vmx/main.c | 2 +- + arch/x86/kvm/vmx/nested.c | 100 ++- + arch/x86/kvm/vmx/pmu_intel.c | 4 +- + arch/x86/kvm/vmx/sgx.c | 14 +- + arch/x86/kvm/vmx/vmx.c | 140 ++- + arch/x86/kvm/vmx/vmx.h | 1 + + arch/x86/kvm/vmx/x86_ops.h | 6 +- + arch/x86/kvm/x86.c | 186 ++-- + arch/x86/kvm/x86.h | 6 +- + include/linux/kvm_host.h | 16 +- + include/uapi/linux/kvm.h | 4 - + .../testing/selftests/kvm/include/x86/processor.h | 25 +- + .../testing/selftests/kvm/set_memory_region_test.c | 53 +- + tools/testing/selftests/kvm/x86/kvm_pv_test.c | 38 +- + tools/testing/selftests/kvm/x86/set_sregs_test.c | 63 +- + tools/testing/selftests/kvm/x86/sev_smoke_test.c | 2 +- + virt/kvm/kvm_main.c | 68 +- + 44 files changed, 1398 insertions(+), 857 deletions(-) + delete mode 100644 arch/x86/kvm/governed_features.h +Merging xen-tip/linux-next (fac04efc5c79 Linux 6.13-rc2) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (de35994ecd2d workqueue: Do not warn when cancelling WQ_MEM_RECLAIM work from !WQ_MEM_RECLAIM worker) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + kernel/workqueue.c | 22 +++++++++++++--------- + rust/kernel/workqueue.rs | 18 ++++++++++++++++-- + 2 files changed, 29 insertions(+), 11 deletions(-) +Merging sched-ext/for-next (471069f5ae88 Merge branch 'for-6.14' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + kernel/sched/ext.c | 118 +++++++++++++++------ + tools/sched_ext/include/scx/common.bpf.h | 89 +++++++++++++++- + tools/sched_ext/include/scx/common.h | 6 ++ + tools/sched_ext/include/scx/compat.h | 1 + + tools/sched_ext/include/scx/enums.autogen.bpf.h | 105 ++++++++++++++++++ + tools/sched_ext/include/scx/enums.autogen.h | 41 +++++++ + tools/sched_ext/include/scx/enums.bpf.h | 12 +++ + tools/sched_ext/include/scx/enums.h | 27 +++++ + tools/sched_ext/include/scx/user_exit_info.h | 9 +- + tools/sched_ext/scx_central.bpf.c | 2 +- + tools/sched_ext/scx_central.c | 3 +- + tools/sched_ext/scx_flatcg.bpf.c | 2 +- + tools/sched_ext/scx_flatcg.c | 1 + + tools/sched_ext/scx_qmap.bpf.c | 2 +- + tools/sched_ext/scx_qmap.c | 2 + + .../selftests/sched_ext/ddsp_bogus_dsq_fail.bpf.c | 2 +- + .../selftests/sched_ext/ddsp_vtimelocal_fail.bpf.c | 4 +- + .../testing/selftests/sched_ext/dsp_local_on.bpf.c | 2 +- + .../selftests/sched_ext/enq_select_cpu_fails.bpf.c | 2 +- + tools/testing/selftests/sched_ext/exit.bpf.c | 4 +- + tools/testing/selftests/sched_ext/maximal.bpf.c | 8 +- + .../selftests/sched_ext/select_cpu_dfl.bpf.c | 2 +- + .../sched_ext/select_cpu_dfl_nodispatch.bpf.c | 2 +- + .../selftests/sched_ext/select_cpu_dispatch.bpf.c | 2 +- + .../sched_ext/select_cpu_dispatch_bad_dsq.bpf.c | 2 +- + .../sched_ext/select_cpu_dispatch_dbl_dsp.bpf.c | 4 +- + .../selftests/sched_ext/select_cpu_vtime.bpf.c | 8 +- + 28 files changed, 402 insertions(+), 62 deletions(-) + create mode 100644 tools/sched_ext/include/scx/enums.autogen.bpf.h + create mode 100644 tools/sched_ext/include/scx/enums.autogen.h + create mode 100644 tools/sched_ext/include/scx/enums.bpf.h + create mode 100644 tools/sched_ext/include/scx/enums.h +Merging drivers-x86/for-next (9e0894d07072 platform/x86/amd/pmf: Enable Custom BIOS Inputs for PMF-TA) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/platform/x86/dell/alienware-wmi.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-platform_profile | 5 + + .../userspace-api/sysfs-platform_profile.rst | 38 ++ + MAINTAINERS | 2 +- + arch/x86/include/uapi/asm/amd_hsmp.h | 64 ++- + drivers/acpi/platform_profile.c | 544 ++++++++++++++++----- + drivers/i2c/busses/i2c-i801.c | 124 ----- + drivers/platform/mellanox/mlxbf-bootctl.c | 6 +- + drivers/platform/mellanox/mlxbf-pmc.c | 6 +- + .../platform/surface/surface_platform_profile.c | 8 +- + drivers/platform/x86/acer-wmi.c | 176 +++++-- + drivers/platform/x86/amd/hsmp/acpi.c | 12 +- + drivers/platform/x86/amd/hsmp/hsmp.c | 47 +- + drivers/platform/x86/amd/hsmp/plat.c | 12 +- + drivers/platform/x86/amd/pmc/Makefile | 2 +- + drivers/platform/x86/amd/pmc/mp1_stb.c | 332 +++++++++++++ + drivers/platform/x86/amd/pmc/pmc.c | 377 +++----------- + drivers/platform/x86/amd/pmc/pmc.h | 24 +- + drivers/platform/x86/amd/pmf/Makefile | 2 +- + drivers/platform/x86/amd/pmf/acpi.c | 24 + + drivers/platform/x86/amd/pmf/core.c | 1 - + drivers/platform/x86/amd/pmf/pmf-quirks.c | 66 --- + drivers/platform/x86/amd/pmf/pmf.h | 18 +- + drivers/platform/x86/amd/pmf/spc.c | 24 + + drivers/platform/x86/amd/pmf/sps.c | 4 +- + drivers/platform/x86/asus-wmi.c | 8 +- + drivers/platform/x86/dell/Kconfig | 1 + + drivers/platform/x86/dell/Makefile | 1 + + drivers/platform/x86/dell/alienware-wmi.c | 8 +- + drivers/platform/x86/dell/dcdbas.c | 10 +- + drivers/platform/x86/dell/dcdbas.h | 8 - + drivers/platform/x86/dell/dell-lis3lv02d.c | 207 ++++++++ + drivers/platform/x86/dell/dell-pc.c | 38 +- + drivers/platform/x86/dell/dell-smo8800-ids.h | 27 + + drivers/platform/x86/dell/dell-smo8800.c | 16 +- + drivers/platform/x86/dell/dell-uart-backlight.c | 2 +- + drivers/platform/x86/dell/dell_rbu.c | 20 +- + drivers/platform/x86/fujitsu-laptop.c | 8 +- + drivers/platform/x86/hp/hp-wmi.c | 8 +- + drivers/platform/x86/ideapad-laptop.c | 6 +- + drivers/platform/x86/inspur_platform_profile.c | 7 +- + drivers/platform/x86/intel/Kconfig | 1 + + drivers/platform/x86/intel/bytcrc_pwrsrc.c | 79 ++- + drivers/platform/x86/intel/int0002_vgpio.c | 14 +- + drivers/platform/x86/intel/int3472/common.c | 2 + + drivers/platform/x86/intel/int3472/discrete.c | 24 +- + drivers/platform/x86/intel/int3472/tps68470.c | 3 + + drivers/platform/x86/intel/plr_tpmi.c | 2 +- + drivers/platform/x86/intel/pmt/class.c | 4 +- + drivers/platform/x86/intel/sdsi.c | 34 +- + drivers/platform/x86/quickstart.c | 1 - + drivers/platform/x86/serdev_helpers.h | 60 ++- + drivers/platform/x86/thinkpad_acpi.c | 16 +- + drivers/platform/x86/wmi-bmof.c | 77 +-- + drivers/platform/x86/x86-android-tablets/Makefile | 2 +- + drivers/platform/x86/x86-android-tablets/asus.c | 4 +- + drivers/platform/x86/x86-android-tablets/core.c | 31 +- + drivers/platform/x86/x86-android-tablets/lenovo.c | 8 +- + drivers/platform/x86/x86-android-tablets/other.c | 16 +- + .../x86/x86-android-tablets/vexia_atla10_ec.c | 261 ++++++++++ + .../x86/x86-android-tablets/x86-android-tablets.h | 13 +- + include/linux/platform_profile.h | 9 +- + 61 files changed, 2067 insertions(+), 887 deletions(-) + create mode 100644 drivers/platform/x86/amd/pmc/mp1_stb.c + delete mode 100644 drivers/platform/x86/amd/pmf/pmf-quirks.c + create mode 100644 drivers/platform/x86/dell/dell-lis3lv02d.c + create mode 100644 drivers/platform/x86/dell/dell-smo8800-ids.h + create mode 100644 drivers/platform/x86/x86-android-tablets/vexia_atla10_ec.c +Merging chrome-platform/for-next (a0355d4d55f3 platform/chrome: cros_ec_vbc: Constify 'struct bin_attribute') +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + .../chrome/google,cros-kbd-led-backlight.yaml | 36 ---------- + .../devicetree/bindings/mfd/google,cros-ec.yaml | 3 - + drivers/platform/chrome/cros_ec.c | 5 ++ + drivers/platform/chrome/cros_ec_i2c.c | 3 +- + drivers/platform/chrome/cros_ec_ishtp.c | 2 +- + drivers/platform/chrome/cros_ec_lpc.c | 2 +- + drivers/platform/chrome/cros_ec_proto.c | 69 ++++++++++++++++--- + drivers/platform/chrome/cros_ec_rpmsg.c | 2 +- + drivers/platform/chrome/cros_ec_spi.c | 2 +- + drivers/platform/chrome/cros_ec_uart.c | 2 +- + drivers/platform/chrome/cros_ec_vbc.c | 10 +-- + drivers/platform/chrome/cros_kbd_led_backlight.c | 79 +++++----------------- + include/linux/platform_data/cros_ec_proto.h | 2 + + 13 files changed, 97 insertions(+), 120 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/chrome/google,cros-kbd-led-backlight.yaml +Merging chrome-platform-firmware/for-firmware-next (7543d5702c2c firmware: google: vpd: Use const 'struct bin_attribute' callback) +$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Merge made by the 'ort' strategy. + drivers/firmware/google/cbmem.c | 10 +++++----- + drivers/firmware/google/gsmi.c | 6 +++--- + drivers/firmware/google/memconsole.c | 4 ++-- + drivers/firmware/google/vpd.c | 8 ++++---- + 4 files changed, 14 insertions(+), 14 deletions(-) +Merging hsi/for-next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds-lj/for-leds-next (29df7025cff0 leds: pwm-multicolor: Disable PWM when going to suspend) +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Auto-merging MAINTAINERS +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/Makefile +Merge made by the 'ort' strategy. + .../bindings/leds/cznic,turris-omnia-leds.yaml | 8 + + .../bindings/leds/leds-class-multicolor.yaml | 2 +- + .../bindings/leds/qcom,spmi-flash-led.yaml | 1 + + MAINTAINERS | 8 + + drivers/leds/Kconfig | 11 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-lp8860.c | 2 +- + drivers/leds/leds-netxbig.c | 1 + + drivers/leds/leds-turris-omnia.c | 334 ++++++++++----------- + drivers/leds/leds-upboard.c | 126 ++++++++ + drivers/leds/rgb/leds-pwm-multicolor.c | 8 +- + drivers/leds/trigger/ledtrig-activity.c | 2 +- + drivers/leds/trigger/ledtrig-netdev.c | 2 + + drivers/platform/cznic/turris-omnia-mcu-base.c | 3 + + drivers/platform/cznic/turris-omnia-mcu.h | 130 -------- + include/linux/turris-omnia-mcu-interface.h | 150 ++++++++- + 16 files changed, 487 insertions(+), 302 deletions(-) + create mode 100644 drivers/leds/leds-upboard.c +Merging ipmi/for-next (7868b3a94045 char:ipmi: Fix the wrong format specifier) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmb_dev_int.c | 3 +++ + drivers/char/ipmi/ipmi_si_pci.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging driver-core/driver-core-next (5bcc8bfe841b rust: miscdevice: add fops->show_fdinfo() hook) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 1 + + rust/kernel/miscdevice.rs | 100 ++++++++- + samples/rust/Kconfig | 10 + + samples/rust/Makefile | 1 + + samples/rust/rust_misc_device.rs | 238 +++++++++++++++++++++ + 6 files changed, 340 insertions(+), 11 deletions(-) + create mode 100644 samples/rust/rust_misc_device.rs +Merging usb/usb-next (362a7993ed01 Merge 6.13-rc3 into usb-next) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/usb/maxim,max33359.yaml | 8 ++++++-- + Documentation/devicetree/bindings/usb/qcom,dwc3.yaml | 2 ++ + .../devicetree/bindings/usb/renesas,usbhs.yaml | 2 ++ + drivers/usb/chipidea/host.c | 10 ++++++++-- + drivers/usb/core/hcd-pci.c | 15 +++++++++++++-- + drivers/usb/dwc3/core.c | 20 ++++++++++++++++++++ + drivers/usb/dwc3/core.h | 2 +- + drivers/usb/gadget/function/f_tcm.c | 8 ++------ + drivers/usb/gadget/function/storage_common.h | 2 +- + drivers/usb/storage/Kconfig | 3 +-- + drivers/usb/storage/transport.c | 8 ++------ + drivers/usb/typec/tcpm/tcpci_mt6370.c | 1 - + include/linux/pm.h | 3 ++- + include/linux/usb/storage.h | 8 ++++++++ + include/uapi/linux/usb/functionfs.h | 8 ++++---- + 15 files changed, 72 insertions(+), 28 deletions(-) +Merging thunderbolt/next (b5d175beb4d3 thunderbolt: debugfs: Add write capability to path config space) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/debugfs.c | 67 ++++++++++++++++++++++++++++++++++++------- + 1 file changed, 56 insertions(+), 11 deletions(-) +Merging usb-serial/usb-next (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (30691a59c85c Merge 6.13-rc3 into tty-next) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/renesas,scif.yaml | 5 + + drivers/parport/parport_serial.c | 12 +- + drivers/tty/serial/8250/8250_pci.c | 76 +++--- + drivers/tty/serial/8250/8250_port.c | 2 +- + drivers/tty/serial/altera_jtaguart.c | 10 +- + drivers/tty/serial/altera_uart.c | 7 +- + drivers/tty/serial/mpc52xx_uart.c | 2 +- + drivers/tty/serial/serial_core.c | 263 +++++++++------------ + drivers/tty/serial/sh-sci.c | 2 +- + drivers/tty/tty_io.c | 2 +- + include/linux/pci_ids.h | 11 + + 11 files changed, 185 insertions(+), 207 deletions(-) +Merging char-misc/char-misc-next (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Already up to date. +Merging coresight/next (56e14a21cee4 coresight-tpda: Optimize the function of reading element size) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Merge made by the 'ort' strategy. + .../sysfs-bus-coresight-devices-dummy-source | 15 +++ + .../bindings/arm/arm,coresight-dummy-source.yaml | 6 ++ + .../arm/arm,coresight-static-replicator.yaml | 19 +++- + drivers/hwtracing/coresight/coresight-core.c | 113 +++++++++++++++++---- + drivers/hwtracing/coresight/coresight-dummy.c | 81 +++++++++++++-- + drivers/hwtracing/coresight/coresight-funnel.c | 6 +- + drivers/hwtracing/coresight/coresight-platform.c | 27 +++++ + drivers/hwtracing/coresight/coresight-replicator.c | 6 +- + drivers/hwtracing/coresight/coresight-tpda.c | 19 +++- + drivers/hwtracing/coresight/coresight-tpdm.c | 7 +- + drivers/hwtracing/coresight/coresight-trace-id.c | 43 +++++--- + drivers/hwtracing/coresight/coresight-trace-id.h | 9 ++ + include/linux/coresight.h | 17 +++- + 13 files changed, 309 insertions(+), 59 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-dummy-source +Merging fastrpc/for-next (9f86299512e0 misc: fastrpc: Rename tgid and pid to client_id) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Auto-merging drivers/misc/fastrpc.c +Merge made by the 'ort' strategy. + drivers/misc/fastrpc.c | 58 ++++++++++++++++++++++++++------------------------ + 1 file changed, 30 insertions(+), 28 deletions(-) +Merging fpga/for-next (46b155acbf4e fpga: dfl: destroy/recreate feature platform device on port release/assign) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + drivers/fpga/dfl-afu-dma-region.c | 117 +++++----- + drivers/fpga/dfl-afu-error.c | 59 ++--- + drivers/fpga/dfl-afu-main.c | 278 ++++++++++++------------ + drivers/fpga/dfl-afu-region.c | 51 ++--- + drivers/fpga/dfl-afu.h | 26 +-- + drivers/fpga/dfl-fme-br.c | 24 +- + drivers/fpga/dfl-fme-error.c | 98 +++++---- + drivers/fpga/dfl-fme-main.c | 95 ++++---- + drivers/fpga/dfl-fme-pr.c | 86 ++++---- + drivers/fpga/dfl.c | 447 +++++++++++++++++++------------------- + drivers/fpga/dfl.h | 142 +++++++----- + 11 files changed, 722 insertions(+), 701 deletions(-) +Merging icc/icc-next (e20f7bfcd21e Merge branch 'icc-fixes' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + .../bindings/interconnect/qcom,sm8750-rpmh.yaml | 136 ++ + drivers/interconnect/icc-clk.c | 10 + + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/icc-rpm.c | 2 +- + drivers/interconnect/qcom/sm8750.c | 1705 ++++++++++++++++++++ + .../dt-bindings/interconnect/qcom,sm8750-rpmh.h | 143 ++ + 7 files changed, 2006 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sm8750-rpmh.yaml + create mode 100644 drivers/interconnect/qcom/sm8750.c + create mode 100644 include/dt-bindings/interconnect/qcom,sm8750-rpmh.h +Merging iio/togreg (4d112ebd02d1 iio: adc: ad-sigma-delta: Document ABI for sigma delta adc) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/iio/adc/ad4695.c +Auto-merging drivers/iio/adc/ad7124.c +Auto-merging drivers/iio/adc/ad7173.c +Auto-merging drivers/iio/inkern.c +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-bus-iio-adc-ad-sigma-delta | 23 + + Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192 | 24 - + .../bindings/iio/accel/kionix,kx022a.yaml | 11 +- + .../bindings/iio/accel/nxp,fxls8962af.yaml | 20 +- + .../devicetree/bindings/iio/adc/adi,ad4000.yaml | 75 +- + .../devicetree/bindings/iio/adc/adi,ad4695.yaml | 7 +- + .../devicetree/bindings/iio/adc/adi,ad7124.yaml | 13 + + .../devicetree/bindings/iio/adc/adi,ad7173.yaml | 12 + + .../devicetree/bindings/iio/adc/adi,ad7192.yaml | 15 + + .../devicetree/bindings/iio/adc/adi,ad7780.yaml | 11 + + .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 37 +- + .../bindings/iio/chemical/bosch,bme680.yaml | 62 + + .../devicetree/bindings/iio/imu/adi,adis16480.yaml | 42 +- + .../bindings/iio/imu/invensense,mpu6050.yaml | 1 + + .../bindings/iio/light/rohm,bu27008.yaml | 49 - + .../bindings/iio/light/rohm,bu27010.yaml | 50 - + .../devicetree/bindings/trivial-devices.yaml | 2 - + Documentation/iio/ad4695.rst | 2 +- + Documentation/iio/adis16480.rst | 3 + + MAINTAINERS | 3 +- + drivers/iio/accel/adxl345_core.c | 47 +- + drivers/iio/accel/fxls8962af-core.c | 14 + + drivers/iio/accel/fxls8962af-i2c.c | 2 + + drivers/iio/accel/fxls8962af.h | 2 + + drivers/iio/accel/kionix-kx022a-i2c.c | 4 + + drivers/iio/accel/kionix-kx022a-spi.c | 4 + + drivers/iio/accel/kionix-kx022a.c | 169 +- + drivers/iio/accel/kionix-kx022a.h | 14 + + drivers/iio/adc/ad4000.c | 311 +++- + drivers/iio/adc/ad4695.c | 2 +- + drivers/iio/adc/ad7124.c | 217 ++- + drivers/iio/adc/ad7173.c | 119 +- + drivers/iio/adc/ad7192.c | 4 +- + drivers/iio/adc/ad7791.c | 1 + + drivers/iio/adc/ad7793.c | 3 +- + drivers/iio/adc/ad_sigma_delta.c | 194 ++- + drivers/iio/adc/pac1921.c | 93 +- + drivers/iio/adc/rzg2l_adc.c | 439 +++--- + drivers/iio/adc/vf610_adc.c | 98 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 19 +- + drivers/iio/chemical/bme680.h | 2 + + drivers/iio/chemical/bme680_core.c | 120 +- + drivers/iio/chemical/bme680_i2c.c | 1 + + drivers/iio/chemical/bme680_spi.c | 1 + + .../iio/common/inv_sensors/inv_sensors_timestamp.c | 4 +- + drivers/iio/dac/Kconfig | 2 +- + drivers/iio/dac/ad5624r.h | 2 +- + drivers/iio/dac/ad5686-spi.c | 6 - + drivers/iio/dac/ad5686.c | 62 +- + drivers/iio/dac/ad5686.h | 6 +- + drivers/iio/dac/ad5696-i2c.c | 6 - + drivers/iio/dac/ad8801.c | 79 +- + drivers/iio/dac/ltc2632.c | 69 +- + drivers/iio/dac/ltc2688.c | 44 +- + drivers/iio/dac/max5821.c | 36 +- + drivers/iio/dac/mcp4725.c | 2 +- + drivers/iio/imu/adis16480.c | 75 + + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 25 + + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 6 + + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 + + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 5 + + drivers/iio/imu/st_lsm6dsx/Kconfig | 18 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 6 +- + drivers/iio/inkern.c | 11 + + drivers/iio/light/Kconfig | 18 +- + drivers/iio/light/Makefile | 1 - + drivers/iio/light/cm3232.c | 18 +- + drivers/iio/light/rohm-bu27008.c | 1635 -------------------- + drivers/iio/light/rohm-bu27034.c | 73 +- + drivers/iio/light/veml6030.c | 76 + + drivers/iio/pressure/bmp280-core.c | 39 +- + drivers/iio/pressure/bmp280.h | 8 +- + drivers/iio/pressure/rohm-bm1390.c | 78 +- + drivers/iio/proximity/aw96103.c | 2 +- + drivers/iio/trigger/stm32-timer-trigger.c | 48 +- + include/dt-bindings/iio/{ => adc}/adi,ad4695.h | 0 + include/linux/iio/adc/ad_sigma_delta.h | 10 +- + include/linux/iio/consumer.h | 4 +- + include/linux/iio/iio-opaque.h | 2 +- + include/linux/iio/imu/adis.h | 1 - + 80 files changed, 2079 insertions(+), 2742 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad-sigma-delta + create mode 100644 Documentation/devicetree/bindings/iio/chemical/bosch,bme680.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/rohm,bu27008.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/rohm,bu27010.yaml + delete mode 100644 drivers/iio/light/rohm-bu27008.c + rename include/dt-bindings/iio/{ => adc}/adi,ad4695.h (100%) +Merging phy-next/next (b6096751a652 phy: sun4i-usb: Remove unused of_gpio.h) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging MAINTAINERS +Auto-merging drivers/phy/qualcomm/phy-qcom-qmp-usb.c +Auto-merging drivers/phy/rockchip/phy-rockchip-naneng-combphy.c +Merge made by the 'ort' strategy. + .../bindings/phy/phy-rockchip-naneng-combphy.yaml | 1 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 4 + + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 2 + + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 2 + + MAINTAINERS | 1 - + drivers/phy/allwinner/phy-sun4i-usb.c | 1 - + drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 47 ++-- + drivers/phy/hisilicon/phy-hi3670-pcie.c | 11 +- + drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 2 +- + drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c | 44 ++++ + drivers/phy/mediatek/phy-mtk-hdmi-mt8195.h | 3 + + drivers/phy/mediatek/phy-mtk-hdmi.c | 28 +++ + drivers/phy/mediatek/phy-mtk-hdmi.h | 4 + + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 100 ++++++++ + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 278 +++++++++++++++++++- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v4_20.h | 5 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h | 5 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6.h | 3 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v2.h | 1 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6.h | 2 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6.h | 1 + + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 3 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 28 +++ + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 279 +++++++++++++++++++++ + drivers/phy/rockchip/phy-rockchip-pcie.c | 146 ++++------- + drivers/phy/samsung/Kconfig | 1 + + drivers/phy/samsung/phy-samsung-ufs.c | 6 +- + drivers/phy/tegra/Kconfig | 5 +- + 29 files changed, 867 insertions(+), 147 deletions(-) +Merging soundwire/next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (7041ed0dde83 extcon: Drop explicit initialization of struct i2c_device_id::driver_data to 0) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Auto-merging MAINTAINERS +Auto-merging drivers/extcon/extcon-rtk-type-c.c +Merge made by the 'ort' strategy. + Documentation/driver-api/extcon.rst | 255 ++++++++++++++++++++++++++++++++++++ + Documentation/driver-api/index.rst | 1 + + MAINTAINERS | 1 + + drivers/extcon/extcon-fsa9480.c | 2 +- + drivers/extcon/extcon-ptn5150.c | 2 +- + drivers/extcon/extcon-rtk-type-c.c | 2 + + 6 files changed, 261 insertions(+), 2 deletions(-) + create mode 100644 Documentation/driver-api/extcon.rst +Merging gnss/gnss-next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (fe4bf8d0b671 vfio/pci: Properly hide first-in-list PCIe extended capability) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (0f28374e99a4 w1: ds28e04: Constify 'struct bin_attribute') +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/w1/maxim,ds2482.yaml | 2 ++ + drivers/w1/masters/ds2482.c | 26 +++++++------- + drivers/w1/slaves/w1_ds2406.c | 10 +++--- + drivers/w1/slaves/w1_ds2408.c | 42 +++++++++++----------- + drivers/w1/slaves/w1_ds2413.c | 14 ++++---- + drivers/w1/slaves/w1_ds2430.c | 10 +++--- + drivers/w1/slaves/w1_ds2431.c | 10 +++--- + drivers/w1/slaves/w1_ds2433.c | 24 ++++++------- + drivers/w1/slaves/w1_ds2438.c | 34 +++++++++--------- + drivers/w1/slaves/w1_ds2780.c | 8 ++--- + drivers/w1/slaves/w1_ds2781.c | 8 ++--- + drivers/w1/slaves/w1_ds2805.c | 10 +++--- + drivers/w1/slaves/w1_ds28e04.c | 18 +++++----- + drivers/w1/w1.c | 12 +++---- + 14 files changed, 114 insertions(+), 114 deletions(-) +Merging spmi/spmi-next (a45e4aa263d6 spmi: Set fwnode for spmi devices) +$ git merge -m Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Merge made by the 'ort' strategy. + drivers/spmi/spmi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging staging/staging-next (f9e7f3f9620b Merge 6.13-rc3 into staging-next) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Merge made by the 'ort' strategy. + drivers/staging/fbtft/fb_ssd1351.c | 3 ++- + drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 2 -- + drivers/staging/gpib/tnt4882/mite.c | 2 +- + drivers/staging/gpib/tnt4882/mite.h | 2 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 6 ++++-- + 5 files changed, 8 insertions(+), 7 deletions(-) +Merging counter-next/counter-next (fac04efc5c79 Linux 6.13-rc2) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions) +$ git merge -m Merge branch 'siox/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git siox/siox/for-next +Already up to date. +Merging mux/for-next (49a9b01803e4 mux: constify mux class) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Merge made by the 'ort' strategy. + drivers/mux/core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging dmaengine/next (9d880452fb3e dmaengine: amd: qdma: make read-only arrays h2c_types and c2h_types static const) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Auto-merging drivers/dma/amd/qdma/qdma.c +Auto-merging drivers/dma/idxd/init.c +Merge made by the 'ort' strategy. + .../bindings/dma/allwinner,sun4i-a10-dma.yaml | 4 +- + .../devicetree/bindings/dma/qcom,gpi.yaml | 4 + + MAINTAINERS | 10 +- + drivers/dma/Kconfig | 6 +- + drivers/dma/Makefile | 1 - + drivers/dma/amd/Kconfig | 28 +++ + drivers/dma/amd/Makefile | 2 + + drivers/dma/amd/ae4dma/Makefile | 10 + + drivers/dma/amd/ae4dma/ae4dma-dev.c | 157 ++++++++++++++ + drivers/dma/amd/ae4dma/ae4dma-pci.c | 158 ++++++++++++++ + drivers/dma/amd/ae4dma/ae4dma.h | 100 +++++++++ + drivers/dma/{ => amd}/ptdma/Makefile | 0 + drivers/dma/{ => amd}/ptdma/ptdma-debugfs.c | 75 +++++-- + drivers/dma/{ => amd}/ptdma/ptdma-dev.c | 0 + drivers/dma/{ => amd}/ptdma/ptdma-dmaengine.c | 226 ++++++++++++++++++--- + drivers/dma/{ => amd}/ptdma/ptdma-pci.c | 0 + drivers/dma/{ => amd}/ptdma/ptdma.h | 4 +- + drivers/dma/amd/qdma/qdma.c | 22 +- + drivers/dma/idxd/cdev.c | 5 - + drivers/dma/idxd/init.c | 2 + + drivers/dma/idxd/registers.h | 1 + + drivers/dma/ptdma/Kconfig | 13 -- + drivers/dma/sh/rcar-dmac.c | 4 + + drivers/dma/sun4i-dma.c | 208 ++++++++++++++++--- + drivers/dma/xilinx/xdma.c | 8 +- + drivers/dma/xilinx/xilinx_dma.c | 20 +- + 26 files changed, 942 insertions(+), 126 deletions(-) + create mode 100644 drivers/dma/amd/ae4dma/Makefile + create mode 100644 drivers/dma/amd/ae4dma/ae4dma-dev.c + create mode 100644 drivers/dma/amd/ae4dma/ae4dma-pci.c + create mode 100644 drivers/dma/amd/ae4dma/ae4dma.h + rename drivers/dma/{ => amd}/ptdma/Makefile (100%) + rename drivers/dma/{ => amd}/ptdma/ptdma-debugfs.c (52%) + rename drivers/dma/{ => amd}/ptdma/ptdma-dev.c (100%) + rename drivers/dma/{ => amd}/ptdma/ptdma-dmaengine.c (59%) + rename drivers/dma/{ => amd}/ptdma/ptdma-pci.c (100%) + rename drivers/dma/{ => amd}/ptdma/ptdma.h (99%) + delete mode 100644 drivers/dma/ptdma/Kconfig +Merging cgroup/for-next (9b496a8bbed9 cgroup/cpuset: Prevent leakage of isolated CPUs into sched domains) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. + kernel/cgroup/cpuset.c | 19 +++++++------ + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 33 +++++++++++++---------- + 2 files changed, 30 insertions(+), 22 deletions(-) +Merging scsi/for-next (1fb3855b8a12 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/ata/sata_sil24.c +Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c +Auto-merging drivers/scsi/fnic/fnic_main.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas.h +Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr_os.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_scsih.c +Auto-merging drivers/scsi/pm8001/pm8001_sas.h +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/smartpqi/smartpqi_init.c +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging drivers/usb/storage/uas.c +Merge made by the 'ort' strategy. + Documentation/scsi/scsi_mid_low_api.rst | 78 ++++---- + drivers/ata/ahci.h | 2 +- + drivers/ata/libata-sata.c | 8 +- + drivers/ata/libata-scsi.c | 19 +- + drivers/ata/pata_macio.c | 8 +- + drivers/ata/sata_mv.c | 2 +- + drivers/ata/sata_nv.c | 24 +-- + drivers/ata/sata_sil24.c | 2 +- + drivers/firewire/sbp2.c | 10 +- + drivers/infiniband/ulp/srp/ib_srp.c | 5 +- + drivers/message/fusion/mptfc.c | 14 +- + drivers/message/fusion/mptsas.c | 14 +- + drivers/message/fusion/mptscsih.c | 10 +- + drivers/message/fusion/mptscsih.h | 5 +- + drivers/message/fusion/mptspi.c | 19 +- + drivers/s390/scsi/zfcp_scsi.c | 15 +- + drivers/s390/scsi/zfcp_sysfs.c | 2 +- + drivers/s390/scsi/zfcp_unit.c | 2 +- + drivers/scsi/3w-9xxx.c | 7 +- + drivers/scsi/3w-sas.c | 7 +- + drivers/scsi/3w-xxxx.c | 8 +- + drivers/scsi/53c700.c | 19 +- + drivers/scsi/BusLogic.c | 7 +- + drivers/scsi/BusLogic.h | 3 +- + drivers/scsi/aacraid/linit.c | 8 +- + drivers/scsi/advansys.c | 23 +-- + drivers/scsi/aic7xxx/aic79xx_osm.c | 8 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 8 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 8 +- + drivers/scsi/bfa/bfad_im.c | 26 +-- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 7 +- + drivers/scsi/csiostor/csio_scsi.c | 20 +-- + drivers/scsi/dc395x.c | 12 +- + drivers/scsi/esp_scsi.c | 14 +- + drivers/scsi/fcoe/fcoe.c | 2 +- + drivers/scsi/fnic/fnic_main.c | 4 +- + drivers/scsi/fnic/fnic_trace.c | 16 +- + drivers/scsi/hisi_sas/hisi_sas.h | 5 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 13 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 4 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 +- + drivers/scsi/hpsa.c | 20 ++- + drivers/scsi/hptiop.c | 6 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 14 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 8 +- + drivers/scsi/ipr.c | 20 +-- + drivers/scsi/ips.c | 6 +- + drivers/scsi/ips.h | 3 +- + drivers/scsi/iscsi_tcp.c | 6 +- + drivers/scsi/libfc/fc_fcp.c | 6 +- + drivers/scsi/libsas/sas_scsi_host.c | 11 +- + drivers/scsi/lpfc/lpfc_scsi.c | 37 ++-- + drivers/scsi/megaraid/megaraid_sas_base.c | 14 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 20 +-- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 24 +-- + drivers/scsi/mvumi.c | 5 +- + drivers/scsi/myrb.c | 21 +-- + drivers/scsi/myrs.c | 13 +- + drivers/scsi/ncr53c8xx.c | 9 +- + drivers/scsi/pm8001/pm8001_defs.h | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 5 +- + drivers/scsi/pm8001/pm8001_sas.c | 78 ++++++-- + drivers/scsi/pm8001/pm8001_sas.h | 2 + + drivers/scsi/pm8001/pm80xx_hwi.c | 59 +++++-- + drivers/scsi/pmcraid.c | 22 +-- + drivers/scsi/ps3rom.c | 5 +- + drivers/scsi/qedf/qedf_main.c | 5 +- + drivers/scsi/qla1280.c | 6 +- + drivers/scsi/qla2xxx/qla_def.h | 2 + + drivers/scsi/qla2xxx/qla_dfs.c | 122 ++++++++++--- + drivers/scsi/qla2xxx/qla_gbl.h | 3 + + drivers/scsi/qla2xxx/qla_init.c | 28 ++- + drivers/scsi/qla2xxx/qla_os.c | 12 +- + drivers/scsi/qla4xxx/ql4_os.c | 6 +- + drivers/scsi/qlogicpti.c | 5 +- + drivers/scsi/scsi_debug.c | 19 +- + drivers/scsi/scsi_scan.c | 22 ++- + drivers/scsi/scsi_sysfs.c | 4 +- + drivers/scsi/smartpqi/smartpqi_init.c | 13 +- + drivers/scsi/snic/snic_main.c | 12 +- + drivers/scsi/stex.c | 4 +- + drivers/scsi/storvsc_drv.c | 7 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 15 +- + drivers/scsi/virtio_scsi.c | 2 +- + drivers/scsi/xen-scsifront.c | 11 +- + drivers/ufs/core/ufshcd.c | 285 +++++++++++++++--------------- + drivers/usb/image/microtek.c | 4 +- + drivers/usb/storage/scsiglue.c | 10 +- + drivers/usb/storage/uas.c | 10 +- + include/linux/libata.h | 19 +- + include/scsi/libfc.h | 2 +- + include/scsi/libsas.h | 9 +- + include/scsi/scsi_bsg_iscsi.h | 2 +- + include/scsi/scsi_device.h | 4 +- + include/scsi/scsi_host.h | 24 ++- + include/ufs/ufshcd.h | 25 ++- + 97 files changed, 888 insertions(+), 702 deletions(-) +Merging scsi-mkp/for-next (c9a71ca13f71 scsi: Constify struct pci_device_id) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c +Auto-merging drivers/scsi/fnic/fnic_main.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/pm8001/pm8001_init.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + Documentation/scsi/scsi_mid_low_api.rst | 61 +++---------------------------- + MAINTAINERS | 3 +- + drivers/s390/scsi/zfcp_fc.c | 7 +++- + drivers/s390/scsi/zfcp_fsf.c | 4 +- + drivers/scsi/3w-9xxx.c | 2 +- + drivers/scsi/3w-sas.c | 2 +- + drivers/scsi/3w-xxxx.c | 2 +- + drivers/scsi/BusLogic.c | 2 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/advansys.c | 2 +- + drivers/scsi/am53c974.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- + drivers/scsi/atp870u.c | 2 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/scsi/dc395x.c | 2 +- + drivers/scsi/dmx3191d.c | 2 +- + drivers/scsi/elx/efct/efct_driver.c | 2 +- + drivers/scsi/fdomain_pci.c | 2 +- + drivers/scsi/fnic/fnic_main.c | 2 +- + drivers/scsi/hptiop.c | 2 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/megaraid.c | 2 +- + drivers/scsi/megaraid/megaraid_mbox.c | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/mvsas/mv_init.c | 2 +- + drivers/scsi/nsp32.c | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/qedi/qedi_main.c | 2 +- + drivers/scsi/qla1280.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/snic/snic_main.c | 2 +- + drivers/scsi/stex.c | 2 +- + drivers/scsi/storvsc_drv.c | 13 +++---- + drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- + drivers/ufs/core/ufshcd.c | 10 +---- + include/scsi/scsi_host.h | 2 +- + 39 files changed, 57 insertions(+), 109 deletions(-) +Merging vhost/linux-next (6a39bb15b3d1 virtio_vdpa: remove redundant check on desc) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (dbb9c372555c remoteproc: mtk_scp: Only populate devices for SCP cores) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + drivers/remoteproc/mtk_scp.c | 12 ++++++++++-- + drivers/remoteproc/omap_remoteproc.c | 17 +++++++++++++++++ + drivers/remoteproc/remoteproc_core.c | 14 +++++++------- + 3 files changed, 34 insertions(+), 9 deletions(-) +Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (83a9752729c4 dt-bindings: gpio: brcmstb: permit gpio-line-names property) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/Kconfig +Merge made by the 'ort' strategy. + .../bindings/gpio/brcm,brcmstb-gpio.yaml | 4 + + drivers/gpio/Kconfig | 4 +- + drivers/gpio/gpio-tqmx86.c | 206 ++++++++++++--------- + drivers/gpio/gpio-twl6040.c | 6 +- + 4 files changed, 128 insertions(+), 92 deletions(-) +Merging gpio-intel/for-next (12b0e305f509 gpio: acpi: switch to device_for_each_child_node_scoped()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (38867d5de5f1 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'ort' strategy. + .../bindings/pinctrl/qcom,ipq5424-tlmm.yaml | 4 +- + .../bindings/pinctrl/qcom,msm8917-pinctrl.yaml | 160 ++ + arch/arm/mach-imx/Kconfig | 1 + + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 35 +- + drivers/pinctrl/pinctrl-ingenic.c | 2 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 6 + + drivers/pinctrl/qcom/Kconfig.msm | 6 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-ipq5424.c | 34 +- + drivers/pinctrl/qcom/pinctrl-msm8917.c | 1620 ++++++++++++++++++++ + 10 files changed, 1851 insertions(+), 18 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8917-pinctrl.yaml + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8917.c +Merging pinctrl-intel/for-next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (53967d9c146d pinctrl: renesas: rzg2l: Add audio clock pins) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging pinctrl-samsung/for-next (0ebb1e9e1b12 pinctrl: samsung: update child reference drop comment) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 3 ++- + drivers/pinctrl/samsung/pinctrl-samsung.c | 4 ++-- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging pwm/pwm/for-next (cce16e7f6216 pwm: stm32-lp: Add check for clk_enable()) +$ git merge -m Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Auto-merging drivers/pwm/pwm-lpss-pci.c +Merge made by the 'ort' strategy. + .../bindings/pwm/marvell,berlin-pwm.yaml | 44 +++++++++++++++ + .../devicetree/bindings/pwm/pwm-berlin.txt | 17 ------ + Documentation/devicetree/bindings/pwm/pwm-sprd.txt | 40 ------------- + .../devicetree/bindings/pwm/sprd,ums512-pwm.yaml | 66 ++++++++++++++++++++++ + drivers/pwm/pwm-dwc.c | 14 ++--- + drivers/pwm/pwm-lpss-pci.c | 9 +-- + drivers/pwm/pwm-stm32-lp.c | 8 ++- + 7 files changed, 126 insertions(+), 72 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/marvell,berlin-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-berlin.txt + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-sprd.txt + create mode 100644 Documentation/devicetree/bindings/pwm/sprd,ums512-pwm.yaml +Merging ktest/for-next (2351e8c65404 ktest.pl: Avoid false positives with grub2 skip regex) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (bd812d285853 selftests: acct: Add ksft_exit_skip if not running as root) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'ort' strategy. + tools/testing/selftests/acct/acct_syscall.c | 2 +- + .../selftests/filesystems/statmount/.gitignore | 1 + + tools/testing/selftests/ipc/msgque.c | 2 +- + tools/testing/selftests/kselftest.h | 28 +++++- + tools/testing/selftests/kselftest/ksft.py | 3 + + tools/testing/selftests/kselftest/ktap_helpers.sh | 4 + + .../selftests/media_tests/regression_test.txt | 8 +- + .../testing/selftests/timers/clocksource-switch.c | 6 +- + tools/testing/selftests/vDSO/parse_vdso.c | 106 ++++++++++++++++----- + tools/testing/selftests/zram/.gitignore | 2 + + 10 files changed, 125 insertions(+), 37 deletions(-) + create mode 100644 tools/testing/selftests/zram/.gitignore +Merging kunit/test (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging livepatching/for-next (7e17e80c3a7e Merge branch 'for-6.14/stack-order' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-kernel-livepatch | 9 +++ + kernel/livepatch/core.c | 24 ++++++++ + .../testing/selftests/livepatch/test-callbacks.sh | 2 +- + tools/testing/selftests/livepatch/test-sysfs.sh | 71 ++++++++++++++++++++++ + 4 files changed, 105 insertions(+), 1 deletion(-) +Merging rtc/rtc-next (e0779a0dcf41 rtc: ab-eoz9: don't fail temperature reads on undervoltage notification) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (f3dd9ae7f03a dax: Remove an unused field in struct dax_operations) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (c620f56c70eb MAINTAINERS: Update AMD NTB maintainers) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + drivers/ntb/hw/intel/ntb_hw_gen3.c | 3 +++ + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) +Merging seccomp/for-next/seccomp (8cf8dfceebda seccomp: Stub for !HAVE_ARCH_SECCOMP_FILTER) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Merge made by the 'ort' strategy. + drivers/fsi/fsi-sbefifo.c | 9 ++++++++- + drivers/fsi/i2cr-scom.c | 11 ++++++++++- + 2 files changed, 18 insertions(+), 2 deletions(-) +Merging slimbus/for-next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (ea4ef69b81f0 nvmem: imx-ocotp-ele: set word length to 1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'ort' strategy. + drivers/nvmem/imx-ocotp-ele.c | 38 +++++++++++++++++++++++++++++++------- + 1 file changed, 31 insertions(+), 7 deletions(-) +Merging xarray/main (6684aba0780d XArray: Add extra debugging check to xas_lock and friends) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Auto-merging lib/xarray.c +Merge made by the 'ort' strategy. + include/linux/xarray.h | 60 +++++++++++++++++++++++++++----------------------- + lib/xarray.c | 3 +-- + 2 files changed, 34 insertions(+), 29 deletions(-) +Merging hyperv/hyperv-next (13546de23445 iommu/hyper-v: Don't assume cpu_possible_mask is dense) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging MAINTAINERS +Auto-merging arch/x86/hyperv/ivm.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging drivers/clocksource/hyperv_timer.c +Auto-merging drivers/hv/hv_balloon.c +Auto-merging drivers/hv/hv_kvp.c +Auto-merging drivers/hv/hv_snapshot.c +Auto-merging drivers/hv/hyperv_vmbus.h +Auto-merging include/clocksource/hyperv_timer.h +Auto-merging include/linux/hyperv.h +Auto-merging net/vmw_vsock/hyperv_transport.c +Merge made by the 'ort' strategy. + MAINTAINERS | 8 +- + arch/arm64/hyperv/hv_core.c | 3 +- + arch/arm64/hyperv/mshyperv.c | 4 +- + arch/arm64/include/asm/hyperv-tlfs.h | 71 -- + arch/arm64/include/asm/mshyperv.h | 7 +- + arch/x86/hyperv/hv_apic.c | 1 - + arch/x86/hyperv/hv_init.c | 23 +- + arch/x86/hyperv/hv_proc.c | 3 +- + arch/x86/hyperv/ivm.c | 1 - + arch/x86/hyperv/mmu.c | 1 - + arch/x86/hyperv/nested.c | 2 +- + arch/x86/include/asm/hyperv-tlfs.h | 811 --------------------- + arch/x86/include/asm/kvm_host.h | 3 +- + arch/x86/include/asm/mshyperv.h | 3 +- + arch/x86/include/asm/svm.h | 2 +- + arch/x86/kernel/cpu/mshyperv.c | 2 +- + arch/x86/kvm/vmx/hyperv_evmcs.h | 2 +- + arch/x86/kvm/vmx/vmx_onhyperv.h | 2 +- + arch/x86/mm/pat/set_memory.c | 2 - + drivers/clocksource/hyperv_timer.c | 2 +- + drivers/hv/hv_balloon.c | 4 +- + drivers/hv/hv_common.c | 6 +- + drivers/hv/hv_kvp.c | 2 +- + drivers/hv/hv_snapshot.c | 2 +- + drivers/hv/hyperv_vmbus.h | 2 +- + drivers/iommu/hyperv-iommu.c | 4 +- + include/asm-generic/hyperv-tlfs.h | 874 ----------------------- + include/asm-generic/mshyperv.h | 7 +- + include/clocksource/hyperv_timer.h | 2 +- + include/hyperv/hvgdk.h | 308 ++++++++ + include/hyperv/hvgdk_ext.h | 46 ++ + include/hyperv/hvgdk_mini.h | 1306 ++++++++++++++++++++++++++++++++++ + include/hyperv/hvhdk.h | 733 +++++++++++++++++++ + include/hyperv/hvhdk_mini.h | 311 ++++++++ + include/linux/hyperv.h | 11 +- + net/vmw_vsock/hyperv_transport.c | 6 +- + 36 files changed, 2753 insertions(+), 1824 deletions(-) + delete mode 100644 arch/arm64/include/asm/hyperv-tlfs.h + delete mode 100644 arch/x86/include/asm/hyperv-tlfs.h + delete mode 100644 include/asm-generic/hyperv-tlfs.h + create mode 100644 include/hyperv/hvgdk.h + create mode 100644 include/hyperv/hvgdk_ext.h + create mode 100644 include/hyperv/hvgdk_mini.h + create mode 100644 include/hyperv/hvhdk.h + create mode 100644 include/hyperv/hvhdk_mini.h +Merging auxdisplay/for-next (93b216cb312d auxdisplay: img-ascii-lcd: Constify struct img_ascii_lcd_config) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Merge made by the 'ort' strategy. + drivers/auxdisplay/img-ascii-lcd.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) +Merging kgdb/kgdb/for-next (24b2455fe8fc kdb: fix ctrl+e/a/f/b/d/p/n broken in keyboard mode) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (33c792a22879 Merge branch 'mhi-fixes' into mhi-next) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/host/boot.c | 1 + + 1 file changed, 1 insertion(+) +Merging memblock/for-next (98b7beba1ee6 memblock: uniformly initialize all reserved pages to MIGRATE_MOVABLE) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging cxl/next (e2b952ffafce ACPI/HMAT: Move HMAT messages to pr_debug()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging drivers/acpi/numa/hmat.c +Merge made by the 'ort' strategy. + drivers/acpi/numa/hmat.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) +Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Auto-merging include/linux/zstd.h +Auto-merging lib/zstd/common/mem.h +Auto-merging lib/zstd/compress/zstd_compress.c +Auto-merging lib/zstd/zstd_compress_module.c +Auto-merging lib/zstd/zstd_decompress_module.c +Merge made by the 'ort' strategy. + include/linux/zstd.h | 2 +- + include/linux/zstd_errors.h | 23 +- + include/linux/zstd_lib.h | 697 ++++++++-- + lib/zstd/Makefile | 2 +- + lib/zstd/common/allocations.h | 56 + + lib/zstd/common/bits.h | 149 ++ + lib/zstd/common/bitstream.h | 53 +- + lib/zstd/common/compiler.h | 14 +- + lib/zstd/common/cpu.h | 3 +- + lib/zstd/common/debug.c | 5 +- + lib/zstd/common/debug.h | 3 +- + lib/zstd/common/entropy_common.c | 42 +- + lib/zstd/common/error_private.c | 12 +- + lib/zstd/common/error_private.h | 3 +- + lib/zstd/common/fse.h | 89 +- + lib/zstd/common/fse_decompress.c | 94 +- + lib/zstd/common/huf.h | 234 +--- + lib/zstd/common/mem.h | 2 +- + lib/zstd/common/portability_macros.h | 26 +- + lib/zstd/common/zstd_common.c | 38 +- + lib/zstd/common/zstd_deps.h | 16 +- + lib/zstd/common/zstd_internal.h | 99 +- + lib/zstd/compress/clevels.h | 3 +- + lib/zstd/compress/fse_compress.c | 59 +- + lib/zstd/compress/hist.c | 3 +- + lib/zstd/compress/hist.h | 3 +- + lib/zstd/compress/huf_compress.c | 372 +++-- + lib/zstd/compress/zstd_compress.c | 1758 +++++++++++++++++------- + lib/zstd/compress/zstd_compress_internal.h | 333 +++-- + lib/zstd/compress/zstd_compress_literals.c | 155 ++- + lib/zstd/compress/zstd_compress_literals.h | 25 +- + lib/zstd/compress/zstd_compress_sequences.c | 7 +- + lib/zstd/compress/zstd_compress_sequences.h | 3 +- + lib/zstd/compress/zstd_compress_superblock.c | 47 +- + lib/zstd/compress/zstd_compress_superblock.h | 3 +- + lib/zstd/compress/zstd_cwksp.h | 149 +- + lib/zstd/compress/zstd_double_fast.c | 129 +- + lib/zstd/compress/zstd_double_fast.h | 6 +- + lib/zstd/compress/zstd_fast.c | 578 ++++++-- + lib/zstd/compress/zstd_fast.h | 6 +- + lib/zstd/compress/zstd_lazy.c | 518 +++---- + lib/zstd/compress/zstd_lazy.h | 7 +- + lib/zstd/compress/zstd_ldm.c | 11 +- + lib/zstd/compress/zstd_ldm.h | 3 +- + lib/zstd/compress/zstd_ldm_geartab.h | 3 +- + lib/zstd/compress/zstd_opt.c | 187 +-- + lib/zstd/compress/zstd_opt.h | 3 +- + lib/zstd/decompress/huf_decompress.c | 772 +++++++---- + lib/zstd/decompress/zstd_ddict.c | 9 +- + lib/zstd/decompress/zstd_ddict.h | 3 +- + lib/zstd/decompress/zstd_decompress.c | 259 +++- + lib/zstd/decompress/zstd_decompress_block.c | 283 ++-- + lib/zstd/decompress/zstd_decompress_block.h | 8 +- + lib/zstd/decompress/zstd_decompress_internal.h | 7 +- + lib/zstd/decompress_sources.h | 2 +- + lib/zstd/zstd_common_module.c | 5 +- + lib/zstd/zstd_compress_module.c | 2 +- + lib/zstd/zstd_decompress_module.c | 4 +- + 58 files changed, 4791 insertions(+), 2596 deletions(-) + create mode 100644 lib/zstd/common/allocations.h + create mode 100644 lib/zstd/common/bits.h +Merging efi/next (ec4696925da6 efi/libstub: Bump up EFI_MMAP_NR_SLACK_SLOTS to 32) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Merge made by the 'ort' strategy. + drivers/firmware/efi/libstub/efistub.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Already up to date. +Merging slab/slab/for-next (c44d336ad5ba mm/slab: Move kvfree_rcu() into SLAB) +$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging kernel/rcu/tree.c +CONFLICT (content): Merge conflict in kernel/rcu/tree.c +Resolved 'kernel/rcu/tree.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bbe1d9458bc7] Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git +$ git diff -M --stat --summary HEAD^.. + include/linux/slab.h | 1 + + init/main.c | 1 + + kernel/rcu/tree.c | 876 -------------------------------------------------- + mm/slab_common.c | 880 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 882 insertions(+), 876 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-mm-slab-Move-kvfree_rcu-into-SLAB.patch +Applying: fix up for "mm/slab: Move kvfree_rcu() into SLAB" +$ git reset HEAD^ +Unstaged changes after reset: +M mm/slab_common.c +$ git add -A . +$ git commit -v -a --amend +[master 7b5a9f355de1] Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git + Date: Fri Dec 20 15:11:18 2024 +1100 +Merging random/master (d18c13697b4d prandom: Include in ) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (78d4f34e2115 Linux 6.13-rc3) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (0c5928deada1 rust: block: fix formatting in GenDisk doc) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging rust/kernel/miscdevice.rs +CONFLICT (content): Merge conflict in rust/kernel/miscdevice.rs +Auto-merging rust/kernel/security.rs +CONFLICT (content): Merge conflict in rust/kernel/security.rs +Auto-merging rust/kernel/workqueue.rs +Resolved 'rust/kernel/miscdevice.rs' using previous resolution. +Resolved 'rust/kernel/security.rs' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9b9b567376a0] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_panic_qr.rs | 2 +- + rust/ffi.rs | 37 ++++++++++++++++++++++++++++++++++++- + rust/kernel/alloc/kbox.rs | 12 +++++++++++- + rust/kernel/block/mq/gen_disk.rs | 6 +++--- + rust/kernel/device.rs | 4 ++-- + rust/kernel/error.rs | 16 +++++----------- + rust/kernel/firmware.rs | 2 +- + rust/kernel/miscdevice.rs | 12 ++++-------- + rust/kernel/print.rs | 4 ++-- + rust/kernel/seq_file.rs | 2 +- + rust/kernel/str.rs | 6 +++--- + rust/kernel/sync/arc.rs | 8 ++++++++ + rust/kernel/uaccess.rs | 27 +++++++-------------------- + rust/kernel/workqueue.rs | 3 +++ + samples/rust/rust_print_main.rs | 2 +- + 15 files changed, 88 insertions(+), 55 deletions(-) +Merging sysctl/sysctl-next (9c738dae9534 sysctl: Reduce dput(child) calls in proc_sys_fill_cache()) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (c7c1167fcbbd Merge branch 'for-next/topic/execve/core' into for-next/execve) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Auto-merging MAINTAINERS +Auto-merging fs/exec.c +Auto-merging include/linux/sched.h +Auto-merging samples/Kconfig +Auto-merging samples/Makefile +Auto-merging security/security.c +Auto-merging tools/testing/selftests/kselftest/ktap_helpers.sh +Merge made by the 'ort' strategy. + Documentation/userspace-api/check_exec.rst | 144 +++++++ + Documentation/userspace-api/index.rst | 1 + + MAINTAINERS | 3 +- + fs/binfmt_misc.c | 2 +- + fs/exec.c | 83 ++-- + include/linux/binfmts.h | 9 +- + include/linux/coredump.h | 4 +- + include/linux/sched.h | 9 +- + include/uapi/linux/audit.h | 1 + + include/uapi/linux/fcntl.h | 4 + + include/uapi/linux/securebits.h | 24 +- + io_uring/io-wq.c | 2 +- + io_uring/sqpoll.c | 2 +- + kernel/kthread.c | 3 +- + samples/Kconfig | 9 + + samples/Makefile | 1 + + samples/check-exec/.gitignore | 2 + + samples/check-exec/Makefile | 15 + + samples/check-exec/inc.c | 205 ++++++++++ + samples/check-exec/run-script-ask.inc | 9 + + samples/check-exec/script-ask.inc | 5 + + samples/check-exec/script-exec.inc | 4 + + samples/check-exec/script-noexec.inc | 4 + + samples/check-exec/set-exec.c | 85 ++++ + security/commoncap.c | 29 +- + security/integrity/ima/ima_appraise.c | 27 +- + security/integrity/ima/ima_main.c | 29 ++ + security/security.c | 10 + + tools/testing/selftests/exec/.gitignore | 4 + + tools/testing/selftests/exec/Makefile | 19 +- + tools/testing/selftests/exec/check-exec-tests.sh | 205 ++++++++++ + tools/testing/selftests/exec/check-exec.c | 456 ++++++++++++++++++++++ + tools/testing/selftests/exec/config | 2 + + tools/testing/selftests/exec/execveat.c | 75 +++- + tools/testing/selftests/exec/false.c | 5 + + tools/testing/selftests/kselftest/ktap_helpers.sh | 2 +- + tools/testing/selftests/landlock/fs_test.c | 27 ++ + 37 files changed, 1464 insertions(+), 56 deletions(-) + create mode 100644 Documentation/userspace-api/check_exec.rst + create mode 100644 samples/check-exec/.gitignore + create mode 100644 samples/check-exec/Makefile + create mode 100644 samples/check-exec/inc.c + create mode 100755 samples/check-exec/run-script-ask.inc + create mode 100755 samples/check-exec/script-ask.inc + create mode 100755 samples/check-exec/script-exec.inc + create mode 100644 samples/check-exec/script-noexec.inc + create mode 100644 samples/check-exec/set-exec.c + create mode 100755 tools/testing/selftests/exec/check-exec-tests.sh + create mode 100644 tools/testing/selftests/exec/check-exec.c + create mode 100644 tools/testing/selftests/exec/config + create mode 100644 tools/testing/selftests/exec/false.c +Merging bitmap/bitmap-for-next (af206905fa22 riscv: Always inline bitops) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging include/linux/compiler.h +Merge made by the 'ort' strategy. + arch/riscv/include/asm/bitops.h | 20 ++++++++++---------- + include/linux/bits.h | 5 ++--- + include/linux/compiler.h | 22 ++++++++++++++++++++++ + 3 files changed, 34 insertions(+), 13 deletions(-) +Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (7a059073b08a Merge branch 'for-next/hardening' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Merge made by the 'ort' strategy. + Documentation/process/handling-regressions.rst | 4 +-- + Documentation/process/maintainer-tip.rst | 4 +-- + Documentation/process/submitting-patches.rst | 6 ++++ + include/trace/events/task.h | 44 +++++++++++++++++++++++--- + kernel/sys.c | 3 ++ + 5 files changed, 52 insertions(+), 9 deletions(-) +Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging nolibc/nolibc (40384c840ea1 Linux 6.13-rc1) +$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc +Already up to date. +Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) +$ git merge -m Merge branch 'tsm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux tsm/tsm-next +Already up to date. +Merging iommufd/for-next (11534b4de2a1 iommufd: Deal with IOMMU_HWPT_FAULT_ID_VALID in iommufd core) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Auto-merging drivers/iommu/intel/iommu.c +Merge made by the 'ort' strategy. + .../iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 8 +--- + drivers/iommu/intel/iommu.c | 3 +- + drivers/iommu/iommufd/hw_pagetable.c | 10 +++-- + drivers/iommu/iommufd/selftest.c | 45 ++++++++-------------- + 4 files changed, 26 insertions(+), 40 deletions(-) +Merging turbostat/next (75de0ab82fb4 tools/power turbostat: Add an NMI column) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Merge made by the 'ort' strategy. + tools/power/x86/turbostat/turbostat.8 | 28 +++++++- + tools/power/x86/turbostat/turbostat.c | 128 +++++++++++++++++++++++++++------- + 2 files changed, 129 insertions(+), 27 deletions(-) +Merging pwrseq/pwrseq/for-next (93e3c990fcd9 power: sequencing: qcom-wcn: add support for the WCN6750 PMU) +$ git merge -m Merge branch 'pwrseq/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next +Merge made by the 'ort' strategy. + drivers/power/sequencing/pwrseq-qcom-wcn.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) +Merging capabilities-next/caps-next (d48da4d5ed7b security: add trace event for cap_capable) +$ git merge -m Merge branch 'caps-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Auto-merging MAINTAINERS +Auto-merging security/commoncap.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + include/trace/events/capability.h | 57 ++++++++++++++++++++++++++++++++++++ + security/commoncap.c | 61 ++++++++++++++++++++++++++------------- + 3 files changed, 99 insertions(+), 20 deletions(-) + create mode 100644 include/trace/events/capability.h +Merging ipe/next (d881f0eb6f23 scripts: ipe: polgen: remove redundant close and error exit path) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next +Merge made by the 'ort' strategy. +Merging kcsan/next (b86f7c9fad06 kcsan: Remove redundant call of kallsyms_lookup_name()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next +Already up to date. +Merging crc/crc-next (72914faebaab MAINTAINERS: add entry for CRC library) +$ git merge -m Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/m68k/configs/amiga_defconfig +Auto-merging arch/m68k/configs/apollo_defconfig +Auto-merging arch/m68k/configs/atari_defconfig +Auto-merging arch/m68k/configs/bvme6000_defconfig +Auto-merging arch/m68k/configs/hp300_defconfig +Auto-merging arch/m68k/configs/mac_defconfig +Auto-merging arch/m68k/configs/multi_defconfig +Auto-merging arch/m68k/configs/mvme147_defconfig +Auto-merging arch/m68k/configs/mvme16x_defconfig +Auto-merging arch/m68k/configs/q40_defconfig +Auto-merging arch/m68k/configs/sun3_defconfig +Auto-merging arch/m68k/configs/sun3x_defconfig +Auto-merging arch/powerpc/configs/ppc64_defconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging fs/bcachefs/Kconfig +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 11 + + arch/arm/Kconfig | 2 + + arch/arm/configs/milbeaut_m10v_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/crypto/Kconfig | 25 - + arch/arm/crypto/Makefile | 4 - + arch/arm/crypto/crc32-ce-glue.c | 247 ------ + arch/arm/crypto/crct10dif-ce-glue.c | 124 --- + arch/arm/lib/Makefile | 6 + + .../crct10dif-ce-core.S => lib/crc-t10dif-core.S} | 0 + arch/arm/lib/crc-t10dif-glue.c | 80 ++ + .../{crypto/crc32-ce-core.S => lib/crc32-core.S} | 5 +- + arch/arm/lib/crc32-glue.c | 123 +++ + arch/arm64/Kconfig | 2 + + arch/arm64/configs/defconfig | 1 - + arch/arm64/crypto/Kconfig | 10 - + arch/arm64/crypto/Makefile | 3 - + arch/arm64/crypto/crct10dif-ce-glue.c | 132 ---- + arch/arm64/lib/Makefile | 6 +- + .../crct10dif-ce-core.S => lib/crc-t10dif-core.S} | 0 + arch/arm64/lib/crc-t10dif-glue.c | 81 ++ + arch/arm64/lib/crc32-glue.c | 25 +- + arch/loongarch/Kconfig | 1 + + arch/loongarch/configs/loongson3_defconfig | 1 - + arch/loongarch/crypto/Kconfig | 9 - + arch/loongarch/crypto/Makefile | 2 - + arch/loongarch/crypto/crc32-loongarch.c | 300 -------- + arch/loongarch/lib/Makefile | 2 + + arch/loongarch/lib/crc32-loongarch.c | 135 ++++ + arch/m68k/configs/amiga_defconfig | 1 - + arch/m68k/configs/apollo_defconfig | 1 - + arch/m68k/configs/atari_defconfig | 1 - + arch/m68k/configs/bvme6000_defconfig | 1 - + arch/m68k/configs/hp300_defconfig | 1 - + arch/m68k/configs/mac_defconfig | 1 - + arch/m68k/configs/multi_defconfig | 1 - + arch/m68k/configs/mvme147_defconfig | 1 - + arch/m68k/configs/mvme16x_defconfig | 1 - + arch/m68k/configs/q40_defconfig | 1 - + arch/m68k/configs/sun3_defconfig | 1 - + arch/m68k/configs/sun3x_defconfig | 1 - + arch/mips/Kconfig | 5 +- + arch/mips/configs/eyeq5_defconfig | 1 - + arch/mips/configs/eyeq6_defconfig | 1 - + arch/mips/configs/generic/32r6.config | 2 - + arch/mips/configs/generic/64r6.config | 1 - + arch/mips/crypto/Kconfig | 9 - + arch/mips/crypto/Makefile | 2 - + arch/mips/crypto/crc32-mips.c | 354 --------- + arch/mips/lib/Makefile | 2 + + arch/mips/lib/crc32-mips.c | 192 +++++ + arch/powerpc/Kconfig | 2 + + arch/powerpc/configs/powernv_defconfig | 2 - + arch/powerpc/configs/ppc64_defconfig | 3 - + arch/powerpc/crypto/Kconfig | 33 - + arch/powerpc/crypto/Makefile | 5 - + arch/powerpc/crypto/crc-vpmsum_test.c | 133 ---- + arch/powerpc/crypto/crc32c-vpmsum_glue.c | 173 ----- + arch/powerpc/lib/Makefile | 6 + + .../crc-t10dif-glue.c} | 69 +- + arch/powerpc/lib/crc32-glue.c | 92 +++ + arch/powerpc/{crypto => lib}/crc32-vpmsum_core.S | 0 + arch/powerpc/{crypto => lib}/crc32c-vpmsum_asm.S | 0 + .../powerpc/{crypto => lib}/crct10dif-vpmsum_asm.S | 0 + arch/riscv/Kconfig | 1 + + arch/riscv/lib/Makefile | 3 +- + arch/riscv/lib/{crc32.c => crc32-riscv.c} | 25 +- + arch/s390/Kconfig | 1 + + arch/s390/configs/debug_defconfig | 2 - + arch/s390/configs/defconfig | 1 - + arch/s390/crypto/Kconfig | 12 - + arch/s390/crypto/Makefile | 2 - + arch/s390/crypto/crc32-vx.c | 306 -------- + arch/s390/lib/Makefile | 3 + + arch/s390/lib/crc32-glue.c | 92 +++ + arch/s390/{crypto => lib}/crc32-vx.h | 0 + arch/s390/{crypto => lib}/crc32be-vx.c | 0 + arch/s390/{crypto => lib}/crc32le-vx.c | 0 + arch/sparc/Kconfig | 1 + + arch/sparc/crypto/Kconfig | 10 - + arch/sparc/crypto/Makefile | 4 - + arch/sparc/crypto/crc32c_glue.c | 184 ----- + arch/sparc/lib/Makefile | 2 + + arch/sparc/lib/crc32_glue.c | 93 +++ + arch/sparc/{crypto => lib}/crc32c_asm.S | 2 +- + arch/x86/Kconfig | 2 + + arch/x86/crypto/Kconfig | 32 - + arch/x86/crypto/Makefile | 10 - + arch/x86/crypto/crc32-pclmul_glue.c | 202 ----- + arch/x86/crypto/crc32c-intel_glue.c | 250 ------ + arch/x86/crypto/crct10dif-pclmul_glue.c | 143 ---- + arch/x86/lib/Makefile | 7 + + arch/x86/lib/crc-t10dif-glue.c | 51 ++ + arch/x86/lib/crc32-glue.c | 124 +++ + .../crc32-pclmul_asm.S => lib/crc32-pclmul.S} | 19 +- + .../crc32c-3way.S} | 63 +- + arch/x86/{crypto => lib}/crct10dif-pcl-asm_64.S | 0 + crypto/Kconfig | 1 + + crypto/Makefile | 3 +- + crypto/crc32_generic.c | 8 +- + crypto/crc32c_generic.c | 12 +- + crypto/crct10dif_common.c | 82 -- + crypto/crct10dif_generic.c | 82 +- + drivers/target/iscsi/Kconfig | 4 +- + drivers/target/iscsi/iscsi_target.c | 153 ++-- + drivers/target/iscsi/iscsi_target_login.c | 50 -- + drivers/target/iscsi/iscsi_target_login.h | 1 - + drivers/target/iscsi/iscsi_target_nego.c | 21 +- + fs/bcachefs/Kconfig | 1 + + fs/ext4/Kconfig | 3 +- + fs/ext4/ext4.h | 25 +- + fs/ext4/super.c | 15 - + fs/f2fs/Kconfig | 3 +- + fs/f2fs/f2fs.h | 20 +- + fs/f2fs/super.c | 15 - + fs/jbd2/Kconfig | 2 - + fs/jbd2/journal.c | 30 +- + include/linux/crc-t10dif.h | 28 +- + include/linux/crc32.h | 50 +- + include/linux/crc32c.h | 7 +- + include/linux/jbd2.h | 33 +- + include/target/iscsi/iscsi_target_core.h | 3 - + lib/Kconfig | 121 ++- + lib/Kconfig.debug | 29 +- + lib/Makefile | 4 +- + lib/crc-t10dif.c | 156 ++-- + lib/crc16_kunit.c | 155 ---- + lib/crc32.c | 24 +- + lib/crc32test.c | 852 --------------------- + lib/crc_kunit.c | 435 +++++++++++ + lib/libcrc32c.c | 74 -- + tools/testing/selftests/arm64/fp/kernel-test.c | 3 +- + 132 files changed, 2035 insertions(+), 4555 deletions(-) + delete mode 100644 arch/arm/crypto/crc32-ce-glue.c + delete mode 100644 arch/arm/crypto/crct10dif-ce-glue.c + rename arch/arm/{crypto/crct10dif-ce-core.S => lib/crc-t10dif-core.S} (100%) + create mode 100644 arch/arm/lib/crc-t10dif-glue.c + rename arch/arm/{crypto/crc32-ce-core.S => lib/crc32-core.S} (98%) + create mode 100644 arch/arm/lib/crc32-glue.c + delete mode 100644 arch/arm64/crypto/crct10dif-ce-glue.c + rename arch/arm64/{crypto/crct10dif-ce-core.S => lib/crc-t10dif-core.S} (100%) + create mode 100644 arch/arm64/lib/crc-t10dif-glue.c + delete mode 100644 arch/loongarch/crypto/crc32-loongarch.c + create mode 100644 arch/loongarch/lib/crc32-loongarch.c + delete mode 100644 arch/mips/crypto/crc32-mips.c + create mode 100644 arch/mips/lib/crc32-mips.c + delete mode 100644 arch/powerpc/crypto/crc-vpmsum_test.c + delete mode 100644 arch/powerpc/crypto/crc32c-vpmsum_glue.c + rename arch/powerpc/{crypto/crct10dif-vpmsum_glue.c => lib/crc-t10dif-glue.c} (50%) + create mode 100644 arch/powerpc/lib/crc32-glue.c + rename arch/powerpc/{crypto => lib}/crc32-vpmsum_core.S (100%) + rename arch/powerpc/{crypto => lib}/crc32c-vpmsum_asm.S (100%) + rename arch/powerpc/{crypto => lib}/crct10dif-vpmsum_asm.S (100%) + rename arch/riscv/lib/{crc32.c => crc32-riscv.c} (91%) + delete mode 100644 arch/s390/crypto/crc32-vx.c + create mode 100644 arch/s390/lib/crc32-glue.c + rename arch/s390/{crypto => lib}/crc32-vx.h (100%) + rename arch/s390/{crypto => lib}/crc32be-vx.c (100%) + rename arch/s390/{crypto => lib}/crc32le-vx.c (100%) + delete mode 100644 arch/sparc/crypto/crc32c_glue.c + create mode 100644 arch/sparc/lib/crc32_glue.c + rename arch/sparc/{crypto => lib}/crc32c_asm.S (92%) + delete mode 100644 arch/x86/crypto/crc32-pclmul_glue.c + delete mode 100644 arch/x86/crypto/crc32c-intel_glue.c + delete mode 100644 arch/x86/crypto/crct10dif-pclmul_glue.c + create mode 100644 arch/x86/lib/crc-t10dif-glue.c + create mode 100644 arch/x86/lib/crc32-glue.c + rename arch/x86/{crypto/crc32-pclmul_asm.S => lib/crc32-pclmul.S} (95%) + rename arch/x86/{crypto/crc32c-pcl-intel-asm_64.S => lib/crc32c-3way.S} (92%) + rename arch/x86/{crypto => lib}/crct10dif-pcl-asm_64.S (100%) + delete mode 100644 crypto/crct10dif_common.c + delete mode 100644 lib/crc16_kunit.c + delete mode 100644 lib/crc32test.c + create mode 100644 lib/crc_kunit.c + delete mode 100644 lib/libcrc32c.c +Merging kthread/for-next (fc7d29fc8771 rcu: Use kthread preferred affinity for RCU exp kworkers) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next +Auto-merging arch/arm64/include/asm/cpufeature.h +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging drivers/net/dsa/mv88e6xxx/chip.c +Auto-merging drivers/platform/chrome/cros_ec_spi.c +Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c +Auto-merging drivers/scsi/qedi/qedi_main.c +Auto-merging drivers/spi/spi.c +Auto-merging fs/erofs/zdata.c +Auto-merging kernel/kthread.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/rcu/tree_plugin.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/ext.c +Auto-merging kernel/workqueue.c +Auto-merging mm/compaction.c +Auto-merging mm/vmscan.c +Auto-merging net/dsa/tag_ocelot_8021q.c +Merge made by the 'ort' strategy. + Documentation/arch/arm64/asymmetric-32bit.rst | 9 + + arch/arm/common/bL_switcher.c | 10 +- + arch/arm64/include/asm/cpufeature.h | 1 + + arch/arm64/include/asm/mmu_context.h | 2 + + arch/arm64/kernel/cpufeature.c | 17 +- + arch/x86/kvm/i8254.c | 2 +- + crypto/crypto_engine.c | 2 +- + drivers/cpufreq/cppc_cpufreq.c | 2 +- + drivers/gpu/drm/drm_vblank_work.c | 2 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_slpc.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 8 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot.c | 2 +- + drivers/gpu/drm/msm/msm_atomic.c | 2 +- + drivers/gpu/drm/msm/msm_gpu.c | 2 +- + drivers/gpu/drm/msm/msm_kms.c | 2 +- + .../media/platform/chips-media/wave5/wave5-vpu.c | 2 +- + drivers/net/dsa/mv88e6xxx/chip.c | 2 +- + drivers/net/ethernet/intel/ice/ice_dpll.c | 2 +- + drivers/net/ethernet/intel/ice/ice_gnss.c | 2 +- + drivers/net/ethernet/intel/ice/ice_ptp.c | 2 +- + drivers/platform/chrome/cros_ec_spi.c | 2 +- + drivers/ptp/ptp_clock.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 7 +- + drivers/scsi/bnx2i/bnx2i_init.c | 7 +- + drivers/scsi/qedi/qedi_main.c | 6 +- + drivers/soc/fsl/qbman/qman_test_stash.c | 6 +- + drivers/spi/spi.c | 2 +- + drivers/usb/typec/tcpm/tcpm.c | 2 +- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 2 +- + drivers/watchdog/watchdog_dev.c | 2 +- + fs/erofs/zdata.c | 2 +- + include/linux/cpuhotplug.h | 1 + + include/linux/kthread.h | 56 +++++- + include/linux/mmu_context.h | 1 + + kernel/kallsyms_selftest.c | 4 +- + kernel/kthread.c | 201 ++++++++++++++++++--- + kernel/rcu/tree.c | 94 ++-------- + kernel/rcu/tree_plugin.h | 11 +- + kernel/sched/core.c | 2 +- + kernel/sched/ext.c | 2 +- + kernel/workqueue.c | 2 +- + lib/test_objpool.c | 19 +- + mm/compaction.c | 43 +---- + mm/vmscan.c | 8 +- + net/dsa/tag_ksz.c | 2 +- + net/dsa/tag_ocelot_8021q.c | 2 +- + net/dsa/tag_sja1105.c | 2 +- + 50 files changed, 340 insertions(+), 231 deletions(-) +Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT) +$ git merge -m Merge branch 'header_cleanup' of git://evilpiepirate.org/bcachefs.git header_cleanup/header_cleanup +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..e97fb784db13 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20241220