diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-04-12 17:08:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-04-12 17:08:20 +1000 |
| commit | 9ed46da14b9b9b2ad4edb3b0c545b6dbe5c00d39 (patch) | |
| tree | bd91f94133e0da31e51d155b92a089dbafebb5f5 | |
| parent | 60872a66c0e59515ec40ac418b2320942173cb11 (diff) | |
Add linux-next specific files for 20240412next-20240412
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 371 | ||||
| -rw-r--r-- | Next/Trees | 373 | ||||
| -rw-r--r-- | Next/merge.log | 8168 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 8913 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..4e1c150c655e --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,371 @@ +Name SHA1 +---- ---- +origin 00dcf5d862e86e57f5ce46344039f11bb1ad61f6 +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes 2f61e5f50dcb5e712a53c4c6627baacce484719d +kbuild-current 89e5462bb5aee1e634a3d5bd41125809a929a486 +arc-current ebfc2fd8873b4feb86f01835ad97282aede1e956 +arm-current 0c66c6f4e21cb22220cbd8821c5c73fc157d20dc +arm64-fixes e3ba51ab24fddef79fc212f9840de54db8fd1685 +arm-soc-fixes 011d79ef1cfad701c2d8e7e80d8c77523af9c771 +davinci-current 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory-fixes 4cece764965020c22cff7665b18a012006359095 +sophgo-fixes 4cece764965020c22cff7665b18a012006359095 +m68k-current e8a7824856def1c8608401b0d7d05566d6e81c95 +powerpc-fixes 36ba64b4cbc6145103a0e3586ae7ef595bdef132 +s390-fixes 378ca2d2ad410a1cd5690d06b46c5e2297f4c8c0 +fscrypt-current 4cece764965020c22cff7665b18a012006359095 +fsverity-current 4cece764965020c22cff7665b18a012006359095 +net 2ae9a8972ce04046957f8af214509cebfd3bfb9c +bpf 6648e613226e18897231ab5e42ffc29e63fa3365 +ipsec bccb798e07f8bb8b91212fe8ed1e421685449076 +netfilter 6db5dc7b351b9569940cd1cf445e237c42cd6d27 +ipvs 7eaf837a4eb5f74561e2486972e7f5184b613f6e +wireless 9ef369973cd2c97cce3388d2c0c7e3c056656e8a +wpan b85ea95d086471afb4ad062012a4d73cd328fa86 +rdma-fixes b68e1acb5834ed1a2ad42d9d002815a8bae7c0b6 +sound-current 0b6f0ff01a4a8c1b66c600263465976d57dcc1a3 +sound-asoc-fixes 2e411e939da9557494a0d83eb2e50627d9ccb2af +regmap-fixes fec50db7033ea478773b159e0e2efb135270e3b7 +regulator-fixes 68adb581a39ae63a0ed082c47f01fbbe515efa0e +spi-fixes fec50db7033ea478773b159e0e2efb135270e3b7 +pci-current 302b84e84d108b878efc56ebfea09474159be56b +driver-core.current 156539fd65019e8ed6b9fbac0583cf519cdbb227 +tty.current 1aa4ad4eb695bac1b0a7ba542a16d6833c9c8dd8 +usb.current 34b990e9bb54d20b9675ca9483be8668eed374d8 +usb-serial-fixes d206a76d7d2726f3b096037f2079ce0bd3ba329b +phy 47b3e2f3914ae5e8d9025d65ae5cffcbb54bc9c3 +staging.current 39cd87c4eb2b893354f3b850f916353f2658ae6f +iio-fixes 74a72baf204fd509bbe8b53eec35e39869d94341 +counter-current 39cd87c4eb2b893354f3b850f916353f2658ae6f +char-misc.current ebaed6d4def877d2035786ff318379eb750044c8 +soundwire-fixes 63dc588e7af1392576071a1841298198c9cddee3 +thunderbolt-fixes dcd12acaf384c30437fa5a9a1f71df06fc9835fd +input-current 57ed9567e63b59350c21ae026635ae051e247abb +crypto-current 5a7e89d3315d1be86aff8a8bf849023cda6547f7 +vfio-fixes 4ea95c04fa6b9043a1a301240996aeebe3cb28ec +kselftest-fixes 72d7cb5c190befbb095bae7737e71560ec0fcaa6 +dmaengine-fixes f221033f5c24659dc6ad7e5cf18fb1b075f4a8be +backlight-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +mtd-fixes 21c9fb611c25d5cd038f6fe485232e7884bb0b3d +mfd-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +v4l-dvb-fixes d353c3c34af08cfd4eaafc8c55f664eacec274ee +reset-fixes 4a6756f56bcf8e64c87144a626ce53aea4899c0e +mips-fixes 4370b673ccf240bf7587b0cb8e6726a5ccaf1f17 +at91-fixes 4cece764965020c22cff7665b18a012006359095 +omap-fixes 9b6a51aab5f5f9f71d2fa16e8b4d530e1643dfcb +kvm-fixes 49ff3b4aec51e3abfc9369997cc603319b02af9a +kvms390-fixes 83303a4c776ce1032d88df59e811183479acea77 +hwmon-fixes 4cece764965020c22cff7665b18a012006359095 +nvdimm-fixes 33908660e814203e996f6e775d033c5c32fcf9a7 +cxl-fixes 7bcf809b1e7889ab7e75fe1fcf8f1a98332f36d2 +btrfs-fixes 07475cc36e03d2c0d60aa30856666aee359ad2ab +vfs-fixes aa23317d0268b309bb3f0801ddd0d61813ff5afb +dma-mapping-fixes d5090484b021794271280ab64d20253883b7f6fd +drivers-x86-fixes e71c8481692582c70cdfd0996c20cdcc71e425d3 +samsung-krzk-fixes 4cece764965020c22cff7665b18a012006359095 +pinctrl-samsung-fixes 4cece764965020c22cff7665b18a012006359095 +devicetree-fixes de164a7f19248fb03229a4af9b0db333d9591e55 +dt-krzk-fixes 4cece764965020c22cff7665b18a012006359095 +scsi-fixes ca91259b775f6fd98ae5d23bb4eec101d468ba8d +drm-fixes 1bafeaf26264546b7592caa05611b22740ee6ccb +drm-intel-fixes dcd8992e47f13afb5c11a61e8d9c141c35e23751 +mmc-fixes ace323f80b9bc6734289a4e8a77938a3ce964c7d +rtc-fixes 4cece764965020c22cff7665b18a012006359095 +gnss-fixes 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +hyperv-fixes 30d18df6567be09c1433e81993e35e3da573ac48 +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes a373a36fb6b024ac1d87fc04c97c75621b574c30 +riscv-dt-fixes 0f74c64f0a9f6e1e7cf17bea3d4350fa6581e0d7 +riscv-soc-fixes 6b0856ee585d7f8a544546c3c5f1f4c49162e451 +fpga-fixes 4cece764965020c22cff7665b18a012006359095 +spdx 4cece764965020c22cff7665b18a012006359095 +gpio-brgl-fixes e43c2feb8f323b91c85ddbf23769c3586cd91010 +gpio-intel-fixes ace0ebe5c98d66889f19e0f30e2518d0c58d0e04 +pinctrl-intel-fixes 5d10a157ebe02ac9b8abacfd529f8b045e8aa41b +auxdisplay-fixes 4cece764965020c22cff7665b18a012006359095 +erofs-fixes 7557d296ad439f66a87cd34917af2a4172517826 +kunit-fixes cfedfb24c9ddee2bf1641545f6e9b6a02b924aee +memblock-fixes 592447f6cb3c20d606d6c5d8e6af68e99707b786 +nfsd-fixes f488138b526715c6d2568d7329c4477911be4210 +renesas-fixes 8c987693dc2d292d777f1be63cb35233049ae25e +perf-current 25e973a0e077da585e472b4cadb1d2f4c1113285 +efi-fixes decd347c2a75d32984beb8807d470b763a53b542 +zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb +battery-fixes 452d8950db3e839aba1bb13bc5378f4bac11fa04 +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +iommufd-fixes 39cd87c4eb2b893354f3b850f916353f2658ae6f +rust-fixes 761a8f0a776b5d5f5816e6c6e5f7f18d1b3d52f9 +v9fs-fixes 7a84602297d36617dbdadeba55a2567031e5165b +w1-fixes 4cece764965020c22cff7665b18a012006359095 +pmdomain-fixes 39cd87c4eb2b893354f3b850f916353f2658ae6f +overlayfs-fixes 77a28aa476873048024ad56daf8f4f17d58ee48e +i2c-host-fixes fec50db7033ea478773b159e0e2efb135270e3b7 +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +clk-fixes d3e8a91a848a5941e3c31ecebd6b2612b37e01a6 +drm-misc-fixes 4c08f01934ab67d1d283d5cbaa52b923abcfe4cd +mm-stable 4e2e3612922529f03a6fb380d416ba8c968b34cc +mm-nonmm-stable 39cd87c4eb2b893354f3b850f916353f2658ae6f +mm ed7c95c95397baff9b40ba9b0919933eee2d7960 +kbuild bfa8f18691ed2e978e4dd51190569c434f93e268 +clang-format 5a205c6a9f79d14db38006aa2d7c4f4e76b1bfc7 +perf 9c3e9af74326978ba6f4432bb038e6c80f4f56fd +compiler-attributes 2993eb7a8d34aee6165e1f6676e81cdf1d22aa62 +dma-mapping a1255ccab8ecee89905ddb12161139b0d878a7f2 +asm-generic 5394f1e9b687bcf26595cabf83483e568676128d +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm 5616fee8981b838d56c8d85a63047c2c003ecc9d +arm64 fec50db7033ea478773b159e0e2efb135270e3b7 +arm-perf 8f9f5041c64600b01b71f29fb8e2121e45bfb719 +arm-soc 011d79ef1cfad701c2d8e7e80d8c77523af9c771 +amlogic 4ee46d40d625a5826149686a6d7396daed2c5eea +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed 0c30853731ec7e70941cf008bf5227fb9e327810 +at91 fa8e55345b646f3eb5b1dc889bad4a2a1fa360d9 +broadcom ebe9ff485efc0e54dff4fbf36848feb07b2c71fa +davinci 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory bf11908757eeab716536d16a32693b5dcd6990de +imx-mxs 6cf256f63478db53df00f0c23c800e802cf0f0de +mediatek 67d5303fe655a13998b80120ae282a2a78832c72 +mvebu 058bfa0ead87e05ffdc837d534e68a8ca6b73dc4 +omap 2a1e301bf4799a99e787a671ea3d5b93a5048909 +qcom 3cd1977804fb3354e412988f7416ac1bf2c4fffd +renesas 957eed54b7b66fdd3e93ca7550be25aba1ee225d +reset 6d89df61650d155b9033d9f507f3580f9177e623 +rockchip 56f939cce5e13f57a5fbdc75b451dc10a3b4f0c3 +samsung-krzk b7b2fe24038b40f52135584a3dfce6e0f3cb6264 +scmi a4200c1395dc3cce6ce36ea43e115938600e2605 +sophgo 65fcc08b4cfe92d5d2c39710b3145d0b56e8391d +stm32 b12a916d30dc4ec545cb11a420276788a9e529c0 +sunxi c1d7282e4e920ca2caea6147162ef77ca2fdea6e +tee 60757f1264a2d88502d05977c791757ee5eb9f5e +tegra c85c30fad06dabdefbf59911ed303553e77490f2 +ti 592695bed5f8957cd55d120af2cbe63f5a25334e +xilinx 2d81f5ef567ce96f29e698939673226d2d1b0fcb +clk deb01ebcc734ce9d9d7cfc7dcd9d16c761197213 +clk-imx 13269dc6c70444528f0093585e3559cd2f38850a +clk-renesas c0516eb4cf04ac61b6fe1f86cc15b2f5f024ee78 +csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b +loongarch a07c772fa658645887119184de48b255bf19a46e +m68k 70d830e337f999ad186d0093e973805eaf6fb8ca +m68knommu d677c24fcceef0e9ea9b8632d137692f5008d1b5 +microblaze 6613476e225e090cc9aad49be7fa504e290dd33d +mips 4cece764965020c22cff7665b18a012006359095 +openrisc 68b70ab43cecfc960e119300136e72c141471b12 +parisc-hd e8f897f4afef0031fe618a8e94127a0934896aba +powerpc 8884fc918f6aee220f9b41806974508bd0213aca +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v ba5ea59f768f67d127b319b26ba209ff67e0d9a5 +riscv-dt 5db2c4dc413e27720b8f567522cd5ebb0bb7ef70 +riscv-soc 16d9122246cc05b5e89e207757ca2a69f720509c +s390 9fb83b5a1bdb866630bb58ac231be453230e9f2c +sh 4cece764965020c22cff7665b18a012006359095 +sparc 84b76d05828a1909e20d0f66553b876b801f98c8 +uml 83aec96c631e0fa75cfe6d6a1b113a32151aaa88 +xtensa 11cca8ccf2c3643d002e7b421acfdc847a627e9f +bcachefs 1189bdda6c991cbf9342d84410042dd5f3a792e0 +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 8c62f31eddb71c6f6878258579318c1156045247 +afs abcbd3bfbbfe97a8912d0c929d4aa18f50d9bc52 +btrfs 7218664bf91d9cd6b6473503034d151a13e7fdd3 +ceph d3e0469306793972fd2b1ea016fa7ab0658c9849 +cifs 4e996f9d30cbd913eadce16a97dd5f06eebe9cdc +configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b +erofs b351756059e3120470706d262f0f0acf0f1fb9b7 +exfat 6397cc21e5c05f35a69e4aca247337a8d97cbbd4 +exportfs e8f897f4afef0031fe618a8e94127a0934896aba +ext3 172dc02ca6ece0fe361ce194d68744c8d5ec2f32 +ext4 0ecae5410ab526225293d2591ca4632b22c2fd8c +f2fs bf3a69c6861ff4dc7892d895c87074af7bc1c400 +fsverity 8e43fb06e10d2c811797740dd578c5099a3e6378 +fuse cdf6ac2a03d253f05d3e798f60f23dea1b176b92 +gfs2 cac2ca6ca54959b20004a79d66cc9080b8e243ac +jfs e42e29cc442395d62f1a8963ec2dfb700ba6a5d7 +ksmbd 405ac6a57277f09a49635714b07a34cc584d9cc4 +nfs 24457f1be29f1e7042e50a7749f5c2dde8c433c8 +nfs-anna 57331a59ac0d680f606403eb24edd3c35aecba31 +nfsd e5ca63b09c65effccda06af447fc053f2c6bfaf5 +ntfs3 622cd3daa8eae37359a6fd3c07c36d19f66606b5 +orangefs 9bf93dcfc453fae192fe5d7874b89699e8f800ac +overlayfs d17bb4620f90f81d8a8a45c3d025c679a1b5efcd +ubifs b8a77b9a5f9c2ba313f2beef8440b6f9f69768e7 +v9fs 2a0505cdd8c8b12670f4b5a6eb5c996c0861c2d5 +v9fs-ericvh 4cece764965020c22cff7665b18a012006359095 +xfs e23d7e82b707d1d0a627e334fb46370e4f772c11 +zonefs 567e629fd296561aacd04547a603b163de3dabbe +iomap 3ac974796e5d94509b85a403449132ea660127c2 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner 7dad3e0bd4e46f81cae29aa7bacc51d1d625ac44 +vfs 052d534373b7ed33712a63d5e17b2b6cdbce84fd +printk a2b4cab9da7746c42f87c13721d305baf0085a20 +pci ced360f2a021b8bf0cb7c0222cb551b8cad3cf91 +pstore 9dd12ed95c2d06a29a5d289c6e65589c577ef8ca +hid a8d38c4a9f9f31864ec77cee2e89e14581e8dc20 +i2c 5ceeabb0eb2e1982d25c384048735b9da66911f9 +i2c-host ab9713bb88443f8791e2917833ff1ed802046b2f +i3c 8f06fb45853900b4deaa52e2a9e16f3d9550b011 +hwmon-staging db85dba9fee5fed54e2c37eed465f8fd243a92e8 +jc_docs 8819b60eed720819ea392d2b6d955e332caf703d +v4l-dvb 4cece764965020c22cff7665b18a012006359095 +v4l-dvb-next 71b3ed53b08d87212fbbe51bdc3bf44eb8c462f8 +pm 53c477378d23c092bd63c0670d9020b5c552bb28 +cpufreq-arm 4cece764965020c22cff7665b18a012006359095 +cpupower 4cece764965020c22cff7665b18a012006359095 +devfreq 6f3c0cfe2aa52d7ecb280cecc20147952d6ec02d +pmdomain 02e2a4b3638cdf6c001f368589966887a1420e01 +opp 4cece764965020c22cff7665b18a012006359095 +thermal 1828c1c17bb2adf3a3f26abc69cb3fe971eac0e4 +dlm 92d59adfaf710f34ae7788fa54f0731a7640833b +rdma dfcdb38b21e4fb92a49acdbdf6afa82c07c8eba0 +net-next 94426ed2137a948d212302df571445d4245772b9 +bpf-next c53e853c2d8145859f57c63662030f7aaa61cfdc +ipsec-next 267e31750ae89f845cfe7df8f577b19482d9ef9b +mlx5-next d727d27db536faea7178290c677cc0567f647231 +netfilter-next ed1f164038b50c5864aa85389f3ffd456f050cca +ipvs-next ed1f164038b50c5864aa85389f3ffd456f050cca +bluetooth e00fc2700a3fa0a506666741279c969ae4ba5551 +wireless-next d26a0a66f9290a3665e283826637722507af5ce3 +wpan-next 9187210eee7d87eea37b45ea93454a88681894a4 +wpan-staging 9187210eee7d87eea37b45ea93454a88681894a4 +mtd 3ef4600f12269d489933b3835fe8d43621e4ee6c +nand 6819db94e1cd3ce24a432f3616cd563ed0c4eaba +spi-nor 4cece764965020c22cff7665b18a012006359095 +crypto 4ad27a8be9dbefd4820da0f60da879d512b2f659 +drm 6e1f415e7129f7cd4c2394af83b35cdcdd40baf7 +drm-exynos 6633c7d2fd314145ad9e6ba553775c6a03827b44 +drm-misc 42118c5f6853a28c132ab1ae6efe3893b051e0d2 +amdgpu 526b184e888371dd3fdb131961461a2f30cd0ae4 +drm-intel 578ff98403cef6284430934616bc4debf3017d0f +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm 9dc23cba0927d09cb481da064c8413eb9df42e2b +drm-msm-lumag ab556156cafa24ec7de9e89bc18fa15637c21a59 +drm-xe 4209d635a823619038db0bf72e86a223f4186634 +etnaviv b735ee173f84d5d0d0733c53946a83c12d770d05 +fbdev fb3b9c2d217f1f51fffe19fc0f4eaf55e2d4ea4f +regmap 8a8317f92770ab70ff39b15de74bdb3a07fdb6cb +sound a9b16d59187404db0eef1343ae5a08ed281b726e +ieee1394 0d4149e5e9b02e5c11e3418c09c6db8b87448f15 +sound-asoc f8cfa515170f4ea0a00310511fc21ef53660d1dd +modules 68881525ba297ea18bf7bff9ae879be9be4a8f75 +input 8984e0b569236c8581901efce2f1f4d03cd3dec1 +block 7ed17328165314e4c65c1a7cdb3b73152c9cf570 +device-mapper 44078156fc77252694021d38010ae6c324f4c8a9 +libata dcf2653ac12f2c1c3c0e1042c35fe90f7d74eb08 +pcmcia ccae53aa8aa2d902242555638c5de104aab08879 +mmc bce42d6108c9ff6de1381995dffa762730ce0756 +mfd fb9d85a9698e1ed953b6c998ab56e4d431d5ed74 +backlight 9db7677e33b646a7fd60d35cbd4ab99886057a85 +battery 50f0ff7c8cc4c1d10fabc4b3b3f3b9e942b08187 +regulator 15f992fa81eb7d03ab87ea90feee30a77d0a8745 +security 4cece764965020c22cff7665b18a012006359095 +apparmor 8ead196be219adade3bd0d4115cc9b8506643121 +integrity 5e2e4d0ea5c2c886c4a082890be6a1c2ee064605 +selinux d6fc1ee0b6c11b70808cbd3ed0bf06c2e772ad73 +smack 69b6d71052b54fb10feba68564ccb41c0f0ce1e9 +tomoyo 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tpmdd 6999f8229e5998e8286e6a960779b6c202d878da +watchdog 6fe5aabf7fc645562faec50c79c7a21a4dd1cab6 +iommu c404f55c26fc23c70a9f2262f3f36a69fc46289b +audit 4cece764965020c22cff7665b18a012006359095 +devicetree 3cef9e08b6f43fcc7b7802a1f01bb7d9334d6b6d +dt-krzk 364be3ecd30d22de62741970f7554fa5f035a5cc +mailbox 8df6bab6cb9abc98736ffae410a74647995873c6 +spi 637ced031d3c490f0c37c1e826574f39909647a5 +tip b4ba814ae4a4d07d1b983601c3b2ea488864cc88 +clockevents 8248ca30ef89f9cc74ace62ae1b9a22b5f16736c +edac 8e95536e9495b387bf62c9d9daf8f4888cf28ad7 +ftrace 7604256cecef34a82333d9f78262d3180f4eb525 +rcu 8942ebe9e1836406c44c8bbf78081f4be15c533e +kvm 415efaaf0d973684af5fa7c9ddccf111485f9f1b +kvm-arm 29b0075ed61cda250449f556fbe007a5c469440c +kvms390 00de073e2420df02ac0f1a19dbfb60ff8eb198be +kvm-ppc 41bccc98fb7931d63d03f326a746ac4d429c1dd3 +kvm-riscv 8e936e98718f005c986be0bfa1ee6b355acf96be +kvm-x86 f10f3621ad80f008c218dbbc13a05c893766a7d2 +xen-tip d277f9d82802223f242cd9b60c988cfdda1d6be0 +percpu 2d9ad81ef93570bc0d4929d05d0601ea400d6fcf +workqueues 8a8a4bfdbe85b666e39576754b878ebcbffb10f3 +drivers-x86 88c0ef69dd881d8acceb62c48b66674367c962b7 +chrome-platform 70a5f30050089769991581d7f42b1707880d5bb6 +chrome-platform-firmware 7f20f21c22aa22e488530f66bf4fc168e427f5bd +hsi 4cece764965020c22cff7665b18a012006359095 +leds-lj de6b3fd4bbc92731e11822d8d34fe80c2cc0718d +ipmi 6b4c0417866078fa4c07e9cfe9b0aeb10afa6628 +driver-core 0bb322be5d389c00740d884351d4ba08fca938aa +usb 1a395af9d53c6240bf7799abc43b4dc292ca9dd0 +thunderbolt 9a966517a83090ee3e26e9a93a92523e2358c5b3 +usb-serial b1a8da9ff1395c4879b4bd41e55733d944f3d613 +tty fec50db7033ea478773b159e0e2efb135270e3b7 +char-misc fec50db7033ea478773b159e0e2efb135270e3b7 +accel 576d7cc5a9e29e4cc579ffb0f9afc209e34eea31 +coresight a4f3057d19ffe1f5a7b9320303471a6725f11379 +fastrpc 4cece764965020c22cff7665b18a012006359095 +fpga 4d2bc3f7dea4d17243924c6758e0447cc1aa0eea +icc 7af14fe58e5ee10807088aa48f176a213c13d309 +iio 27eea4778db8268cd6dc80a5b853c599bd3099f1 +phy-next 0338e1d2f933a4ec7ae96ed1f40c39b899e357d7 +soundwire 4cd5ea6de156850d555e1af8244a530812ae6ff6 +extcon abe83c4e5e4fdb3cb6c72dfe3bbbfd61f5b935ef +gnss 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +vfio 7447d911af699a15f8d050dfcb7c680a86f87012 +w1 cde37a5bdb0ed2c4c7b86ef688e5fdb697525a57 +spmi 897268aef3fa5b979b26121b28fe7acc66894ce3 +staging 18f44de63f88a47ea7669a8b81708b9fa54e5d65 +counter-next 916baadd293a4d11e08a7ca1e2968314451ade6c +siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 4665be0e952f68306cc6fba2cce68b940a7ec78c +cgroup a24e3b7d27c63036dac32d20d18eeeceb54ca207 +scsi 99033e81ab05ad1b3855442fb94877827395dd70 +scsi-mkp e63350dae44f01842dca229aaaa22c105356d7ab +vhost 5b9f214d05404a95051a6d9f8800baad9fc36289 +rpmsg 4d5aabb6843939fad36912be8bf109adf9af0848 +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 1685f72a6dcc55b6a5e50c127b9a0165e8c682a3 +gpio-intel d8a26a18d971cd52a9b253aa2cff7dcb20187711 +pinctrl 07bd48cca03b012d3d788a02b4b29813a93c75b4 +pinctrl-intel 5d10a157ebe02ac9b8abacfd529f8b045e8aa41b +pinctrl-renesas aa43c15a790cf083a6e6a7c531cffd27a5e1fd4f +pinctrl-samsung 4184e4912ca69d4f18a800144539af3b37c6a663 +pwm 858fbbf538a6be743488c7bb61e26c755f8a3baf +ktest 07283c1873a4d0eaa0e822536881bfdaea853910 +kselftest 4f4ade6863ced470fd33152dcf8ba8ae2534d8e2 +kunit 4cece764965020c22cff7665b18a012006359095 +kunit-next 82b0beff3497004c8093f50c1be69bae73e7b66e +livepatching 602bf18307981f3bfd9ebf19921791a4256d3fd1 +rtc 8b59a11fb8e60540ee00ea054afd8dbe9dd3ba00 +nvdimm d9212b35da52109361247b66010802d43c6b1f0d +at24 4cece764965020c22cff7665b18a012006359095 +ntb 9341b37ec17a8793e8439e9b18354ba69556b786 +seccomp 39cd87c4eb2b893354f3b850f916353f2658ae6f +fsi c5eeb63edac9497f9a0d46d3b75cf8b293771ecf +slimbus b12bd525ca6e06c5ba93a49904f580f7f0021cbd +nvmem ea8f9ec2bbb75adac49dbaaf267f8727ee26b91b +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv f2580a907e5c0e8fc9354fd095b011301c64f949 +auxdisplay 93ee235f55d3e1c881e766a320cedcad0b9aca42 +kgdb 4f41d30cd6dc865c3cbc1a852372321eba6d4e4c +hmm 6613476e225e090cc9aad49be7fa504e290dd33d +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi 813e0ae613d6ee1b3e11f1c41f8b9e9df8ef0493 +memblock 2159bd4e905704b1765b6b883ea15e51ad986a6a +cxl ed1ff2fba7afa7baca7ceb93824a4699130b8377 +zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a +efi bf87a149828e6a10437ef96036af0d2706d4cbc6 +unicode 0131c1f3cce7c01b0eb657a9e9e1a5e42c09a68b +slab 5aa5c7b9a09dfce2761c46579cc421708492e890 +random 4cece764965020c22cff7665b18a012006359095 +landlock 028243655456a59d78756d798403a5d673c6d778 +rust 8db31d3f3bd5dbc8cf3a22bba04b4b4add7f984e +sysctl 4f1136a55dc8e2c27d51e934d0675e12331c7291 +execve c82389947d90c8b0dd206d9ef082191eb58df8fc +bitmap fd8ed16c2419e23b7496e008e5f7be98da7fe2d5 +hte b85ea95d086471afb4ad062012a4d73cd328fa86 +kspp 9c573cd313433f6c1f7236fe64b9b743500c1628 +kspp-gustavo 6613476e225e090cc9aad49be7fa504e290dd33d +nolibc 4cece764965020c22cff7665b18a012006359095 +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd 4cece764965020c22cff7665b18a012006359095 +header_cleanup 5f4c01f1e3c7b0c8d1e5dd6f080531de7aa5e47b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..c5d5643ee786 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,373 @@ +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 +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +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 +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 +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 +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 https://git.linuxtv.org/media_stage.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/tmlind/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 +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 +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 git://anongit.freedesktop.org/drm-intel#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 +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +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 +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.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 +nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-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 +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.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 +v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +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 +overlayfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-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 +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/tmlind/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 +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 +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 +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/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 +bcachefs git https://evilpiepirate.org/git/bcachefs.git#for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.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 +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 +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-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 +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 +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_tree.git#master +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 +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#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 +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 git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-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/mcgrof/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 https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.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/joro/iommu.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/paulmck/linux-rcu.git#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 +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 +header_cleanup git https://evilpiepirate.org/git/bcachefs.git#header_cleanup diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..64896aef0f02 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8168 @@ +$ date -R +Fri, 12 Apr 2024 08:00:43 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 80% (3980/4940)
Updating files: 81% (4002/4940)
Updating files: 82% (4051/4940)
Updating files: 83% (4101/4940)
Updating files: 84% (4150/4940)
Updating files: 85% (4199/4940)
Updating files: 86% (4249/4940)
Updating files: 87% (4298/4940)
Updating files: 88% (4348/4940)
Updating files: 89% (4397/4940)
Updating files: 90% (4446/4940)
Updating files: 91% (4496/4940)
Updating files: 92% (4545/4940)
Updating files: 93% (4595/4940)
Updating files: 94% (4644/4940)
Updating files: 95% (4693/4940)
Updating files: 96% (4743/4940)
Updating files: 97% (4792/4940)
Updating files: 98% (4842/4940)
Updating files: 99% (4891/4940)
Updating files: 100% (4940/4940)
Updating files: 100% (4940/4940), done. +HEAD is now at 9875c0beb8ad Merge tag 'media/v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media +Merging origin/master (00dcf5d862e8 Merge tag 'acpi-6.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 9875c0beb8ad..00dcf5d862e8 +Fast-forward (no commit created; -m option ignored) + Documentation/filesystems/bcachefs/index.rst | 11 + + Documentation/filesystems/index.rst | 1 + + MAINTAINERS | 12 +- + arch/loongarch/boot/dts/loongson-2k1000.dtsi | 7 + + arch/loongarch/boot/dts/loongson-2k2000-ref.dts | 33 +++ + arch/loongarch/boot/dts/loongson-2k2000.dtsi | 24 +- + arch/loongarch/include/asm/addrspace.h | 1 + + arch/loongarch/include/asm/io.h | 20 +- + arch/loongarch/include/asm/kfence.h | 9 + + arch/loongarch/include/asm/page.h | 26 ++- + arch/loongarch/mm/mmap.c | 4 + + arch/loongarch/mm/pgtable.c | 4 +- + drivers/acpi/scan.c | 3 +- + drivers/isdn/mISDN/socket.c | 10 +- + drivers/net/dsa/mt7530.c | 246 +++++++++++++++++---- + drivers/net/dsa/mt7530.h | 6 + + drivers/net/ethernet/amazon/ena/ena_com.c | 2 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 35 ++- + drivers/net/ethernet/amazon/ena/ena_xdp.c | 4 +- + drivers/net/ethernet/amd/pds_core/core.c | 13 +- + drivers/net/ethernet/amd/pds_core/core.h | 2 + + drivers/net/ethernet/amd/pds_core/dev.c | 3 + + drivers/net/ethernet/amd/pds_core/main.c | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 6 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 22 +- + drivers/net/ethernet/marvell/octeontx2/nic/qos.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.h | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 33 +-- + drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c | 7 + + drivers/net/ethernet/mellanox/mlx5/core/en/rqt.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/selq.c | 2 + + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 45 +++- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 2 - + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 9 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 11 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 17 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 37 ++-- + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 4 +- + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 1 - + .../ethernet/mellanox/mlx5/core/steering/dr_dbg.c | 82 +++---- + drivers/net/ethernet/micrel/ks8851.h | 3 - + drivers/net/ethernet/micrel/ks8851_common.c | 16 +- + drivers/net/ethernet/micrel/ks8851_par.c | 11 - + drivers/net/ethernet/micrel/ks8851_spi.c | 11 - + .../net/ethernet/microchip/sparx5/sparx5_port.c | 4 +- + drivers/net/ethernet/realtek/r8169.h | 6 +- + drivers/net/ethernet/realtek/r8169_leds.c | 35 ++- + drivers/net/ethernet/realtek/r8169_main.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/mmc.h | 2 + + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 15 ++ + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 + + drivers/net/geneve.c | 4 +- + drivers/net/virtio_net.c | 28 ++- + drivers/platform/chrome/cros_ec_uart.c | 28 +-- + drivers/scsi/hisi_sas/hisi_sas_main.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 +- + drivers/scsi/qla2xxx/qla_edif.c | 2 +- + drivers/scsi/sg.c | 18 +- + drivers/target/target_core_configfs.c | 12 + + fs/bcachefs/acl.c | 32 ++- + fs/bcachefs/bcachefs_format.h | 14 ++ + fs/bcachefs/btree_gc.c | 13 +- + fs/bcachefs/btree_iter.h | 2 +- + fs/bcachefs/btree_journal_iter.c | 67 ++++-- + fs/bcachefs/btree_key_cache.c | 4 +- + fs/bcachefs/btree_locking.c | 28 +-- + fs/bcachefs/btree_node_scan.c | 11 +- + fs/bcachefs/btree_types.h | 14 ++ + fs/bcachefs/btree_update_interior.c | 128 +++++------ + fs/bcachefs/btree_update_interior.h | 3 +- + fs/bcachefs/chardev.c | 98 ++++---- + fs/bcachefs/data_update.c | 17 +- + fs/bcachefs/debug.c | 75 +++++-- + fs/bcachefs/eytzinger.c | 8 +- + fs/bcachefs/eytzinger.h | 26 ++- + fs/bcachefs/journal_reclaim.c | 2 + + fs/bcachefs/journal_types.h | 1 + + fs/bcachefs/recovery.c | 14 -- + fs/bcachefs/snapshot.c | 19 +- + fs/bcachefs/super.c | 5 + + fs/bcachefs/sysfs.c | 6 - + fs/bcachefs/tests.c | 2 +- + fs/bcachefs/util.h | 10 +- + fs/proc/bootconfig.c | 12 +- + include/acpi/acpi_bus.h | 8 +- + include/linux/bootconfig.h | 1 + + include/linux/mm.h | 10 +- + include/linux/sockptr.h | 25 +++ + include/linux/u64_stats_sync.h | 9 +- + include/net/addrconf.h | 4 + + include/net/bluetooth/bluetooth.h | 9 + + include/net/ip_tunnels.h | 33 +++ + init/main.c | 5 + + kernel/kprobes.c | 18 +- + kernel/power/suspend.c | 6 + + lib/checksum_kunit.c | 5 +- + net/batman-adv/translation-table.c | 2 +- + net/bluetooth/hci_request.c | 4 +- + net/bluetooth/hci_sock.c | 21 +- + net/bluetooth/hci_sync.c | 6 +- + net/bluetooth/iso.c | 46 ++-- + net/bluetooth/l2cap_core.c | 3 +- + net/bluetooth/l2cap_sock.c | 52 ++--- + net/bluetooth/rfcomm/sock.c | 14 +- + net/bluetooth/sco.c | 23 +- + net/ipv4/netfilter/arp_tables.c | 4 + + net/ipv4/netfilter/ip_tables.c | 4 + + net/ipv4/route.c | 4 +- + net/ipv6/addrconf.c | 7 +- + net/ipv6/ip6_fib.c | 7 +- + net/ipv6/netfilter/ip6_tables.c | 4 + + net/nfc/llcp_sock.c | 12 +- + net/openvswitch/conntrack.c | 5 +- + net/unix/af_unix.c | 4 +- + net/unix/garbage.c | 18 +- + net/xdp/xsk.c | 2 + + 118 files changed, 1323 insertions(+), 655 deletions(-) + create mode 100644 Documentation/filesystems/bcachefs/index.rst +Merging fixes/fixes (2dde18cd1d8f Linux 6.5) +$ 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 mm-hotfixes/mm-hotfixes-unstable (2f61e5f50dcb fork: defer linking file vma until vma is fully initialized) +$ 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. + Documentation/mm/page_owner.rst | 73 +++++++-------- + fs/squashfs/inode.c | 5 +- + include/linux/shmem_fs.h | 9 ++ + include/linux/swapops.h | 65 +++++++------- + kernel/fork.c | 33 +++---- + mm/gup.c | 54 +++++++----- + mm/huge_memory.c | 6 +- + mm/hugetlb.c | 10 ++- + mm/internal.h | 10 ++- + mm/madvise.c | 17 +--- + mm/memory-failure.c | 12 ++- + mm/page_owner.c | 190 +++++++++++++++++++++++----------------- + mm/shmem.c | 6 -- + 13 files changed, 270 insertions(+), 220 deletions(-) +Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT) +$ 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 (ebfc2fd8873b ARC: Fix typos) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Merge made by the 'ort' strategy. + arch/arc/Kconfig | 1 - + arch/arc/boot/Makefile | 4 ++-- + arch/arc/boot/dts/axc003.dtsi | 4 ++-- + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 2 +- + arch/arc/include/asm/cachetype.h | 9 --------- + arch/arc/include/asm/dsp.h | 2 +- + arch/arc/include/asm/entry-compact.h | 10 +++++----- + arch/arc/include/asm/entry.h | 4 ++-- + arch/arc/include/asm/irq.h | 2 +- + arch/arc/include/asm/irqflags-compact.h | 2 +- + arch/arc/include/asm/mmu_context.h | 2 +- + arch/arc/include/asm/pgtable-bits-arcv2.h | 2 +- + arch/arc/include/asm/ptrace.h | 2 +- + arch/arc/include/asm/shmparam.h | 2 +- + arch/arc/include/asm/smp.h | 4 ++-- + arch/arc/include/asm/thread_info.h | 2 +- + arch/arc/include/uapi/asm/swab.h | 2 +- + arch/arc/kernel/entry-arcv2.S | 8 ++++---- + arch/arc/kernel/entry.S | 4 ++-- + arch/arc/kernel/head.S | 2 +- + arch/arc/kernel/intc-arcv2.c | 2 +- + arch/arc/kernel/kprobes.c | 7 ++++--- + arch/arc/kernel/perf_event.c | 2 +- + arch/arc/kernel/setup.c | 2 +- + arch/arc/kernel/signal.c | 7 ++++--- + arch/arc/kernel/traps.c | 2 +- + arch/arc/kernel/vmlinux.lds.S | 4 ++-- + arch/arc/mm/tlb.c | 4 ++-- + arch/arc/mm/tlbex.S | 8 ++++---- + 29 files changed, 50 insertions(+), 58 deletions(-) + delete mode 100644 arch/arc/include/asm/cachetype.h +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 (e3ba51ab24fd arm64: tlb: Fix TLBI RANGE operand) +$ 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 +Merge made by the 'ort' strategy. + arch/arm64/include/asm/tlbflush.h | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) +Merging arm-soc-fixes/arm/fixes (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 38 ++++++------ + arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx7s-warp.dts | 1 + + arch/arm/mach-omap2/board-n8x0.c | 23 +++---- + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 16 ++--- + arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 40 ++++++------ + arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi | 16 ++--- + .../boot/dts/freescale/imx8mp-venice-gw72xx.dtsi | 2 +- + .../boot/dts/freescale/imx8mp-venice-gw73xx.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi | 8 +-- + drivers/cache/sifive_ccache.c | 72 ++++++++++++++-------- + drivers/firmware/arm_ffa/driver.c | 2 +- + drivers/firmware/arm_scmi/powercap.c | 2 +- + drivers/firmware/arm_scmi/raw_mode.c | 7 ++- + drivers/mmc/host/omap.c | 48 ++++++++++----- + 15 files changed, 158 insertions(+), 121 deletions(-) +Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-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 (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-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 (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-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 (36ba64b4cbc6 selftests/powerpc/papr-vpd: Fix missing variable initialization) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Merge made by the 'ort' strategy. + Documentation/process/embargoed-hardware-issues.rst | 2 +- + arch/powerpc/crypto/chacha-p10-glue.c | 8 +++++++- + arch/powerpc/kernel/iommu.c | 7 +++---- + tools/testing/selftests/powerpc/papr_vpd/papr_vpd.c | 2 +- + 4 files changed, 12 insertions(+), 7 deletions(-) +Merging s390-fixes/fixes (378ca2d2ad41 s390/entry: align system call table on 8 bytes) +$ 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 fscrypt-current/for-current (4cece7649650 Linux 6.9-rc1) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ 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 net/main (2ae9a8972ce0 Merge tag 'net-6.9-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 (6648e613226e bpf, skmsg: Fix NULL pointer dereference in sk_psock_skb_ingress_enqueue) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Auto-merging .mailmap +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 1 + + MAINTAINERS | 8 +++++--- + include/linux/skmsg.h | 2 ++ + lib/Kconfig.debug | 5 +++-- + net/core/skmsg.c | 5 +---- + 5 files changed, 12 insertions(+), 9 deletions(-) +Merging ipsec/master (bccb798e07f8 octeontx2-pf: Fix transmit scheduler resource leak) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/main (6db5dc7b351b netfilter: flowtable: incorrect pppoe tuple) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Merge made by the 'ort' strategy. + include/net/netfilter/nf_flow_table.h | 12 +++++++++++- + include/net/netfilter/nf_tables.h | 14 ++++++++++++++ + net/bridge/br_input.c | 15 +++++++++++---- + net/bridge/br_netfilter_hooks.c | 6 ++++++ + net/bridge/br_private.h | 1 + + net/bridge/netfilter/nf_conntrack_bridge.c | 14 ++++++++++---- + net/netfilter/nf_flow_table_inet.c | 3 ++- + net/netfilter/nf_flow_table_ip.c | 10 ++++++---- + net/netfilter/nf_tables_api.c | 22 ++++++++++++++++++---- + net/netfilter/nft_set_pipapo.c | 19 ++++++++++++------- + 10 files changed, 91 insertions(+), 25 deletions(-) +Merging ipvs/main (7eaf837a4eb5 netfilter: nf_tables: Fix a memory leak in nf_tables_updchain) +$ 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 (9ef369973cd2 wifi: cfg80211: fix the order of arguments for trace events of the tx_rx_evt class) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + include/net/mac80211.h | 3 +++ + net/mac80211/mlme.c | 3 ++- + net/mac80211/rate.c | 6 +++++- + net/mac80211/rx.c | 4 ++++ + net/mac80211/scan.c | 1 + + net/mac80211/tx.c | 13 +++++++++---- + net/wireless/trace.h | 4 ++-- + 7 files changed, 26 insertions(+), 8 deletions(-) +Merging wpan/master (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (b68e1acb5834 RDMA/cm: Print the old state when cm_destroy_id gets timeout) +$ 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/cm.c | 11 +++++++---- + drivers/infiniband/sw/rxe/rxe.c | 2 ++ + 2 files changed, 9 insertions(+), 4 deletions(-) +Merging sound-current/for-linus (0b6f0ff01a4a ALSA: hda/tas2781: correct the register for pow calibrated data) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/pci/hda/patch_realtek.c | 2 ++ + sound/pci/hda/tas2781_hda_i2c.c | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging sound-asoc-fixes/for-linus (2e411e939da9 ASoC: cs35l56: Fixes to handling of ASP1 config) +$ 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. + Documentation/devicetree/bindings/sound/rt5645.txt | 6 + + drivers/base/regmap/regmap.c | 37 +++++++ + include/linux/regmap.h | 8 ++ + include/sound/cs35l56.h | 2 + + sound/pci/hda/cs35l56_hda.c | 4 + + sound/soc/amd/yc/acp6x-mach.c | 7 ++ + sound/soc/codecs/cs35l56-sdw.c | 2 - + sound/soc/codecs/cs35l56-shared.c | 83 +++++++++----- + sound/soc/codecs/cs35l56.c | 26 ++++- + sound/soc/codecs/rt5645.c | 25 +++++ + sound/soc/codecs/rt722-sdca.c | 27 +++-- + sound/soc/codecs/rt722-sdca.h | 3 + + sound/soc/intel/avs/icl.c | 2 +- + sound/soc/intel/boards/bytcr_rt5640.c | 24 ++-- + sound/soc/sof/debug.c | 18 +++ + sound/soc/sof/intel/pci-lnl.c | 3 + + sound/soc/sof/ipc3-pcm.c | 1 + + sound/soc/sof/ipc4-pcm.c | 121 ++++++++++++++------- + sound/soc/sof/pcm.c | 13 +-- + sound/soc/sof/sof-audio.h | 2 + + sound/soc/tegra/tegra186_dspk.c | 7 +- + 21 files changed, 320 insertions(+), 101 deletions(-) +Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3) +$ 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 (68adb581a39a regulator: vqmmc-ipq4019: fix module autoloading) +$ 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/irq_helpers.c | 3 +++ + drivers/regulator/mt6360-regulator.c | 32 ++++++++++++++++++----------- + drivers/regulator/qcom-refgen-regulator.c | 1 + + drivers/regulator/vqmmc-ipq4019-regulator.c | 1 + + 4 files changed, 25 insertions(+), 12 deletions(-) +Merging spi-fixes/for-linus (fec50db7033e Linux 6.9-rc3) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (302b84e84d10 Revert "PCI: Mark LSI FW643 to avoid bus reset") +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + CREDITS | 4 ++++ + MAINTAINERS | 1 - + drivers/pci/quirks.c | 8 -------- + 3 files changed, 4 insertions(+), 9 deletions(-) +Merging driver-core.current/driver-core-linus (156539fd6501 Documentation: embargoed-hardware-issues.rst: Add myself for Power) + 156539fd6501 ("Documentation: embargoed-hardware-issues.rst: Add myself for Power") +$ 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 +Merge made by the 'ort' strategy. + fs/sysfs/file.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging tty.current/tty-linus (1aa4ad4eb695 serial: core: Fix missing shutdown and startup for serial base port) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Auto-merging .mailmap +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 1 + + .../bindings/serial/atmel,at91-usart.yaml | 2 +- + MAINTAINERS | 2 +- + drivers/tty/serial/8250/8250_dw.c | 6 ++-- + drivers/tty/serial/8250/8250_lpc18xx.c | 2 +- + drivers/tty/serial/8250/8250_pci.c | 6 ---- + drivers/tty/serial/mxs-auart.c | 8 +++-- + drivers/tty/serial/pmac_zilog.c | 14 --------- + drivers/tty/serial/serial_base.h | 4 +++ + drivers/tty/serial/serial_core.c | 23 ++++++++++++--- + drivers/tty/serial/serial_port.c | 34 ++++++++++++++++++++++ + 11 files changed, 70 insertions(+), 32 deletions(-) +Merging usb.current/usb-linus (34b990e9bb54 usb: misc: onboard_usb_hub: Disable the USB hub clock on failure) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +-- + drivers/usb/core/port.c | 4 +++- + drivers/usb/dwc2/hcd_ddma.c | 4 +++- + drivers/usb/gadget/function/f_fs.c | 29 ++++++++++++++++------------- + drivers/usb/gadget/function/f_ncm.c | 4 ++-- + drivers/usb/gadget/udc/fsl_udc_core.c | 5 ++--- + drivers/usb/host/xhci-ring.c | 9 ++++----- + drivers/usb/host/xhci-trace.h | 12 +++++------- + drivers/usb/misc/onboard_usb_hub.c | 6 +++++- + drivers/usb/typec/mux/it5205.c | 2 +- + drivers/usb/typec/tcpm/tcpm.c | 4 ++-- + drivers/usb/typec/ucsi/ucsi.c | 6 ++++-- + 12 files changed, 48 insertions(+), 40 deletions(-) +Merging usb-serial-fixes/usb-linus (d206a76d7d27 Linux 6.8-rc6) +$ 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 (47b3e2f3914a phy: qcom: m31: match requested regulator name with dt schema) +$ 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/freescale/phy-fsl-imx8m-pcie.c | 6 ++-- + drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 9 +++--- + drivers/phy/qualcomm/phy-qcom-m31.c | 2 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 10 ++++-- + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 36 ++++++++++++++++++++-- + drivers/phy/rockchip/phy-rockchip-snps-pcie3.c | 31 ++++++++----------- + 6 files changed, 63 insertions(+), 31 deletions(-) +Merging staging.current/staging-linus (39cd87c4eb2b Linux 6.9-rc2) +$ 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 (74a72baf204f iio:imu: adis16475: Fix sync mode setting) +$ 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. + .../bindings/iio/health/maxim,max30102.yaml | 2 +- + drivers/iio/accel/mxc4005.c | 92 ++++++++++++++++++++-- + drivers/iio/imu/adis16475.c | 4 +- + drivers/iio/pressure/bmp280-core.c | 1 + + drivers/iio/pressure/bmp280-spi.c | 13 +-- + drivers/iio/pressure/bmp280.h | 1 + + 6 files changed, 95 insertions(+), 18 deletions(-) +Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-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 (ebaed6d4def8 peci: linux/peci.h: fix Excess kernel-doc description warning) +$ 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/accessibility/speakup/main.c | 2 +- + drivers/android/binder.c | 4 +- + drivers/comedi/drivers/vmk80xx.c | 35 ++++++--------- + drivers/interconnect/core.c | 8 ++++ + drivers/interconnect/qcom/x1e80100.c | 26 ----------- + drivers/misc/cardreader/rtsx_pcr.c | 2 +- + drivers/misc/mei/pci-me.c | 2 +- + drivers/misc/mei/platform-vsc.c | 17 +++++++- + drivers/misc/mei/vsc-tp.c | 84 +++++++++++++++++++++++++----------- + drivers/misc/mei/vsc-tp.h | 3 ++ + include/linux/peci.h | 1 - + 11 files changed, 104 insertions(+), 80 deletions(-) +Merging soundwire-fixes/fixes (63dc588e7af1 soundwire: amd: fix for wake interrupt handling for clockstop mode) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Merge made by the 'ort' strategy. + drivers/soundwire/amd_manager.c | 15 +++++++++++++++ + drivers/soundwire/amd_manager.h | 3 ++- + 2 files changed, 17 insertions(+), 1 deletion(-) +Merging thunderbolt-fixes/fixes (dcd12acaf384 thunderbolt: Avoid notify PM core about runtime PM resume) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Merge made by the 'ort' strategy. + drivers/thunderbolt/switch.c | 50 +++++++++++++++++++++++++++++++++++--------- + drivers/thunderbolt/tb.c | 10 +++++++-- + drivers/thunderbolt/tb.h | 3 ++- + drivers/thunderbolt/usb4.c | 13 ++++++------ + 4 files changed, 57 insertions(+), 19 deletions(-) +Merging input-current/for-linus (57ed9567e63b Merge branch 'next' into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case) +$ 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 (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart) +$ 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 (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Merge made by the 'ort' strategy. + tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc | 6 +++--- + tools/testing/selftests/kselftest_harness.h | 5 ++++- + 2 files changed, 7 insertions(+), 4 deletions(-) +Merging dmaengine-fixes/fixes (f221033f5c24 dmaengine: idxd: Fix oops during rmmod on single-CPU platforms) +$ 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/idma64.c | 4 ++++ + drivers/dma/idxd/cdev.c | 5 ++--- + drivers/dma/idxd/debugfs.c | 4 ++-- + drivers/dma/idxd/device.c | 8 ++++---- + drivers/dma/idxd/idxd.h | 2 +- + drivers/dma/idxd/init.c | 2 +- + drivers/dma/idxd/irq.c | 4 ++-- + drivers/dma/idxd/perfmon.c | 9 +++------ + drivers/dma/owl-dma.c | 4 ++-- + drivers/dma/pl330.c | 3 --- + drivers/dma/tegra186-gpc-dma.c | 3 +++ + drivers/dma/xilinx/xdma-regs.h | 3 +++ + drivers/dma/xilinx/xdma.c | 42 +++++++++++++++++++++++++-------------- + drivers/dma/xilinx/xilinx_dpdma.c | 13 +++++++++--- + 14 files changed, 64 insertions(+), 42 deletions(-) +Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-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 (21c9fb611c25 mtd: diskonchip: work around ubsan link failure) +$ 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/brcmnand/brcmnand.c | 2 +- + drivers/mtd/nand/raw/diskonchip.c | 4 ++-- + drivers/mtd/nand/raw/qcom_nandc.c | 7 +++---- + 3 files changed, 6 insertions(+), 7 deletions(-) +Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1) +$ 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 (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address) +$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (4370b673ccf2 MIPS: scall: Save thread_info.syscall unconditionally on entry) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Merge made by the 'ort' strategy. + arch/mips/include/asm/ptrace.h | 2 +- + arch/mips/kernel/asm-offsets.c | 1 + + arch/mips/kernel/ptrace.c | 15 ++++++--------- + arch/mips/kernel/scall32-o32.S | 23 +++++++++++++---------- + arch/mips/kernel/scall64-n32.S | 3 ++- + arch/mips/kernel/scall64-n64.S | 3 ++- + arch/mips/kernel/scall64-o32.S | 33 +++++++++++++++++---------------- + 7 files changed, 42 insertions(+), 38 deletions(-) +Merging at91-fixes/at91-fixes (4cece7649650 Linux 6.9-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 (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (49ff3b4aec51 KVM: x86/pmu: Do not mask LVTPC when handling a PMI on AMD platforms) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Auto-merging arch/x86/kvm/x86.c +Merge made by the 'ort' strategy. + arch/x86/include/asm/kvm_host.h | 1 + + arch/x86/kvm/cpuid.c | 1 + + arch/x86/kvm/cpuid.h | 10 ++++++++++ + arch/x86/kvm/lapic.c | 3 ++- + arch/x86/kvm/mmu/mmu.c | 2 +- + arch/x86/kvm/x86.c | 2 +- + 6 files changed, 16 insertions(+), 3 deletions(-) +Merging kvms390-fixes/master (83303a4c776c KVM: s390: fix cc for successful PQAP) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size) +$ 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 (7bcf809b1e78 cxl: Add checks to access_coordinate calculation to fail missing data) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Merge made by the 'ort' strategy. + drivers/cxl/acpi.c | 13 +--- + drivers/cxl/core/cdat.c | 154 ++++++++++++++++++++++--------------------- + drivers/cxl/core/mbox.c | 5 +- + drivers/cxl/core/port.c | 116 +++++++++++++++++++------------- + drivers/cxl/core/regs.c | 5 +- + drivers/cxl/cxl.h | 8 +-- + drivers/cxl/cxlmem.h | 2 +- + tools/testing/cxl/test/cxl.c | 10 +-- + 8 files changed, 166 insertions(+), 147 deletions(-) +Merging btrfs-fixes/next-fixes (07475cc36e03 Merge branch 'misc-6.9' 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. + fs/btrfs/extent-tree.c | 8 ++++++++ + fs/btrfs/extent_io.c | 21 ++++++--------------- + 2 files changed, 14 insertions(+), 15 deletions(-) +Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Merge made by the 'ort' strategy. + drivers/infiniband/hw/qib/qib_fs.c | 1 + + 1 file changed, 1 insertion(+) +Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages) +$ 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 (e71c84816925 platform/x86: lg-laptop: fix %s null argument warning) +$ 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 +Already up to date. +Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-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 (de164a7f1924 nios2: Only use built-in devicetree blob if configured to do so) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-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 (ca91259b775f scsi: core: Fix handling of SCMD_FAIL_IF_RECOVERING) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/scsi/scsi_lib.c | 7 +++---- + drivers/ufs/host/ufs-qcom.c | 8 +++++++- + 2 files changed, 10 insertions(+), 5 deletions(-) +Merging drm-fixes/drm-fixes (1bafeaf26264 Merge tag 'drm-xe-fixes-2024-04-11' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Merge made by the 'ort' strategy. + drivers/accel/ivpu/ivpu_drv.c | 40 +-- + drivers/accel/ivpu/ivpu_drv.h | 3 +- + drivers/accel/ivpu/ivpu_hw.h | 6 + + drivers/accel/ivpu/ivpu_hw_37xx.c | 11 +- + drivers/accel/ivpu/ivpu_hw_40xx.c | 6 + + drivers/accel/ivpu/ivpu_ipc.c | 8 +- + drivers/accel/ivpu/ivpu_mmu.c | 8 +- + drivers/accel/ivpu/ivpu_pm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 1 + + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 15 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 16 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 32 +- + drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 17 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 31 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 6 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 19 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 50 +++ + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 9 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 8 +- + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 3 - + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 27 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 + + .../pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0_0.h | 33 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v14_0_0_pmfw.h | 55 +++- + .../amd/pm/swsmu/inc/pmfw_if/smu_v14_0_0_ppsmc.h | 18 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 1 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 12 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 347 +++++++++++++++++++-- + drivers/gpu/drm/ast/ast_dp.c | 3 + + drivers/gpu/drm/drm_client_modeset.c | 3 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 42 ++- + drivers/gpu/drm/i915/display/intel_cdclk.h | 3 + + drivers/gpu/drm/i915/display/intel_ddi.c | 5 + + drivers/gpu/drm/i915/display/intel_dp.c | 6 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 5 +- + drivers/gpu/drm/i915/display/intel_psr.c | 11 + + drivers/gpu/drm/i915/display/intel_vrr.c | 7 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 23 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 4 + + .../gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 13 +- + drivers/gpu/drm/qxl/qxl_release.c | 50 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 11 +- + drivers/gpu/drm/xe/display/xe_display.c | 5 - + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 2 +- + drivers/gpu/drm/xe/xe_hwmon.c | 4 +- + drivers/gpu/drm/xe/xe_lrc.c | 5 +- + drivers/gpu/drm/xe/xe_migrate.c | 8 +- + drivers/gpu/host1x/bus.c | 8 - + include/linux/dma-fence.h | 7 + + 63 files changed, 866 insertions(+), 245 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (dcd8992e47f1 drm/i915/vrr: Disable VRR when using bigjoiner) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (ace323f80b9b mmc: sdhci-of-dwcmshc: th1520: Increase tuning loop count to 128) +$ 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 +++++++++++++++- + drivers/mmc/host/sdhci-of-dwcmshc.c | 1 + + 2 files changed, 16 insertions(+), 1 deletion(-) +Merging rtc-fixes/rtc-fixes (4cece7649650 Linux 6.9-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 (54be6c6c5ae8 Linux 6.8-rc3) +$ 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 (30d18df6567b Drivers: hv: vmbus: Don't free ring buffers that couldn't be re-encrypted) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging include/asm-generic/hyperv-tlfs.h +Auto-merging include/asm-generic/mshyperv.h +Merge made by the 'ort' strategy. + arch/x86/hyperv/hv_apic.c | 16 +-- + arch/x86/hyperv/hv_proc.c | 22 +--- + drivers/hv/channel.c | 29 ++++- + drivers/hv/connection.c | 29 +++-- + drivers/hv/vmbus_drv.c | 94 ++++++++--------- + drivers/net/hyperv/netvsc.c | 7 +- + drivers/uio/uio_hv_generic.c | 12 ++- + include/asm-generic/hyperv-tlfs.h | 19 ++-- + include/asm-generic/mshyperv.h | 14 +++ + include/linux/hyperv.h | 1 + + tools/hv/hv_kvp_daemon.c | 215 ++++++++++++++++++++++++++++++-------- + 11 files changed, 308 insertions(+), 150 deletions(-) +Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (a373a36fb6b0 Merge patch the fixes from "riscv: 64-bit NOMMU fixes and enhancements") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'ort' strategy. + arch/riscv/include/asm/page.h | 2 +- + arch/riscv/include/asm/pgtable.h | 2 +- + arch/riscv/mm/init.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging riscv-dt-fixes/riscv-dt-fixes (0f74c64f0a9f riscv: dts: starfive: Remove PMIC interrupt info for Visionfive 2 board) +$ 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-starfive-visionfive-2.dtsi | 1 - + 1 file changed, 1 deletion(-) +Merging riscv-soc-fixes/riscv-soc-fixes (6b0856ee585d cache: sifive_ccache: Silence unused variable warning) +$ 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/cache/sifive_ccache.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fpga-fixes/fixes (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-rc1) +$ 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 (e43c2feb8f32 Merge tag 'intel-gpio-v6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel into gpio/for-current) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpio/gpio-crystalcove.c | 2 +- + drivers/gpio/gpio-wcove.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging gpio-intel-fixes/fixes (ace0ebe5c98d gpio: crystalcove: Use -ENOTSUPP consistently) +$ 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 (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 78 +++++++++++++++++--------------- + drivers/pinctrl/intel/pinctrl-intel.h | 4 ++ + 2 files changed, 45 insertions(+), 37 deletions(-) +Merging auxdisplay-fixes/fixes (4cece7649650 Linux 6.9-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 erofs-fixes/fixes (7557d296ad43 MAINTAINERS: erofs: add myself as reviewer) +$ 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 kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests) +$ 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 (592447f6cb3c memblock tests: fix undefined reference to `BIT') +$ 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 nfsd-fixes/nfsd-fixes (f488138b5267 NFSD: fix endianness issue in nfsd4_encode_fattr4) +$ 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/nfs4xdr.c | 47 +++++++++++++++++++++---------------------- + include/trace/events/rpcgss.h | 4 ++-- + 2 files changed, 25 insertions(+), 26 deletions(-) +Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf-tools (25e973a0e077 perf annotate: Make sure to call symbol__annotate2() in TUI) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Merge made by the 'ort' strategy. + tools/perf/ui/browsers/annotate.c | 2 +- + tools/perf/util/annotate.c | 3 +++ + tools/perf/util/bpf_skel/lock_contention.bpf.c | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging efi-fixes/urgent (decd347c2a75 x86/efistub: Reinstate soft limit for initrd loading) +$ 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 (452d8950db3e power: rt9455: hide unused rt9455_boost_voltage_values) +$ 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/rt9455_charger.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (39cd87c4eb2b Linux 6.9-rc2) +$ 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 (761a8f0a776b rust: make mutually exclusive with CFI_CLANG) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Merge made by the 'ort' strategy. + Documentation/rust/arch-support.rst | 2 +- + init/Kconfig | 2 +- + rust/kernel/init.rs | 11 +- + rust/macros/module.rs | 206 +++++++++++++++++++++--------------- + 4 files changed, 134 insertions(+), 87 deletions(-) +Merging v9fs-fixes/fixes/next (7a84602297d3 9p: explicitly deny setlease attempts) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Merge made by the 'ort' strategy. + fs/9p/fid.h | 3 --- + fs/9p/vfs_file.c | 2 ++ + fs/9p/vfs_inode.c | 5 ++++- + 3 files changed, 6 insertions(+), 4 deletions(-) +Merging w1-fixes/fixes (4cece7649650 Linux 6.9-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 (39cd87c4eb2b Linux 6.9-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area()) +$ 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 i2c-host-fixes/i2c/i2c-host-fixes (fec50db7033e Linux 6.9-rc3) +$ 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 +Already up to date. +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 (d3e8a91a848a clk: mediatek: mt7988-infracfg: fix clocks for 2nd PCIe port) +$ 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/clk.c | 173 ++++++++++++++++++++++------- + drivers/clk/mediatek/clk-mt7988-infracfg.c | 2 +- + drivers/clk/mediatek/clk-mtk.c | 15 +++ + include/linux/clk.h | 5 + + 4 files changed, 156 insertions(+), 39 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (4c08f01934ab drm/vmwgfx: Enable DMA mappings with SEV) +$ 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 (4e2e36129225 Merge branch 'master' into mm-stable) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Merge made by the 'ort' strategy. +Merging mm-nonmm-stable/mm-nonmm-stable (39cd87c4eb2b Linux 6.9-rc2) +$ 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 (ed7c95c95397 Merge branch 'mm-nonmm-unstable' into mm-everything) + 925cc828a1ef ("fix-missing-vmalloch-includes-fix-3") +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/loongarch/include/asm/kfence.h +Auto-merging arch/loongarch/mm/mmap.c +Auto-merging arch/powerpc/kernel/iommu.c +Auto-merging arch/riscv/Makefile +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/s390/mm/fault.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/mm/numa_32.c +CONFLICT (content): Merge conflict in arch/x86/mm/numa_32.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/gfp_types.h +Auto-merging include/linux/mm.h +Auto-merging init/Kconfig +Auto-merging init/main.c +Auto-merging io_uring/io_uring.c +Auto-merging kernel/bpf/syscall.c +Auto-merging lib/Kconfig.debug +Auto-merging scripts/kernel-doc +Resolved 'arch/x86/mm/numa_32.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 18d2bace0450] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/blockdev/zram.rst | 5 + + Documentation/admin-guide/cgroup-v1/memory.rst | 8 +- + Documentation/admin-guide/cgroup-v2.rst | 18 +- + Documentation/admin-guide/kdump/kdump.rst | 8 +- + Documentation/admin-guide/kernel-parameters.txt | 6 + + Documentation/admin-guide/mm/hugetlbpage.rst | 7 + + Documentation/admin-guide/sysctl/vm.rst | 16 + + Documentation/core-api/floating-point.rst | 78 ++ + Documentation/core-api/index.rst | 1 + + Documentation/filesystems/proc.rst | 29 + + Documentation/mm/allocation-profiling.rst | 100 +++ + Documentation/mm/index.rst | 1 + + Documentation/mm/transhuge.rst | 12 +- + Documentation/mm/vmemmap_dedup.rst | 22 +- + .../translations/zh_CN/core-api/cachetlb.rst | 2 +- + MAINTAINERS | 17 + + Makefile | 5 + + arch/Kconfig | 6 + + arch/alpha/kernel/osf_sys.c | 5 +- + arch/alpha/kernel/pci_iommu.c | 2 +- + arch/alpha/lib/checksum.c | 1 + + arch/alpha/lib/fpreg.c | 1 + + arch/arc/include/asm/mmu-arcv2.h | 2 + + arch/arc/mm/mmap.c | 4 +- + arch/arm/Kconfig | 3 +- + arch/arm/Makefile | 7 + + arch/arm/include/asm/fpu.h | 15 + + arch/arm/include/asm/hugetlb.h | 6 +- + arch/arm/include/asm/pgtable-2level.h | 5 +- + arch/arm/include/asm/pgtable-3level-hwdef.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 5 +- + arch/arm/kernel/irq.c | 1 + + arch/arm/kernel/traps.c | 1 + + arch/arm/lib/Makefile | 3 +- + arch/arm/lib/uaccess_with_memcpy.c | 4 +- + arch/arm/mm/Makefile | 1 - + arch/arm/mm/fault.c | 4 +- + arch/arm/mm/hugetlbpage.c | 34 - + arch/arm/mm/mmap.c | 5 +- + arch/arm64/Kconfig | 3 +- + arch/arm64/Makefile | 9 +- + arch/arm64/include/asm/fpu.h | 15 + + arch/arm64/include/asm/hugetlb.h | 6 +- + arch/arm64/include/asm/pgtable.h | 80 +- + arch/arm64/kernel/efi.c | 1 + + arch/arm64/lib/Makefile | 6 +- + arch/arm64/mm/contpte.c | 15 + + arch/arm64/mm/fault.c | 31 +- + arch/arm64/mm/hugetlbpage.c | 18 +- + arch/arm64/mm/mteswap.c | 45 ++ + arch/csky/abiv1/mmap.c | 12 +- + arch/loongarch/Kconfig | 5 +- + arch/loongarch/Makefile | 5 +- + .../include/asm/{crash_core.h => crash_reserve.h} | 4 +- + arch/loongarch/include/asm/fpu.h | 1 + + arch/loongarch/include/asm/kfence.h | 1 + + arch/loongarch/mm/hugetlbpage.c | 12 +- + arch/loongarch/mm/mmap.c | 3 +- + arch/mips/Kconfig | 2 +- + arch/mips/include/asm/pgtable-32.h | 2 +- + arch/mips/include/asm/pgtable-64.h | 2 +- + arch/mips/jazz/jazzdma.c | 2 +- + arch/mips/mm/hugetlbpage.c | 10 - + arch/mips/mm/mmap.c | 3 +- + arch/mips/mm/tlb-r4k.c | 2 +- + arch/parisc/kernel/sys_parisc.c | 6 +- + arch/parisc/mm/hugetlbpage.c | 11 - + arch/powerpc/Kconfig | 3 +- + arch/powerpc/Makefile | 5 +- + arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 20 - + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 25 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 27 +- + arch/powerpc/include/asm/fpu.h | 28 + + arch/powerpc/include/asm/mmu.h | 4 - + arch/powerpc/include/asm/nohash/pgtable.h | 10 - + arch/powerpc/kernel/dma-iommu.c | 2 +- + arch/powerpc/kernel/fadump.c | 5 - + arch/powerpc/kernel/iommu.c | 1 + + arch/powerpc/mm/book3s64/slice.c | 20 +- + arch/powerpc/mm/fault.c | 33 +- + arch/powerpc/mm/mem.c | 1 + + arch/powerpc/mm/pgtable_64.c | 6 +- + arch/powerpc/platforms/ps3/system-bus.c | 4 +- + arch/powerpc/platforms/pseries/vio.c | 2 +- + arch/riscv/Kconfig | 3 +- + arch/riscv/Makefile | 3 + + arch/riscv/include/asm/fpu.h | 16 + + arch/riscv/include/asm/hugetlb.h | 6 +- + arch/riscv/include/asm/pgtable.h | 1 + + arch/riscv/kernel/Makefile | 1 + + arch/riscv/kernel/elf_kexec.c | 1 + + arch/riscv/kernel/kernel_mode_fpu.c | 28 + + arch/riscv/kernel/probes/kprobes.c | 1 + + arch/riscv/mm/fault.c | 5 +- + arch/riscv/mm/hugetlbpage.c | 10 - + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/gmap.h | 2 +- + arch/s390/include/asm/hugetlb.h | 6 +- + arch/s390/include/asm/mmu.h | 5 + + arch/s390/include/asm/mmu_context.h | 1 + + arch/s390/include/asm/pgtable.h | 16 +- + arch/s390/kernel/cert_store.c | 1 + + arch/s390/kernel/ipl.c | 1 + + arch/s390/kvm/kvm-s390.c | 4 +- + arch/s390/mm/fault.c | 3 +- + arch/s390/mm/gmap.c | 163 +++- + arch/s390/mm/hugetlbpage.c | 19 +- + arch/s390/mm/mmap.c | 9 +- + arch/s390/pci/pci_mmio.c | 4 +- + arch/sh/Kconfig | 2 +- + arch/sh/include/asm/hugetlb.h | 6 +- + arch/sh/mm/cache-sh4.c | 5 +- + arch/sh/mm/cache.c | 2 +- + arch/sh/mm/hugetlbpage.c | 10 - + arch/sh/mm/mmap.c | 5 +- + arch/sparc/include/asm/pgtable_64.h | 3 +- + arch/sparc/kernel/sys_sparc_32.c | 3 +- + arch/sparc/kernel/sys_sparc_64.c | 20 +- + arch/sparc/mm/hugetlbpage.c | 21 +- + arch/sparc/mm/tlb.c | 6 +- + arch/um/include/shared/um_malloc.h | 3 +- + arch/x86/Kconfig | 3 +- + arch/x86/Makefile | 20 + + arch/x86/include/asm/fpu.h | 13 + + arch/x86/include/asm/fpu/types.h | 6 +- + arch/x86/include/asm/io.h | 1 + + arch/x86/include/asm/pgtable.h | 2 +- + arch/x86/include/asm/pgtable_64.h | 1 + + arch/x86/kernel/amd_gart_64.c | 2 +- + arch/x86/kernel/cpu/sgx/driver.c | 2 +- + arch/x86/kernel/cpu/sgx/main.c | 1 + + arch/x86/kernel/irq_64.c | 1 + + arch/x86/kernel/setup.c | 2 - + arch/x86/kernel/sys_x86_64.c | 42 +- + arch/x86/lib/copy_mc.c | 21 +- + arch/x86/mm/fault.c | 24 +- + arch/x86/mm/hugetlbpage.c | 35 +- + arch/x86/mm/init.c | 47 -- + arch/x86/mm/mmap.c | 4 +- + arch/x86/mm/numa_32.c | 1 + + arch/x86/mm/pat/memtype.c | 26 +- + arch/x86/mm/pgtable.c | 4 +- + arch/xtensa/mm/cache.c | 6 +- + arch/xtensa/mm/tlb.c | 11 +- + block/partitions/ldm.c | 6 +- + drivers/accel/ivpu/ivpu_mmu_context.c | 1 + + drivers/block/zram/zram_drv.c | 31 +- + drivers/char/mem.c | 2 +- + drivers/dax/device.c | 6 +- + drivers/dax/kmem.c | 30 +- + drivers/gpu/drm/amd/display/Kconfig | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 35 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 36 +- + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 36 +- + drivers/gpu/drm/gma500/mmu.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 1 + + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 1 + + drivers/gpu/drm/i915/gt/shmem_utils.c | 1 + + drivers/gpu/drm/i915/gvt/firmware.c | 1 + + drivers/gpu/drm/i915/gvt/gtt.c | 1 + + drivers/gpu/drm/i915/gvt/handlers.c | 1 + + drivers/gpu/drm/i915/gvt/mmio.c | 1 + + drivers/gpu/drm/i915/gvt/vgpu.c | 1 + + drivers/gpu/drm/i915/intel_gvt.c | 1 + + drivers/gpu/drm/imagination/pvr_vm_mips.c | 1 + + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 1 + + drivers/gpu/drm/omapdrm/omap_gem.c | 1 + + drivers/gpu/drm/v3d/v3d_bo.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 1 + + drivers/gpu/drm/xen/xen_drm_front_gem.c | 1 + + drivers/hwtracing/coresight/coresight-trbe.c | 1 + + drivers/iommu/dma-iommu.c | 2 +- + .../ethernet/marvell/octeon_ep/octep_pfvf_mbox.c | 1 + + .../ethernet/marvell/octeon_ep_vf/octep_vf_mbox.c | 1 + + drivers/net/ethernet/microsoft/mana/hw_channel.c | 1 + + drivers/parisc/ccio-dma.c | 2 +- + drivers/parisc/sba_iommu.c | 2 +- + drivers/platform/x86/uv_sysfs.c | 1 + + drivers/scsi/mpi3mr/mpi3mr_transport.c | 2 + + drivers/staging/media/atomisp/pci/hmm/hmm.c | 2 +- + drivers/vfio/pci/pds/dirty.c | 1 + + drivers/vfio/vfio_iommu_type1.c | 4 +- + drivers/virt/acrn/mm.c | 61 +- + drivers/virtio/virtio_mem.c | 1 + + drivers/xen/grant-dma-ops.c | 2 +- + drivers/xen/swiotlb-xen.c | 2 +- + fs/binfmt_elf.c | 2 +- + fs/dax.c | 14 +- + fs/exec.c | 11 + + fs/fat/dir.c | 12 + + fs/hugetlbfs/inode.c | 11 +- + fs/nilfs2/btree.c | 23 +- + fs/nilfs2/gcinode.c | 1 + + fs/nilfs2/recovery.c | 1 + + fs/ocfs2/aops.c | 2 - + fs/ocfs2/dlm/dlmdomain.c | 11 +- + fs/ocfs2/export.c | 12 +- + fs/ocfs2/file.c | 2 + + fs/ocfs2/inode.c | 2 + + fs/ocfs2/ioctl.c | 1 + + fs/ocfs2/localalloc.c | 34 +- + fs/ocfs2/move_extents.c | 2 +- + fs/ocfs2/namei.c | 4 +- + fs/ocfs2/ocfs2_fs.h | 3 +- + fs/ocfs2/refcounttree.c | 2 +- + fs/ocfs2/reservations.c | 2 +- + fs/ocfs2/resize.c | 8 + + fs/ocfs2/suballoc.c | 117 ++- + fs/ocfs2/suballoc.h | 6 +- + fs/proc/inode.c | 10 +- + fs/proc/meminfo.c | 3 +- + fs/proc/page.c | 80 +- + fs/proc/task_mmu.c | 69 +- + fs/proc/vmcore.c | 5 +- + fs/ramfs/file-mmu.c | 2 +- + fs/squashfs/namei.c | 14 +- + fs/userfaultfd.c | 5 +- + include/asm-generic/codetag.lds.h | 14 + + include/asm-generic/io.h | 2 +- + include/asm-generic/vmlinux.lds.h | 3 + + include/linux/alloc_tag.h | 216 +++++ + include/linux/codetag.h | 81 ++ + include/linux/dma-map-ops.h | 2 +- + include/linux/fortify-string.h | 5 +- + include/linux/fpu.h | 12 + + include/linux/fs.h | 6 +- + include/linux/gfp.h | 130 +-- + include/linux/gfp_types.h | 11 + + include/linux/huge_mm.h | 100 +-- + include/linux/hugetlb.h | 81 +- + include/linux/instrumented.h | 35 + + include/linux/io.h | 1 + + include/linux/kexec.h | 6 +- + include/linux/kmsan-checks.h | 15 + + include/linux/ksm.h | 21 +- + include/linux/memcontrol.h | 59 +- + include/linux/memory-tiers.h | 13 + + include/linux/mempolicy.h | 5 +- + include/linux/mempool.h | 73 +- + include/linux/mm.h | 200 +++-- + include/linux/mm_types.h | 21 +- + include/linux/mmap_lock.h | 10 +- + include/linux/page-flags.h | 198 +++-- + include/linux/page-isolation.h | 5 +- + include/linux/page_ext.h | 5 +- + include/linux/page_idle.h | 68 +- + include/linux/pageblock-flags.h | 8 +- + include/linux/pagemap.h | 15 +- + include/linux/pds/pds_common.h | 2 + + include/linux/percpu.h | 27 +- + include/linux/pgalloc_tag.h | 132 +++ + include/linux/pgtable.h | 139 +++- + include/linux/rhashtable-types.h | 11 +- + include/linux/rmap.h | 48 +- + include/linux/sched.h | 24 + + include/linux/sched/coredump.h | 5 +- + include/linux/sched/mm.h | 22 + + include/linux/secretmem.h | 21 +- + include/linux/slab.h | 181 +++-- + include/linux/string.h | 4 +- + include/linux/swap.h | 45 +- + include/linux/vmalloc.h | 62 +- + include/linux/vmstat.h | 8 - + include/linux/xarray.h | 6 + + include/linux/zpool.h | 4 +- + include/linux/zswap.h | 2 +- + include/rdma/rdmavt_qp.h | 1 + + include/trace/events/fs_dax.h | 16 +- + include/trace/events/huge_memory.h | 12 +- + include/trace/events/mmflags.h | 3 +- + include/trace/events/page_ref.h | 4 +- + init/Kconfig | 4 + + init/do_mounts_initrd.c | 1 - + init/main.c | 26 +- + io_uring/io_uring.c | 2 +- + ipc/ipc_sysctl.c | 1 - + ipc/mq_sysctl.c | 1 - + kernel/bpf/arena.c | 2 +- + kernel/bpf/memalloc.c | 6 +- + kernel/bpf/syscall.c | 2 +- + kernel/dma/mapping.c | 4 +- + kernel/events/core.c | 4 +- + kernel/fork.c | 2 +- + kernel/kallsyms_selftest.c | 2 +- + kernel/kcov.c | 3 +- + kernel/module/main.c | 29 +- + kernel/regset.c | 6 +- + kernel/trace/blktrace.c | 3 +- + kernel/vmcore_info.c | 8 +- + lib/Kconfig.debug | 33 +- + lib/Kconfig.kgdb | 1 + + lib/Makefile | 29 +- + lib/alloc_tag.c | 246 ++++++ + lib/build_OID_registry | 5 +- + lib/codetag.c | 283 +++++++ + lib/devres.c | 26 +- + lib/raid6/Makefile | 33 +- + lib/rhashtable.c | 22 +- + lib/test_fpu.h | 8 + + lib/{test_fpu.c => test_fpu_glue.c} | 37 +- + lib/test_fpu_impl.c | 37 + + lib/test_hexdump.c | 2 +- + lib/test_hmm.c | 8 +- + lib/test_xarray.c | 89 +++ + lib/xarray.c | 53 +- + mm/Kconfig | 8 +- + mm/Makefile | 1 + + mm/backing-dev.c | 23 +- + mm/cma.c | 4 - + mm/compaction.c | 8 +- + mm/debug.c | 25 +- + mm/debug_page_alloc.c | 12 +- + mm/debug_vm_pgtable.c | 1 + + mm/filemap.c | 101 ++- + mm/folio-compat.c | 6 - + mm/gup.c | 779 +++++++++++------- + mm/hmm.c | 9 +- + mm/huge_memory.c | 356 ++++----- + mm/hugetlb.c | 403 ++++------ + mm/hugetlb_vmemmap.c | 1 - + mm/internal.h | 209 +++-- + mm/kasan/hw_tags.c | 1 + + mm/kfence/core.c | 14 +- + mm/kfence/kfence.h | 4 +- + mm/khugepaged.c | 297 ++++--- + mm/kmemleak.c | 2 +- + mm/kmsan/hooks.c | 11 + + mm/madvise.c | 232 +++--- + mm/memcontrol.c | 232 ++++-- + mm/memory-failure.c | 17 +- + mm/memory-tiers.c | 123 ++- + mm/memory.c | 299 ++++--- + mm/memory_hotplug.c | 1 + + mm/mempolicy.c | 104 ++- + mm/mempool.c | 36 +- + mm/memremap.c | 30 +- + mm/migrate.c | 39 +- + mm/migrate_device.c | 28 +- + mm/mlock.c | 2 +- + mm/mm_init.c | 216 +++-- + mm/mmap.c | 233 +++--- + mm/mprotect.c | 3 +- + mm/mremap.c | 2 +- + mm/nommu.c | 77 +- + mm/oom_kill.c | 1 - + mm/page-writeback.c | 1 - + mm/page_alloc.c | 882 ++++++++++++--------- + mm/page_ext.c | 15 +- + mm/page_io.c | 8 +- + mm/page_isolation.c | 121 +-- + mm/page_owner.c | 2 +- + mm/page_vma_mapped.c | 4 +- + mm/percpu-internal.h | 26 +- + mm/percpu-vm.c | 4 +- + mm/percpu.c | 118 ++- + mm/readahead.c | 8 +- + mm/rmap.c | 78 +- + mm/shmem.c | 13 +- + mm/show_mem.c | 26 + + mm/slab.h | 62 +- + mm/slab_common.c | 6 +- + mm/slub.c | 496 +++++++----- + mm/sparse.c | 26 +- + mm/swap.c | 48 +- + mm/swap_slots.c | 8 +- + mm/swap_state.c | 10 +- + mm/swapfile.c | 408 ++++++---- + mm/truncate.c | 36 +- + mm/userfaultfd.c | 39 +- + mm/util.c | 40 +- + mm/vmalloc.c | 128 ++- + mm/vmscan.c | 77 +- + mm/z3fold.c | 10 +- + mm/zbud.c | 10 +- + mm/zpool.c | 10 +- + mm/zsmalloc.c | 6 +- + mm/zswap.c | 305 +++---- + rust/helpers.c | 8 + + scripts/kallsyms.c | 13 + + scripts/kernel-doc | 1 + + scripts/module.lds.S | 7 + + security/Kconfig.hardening | 15 + + sound/pci/hda/cs35l41_hda.c | 1 + + tools/cgroup/memcg_slabinfo.py | 5 +- + tools/include/uapi/linux/memfd.h | 39 + + tools/include/uapi/linux/userfaultfd.h | 386 +++++++++ + tools/testing/selftests/lib.mk | 9 + + tools/testing/selftests/mm/Makefile | 2 +- + tools/testing/selftests/mm/ksm_functional_tests.c | 135 +++- + tools/testing/selftests/mm/memfd_secret.c | 51 +- + tools/testing/selftests/mm/mlock2-tests.c | 15 +- + tools/testing/selftests/mm/mremap_test.c | 202 +++-- + tools/testing/selftests/mm/run_vmtests.sh | 13 +- + tools/testing/selftests/mm/virtual_address_range.c | 78 +- + tools/testing/selftests/x86/test_shadow_stack.c | 67 +- + virt/kvm/kvm_main.c | 4 +- + 401 files changed, 8668 insertions(+), 4976 deletions(-) + create mode 100644 Documentation/core-api/floating-point.rst + create mode 100644 Documentation/mm/allocation-profiling.rst + create mode 100644 arch/arm/include/asm/fpu.h + delete mode 100644 arch/arm/mm/hugetlbpage.c + create mode 100644 arch/arm64/include/asm/fpu.h + rename arch/loongarch/include/asm/{crash_core.h => crash_reserve.h} (75%) + create mode 100644 arch/powerpc/include/asm/fpu.h + create mode 100644 arch/riscv/include/asm/fpu.h + create mode 100644 arch/riscv/kernel/kernel_mode_fpu.c + create mode 100644 arch/x86/include/asm/fpu.h + create mode 100644 include/asm-generic/codetag.lds.h + create mode 100644 include/linux/alloc_tag.h + create mode 100644 include/linux/codetag.h + create mode 100644 include/linux/fpu.h + create mode 100644 include/linux/pgalloc_tag.h + create mode 100644 lib/alloc_tag.c + create mode 100644 lib/codetag.c + create mode 100644 lib/test_fpu.h + rename lib/{test_fpu.c => test_fpu_glue.c} (71%) + create mode 100644 lib/test_fpu_impl.c + create mode 100644 tools/include/uapi/linux/memfd.h + create mode 100644 tools/include/uapi/linux/userfaultfd.h +$ git am -3 ../patches/0001-fix-up-for-mm-add-per-order-mTHP-anon_alloc-and-anon.patch +Applying: fix up for ""mm: add per-order mTHP anon_alloc and anon_alloc_fallback counters" +$ git reset HEAD^ +Unstaged changes after reset: +M mm/memory.c +$ git add -A . +$ git commit -v -a --amend +[master fdcf978dc589] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Fri Apr 12 08:44:49 2024 +1000 +Merging kbuild/for-next (bfa8f18691ed Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Already up to date. +Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4'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 (9c3e9af74326 perf metrics: Remove the "No_group" metric group) +$ 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 +Auto-merging MAINTAINERS +Auto-merging tools/perf/ui/browsers/annotate.c +Auto-merging tools/perf/util/annotate.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + tools/include/uapi/asm-generic/fcntl.h | 221 -- + tools/include/uapi/linux/openat2.h | 43 - + tools/lib/perf/cpumap.c | 33 +- + tools/lib/perf/include/perf/cpumap.h | 16 + + tools/lib/perf/libperf.map | 4 + + tools/lib/subcmd/run-command.c | 70 +- + tools/lib/subcmd/run-command.h | 3 + + tools/perf/Documentation/perf-arm-spe.txt | 12 +- + tools/perf/Documentation/perf-script.txt | 7 +- + tools/perf/Makefile.config | 20 +- + tools/perf/Makefile.perf | 100 +- + tools/perf/arch/arm/util/cs-etm.c | 120 +- + tools/perf/arch/arm64/util/arm-spe.c | 4 +- + tools/perf/arch/arm64/util/header.c | 13 +- + tools/perf/arch/x86/util/intel-bts.c | 4 +- + tools/perf/arch/x86/util/intel-pt.c | 10 +- + tools/perf/builtin-annotate.c | 47 +- + tools/perf/builtin-c2c.c | 8 +- + tools/perf/builtin-kmem.c | 2 +- + tools/perf/builtin-list.c | 21 +- + tools/perf/builtin-record.c | 4 +- + tools/perf/builtin-sched.c | 11 +- + tools/perf/builtin-script.c | 66 +- + tools/perf/builtin-stat.c | 31 +- + tools/perf/builtin-trace.c | 28 +- + tools/perf/builtin.h | 4 +- + tools/perf/check-headers.sh | 23 +- + tools/perf/perf.c | 23 +- + .../pmu-events/arch/s390/cf_z16/transaction.json | 28 +- + tools/perf/pmu-events/arch/s390/mapfile.csv | 2 +- + .../arch/x86/broadwellx/bdx-metrics.json | 35 +- + .../arch/x86/cascadelakex/clx-metrics.json | 85 +- + .../pmu-events/arch/x86/cascadelakex/frontend.json | 10 +- + .../pmu-events/arch/x86/cascadelakex/memory.json | 2 +- + .../pmu-events/arch/x86/cascadelakex/other.json | 2 +- + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 2 +- + .../arch/x86/cascadelakex/uncore-interconnect.json | 14 +- + .../arch/x86/cascadelakex/virtual-memory.json | 2 +- + .../arch/x86/emeraldrapids/frontend.json | 2 +- + .../pmu-events/arch/x86/emeraldrapids/memory.json | 1 + + .../arch/x86/emeraldrapids/pipeline.json | 3 + + .../arch/x86/emeraldrapids/uncore-cache.json | 112 +- + .../x86/emeraldrapids/uncore-interconnect.json | 26 +- + .../pmu-events/arch/x86/grandridge/pipeline.json | 43 +- + .../arch/x86/grandridge/uncore-cache.json | 28 +- + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 35 +- + .../pmu-events/arch/x86/icelakex/frontend.json | 2 +- + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 95 +- + .../perf/pmu-events/arch/x86/icelakex/memory.json | 1 + + .../pmu-events/arch/x86/icelakex/uncore-cache.json | 22 +- + .../arch/x86/icelakex/uncore-interconnect.json | 64 +- + .../pmu-events/arch/x86/icelakex/uncore-io.json | 11 - + .../perf/pmu-events/arch/x86/lunarlake/cache.json | 24 +- + .../pmu-events/arch/x86/lunarlake/frontend.json | 2 +- + .../perf/pmu-events/arch/x86/lunarlake/memory.json | 4 +- + .../perf/pmu-events/arch/x86/lunarlake/other.json | 4 +- + .../pmu-events/arch/x86/lunarlake/pipeline.json | 109 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 20 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 30 + + .../pmu-events/arch/x86/meteorlake/frontend.json | 4 +- + .../pmu-events/arch/x86/meteorlake/memory.json | 20 + + .../perf/pmu-events/arch/x86/meteorlake/other.json | 42 +- + .../pmu-events/arch/x86/meteorlake/pipeline.json | 44 +- + .../arch/x86/meteorlake/uncore-interconnect.json | 22 +- + .../pmu-events/arch/x86/sapphirerapids/cache.json | 1 + + .../arch/x86/sapphirerapids/frontend.json | 2 +- + .../pmu-events/arch/x86/sapphirerapids/memory.json | 1 + + .../arch/x86/sapphirerapids/pipeline.json | 19 +- + .../arch/x86/sapphirerapids/spr-metrics.json | 119 +- + .../arch/x86/sapphirerapids/uncore-cache.json | 112 +- + .../x86/sapphirerapids/uncore-interconnect.json | 26 +- + .../pmu-events/arch/x86/sierraforest/pipeline.json | 36 +- + .../perf/pmu-events/arch/x86/skylake/frontend.json | 10 +- + tools/perf/pmu-events/arch/x86/skylakex/cache.json | 9 + + .../pmu-events/arch/x86/skylakex/frontend.json | 10 +- + .../perf/pmu-events/arch/x86/skylakex/memory.json | 2 +- + tools/perf/pmu-events/arch/x86/skylakex/other.json | 2 +- + .../pmu-events/arch/x86/skylakex/pipeline.json | 2 +- + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 85 +- + .../arch/x86/skylakex/uncore-interconnect.json | 14 +- + .../pmu-events/arch/x86/skylakex/uncore-io.json | 2 +- + .../arch/x86/skylakex/virtual-memory.json | 2 +- + .../arch/x86/snowridgex/uncore-cache.json | 4 +- + .../arch/x86/snowridgex/uncore-interconnect.json | 6 +- + .../pmu-events/arch/x86/snowridgex/uncore-io.json | 11 - + tools/perf/tests/bitmap.c | 13 +- + tools/perf/tests/builtin-test.c | 123 +- + tools/perf/tests/evsel-roundtrip-name.c | 4 +- + tools/perf/tests/parse-events.c | 39 +- + tools/perf/tests/shell/lib/stat_output.sh | 2 +- + tools/perf/tests/shell/stat+json_output.sh | 2 +- + tools/perf/tests/topology.c | 46 +- + tools/perf/trace/beauty/Build | 1 + + .../beauty}/arch/x86/include/asm/irq_vectors.h | 0 + .../beauty}/arch/x86/include/uapi/asm/prctl.h | 0 + tools/perf/trace/beauty/beauty.h | 7 +- + tools/perf/trace/beauty/clone.c | 46 +- + tools/perf/trace/beauty/clone.sh | 17 + + tools/perf/trace/beauty/fcntl.c | 2 +- + tools/perf/trace/beauty/flock.c | 2 +- + tools/perf/trace/beauty/fs_at_flags.c | 58 + + tools/perf/trace/beauty/fs_at_flags.sh | 21 + + tools/perf/trace/beauty/fsconfig.sh | 6 +- + tools/perf/trace/beauty/fsmount.c | 9 +- + tools/perf/trace/beauty/fsmount.sh | 6 +- + tools/perf/trace/beauty/fspick.sh | 6 +- + .../trace/beauty}/include/uapi/linux/fcntl.h | 0 + .../trace/beauty}/include/uapi/linux/fs.h | 0 + .../trace/beauty}/include/uapi/linux/mount.h | 0 + .../trace/beauty}/include/uapi/linux/prctl.h | 0 + .../trace/beauty}/include/uapi/linux/sched.h | 0 + .../trace/beauty}/include/uapi/linux/stat.h | 0 + .../beauty}/include/uapi/linux/usbdevice_fs.h | 0 + .../trace/beauty}/include/uapi/linux/vhost.h | 0 + .../trace/beauty}/include/uapi/sound/asound.h | 0 + tools/perf/trace/beauty/mount_flags.sh | 6 +- + tools/perf/trace/beauty/move_mount_flags.sh | 6 +- + tools/perf/trace/beauty/prctl.c | 2 +- + tools/perf/trace/beauty/prctl_option.sh | 6 +- + tools/perf/trace/beauty/rename_flags.sh | 2 +- + tools/perf/trace/beauty/sndrv_ctl_ioctl.sh | 4 +- + tools/perf/trace/beauty/sndrv_pcm_ioctl.sh | 4 +- + tools/perf/trace/beauty/statx.c | 67 +- + tools/perf/trace/beauty/statx_mask.sh | 23 + + tools/perf/trace/beauty/sync_file_range.c | 11 +- + tools/perf/trace/beauty/sync_file_range.sh | 2 +- + .../trace/beauty/tracepoints/x86_irq_vectors.sh | 6 +- + tools/perf/trace/beauty/usbdevfs_ioctl.sh | 6 +- + tools/perf/trace/beauty/vhost_virtio_ioctl.sh | 6 +- + tools/perf/trace/beauty/x86_arch_prctl.sh | 4 +- + tools/perf/ui/browsers/annotate.c | 15 +- + tools/perf/util/Build | 1 + + tools/perf/util/annotate-data.c | 1332 +++++++++++- + tools/perf/util/annotate-data.h | 52 +- + tools/perf/util/annotate.c | 2198 ++++---------------- + tools/perf/util/annotate.h | 129 +- + tools/perf/util/auxtrace.c | 8 +- + tools/perf/util/bpf_kwork.c | 16 +- + tools/perf/util/bpf_kwork_top.c | 12 +- + .../util/bpf_skel/augmented_raw_syscalls.bpf.c | 21 + + tools/perf/util/color.h | 1 + + tools/perf/util/cpumap.c | 12 +- + tools/perf/util/debug.c | 3 + + tools/perf/util/debug.h | 1 + + tools/perf/util/disasm.c | 1819 ++++++++++++++++ + tools/perf/util/disasm.h | 112 + + tools/perf/util/dso.c | 2 + + tools/perf/util/dso.h | 92 +- + tools/perf/util/dump-insn.h | 1 + + tools/perf/util/dwarf-aux.c | 293 ++- + tools/perf/util/dwarf-aux.h | 33 +- + tools/perf/util/help-unknown-cmd.c | 51 +- + tools/perf/util/machine.c | 24 + + tools/perf/util/machine.h | 2 +- + tools/perf/util/map.c | 17 + + tools/perf/util/map.h | 3 + + tools/perf/util/metricgroup.c | 4 +- + tools/perf/util/perf_event_attr_fprintf.c | 26 +- + tools/perf/util/pmu.c | 83 +- + tools/perf/util/pmu.h | 4 + + tools/perf/util/pmus.c | 94 + + tools/perf/util/pmus.h | 1 + + tools/perf/util/print-events.c | 57 +- + tools/perf/util/print_insn.c | 75 +- + tools/perf/util/print_insn.h | 8 +- + tools/perf/util/probe-event.c | 1 + + tools/perf/util/python.c | 10 + + tools/perf/util/record.c | 2 +- + .../util/scripting-engines/trace-event-python.c | 12 +- + tools/perf/util/session.c | 5 +- + tools/perf/util/stat.c | 2 +- + tools/perf/util/svghelper.c | 20 +- + 173 files changed, 6225 insertions(+), 3370 deletions(-) + delete mode 100644 tools/include/uapi/asm-generic/fcntl.h + delete mode 100644 tools/include/uapi/linux/openat2.h + rename tools/{ => perf/trace/beauty}/arch/x86/include/asm/irq_vectors.h (100%) + rename tools/{ => perf/trace/beauty}/arch/x86/include/uapi/asm/prctl.h (100%) + create mode 100755 tools/perf/trace/beauty/clone.sh + create mode 100644 tools/perf/trace/beauty/fs_at_flags.c + create mode 100755 tools/perf/trace/beauty/fs_at_flags.sh + rename tools/{ => perf/trace/beauty}/include/uapi/linux/fcntl.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/fs.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/mount.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/prctl.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/sched.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/stat.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/usbdevice_fs.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/vhost.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/sound/asound.h (100%) + create mode 100755 tools/perf/trace/beauty/statx_mask.sh + create mode 100644 tools/perf/util/disasm.c + create mode 100644 tools/perf/util/disasm.h +Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL) +$ 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 (a1255ccab8ec swiotlb: do not set total_used to 0 in swiotlb_create_debugfs_files()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'ort' strategy. + kernel/dma/swiotlb.c | 91 +++++++++++++++++++++++++++++++++------------------- + 1 file changed, 58 insertions(+), 33 deletions(-) +Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures) +$ 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 (5616fee8981b Merge branches 'misc' and 'fixes' 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 (fec50db7033e Linux 6.9-rc3) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (8f9f5041c646 perf/arm-cmn: Set PMU device parent) +$ 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. + drivers/perf/alibaba_uncore_drw_pmu.c | 10 +++------- + drivers/perf/arm-cmn.c | 11 ++++++----- + drivers/perf/arm_cspmu/arm_cspmu.c | 8 +++----- + drivers/perf/arm_dsu_pmu.c | 19 ++++++------------- + drivers/perf/dwc_pcie_pmu.c | 10 ++++------ + drivers/perf/hisilicon/hisi_pcie_pmu.c | 9 ++++----- + drivers/perf/hisilicon/hisi_uncore_pmu.c | 6 ++---- + drivers/perf/qcom_l2_pmu.c | 8 +++----- + drivers/perf/riscv_pmu_sbi.c | 1 - + drivers/perf/thunderx2_pmu.c | 29 ++++++++++------------------- + include/linux/cpumask.h | 23 +++++++++++++++++++++++ + 11 files changed, 64 insertions(+), 70 deletions(-) +Merging arm-soc/for-next (011d79ef1cfa MAINTAINERS: Change Krzysztof Kozlowski's email address) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +Merging amlogic/for-next (4ee46d40d625 Merge branch 'v6.10/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. + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 5 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 70 ++++ + .../meson-g12b-bananapi-cm4-mnt-reform2.dts | 384 +++++++++++++++++++++ + .../boot/dts/amlogic/meson-khadas-vim3-ts050.dtso | 108 ++++++ + 5 files changed, 568 insertions(+) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-khadas-vim3-ts050.dtso +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 (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/boot/dts/aspeed/aspeed-g6.dtsi +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 6 + + arch/arm/boot/dts/aspeed/Makefile | 8 +- + .../dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts | 322 ++++ + .../dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts | 324 ++++ + .../boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 377 +++++ + arch/arm/boot/dts/aspeed/aspeed-bmc-asus-x4tf.dts | 592 +++++++ + .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 620 ++++++++ + .../dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts | 265 ---- + .../dts/aspeed/aspeed-bmc-facebook-minerva.dts | 543 +++++++ + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 1623 ++++++++++++++++++++ + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 4 + + arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi | 2 + + 12 files changed, 4420 insertions(+), 266 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asus-x4tf.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts + delete mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' 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. + arch/arm64/boot/dts/microchip/sparx5.dtsi | 4 +- + .../boot/dts/microchip/sparx5_pcb134_board.dtsi | 149 ++++++++++----------- + .../boot/dts/microchip/sparx5_pcb135_board.dtsi | 35 ++--- + 3 files changed, 85 insertions(+), 103 deletions(-) +Merging broadcom/next (ebe9ff485efc Merge branch 'drivers/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 30 +++++++++++++++++++ + .../bindings/gpio/raspberrypi,firmware-gpio.txt | 30 ------------------- + arch/arm/boot/dts/broadcom/bcm2711-rpi-4-b.dts | 7 +++++ + arch/arm/boot/dts/broadcom/bcm2711-rpi-cm4-io.dts | 9 ++++++ + arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi | 34 ++++++++++++++++++---- + arch/arm/boot/dts/broadcom/bcm2835-rpi-common.dtsi | 7 ----- + arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi | 9 +++--- + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 1 + + arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts | 1 - + drivers/bus/brcmstb_gisb.c | 1 + + drivers/firmware/raspberrypi.c | 7 +++-- + 11 files changed, 86 insertions(+), 50 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/raspberrypi,firmware-gpio.txt +Merging davinci/davinci/for-next (6613476e225e Linux 6.8-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 (bf11908757ee memory: mtk-smi: fix module autoloading) +$ 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 +Merge made by the 'ort' strategy. + .../memory-controllers/samsung,s5pv210-dmc.yaml | 33 ++++++++++++++++++++++ + drivers/memory/brcmstb_memc.c | 1 + + drivers/memory/mtk-smi.c | 2 ++ + 3 files changed, 36 insertions(+) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/samsung,s5pv210-dmc.yaml +Merging imx-mxs/for-next (6cf256f63478 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 15 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/nxp/imx/Makefile | 3 + + arch/arm/boot/dts/nxp/imx/e60k02.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/e70k02.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-udoo.dtsi | 25 +- + .../boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6sx-nitrogen6sx.dts | 2 +- + .../nxp/imx/imx6ull-seeed-npi-dev-board-emmc.dts | 19 + + .../nxp/imx/imx6ull-seeed-npi-dev-board-nand.dts | 19 + + .../dts/nxp/imx/imx6ull-seeed-npi-dev-board.dtsi | 424 +++++++++++++++ + arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi.dtsi | 155 ++++++ + arch/arm/boot/dts/nxp/imx/imx6ull-uti260b.dts | 566 +++++++++++++++++++++ + arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 9 + + arch/arm/configs/imx_v6_v7_defconfig | 1 + + arch/arm64/boot/dts/freescale/Makefile | 2 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 108 +++- + .../boot/dts/freescale/fsl-lx2162a-clearfog.dts | 1 + + .../boot/dts/freescale/fsl-lx2162a-sr-som.dtsi | 9 + + arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi | 285 ++++++++++- + arch/arm64/boot/dts/freescale/imx8-ss-cm40.dtsi | 91 ++++ + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 37 ++ + arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 13 + + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 7 + + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 7 + + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk3.dts | 10 + + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 45 ++ + arch/arm64/boot/dts/freescale/imx8mp-navqp.dts | 424 +++++++++++++++ + .../boot/dts/freescale/imx8mp-venice-gw71xx.dtsi | 2 +- + .../boot/dts/freescale/imx8mp-venice-gw72xx.dtsi | 36 ++ + .../boot/dts/freescale/imx8mp-venice-gw73xx.dtsi | 36 ++ + .../dts/freescale/imx8mp-venice-gw74xx-imx219.dtso | 13 + + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 6 + + .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 5 + + .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 5 + + .../boot/dts/freescale/imx8mp-verdin-mallow.dtsi | 5 + + .../boot/dts/freescale/imx8mp-verdin-yavia.dtsi | 5 + + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 27 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 164 ++++++ + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 7 + + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 86 ++++ + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 111 ++++ + arch/arm64/boot/dts/freescale/imx93.dtsi | 3 +- + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 14 +- + arch/arm64/boot/dts/freescale/s32g2.dtsi | 37 +- + arch/arm64/boot/dts/freescale/s32g274a-evb.dts | 6 +- + arch/arm64/boot/dts/freescale/s32g274a-rdb2.dts | 6 +- + arch/arm64/boot/dts/freescale/s32g3.dtsi | 233 +++++++++ + arch/arm64/boot/dts/freescale/s32g399a-rdb3.dts | 45 ++ + arch/arm64/configs/defconfig | 1 + + 54 files changed, 3096 insertions(+), 52 deletions(-) + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi-dev-board-emmc.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi-dev-board-nand.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi-dev-board.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-uti260b.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-cm40.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-navqp.dts + create mode 100644 arch/arm64/boot/dts/freescale/s32g3.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/s32g399a-rdb3.dts +Merging mediatek/for-next (67d5303fe655 Merge branch 'v6.9-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/airoha.yaml | 4 + + .../devicetree/bindings/arm/mediatek.yaml | 6 + + .../bindings/soc/mediatek/mediatek,mutex.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/Kconfig.platforms | 7 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/airoha/Makefile | 2 + + arch/arm64/boot/dts/airoha/en7581-evb.dts | 26 + + arch/arm64/boot/dts/airoha/en7581.dtsi | 163 ++++ + arch/arm64/boot/dts/mediatek/Makefile | 2 + + arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 8 +- + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 3 +- + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 34 +- + .../boot/dts/mediatek/mt7981b-cudy-wr3000-v1.dts | 74 ++ + arch/arm64/boot/dts/mediatek/mt7981b.dtsi | 48 +- + .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts | 6 +- + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 8 +- + arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 32 +- + .../dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts | 1 + + .../mt8183-kukui-jacuzzi-fennel14-sku2.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts | 1 + + .../dts/mediatek/mt8183-kukui-kodama-sku32.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 137 +++- + arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi | 2 +- + .../boot/dts/mediatek/mt8192-asurada-hayato-r1.dts | 1 + + .../dts/mediatek/mt8192-asurada-hayato-r5-sku2.dts | 1 + + .../dts/mediatek/mt8192-asurada-spherion-r0.dts | 1 + + .../dts/mediatek/mt8192-asurada-spherion-r4.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 6 +- + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 3 +- + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 36 +- + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 7 +- + .../boot/dts/mediatek/mt8390-genio-700-evk.dts | 880 +++++++++++++++++++++ + .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 88 ++- + arch/arm64/configs/defconfig | 1 + + drivers/soc/mediatek/Kconfig | 1 + + drivers/soc/mediatek/mtk-cmdq-helper.c | 163 +++- + drivers/soc/mediatek/mtk-mutex.c | 41 + + drivers/soc/mediatek/mtk-socinfo.c | 10 +- + drivers/soc/mediatek/mtk-svs.c | 7 +- + include/linux/soc/mediatek/mtk-cmdq.h | 153 +++- + 49 files changed, 1824 insertions(+), 154 deletions(-) + create mode 100644 arch/arm64/boot/dts/airoha/Makefile + create mode 100644 arch/arm64/boot/dts/airoha/en7581-evb.dts + create mode 100644 arch/arm64/boot/dts/airoha/en7581.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt7981b-cudy-wr3000-v1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8390-genio-700-evk.dts +Merging mvebu/for-next (058bfa0ead87 arm64: dts: marvell: cn9130-crb: drop unneeded "status") +$ 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. + arch/arm64/boot/dts/marvell/armada-ap80x.dtsi | 2 +- + arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 13 ++++++------- + arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 18 ++++++++---------- + arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 8 +++----- + arch/arm64/boot/dts/marvell/cn9132-db.dtsi | 12 ++++++------ + 5 files changed, 24 insertions(+), 29 deletions(-) +Merging omap/for-next (2a1e301bf479 Merge branch 'omap-for-v6.10/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/ti/omap/dra76x.dtsi | 63 ++++--- + arch/arm/boot/dts/ti/omap/dra7xx-clocks.dtsi | 270 ++++++++++++++++++--------- + arch/arm/boot/dts/ti/omap/omap3-n900.dts | 2 +- + 3 files changed, 221 insertions(+), 114 deletions(-) +Merging qcom/for-next (3cd1977804fb Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-for-6.10', 'clk-fixes-for-6.9' and 'drivers-for-6.10' 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 MAINTAINERS +Auto-merging arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 13 +- + MAINTAINERS | 33 +- + arch/arm/boot/dts/qcom/Makefile | 1 + + arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-apq8084.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-msm8916-smp.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 2 +- + .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 576 +-------------------- + ...qcom-msm8974pro-sony-xperia-shinano-common.dtsi | 535 +++++++++++++++++++ + .../qcom-msm8974pro-sony-xperia-shinano-leo.dts | 44 ++ + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 12 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 21 +- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 2 +- + .../dts/qcom/msm8916-samsung-fortuna-common.dtsi | 83 +++ + .../dts/qcom/msm8916-samsung-rossa-common.dtsi | 12 + + arch/arm64/boot/dts/qcom/msm8953.dtsi | 14 + + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 67 ++- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 4 +- + arch/arm64/boot/dts/qcom/qcm2290.dtsi | 56 +- + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 128 +++++ + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 240 ++++++++- + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 60 ++- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 + + arch/arm64/boot/dts/qcom/sc7180.dtsi | 1 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 14 + + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 57 +- + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 13 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 44 +- + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 9 + + arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 31 +- + arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 64 +++ + arch/arm64/boot/dts/qcom/sm6350.dtsi | 31 ++ + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 16 + + .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 9 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 6 + + arch/arm64/boot/dts/qcom/sm8450.dtsi | 3 + + arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 + + arch/arm64/boot/dts/qcom/sm8650.dtsi | 22 +- + arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 42 +- + arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi | 51 ++ + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 22 + + arch/arm64/boot/dts/qcom/x1e80100.dtsi | 44 +- + arch/arm64/configs/defconfig | 5 + + drivers/clk/qcom/clk-smd-rpm.c | 1 + + drivers/clk/qcom/gdsc.c | 11 +- + drivers/firmware/qcom/qcom_scm.c | 25 +- + drivers/soc/qcom/cmd-db.c | 2 +- + drivers/soc/qcom/icc-bwmon.c | 8 +- + drivers/soc/qcom/qcom_stats.c | 4 + + drivers/soc/qcom/rpmh-rsc.c | 2 +- + drivers/soc/qcom/socinfo.c | 2 + + include/dt-bindings/arm/qcom,ids.h | 1 + + 53 files changed, 1778 insertions(+), 676 deletions(-) + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-common.dtsi + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-leo.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi +Merging renesas/next (957eed54b7b6 Merge branch 'renesas-dts-for-v6.10' 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. + .../soc/renesas/renesas,r9a09g057-sys.yaml | 51 ++++ + .../devicetree/bindings/soc/renesas/renesas.yaml | 8 + + arch/arm/boot/dts/renesas/r7s72100.dtsi | 8 + + arch/arm/boot/dts/renesas/r8a73a4.dtsi | 37 +++ + arch/arm/boot/dts/renesas/r8a7742.dtsi | 58 ++++ + arch/arm/boot/dts/renesas/r8a7743.dtsi | 58 ++++ + arch/arm/boot/dts/renesas/r8a7744.dtsi | 58 ++++ + arch/arm/boot/dts/renesas/r8a7745.dtsi | 58 ++++ + arch/arm/boot/dts/renesas/r8a77470.dtsi | 44 +++ + arch/arm/boot/dts/renesas/r8a7790.dtsi | 58 ++++ + arch/arm/boot/dts/renesas/r8a7791.dtsi | 58 ++++ + arch/arm/boot/dts/renesas/r8a7792.dtsi | 59 ++++ + arch/arm/boot/dts/renesas/r8a7793.dtsi | 58 ++++ + arch/arm/boot/dts/renesas/r8a7794.dtsi | 58 ++++ + arch/arm/boot/dts/renesas/r9a06g032.dtsi | 1 - + arch/arm/configs/shmobile_defconfig | 3 +- + arch/arm64/boot/dts/renesas/Makefile | 3 + + .../renesas/r8a77970-eagle-function-expansion.dtso | 214 ++++++++++++++ + .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts | 27 +- + arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 311 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi | 58 ++++ + arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 4 +- + arch/arm64/configs/defconfig | 6 + + drivers/soc/renesas/Kconfig | 6 + + drivers/soc/renesas/renesas-soc.c | 20 +- + include/dt-bindings/clock/r8a73a4-clock.h | 4 + + 26 files changed, 1320 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/renesas/renesas,r9a09g057-sys.yaml + create mode 100644 arch/arm64/boot/dts/renesas/r8a77970-eagle-function-expansion.dtso +Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Merge made by the 'ort' strategy. + drivers/reset/reset-meson-audio-arb.c | 6 ++---- + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 6 ++---- + drivers/reset/reset-ti-sci.c | 6 ++---- + 3 files changed, 6 insertions(+), 12 deletions(-) +Merging rockchip/for-next (56f939cce5e1 Merge branch 'v6.10-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 +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 22 + + .../devicetree/bindings/soc/rockchip/grf.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/rockchip/Makefile | 5 + + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 56 ++ + .../boot/dts/rockchip/rk3326-gameforce-chi.dts | 809 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 37 +- + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 3 +- + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 1 - + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 2 + + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 53 +- + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 4 +- + .../boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 2 +- + .../boot/dts/rockchip/rk3566-anbernic-rg353ps.dts | 2 +- + .../boot/dts/rockchip/rk3566-anbernic-rg353v.dts | 2 +- + .../boot/dts/rockchip/rk3566-anbernic-rg353vs.dts | 2 +- + .../boot/dts/rockchip/rk3566-anbernic-rg503.dts | 2 +- + .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 5 + + arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts | 1 - + .../boot/dts/rockchip/rk3566-powkiddy-rgb30.dts | 2 +- + .../boot/dts/rockchip/rk3566-powkiddy-rk2023.dts | 2 +- + .../boot/dts/rockchip/rk3566-powkiddy-rk2023.dtsi | 2 + + .../boot/dts/rockchip/rk3566-powkiddy-x55.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3568-mecsbc.dts | 404 ++++++++++ + .../rk3568-wolfvision-pf5-io-expander.dtso | 137 ++++ + .../boot/dts/rockchip/rk3568-wolfvision-pf5.dts | 528 ++++++++++++++ + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 41 ++ + .../arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 9 +- + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 14 + + arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi | 558 ++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts | 5 + + arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts | 409 +++++++++++ + .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 3 +- + .../arm64/boot/dts/rockchip/rk3588-quartzpro64.dts | 15 + + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 5 + + arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 5 + + arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 5 + + .../boot/dts/rockchip/rk3588s-khadas-edge2.dts | 680 +++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 248 ++++--- + arch/arm64/configs/defconfig | 2 + + drivers/clk/rockchip/clk-rk3568.c | 4 + + drivers/clk/rockchip/rst-rk3588.c | 1 + + include/dt-bindings/clock/rk3568-cru.h | 1 + + include/dt-bindings/reset/rockchip,rk3588-cru.h | 2 + + 47 files changed, 3979 insertions(+), 126 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3326-gameforce-chi.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-mecsbc.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-io-expander.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts +Merging samsung-krzk/for-next (b7b2fe24038b 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 +Merge made by the 'ort' strategy. + .../bindings/clock/samsung,s3c6400-clock.yaml | 57 ++ + .../bindings/clock/samsung,s3c64xx-clock.txt | 76 -- + arch/arm/boot/dts/samsung/exynos3250.dtsi | 2 + + arch/arm/boot/dts/samsung/exynos4.dtsi | 3 + + arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts | 2 +- + arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 6 + + arch/arm/boot/dts/samsung/exynos4412-origen.dts | 2 +- + arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts | 12 +- + arch/arm/boot/dts/samsung/exynos5250.dtsi | 3 + + arch/arm/boot/dts/samsung/exynos5420.dtsi | 3 + + arch/arm/boot/dts/samsung/exynos5800-peach-pi.dts | 2 +- + arch/arm/boot/dts/samsung/s5pv210.dtsi | 6 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 5 + + arch/arm64/boot/dts/exynos/exynos850.dtsi | 26 + + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 12 + + arch/arm64/boot/dts/exynos/google/gs101-oriole.dts | 4 +- + arch/arm64/boot/dts/exynos/google/gs101.dtsi | 791 ++++++++++++++++++++- + drivers/clk/samsung/clk-exynos-arm64.c | 56 +- + drivers/clk/samsung/clk-exynos850.c | 440 +++++++++++- + drivers/clk/samsung/clk-exynosautov9.c | 8 +- + drivers/clk/samsung/clk.h | 4 + + 21 files changed, 1398 insertions(+), 122 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c6400-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c64xx-clock.txt +Merging scmi/for-linux-next (a4200c1395dc Merge branches 'for-next/scmi/updates' and 'for-next/ffa/updates', tags 'ffa-fix-6.9' and 'scmi-fixes-6.9' of git://git.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. + .../devicetree/bindings/firmware/arm,scmi.yaml | 4 +- + drivers/clk/clk-scmi.c | 226 ++++++++++++++++----- + drivers/firmware/arm_ffa/driver.c | 128 ++++++++---- + drivers/firmware/arm_scmi/common.h | 11 + + drivers/firmware/arm_scmi/driver.c | 83 +++++++- + drivers/firmware/arm_scmi/mailbox.c | 3 + + drivers/firmware/arm_scmi/notify.c | 30 +-- + drivers/firmware/arm_scmi/perf.c | 15 +- + include/linux/scmi_protocol.h | 2 - + include/trace/events/scmi.h | 6 +- + 10 files changed, 373 insertions(+), 135 deletions(-) +Merging sophgo/for-next (65fcc08b4cfe riscv: dts: sophgo: cv18xx: Add i2c devices) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sophgo/cv1800b-milkv-duo.dts | 8 ++ + arch/riscv/boot/dts/sophgo/cv1800b.dtsi | 4 + + arch/riscv/boot/dts/sophgo/cv1812h.dtsi | 4 + + arch/riscv/boot/dts/sophgo/cv18xx.dtsi | 138 ++++++++++++++++++++++- + 4 files changed, 149 insertions(+), 5 deletions(-) +Merging stm32/stm32-next (b12a916d30dc ARM: dts: stm32: add heartbeat led for stm32mp157c-ed1) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'ort' strategy. + .../access-controllers/access-controllers.yaml | 84 + + .../devicetree/bindings/bus/st,stm32-etzpc.yaml | 96 + + .../bindings/bus/st,stm32mp25-rifsc.yaml | 105 + + .../devicetree/bindings/crypto/st,stm32-cryp.yaml | 4 + + .../devicetree/bindings/crypto/st,stm32-hash.yaml | 4 + + .../devicetree/bindings/dma/st,stm32-dma.yaml | 4 + + .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 4 + + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 4 + + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 4 + + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 4 + + .../devicetree/bindings/iio/dac/st,stm32-dac.yaml | 4 + + .../bindings/media/cec/st,stm32-cec.yaml | 4 + + .../devicetree/bindings/media/st,stm32-dcmi.yaml | 4 + + .../memory-controllers/st,stm32-fmc2-ebi.yaml | 4 + + .../devicetree/bindings/mfd/st,stm32-lptimer.yaml | 4 + + .../devicetree/bindings/mfd/st,stm32-timers.yaml | 4 + + .../devicetree/bindings/mmc/arm,pl18x.yaml | 4 + + .../devicetree/bindings/net/can/bosch,m_can.yaml | 4 + + .../devicetree/bindings/net/stm32-dwmac.yaml | 4 + + .../devicetree/bindings/phy/phy-stm32-usbphyc.yaml | 4 + + .../bindings/regulator/st,stm32-vrefbuf.yaml | 4 + + .../devicetree/bindings/rng/st,stm32-rng.yaml | 4 + + .../devicetree/bindings/serial/st,stm32-uart.yaml | 4 + + .../devicetree/bindings/sound/st,stm32-i2s.yaml | 4 + + .../devicetree/bindings/sound/st,stm32-sai.yaml | 4 + + .../bindings/sound/st,stm32-spdifrx.yaml | 4 + + .../devicetree/bindings/spi/st,stm32-qspi.yaml | 4 + + .../devicetree/bindings/spi/st,stm32-spi.yaml | 4 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 4 + + MAINTAINERS | 7 + + arch/arm/boot/dts/st/stm32f746.dtsi | 17 - + arch/arm/boot/dts/st/stm32f769.dtsi | 17 + + arch/arm/boot/dts/st/stm32mp131.dtsi | 1064 ++++---- + arch/arm/boot/dts/st/stm32mp133.dtsi | 51 +- + arch/arm/boot/dts/st/stm32mp13xc.dtsi | 19 +- + arch/arm/boot/dts/st/stm32mp13xf.dtsi | 19 +- + arch/arm/boot/dts/st/stm32mp151.dtsi | 2726 ++++++++++---------- + arch/arm/boot/dts/st/stm32mp153.dtsi | 52 +- + arch/arm/boot/dts/st/stm32mp157c-ed1.dts | 12 + + arch/arm/boot/dts/st/stm32mp15xc.dtsi | 19 +- + arch/arm/mach-stm32/Kconfig | 1 + + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/st/stm32mp251.dtsi | 7 +- + arch/arm64/boot/dts/st/stm32mp255.dtsi | 33 +- + drivers/bus/Kconfig | 10 + + drivers/bus/Makefile | 1 + + drivers/bus/stm32_etzpc.c | 141 + + drivers/bus/stm32_firewall.c | 294 +++ + drivers/bus/stm32_firewall.h | 83 + + drivers/bus/stm32_rifsc.c | 252 ++ + drivers/of/property.c | 2 + + include/linux/bus/stm32_firewall_device.h | 142 + + 52 files changed, 3402 insertions(+), 1957 deletions(-) + create mode 100644 Documentation/devicetree/bindings/access-controllers/access-controllers.yaml + create mode 100644 Documentation/devicetree/bindings/bus/st,stm32-etzpc.yaml + create mode 100644 Documentation/devicetree/bindings/bus/st,stm32mp25-rifsc.yaml + create mode 100644 drivers/bus/stm32_etzpc.c + create mode 100644 drivers/bus/stm32_firewall.c + create mode 100644 drivers/bus/stm32_firewall.h + create mode 100644 drivers/bus/stm32_rifsc.c + create mode 100644 include/linux/bus/stm32_firewall_device.h +Merging sunxi/sunxi/for-next (c1d7282e4e92 Merge branch 'sunxi/dt-for-6.9' into sunxi/for-next) +$ 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. +Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/tee/index.rst | 1 + + Documentation/tee/ts-tee.rst | 71 ++++++ + MAINTAINERS | 10 + + drivers/tee/Kconfig | 1 + + drivers/tee/Makefile | 1 + + drivers/tee/amdtee/amdtee_private.h | 2 +- + drivers/tee/amdtee/call.c | 2 +- + drivers/tee/amdtee/core.c | 3 +- + drivers/tee/amdtee/shm_pool.c | 2 +- + drivers/tee/optee/call.c | 2 +- + drivers/tee/optee/core.c | 66 +---- + drivers/tee/optee/device.c | 2 +- + drivers/tee/optee/ffa_abi.c | 8 +- + drivers/tee/optee/notif.c | 2 +- + drivers/tee/optee/optee_private.h | 14 +- + drivers/tee/optee/rpc.c | 2 +- + drivers/tee/optee/smc_abi.c | 17 +- + drivers/tee/tee_core.c | 2 +- + drivers/tee/tee_private.h | 35 --- + drivers/tee/tee_shm.c | 67 ++++- + drivers/tee/tee_shm_pool.c | 2 +- + drivers/tee/tstee/Kconfig | 11 + + drivers/tee/tstee/Makefile | 3 + + drivers/tee/tstee/core.c | 480 ++++++++++++++++++++++++++++++++++++ + drivers/tee/tstee/tstee_private.h | 92 +++++++ + include/linux/tee_core.h | 306 +++++++++++++++++++++++ + include/linux/tee_drv.h | 317 ++++-------------------- + include/uapi/linux/tee.h | 1 + + 28 files changed, 1113 insertions(+), 409 deletions(-) + create mode 100644 Documentation/tee/ts-tee.rst + create mode 100644 drivers/tee/tstee/Kconfig + create mode 100644 drivers/tee/tstee/Makefile + create mode 100644 drivers/tee/tstee/core.c + create mode 100644 drivers/tee/tstee/tstee_private.h + create mode 100644 include/linux/tee_core.h +Merging tegra/for-next (c85c30fad06d Merge branch for-6.9/arm64/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. +Merging ti/ti-next (592695bed5f8 Merge branches 'ti-drivers-soc-next', 'ti-k3-dts-next' and 'ti-keystone-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/keystone/ti,sci.yaml | 5 - + Documentation/devicetree/bindings/arm/ti/k3.yaml | 1 + + arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi | 5 - + arch/arm64/boot/dts/ti/Makefile | 1 + + arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 1 - + arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi | 10 +- + arch/arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-am62-verdin-mallow.dtsi | 22 +- + arch/arm64/boot/dts/ti/k3-am62-verdin-yavia.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 23 +- + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 27 +- + .../boot/dts/ti/k3-am625-phyboard-lyra-rdk.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 3 + + arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 5 +- + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 1 - + .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 6 +- + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 1 - + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 1 - + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 1 - + arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 1 - + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 10 - + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 2 - + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 10 - + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 2 - + arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 10 - + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 2 - + arch/arm64/boot/dts/ti/k3-j722s-beagley-ai.dts | 370 +++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 12 +- + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 10 - + arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 2 - + drivers/firmware/ti_sci.c | 24 +- + drivers/soc/ti/wkup_m3_ipc.c | 7 +- + 32 files changed, 470 insertions(+), 123 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-j722s-beagley-ai.dts +Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. +Merging clk/clk-next (deb01ebcc734 Merge branch 'clk-loongson' 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. + .../bindings/clock/airoha,en7523-scu.yaml | 31 +- + .../bindings/clock/loongson,ls2k-clk.yaml | 4 +- + .../bindings/clock/sophgo,cv1800-clk.yaml | 3 +- + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 1 + + drivers/clk/clk-en7523.c | 191 ++- + drivers/clk/clk-loongson2.c | 584 ++++---- + drivers/clk/mediatek/clk-pllfh.c | 2 +- + drivers/clk/nxp/clk-lpc18xx-cgu.c | 1 - + drivers/clk/sophgo/Kconfig | 11 + + drivers/clk/sophgo/Makefile | 7 + + drivers/clk/sophgo/clk-cv1800.c | 1537 ++++++++++++++++++++ + drivers/clk/sophgo/clk-cv1800.h | 123 ++ + drivers/clk/sophgo/clk-cv18xx-common.c | 66 + + drivers/clk/sophgo/clk-cv18xx-common.h | 81 ++ + drivers/clk/sophgo/clk-cv18xx-ip.c | 887 +++++++++++ + drivers/clk/sophgo/clk-cv18xx-ip.h | 261 ++++ + drivers/clk/sophgo/clk-cv18xx-pll.c | 420 ++++++ + drivers/clk/sophgo/clk-cv18xx-pll.h | 118 ++ + drivers/clk/ti/dpll.c | 10 +- + include/dt-bindings/clock/loongson,ls2k-clk.h | 54 +- + 21 files changed, 4068 insertions(+), 325 deletions(-) + create mode 100644 drivers/clk/sophgo/Kconfig + create mode 100644 drivers/clk/sophgo/Makefile + create mode 100644 drivers/clk/sophgo/clk-cv1800.c + create mode 100644 drivers/clk/sophgo/clk-cv1800.h + create mode 100644 drivers/clk/sophgo/clk-cv18xx-common.c + create mode 100644 drivers/clk/sophgo/clk-cv18xx-common.h + create mode 100644 drivers/clk/sophgo/clk-cv18xx-ip.c + create mode 100644 drivers/clk/sophgo/clk-cv18xx-ip.h + create mode 100644 drivers/clk/sophgo/clk-cv18xx-pll.c + create mode 100644 drivers/clk/sophgo/clk-cv18xx-pll.h +Merging clk-imx/for-next (13269dc6c704 clk: imx: imx8mp: Fix SAI_MCLK_SEL definition) +$ 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 (c0516eb4cf04 clk: renesas: r8a779h0: Add timer clocks) +$ 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/r8a779h0-cpg-mssr.c | 14 ++++++++++++++ + drivers/clk/renesas/r9a07g043-cpg.c | 4 ++-- + drivers/clk/renesas/r9a07g044-cpg.c | 2 +- + include/dt-bindings/clock/r9a07g043-cpg.h | 6 +++--- + 4 files changed, 20 insertions(+), 6 deletions(-) +Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (a07c772fa658 LoongArch: Include linux/sizes.h in addrspace.h to prevent build errors) +$ 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 (70d830e337f9 m68k: Calculate THREAD_SIZE from THREAD_SIZE_ORDER) +$ 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/m68k/include/asm/thread_info.h | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) +Merging m68knommu/for-next (d677c24fccee m68k: Avoid CONFIG_COLDFIRE switch in uapi header) +$ 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/include/uapi/asm/ptrace.h | 2 +- + scripts/headers_install.sh | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging microblaze/next (6613476e225e Linux 6.8-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 (4cece7649650 Linux 6.9-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 (68b70ab43cec openrisc: Move FPU state out of pt_regs) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'ort' strategy. + arch/openrisc/Kconfig | 9 +++ + arch/openrisc/include/asm/fpu.h | 22 ++++++ + arch/openrisc/include/asm/processor.h | 1 + + arch/openrisc/include/asm/ptrace.h | 3 +- + arch/openrisc/include/uapi/asm/elf.h | 75 ++++++++++++++++--- + arch/openrisc/kernel/entry.S | 15 +--- + arch/openrisc/kernel/module.c | 18 ++++- + arch/openrisc/kernel/process.c | 13 ++-- + arch/openrisc/kernel/ptrace.c | 18 ++--- + arch/openrisc/kernel/signal.c | 36 ++++++++- + arch/openrisc/kernel/traps.c | 136 ++++++++++++++++++---------------- + 11 files changed, 239 insertions(+), 107 deletions(-) + create mode 100644 arch/openrisc/include/asm/fpu.h +Merging parisc-hd/for-next (e8f897f4afef Linux 6.8) +$ 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 +Already up to date. +Merging powerpc/next (8884fc918f6a powerpc: Fix fatal warnings flag for LLVM's integrated assembler) +$ 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/Kbuild | 3 +- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/platforms/ps3/device-init.c | 61 +++++++++++++++++--------------- + arch/powerpc/sysdev/fsl_msi.c | 2 ++ + 4 files changed, 37 insertions(+), 31 deletions(-) +Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (ba5ea59f768f riscv: Do not save the scratch CSR during suspend) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging Documentation/rust/arch-support.rst +CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/Makefile +Resolved 'Documentation/rust/arch-support.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f1386712c6ca] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/rust/arch-support.rst | 1 + + arch/riscv/Kconfig | 18 +- + arch/riscv/Makefile | 26 +- + arch/riscv/include/asm/atomic.h | 164 ++++----- + arch/riscv/include/asm/cacheflush.h | 7 +- + arch/riscv/include/asm/cmpxchg.h | 404 +++++++-------------- + arch/riscv/include/asm/signal.h | 12 - + arch/riscv/include/asm/suspend.h | 1 - + arch/riscv/kernel/suspend.c | 3 +- + arch/riscv/kernel/sys_riscv.c | 1 - + scripts/generate_rust_target.rs | 6 + + .../selftests/syscall_user_dispatch/sud_test.c | 14 + + 12 files changed, 253 insertions(+), 404 deletions(-) + delete mode 100644 arch/riscv/include/asm/signal.h +Merging riscv-dt/riscv-dt-for-next (5db2c4dc413e riscv: dts: add initial canmv-k230 and k230-evb dts) +$ 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 +Auto-merging arch/riscv/Makefile +CONFLICT (content): Merge conflict in arch/riscv/Makefile +Auto-merging drivers/clk/Kconfig +Resolved 'arch/riscv/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2b53bda7fe6f] Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git +$ git diff -M --stat --summary HEAD^.. + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../devicetree/bindings/riscv/canaan.yaml | 8 +- + Documentation/devicetree/bindings/riscv/cpus.yaml | 1 + + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + arch/riscv/Kconfig.socs | 8 +- + arch/riscv/Makefile | 2 +- + arch/riscv/boot/dts/canaan/Makefile | 2 + + arch/riscv/boot/dts/canaan/k230-canmv.dts | 24 ++++ + arch/riscv/boot/dts/canaan/k230-evb.dts | 24 ++++ + arch/riscv/boot/dts/canaan/k230.dtsi | 142 +++++++++++++++++++++ + arch/riscv/configs/nommu_k210_defconfig | 3 +- + arch/riscv/configs/nommu_k210_sdcard_defconfig | 3 +- + drivers/clk/Kconfig | 4 +- + drivers/pinctrl/Kconfig | 4 +- + drivers/reset/Kconfig | 4 +- + drivers/soc/Makefile | 2 +- + drivers/soc/canaan/Kconfig | 4 +- + 17 files changed, 221 insertions(+), 16 deletions(-) + create mode 100644 arch/riscv/boot/dts/canaan/k230-canmv.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230-evb.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230.dtsi +Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' 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/Kconfig.socs | 14 ++++---------- + arch/riscv/configs/defconfig | 7 ++++--- + arch/riscv/configs/nommu_virt_defconfig | 2 +- + tools/testing/kunit/qemu_configs/riscv.py | 2 +- + tools/testing/selftests/wireguard/qemu/arch/riscv32.config | 2 +- + tools/testing/selftests/wireguard/qemu/arch/riscv64.config | 2 +- + 6 files changed, 12 insertions(+), 17 deletions(-) +Merging s390/for-next (9fb83b5a1bdb 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. + Documentation/arch/s390/vfio-ap.rst | 2 +- + arch/s390/Kconfig | 29 ++++- + arch/s390/boot/Makefile | 2 +- + arch/s390/include/asm/ap.h | 30 ++--- + arch/s390/include/asm/chsc.h | 15 +++ + arch/s390/kernel/perf_cpum_cf.c | 2 +- + arch/s390/kernel/perf_cpum_cf_events.c | 11 +- + arch/s390/kernel/uv.c | 51 ++++---- + drivers/crypto/Kconfig | 18 +-- + drivers/s390/char/Makefile | 2 +- + drivers/s390/cio/chsc.c | 18 ++- + drivers/s390/cio/css.c | 14 +- + drivers/s390/crypto/Makefile | 2 +- + drivers/s390/crypto/ap_bus.c | 225 ++++++++++++++++++++------------- + drivers/s390/crypto/ap_queue.c | 4 +- + 15 files changed, 251 insertions(+), 174 deletions(-) +Merging sh/for-next (4cece7649650 Linux 6.9-rc1) +$ 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 (84b76d05828a lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console) +$ 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 (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory) +$ 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 (11cca8ccf2c3 tty: xtensa/iss: Use min() to fix Coccinelle warning) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/include/asm/processor.h | 8 ++++---- + arch/xtensa/include/asm/ptrace.h | 2 +- + arch/xtensa/kernel/process.c | 5 +++-- + arch/xtensa/kernel/stacktrace.c | 3 ++- + arch/xtensa/platforms/iss/console.c | 6 ++---- + 5 files changed, 12 insertions(+), 12 deletions(-) +Merging bcachefs/for-next (1189bdda6c99 bcachefs: Fix __bch2_btree_and_journal_iter_init_node_iter()) +$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next +Already up to date. +Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly) +$ 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 (7218664bf91d Merge branch 'for-next-next-v6.9-20240409' into for-next-20240409) +$ 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/compression.c | 119 ++++++++++++++---------- + fs/btrfs/compression.h | 42 ++++----- + fs/btrfs/ctree.c | 12 +-- + fs/btrfs/disk-io.c | 8 +- + fs/btrfs/extent-io-tree.c | 58 ++++++------ + fs/btrfs/extent-tree.c | 14 ++- + fs/btrfs/extent_io.c | 58 ++++++++++-- + fs/btrfs/extent_io.h | 7 +- + fs/btrfs/extent_map.c | 18 ---- + fs/btrfs/extent_map.h | 4 - + fs/btrfs/file.c | 80 ++++++++-------- + fs/btrfs/inode.c | 215 ++++++++++++++++++++----------------------- + fs/btrfs/ioctl.c | 66 ++++++------- + fs/btrfs/locking.c | 24 ++--- + fs/btrfs/locking.h | 18 +++- + fs/btrfs/lzo.c | 89 +++++++++--------- + fs/btrfs/messages.c | 2 +- + fs/btrfs/qgroup.c | 3 - + fs/btrfs/reflink.c | 54 ++++------- + fs/btrfs/relocation.c | 133 +++++++++++++------------- + fs/btrfs/scrub.c | 142 ++++++++-------------------- + fs/btrfs/send.c | 45 ++++----- + fs/btrfs/transaction.c | 10 +- + fs/btrfs/tree-log.c | 4 +- + fs/btrfs/volumes.c | 17 +--- + fs/btrfs/volumes.h | 1 - + fs/btrfs/xattr.c | 10 +- + fs/btrfs/zlib.c | 112 +++++++++++----------- + fs/btrfs/zoned.c | 9 ++ + fs/btrfs/zstd.c | 80 ++++++++-------- + include/trace/events/btrfs.h | 3 +- + 32 files changed, 709 insertions(+), 749 deletions(-) +Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 -- + fs/ceph/addr.c | 4 +++- + fs/ceph/caps.c | 4 ++-- + fs/ceph/mds_client.c | 9 ++++----- + fs/ceph/mds_client.h | 3 +-- + 5 files changed, 10 insertions(+), 12 deletions(-) +Merging cifs/for-next (4e996f9d30cb smb: client: Fix hang in smb2_reconnect) +$ 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/cached_dir.c | 4 +- + fs/smb/client/cifsglob.h | 1 + + fs/smb/client/connect.c | 8 ++++ + fs/smb/client/fs_context.c | 21 +++++++++++ + fs/smb/client/fs_context.h | 2 + + fs/smb/client/inode.c | 3 +- + fs/smb/client/misc.c | 1 + + fs/smb/client/smb2ops.c | 94 +++++++++++++++++++++++++++------------------- + fs/smb/client/smb2pdu.c | 11 ++++++ + fs/smb/client/transport.c | 15 +++++--- + 10 files changed, 112 insertions(+), 48 deletions(-) +Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Auto-merging fs/configfs/inode.c +Merge made by the 'ort' strategy. + fs/configfs/configfs_internal.h | 4 ++-- + fs/configfs/dir.c | 42 +++++++++++++++++++++++++++++++---------- + fs/configfs/inode.c | 24 ----------------------- + 3 files changed, 34 insertions(+), 36 deletions(-) +Merging erofs/dev (b351756059e3 erofs: derive fsid from on-disk UUID for .statfs() if possible) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'ort' strategy. + fs/erofs/Makefile | 4 +- + fs/erofs/decompressor.c | 8 +- + fs/erofs/internal.h | 20 ++-- + fs/erofs/pcpubuf.c | 148 ------------------------------ + fs/erofs/super.c | 21 +++-- + fs/erofs/{utils.c => zutil.c} | 206 ++++++++++++++++++++++++++++++++++++++---- + 6 files changed, 216 insertions(+), 191 deletions(-) + delete mode 100644 fs/erofs/pcpubuf.c + rename fs/erofs/{utils.c => zutil.c} (58%) +Merging exfat/dev (6397cc21e5c0 exfat: move extend valid_size into ->page_mkwrite()) +$ 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/exfat_fs.h | 1 + + fs/exfat/file.c | 106 +++++++++++++++++++++++++++++++++++++++------------- + fs/exfat/inode.c | 5 +++ + 3 files changed, 87 insertions(+), 25 deletions(-) +Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8) +$ 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 (172dc02ca6ec Merge UDF time conversion fix.) +$ 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 include/linux/fs.h +Merge made by the 'ort' strategy. + fs/ext2/file.c | 8 +- + fs/ext2/inode.c | 2 - + fs/isofs/inode.c | 467 +++++++++++++++++++------------------ + fs/nfsd/filecache.c | 4 +- + fs/notify/dnotify/dnotify.c | 4 +- + fs/notify/fanotify/fanotify_user.c | 143 ++++-------- + fs/notify/fdinfo.c | 20 +- + fs/notify/fsnotify.c | 23 +- + fs/notify/fsnotify.h | 47 ++-- + fs/notify/inotify/inotify_user.c | 2 +- + fs/notify/mark.c | 174 ++++++++++---- + fs/quota/dquot.c | 9 +- + fs/udf/super.c | 8 +- + fs/udf/udftime.c | 11 +- + include/linux/fs.h | 14 +- + include/linux/fsnotify.h | 21 +- + include/linux/fsnotify_backend.h | 93 +++++--- + kernel/audit_tree.c | 2 +- + kernel/audit_watch.c | 2 +- + 19 files changed, 589 insertions(+), 465 deletions(-) +Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test) +$ 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 (bf3a69c6861f Merge tag 'for-linus-6.9-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/for-next (8e43fb06e10d fsverity: remove hash page spin lock) +$ 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 (cdf6ac2a03d2 fuse: get rid of ff->readdir.lock) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (cac2ca6ca549 gfs2: Fix do_xmote locking error) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/bmap.c +Auto-merging fs/gfs2/ops_fstype.c +Merge made by the 'ort' strategy. + Documentation/filesystems/gfs2-glocks.rst | 3 - + fs/gfs2/bmap.c | 2 +- + fs/gfs2/dir.c | 31 ++++--- + fs/gfs2/glock.c | 137 ++++++++++++++++-------------- + fs/gfs2/glock.h | 4 +- + fs/gfs2/glops.c | 55 +++++------- + fs/gfs2/incore.h | 2 +- + fs/gfs2/lock_dlm.c | 40 ++++++--- + fs/gfs2/log.c | 5 +- + fs/gfs2/ops_fstype.c | 1 + + fs/gfs2/rgrp.c | 10 +-- + fs/gfs2/super.c | 9 +- + fs/gfs2/sys.c | 4 +- + fs/gfs2/util.c | 57 +++++++------ + fs/gfs2/util.h | 4 +- + fs/gfs2/xattr.c | 28 +++--- + 16 files changed, 214 insertions(+), 178 deletions(-) +Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin") +$ 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 (405ac6a57277 Merge tag '6.9-rc2-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 (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging fs/nfs/inode.c +Auto-merging net/sunrpc/xprtsock.c +Merge made by the 'ort' strategy. + fs/nfs/inode.c | 7 ++++++- + net/sunrpc/xprtsock.c | 1 + + 2 files changed, 7 insertions(+), 1 deletion(-) +Merging nfs-anna/linux-next (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel) +$ 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 (e5ca63b09c65 nfsd: optimise recalculate_deny_mode() for a common case) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4xdr.c +Merge made by the 'ort' strategy. + fs/nfsd/export.c | 16 +++-- + fs/nfsd/nfs4callback.c | 37 ++++------ + fs/nfsd/nfs4proc.c | 41 +++++++++++ + fs/nfsd/nfs4state.c | 188 +++++++++++++++++++++++++++---------------------- + fs/nfsd/nfs4xdr.c | 76 +++++++++++++++++++- + fs/nfsd/nfsctl.c | 5 +- + fs/nfsd/state.h | 6 +- + fs/nfsd/stats.c | 42 ----------- + fs/nfsd/stats.h | 5 -- + fs/nfsd/trace.h | 100 +++++++++++++++++++++++++- + fs/nfsd/xdr4.h | 19 +++++ + include/linux/nfs4.h | 6 ++ + net/sunrpc/svc.c | 2 - + 13 files changed, 370 insertions(+), 173 deletions(-) +Merging ntfs3/master (622cd3daa8ea fs/ntfs3: Slightly simplify ntfs_inode_printk()) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Already up to date. +Merging orangefs/for-next (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.) +$ 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 (d17bb4620f90 overlayfs.rst: fix ReST formatting) +$ 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 (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems) +$ 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 (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ 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 (e23d7e82b707 xfs: allow cross-linking special files without project quota) +$ 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 (567e629fd296 zonefs: convert zonefs to use the new mount api) +$ 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 iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter()) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-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 (7dad3e0bd4e4 Merge branch 'vfs.super' 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 drivers/dax/device.c +Auto-merging fs/bcachefs/util.h +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/zoned.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/userfaultfd.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/pagemap.h +Auto-merging io_uring/io_uring.c +Auto-merging mm/filemap.c +Auto-merging mm/mmap.c +Auto-merging mm/page-writeback.c +Merge made by the 'ort' strategy. + block/bdev.c | 105 +++-- + block/blk-zoned.c | 4 +- + block/blk.h | 2 + + block/fops.c | 5 +- + block/genhd.c | 9 +- + block/ioctl.c | 16 +- + block/partitions/core.c | 8 +- + drivers/dax/device.c | 2 +- + drivers/md/bcache/super.c | 7 +- + drivers/md/dm-vdo/dm-vdo-target.c | 4 +- + drivers/md/dm-vdo/indexer/io-factory.c | 2 +- + drivers/mtd/devices/block2mtd.c | 6 +- + drivers/s390/block/dasd_ioctl.c | 5 +- + drivers/scsi/scsicam.c | 3 +- + fs/9p/vfs_addr.c | 66 +-- + fs/afs/file.c | 8 +- + fs/afs/internal.h | 6 +- + fs/afs/validation.c | 4 +- + fs/afs/write.c | 193 ++++---- + fs/aio.c | 93 ++-- + fs/bcachefs/fs.c | 3 + + fs/bcachefs/util.h | 5 - + fs/btrfs/disk-io.c | 6 +- + fs/btrfs/file.c | 4 +- + fs/btrfs/inode.c | 3 + + fs/btrfs/volumes.c | 14 +- + fs/btrfs/zoned.c | 2 +- + fs/cachefiles/io.c | 76 ++- + fs/ceph/addr.c | 24 +- + fs/ceph/inode.c | 2 + + fs/cramfs/inode.c | 2 +- + fs/dcache.c | 2 +- + fs/debugfs/inode.c | 194 ++++---- + fs/direct-io.c | 1 - + fs/ecryptfs/keystore.c | 4 +- + fs/erofs/data.c | 2 +- + fs/exfat/fatent.c | 2 +- + fs/ext4/dir.c | 2 +- + fs/ext4/ext4_jbd2.c | 2 +- + fs/ext4/file.c | 6 +- + fs/ext4/super.c | 30 +- + fs/f2fs/file.c | 3 +- + fs/fat/inode.c | 2 +- + fs/fhandle.c | 6 +- + fs/freevxfs/vxfs_super.c | 69 +-- + fs/fs-writeback.c | 57 ++- + fs/gfs2/glock.c | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/hugetlbfs/inode.c | 5 +- + fs/ioctl.c | 4 +- + fs/jbd2/journal.c | 26 +- + fs/minix/inode.c | 48 +- + fs/netfs/Makefile | 3 +- + fs/netfs/buffered_read.c | 40 +- + fs/netfs/buffered_write.c | 835 +++------------------------------ + fs/netfs/direct_write.c | 28 +- + fs/netfs/fscache_io.c | 14 +- + fs/netfs/internal.h | 55 ++- + fs/netfs/io.c | 155 +----- + fs/netfs/main.c | 55 ++- + fs/netfs/misc.c | 10 +- + fs/netfs/objects.c | 79 +++- + fs/netfs/output.c | 478 ------------------- + fs/netfs/stats.c | 17 +- + fs/netfs/write_collect.c | 808 +++++++++++++++++++++++++++++++ + fs/netfs/write_issue.c | 675 ++++++++++++++++++++++++++ + fs/nfs/file.c | 8 +- + fs/nfs/fscache.h | 6 +- + fs/nfs/write.c | 4 +- + fs/nilfs2/ioctl.c | 2 +- + fs/nilfs2/segment.c | 2 +- + fs/ntfs3/inode.c | 2 +- + fs/openpromfs/inode.c | 8 +- + fs/orangefs/dcache.c | 4 +- + fs/orangefs/namei.c | 26 +- + fs/orangefs/super.c | 17 +- + fs/overlayfs/params.c | 4 - + fs/proc/proc_net.c | 1 + + fs/qnx6/inode.c | 113 +++-- + fs/read_write.c | 2 +- + fs/signalfd.c | 44 +- + fs/smb/client/file.c | 16 +- + fs/stat.c | 1 + + fs/sync.c | 9 +- + fs/timerfd.c | 36 +- + fs/tracefs/inode.c | 194 ++++---- + fs/userfaultfd.c | 44 +- + fs/xfs/xfs_file.c | 8 +- + include/linux/blkdev.h | 21 +- + include/linux/fs.h | 88 ++-- + include/linux/fs_parser.h | 4 + + include/linux/fscache.h | 22 +- + include/linux/hugetlb.h | 8 +- + include/linux/jbd2.h | 18 +- + include/linux/netfs.h | 200 ++++---- + include/linux/pagemap.h | 1 + + include/linux/shm.h | 5 - + include/linux/stat.h | 1 + + include/linux/uio.h | 10 + + include/net/9p/client.h | 2 + + include/net/udp.h | 9 +- + include/trace/events/netfs.h | 249 +++++++++- + include/uapi/linux/stat.h | 4 +- + io_uring/io_uring.c | 2 +- + io_uring/rw.c | 9 +- + ipc/shm.c | 10 +- + mm/filemap.c | 52 +- + mm/mmap.c | 4 +- + mm/page-writeback.c | 1 + + net/9p/Kconfig | 1 + + net/9p/client.c | 49 ++ + 111 files changed, 3275 insertions(+), 2456 deletions(-) + delete mode 100644 fs/netfs/output.c + create mode 100644 fs/netfs/write_collect.c + create mode 100644 fs/netfs/write_issue.c +Merging vfs/for-next (052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' 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. + include/linux/ceph/ceph_debug.h | 18 +++++++----------- + include/linux/dev_printk.h | 25 +++++++++++++------------ + include/linux/dynamic_debug.h | 4 ++-- + include/linux/printk.h | 2 +- + 4 files changed, 23 insertions(+), 26 deletions(-) +Merging pci/next (ced360f2a021 Merge branch 'pci/dt-bindings') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/tty/serial/8250/8250_pci.c +Merge made by the 'ort' strategy. + Documentation/PCI/msi-howto.rst | 2 +- + Documentation/PCI/pci.rst | 2 +- + .../devicetree/bindings/pci/amlogic,axg-pcie.yaml | 2 +- + .../devicetree/bindings/pci/apple,pcie.yaml | 2 +- + .../devicetree/bindings/pci/brcm,iproc-pcie.yaml | 2 +- + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 2 +- + .../bindings/pci/cdns,cdns-pcie-host.yaml | 3 -- + .../devicetree/bindings/pci/cdns-pcie-host.yaml | 2 +- + .../devicetree/bindings/pci/faraday,ftpci100.yaml | 2 +- + .../devicetree/bindings/pci/host-generic-pci.yaml | 2 +- + .../devicetree/bindings/pci/intel,ixp4xx-pci.yaml | 2 +- + .../bindings/pci/intel,keembay-pcie.yaml | 2 +- + .../devicetree/bindings/pci/loongson.yaml | 2 +- + .../bindings/pci/mediatek,mt7621-pcie.yaml | 7 +++-- + .../bindings/pci/mediatek-pcie-gen3.yaml | 2 +- + .../bindings/pci/microchip,pcie-host.yaml | 2 +- + .../devicetree/bindings/pci/qcom,pcie-common.yaml | 2 +- + .../devicetree/bindings/pci/qcom,pcie.yaml | 2 +- + .../devicetree/bindings/pci/rcar-pci-host.yaml | 5 ++- + .../bindings/pci/renesas,pci-rcar-gen2.yaml | 2 +- + .../bindings/pci/rockchip,rk3399-pcie.yaml | 3 +- + .../devicetree/bindings/pci/snps,dw-pcie.yaml | 2 +- + .../devicetree/bindings/pci/ti,am65-pci-host.yaml | 2 +- + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 5 +++ + .../devicetree/bindings/pci/versatile.yaml | 2 +- + .../devicetree/bindings/pci/xilinx-versal-cpm.yaml | 2 +- + .../bindings/pci/xlnx,axi-pcie-host.yaml | 2 +- + .../devicetree/bindings/pci/xlnx,nwl-pcie.yaml | 2 +- + .../devicetree/bindings/pci/xlnx,xdma-host.yaml | 2 +- + Documentation/translations/zh_CN/PCI/msi-howto.rst | 2 +- + Documentation/translations/zh_CN/PCI/pci.rst | 2 +- + drivers/ata/pata_cs5520.c | 6 ---- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 5 ++- + drivers/infiniband/hw/qib/qib_pcie.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +- + drivers/mfd/intel-lpss-pci.c | 2 +- + drivers/misc/vmw_vmci/vmci_guest.c | 3 +- + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 9 ++---- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 2 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 2 +- + .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 2 +- + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 8 ++--- + drivers/net/wireless/ath/ath10k/ahb.c | 18 +++++------ + drivers/net/wireless/ath/ath10k/pci.c | 36 +++++++++++----------- + drivers/net/wireless/ath/ath10k/pci.h | 6 ++-- + drivers/net/wireless/realtek/rtw88/pci.c | 2 +- + drivers/net/wireless/realtek/rtw89/pci.c | 2 +- + drivers/ntb/hw/idt/ntb_hw_idt.c | 2 +- + drivers/pci/doe.c | 12 ++++++-- + drivers/pci/msi/api.c | 8 ++--- + drivers/pci/pci.c | 26 ++++++++-------- + drivers/pci/pcie/portdrv.c | 8 ++--- + drivers/pci/quirks.c | 20 ++++++++++++ + drivers/platform/x86/intel_ips.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- + drivers/scsi/hpsa.c | 2 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 4 +-- + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/vmw_pvscsi.c | 2 +- + drivers/tty/serial/8250/8250_pci.c | 2 +- + drivers/usb/core/hcd-pci.c | 3 +- + include/linux/pci.h | 13 +++----- + include/uapi/linux/pci_regs.h | 1 + + sound/soc/intel/avs/core.c | 2 +- + 74 files changed, 166 insertions(+), 147 deletions(-) +Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy) +$ 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 +Merge made by the 'ort' strategy. + fs/pstore/blk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hid/for-next (a8d38c4a9f9f Merge branch 'for-6.10/hid-bpf' 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 +Auto-merging .mailmap +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 2 + + Documentation/hid/hid-bpf.rst | 2 +- + MAINTAINERS | 4 +- + drivers/hid/Kconfig | 16 + + drivers/hid/Makefile | 1 + + drivers/hid/bpf/hid_bpf_dispatch.c | 226 +- + drivers/hid/hid-core.c | 2 + + drivers/hid/hid-corsair.c | 4 +- + drivers/hid/hid-debug.c | 3400 +++++++++++++++++--- + drivers/hid/hid-google-hammer.c | 5 +- + drivers/hid/hid-lenovo.c | 23 +- + drivers/hid/hid-logitech-dj.c | 4 +- + drivers/hid/hid-nintendo.c | 56 +- + drivers/hid/hid-picolcd_core.c | 6 +- + drivers/hid/hid-picolcd_fb.c | 8 +- + drivers/hid/hid-playstation.c | 108 +- + drivers/hid/hid-roccat-isku.c | 2 +- + drivers/hid/hid-roccat-kone.c | 12 +- + drivers/hid/hid-roccat-koneplus.c | 4 +- + drivers/hid/hid-roccat-kovaplus.c | 10 +- + drivers/hid/hid-roccat-pyra.c | 6 +- + drivers/hid/hid-sensor-custom.c | 17 +- + drivers/hid/hid-uclogic-params.c | 3 + + drivers/hid/hid-winwing.c | 229 ++ + drivers/hid/i2c-hid/i2c-hid-core.c | 38 +- + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 45 +- + drivers/hid/intel-ish-hid/ipc/ipc.c | 16 +- + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 59 +- + drivers/hid/surface-hid/surface_kbd.c | 5 +- + include/linux/hid_bpf.h | 3 + + tools/testing/selftests/hid/config.common | 1 + + tools/testing/selftests/hid/hid_bpf.c | 112 +- + tools/testing/selftests/hid/progs/hid.c | 46 + + .../testing/selftests/hid/progs/hid_bpf_helpers.h | 6 + + 34 files changed, 3766 insertions(+), 715 deletions(-) + create mode 100644 drivers/hid/hid-winwing.c +Merging i2c/i2c/for-next (5ceeabb0eb2e Merge tag 'i2c-host-fixes-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current) +$ 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 (ab9713bb8844 i2c: i801: Fix missing Kconfig dependency) +$ 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/i2c/i2c-pnx.txt | 34 ------ + .../devicetree/bindings/i2c/nxp,pnx-i2c.yaml | 46 ++++++++ + .../devicetree/bindings/i2c/renesas,riic.yaml | 19 ++-- + drivers/dma/qcom/gpi.c | 12 +- + drivers/i2c/busses/Kconfig | 37 +++--- + drivers/i2c/busses/i2c-i801.c | 31 ++++- + drivers/i2c/busses/i2c-ocores.c | 21 ++-- + drivers/i2c/busses/i2c-qcom-geni.c | 18 ++- + drivers/i2c/busses/i2c-riic.c | 125 +++++++++++++++------ + drivers/i2c/busses/i2c-viperboard.c | 1 - + include/linux/dma/qcom-gpi-dma.h | 10 ++ + 11 files changed, 239 insertions(+), 115 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-pnx.txt + create mode 100644 Documentation/devicetree/bindings/i2c/nxp,pnx-i2c.yaml +Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const) +$ 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 hwmon-staging/hwmon-next (db85dba9fee5 hwmon: (aspeed-g6-pwm-tach) Convert to platform remove callback returning void) +$ 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 +Auto-merging include/acpi/acpi_bus.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/hwmon/adc128d818.txt | 38 ------ + Documentation/devicetree/bindings/hwmon/as370.txt | 11 -- + .../devicetree/bindings/hwmon/ibm,opal-sensor.yaml | 37 ++++++ + .../devicetree/bindings/hwmon/ibm,p8-occ-hwmon.txt | 25 ---- + .../devicetree/bindings/hwmon/ibmpowernv.txt | 23 ---- + Documentation/devicetree/bindings/hwmon/lm87.txt | 30 ----- + .../devicetree/bindings/hwmon/max6650.txt | 28 ----- + .../devicetree/bindings/hwmon/maxim,max6650.yaml | 70 +++++++++++ + .../bindings/hwmon/pmbus/adi,adp1050.yaml | 49 ++++++++ + .../devicetree/bindings/hwmon/pwm-fan.txt | 1 - + .../devicetree/bindings/hwmon/st,stts751.yaml | 41 +++++++ + .../devicetree/bindings/hwmon/stts751.txt | 15 --- + .../devicetree/bindings/hwmon/syna,as370.yaml | 32 +++++ + .../devicetree/bindings/hwmon/ti,adc128d818.yaml | 63 ++++++++++ + .../devicetree/bindings/hwmon/ti,lm87.yaml | 69 +++++++++++ + .../devicetree/bindings/trivial-devices.yaml | 2 + + Documentation/hwmon/adp1050.rst | 64 ++++++++++ + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/lm70.rst | 2 +- + MAINTAINERS | 7 ++ + drivers/acpi/acpi_ipmi.c | 23 +++- + drivers/hwmon/Kconfig | 27 +++- + drivers/hwmon/acpi_power_meter.c | 16 +++ + drivers/hwmon/aspeed-g6-pwm-tach.c | 6 +- + drivers/hwmon/dell-smm-hwmon.c | 15 +++ + drivers/hwmon/lm70.c | 4 +- + drivers/hwmon/pmbus/Kconfig | 10 ++ + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/adp1050.c | 56 +++++++++ + drivers/hwmon/pmbus/mp2975.c | 136 +++++++++++++++++---- + drivers/hwmon/pwm-fan.c | 45 ++++--- + include/acpi/acpi_bus.h | 5 + + 32 files changed, 723 insertions(+), 229 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwmon/adc128d818.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/as370.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/ibm,opal-sensor.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/ibm,p8-occ-hwmon.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/ibmpowernv.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/lm87.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/max6650.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/maxim,max6650.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/adi,adp1050.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/pwm-fan.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/st,stts751.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/stts751.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/syna,as370.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,adc128d818.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,lm87.yaml + create mode 100644 Documentation/hwmon/adp1050.rst + create mode 100644 drivers/hwmon/pmbus/adp1050.c +Merging jc_docs/docs-next (8819b60eed72 docs/zh_CN: Add dev-tools/kmemleak Chinese translation) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/Makefile | 7 +- + .../admin-guide/reporting-regressions.rst | 10 +- + Documentation/core-api/dma-api-howto.rst | 24 +- + Documentation/doc-guide/parse-headers.rst | 2 +- + Documentation/index.rst | 2 +- + Documentation/process/handling-regressions.rst | 2 +- + Documentation/sphinx/kerneldoc-preamble.sty | 9 +- + Documentation/trace/tracepoints.rst | 2 +- + Documentation/translations/it_IT/index.rst | 2 +- + .../translations/sp_SP/process/1.Intro.rst | 302 ++++++++++++ + .../translations/sp_SP/process/2.Process.rst | 542 +++++++++++++++++++++ + .../translations/sp_SP/process/3.Early-stage.rst | 11 + + .../translations/sp_SP/process/4.Coding.rst | 11 + + .../translations/sp_SP/process/5.Posting.rst | 11 + + .../translations/sp_SP/process/6.Followthrough.rst | 11 + + .../sp_SP/process/7.AdvancedTopics.rst | 11 + + .../translations/sp_SP/process/8.Conclusion.rst | 11 + + .../sp_SP/process/development-process.rst | 27 + + Documentation/translations/sp_SP/process/index.rst | 1 + + .../sp_SP/process/submitting-patches.rst | 28 ++ + .../translations/zh_CN/dev-tools/index.rst | 4 +- + .../translations/zh_CN/dev-tools/kmemleak.rst | 229 +++++++++ + .../translations/zh_CN/dev-tools/ubsan.rst | 91 ++++ + .../zh_CN/process/submitting-patches.rst | 8 +- + .../zh_TW/process/submitting-patches.rst | 8 +- + MAINTAINERS | 1 + + scripts/check-variable-fonts.sh | 117 +++++ + scripts/sphinx-pre-install | 5 +- + 28 files changed, 1461 insertions(+), 28 deletions(-) + create mode 100644 Documentation/translations/sp_SP/process/1.Intro.rst + create mode 100644 Documentation/translations/sp_SP/process/2.Process.rst + create mode 100644 Documentation/translations/sp_SP/process/3.Early-stage.rst + create mode 100644 Documentation/translations/sp_SP/process/4.Coding.rst + create mode 100644 Documentation/translations/sp_SP/process/5.Posting.rst + create mode 100644 Documentation/translations/sp_SP/process/6.Followthrough.rst + create mode 100644 Documentation/translations/sp_SP/process/7.AdvancedTopics.rst + create mode 100644 Documentation/translations/sp_SP/process/8.Conclusion.rst + create mode 100644 Documentation/translations/sp_SP/process/development-process.rst + create mode 100644 Documentation/translations/zh_CN/dev-tools/kmemleak.rst + create mode 100644 Documentation/translations/zh_CN/dev-tools/ubsan.rst + create mode 100755 scripts/check-variable-fonts.sh +Merging v4l-dvb/master (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (71b3ed53b08d media: atomisp: Implement link_setup() op for ISP subdev MC entity) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h +Auto-merging drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_hevc_req_multi_if.c +Auto-merging drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_if.c +Auto-merging drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_if.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/mgb4.rst | 35 +- + .../devicetree/bindings/media/i2c/ovti,ov2680.yaml | 35 +- + .../bindings/media/qcom,sc8280xp-camss.yaml | 512 +++++++++++++++++++++ + .../userspace-api/media/dvb/frontend_f_open.rst | 2 +- + Documentation/userspace-api/media/v4l/mmap.rst | 2 +- + .../userspace-api/media/v4l/user-func.rst | 1 + + .../userspace-api/media/v4l/vidioc-remove-bufs.rst | 86 ++++ + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 1 + + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 9 +- + drivers/media/common/videobuf2/videobuf2-core.c | 223 ++++++--- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 34 +- + drivers/media/dvb-core/dvbdev.c | 2 +- + drivers/media/dvb-frontends/cxd2880/Kconfig | 2 +- + drivers/media/i2c/adv748x/adv748x-hdmi.c | 16 +- + drivers/media/i2c/adv7511-v4l2.c | 16 +- + drivers/media/i2c/adv7604.c | 20 +- + drivers/media/i2c/adv7842.c | 25 +- + drivers/media/i2c/dw9714.c | 6 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 4 +- + drivers/media/i2c/ov2680.c | 10 +- + drivers/media/i2c/ov2740.c | 11 +- + drivers/media/i2c/tc358743.c | 25 +- + drivers/media/i2c/tda1997x.c | 14 +- + drivers/media/i2c/ths7303.c | 10 +- + drivers/media/i2c/ths8200.c | 14 +- + drivers/media/i2c/tvp7002.c | 32 +- + drivers/media/mc/mc-entity.c | 6 + + drivers/media/mmc/siano/smssdio.c | 25 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 12 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 29 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 4 - + drivers/media/pci/ngene/ngene-core.c | 4 +- + .../platform/chips-media/wave5/wave5-helper.c | 17 +- + .../platform/chips-media/wave5/wave5-vpu-dec.c | 13 +- + .../platform/chips-media/wave5/wave5-vpu-enc.c | 13 +- + .../media/platform/chips-media/wave5/wave5-vpu.c | 125 +++-- + .../platform/chips-media/wave5/wave5-vpuapi.h | 4 + + .../mediatek/vcodec/decoder/mtk_vcodec_dec.c | 2 +- + .../mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h | 4 +- + .../vcodec/decoder/vdec/vdec_av1_req_lat_if.c | 20 +- + .../mediatek/vcodec/decoder/vdec/vdec_h264_if.c | 12 +- + .../vcodec/decoder/vdec/vdec_h264_req_common.h | 15 +- + .../vcodec/decoder/vdec/vdec_h264_req_if.c | 14 +- + .../vcodec/decoder/vdec/vdec_h264_req_multi_if.c | 6 +- + .../vcodec/decoder/vdec/vdec_hevc_req_multi_if.c | 4 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp8_if.c | 4 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c | 2 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp9_if.c | 4 +- + .../mediatek/vcodec/decoder/vdec_msg_queue.h | 4 +- + .../platform/mediatek/vcodec/decoder/vdec_vpu_if.h | 4 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 2 +- + .../platform/mediatek/vcodec/encoder/venc_drv_if.h | 2 +- + drivers/media/platform/qcom/camss/Makefile | 2 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 108 ++++- + drivers/media/platform/qcom/camss/camss-csiphy.c | 1 + + .../camss/{camss-vfe-170.c => camss-vfe-17x.c} | 0 + drivers/media/platform/qcom/camss/camss-vfe.c | 25 +- + drivers/media/platform/qcom/camss/camss-video.c | 1 + + drivers/media/platform/qcom/camss/camss.c | 307 ++++++++++++ + drivers/media/platform/qcom/camss/camss.h | 1 + + .../media/platform/renesas/rcar-vin/rcar-v4l2.c | 9 +- + drivers/media/platform/renesas/rcar-vin/rcar-vin.h | 2 +- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 1 - + drivers/media/platform/ti/davinci/vpif_capture.c | 4 +- + drivers/media/platform/ti/davinci/vpif_display.c | 2 +- + drivers/media/platform/verisilicon/hantro_v4l2.c | 1 + + drivers/media/radio/radio-shark2.c | 2 +- + drivers/media/rc/gpio-ir-recv.c | 1 - + drivers/media/rc/imon.c | 12 +- + drivers/media/rc/ir-spi.c | 41 +- + drivers/media/rc/lirc_dev.c | 18 +- + drivers/media/spi/gs1662.c | 27 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 1 + + drivers/media/test-drivers/vimc/vimc-capture.c | 3 +- + drivers/media/test-drivers/visl/visl-video.c | 1 + + drivers/media/test-drivers/vivid/vivid-core.c | 9 +- + drivers/media/test-drivers/vivid/vivid-meta-out.c | 4 - + drivers/media/test-drivers/vivid/vivid-touch-cap.c | 4 - + drivers/media/usb/dvb-usb-v2/anysee.c | 4 +- + drivers/media/v4l2-core/v4l2-async.c | 12 +- + drivers/media/v4l2-core/v4l2-common.c | 2 + + drivers/media/v4l2-core/v4l2-ctrls-core.c | 3 + + drivers/media/v4l2-core/v4l2-dev.c | 3 + + drivers/media/v4l2-core/v4l2-ioctl.c | 30 ++ + drivers/media/v4l2-core/v4l2-mem2mem.c | 15 + + drivers/media/v4l2-core/v4l2-subdev.c | 41 +- + .../staging/media/atomisp/include/linux/atomisp.h | 24 - + .../media/atomisp/include/linux/atomisp_platform.h | 5 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 12 +- + .../staging/media/atomisp/pci/atomisp_internal.h | 4 - + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 333 +------------- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 95 ++-- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 20 +- + drivers/staging/media/atomisp/pci/sh_css.c | 1 + + drivers/staging/media/imx/Kconfig | 1 - + drivers/staging/media/ipu3/ipu3-css.c | 1 - + drivers/staging/media/ipu3/ipu3.c | 6 +- + drivers/staging/media/starfive/camss/stf-camss.c | 12 +- + drivers/staging/media/tegra-video/tegra20.c | 1 + + drivers/staging/media/tegra-video/vi.c | 12 +- + include/media/media-device.h | 6 + + include/media/v4l2-ioctl.h | 4 + + include/media/v4l2-mem2mem.h | 2 + + include/media/v4l2-subdev.h | 28 +- + include/media/videobuf2-core.h | 52 ++- + include/media/videobuf2-v4l2.h | 2 + + include/uapi/linux/videodev2.h | 17 + + 107 files changed, 1953 insertions(+), 880 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/qcom,sc8280xp-camss.yaml + create mode 100644 Documentation/userspace-api/media/v4l/vidioc-remove-bufs.rst + rename drivers/media/platform/qcom/camss/{camss-vfe-170.c => camss-vfe-17x.c} (100%) +Merging pm/linux-next (53c477378d23 Merge branch 'acpica' 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 +Auto-merging drivers/platform/x86/lg-laptop.c +Auto-merging drivers/platform/x86/toshiba_acpi.c +Auto-merging include/acpi/acpi_bus.h +Merge made by the 'ort' strategy. + Documentation/power/pci.rst | 2 +- + drivers/acpi/Kconfig | 3 + + drivers/acpi/Makefile | 8 +- + drivers/acpi/acpica/Makefile | 1 + + drivers/acpi/apei/einj-core.c | 12 +- + drivers/acpi/bus.c | 14 +- + drivers/acpi/dock.c | 48 ++-- + 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/internal.h | 3 +- + drivers/acpi/nhlt.c | 289 ++++++++++++++++++++ + drivers/acpi/scan.c | 28 +- + drivers/acpi/x86/Makefile | 8 + + drivers/acpi/{ => x86}/blacklist.c | 2 +- + drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} | 2 +- + drivers/acpi/{acpi_lpss.c => x86/lpss.c} | 5 +- + drivers/acpi/x86/utils.c | 29 +- + drivers/base/power/main.c | 6 +- + drivers/base/power/wakeup.c | 11 +- + drivers/cpufreq/freq_table.c | 8 +- + drivers/cpufreq/intel_pstate.c | 179 +++++------- + drivers/input/misc/atlas_btns.c | 1 - + drivers/mmc/host/sdhci-pci-core.c | 2 +- + drivers/net/fjes/fjes_main.c | 1 - + drivers/platform/chrome/wilco_ec/event.c | 1 - + drivers/platform/x86/asus-laptop.c | 1 - + drivers/platform/x86/classmate-laptop.c | 5 - + drivers/platform/x86/dell/dell-rbtn.c | 1 - + drivers/platform/x86/eeepc-laptop.c | 1 - + drivers/platform/x86/intel/rst.c | 1 - + drivers/platform/x86/intel/smartconnect.c | 1 - + drivers/platform/x86/lg-laptop.c | 1 - + drivers/platform/x86/sony-laptop.c | 2 - + drivers/platform/x86/toshiba_acpi.c | 1 - + drivers/platform/x86/toshiba_bluetooth.c | 1 - + drivers/platform/x86/toshiba_haps.c | 1 - + drivers/platform/x86/wireless-hotkey.c | 1 - + drivers/ptp/ptp_vmw.c | 1 - + drivers/thermal/gov_fair_share.c | 7 +- + drivers/thermal/gov_power_allocator.c | 6 +- + drivers/thermal/gov_step_wise.c | 41 ++- + .../intel/int340x_thermal/acpi_thermal_rel.c | 4 +- + .../intel/int340x_thermal/int3400_thermal.c | 1 + + .../intel/int340x_thermal/int3403_thermal.c | 1 + + drivers/thermal/intel/intel_hfi.c | 97 ++++++- + drivers/thermal/thermal_core.c | 120 ++++++--- + drivers/thermal/thermal_core.h | 119 +++++++- + drivers/thermal/thermal_debugfs.c | 6 +- + drivers/thermal/thermal_helpers.c | 8 +- + drivers/thermal/thermal_netlink.c | 68 +++-- + drivers/thermal/thermal_netlink.h | 26 ++ + drivers/thermal/thermal_sysfs.c | 20 +- + drivers/thermal/thermal_trace.h | 2 + + drivers/thermal/thermal_trace_ipa.h | 2 + + drivers/thermal/thermal_trip.c | 15 +- + drivers/virt/vmgenid.c | 1 - + include/acpi/acpi_bus.h | 36 ++- + include/acpi/actbl2.h | 299 ++++++++------------- + include/acpi/nhlt.h | 181 +++++++++++++ + include/linux/acpi.h | 6 +- + include/linux/pm_wakeup.h | 12 +- + include/linux/thermal.h | 109 +------- + 64 files changed, 1228 insertions(+), 650 deletions(-) + create mode 100644 drivers/acpi/nhlt.c + create mode 100644 drivers/acpi/x86/Makefile + rename drivers/acpi/{ => x86}/blacklist.c (99%) + rename drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} (98%) + rename drivers/acpi/{acpi_lpss.c => x86/lpss.c} (99%) + create mode 100644 include/acpi/nhlt.h +Merging cpufreq-arm/cpufreq/arm/linux-next (4cece7649650 Linux 6.9-rc1) +$ 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 +Already up to date. +Merging cpupower/cpupower (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (6f3c0cfe2aa5 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/event/exynos-nocp.c | 6 ++---- + drivers/devfreq/event/exynos-ppmu.c | 6 ++---- + drivers/devfreq/mtk-cci-devfreq.c | 6 ++---- + drivers/devfreq/rk3399_dmc.c | 6 ++---- + drivers/devfreq/sun8i-a33-mbus.c | 6 ++---- + 5 files changed, 10 insertions(+), 20 deletions(-) +Merging pmdomain/next (02e2a4b3638c cpuidle: psci: Update init level to core_initcall()) +$ 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. + drivers/cpuidle/cpuidle-psci-domain.c | 3 ++- + drivers/cpuidle/cpuidle-psci.c | 5 +++-- + drivers/cpuidle/cpuidle-psci.h | 20 -------------------- + drivers/pmdomain/mediatek/mt8188-pm-domains.h | 14 +++++++++++--- + drivers/pmdomain/mediatek/mtk-scpsys.c | 1 - + 5 files changed, 16 insertions(+), 27 deletions(-) +Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1) +$ 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 +Already up to date. +Merging thermal/thermal/linux-next (1828c1c17bb2 thermal/drivers/rcar_gen3: Add support for R-Car V4M) +$ 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 dlm/next (92d59adfaf71 dlm: do message processing in softirq context) +$ 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/ast.c | 216 +++++++++++++-------------------- + fs/dlm/ast.h | 13 +- + fs/dlm/debug_fs.c | 139 +++++---------------- + fs/dlm/dir.c | 147 ++++++++++++++++++---- + fs/dlm/dir.h | 3 +- + fs/dlm/dlm_internal.h | 87 +++++++------ + fs/dlm/lock.c | 295 +++++++++++++++++++++++++-------------------- + fs/dlm/lock.h | 7 +- + fs/dlm/lockspace.c | 65 +++++----- + fs/dlm/lowcomms.c | 62 ++++++---- + fs/dlm/lowcomms.h | 5 +- + fs/dlm/member.c | 23 ++-- + fs/dlm/memory.c | 18 ++- + fs/dlm/memory.h | 4 +- + fs/dlm/midcomms.c | 67 +++++----- + fs/dlm/midcomms.h | 3 +- + fs/dlm/rcom.c | 33 +++-- + fs/dlm/recover.c | 126 ++++++------------- + fs/dlm/recover.h | 10 +- + fs/dlm/recoverd.c | 142 ++++++++++++++++++---- + fs/dlm/requestqueue.c | 43 ++----- + fs/dlm/user.c | 135 +++++++-------------- + include/trace/events/dlm.h | 46 +++---- + 23 files changed, 827 insertions(+), 862 deletions(-) +Merging rdma/for-next (dfcdb38b21e4 RDMA/rxe: Return the correct errno) +$ 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/net/ethernet/microsoft/mana/mana_en.c +Auto-merging include/net/mana/mana.h +Merge made by the 'ort' strategy. + drivers/infiniband/core/restrack.c | 51 +------------ + drivers/infiniband/hw/erdma/erdma.h | 13 ++-- + drivers/infiniband/hw/erdma/erdma_cmdq.c | 99 +++++++++++++----------- + drivers/infiniband/hw/erdma/erdma_cq.c | 2 +- + drivers/infiniband/hw/erdma/erdma_eq.c | 54 +++++++------ + drivers/infiniband/hw/erdma/erdma_hw.h | 6 +- + drivers/infiniband/hw/erdma/erdma_main.c | 15 +++- + drivers/infiniband/hw/erdma/erdma_qp.c | 4 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 105 +++++++++++++++----------- + drivers/infiniband/hw/erdma/erdma_verbs.h | 16 ++-- + drivers/infiniband/hw/hns/hns_roce_ah.c | 31 +++++--- + drivers/infiniband/hw/hns/hns_roce_device.h | 6 ++ + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 85 ++++++++++++++++----- + drivers/infiniband/hw/hns/hns_roce_qp.c | 13 ++++ + drivers/infiniband/hw/mana/cq.c | 52 +++---------- + drivers/infiniband/hw/mana/main.c | 41 ++++++++++ + drivers/infiniband/hw/mana/mana_ib.h | 26 ++++--- + drivers/infiniband/hw/mana/mr.c | 2 +- + drivers/infiniband/hw/mana/qp.c | 102 ++++++++++--------------- + drivers/infiniband/hw/mana/wq.c | 31 +------- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 +- + drivers/infiniband/hw/mlx5/mr.c | 35 ++++++--- + drivers/infiniband/sw/rxe/rxe_pool.c | 4 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 14 ++-- + include/net/mana/mana.h | 1 + + include/uapi/rdma/hns-abi.h | 9 ++- + 26 files changed, 440 insertions(+), 380 deletions(-) +Merging net-next/main (94426ed2137a 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 Documentation/devicetree/bindings/net/stm32-dwmac.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging include/linux/cpumask.h +Auto-merging include/net/mac80211.h +Auto-merging include/trace/events/rpcgss.h +CONFLICT (content): Merge conflict in include/trace/events/rpcgss.h +Auto-merging kernel/bpf/syscall.c +Auto-merging net/bridge/br_netfilter_hooks.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/scan.c +Auto-merging net/mac80211/tx.c +Auto-merging scripts/kernel-doc +Recorded preimage for 'include/trace/events/rpcgss.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/trace/events/rpcgss.h'. +[master b68f3587b13f] Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/conf.py | 2 + + .../devicetree/bindings/net/airoha,en8811h.yaml | 56 + + .../devicetree/bindings/net/renesas,etheravb.yaml | 12 +- + .../devicetree/bindings/net/renesas,ethertsn.yaml | 33 +- + .../devicetree/bindings/net/rockchip-dwmac.yaml | 4 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 6 +- + .../bindings/net/starfive,jh7110-dwmac.yaml | 26 +- + .../devicetree/bindings/net/stm32-dwmac.yaml | 7 + + .../devicetree/bindings/net/ti,icssg-prueth.yaml | 35 +- + .../bindings/net/wireless/brcm,bcm4329-fmac.yaml | 1 + + Documentation/mm/page_frags.rst | 2 +- + Documentation/netlink/genetlink-c.yaml | 2 +- + Documentation/netlink/genetlink-legacy.yaml | 2 +- + Documentation/netlink/genetlink.yaml | 2 +- + Documentation/netlink/netlink-raw.yaml | 2 +- + Documentation/netlink/specs/ethtool.yaml | 22 + + Documentation/netlink/specs/nlctrl.yaml | 6 +- + Documentation/netlink/specs/rt_link.yaml | 246 ++- + Documentation/netlink/specs/tc.yaml | 72 +- + Documentation/netlink/specs/team.yaml | 204 ++ + .../ethernet/mellanox/mlx5/counters.rst | 11 + + Documentation/networking/devlink/devlink-port.rst | 33 + + Documentation/networking/dns_resolver.rst | 4 +- + Documentation/networking/ethtool-netlink.rst | 16 + + Documentation/translations/zh_CN/mm/page_frags.rst | 2 +- + .../userspace-api/netlink/genetlink-legacy.rst | 22 +- + MAINTAINERS | 3 + + arch/arm/net/bpf_jit_32.c | 25 +- + arch/arm64/net/bpf_jit_comp.c | 7 +- + arch/loongarch/net/bpf_jit.c | 22 +- + arch/mips/net/bpf_jit_comp.c | 3 +- + arch/parisc/net/bpf_jit_core.c | 8 +- + arch/s390/net/bpf_jit_comp.c | 6 +- + arch/sparc/net/bpf_jit_comp_64.c | 6 +- + arch/x86/net/bpf_jit_comp.c | 10 +- + arch/x86/net/bpf_jit_comp32.c | 3 +- + crypto/af_alg.c | 4 +- + drivers/bcma/host_soc.c | 6 +- + drivers/infiniband/hw/irdma/cm.c | 3 +- + drivers/infiniband/hw/qedr/qedr_iw_cm.c | 3 +- + drivers/isdn/capi/Makefile | 3 +- + drivers/isdn/capi/kcapi.c | 7 +- + drivers/md/dm-clone-metadata.c | 5 - + drivers/net/Kconfig | 15 +- + drivers/net/Makefile | 1 + + drivers/net/arcnet/Kconfig | 2 +- + drivers/net/arcnet/arcdevice.h | 3 +- + drivers/net/arcnet/arcnet.c | 11 +- + drivers/net/bareudp.c | 19 +- + drivers/net/bonding/bond_main.c | 10 +- + drivers/net/bonding/bond_netlink.c | 3 +- + drivers/net/bonding/bond_options.c | 2 +- + drivers/net/bonding/bond_procfs.c | 2 +- + drivers/net/bonding/bond_sysfs.c | 25 +- + drivers/net/bonding/bond_sysfs_slave.c | 2 +- + drivers/net/can/cc770/Kconfig | 1 + + drivers/net/can/sja1000/Kconfig | 1 + + drivers/net/dsa/hirschmann/hellcreek_ptp.c | 25 +- + drivers/net/dsa/microchip/ksz8.h | 2 - + drivers/net/dsa/microchip/ksz8795.c | 135 +- + drivers/net/dsa/microchip/ksz8795_reg.h | 1 + + drivers/net/dsa/microchip/ksz_spi.c | 1 - + drivers/net/dsa/sja1105/sja1105_main.c | 1 - + drivers/net/ethernet/3com/3c515.c | 3 - + drivers/net/ethernet/3com/Kconfig | 4 +- + drivers/net/ethernet/8390/Kconfig | 6 +- + drivers/net/ethernet/amd/Kconfig | 4 +- + drivers/net/ethernet/amd/amd8111e.c | 1 - + drivers/net/ethernet/amd/amd8111e.h | 1 - + drivers/net/ethernet/amd/xgbe/xgbe-platform.c | 8 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 570 ++++-- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 40 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 226 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 184 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 30 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 5 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 149 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 14 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 30 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 2 +- + drivers/net/ethernet/broadcom/cnic.c | 3 +- + drivers/net/ethernet/broadcom/tg3.c | 30 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 64 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 5 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 14 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 1 - + drivers/net/ethernet/freescale/fman/fman_muram.c | 1 - + drivers/net/ethernet/fujitsu/Kconfig | 2 +- + drivers/net/ethernet/google/gve/gve.h | 35 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 146 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 48 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 88 +- + drivers/net/ethernet/google/gve/gve_main.c | 30 +- + drivers/net/ethernet/google/gve/gve_rx.c | 2 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 7 +- + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 4 +- + drivers/net/ethernet/intel/Kconfig | 2 +- + drivers/net/ethernet/intel/e100.c | 8 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 14 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 62 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 22 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 10 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 18 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 1160 ++++++----- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 3 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 8 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 4 +- + drivers/net/ethernet/intel/ice/Makefile | 7 +- + .../intel/ice/{ice_devlink.c => devlink/devlink.c} | 463 +---- + .../intel/ice/{ice_devlink.h => devlink/devlink.h} | 0 + .../net/ethernet/intel/ice/devlink/devlink_port.c | 430 ++++ + .../net/ethernet/intel/ice/devlink/devlink_port.h | 12 + + drivers/net/ethernet/intel/ice/ice.h | 9 +- + drivers/net/ethernet/intel/ice/ice_adapter.c | 116 ++ + drivers/net/ethernet/intel/ice/ice_adapter.h | 28 + + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 2 + + drivers/net/ethernet/intel/ice/ice_base.c | 44 +- + drivers/net/ethernet/intel/ice/ice_common.c | 2 + + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 6 +- + drivers/net/ethernet/intel/ice/ice_ddp.c | 9 + + drivers/net/ethernet/intel/ice/ice_eswitch.c | 364 +--- + drivers/net/ethernet/intel/ice/ice_eswitch.h | 13 +- + drivers/net/ethernet/intel/ice/ice_flex_type.h | 4 +- + drivers/net/ethernet/intel/ice/ice_lag.c | 53 +- + drivers/net/ethernet/intel/ice/ice_lag.h | 3 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 50 +- + drivers/net/ethernet/intel/ice/ice_main.c | 47 +- + drivers/net/ethernet/intel/ice/ice_protocol_type.h | 12 + + drivers/net/ethernet/intel/ice/ice_ptp.c | 33 +- + drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 3 + + drivers/net/ethernet/intel/ice/ice_repr.c | 123 +- + drivers/net/ethernet/intel/ice/ice_repr.h | 24 +- + drivers/net/ethernet/intel/ice/ice_sriov.c | 3 - + drivers/net/ethernet/intel/ice/ice_switch.c | 276 ++- + drivers/net/ethernet/intel/ice/ice_switch.h | 8 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 68 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.h | 8 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 3 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 1 + + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 11 +- + drivers/net/ethernet/intel/ice/ice_type.h | 3 +- + drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c | 1 - + drivers/net/ethernet/intel/ice/ice_xsk.c | 3 +- + drivers/net/ethernet/intel/idpf/idpf_txrx.c | 5 +- + drivers/net/ethernet/intel/idpf/idpf_txrx.h | 2 + + drivers/net/ethernet/intel/idpf/virtchnl2.h | 24 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 15 - + drivers/net/ethernet/intel/igb/igb_main.c | 59 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 6 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 17 - + drivers/net/ethernet/intel/igc/igc_main.c | 59 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 19 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 3 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 8 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 27 + + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 1 + + .../ethernet/marvell/octeontx2/af/lmac_common.h | 1 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 7 +- + drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 + + drivers/net/ethernet/marvell/octeontx2/af/rpm.h | 3 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 29 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 1 + + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 28 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 50 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 1 + + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 2 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 12 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_gre.c | 8 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 6 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h | 4 +- + .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 28 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 14 +- + .../mellanox/mlx5/core/en_accel/ktls_stats.c | 26 +- + .../mellanox/mlx5/core/en_accel/macsec_stats.c | 22 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 41 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 30 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 539 ++--- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 19 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 9 +- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 2 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 4 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 7 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 97 + + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 8 +- + .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 252 ++- + .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 3 + + .../mellanox/mlx5/core/steering/dr_ste_v0.c | 2 +- + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 440 ++-- + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 4 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 3 + + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 60 + + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 56 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 10 +- + drivers/net/ethernet/microchip/encx24j600.c | 1 - + drivers/net/ethernet/microchip/lan743x_ethtool.c | 21 - + drivers/net/ethernet/microchip/lan743x_main.c | 7 + + .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 68 + + drivers/net/ethernet/microchip/vcap/vcap_api.c | 12 + + .../net/ethernet/microchip/vcap/vcap_api_client.h | 2 + + drivers/net/ethernet/netronome/nfp/flower/action.c | 27 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 5 +- + .../net/ethernet/netronome/nfp/nfp_net_debugdump.c | 41 +- + drivers/net/ethernet/qlogic/qed/qed.h | 2 - + drivers/net/ethernet/qlogic/qed/qed_main.c | 12 +- + drivers/net/ethernet/realtek/r8169_main.c | 2 + + drivers/net/ethernet/renesas/ravb_main.c | 9 +- + drivers/net/ethernet/sis/Kconfig | 4 +- + drivers/net/ethernet/smsc/Kconfig | 2 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 2 - + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20 +- + drivers/net/ethernet/ti/Kconfig | 17 +- + drivers/net/ethernet/ti/Makefile | 9 + + drivers/net/ethernet/ti/icssg/icssg_classifier.c | 113 +- + drivers/net/ethernet/ti/icssg/icssg_common.c | 1221 ++++++++++++ + drivers/net/ethernet/ti/icssg/icssg_config.c | 14 +- + drivers/net/ethernet/ti/icssg/icssg_config.h | 56 + + drivers/net/ethernet/ti/icssg/icssg_ethtool.c | 12 + + drivers/net/ethernet/ti/icssg/icssg_prueth.c | 1189 +---------- + drivers/net/ethernet/ti/icssg/icssg_prueth.h | 79 +- + drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c | 1181 +++++++++++ + drivers/net/ethernet/via/Kconfig | 1 + + drivers/net/ethernet/xilinx/xilinx_axienet.h | 4 +- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 23 +- + drivers/net/ethernet/xircom/Kconfig | 2 +- + drivers/net/fddi/defxx.c | 2 +- + drivers/net/geneve.c | 44 +- + drivers/net/hamradio/Kconfig | 6 +- + drivers/net/ipvlan/ipvlan_main.c | 1 + + drivers/net/mdio/mdio-gpio.c | 3 +- + drivers/net/netdevsim/ethtool.c | 11 + + drivers/net/netdevsim/netdev.c | 49 + + drivers/net/pcs/pcs-rzn1-miic.c | 28 + + drivers/net/pfcp.c | 301 +++ + drivers/net/phy/Kconfig | 5 + + drivers/net/phy/Makefile | 3 +- + drivers/net/phy/air_en8811h.c | 1086 ++++++++++ + drivers/net/phy/aquantia/aquantia_main.c | 21 + + drivers/net/phy/dp83822.c | 37 +- + drivers/net/phy/marvell-88x2222.c | 2 + + drivers/net/phy/marvell.c | 316 +++ + drivers/net/phy/marvell10g.c | 2 + + drivers/net/phy/micrel.c | 381 +++- + drivers/net/phy/phy_device.c | 55 + + drivers/net/phy/phy_link_topology.c | 105 + + drivers/net/phy/phylink.c | 28 +- + drivers/net/phy/qcom/at803x.c | 5 +- + drivers/net/phy/qcom/qca807x.c | 2 + + drivers/net/phy/sfp-bus.c | 15 +- + drivers/net/team/Makefile | 1 + + drivers/net/team/{team.c => team_core.c} | 63 +- + drivers/net/team/team_nl.c | 59 + + drivers/net/team/team_nl.h | 29 + + drivers/net/usb/ax88179_178a.c | 1 - + drivers/net/usb/lan78xx.c | 42 +- + drivers/net/vxlan/vxlan_core.c | 14 +- + drivers/net/wan/Kconfig | 2 +- + drivers/net/wan/fsl_qmc_hdlc.c | 6 +- + drivers/net/wireguard/main.c | 2 +- + drivers/net/wireless/ath/ath10k/thermal.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi.c | 26 +- + drivers/net/wireless/ath/ath11k/Makefile | 3 +- + drivers/net/wireless/ath/ath11k/core.c | 20 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 4 +- + drivers/net/wireless/ath/ath11k/mac.c | 175 +- + drivers/net/wireless/ath/ath11k/mhi.c | 17 +- + drivers/net/wireless/ath/ath11k/p2p.c | 149 ++ + drivers/net/wireless/ath/ath11k/p2p.h | 22 + + drivers/net/wireless/ath/ath11k/pci.h | 1 + + drivers/net/wireless/ath/ath11k/thermal.c | 2 +- + drivers/net/wireless/ath/ath11k/wmi.c | 107 +- + drivers/net/wireless/ath/ath11k/wmi.h | 78 +- + drivers/net/wireless/ath/ath12k/dp.c | 31 +- + drivers/net/wireless/ath/ath12k/dp.h | 7 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 140 +- + drivers/net/wireless/ath/ath12k/dp_rx.h | 1 + + drivers/net/wireless/ath/ath12k/dp_tx.c | 2 +- + drivers/net/wireless/ath/ath12k/wmi.c | 2 +- + drivers/net/wireless/ath/ath12k/wmi.h | 34 - + drivers/net/wireless/ath/ath6kl/htc_mbox.c | 3 +- + drivers/net/wireless/ath/ath6kl/htc_pipe.c | 3 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 1 + + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 2 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 4 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 6 +- + drivers/net/wireless/ath/ath9k/pci.c | 2 - + drivers/net/wireless/ath/ath9k/xmit.c | 10 +- + drivers/net/wireless/ath/wcn36xx/main.c | 4 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 4 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 7 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 4 +- + drivers/net/wireless/ath/wil6210/fw.h | 1 - + drivers/net/wireless/ath/wil6210/fw_inc.c | 4 +- + drivers/net/wireless/broadcom/b43/sysfs.c | 13 +- + drivers/net/wireless/broadcom/b43legacy/sysfs.c | 16 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 15 +- + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 2 + + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 57 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 5 +- + .../net/wireless/intel/iwlwifi/fw/api/offload.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 30 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 1 + + drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 19 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 5 + + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 6 - + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 28 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 212 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 60 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 17 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 117 +- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 30 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 39 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 38 +- + .../net/wireless/intel/iwlwifi/mvm/offloading.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 16 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 48 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 292 ++- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 53 +- + drivers/net/wireless/intel/iwlwifi/tests/devinfo.c | 26 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 1 + + drivers/net/wireless/marvell/mwl8k.c | 92 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 9 +- + drivers/net/wireless/quantenna/qtnfmac/bus.h | 2 +- + drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 13 +- + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 6 +- + .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 6 +- + drivers/net/wireless/realtek/rtw88/Kconfig | 22 + + drivers/net/wireless/realtek/rtw88/Makefile | 9 + + drivers/net/wireless/realtek/rtw88/mac.c | 6 + + drivers/net/wireless/realtek/rtw88/main.h | 3 + + drivers/net/wireless/realtek/rtw88/rtw8703b.c | 2109 ++++++++++++++++++++ + drivers/net/wireless/realtek/rtw88/rtw8703b.h | 102 + + .../net/wireless/realtek/rtw88/rtw8703b_tables.c | 902 +++++++++ + .../net/wireless/realtek/rtw88/rtw8703b_tables.h | 14 + + drivers/net/wireless/realtek/rtw88/rtw8723cs.c | 34 + + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 673 +------ + drivers/net/wireless/realtek/rtw88/rtw8723d.h | 269 +-- + drivers/net/wireless/realtek/rtw88/rtw8723x.c | 721 +++++++ + drivers/net/wireless/realtek/rtw88/rtw8723x.h | 518 +++++ + drivers/net/wireless/realtek/rtw88/rx.h | 2 + + drivers/net/wireless/realtek/rtw89/Kconfig | 15 + + drivers/net/wireless/realtek/rtw89/Makefile | 12 +- + drivers/net/wireless/realtek/rtw89/coex.c | 964 ++++++++- + drivers/net/wireless/realtek/rtw89/coex.h | 72 + + drivers/net/wireless/realtek/rtw89/core.h | 108 +- + drivers/net/wireless/realtek/rtw89/fw.c | 42 + + drivers/net/wireless/realtek/rtw89/fw.h | 27 + + drivers/net/wireless/realtek/rtw89/phy.c | 13 +- + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 154 ++ + drivers/net/wireless/ti/wl1251/cmd.h | 2 - + drivers/net/wireless/ti/wl1251/wl12xx_80211.h | 1 - + drivers/net/wireless/ti/wlcore/cmd.h | 2 - + drivers/net/wireless/ti/wlcore/sysfs.c | 11 +- + drivers/net/wireless/ti/wlcore/wl12xx_80211.h | 1 - + drivers/net/wireless/virtual/mac80211_hwsim.c | 42 +- + drivers/net/wwan/mhi_wwan_mbim.c | 1 - + drivers/nfc/nfcmrvl/spi.c | 1 - + drivers/nfc/st95hf/core.c | 28 +- + drivers/s390/cio/idset.c | 12 +- + drivers/ssb/main.c | 6 +- + fs/btrfs/free-space-cache.c | 8 +- + fs/ntfs3/bitmap.c | 4 +- + fs/ntfs3/fsntfs.c | 2 +- + fs/ntfs3/index.c | 11 +- + fs/ntfs3/ntfs_fs.h | 4 +- + fs/ntfs3/super.c | 2 +- + include/linux/bitmap.h | 91 +- + include/linux/bitops.h | 23 +- + include/linux/bpf.h | 9 +- + include/linux/compiler_types.h | 11 + + include/linux/cpumask.h | 2 +- + include/linux/etherdevice.h | 12 +- + include/linux/ethtool.h | 27 +- + include/linux/filter.h | 20 +- + include/linux/genetlink.h | 19 - + include/linux/genl_magic_struct.h | 2 +- + include/linux/ieee80211.h | 12 +- + include/linux/linkmode.h | 27 +- + include/linux/marvell_phy.h | 1 + + include/linux/mlx5/device.h | 8 +- + include/linux/mlx5/mlx5_ifc.h | 56 +- + include/linux/mmc/sdio_ids.h | 1 + + include/linux/netdevice.h | 50 +- + include/linux/phy.h | 7 + + include/linux/phy_link_topology.h | 72 + + include/linux/phy_link_topology_core.h | 25 + + include/linux/phylink.h | 42 + + include/linux/rhashtable.h | 10 +- + include/linux/rtnetlink.h | 3 + + include/linux/sfp.h | 8 +- + include/linux/skbuff.h | 49 +- + include/linux/ssb/ssb.h | 8 - + include/linux/tcp.h | 6 +- + include/linux/trace_events.h | 36 +- + include/net/af_unix.h | 32 +- + include/net/devlink.h | 14 + + include/net/dst_metadata.h | 10 +- + include/net/espintcp.h | 2 +- + include/net/flow_dissector.h | 2 +- + include/net/genetlink.h | 10 +- + include/net/gre.h | 66 +- + include/net/inet_connection_sock.h | 7 +- + include/net/inet_timewait_sock.h | 2 +- + include/net/ip6_tunnel.h | 4 +- + include/net/ip_tunnels.h | 139 +- + include/net/mac80211.h | 22 +- + include/net/netlink.h | 41 +- + include/net/pfcp.h | 90 + + include/net/pkt_cls.h | 9 + + include/net/route.h | 9 +- + include/net/rps.h | 28 + + include/net/sch_generic.h | 4 + + include/net/scm.h | 9 + + include/net/smc.h | 3 - + include/net/sock.h | 10 +- + include/net/tcp.h | 17 +- + include/net/tls.h | 2 +- + include/net/udp_tunnel.h | 4 +- + include/trace/bpf_probe.h | 3 +- + include/trace/events/mdio.h | 2 +- + include/trace/events/net_probe_common.h | 71 + + include/trace/events/sock.h | 37 +- + include/trace/events/tcp.h | 114 +- + include/trace/events/udp.h | 29 +- + include/uapi/linux/bpf.h | 6 +- + include/uapi/linux/devlink.h | 1 + + include/uapi/linux/ethtool.h | 16 + + include/uapi/linux/ethtool_netlink.h | 30 +- + include/uapi/linux/if_team.h | 158 +- + include/uapi/linux/if_tunnel.h | 36 + + include/uapi/linux/mptcp.h | 4 + + include/uapi/linux/nl80211.h | 236 +-- + include/uapi/linux/pkt_cls.h | 14 + + kernel/bpf/bpf_struct_ops.c | 10 +- + kernel/bpf/cgroup.c | 2 - + kernel/bpf/core.c | 32 +- + kernel/bpf/helpers.c | 4 + + kernel/bpf/lpm_trie.c | 18 +- + kernel/bpf/syscall.c | 22 +- + kernel/bpf/trampoline.c | 15 +- + kernel/bpf/verifier.c | 31 +- + kernel/trace/bpf_trace.c | 52 +- + kernel/trace/trace_probe.c | 2 - + lib/math/prime_numbers.c | 2 - + lib/test_bitmap.c | 203 +- + net/8021q/vlan_netlink.c | 10 +- + net/Kconfig | 3 + + net/atm/clip.c | 2 +- + net/atm/common.c | 2 +- + net/ax25/Kconfig | 2 +- + net/batman-adv/main.c | 2 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/netlink.c | 1 - + net/batman-adv/originator.c | 2 + + net/batman-adv/translation-table.c | 47 +- + net/bpf/bpf_dummy_struct_ops.c | 4 +- + net/bridge/br_netfilter_hooks.c | 3 +- + net/bridge/br_vlan_tunnel.c | 9 +- + net/caif/cfctrl.c | 8 +- + net/core/Makefile | 2 +- + net/core/bpf_sk_storage.c | 23 +- + net/core/datagram.c | 19 - + net/core/dev.c | 324 ++- + net/core/dev.h | 23 +- + net/core/filter.c | 28 +- + net/core/flow_dissector.c | 20 +- + net/core/net-procfs.c | 3 +- + net/core/net-sysfs.c | 6 +- + net/core/{gso_test.c => net_test.c} | 129 +- + net/core/page_pool.c | 38 +- + net/core/rtnetlink.c | 15 +- + net/core/scm.c | 11 + + net/core/skbuff.c | 116 +- + net/core/sock.c | 13 +- + net/dccp/ipv4.c | 2 +- + net/dccp/ipv6.c | 6 - + net/dccp/output.c | 2 +- + net/devlink/core.c | 6 +- + net/devlink/dev.c | 14 +- + net/devlink/port.c | 53 + + net/ethtool/netlink.c | 48 +- + net/ethtool/netlink.h | 5 + + net/ethtool/tsinfo.c | 52 +- + net/ipv4/arp.c | 9 +- + net/ipv4/esp4.c | 2 +- + net/ipv4/fou_bpf.c | 2 +- + net/ipv4/gre_demux.c | 2 +- + net/ipv4/igmp.c | 3 +- + net/ipv4/inet_fragment.c | 4 +- + net/ipv4/inet_timewait_sock.c | 16 +- + net/ipv4/ip_gre.c | 144 +- + net/ipv4/ip_tunnel.c | 111 +- + net/ipv4/ip_tunnel_core.c | 82 +- + net/ipv4/ip_vti.c | 41 +- + net/ipv4/ipip.c | 33 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/syncookies.c | 3 +- + net/ipv4/tcp.c | 23 +- + net/ipv4/tcp_input.c | 59 +- + net/ipv4/tcp_ipv4.c | 21 +- + net/ipv4/tcp_minisocks.c | 10 +- + net/ipv4/tcp_offload.c | 4 +- + net/ipv4/tcp_output.c | 18 +- + net/ipv4/tcp_timer.c | 4 +- + net/ipv4/udp.c | 34 +- + net/ipv4/udp_tunnel_core.c | 5 +- + net/ipv6/addrconf.c | 3 +- + net/ipv6/addrlabel.c | 18 +- + net/ipv6/esp6.c | 2 +- + net/ipv6/ip6_fib.c | 51 +- + net/ipv6/ip6_gre.c | 85 +- + net/ipv6/ip6_tunnel.c | 14 +- + net/ipv6/ip6_vti.c | 12 +- + net/ipv6/sit.c | 38 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/tcp_ipv6.c | 24 +- + net/ipv6/udp.c | 3 +- + net/iucv/af_iucv.c | 2 +- + net/iucv/iucv.c | 26 +- + net/mac80211/chan.c | 34 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/drop.h | 3 +- + net/mac80211/ht.c | 2 +- + net/mac80211/ieee80211_i.h | 8 +- + net/mac80211/link.c | 7 +- + net/mac80211/mlme.c | 82 +- + net/mac80211/rx.c | 4 +- + net/mac80211/scan.c | 16 +- + net/mac80211/spectmgmt.c | 18 +- + net/mac80211/status.c | 22 +- + net/mac80211/tx.c | 6 +- + net/mac80211/util.c | 14 +- + net/mpls/af_mpls.c | 2 +- + net/mptcp/options.c | 1 + + net/mptcp/protocol.c | 9 +- + net/mptcp/protocol.h | 5 +- + net/mptcp/sockopt.c | 18 +- + net/mptcp/subflow.c | 30 +- + net/netfilter/ipvs/ip_vs_core.c | 6 +- + net/netfilter/ipvs/ip_vs_xmit.c | 20 +- + net/netfilter/nft_tunnel.c | 44 +- + net/netlink/af_netlink.c | 2 +- + net/netlink/genetlink.c | 2 + + net/netlink/genetlink.h | 11 + + net/openvswitch/datapath.c | 1 - + net/openvswitch/flow_netlink.c | 61 +- + net/openvswitch/meter.h | 1 - + net/packet/af_packet.c | 26 +- + net/psample/psample.c | 26 +- + net/rfkill/rfkill-gpio.c | 6 +- + net/rxrpc/af_rxrpc.c | 2 +- + net/sched/act_tunnel_key.c | 36 +- + net/sched/cls_api.c | 41 + + net/sched/cls_flower.c | 134 +- + net/sched/sch_cake.c | 2 +- + net/sched/sch_mqprio.c | 6 +- + net/sched/sch_taprio.c | 5 +- + net/sctp/socket.c | 2 +- + net/smc/af_smc.c | 6 +- + net/smc/smc_clc.c | 6 +- + net/smc/smc_clc.h | 26 +- + net/smc/smc_rx.c | 4 +- + net/tls/Kconfig | 1 + + net/unix/af_unix.c | 80 +- + net/unix/garbage.c | 693 ++++--- + net/wireless/scan.c | 54 +- + scripts/kernel-doc | 1 + + tools/bpf/bpftool/Makefile | 14 +- + tools/bpf/bpftool/gen.c | 3 +- + tools/bpf/bpftool/pids.c | 19 +- + tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 4 +- + tools/include/linux/align.h | 12 + + tools/include/linux/bitmap.h | 9 +- + tools/include/linux/bitops.h | 2 + + tools/include/linux/compiler.h | 4 + + tools/include/linux/mm.h | 5 +- + tools/include/uapi/linux/bpf.h | 6 +- + tools/lib/bpf/bpf.c | 16 +- + tools/lib/bpf/bpf.h | 9 + + tools/lib/bpf/libbpf.c | 111 +- + tools/lib/bpf/libbpf.h | 11 + + tools/lib/bpf/libbpf.map | 2 + + tools/net/ynl/ethtool.py | 19 +- + tools/net/ynl/lib/ynl.h | 12 + + tools/net/ynl/lib/ynl.py | 77 +- + tools/net/ynl/samples/netdev.c | 2 + + tools/net/ynl/ynl-gen-c.py | 18 +- + tools/net/ynl/ynl-gen-rst.py | 62 +- + tools/perf/util/probe-finder.c | 4 +- + tools/testing/selftests/Makefile | 10 +- + tools/testing/selftests/bpf/Makefile | 1 - + .../bpf/benchs/bench_local_storage_create.c | 2 +- + tools/testing/selftests/bpf/benchs/bench_trigger.c | 48 +- + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 114 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 13 +- + .../selftests/bpf/prog_tests/btf_map_in_map.c | 26 +- + .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 216 +- + .../bpf/prog_tests/test_struct_ops_module.c | 47 + + tools/testing/selftests/bpf/progs/iters.c | 2 +- + .../selftests/bpf/progs/struct_ops_module.c | 16 +- + .../testing/selftests/bpf/progs/test_bpf_cookie.c | 16 + + .../selftests/bpf/progs/test_ns_current_pid_tgid.c | 31 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 39 +- + tools/testing/selftests/bpf/test_cpp.cpp | 5 + + tools/testing/selftests/bpf/test_tc_tunnel.sh | 13 +- + tools/testing/selftests/drivers/net/Makefile | 7 + + tools/testing/selftests/drivers/net/README.rst | 30 + + tools/testing/selftests/drivers/net/hw/Makefile | 25 + + .../{net => drivers/net/hw}/devlink_port_split.py | 0 + .../{net/forwarding => drivers/net/hw}/ethtool.sh | 5 +- + .../net/hw}/ethtool_extended_state.sh | 5 +- + .../forwarding => drivers/net/hw}/ethtool_lib.sh | 0 + .../forwarding => drivers/net/hw}/ethtool_mm.sh | 3 +- + .../forwarding => drivers/net/hw}/ethtool_rmon.sh | 7 +- + .../forwarding => drivers/net/hw}/hw_stats_l3.sh | 19 +- + .../net/hw}/hw_stats_l3_gre.sh | 7 +- + .../{net/forwarding => drivers/net/hw}/loopback.sh | 5 +- + tools/testing/selftests/drivers/net/hw/settings | 1 + + .../selftests/drivers/net/lib/py/__init__.py | 17 + + tools/testing/selftests/drivers/net/lib/py/env.py | 52 + + .../selftests/drivers/net/mlxsw/mlxsw_lib.sh | 2 +- + .../drivers/net/mlxsw/spectrum-2/resource_scale.sh | 1 - + .../drivers/net/mlxsw/spectrum/resource_scale.sh | 1 - + tools/testing/selftests/drivers/net/stats.py | 86 + + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 13 +- + tools/testing/selftests/net/af_unix/Makefile | 2 +- + tools/testing/selftests/net/af_unix/scm_rights.c | 286 +++ + .../{bpf/test_offload.py => net/bpf_offload.py} | 138 +- + tools/testing/selftests/net/fib_rule_tests.sh | 46 +- + tools/testing/selftests/net/forwarding/Makefile | 9 +- + tools/testing/selftests/net/forwarding/README | 33 + + .../net/forwarding/forwarding.config.sample | 53 +- + tools/testing/selftests/net/forwarding/ipip_lib.sh | 1 - + tools/testing/selftests/net/forwarding/lib.sh | 255 ++- + .../selftests/net/forwarding/lib_sh_test.sh | 208 ++ + .../net/forwarding/router_mpath_nh_lib.sh | 12 +- + .../selftests/net/forwarding/sch_ets_tests.sh | 19 +- + tools/testing/selftests/net/forwarding/sch_red.sh | 10 +- + .../selftests/net/forwarding/sch_tbf_core.sh | 2 +- + .../testing/selftests/net/forwarding/tc_common.sh | 2 +- + .../selftests/net/forwarding/tc_tunnel_key.sh | 2 - + tools/testing/selftests/net/lib.sh | 48 +- + tools/testing/selftests/net/lib/Makefile | 8 + + tools/testing/selftests/net/lib/py/__init__.py | 7 + + tools/testing/selftests/net/lib/py/consts.py | 9 + + tools/testing/selftests/net/lib/py/ksft.py | 96 + + tools/testing/selftests/net/lib/py/nsim.py | 120 ++ + tools/testing/selftests/net/lib/py/utils.py | 47 + + tools/testing/selftests/net/lib/py/ynl.py | 49 + + tools/testing/selftests/net/mptcp/diag.sh | 53 + + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 155 +- + tools/testing/selftests/net/mptcp/mptcp_lib.sh | 135 ++ + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 34 +- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 281 ++- + tools/testing/selftests/net/mptcp/simult_flows.sh | 20 +- + tools/testing/selftests/net/nl_netdev.py | 24 + + .../sample_map_ret0.bpf.c} | 2 +- + .../progs/sample_ret0.c => net/sample_ret0.bpf.c} | 3 + + 686 files changed, 24997 insertions(+), 9127 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/airoha,en8811h.yaml + create mode 100644 Documentation/netlink/specs/team.yaml + rename drivers/net/ethernet/intel/ice/{ice_devlink.c => devlink/devlink.c} (77%) + rename drivers/net/ethernet/intel/ice/{ice_devlink.h => devlink/devlink.h} (100%) + create mode 100644 drivers/net/ethernet/intel/ice/devlink/devlink_port.c + create mode 100644 drivers/net/ethernet/intel/ice/devlink/devlink_port.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_adapter.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_adapter.h + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_common.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c + create mode 100644 drivers/net/pfcp.c + create mode 100644 drivers/net/phy/air_en8811h.c + create mode 100644 drivers/net/phy/phy_link_topology.c + rename drivers/net/team/{team.c => team_core.c} (97%) + create mode 100644 drivers/net/team/team_nl.c + create mode 100644 drivers/net/team/team_nl.h + create mode 100644 drivers/net/wireless/ath/ath11k/p2p.c + create mode 100644 drivers/net/wireless/ath/ath11k/p2p.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b_tables.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b_tables.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723cs.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723x.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723x.h + delete mode 100644 include/linux/genetlink.h + create mode 100644 include/linux/phy_link_topology.h + create mode 100644 include/linux/phy_link_topology_core.h + create mode 100644 include/net/pfcp.h + rename net/core/{gso_test.c => net_test.c} (67%) + create mode 100644 net/netlink/genetlink.h + create mode 100644 tools/include/linux/align.h + create mode 100644 tools/testing/selftests/drivers/net/Makefile + create mode 100644 tools/testing/selftests/drivers/net/README.rst + create mode 100644 tools/testing/selftests/drivers/net/hw/Makefile + rename tools/testing/selftests/{net => drivers/net/hw}/devlink_port_split.py (100%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool.sh (98%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_extended_state.sh (96%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_lib.sh (100%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_mm.sh (99%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_rmon.sh (92%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/hw_stats_l3.sh (96%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/hw_stats_l3_gre.sh (92%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/loopback.sh (92%) + create mode 100644 tools/testing/selftests/drivers/net/hw/settings + create mode 100644 tools/testing/selftests/drivers/net/lib/py/__init__.py + create mode 100644 tools/testing/selftests/drivers/net/lib/py/env.py + create mode 100755 tools/testing/selftests/drivers/net/stats.py + create mode 100644 tools/testing/selftests/net/af_unix/scm_rights.c + rename tools/testing/selftests/{bpf/test_offload.py => net/bpf_offload.py} (93%) + create mode 100755 tools/testing/selftests/net/forwarding/lib_sh_test.sh + create mode 100644 tools/testing/selftests/net/lib/Makefile + create mode 100644 tools/testing/selftests/net/lib/py/__init__.py + create mode 100644 tools/testing/selftests/net/lib/py/consts.py + create mode 100644 tools/testing/selftests/net/lib/py/ksft.py + create mode 100644 tools/testing/selftests/net/lib/py/nsim.py + create mode 100644 tools/testing/selftests/net/lib/py/utils.py + create mode 100644 tools/testing/selftests/net/lib/py/ynl.py + create mode 100755 tools/testing/selftests/net/nl_netdev.py + rename tools/testing/selftests/{bpf/progs/sample_map_ret0.c => net/sample_map_ret0.bpf.c} (96%) + rename tools/testing/selftests/{bpf/progs/sample_ret0.c => net/sample_ret0.bpf.c} (70%) +Merging bpf-next/for-next (c53e853c2d81 Merge branch 'export send_recv_data') +$ 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 arch/x86/net/bpf_jit_comp.c +Auto-merging include/linux/bpf.h +Auto-merging include/linux/skmsg.h +Auto-merging kernel/bpf/arena.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging net/core/filter.c +Auto-merging net/core/sock_map.c +Auto-merging tools/testing/selftests/bpf/Makefile +Merge made by the 'ort' strategy. + .../bpf/standardization/instruction-set.rst | 47 +- + arch/arm64/net/bpf_jit_comp.c | 86 +- + arch/riscv/net/bpf_jit.h | 2 + + arch/riscv/net/bpf_jit_comp64.c | 203 +- + arch/riscv/net/bpf_jit_core.c | 2 + + arch/x86/net/bpf_jit_comp.c | 92 +- + include/linux/bpf.h | 6 + + include/linux/bpf_verifier.h | 9 +- + include/linux/filter.h | 30 +- + include/linux/skmsg.h | 4 + + include/trace/events/bpf_test_run.h | 17 + + include/uapi/linux/bpf.h | 31 +- + kernel/bpf/arena.c | 2 +- + kernel/bpf/arraymap.c | 33 + + kernel/bpf/core.c | 16 +- + kernel/bpf/cpumask.c | 1 + + kernel/bpf/disasm.c | 14 + + kernel/bpf/hashtab.c | 22 + + kernel/bpf/helpers.c | 2 + + kernel/bpf/log.c | 4 +- + kernel/bpf/lpm_trie.c | 13 +- + kernel/bpf/syscall.c | 4 + + kernel/bpf/trampoline.c | 3 +- + kernel/bpf/verifier.c | 166 +- + kernel/trace/bpf_trace.c | 4 - + net/bpf/test_run.c | 8 + + net/core/filter.c | 15 +- + net/core/sock_map.c | 263 ++- + net/ipv4/tcp_bbr.c | 4 - + net/ipv4/tcp_cubic.c | 4 - + net/ipv4/tcp_dctcp.c | 4 - + tools/bpf/bpftool/Documentation/Makefile | 6 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 100 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 193 +- + .../bpf/bpftool/Documentation/bpftool-feature.rst | 99 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 284 ++- + tools/bpf/bpftool/Documentation/bpftool-iter.rst | 52 +- + tools/bpf/bpftool/Documentation/bpftool-link.rst | 73 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 232 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 98 +- + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 34 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 374 ++-- + .../bpftool/Documentation/bpftool-struct_ops.rst | 71 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 60 +- + tools/bpf/bpftool/Documentation/common_options.rst | 26 +- + tools/bpf/bpftool/common.c | 96 +- + tools/bpf/bpftool/feature.c | 3 +- + tools/bpf/bpftool/gen.c | 4 +- + tools/bpf/bpftool/iter.c | 2 +- + tools/bpf/bpftool/link.c | 9 + + tools/bpf/bpftool/main.h | 3 +- + tools/bpf/bpftool/prog.c | 5 +- + tools/bpf/bpftool/struct_ops.c | 2 +- + tools/include/linux/filter.h | 18 + + tools/include/uapi/linux/bpf.h | 31 +- + tools/include/uapi/linux/ethtool.h | 2261 +++++++++++++++++++- + tools/lib/bpf/bpf_core_read.h | 2 +- + tools/lib/bpf/libbpf.c | 33 +- + tools/lib/bpf/libbpf.h | 14 + + tools/lib/bpf/libbpf.map | 7 + + tools/lib/bpf/libbpf_internal.h | 5 - + tools/lib/bpf/libbpf_probes.c | 6 +- + tools/lib/bpf/libbpf_version.h | 2 +- + tools/lib/bpf/ringbuf.c | 55 +- + tools/testing/selftests/bpf/DENYLIST.aarch64 | 3 +- + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + tools/testing/selftests/bpf/Makefile | 6 +- + tools/testing/selftests/bpf/bench.c | 33 +- + tools/testing/selftests/bpf/benchs/bench_trigger.c | 389 ++-- + .../selftests/bpf/benchs/run_bench_trigger.sh | 22 +- + .../selftests/bpf/benchs/run_bench_uprobes.sh | 2 +- + tools/testing/selftests/bpf/bpf_experimental.h | 11 + + tools/testing/selftests/bpf/cgroup_helpers.c | 2 +- + tools/testing/selftests/bpf/config | 2 + + tools/testing/selftests/bpf/network_helpers.c | 150 ++ + tools/testing/selftests/bpf/network_helpers.h | 6 + + .../selftests/bpf/prog_tests/arena_atomics.c | 186 ++ + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 96 +- + .../testing/selftests/bpf/prog_tests/fib_lookup.c | 132 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 1 - + tools/testing/selftests/bpf/prog_tests/for_each.c | 62 + + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 260 ++- + tools/testing/selftests/bpf/prog_tests/ksyms.c | 30 +- + tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 + + .../testing/selftests/bpf/prog_tests/send_signal.c | 2 +- + .../selftests/bpf/prog_tests/sockmap_basic.c | 171 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 38 + + .../bpf/prog_tests/stacktrace_build_id_nmi.c | 2 +- + .../bpf/prog_tests/test_struct_ops_module.c | 24 + + .../bpf/prog_tests/verifier_kfunc_prog_types.c | 11 + + tools/testing/selftests/bpf/progs/arena_atomics.c | 178 ++ + .../selftests/bpf/progs/cgrp_kfunc_common.h | 2 +- + .../selftests/bpf/progs/for_each_multi_maps.c | 49 + + tools/testing/selftests/bpf/progs/mptcpify.c | 4 + + .../selftests/bpf/progs/struct_ops_module.c | 13 + + .../selftests/bpf/progs/task_kfunc_common.h | 2 +- + tools/testing/selftests/bpf/progs/tcp_ca_kfunc.c | 121 ++ + .../selftests/bpf/progs/test_skmsg_load_helpers.c | 27 +- + .../selftests/bpf/progs/test_sockmap_pass_prog.c | 17 +- + .../bpf/progs/test_sockmap_skb_verdict_attach.c | 2 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 72 +- + .../bpf/progs/verifier_helper_restricted.c | 8 +- + .../bpf/progs/verifier_kfunc_prog_types.c | 122 ++ + .../bpf/progs/verifier_subprog_precision.c | 89 + + tools/testing/selftests/bpf/test_sockmap.c | 2 +- + tools/testing/selftests/bpf/trace_helpers.c | 46 +- + tools/testing/selftests/bpf/trace_helpers.h | 7 + + tools/testing/selftests/bpf/uprobe_multi.c | 2 +- + tools/testing/selftests/bpf/xdp_hw_metadata.c | 14 - + tools/testing/selftests/bpf/xskxceiver.c | 123 +- + tools/testing/selftests/bpf/xskxceiver.h | 12 +- + 111 files changed, 6342 insertions(+), 1585 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/arena_atomics.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/verifier_kfunc_prog_types.c + create mode 100644 tools/testing/selftests/bpf/progs/arena_atomics.c + create mode 100644 tools/testing/selftests/bpf/progs/for_each_multi_maps.c + create mode 100644 tools/testing/selftests/bpf/progs/tcp_ca_kfunc.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_kfunc_prog_types.c +Merging ipsec-next/master (267e31750ae8 Merge branch 'phy-listing-link_topology-tracking') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device) +$ 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 (ed1f164038b5 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/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (ed1f164038b5 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/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (e00fc2700a3f Bluetooth: btusb: Fix triggering coredump implementation for QCA) + 01841038e1d2 ("Bluetooth: Fix memory leak in hci_req_sync_complete()") + 2151391668d9 ("Bluetooth: ISO: Don't reject BT_ISO_QOS if parameters are unset") + 289bfd91fcf2 ("Bluetooth: SCO: Fix not validating setsockopt user input") + 35d2c39b23ff ("Bluetooth: hci_sock: Fix not validating setsockopt user input") + 5a5010485400 ("Bluetooth: ISO: Fix not validating setsockopt user input") + a95f9d212d1b ("Bluetooth: L2CAP: Fix not validating setsockopt user input") + b191fb7a3075 ("Bluetooth: hci_sync: Fix using the same interval and window for Coded PHY") + e6bb15dbae90 ("Bluetooth: l2cap: Don't double set the HCI_CONN_MGMT_CONNECTED bit") + ee77912bc0bb ("Bluetooth: RFCOMM: Fix not validating setsockopt user input") +$ 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/bluetooth.h +Auto-merging net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/iso.c +Auto-merging net/bluetooth/l2cap_core.c +Auto-merging net/bluetooth/l2cap_sock.c +Auto-merging net/bluetooth/sco.c +Merge made by the 'ort' strategy. + drivers/bluetooth/ath3k.c | 25 +++--- + drivers/bluetooth/btintel.c | 50 +++++++++-- + drivers/bluetooth/btintel.h | 6 ++ + drivers/bluetooth/btqcomsmd.c | 6 +- + drivers/bluetooth/btusb.c | 16 ++-- + drivers/bluetooth/hci_bcm.c | 8 +- + drivers/bluetooth/hci_intel.c | 25 +++--- + include/net/bluetooth/bluetooth.h | 15 +++- + include/net/bluetooth/hci_core.h | 37 ++++++-- + include/net/bluetooth/l2cap.h | 25 ++++-- + net/bluetooth/6lowpan.c | 2 +- + net/bluetooth/af_bluetooth.c | 119 ++++++++++++++++++++++++- + net/bluetooth/hci_conn.c | 117 +++++++++++++++++++++++- + net/bluetooth/hci_core.c | 46 ++++++---- + net/bluetooth/hci_event.c | 94 ++++++++++++-------- + net/bluetooth/hci_sync.c | 9 +- + net/bluetooth/iso.c | 181 ++++++++++++++++++++------------------ + net/bluetooth/l2cap_core.c | 59 +++++++------ + net/bluetooth/l2cap_sock.c | 30 +++++-- + net/bluetooth/mgmt.c | 65 +++++++++++++- + net/bluetooth/sco.c | 34 +++++-- + net/bluetooth/smp.c | 2 +- + 22 files changed, 715 insertions(+), 256 deletions(-) +Merging wireless-next/for-next (d26a0a66f929 wifi: brcmfmac: Fix spelling mistake "ivalid" -> "invalid") +$ 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 drivers/net/wireless/realtek/rtw89/pci.c +Auto-merging include/net/mac80211.h +Merge made by the 'ort' strategy. + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 6 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- + drivers/net/wireless/microchip/wilc1000/sdio.c | 5 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 9 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 193 ++++++--------------- + drivers/net/wireless/realtek/rtw88/coex.c | 4 +- + drivers/net/wireless/realtek/rtw88/fw.c | 14 +- + drivers/net/wireless/realtek/rtw88/fw.h | 2 + + drivers/net/wireless/realtek/rtw88/mac80211.c | 2 + + drivers/net/wireless/realtek/rtw88/main.c | 18 +- + drivers/net/wireless/realtek/rtw89/core.c | 24 ++- + drivers/net/wireless/realtek/rtw89/core.h | 11 ++ + drivers/net/wireless/realtek/rtw89/fw.c | 56 ++++-- + drivers/net/wireless/realtek/rtw89/fw.h | 4 +- + drivers/net/wireless/realtek/rtw89/pci.c | 91 ++++++++++ + drivers/net/wireless/realtek/rtw89/pci.h | 13 ++ + drivers/net/wireless/realtek/rtw89/phy_be.c | 18 ++ + drivers/net/wireless/realtek/rtw89/reg.h | 4 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8851be.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852be.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + + .../net/wireless/realtek/rtw89/rtw8852c_table.c | 90 +++++----- + drivers/net/wireless/realtek/rtw89/rtw8852ce.c | 23 +++ + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8922ae.c | 1 + + drivers/net/wireless/rsi/rsi_91x_sdio.c | 31 +--- + drivers/net/wireless/ti/wl1251/sdio.c | 20 +-- + include/net/mac80211.h | 54 +++--- + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/wpa.c | 12 +- + 34 files changed, 419 insertions(+), 298 deletions(-) +Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Already up to date. +Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ 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 (3ef4600f1226 mtd: maps: sa1100-flash: Prefer struct_size over open coded arithmetic) +$ 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/samsung,s5pv210-onenand.yaml | 65 ++++++++++++++++++++++ + drivers/mtd/maps/sa1100-flash.c | 6 +- + drivers/mtd/mtdcore.c | 9 ++- + drivers/mtd/parsers/redboot.c | 2 +- + 4 files changed, 75 insertions(+), 7 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/samsung,s5pv210-onenand.yaml +Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo) +$ 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. + drivers/mtd/nand/raw/davinci_nand.c | 5 ++++- + drivers/mtd/nand/raw/nand_hynix.c | 2 +- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1) +$ 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 +Already up to date. +Merging crypto/master (4ad27a8be9db crypto: jitter - Replace http with https) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Merge made by the 'ort' strategy. + .../devicetree/bindings/crypto/omap-sham.txt | 28 - + .../bindings/crypto/qcom,inline-crypto-engine.yaml | 1 + + .../bindings/crypto/starfive,jh7110-crypto.yaml | 30 +- + .../devicetree/bindings/crypto/ti,omap-sham.yaml | 56 ++ + Documentation/driver-api/crypto/iaa/iaa-crypto.rst | 96 +- + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + arch/x86/Kconfig.assembler | 10 + + arch/x86/crypto/Makefile | 3 +- + arch/x86/crypto/aes-xts-avx-x86_64.S | 838 ++++++++++++++++ + arch/x86/crypto/aesni-intel_asm.S | 5 +- + arch/x86/crypto/aesni-intel_glue.c | 294 +++++- + crypto/Kconfig | 20 - + crypto/Makefile | 2 - + crypto/acompress.c | 33 - + crypto/aead.c | 84 +- + crypto/ahash.c | 63 +- + crypto/akcipher.c | 31 - + crypto/compress.h | 3 - + crypto/{crypto_user_base.c => crypto_user.c} | 10 +- + crypto/crypto_user_stat.c | 176 ---- + crypto/ecc.c | 29 +- + crypto/ecdh.c | 2 + + crypto/ecdsa.c | 3 + + crypto/ecrdsa.c | 1 + + crypto/fips.c | 1 - + crypto/hash.h | 30 - + crypto/jitterentropy-kcapi.c | 3 +- + crypto/jitterentropy.c | 4 +- + crypto/kpp.c | 30 - + crypto/lskcipher.c | 73 +- + crypto/rng.c | 44 +- + crypto/scompress.c | 3 - + crypto/shash.c | 75 +- + crypto/sig.c | 13 - + crypto/skcipher.c | 86 +- + crypto/skcipher.h | 10 - + drivers/char/hw_random/core.c | 2 +- + drivers/char/hw_random/mxc-rnga.c | 9 +- + drivers/crypto/bcm/spu2.c | 2 +- + drivers/crypto/intel/iaa/iaa_crypto.h | 16 +- + drivers/crypto/intel/iaa/iaa_crypto_main.c | 13 +- + drivers/crypto/intel/iaa/iaa_crypto_stats.c | 183 ++-- + drivers/crypto/intel/iaa/iaa_crypto_stats.h | 8 - + .../crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c | 3 + + .../crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c | 5 + + .../crypto/intel/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 1 + + .../intel/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 1 + + .../crypto/intel/qat/qat_c62x/adf_c62x_hw_data.c | 1 + + .../intel/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 1 + + drivers/crypto/intel/qat/qat_common/Makefile | 6 +- + .../intel/qat/qat_common/adf_accel_devices.h | 88 ++ + .../crypto/intel/qat/qat_common/adf_common_drv.h | 10 + + .../intel/qat/qat_common/adf_gen2_hw_csr_data.c | 101 ++ + .../intel/qat/qat_common/adf_gen2_hw_csr_data.h | 86 ++ + .../crypto/intel/qat/qat_common/adf_gen2_hw_data.c | 97 -- + .../crypto/intel/qat/qat_common/adf_gen2_hw_data.h | 76 -- + .../intel/qat/qat_common/adf_gen4_hw_csr_data.c | 231 +++++ + .../intel/qat/qat_common/adf_gen4_hw_csr_data.h | 188 ++++ + .../crypto/intel/qat/qat_common/adf_gen4_hw_data.c | 380 ++++++-- + .../crypto/intel/qat/qat_common/adf_gen4_hw_data.h | 127 +-- + .../crypto/intel/qat/qat_common/adf_gen4_pfvf.c | 8 +- + .../crypto/intel/qat/qat_common/adf_gen4_vf_mig.c | 1010 ++++++++++++++++++++ + .../crypto/intel/qat/qat_common/adf_gen4_vf_mig.h | 10 + + .../crypto/intel/qat/qat_common/adf_mstate_mgr.c | 318 ++++++ + .../crypto/intel/qat/qat_common/adf_mstate_mgr.h | 89 ++ + .../intel/qat/qat_common/adf_pfvf_pf_proto.c | 8 +- + .../crypto/intel/qat/qat_common/adf_pfvf_utils.h | 11 + + drivers/crypto/intel/qat/qat_common/adf_rl.c | 10 +- + drivers/crypto/intel/qat/qat_common/adf_rl.h | 2 + + drivers/crypto/intel/qat/qat_common/adf_sriov.c | 7 +- + .../crypto/intel/qat/qat_common/adf_transport.c | 4 +- + drivers/crypto/intel/qat/qat_common/qat_bl.c | 6 +- + drivers/crypto/intel/qat/qat_common/qat_bl.h | 11 +- + drivers/crypto/intel/qat/qat_common/qat_mig_dev.c | 130 +++ + .../intel/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 1 + + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 1 + + drivers/crypto/nx/nx-842.c | 6 +- + drivers/crypto/nx/nx-842.h | 10 +- + drivers/crypto/starfive/Kconfig | 4 + + drivers/crypto/starfive/jh7110-aes.c | 595 ++++++++---- + drivers/crypto/starfive/jh7110-cryp.c | 43 - + drivers/crypto/starfive/jh7110-cryp.h | 10 +- + drivers/crypto/starfive/jh7110-hash.c | 285 +++--- + drivers/crypto/starfive/jh7110-rsa.c | 3 + + include/crypto/acompress.h | 73 +- + include/crypto/aead.h | 21 - + include/crypto/akcipher.h | 78 +- + include/crypto/algapi.h | 3 - + include/crypto/hash.h | 22 - + include/crypto/internal/acompress.h | 1 - + include/crypto/internal/cryptouser.h | 16 - + include/crypto/internal/scompress.h | 1 - + include/crypto/kpp.h | 58 +- + include/crypto/rng.h | 51 +- + include/crypto/skcipher.h | 25 - + include/linux/qat/qat_mig_dev.h | 31 + + include/uapi/linux/cryptouser.h | 30 +- + 98 files changed, 4669 insertions(+), 2150 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/crypto/omap-sham.txt + create mode 100644 Documentation/devicetree/bindings/crypto/ti,omap-sham.yaml + create mode 100644 arch/x86/crypto/aes-xts-avx-x86_64.S + rename crypto/{crypto_user_base.c => crypto_user.c} (98%) + delete mode 100644 crypto/crypto_user_stat.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen2_hw_csr_data.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen2_hw_csr_data.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen4_hw_csr_data.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen4_hw_csr_data.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen4_vf_mig.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_mstate_mgr.h + create mode 100644 drivers/crypto/intel/qat/qat_common/qat_mig_dev.c + delete mode 100644 include/crypto/internal/cryptouser.h + create mode 100644 include/linux/qat/qat_mig_dev.h +Merging drm/drm-next (6e1f415e7129 Merge tag 'drm-misc-next-2024-04-10' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/imagination/pvr_vm_mips.c +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-driver-panfrost-profiling | 10 + + .../bindings/display/bridge/ite,it6505.yaml | 8 +- + .../bindings/display/bridge/lvds-codec.yaml | 1 + + .../bindings/display/panel/ilitek,ili9881c.yaml | 1 + + .../bindings/display/panel/novatek,nt35950.yaml | 3 +- + .../bindings/display/panel/novatek,nt36523.yaml | 25 +- + .../bindings/display/panel/panel-common-dual.yaml | 47 + + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 4 + + .../display/panel/rocktech,jh057n00900.yaml | 2 + + .../bindings/display/panel/sony,td4353-jdi.yaml | 2 + + .../bindings/gpu/arm,mali-valhall-csf.yaml | 147 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/gpu/driver-uapi.rst | 5 + + Documentation/gpu/panfrost.rst | 9 + + MAINTAINERS | 184 +- + arch/m68k/include/asm/pgtable.h | 2 + + arch/parisc/configs/generic-32bit_defconfig | 2 +- + drivers/accel/qaic/Makefile | 2 + + drivers/accel/qaic/qaic.h | 9 + + drivers/accel/qaic/qaic_data.c | 9 + + drivers/accel/qaic/qaic_debugfs.c | 338 ++ + drivers/accel/qaic/qaic_debugfs.h | 20 + + drivers/accel/qaic/qaic_drv.c | 16 +- + drivers/gpu/drm/Kconfig | 23 +- + drivers/gpu/drm/Makefile | 29 + + drivers/gpu/drm/amd/amdgpu/Kconfig | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 + + drivers/gpu/drm/ast/Makefile | 10 +- + drivers/gpu/drm/ast/{ast_i2c.c => ast_ddc.c} | 116 +- + drivers/gpu/drm/ast/ast_ddc.h | 20 + + drivers/gpu/drm/ast/ast_drv.c | 1 + + drivers/gpu/drm/ast/ast_drv.h | 39 +- + drivers/gpu/drm/ast/ast_main.c | 1 + + drivers/gpu/drm/ast/ast_mode.c | 147 +- + drivers/gpu/drm/bridge/Kconfig | 29 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 8 +- + drivers/gpu/drm/bridge/analogix/Kconfig | 16 +- + drivers/gpu/drm/bridge/cadence/Kconfig | 8 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 3 + + drivers/gpu/drm/bridge/imx/Kconfig | 4 +- + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c | 6 +- + drivers/gpu/drm/bridge/ite-it66121.c | 23 +- + drivers/gpu/drm/bridge/synopsys/Kconfig | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 31 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 21 +- + drivers/gpu/drm/ci/test.yml | 6 +- + drivers/gpu/drm/display/Kconfig | 76 +- + drivers/gpu/drm/display/Makefile | 6 +- + drivers/gpu/drm/display/drm_dp_helper.c | 2 +- + drivers/gpu/drm/display/drm_dp_helper_internal.h | 2 +- + .../gpu/drm/display/drm_dp_mst_topology_internal.h | 4 +- + drivers/gpu/drm/display/drm_dp_tunnel.c | 10 +- + drivers/gpu/drm/drm_bridge.c | 24 +- + drivers/gpu/drm/drm_client.c | 92 +- + drivers/gpu/drm/drm_crtc_helper_internal.h | 15 +- + drivers/gpu/drm/drm_crtc_internal.h | 7 + + drivers/gpu/drm/drm_edid.c | 147 +- + drivers/gpu/drm/drm_fbdev_generic.c | 4 +- + drivers/gpu/drm/drm_gem.c | 34 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 7 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 105 +- + drivers/gpu/drm/drm_internal.h | 7 + + drivers/gpu/drm/drm_probe_helper.c | 56 + + drivers/gpu/drm/exynos/Kconfig | 4 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 - + drivers/gpu/drm/i915/Kconfig | 8 +- + drivers/gpu/drm/i915/Kconfig.debug | 4 +- + drivers/gpu/drm/imagination/pvr_vm_mips.c | 4 +- + drivers/gpu/drm/imx/ipuv3/Kconfig | 5 +- + drivers/gpu/drm/ingenic/Kconfig | 2 +- + drivers/gpu/drm/loongson/lsdc_gem.c | 13 +- + drivers/gpu/drm/mediatek/Kconfig | 6 +- + drivers/gpu/drm/meson/Kconfig | 2 +- + drivers/gpu/drm/meson/meson_vclk.c | 6 +- + drivers/gpu/drm/msm/Kconfig | 8 +- + drivers/gpu/drm/msm/msm_gem.c | 20 +- + drivers/gpu/drm/msm/msm_gem.h | 4 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 20 +- + drivers/gpu/drm/mxsfb/lcdif_drv.c | 6 +- + drivers/gpu/drm/nouveau/Kconfig | 10 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_abi16.h | 12 - + drivers/gpu/drm/nouveau/nouveau_bo.c | 43 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 2 + + drivers/gpu/drm/nouveau/nouveau_prime.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c | 2 +- + drivers/gpu/drm/omapdrm/Kconfig | 2 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 - + drivers/gpu/drm/omapdrm/omap_fbdev.c | 40 +- + drivers/gpu/drm/panel/Kconfig | 41 +- + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-edp.c | 145 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 228 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 5 +- + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 31 +- + drivers/gpu/drm/panel/panel-samsung-s6e3fa7.c | 285 ++ + drivers/gpu/drm/panel/panel-simple.c | 58 + + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 87 + + drivers/gpu/drm/panfrost/Makefile | 2 - + drivers/gpu/drm/panfrost/panfrost_debugfs.c | 21 - + drivers/gpu/drm/panfrost/panfrost_debugfs.h | 14 - + drivers/gpu/drm/panfrost/panfrost_device.h | 2 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 50 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- + drivers/gpu/drm/panthor/Kconfig | 23 + + drivers/gpu/drm/panthor/Makefile | 14 + + drivers/gpu/drm/panthor/panthor_devfreq.c | 283 ++ + drivers/gpu/drm/panthor/panthor_devfreq.h | 21 + + drivers/gpu/drm/panthor/panthor_device.c | 561 ++++ + drivers/gpu/drm/panthor/panthor_device.h | 357 ++ + drivers/gpu/drm/panthor/panthor_drv.c | 1488 +++++++++ + drivers/gpu/drm/panthor/panthor_fw.c | 1362 ++++++++ + drivers/gpu/drm/panthor/panthor_fw.h | 503 +++ + drivers/gpu/drm/panthor/panthor_gem.c | 230 ++ + drivers/gpu/drm/panthor/panthor_gem.h | 142 + + drivers/gpu/drm/panthor/panthor_gpu.c | 482 +++ + drivers/gpu/drm/panthor/panthor_gpu.h | 52 + + drivers/gpu/drm/panthor/panthor_heap.c | 597 ++++ + drivers/gpu/drm/panthor/panthor_heap.h | 39 + + drivers/gpu/drm/panthor/panthor_mmu.c | 2774 ++++++++++++++++ + drivers/gpu/drm/panthor/panthor_mmu.h | 102 + + drivers/gpu/drm/panthor/panthor_regs.h | 239 ++ + drivers/gpu/drm/panthor/panthor_sched.c | 3499 ++++++++++++++++++++ + drivers/gpu/drm/panthor/panthor_sched.h | 50 + + drivers/gpu/drm/qxl/qxl_object.c | 26 +- + drivers/gpu/drm/qxl/qxl_object.h | 2 + + drivers/gpu/drm/qxl/qxl_prime.c | 4 +- + drivers/gpu/drm/radeon/Kconfig | 8 +- + drivers/gpu/drm/radeon/radeon_prime.c | 11 - + drivers/gpu/drm/renesas/rcar-du/Kconfig | 2 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 3 - + drivers/gpu/drm/rockchip/Kconfig | 10 +- + drivers/gpu/drm/sun4i/Kconfig | 2 +- + drivers/gpu/drm/tegra/Kconfig | 8 +- + drivers/gpu/drm/tidss/tidss_kms.c | 3 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 6 - + drivers/gpu/drm/ttm/ttm_bo.c | 235 +- + drivers/gpu/drm/ttm/ttm_resource.c | 17 +- + drivers/gpu/drm/vc4/Kconfig | 10 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 4 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 27 - + drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 29 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 12 - + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 16 - + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 3 - + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 110 - + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 19 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 7 - + drivers/gpu/drm/xe/Kconfig | 13 +- + drivers/gpu/drm/xlnx/Kconfig | 8 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 4 + + drivers/video/fbdev/core/Kconfig | 6 + + include/drm/amd_asic_type.h | 3 + + include/drm/bridge/samsung-dsim.h | 4 +- + include/drm/display/drm_dp_helper.h | 15 +- + include/drm/display/drm_dp_mst_helper.h | 1 - + include/drm/drm_client.h | 10 + + include/drm/drm_debugfs_crc.h | 8 +- + include/drm/drm_edid.h | 12 +- + include/drm/drm_encoder_slave.h | 91 +- + include/drm/drm_format_helper.h | 1 + + include/drm/drm_gem.h | 3 + + include/drm/drm_gem_shmem_helper.h | 7 +- + include/drm/drm_gem_vram_helper.h | 1 - + include/drm/drm_kunit_helpers.h | 2 +- + include/drm/drm_lease.h | 2 + + include/drm/drm_of.h | 1 + + include/drm/drm_probe_helper.h | 6 + + include/drm/drm_suballoc.h | 2 +- + include/drm/gma_drm.h | 13 - + include/drm/i2c/ch7006.h | 1 + + include/drm/i2c/sil164.h | 1 + + include/drm/i915_gsc_proxy_mei_interface.h | 4 +- + include/drm/i915_hdcp_interface.h | 18 +- + include/drm/i915_pxp_tee_interface.h | 27 +- + include/drm/ttm/ttm_bo.h | 17 +- + include/drm/ttm/ttm_caching.h | 2 + + include/drm/ttm/ttm_execbuf_util.h | 7 +- + include/drm/ttm/ttm_kmap_iter.h | 4 +- + include/drm/ttm/ttm_pool.h | 5 +- + include/drm/ttm/ttm_resource.h | 6 +- + include/linux/fb.h | 4 + + include/uapi/drm/nouveau_drm.h | 22 + + include/uapi/drm/panthor_drm.h | 945 ++++++ + 185 files changed, 16638 insertions(+), 1271 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-panfrost-profiling + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-common-dual.yaml + create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-valhall-csf.yaml + create mode 100644 drivers/accel/qaic/qaic_debugfs.c + create mode 100644 drivers/accel/qaic/qaic_debugfs.h + rename drivers/gpu/drm/ast/{ast_i2c.c => ast_ddc.c} (54%) + create mode 100644 drivers/gpu/drm/ast/ast_ddc.h + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e3fa7.c + delete mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.c + delete mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.h + create mode 100644 drivers/gpu/drm/panthor/Kconfig + create mode 100644 drivers/gpu/drm/panthor/Makefile + create mode 100644 drivers/gpu/drm/panthor/panthor_devfreq.c + create mode 100644 drivers/gpu/drm/panthor/panthor_devfreq.h + create mode 100644 drivers/gpu/drm/panthor/panthor_device.c + create mode 100644 drivers/gpu/drm/panthor/panthor_device.h + create mode 100644 drivers/gpu/drm/panthor/panthor_drv.c + create mode 100644 drivers/gpu/drm/panthor/panthor_fw.c + create mode 100644 drivers/gpu/drm/panthor/panthor_fw.h + create mode 100644 drivers/gpu/drm/panthor/panthor_gem.c + create mode 100644 drivers/gpu/drm/panthor/panthor_gem.h + create mode 100644 drivers/gpu/drm/panthor/panthor_gpu.c + create mode 100644 drivers/gpu/drm/panthor/panthor_gpu.h + create mode 100644 drivers/gpu/drm/panthor/panthor_heap.c + create mode 100644 drivers/gpu/drm/panthor/panthor_heap.h + create mode 100644 drivers/gpu/drm/panthor/panthor_mmu.c + create mode 100644 drivers/gpu/drm/panthor/panthor_mmu.h + create mode 100644 drivers/gpu/drm/panthor/panthor_regs.h + create mode 100644 drivers/gpu/drm/panthor/panthor_sched.c + create mode 100644 drivers/gpu/drm/panthor/panthor_sched.h + delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c + delete mode 100644 include/drm/gma_drm.h + create mode 100644 include/uapi/drm/panthor_drm.h +Merging drm-exynos/for-linux-next (6633c7d2fd31 drm/exynos: mixer: drop driver owner initialization) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_mic.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 1 - + drivers/gpu/drm/exynos/exynos_mixer.c | 1 - + 11 files changed, 11 deletions(-) +Merging drm-misc/for-linux-next (42118c5f6853 drm/i915: Add SIZE_HINTS property for cursors) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/ast/ast_ddc.c | 30 ++++++++++------ + drivers/gpu/drm/ast/ast_ddc.h | 13 ++----- + drivers/gpu/drm/ast/ast_mode.c | 8 ++--- + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 6 ++-- + drivers/gpu/drm/drm_mode_config.c | 7 ++++ + drivers/gpu/drm/drm_plane.c | 56 +++++++++++++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_cursor.c | 24 +++++++++++++ + drivers/gpu/drm/nouveau/nouveau_dp.c | 23 +++++++++--- + drivers/gpu/drm/ttm/ttm_bo.c | 8 ++--- + include/drm/drm_mode_config.h | 5 +++ + include/drm/drm_plane.h | 4 +++ + include/uapi/drm/drm_mode.h | 11 ++++++ + 12 files changed, 156 insertions(+), 39 deletions(-) +Merging amdgpu/drm-next (526b184e8883 drm/amdgpu: differentiate external rev id for gfx 11.5.0) + 029faefb7302 ("drm/amdgpu: implement IRQ_STATE_ENABLE for SDMA v4.4.2") + 05e40141685f ("drm/amdgpu: clear set_q_mode_offs when VM changed") + 108ab31be9d5 ("drm/amdgpu/umsch: reinitialize write pointer in hw init") + 24e9727b39ca ("drm/amd/display: Do not recursively call manual trigger programming") + 27e718ac8b81 ("drm/amd/display: fix disable otg wa logic in DCN316") + 2dbe9c2b2685 ("drm/amd/display: add DCN 351 version for microcode load") + 364b1c1de6de ("drm/amd/display: Adjust dprefclk by down spread percentage.") + 4a5b171299e5 ("drm/amd/display: always reset ODM mode in context when adding first plane") + 526b184e8883 ("drm/amdgpu: differentiate external rev id for gfx 11.5.0") + 7c1d9e10e664 ("drm/amd/pm: fix the high voltage issue after unload") + 8966c3167402 ("drm/amdgpu : Increase the mes log buffer size as per new MES FW version") + 91bc86011661 ("drm/amdgpu: Fix VCN allocation in CPX partition") + af1c41858da1 ("drm/amd/display: Return max resolution supported by DWB") + cd409dbc6986 ("drm/amdgpu: Refine IB schedule error logging") + cf82a80a1456 ("drm/amd/display: Skip on writeback when it's not applicable") + d045f4ad7700 ("drm/amd/swsmu: Update smu v14.0.0 headers to be 14.0.1 compatible") + d6d6561f936b ("drm/amdgpu: fix incorrect number of active RBs for gfx11") + d7f148764355 ("drm/amdgpu: always force full reset for SOC21") + df3c7dc5c58b ("drm/amdgpu: Reset dGPU if suspend got aborted") + dfb15c4ab586 ("amd/amdkfd: sync all devices to wait all processes being evicted") + e58acb7613aa ("drm/amdgpu : Add mes_log_enable to control mes log feature") + f5a3507c4abf ("drm/amdgpu: add smu 14.0.1 discovery support") + fedb6ae49758 ("drm/amd/pm: fixes a random hang in S4 for SMU v13.0.4/11") +$ 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.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_state.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml2/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn351/dcn351_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn351/dcn351_resource.c +Auto-merging drivers/gpu/drm/amd/display/modules/info_packet/info_packet.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' +Resolved 'drivers/gpu/drm/amd/display/dc/core/dc.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c'. +[master 72cf21abda74] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/amdgpu/debugging.rst | 80 ++ + .../gpu/amdgpu/display/display-contributing.rst | 2 +- + Documentation/gpu/amdgpu/index.rst | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 146 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 345 ++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.h | 47 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 269 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 105 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 16 - + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c | 112 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 9 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 12 - + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 48 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 17 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 15 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 43 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 55 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 2 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 40 +- + drivers/gpu/drm/amd/amdgpu/si.c | 4 +- + drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.c | 62 ++ + .../dcn35/dcn35_dpp.c => amdgpu/smuio_v14_0_2.h} | 33 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 10 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 209 ++-- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 62 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 6 - + drivers/gpu/drm/amd/amdgpu/vi.c | 8 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 32 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 39 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 18 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 25 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 6 +- + drivers/gpu/drm/amd/display/Makefile | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 39 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 42 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 66 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 3 - + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 8 + + drivers/gpu/drm/amd/display/dc/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 3 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 - + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 15 +- + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 4 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 11 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 5 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 2 +- + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 5 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 3 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 3 +- + .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.h | 42 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 3 +- + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c | 9 + + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h | 3 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 41 +- + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 21 - + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h | 2 - + drivers/gpu/drm/amd/display/dc/core/dc.c | 1004 ++++++++++++------ + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 197 +++- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 62 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 20 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 65 +- + drivers/gpu/drm/amd/display/dc/dc.h | 211 ++-- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 179 +++- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 18 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_plane.h | 2 +- + drivers/gpu/drm/amd/display/dc/dc_plane_priv.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_state.h | 8 +- + drivers/gpu/drm/amd/display/dc/dc_state_priv.h | 12 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 10 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 18 +- + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_opp.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 4 - + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 4 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 7 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 10 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 10 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 1 + + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb.c | 11 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 2 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.c | 4 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 8 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h | 8 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 2 +- + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 2 - + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 2 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h | 23 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 2 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.h | 2 + + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 4 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 8 +- + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 10 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 8 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 25 +- + drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c | 207 +++- + .../amd/display/dc/dcn35/dcn35_dio_link_encoder.c | 3 +- + .../display/dc/dcn35/dcn35_dio_stream_encoder.h | 1 - + .../gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c | 4 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 10 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 7 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 1 - + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 10 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 1 + + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 1 - + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 2 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 1 - + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 267 ++--- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 14 +- + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 8 +- + .../gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c | 3 +- + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 1 + + .../drm/amd/display/dc/dml2/display_mode_core.c | 15 +- + .../drm/amd/display/dc/dml2/display_mode_core.h | 1 + + .../amd/display/dc/dml2/display_mode_lib_defines.h | 2 + + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 163 ++- + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.h | 2 + + .../drm/amd/display/dc/dml2/dml2_internal_types.h | 11 + + .../amd/display/dc/dml2/dml2_translation_helper.c | 60 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 78 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.h | 5 + + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 16 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 34 +- + drivers/gpu/drm/amd/display/dc/dpp/Makefile | 77 ++ + .../drm/amd/display/dc/dpp/dcn10/CMakeLists.txt | 6 + + .../drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.c | 2 +- + .../drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.h | 3 +- + .../amd/display/dc/{ => dpp}/dcn10/dcn10_dpp_cm.c | 4 +- + .../display/dc/{ => dpp}/dcn10/dcn10_dpp_dscl.c | 2 +- + .../drm/amd/display/dc/dpp/dcn20/CMakeLists.txt | 5 + + .../drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.c | 2 +- + .../drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.h | 2 +- + .../amd/display/dc/{ => dpp}/dcn20/dcn20_dpp_cm.c | 12 +- + .../drm/amd/display/dc/dpp/dcn201/CMakeLists.txt | 4 + + .../amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.c | 2 +- + .../amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.h | 0 + .../drm/amd/display/dc/dpp/dcn30/CMakeLists.txt | 5 + + .../drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.c | 22 +- + .../drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.h | 4 + + .../amd/display/dc/{ => dpp}/dcn30/dcn30_dpp_cm.c | 4 +- + .../drm/amd/display/dc/dpp/dcn32/CMakeLists.txt | 4 + + .../drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.c | 2 +- + .../drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.h | 0 + .../drm/amd/display/dc/dpp/dcn35/CMakeLists.txt | 4 + + .../gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.c | 112 ++ + .../drm/amd/display/dc/{ => dpp}/dcn35/dcn35_dpp.h | 9 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 8 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 7 +- + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 13 - + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 50 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 40 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 112 +- + .../gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 70 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 5 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 85 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 107 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 8 +- + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 4 +- + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 3 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 13 +- + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 28 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 2 - + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 12 +- + drivers/gpu/drm/amd/display/dc/inc/hw/optc.h | 2 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 7 + + drivers/gpu/drm/amd/display/dc/inc/hw/vpg.h | 53 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 17 + + .../amd/display/dc/link/accessories/link_dp_cts.c | 2 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 8 +- + .../display/dc/link/protocols/link_dp_dpia_bw.c | 4 +- + .../display/dc/link/protocols/link_dp_training.c | 16 +- + .../dc/link/protocols/link_dp_training_dpia.c | 4 +- + .../dc/link/protocols/link_edp_panel_control.c | 71 +- + .../dc/link/protocols/link_edp_panel_control.h | 4 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c | 3 + + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 9 +- + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 165 ++- + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.h | 6 +- + drivers/gpu/drm/amd/display/dc/resource/Makefile | 6 - + .../display/dc/resource/dce112/dce112_resource.c | 2 - + .../display/dc/resource/dce120/dce120_resource.c | 2 +- + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 7 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 2 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 7 +- + .../display/dc/resource/dcn314/dcn314_resource.c | 21 +- + .../display/dc/resource/dcn316/dcn316_resource.c | 3 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 116 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.h | 6 +- + .../display/dc/resource/dcn321/dcn321_resource.c | 41 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 22 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.h | 2 + + .../display/dc/resource/dcn351/dcn351_resource.c | 19 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 17 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 168 ++- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 1 + + .../gpu/drm/amd/display/include/grph_object_id.h | 4 +- + .../drm/amd/display/include/link_service_types.h | 1 - + drivers/gpu/drm/amd/display/include/logger_types.h | 1 + + .../drm/amd/display/modules/color/color_gamma.c | 2 +- + .../drm/amd/display/modules/freesync/freesync.c | 8 +- + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 2 +- + .../amd/display/modules/info_packet/info_packet.c | 2 - + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 24 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 9 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_offset.h | 20 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h | 8 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_offset.h | 28 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h | 18 + + .../amd/include/asic_reg/dcn/dcn_3_1_2_offset.h | 4 + + .../amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 19 + + .../amd/include/asic_reg/dcn/dcn_3_2_0_offset.h | 60 ++ + .../amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h | 27 + + .../amd/include/asic_reg/dcn/dcn_3_2_1_offset.h | 37 +- + .../amd/include/asic_reg/dcn/dcn_3_2_1_sh_mask.h | 16 + + .../amd/include/asic_reg/dpcs/dpcs_3_0_3_sh_mask.h | 4 +- + .../amd/include/asic_reg/dpcs/dpcs_4_2_0_offset.h | 10 + + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 4 + + .../include/asic_reg/smuio/smuio_14_0_2_offset.h | 511 +++++++++ + .../include/asic_reg/smuio/smuio_14_0_2_sh_mask.h | 1106 ++++++++++++++++++++ + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 3 +- + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 21 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 8 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 224 ++-- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 6 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 41 + + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 6 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_baco.c | 6 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_baco.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 2 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu9_baco.c | 8 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu9_baco.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.c | 8 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 2 +- + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 7 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 13 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h | 6 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 7 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 18 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 22 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 21 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 78 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 16 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 6 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 67 +- + drivers/gpu/drm/radeon/radeon.h | 1 - + drivers/gpu/drm/radeon/radeon_display.c | 8 +- + 344 files changed, 7574 insertions(+), 2529 deletions(-) + create mode 100644 Documentation/gpu/amdgpu/debugging.rst + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.c + rename drivers/gpu/drm/amd/{display/dc/dcn35/dcn35_dpp.c => amdgpu/smuio_v14_0_2.h} (56%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn10/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp_cm.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp_dscl.c (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn20/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp_cm.c (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn201/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn30/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp_cm.c (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn32/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn35/CMakeLists.txt + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.c + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn35/dcn35_dpp.h (87%) + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/vpg.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_14_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_14_0_2_sh_mask.h +Merging drm-intel/for-linux-next (578ff98403ce drm/i915: Allow bigjoiner for MST) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/display/drm_dp_helper.c +Auto-merging drivers/gpu/drm/display/drm_dp_tunnel.c +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/i915/display/intel_cdclk.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_cdclk.c +Auto-merging drivers/gpu/drm/i915/display/intel_cdclk.h +Auto-merging drivers/gpu/drm/i915/display/intel_cursor.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_device.h +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_hdcp.c +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_psr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/i915/display/intel_vrr.c +Auto-merging drivers/gpu/drm/i915/gt/gen8_ppgtt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_regs.h +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_uc.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_dp.c +Auto-merging drivers/gpu/drm/xe/xe_device_types.h +Auto-merging include/drm/display/drm_dp_helper.h +Auto-merging include/drm/display/drm_dp_mst_helper.h +Resolved 'drivers/gpu/drm/i915/display/intel_cdclk.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/i915/display/intel_dp_mst.c' +Resolved 'drivers/gpu/drm/i915/display/intel_psr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/display/intel_dp_mst.c'. +[master 9828320f5c5e] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/rfc/i915_vm_bind.h | 11 +- + drivers/gpu/drm/display/drm_dp_helper.c | 37 ++ + drivers/gpu/drm/display/drm_dp_mst_topology.c | 20 +- + drivers/gpu/drm/display/drm_dp_tunnel.c | 7 +- + drivers/gpu/drm/i915/Makefile | 5 - + drivers/gpu/drm/i915/display/icl_dsi.c | 3 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 10 +- + drivers/gpu/drm/i915/display/intel_bios.c | 198 ++++-- + drivers/gpu/drm/i915/display/intel_bw.h | 3 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 204 +++++-- + drivers/gpu/drm/i915/display/intel_cdclk.h | 12 +- + .../gpu/drm/i915/display/intel_combo_phy_regs.h | 117 ++-- + drivers/gpu/drm/i915/display/intel_crt.c | 5 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 333 +++++----- + drivers/gpu/drm/i915/display/intel_cursor.c | 24 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 367 +++++------ + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 3 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 231 ++++--- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 18 +- + drivers/gpu/drm/i915/display/intel_de.h | 20 +- + drivers/gpu/drm/i915/display/intel_display.c | 672 +++++++++++++-------- + drivers/gpu/drm/i915/display/intel_display.h | 22 + + drivers/gpu/drm/i915/display/intel_display_core.h | 12 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 87 +-- + .../gpu/drm/i915/display/intel_display_device.c | 5 + + .../gpu/drm/i915/display/intel_display_device.h | 1 + + drivers/gpu/drm/i915/display/intel_display_irq.c | 57 +- + .../drm/i915/display/intel_display_power_well.c | 66 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 19 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 8 - + drivers/gpu/drm/i915/display/intel_dmc.c | 13 +- + drivers/gpu/drm/i915/display/intel_dp.c | 303 ++++++++-- + drivers/gpu/drm/i915/display/intel_dp.h | 5 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 15 +- + drivers/gpu/drm/i915/display/intel_dp_aux.h | 1 + + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 17 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 140 +++-- + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 7 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 127 ++-- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 2 + + drivers/gpu/drm/i915/display/intel_dsb.c | 5 +- + drivers/gpu/drm/i915/display/intel_dsi.c | 5 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 5 +- + drivers/gpu/drm/i915/display/intel_fb.c | 6 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 32 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 5 + + .../i915/{i915_fixed.h => display/intel_fixed.h} | 0 + drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 6 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 96 +-- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 5 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 58 +- + drivers/gpu/drm/i915/display/intel_opregion.h | 6 + + drivers/gpu/drm/i915/display/intel_overlay.c | 7 +- + drivers/gpu/drm/i915/display/intel_pmdemand.c | 14 +- + drivers/gpu/drm/i915/display/intel_pmdemand.h | 5 +- + drivers/gpu/drm/i915/display/intel_pps.c | 34 +- + drivers/gpu/drm/i915/display/intel_pps.h | 2 + + drivers/gpu/drm/i915/display/intel_psr.c | 454 +++++++++++--- + drivers/gpu/drm/i915/display/intel_psr.h | 5 + + drivers/gpu/drm/i915/display/intel_psr_regs.h | 12 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 9 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 16 +- + drivers/gpu/drm/i915/display/intel_snps_phy.h | 4 +- + drivers/gpu/drm/i915/display/intel_tc.c | 33 +- + drivers/gpu/drm/i915/display/intel_tv.c | 8 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 36 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 33 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 7 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 320 +++++++--- + drivers/gpu/drm/i915/display/skl_watermark.h | 13 +- + drivers/gpu/drm/i915/display/skl_watermark_regs.h | 18 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 4 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 8 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 5 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 40 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 43 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 10 +- + drivers/gpu/drm/i915/gt/intel_gsc.c | 15 - + drivers/gpu/drm/i915/gt/intel_gt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 52 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.h | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 4 - + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 59 -- + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 21 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 51 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 22 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 52 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 6 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 13 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 183 +----- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 4 - + drivers/gpu/drm/i915/i915_debugfs.c | 12 - + drivers/gpu/drm/i915/i915_drv.h | 26 +- + drivers/gpu/drm/i915/i915_getparam.c | 4 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- + drivers/gpu/drm/i915/i915_hwmon.c | 6 - + drivers/gpu/drm/i915/i915_irq.c | 8 +- + drivers/gpu/drm/i915/i915_pci.c | 66 +- + drivers/gpu/drm/i915/i915_perf.c | 19 +- + drivers/gpu/drm/i915/i915_query.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 43 +- + drivers/gpu/drm/i915/i915_utils.h | 14 - + drivers/gpu/drm/i915/intel_clock_gating.c | 59 +- + drivers/gpu/drm/i915/intel_device_info.c | 2 - + drivers/gpu/drm/i915/intel_device_info.h | 2 - + drivers/gpu/drm/i915/intel_step.c | 80 +-- + drivers/gpu/drm/i915/intel_uncore.c | 380 ++++-------- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 3 - + drivers/gpu/drm/nouveau/nouveau_dp.c | 2 +- + drivers/gpu/drm/xe/Makefile | 3 - + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 40 -- + .../gpu/drm/xe/compat-i915-headers/i915_fixed.h | 6 - + drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h | 9 - + drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h | 26 - + .../gpu/drm/xe/compat-i915-headers/intel_uc_fw.h | 11 - + drivers/gpu/drm/xe/xe_device_types.h | 16 +- + drivers/gpu/drm/xe/xe_pci.c | 1 + + include/drm/display/drm_dp.h | 11 + + include/drm/display/drm_dp_helper.h | 30 + + include/drm/display/drm_dp_mst_helper.h | 23 +- + include/drm/i915_pciids.h | 4 +- + include/uapi/drm/i915_drm.h | 16 +- + 133 files changed, 3081 insertions(+), 2943 deletions(-) + rename drivers/gpu/drm/i915/{i915_fixed.h => display/intel_fixed.h} (100%) + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_fixed.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h +Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (9dc23cba0927 drm/msm/adreno: Set highest_bank_bit for A619) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/dp/dp_display.c +Merge made by the 'ort' strategy. + .../bindings/display/msm/qcom,sm8150-mdss.yaml | 9 ++++++ + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 +++ + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 2 +- + .../drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 34 ++++++++++++++++++++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 10 +++---- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 8 ++--- + drivers/gpu/drm/msm/dp/dp_display.c | 6 ++-- + drivers/gpu/drm/msm/msm_fb.c | 6 ++-- + drivers/gpu/drm/msm/msm_kms.c | 4 +-- + 9 files changed, 63 insertions(+), 20 deletions(-) +Merging drm-msm-lumag/msm-next-lumag (ab556156cafa drm/msm: drop A6xx header) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Merge made by the 'ort' strategy. + .../bindings/display/msm/dp-controller.yaml | 1 + + .../bindings/display/msm/qcom,sm6350-mdss.yaml | 9 + + drivers/gpu/drm/msm/.gitignore | 1 + + drivers/gpu/drm/msm/Makefile | 99 +- + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 3251 ----- + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 4 +- + drivers/gpu/drm/msm/adreno/a2xx_gpu.h | 4 + + .../drm/msm/{msm_gpummu.c => adreno/a2xx_gpummu.c} | 45 +- + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 3268 ----- + drivers/gpu/drm/msm/adreno/a4xx.xml.h | 4379 ------- + drivers/gpu/drm/msm/adreno/a5xx.xml.h | 5572 --------- + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 11858 ------------------- + drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 422 - + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 539 - + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 2803 ----- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 12 + + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 24 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 56 + + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 8 + + drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h | 1181 -- + drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h | 1979 ---- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h | 11 + + drivers/gpu/drm/msm/disp/mdp_common.xml.h | 111 - + drivers/gpu/drm/msm/dp/dp_audio.c | 25 +- + drivers/gpu/drm/msm/dp/dp_aux.c | 39 +- + drivers/gpu/drm/msm/dp/dp_aux.h | 1 + + drivers/gpu/drm/msm/dp/dp_catalog.c | 71 +- + drivers/gpu/drm/msm/dp/dp_catalog.h | 52 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 23 +- + drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 - + drivers/gpu/drm/msm/dp/dp_debug.c | 61 +- + drivers/gpu/drm/msm/dp/dp_debug.h | 38 +- + drivers/gpu/drm/msm/dp/dp_display.c | 105 +- + drivers/gpu/drm/msm/dp/dp_display.h | 3 - + drivers/gpu/drm/msm/dp/dp_drm.c | 2 - + drivers/gpu/drm/msm/dp/dp_link.c | 26 +- + drivers/gpu/drm/msm/dp/dp_link.h | 15 +- + drivers/gpu/drm/msm/dp/dp_panel.c | 14 +- + drivers/gpu/drm/msm/dp/dp_panel.h | 3 - + drivers/gpu/drm/msm/dsi/dsi.xml.h | 790 -- + drivers/gpu/drm/msm/dsi/dsi_phy_10nm.xml.h | 227 - + drivers/gpu/drm/msm/dsi/dsi_phy_14nm.xml.h | 309 - + drivers/gpu/drm/msm/dsi/dsi_phy_20nm.xml.h | 237 - + drivers/gpu/drm/msm/dsi/dsi_phy_28nm.xml.h | 384 - + drivers/gpu/drm/msm/dsi/dsi_phy_28nm_8960.xml.h | 286 - + drivers/gpu/drm/msm/dsi/dsi_phy_7nm.xml.h | 483 - + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 131 - + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 70 - + drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 1399 --- + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 61 - + drivers/gpu/drm/msm/msm_drv.c | 3 +- + drivers/gpu/drm/msm/msm_fb.c | 10 +- + drivers/gpu/drm/msm/msm_gpu.c | 2 +- + drivers/gpu/drm/msm/msm_mmu.h | 5 - + drivers/gpu/drm/msm/registers/.gitignore | 4 + + drivers/gpu/drm/msm/registers/adreno/a2xx.xml | 1865 +++ + drivers/gpu/drm/msm/registers/adreno/a3xx.xml | 1751 +++ + drivers/gpu/drm/msm/registers/adreno/a4xx.xml | 2409 ++++ + drivers/gpu/drm/msm/registers/adreno/a5xx.xml | 3039 +++++ + drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 4970 ++++++++ + drivers/gpu/drm/msm/registers/adreno/a6xx_gmu.xml | 228 + + .../gpu/drm/msm/registers/adreno/adreno_common.xml | 400 + + .../gpu/drm/msm/registers/adreno/adreno_pm4.xml | 2268 ++++ + drivers/gpu/drm/msm/registers/display/dsi.xml | 390 + + .../gpu/drm/msm/registers/display/dsi_phy_10nm.xml | 102 + + .../gpu/drm/msm/registers/display/dsi_phy_14nm.xml | 135 + + .../gpu/drm/msm/registers/display/dsi_phy_20nm.xml | 100 + + .../gpu/drm/msm/registers/display/dsi_phy_28nm.xml | 180 + + .../msm/registers/display/dsi_phy_28nm_8960.xml | 134 + + .../gpu/drm/msm/registers/display/dsi_phy_7nm.xml | 230 + + drivers/gpu/drm/msm/registers/display/edp.xml | 239 + + drivers/gpu/drm/msm/registers/display/hdmi.xml | 1015 ++ + drivers/gpu/drm/msm/registers/display/mdp4.xml | 504 + + drivers/gpu/drm/msm/registers/display/mdp5.xml | 806 ++ + .../gpu/drm/msm/registers/display/mdp_common.xml | 90 + + drivers/gpu/drm/msm/registers/display/msm.xml | 32 + + drivers/gpu/drm/msm/registers/display/sfpb.xml | 17 + + .../gpu/drm/msm/registers/freedreno_copyright.xml | 40 + + drivers/gpu/drm/msm/registers/gen_header.py | 961 ++ + drivers/gpu/drm/msm/registers/rules-fd.xsd | 404 + + drivers/phy/qualcomm/phy-qcom-edp.c | 76 +- + include/linux/phy/phy-dp.h | 3 + + 87 files changed, 22793 insertions(+), 40130 deletions(-) + create mode 100644 drivers/gpu/drm/msm/.gitignore + delete mode 100644 drivers/gpu/drm/msm/adreno/a2xx.xml.h + rename drivers/gpu/drm/msm/{msm_gpummu.c => adreno/a2xx_gpummu.c} (67%) + delete mode 100644 drivers/gpu/drm/msm/adreno/a3xx.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/a4xx.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/a5xx.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/a6xx.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/adreno_common.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h + delete mode 100644 drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h + delete mode 100644 drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h + delete mode 100644 drivers/gpu/drm/msm/disp/mdp_common.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_10nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_14nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_20nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_28nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_28nm_8960.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_7nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/mmss_cc.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/sfpb.xml.h + delete mode 100644 drivers/gpu/drm/msm/hdmi/hdmi.xml.h + delete mode 100644 drivers/gpu/drm/msm/hdmi/qfprom.xml.h + create mode 100644 drivers/gpu/drm/msm/registers/.gitignore + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a2xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a3xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a4xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a5xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a6xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a6xx_gmu.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/adreno_common.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/adreno_pm4.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_10nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_14nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_20nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_28nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_28nm_8960.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/edp.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/hdmi.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/mdp4.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/mdp5.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/mdp_common.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/msm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/sfpb.xml + create mode 100644 drivers/gpu/drm/msm/registers/freedreno_copyright.xml + create mode 100644 drivers/gpu/drm/msm/registers/gen_header.py + create mode 100644 drivers/gpu/drm/msm/registers/rules-fd.xsd +Merging drm-xe/drm-xe-next (4209d635a823 drm/xe: Remove devcoredump during driver release) + 117de185edf2 ("drm/xe/display: Fix double mutex initialization") + 34820967ae7b ("drm/xe/xe_migrate: Cast to output precision before multiplying operands") + 883232b47b81 ("drm/xe/hwmon: Cast result to output precision on left shift of operand") + dc30c6e7149b ("drm/xe: Label RING_CONTEXT_CONTROL as masked") +$ 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/xe/Kconfig +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +Auto-merging drivers/gpu/drm/xe/regs/xe_engine_regs.h +Auto-merging drivers/gpu/drm/xe/tests/xe_migrate.c +Auto-merging drivers/gpu/drm/xe/xe_bo.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_bo.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_device_types.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device_types.h +Auto-merging drivers/gpu/drm/xe/xe_drm_client.c +Auto-merging drivers/gpu/drm/xe/xe_exec.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_exec.c +Auto-merging drivers/gpu/drm/xe/xe_exec_queue.c +Auto-merging drivers/gpu/drm/xe/xe_exec_queue_types.h +Auto-merging drivers/gpu/drm/xe/xe_gt.c +Auto-merging drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c +Auto-merging drivers/gpu/drm/xe/xe_gt_types.h +Auto-merging drivers/gpu/drm/xe/xe_guc_submit.c +Auto-merging drivers/gpu/drm/xe/xe_hwmon.c +Auto-merging drivers/gpu/drm/xe/xe_lrc.c +Auto-merging drivers/gpu/drm/xe/xe_migrate.c +Auto-merging drivers/gpu/drm/xe/xe_mmio.c +Auto-merging drivers/gpu/drm/xe/xe_pci.c +Auto-merging drivers/gpu/drm/xe/xe_pm.c +Auto-merging drivers/gpu/drm/xe/xe_pt.c +Auto-merging drivers/gpu/drm/xe/xe_query.c +Auto-merging drivers/gpu/drm/xe/xe_ring_ops.c +Auto-merging drivers/gpu/drm/xe/xe_sched_job.c +Auto-merging drivers/gpu/drm/xe/xe_sync.c +Auto-merging drivers/gpu/drm/xe/xe_sync.h +Auto-merging drivers/gpu/drm/xe/xe_trace.h +Auto-merging drivers/gpu/drm/xe/xe_vm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c +Auto-merging drivers/gpu/drm/xe/xe_vm_types.h +Auto-merging include/uapi/drm/xe_drm.h +CONFLICT (content): Merge conflict in include/uapi/drm/xe_drm.h +Resolved 'drivers/gpu/drm/xe/xe_bo.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_device_types.h' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_exec.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_vm.c' using previous resolution. +Resolved 'include/uapi/drm/xe_drm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3f6d3b5cfeb5] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-driver-intel-xe-hwmon | 114 ++++++--- + drivers/base/devcoredump.c | 23 ++ + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 6 + + drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 7 +- + drivers/gpu/drm/xe/Makefile | 7 +- + drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 98 +++++++- + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 7 + + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 9 +- + .../drm/xe/compat-i915-headers/i915_gem_stolen.h | 2 +- + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 6 +- + drivers/gpu/drm/xe/display/intel_fb_bo.c | 8 +- + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 16 +- + drivers/gpu/drm/xe/display/xe_dsb_buffer.c | 4 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 34 +-- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 242 +++++++++++++++++- + drivers/gpu/drm/xe/display/xe_plane_initial.c | 7 +- + .../drm/xe/instructions/xe_gfx_state_commands.h | 18 ++ + .../gpu/drm/xe/instructions/xe_gfxpipe_commands.h | 3 + + drivers/gpu/drm/xe/instructions/xe_instr_defs.h | 1 + + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 3 - + drivers/gpu/drm/xe/regs/xe_gsc_regs.h | 7 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 62 +++-- + drivers/gpu/drm/xe/regs/xe_gtt_defs.h | 35 +++ + drivers/gpu/drm/xe/regs/xe_guc_regs.h | 15 +- + drivers/gpu/drm/xe/regs/xe_reg_defs.h | 19 ++ + drivers/gpu/drm/xe/regs/xe_regs.h | 2 +- + drivers/gpu/drm/xe/regs/xe_sriov_regs.h | 3 + + drivers/gpu/drm/xe/tests/Makefile | 3 +- + drivers/gpu/drm/xe/tests/xe_bo.c | 12 +- + drivers/gpu/drm/xe/tests/xe_bo_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 54 ++-- + drivers/gpu/drm/xe/tests/xe_dma_buf_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_guc_id_mgr_test.c | 136 ++++++++++ + drivers/gpu/drm/xe/tests/xe_live_test_mod.c | 10 + + drivers/gpu/drm/xe/tests/xe_migrate.c | 27 +- + drivers/gpu/drm/xe/tests/xe_migrate_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_mocs.c | 96 ++++--- + drivers/gpu/drm/xe/tests/xe_mocs_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_wa_test.c | 1 + + drivers/gpu/drm/xe/xe_bb.c | 6 +- + drivers/gpu/drm/xe/xe_bo.c | 124 +++++---- + drivers/gpu/drm/xe/xe_bo.h | 74 ++---- + drivers/gpu/drm/xe/xe_bo_evict.c | 4 +- + drivers/gpu/drm/xe/xe_debugfs.c | 23 +- + drivers/gpu/drm/xe/xe_devcoredump.c | 47 ++-- + drivers/gpu/drm/xe/xe_devcoredump.h | 6 + + drivers/gpu/drm/xe/xe_device.c | 135 +++++++++- + drivers/gpu/drm/xe/xe_device_sysfs.c | 4 + + drivers/gpu/drm/xe/xe_device_types.h | 4 + + drivers/gpu/drm/xe/xe_dma_buf.c | 7 +- + drivers/gpu/drm/xe/xe_drm_client.c | 8 +- + drivers/gpu/drm/xe/xe_exec.c | 14 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 66 +++-- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 8 +- + drivers/gpu/drm/xe/xe_ggtt.c | 83 ++---- + drivers/gpu/drm/xe/xe_ggtt.h | 4 +- + drivers/gpu/drm/xe/xe_gsc.c | 100 +++++++- + drivers/gpu/drm/xe/xe_gsc.h | 2 + + drivers/gpu/drm/xe/xe_gsc_proxy.c | 8 +- + drivers/gpu/drm/xe/xe_gsc_proxy.h | 1 + + drivers/gpu/drm/xe/xe_gsc_submit.c | 15 ++ + drivers/gpu/drm/xe/xe_gsc_submit.h | 1 + + drivers/gpu/drm/xe/xe_gsc_types.h | 1 + + drivers/gpu/drm/xe/xe_gt.c | 21 +- + drivers/gpu/drm/xe/xe_gt_clock.c | 5 - + drivers/gpu/drm/xe/xe_gt_clock.h | 2 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 240 ++++++++++-------- + drivers/gpu/drm/xe/xe_gt_debugfs.h | 2 + + drivers/gpu/drm/xe/xe_gt_freq.c | 38 ++- + drivers/gpu/drm/xe/xe_gt_idle.c | 27 +- + drivers/gpu/drm/xe/xe_gt_mcr.c | 39 ++- + drivers/gpu/drm/xe/xe_gt_mcr.h | 14 ++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c | 257 +++++++++++++++++++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.h | 27 ++ + drivers/gpu/drm/xe/xe_gt_throttle_sysfs.c | 3 + + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 43 +++- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h | 2 +- + drivers/gpu/drm/xe/xe_gt_topology.c | 3 - + drivers/gpu/drm/xe/xe_gt_topology.h | 11 + + drivers/gpu/drm/xe/xe_gt_types.h | 6 +- + drivers/gpu/drm/xe/xe_guc.c | 122 ++++----- + drivers/gpu/drm/xe/xe_guc_ads.c | 91 ++++++- + drivers/gpu/drm/xe/xe_guc_ads_types.h | 2 + + drivers/gpu/drm/xe/xe_guc_ct.c | 123 ++++----- + drivers/gpu/drm/xe/xe_guc_debugfs.c | 9 +- + drivers/gpu/drm/xe/xe_guc_fwif.h | 7 +- + drivers/gpu/drm/xe/xe_guc_hwconfig.c | 7 +- + drivers/gpu/drm/xe/xe_guc_id_mgr.c | 279 +++++++++++++++++++++ + drivers/gpu/drm/xe/xe_guc_id_mgr.h | 22 ++ + drivers/gpu/drm/xe/xe_guc_log.c | 5 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 110 ++------ + drivers/gpu/drm/xe/xe_guc_submit.c | 230 ++++++++--------- + drivers/gpu/drm/xe/xe_guc_submit.h | 6 +- + drivers/gpu/drm/xe/xe_guc_submit_types.h | 13 +- + drivers/gpu/drm/xe/xe_guc_types.h | 21 +- + drivers/gpu/drm/xe/xe_huc.c | 4 +- + drivers/gpu/drm/xe/xe_huc_debugfs.c | 5 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 40 ++- + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 127 +++++++--- + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.h | 7 + + drivers/gpu/drm/xe/xe_hw_fence.c | 2 +- + drivers/gpu/drm/xe/xe_hwmon.c | 266 ++++++++++++-------- + drivers/gpu/drm/xe/xe_irq.c | 3 +- + drivers/gpu/drm/xe/xe_lmtt.c | 6 +- + drivers/gpu/drm/xe/xe_lrc.c | 169 ++++++++++++- + drivers/gpu/drm/xe/xe_lrc.h | 5 + + drivers/gpu/drm/xe/xe_lrc_types.h | 2 + + drivers/gpu/drm/xe/xe_memirq.c | 9 +- + drivers/gpu/drm/xe/xe_migrate.c | 8 +- + drivers/gpu/drm/xe/xe_mmio.c | 148 ++++++++--- + drivers/gpu/drm/xe/xe_mmio.h | 82 +----- + drivers/gpu/drm/xe/xe_mocs.c | 66 +++-- + drivers/gpu/drm/xe/xe_module.c | 7 + + drivers/gpu/drm/xe/xe_module.h | 3 + + drivers/gpu/drm/xe/xe_pat.c | 23 +- + drivers/gpu/drm/xe/xe_pci.c | 15 +- + drivers/gpu/drm/xe/xe_pcode.c | 119 +++++---- + drivers/gpu/drm/xe/xe_pcode.h | 6 +- + drivers/gpu/drm/xe/xe_platform_types.h | 1 + + drivers/gpu/drm/xe/xe_pm.c | 227 ++++++++++++++--- + drivers/gpu/drm/xe/xe_pm.h | 8 +- + drivers/gpu/drm/xe/xe_pt.c | 13 +- + drivers/gpu/drm/xe/xe_query.c | 53 +++- + drivers/gpu/drm/xe/xe_ring_ops.c | 11 +- + drivers/gpu/drm/xe/xe_sa.c | 5 +- + drivers/gpu/drm/xe/xe_sched_job.c | 18 ++ + drivers/gpu/drm/xe/xe_sched_job.h | 3 + + drivers/gpu/drm/xe/xe_sriov.c | 38 ++- + drivers/gpu/drm/xe/xe_sriov.h | 5 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 89 +++++++ + drivers/gpu/drm/xe/xe_sriov_pf.h | 24 ++ + drivers/gpu/drm/xe/xe_sriov_types.h | 15 ++ + drivers/gpu/drm/xe/xe_sync.c | 7 +- + drivers/gpu/drm/xe/xe_sync.h | 1 - + drivers/gpu/drm/xe/xe_tile_sysfs.c | 1 + + drivers/gpu/drm/xe/xe_trace.h | 6 +- + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 7 +- + drivers/gpu/drm/xe/xe_ttm_sys_mgr.c | 5 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 2 +- + drivers/gpu/drm/xe/xe_tuning.c | 10 +- + drivers/gpu/drm/xe/xe_uc_fw.c | 51 ++-- + drivers/gpu/drm/xe/xe_uc_fw.h | 8 +- + drivers/gpu/drm/xe/xe_uc_fw_types.h | 3 +- + drivers/gpu/drm/xe/xe_vm.c | 64 +++-- + drivers/gpu/drm/xe/xe_wa.c | 131 ++++++++-- + drivers/gpu/drm/xe/xe_wa_oob.rules | 5 +- + include/drm/xe_pciids.h | 7 +- + include/linux/devcoredump.h | 5 + + include/uapi/drm/xe_drm.h | 25 +- + 149 files changed, 4074 insertions(+), 1545 deletions(-) + create mode 100644 drivers/gpu/drm/xe/instructions/xe_gfx_state_commands.h + create mode 100644 drivers/gpu/drm/xe/regs/xe_gtt_defs.h + create mode 100644 drivers/gpu/drm/xe/tests/xe_guc_id_mgr_test.c + create mode 100644 drivers/gpu/drm/xe/tests/xe_live_test_mod.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_control.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_id_mgr.c + create mode 100644 drivers/gpu/drm/xe/xe_guc_id_mgr.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf.h +Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (fb3b9c2d217f video: logo: Drop full path of the input filename in generated file) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/Kconfig +Merge made by the 'ort' strategy. + drivers/video/fbdev/Kconfig | 26 +++++++++++++------------- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 20 +------------------- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 3 ++- + drivers/video/fbdev/pxafb.c | 2 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 2 +- + drivers/video/fbdev/sis/init301.c | 3 +-- + drivers/video/logo/pnmtologo.c | 2 -- + include/video/omapfb_dss.h | 3 --- + 11 files changed, 25 insertions(+), 45 deletions(-) +Merging regmap/for-next (8a8317f92770 regmap: kunit: Add some test cases and a few small) +$ 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/internal.h | 14 +- + drivers/base/regmap/regcache-maple.c | 2 +- + drivers/base/regmap/regmap-kunit.c | 994 ++++++++++++++++++++++++++--------- + drivers/base/regmap/regmap-ram.c | 5 +- + drivers/base/regmap/regmap-raw-ram.c | 5 +- + 5 files changed, 766 insertions(+), 254 deletions(-) +Merging sound/for-next (a9b16d591874 Merge branch 'topic/emu10k1-fix' into for-next) +$ 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. + include/sound/emu10k1.h | 32 ++++-- + include/sound/soundfont.h | 2 +- + sound/firewire/amdtp-stream.c | 10 +- + sound/isa/sb/emu8000_patch.c | 13 --- + sound/pci/emu10k1/emu10k1_callback.c | 13 ++- + sound/pci/emu10k1/emu10k1_patch.c | 207 ++++++++++++++--------------------- + sound/pci/emu10k1/memory.c | 55 ++++++++-- + sound/synth/emux/emux.c | 6 +- + sound/synth/emux/emux_hwdep.c | 3 +- + sound/synth/emux/emux_oss.c | 3 +- + sound/synth/emux/emux_proc.c | 1 + + sound/synth/emux/emux_seq.c | 6 +- + sound/synth/emux/soundfont.c | 73 +++++++++--- + 13 files changed, 223 insertions(+), 201 deletions(-) +Merging ieee1394/for-next (0d4149e5e9b0 firewire: ohci: use pci_irq_vector() to retrieve allocated interrupt line) +$ 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/core-card.c | 10 ++++++++++ + drivers/firewire/core-transaction.c | 7 +++++++ + drivers/firewire/core.h | 4 ++++ + drivers/firewire/ohci.c | 35 +++++++++++++++++++++++++---------- + include/linux/firewire.h | 3 ++- + 5 files changed, 48 insertions(+), 11 deletions(-) +Merging sound-asoc/for-next (f8cfa515170f Merge remote-tracking branch 'asoc/for-6.10' 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/intel/avs/core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/davinci-mcbsp.txt | 50 - + .../devicetree/bindings/sound/davinci-mcbsp.yaml | 113 ++ + .../devicetree/bindings/sound/fsl,audmix.txt | 50 - + .../devicetree/bindings/sound/fsl,audmix.yaml | 83 ++ + .../devicetree/bindings/sound/fsl,esai.txt | 68 -- + .../devicetree/bindings/sound/fsl,esai.yaml | 116 ++ + .../devicetree/bindings/sound/fsl,imx-asrc.yaml | 14 + + .../devicetree/bindings/sound/fsl,sai.yaml | 6 +- + .../devicetree/bindings/sound/fsl,spdif.yaml | 35 +- + .../devicetree/bindings/sound/fsl-asoc-card.txt | 117 -- + .../devicetree/bindings/sound/fsl-asoc-card.yaml | 195 ++++ + .../devicetree/bindings/sound/nuvoton,nau8325.yaml | 80 ++ + .../devicetree/bindings/sound/qcom,sm8250.yaml | 2 + + .../bindings/sound/rockchip,rk3308-codec.yaml | 98 ++ + .../devicetree/bindings/sound/ti,pcm1681.txt | 15 - + .../devicetree/bindings/sound/ti,pcm1681.yaml | 43 + + .../devicetree/bindings/sound/wlf,wm8776.yaml | 41 + + .../devicetree/bindings/sound/wlf,wm8974.txt | 15 - + .../devicetree/bindings/sound/wlf,wm8974.yaml | 41 + + Documentation/devicetree/bindings/sound/wm8776.txt | 18 - + MAINTAINERS | 7 + + drivers/firmware/cirrus/cs_dsp.c | 54 + + include/linux/firmware/cirrus/cs_dsp.h | 4 + + include/linux/platform_data/davinci_asp.h | 15 - + include/sound/control.h | 23 + + include/sound/dmaengine_pcm.h | 2 + + .../sound/soc-acpi-intel-ssp-common.h | 29 +- + include/sound/soc-acpi.h | 12 + + include/sound/soc-jack.h | 2 - + include/sound/soc.h | 12 + + include/uapi/sound/asoc.h | 56 - + include/uapi/sound/skl-tplg-interface.h | 74 -- + sound/pci/hda/hda_cs_dsp_ctl.c | 22 +- + sound/soc/Kconfig | 8 + + sound/soc/Makefile | 4 + + sound/soc/amd/Kconfig | 21 +- + sound/soc/codecs/Kconfig | 15 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/cs35l41.c | 28 +- + sound/soc/codecs/cs35l56-shared.c | 1 + + sound/soc/codecs/cs35l56.c | 1 + + sound/soc/codecs/es8326.c | 41 +- + sound/soc/codecs/hdac_hda.c | 44 +- + sound/soc/codecs/max98373-sdw.c | 1 - + sound/soc/codecs/nau8325.c | 900 ++++++++++++++++ + sound/soc/codecs/nau8325.h | 391 +++++++ + sound/soc/codecs/nau8822.h | 1 - + sound/soc/codecs/rk3308_codec.c | 974 +++++++++++++++++ + sound/soc/codecs/rk3308_codec.h | 579 ++++++++++ + sound/soc/codecs/rt1017-sdca-sdw.c | 1 - + sound/soc/codecs/rt1308-sdw.c | 1 - + sound/soc/codecs/rt1316-sdw.c | 1 - + sound/soc/codecs/rt1318-sdw.c | 1 - + sound/soc/codecs/rt5682-sdw.c | 1 - + sound/soc/codecs/rt700-sdw.c | 1 - + sound/soc/codecs/rt711-sdca-sdw.c | 1 - + sound/soc/codecs/rt711-sdw.c | 1 - + sound/soc/codecs/rt712-sdca-dmic.c | 1 - + sound/soc/codecs/rt712-sdca-sdw.c | 1 - + sound/soc/codecs/rt715-sdca-sdw.c | 1 - + sound/soc/codecs/rt715-sdca.c | 4 +- + sound/soc/codecs/rt715-sdw.c | 1 - + sound/soc/codecs/rt722-sdca-sdw.c | 1 - + sound/soc/codecs/sdw-mockup.c | 1 - + sound/soc/codecs/tas2780.c | 3 +- + sound/soc/codecs/tlv320aic32x4-spi.c | 1 - + sound/soc/codecs/tlv320aic3x-spi.c | 1 - + sound/soc/codecs/wm_adsp.c | 33 +- + sound/soc/fsl/fsl_rpmsg.c | 43 +- + sound/soc/fsl/fsl_ssi.c | 4 +- + sound/soc/fsl/imx-audio-rpmsg.c | 21 +- + sound/soc/fsl/imx-es8328.c | 17 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 11 +- + sound/soc/fsl/imx-rpmsg.c | 28 +- + sound/soc/generic/simple-card-utils.c | 2 - + sound/soc/intel/avs/avs.h | 3 +- + sound/soc/intel/avs/boards/es8336.c | 2 +- + sound/soc/intel/avs/boards/hdaudio.c | 6 +- + sound/soc/intel/avs/boards/i2s_test.c | 79 -- + sound/soc/intel/avs/boards/nau8825.c | 2 +- + sound/soc/intel/avs/boards/rt274.c | 2 +- + sound/soc/intel/avs/boards/rt286.c | 2 +- + sound/soc/intel/avs/boards/rt298.c | 2 +- + sound/soc/intel/avs/boards/rt5663.c | 2 +- + sound/soc/intel/avs/boards/rt5682.c | 2 +- + sound/soc/intel/avs/boards/ssm4567.c | 5 +- + sound/soc/intel/avs/cldma.c | 2 +- + sound/soc/intel/avs/core.c | 4 +- + sound/soc/intel/avs/icl.c | 12 +- + sound/soc/intel/avs/loader.c | 6 +- + sound/soc/intel/avs/messages.h | 47 +- + sound/soc/intel/avs/path.c | 13 +- + sound/soc/intel/avs/pcm.c | 34 +- + sound/soc/intel/avs/probes.c | 14 +- + sound/soc/intel/avs/utils.c | 8 +- + sound/soc/intel/boards/Kconfig | 15 +- + sound/soc/intel/boards/Makefile | 7 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 1 + + sound/soc/intel/boards/bxt_rt298.c | 1 + + sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 + + sound/soc/intel/boards/kbl_da7219_max98357a.c | 1 + + sound/soc/intel/boards/kbl_da7219_max98927.c | 4 + + sound/soc/intel/boards/kbl_rt5660.c | 1 + + sound/soc/intel/boards/kbl_rt5663_max98927.c | 2 + + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 1 + + sound/soc/intel/boards/skl_hda_dsp_generic.c | 2 + + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 1 + + sound/soc/intel/boards/skl_rt286.c | 1 + + sound/soc/intel/boards/sof_board_helpers.c | 161 +-- + sound/soc/intel/boards/sof_board_helpers.h | 106 +- + sound/soc/intel/boards/sof_cirrus_common.h | 2 +- + sound/soc/intel/boards/sof_cs42l42.c | 89 +- + sound/soc/intel/boards/sof_da7219.c | 410 +++---- + sound/soc/intel/boards/sof_maxim_common.h | 2 +- + sound/soc/intel/boards/sof_nau8825.c | 95 +- + sound/soc/intel/boards/sof_nuvoton_common.h | 2 +- + sound/soc/intel/boards/sof_realtek_common.h | 2 +- + sound/soc/intel/boards/sof_rt5682.c | 216 ++-- + sound/soc/intel/boards/sof_sdw.c | 1122 ++++++++++---------- + sound/soc/intel/boards/sof_sdw_common.h | 42 +- + sound/soc/intel/boards/sof_sdw_cs42l42.c | 1 - + sound/soc/intel/boards/sof_sdw_cs42l43.c | 50 + + sound/soc/intel/boards/sof_sdw_cs_amp.c | 1 - + sound/soc/intel/boards/sof_sdw_maxim.c | 1 - + sound/soc/intel/boards/sof_sdw_rt5682.c | 1 - + sound/soc/intel/boards/sof_sdw_rt700.c | 1 - + sound/soc/intel/boards/sof_sdw_rt711.c | 2 - + sound/soc/intel/boards/sof_sdw_rt712_sdca.c | 25 - + sound/soc/intel/boards/sof_sdw_rt715.c | 26 - + sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 26 - + sound/soc/intel/boards/sof_sdw_rt722_sdca.c | 38 +- + sound/soc/intel/boards/sof_sdw_rt_amp.c | 1 - + sound/soc/intel/boards/sof_sdw_rt_dmic.c | 54 + + .../soc/intel/boards/sof_sdw_rt_sdca_jack_common.c | 4 +- + sound/soc/intel/boards/sof_ssp_amp.c | 264 ++--- + sound/soc/intel/boards/sof_ssp_common.c | 122 --- + sound/soc/intel/common/Makefile | 2 + + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 141 +-- + sound/soc/intel/common/soc-acpi-intel-arl-match.c | 24 + + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 6 +- + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 4 +- + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 87 +- + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 92 +- + sound/soc/intel/common/soc-acpi-intel-ssp-common.c | 159 +++ + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 85 +- + sound/soc/intel/skylake/skl-topology.c | 169 --- + sound/soc/kirkwood/kirkwood-dma.c | 3 + + sound/soc/loongson/loongson_i2s_pci.c | 1 - + sound/soc/mediatek/common/Makefile | 2 + + sound/soc/mediatek/common/mtk-dai-adda-common.c | 70 ++ + sound/soc/mediatek/common/mtk-dai-adda-common.h | 45 + + sound/soc/mediatek/common/mtk-soundcard-driver.c | 6 +- + sound/soc/mediatek/mt6797/mt6797-dai-adda.c | 85 +- + sound/soc/mediatek/mt8183/mt8183-dai-adda.c | 90 +- + sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 92 +- + sound/soc/mediatek/mt8188/mt8188-dai-adda.c | 89 +- + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 95 +- + sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 90 +- + sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 90 +- + sound/soc/qcom/sc8280xp.c | 2 + + sound/soc/sh/rcar/cmd.c | 6 +- + sound/soc/sh/rcar/core.c | 4 +- + sound/soc/sh/rcar/ctu.c | 6 +- + sound/soc/sh/rcar/dma.c | 6 +- + sound/soc/sh/rcar/dvc.c | 6 +- + sound/soc/sh/rcar/gen.c | 515 ++++----- + sound/soc/sh/rcar/mix.c | 6 +- + sound/soc/sh/rcar/rsnd.h | 22 +- + sound/soc/sh/rcar/src.c | 12 +- + sound/soc/sh/rcar/ssi.c | 2 +- + sound/soc/sh/rcar/ssiu.c | 2 +- + sound/soc/soc-card-test.c | 184 ++++ + sound/soc/soc-card.c | 21 +- + sound/soc/soc-core.c | 8 +- + sound/soc/soc-dai.c | 2 +- + sound/soc/soc-generic-dmaengine-pcm.c | 3 + + sound/soc/soc-jack.c | 23 +- + sound/soc/soc-pcm.c | 9 +- + sound/soc/soc-topology.c | 252 +---- + sound/soc/sof/amd/acp-loader.c | 2 + + sound/soc/sof/debug.c | 19 - + sound/soc/sof/imx/imx-common.c | 24 - + sound/soc/sof/imx/imx-common.h | 9 - + sound/soc/sof/imx/imx8.c | 41 +- + sound/soc/sof/imx/imx8m.c | 40 +- + sound/soc/sof/imx/imx8ulp.c | 42 +- + sound/soc/sof/intel/hda-codec.c | 15 +- + sound/soc/sof/intel/hda-ctrl.c | 9 +- + sound/soc/sof/intel/hda-dai-ops.c | 41 +- + sound/soc/sof/intel/hda-dai.c | 124 ++- + sound/soc/sof/intel/hda-loader.c | 87 +- + sound/soc/sof/intel/hda-stream.c | 24 +- + sound/soc/sof/intel/hda.c | 184 +++- + sound/soc/sof/intel/hda.h | 26 +- + sound/soc/sof/intel/lnl.c | 29 +- + sound/soc/sof/intel/lnl.h | 15 + + sound/soc/sof/intel/mtl.c | 68 +- + sound/soc/sof/intel/mtl.h | 48 +- + sound/soc/sof/intel/tgl.c | 15 +- + sound/soc/sof/ipc4-loader.c | 8 + + sound/soc/sof/ipc4-priv.h | 2 +- + sound/soc/sof/ipc4-topology.c | 71 +- + sound/soc/sof/ipc4-topology.h | 3 +- + sound/soc/sof/pcm.c | 58 +- + sound/soc/sof/sof-audio.c | 29 +- + sound/soc/sof/sof-audio.h | 2 + + sound/soc/sof/sof-client-ipc-flood-test.c | 17 +- + sound/soc/sunxi/sun50i-codec-analog.c | 73 +- + sound/soc/sunxi/sun8i-codec.c | 346 +++++- + sound/soc/ti/davinci-i2s.c | 278 ++++- + 210 files changed, 7757 insertions(+), 4467 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/davinci-mcbsp.txt + create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcbsp.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,audmix.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,audmix.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,esai.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,esai.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl-asoc-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl-asoc-card.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8325.yaml + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3308-codec.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1681.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1681.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8776.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8974.txt + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8974.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8776.txt + rename sound/soc/intel/boards/sof_ssp_common.h => include/sound/soc-acpi-intel-ssp-common.h (66%) + create mode 100644 sound/soc/codecs/nau8325.c + create mode 100644 sound/soc/codecs/nau8325.h + create mode 100644 sound/soc/codecs/rk3308_codec.c + create mode 100644 sound/soc/codecs/rk3308_codec.h + delete mode 100644 sound/soc/intel/boards/sof_sdw_rt715.c + delete mode 100644 sound/soc/intel/boards/sof_sdw_rt715_sdca.c + create mode 100644 sound/soc/intel/boards/sof_sdw_rt_dmic.c + delete mode 100644 sound/soc/intel/boards/sof_ssp_common.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-ssp-common.c + create mode 100644 sound/soc/mediatek/common/mtk-dai-adda-common.c + create mode 100644 sound/soc/mediatek/common/mtk-dai-adda-common.h + create mode 100644 sound/soc/soc-card-test.c + create mode 100644 sound/soc/sof/intel/lnl.h +Merging modules/modules-next (68881525ba29 mm: introduce execmem_alloc() and execmem_free()) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging arch/mips/include/asm/pgtable-64.h +Auto-merging kernel/bpf/core.c +Auto-merging kernel/kprobes.c +Auto-merging kernel/module/main.c +CONFLICT (content): Merge conflict in kernel/module/main.c +Auto-merging mm/Kconfig +Auto-merging mm/Makefile +Recorded preimage for 'kernel/module/main.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'kernel/module/main.c'. +[master e357c6becda8] Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/arm64/kernel/module.c | 5 --- + arch/mips/include/asm/pgtable-64.h | 4 +- + arch/mips/kernel/module.c | 4 +- + arch/mips/mm/fault.c | 4 +- + arch/nios2/include/asm/pgtable.h | 5 ++- + arch/nios2/kernel/module.c | 19 ++------- + arch/powerpc/kernel/kprobes.c | 6 +-- + arch/s390/kernel/ftrace.c | 4 +- + arch/s390/kernel/kprobes.c | 4 +- + arch/s390/kernel/module.c | 5 ++- + arch/sparc/net/bpf_jit_comp_32.c | 8 ++-- + arch/x86/kernel/ftrace.c | 6 +-- + arch/x86/kernel/kprobes/core.c | 4 +- + include/linux/execmem.h | 57 +++++++++++++++++++++++++ + include/linux/moduleloader.h | 3 -- + kernel/bpf/core.c | 6 +-- + kernel/kprobes.c | 8 ++-- + kernel/module/Kconfig | 3 +- + kernel/module/main.c | 87 ++++++++++++++++++++------------------ + mm/Kconfig | 3 ++ + mm/Makefile | 1 + + mm/execmem.c | 26 ++++++++++++ + scripts/Makefile.modpost | 2 +- + 23 files changed, 176 insertions(+), 98 deletions(-) + create mode 100644 include/linux/execmem.h + create mode 100644 mm/execmem.c +Merging input/next (8984e0b56923 Input: adafruit-seesaw - only report buttons that changed state) +$ 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/joystick/adafruit-seesaw.c | 21 ++++++++++++++++++--- + drivers/input/keyboard/stmpe-keypad.c | 1 - + drivers/input/misc/ims-pcu.c | 4 ++-- + drivers/input/serio/ioc3kbd.c | 7 +++++++ + 4 files changed, 27 insertions(+), 6 deletions(-) +Merging block/for-next (7ed173281653 Merge branch 'for-6.10/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging io_uring/io_uring.c +CONFLICT (content): Merge conflict in io_uring/io_uring.c +Auto-merging io_uring/rw.c +CONFLICT (content): Merge conflict in io_uring/rw.c +Auto-merging mm/nommu.c +Resolved 'io_uring/io_uring.c' using previous resolution. +Resolved 'io_uring/rw.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master de16797228dd] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +$ git diff -M --stat --summary HEAD^.. + block/blk-cgroup-rwstat.c | 18 +- + block/blk-cgroup.c | 3 +- + block/blk-mq.c | 57 +++- + block/blk-throttle.c | 51 ++-- + drivers/block/brd.c | 40 +-- + drivers/md/dm-bio-prison-v2.c | 3 +- + drivers/md/dm-cache-target.c | 12 +- + drivers/md/dm-clone-target.c | 14 +- + drivers/md/dm-era-target.c | 3 +- + drivers/md/dm-mpath.c | 3 +- + drivers/md/dm-thin.c | 12 +- + drivers/md/dm-vdo/data-vio.c | 3 +- + drivers/md/dm-vdo/flush.c | 3 +- + drivers/nvme/host/ioctl.c | 15 +- + fs/btrfs/raid56.c | 3 +- + include/linux/bio.h | 7 + + include/linux/io_uring.h | 6 - + include/linux/io_uring/cmd.h | 24 ++ + include/linux/io_uring/net.h | 18 ++ + include/linux/io_uring_types.h | 16 +- + include/uapi/linux/io_uring.h | 18 +- + io_uring/Makefile | 15 +- + io_uring/alloc_cache.h | 59 ++-- + io_uring/cancel.c | 4 +- + io_uring/fdinfo.c | 4 +- + io_uring/futex.c | 30 +- + io_uring/futex.h | 5 +- + io_uring/io_uring.c | 661 ++++++++--------------------------------- + io_uring/io_uring.h | 33 +- + io_uring/kbuf.c | 175 +++-------- + io_uring/kbuf.h | 11 +- + io_uring/memmap.c | 336 +++++++++++++++++++++ + io_uring/memmap.h | 25 ++ + io_uring/net.c | 589 ++++++++++++++++-------------------- + io_uring/net.h | 29 +- + io_uring/notif.c | 32 +- + io_uring/notif.h | 6 +- + io_uring/opdef.c | 64 ++-- + io_uring/opdef.h | 9 +- + io_uring/poll.c | 15 +- + io_uring/poll.h | 9 +- + io_uring/refs.h | 7 + + io_uring/register.c | 3 +- + io_uring/rsrc.c | 47 +-- + io_uring/rsrc.h | 13 +- + io_uring/rw.c | 612 ++++++++++++++++++-------------------- + io_uring/rw.h | 25 +- + io_uring/timeout.c | 9 +- + io_uring/uring_cmd.c | 122 ++++++-- + io_uring/uring_cmd.h | 8 +- + io_uring/waitid.c | 2 +- + mm/nommu.c | 7 + + net/socket.c | 2 +- + 53 files changed, 1513 insertions(+), 1784 deletions(-) + create mode 100644 include/linux/io_uring/net.h + create mode 100644 io_uring/memmap.c + create mode 100644 io_uring/memmap.h +$ git am -3 ../patches/0001-fix-up-for-mm-switch-mm-get_unmapped_area-to-a-flag.patch +Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag" +$ git reset HEAD^ +Unstaged changes after reset: +M io_uring/memmap.c +$ git add -A . +$ git commit -v -a --amend +[master 16a083c5ce77] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git + Date: Fri Apr 12 12:02:37 2024 +1000 +Merging device-mapper/for-next (44078156fc77 dm: use queue_limits_set) +$ 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. + .../admin-guide/device-mapper/dm-crypt.rst | 5 ++ + drivers/md/dm-crypt.c | 69 ++++++++++++++-------- + drivers/md/dm-table.c | 27 ++++----- + drivers/md/dm-vdo/murmurhash3.c | 2 +- + 4 files changed, 63 insertions(+), 40 deletions(-) +Merging libata/for-next (dcf2653ac12f dt-bindings: ata: ahci-da850: Convert to dtschema) +$ 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. + .../devicetree/bindings/ata/ahci-da850.txt | 18 ---------- + .../devicetree/bindings/ata/fsl,imx-pata.yaml | 42 ++++++++++++++++++++++ + Documentation/devicetree/bindings/ata/imx-pata.txt | 16 --------- + .../devicetree/bindings/ata/ti,da850-ahci.yaml | 39 ++++++++++++++++++++ + 4 files changed, 81 insertions(+), 34 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/ata/ahci-da850.txt + create mode 100644 Documentation/devicetree/bindings/ata/fsl,imx-pata.yaml + delete mode 100644 Documentation/devicetree/bindings/ata/imx-pata.txt + create mode 100644 Documentation/devicetree/bindings/ata/ti,da850-ahci.yaml +Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant) +$ 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 (bce42d6108c9 mmc: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/marvell/mwifiex/sdio.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 3 + + MAINTAINERS | 2 +- + drivers/bluetooth/btmrvl_sdio.c | 1 - + drivers/bluetooth/btmtksdio.c | 1 - + drivers/mmc/core/block.c | 8 +- + drivers/mmc/core/debugfs.c | 7 +- + drivers/mmc/core/host.c | 1 - + drivers/mmc/core/sdio_bus.c | 9 +- + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/cqhci-core.c | 11 +- + drivers/mmc/host/cqhci.h | 4 + + drivers/mmc/host/davinci_mmc.c | 4 +- + drivers/mmc/host/dw_mmc-hi3798cv200.c | 1 - + drivers/mmc/host/dw_mmc-hi3798mv200.c | 1 - + drivers/mmc/host/mtk-sd.c | 1 - + drivers/mmc/host/sdhci-of-dwcmshc.c | 191 ++++++++++++++++++++- + drivers/mmc/host/sdhci-pci-gli.c | 46 ++--- + drivers/mmc/host/sdhci-s3c.c | 4 +- + drivers/mmc/host/sdhci-sprd.c | 1 - + drivers/mmc/host/sdhci_am654.c | 176 +++++++++++++++---- + drivers/net/wireless/ath/ath10k/sdio.c | 21 +-- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 - + drivers/net/wireless/marvell/mwifiex/sdio.c | 1 - + drivers/net/wireless/silabs/wfx/bus_sdio.c | 1 - + include/linux/mmc/sdio_func.h | 5 +- + 25 files changed, 384 insertions(+), 118 deletions(-) +Merging mfd/for-mfd-next (fb9d85a9698e mfd: Tidy Kconfig dependency's parentheses) +$ 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 MAINTAINERS +Auto-merging drivers/mfd/intel-lpss-pci.c +CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c +Resolved 'drivers/mfd/intel-lpss-pci.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 91b98e4ab5a9] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git +$ git diff -M --stat --summary HEAD^.. + .../arm/altera/socfpga-sdram-controller.txt | 12 -- + Documentation/devicetree/bindings/arm/apm/scu.txt | 17 --- + .../bindings/arm/marvell/armada-37xx.txt | 32 ----- + .../bindings/input/twl4030-pwrbutton.txt | 21 ---- + .../devicetree/bindings/mfd/brcm,iproc-cdru.txt | 16 --- + .../devicetree/bindings/mfd/brcm,iproc-mhb.txt | 18 --- + .../devicetree/bindings/mfd/rohm,bd71828-pmic.yaml | 2 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 15 +++ + Documentation/devicetree/bindings/mfd/ti,twl.yaml | 72 ++++++++++- + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 2 + + Documentation/devicetree/bindings/rtc/twl-rtc.txt | 11 -- + .../devicetree/bindings/watchdog/twl4030-wdt.txt | 10 -- + MAINTAINERS | 2 +- + arch/sh/boards/board-sh7757lcr.c | 2 +- + arch/sh/boards/mach-ap325rxa/setup.c | 2 +- + arch/sh/boards/mach-ecovec24/setup.c | 2 +- + arch/sh/boards/mach-kfr2r09/setup.c | 2 +- + arch/sh/boards/mach-migor/setup.c | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 2 +- + drivers/mfd/Kconfig | 12 +- + drivers/mfd/axp20x-i2c.c | 2 + + drivers/mfd/axp20x-rsb.c | 1 + + drivers/mfd/axp20x.c | 90 ++++++++++++++ + drivers/mfd/intel-lpss-pci.c | 2 +- + drivers/mfd/kempld-core.c | 105 +++++----------- + drivers/mfd/ocelot-spi.c | 5 +- + drivers/mfd/rohm-bd71828.c | 36 +++++- + drivers/mmc/host/renesas_sdhi_core.c | 2 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 5 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 5 +- + drivers/mmc/host/tmio_mmc_core.c | 3 +- + drivers/mmc/host/uniphier-sd.c | 2 +- + drivers/regulator/axp20x-regulator.c | 94 ++++++++++++++- + include/linux/mfd/axp20x.h | 98 ++++++++++++++- + include/linux/mfd/rohm-bd71828.h | 3 + + include/linux/mfd/tmio.h | 133 --------------------- + include/linux/platform_data/tmio.h | 64 ++++++++++ + 37 files changed, 525 insertions(+), 379 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-sdram-controller.txt + delete mode 100644 Documentation/devicetree/bindings/arm/apm/scu.txt + delete mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-37xx.txt + delete mode 100644 Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/brcm,iproc-cdru.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/brcm,iproc-mhb.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/twl-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt + delete mode 100644 include/linux/mfd/tmio.h + create mode 100644 include/linux/platform_data/tmio.h +Merging backlight/for-backlight-next (9db7677e33b6 backlight: otm3225a: Drop driver owner assignment) +$ 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 +Auto-merging drivers/hid/hid-picolcd_core.c +Auto-merging drivers/hid/hid-picolcd_fb.c +Auto-merging drivers/video/fbdev/sh_mobile_lcdcfb.c +Auto-merging include/linux/fb.h +Merge made by the 'ort' strategy. + drivers/auxdisplay/ht16k33.c | 15 +- + drivers/hid/hid-picolcd_backlight.c | 7 - + drivers/hid/hid-picolcd_core.c | 14 +- + drivers/hid/hid-picolcd_fb.c | 6 + + drivers/staging/fbtft/fb_ssd1351.c | 4 +- + drivers/staging/fbtft/fbtft-core.c | 5 +- + drivers/video/backlight/aat2870_bl.c | 7 - + drivers/video/backlight/backlight.c | 39 +++--- + drivers/video/backlight/bd6107.c | 12 +- + drivers/video/backlight/gpio_backlight.c | 12 +- + drivers/video/backlight/lp8788_bl.c | 151 ++------------------- + drivers/video/backlight/lv5207lp.c | 12 +- + drivers/video/backlight/mp3309c.c | 4 +- + drivers/video/backlight/omap1_bl.c | 47 +++---- + drivers/video/backlight/otm3225a.c | 1 - + drivers/video/backlight/pwm_bl.c | 12 -- + drivers/video/fbdev/atmel_lcdfb.c | 1 - + drivers/video/fbdev/core/fb_backlight.c | 6 + + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 7 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 10 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 7 - + drivers/video/fbdev/ssd1307fb.c | 31 ++--- + include/linux/backlight.h | 41 ++---- + include/linux/fb.h | 9 ++ + include/linux/mfd/lp8788.h | 36 ----- + include/linux/platform_data/omap1_bl.h | 1 - + include/linux/pwm_backlight.h | 1 - + 27 files changed, 123 insertions(+), 375 deletions(-) +Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop) +$ 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 +Merge made by the 'ort' strategy. + drivers/power/supply/bq27xxx_battery.c | 116 ++++++++++++++----------- + drivers/power/supply/cros_peripheral_charger.c | 11 ++- + drivers/power/supply/cros_usbpd-charger.c | 11 ++- + drivers/power/supply/power_supply_sysfs.c | 20 +---- + drivers/power/supply/test_power.c | 36 ++++++++ + include/linux/power/bq27xxx_battery.h | 8 -- + 6 files changed, 120 insertions(+), 82 deletions(-) +Merging regulator/for-next (15f992fa81eb Merge remote-tracking branch 'regulator/for-6.10' 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/nxp,pca9450-regulator.yaml | 1 + + .../regulator/qcom,usb-vbus-regulator.yaml | 1 + + drivers/regulator/da9121-regulator.c | 4 +- + drivers/regulator/da9211-regulator.c | 2 +- + drivers/regulator/isl9305.c | 2 +- + drivers/regulator/max8973-regulator.c | 2 +- + drivers/regulator/mt6311-regulator.c | 2 +- + drivers/regulator/pca9450-regulator.c | 196 ++++++++++++++++++++- + drivers/regulator/pf8x00-regulator.c | 2 +- + drivers/regulator/pfuze100-regulator.c | 2 +- + drivers/regulator/rpi-panel-attiny-regulator.c | 2 +- + drivers/regulator/rtmv20-regulator.c | 2 +- + drivers/regulator/rtq6752-regulator.c | 2 +- + drivers/regulator/tps51632-regulator.c | 2 +- + drivers/regulator/tps62360-regulator.c | 2 +- + include/linux/regulator/pca9450.h | 1 + + 16 files changed, 209 insertions(+), 16 deletions(-) +Merging security/next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile()) +$ 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 (5e2e4d0ea5c2 evm: Rename is_unsupported_fs to is_unsupported_hmac_fs) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/overlayfs/copy_up.c | 2 +- + fs/overlayfs/super.c | 2 +- + include/linux/evm.h | 8 +++ + include/linux/fs.h | 2 +- + include/linux/integrity.h | 34 ++++++++++++ + include/linux/lsm_hook_defs.h | 3 +- + include/linux/security.h | 4 +- + security/integrity/evm/evm.h | 8 ++- + security/integrity/evm/evm_crypto.c | 25 ++++++--- + security/integrity/evm/evm_main.c | 92 ++++++++++++++++++++++++------- + security/integrity/ima/ima.h | 4 +- + security/integrity/ima/ima_api.c | 32 +++++++---- + security/integrity/ima/ima_appraise.c | 4 +- + security/integrity/ima/ima_iint.c | 2 +- + security/integrity/ima/ima_init.c | 6 +- + security/integrity/ima/ima_main.c | 44 +++++++++++---- + security/integrity/ima/ima_template_lib.c | 27 ++++++--- + security/integrity/integrity.h | 12 +++- + security/security.c | 5 +- + security/selinux/hooks.c | 2 +- + security/smack/smack_lsm.c | 2 +- + 21 files changed, 242 insertions(+), 78 deletions(-) +Merging selinux/next (d6fc1ee0b6c1 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. + security/selinux/hooks.c | 58 ++++++++++++++++----------------------- + security/selinux/selinuxfs.c | 30 ++++++++++---------- + security/selinux/ss/conditional.c | 3 ++ + security/selinux/ss/ebitmap.c | 50 +++++++++++++++++++++------------ + security/selinux/ss/ebitmap.h | 38 ++++++++++++------------- + security/selinux/ss/policydb.c | 24 +++++++++++----- + security/selinux/ss/symtab.c | 20 +++++++------- + security/selinux/xfrm.c | 7 ++--- + 8 files changed, 121 insertions(+), 109 deletions(-) +Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer()) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Already up to date. +Merging tpmdd/next (6999f8229e59 keys: Fix overwrite of key expiration on instantiation) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + security/keys/gc.c | 8 -------- + security/keys/key.c | 35 ++++++++++++++++++++++++----------- + security/keys/keyctl.c | 11 ++++++----- + 3 files changed, 30 insertions(+), 24 deletions(-) +Merging watchdog/master (6fe5aabf7fc6 watchdog: intel-mid_wdt: Get platform data via dev_get_platdata()) +$ 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 (c404f55c26fc iommu: Validate the PASID in iommu_attach_device_pasid()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (3cef9e08b6f4 dt-bindings: usb: mtk-xhci: add compatible for MT7988) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Merge made by the 'ort' strategy. + .../bindings/display/atmel,lcdc-display.yaml | 103 +++++++++++++ + .../devicetree/bindings/display/atmel,lcdc.txt | 87 ----------- + .../devicetree/bindings/display/atmel,lcdc.yaml | 70 +++++++++ + .../bindings/display/exynos/exynos_dp.txt | 112 -------------- + .../display/samsung/samsung,exynos5-dp.yaml | 163 +++++++++++++++++++++ + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 1 + + 6 files changed, 337 insertions(+), 199 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/atmel,lcdc-display.yaml + delete mode 100644 Documentation/devicetree/bindings/display/atmel,lcdc.txt + create mode 100644 Documentation/devicetree/bindings/display/atmel,lcdc.yaml + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos_dp.txt + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos5-dp.yaml +Merging dt-krzk/for-next (364be3ecd30d Merge branch 'next/dt' 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 +Auto-merging drivers/dma/pl330.c +Merge made by the 'ort' strategy. + arch/arm/boot/dts/ti/omap/am33xx.dtsi | 8 ++-- + arch/arm/boot/dts/ti/omap/am4372.dtsi | 2 +- + arch/arm64/boot/dts/amd/elba-16core.dtsi | 2 +- + arch/arm64/boot/dts/amd/elba-asic-common.dtsi | 2 +- + arch/arm64/boot/dts/amd/elba-asic.dts | 2 +- + arch/arm64/boot/dts/amd/elba-flash-parts.dtsi | 2 +- + arch/arm64/boot/dts/amd/elba.dtsi | 2 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 4 +- + arch/arm64/boot/dts/arm/juno-scmi.dtsi | 4 +- + arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 43 +++++++++++++++++++++- + arch/arm64/boot/dts/sprd/sc9860.dtsi | 2 +- + arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 2 +- + drivers/amba/bus.c | 11 ++++-- + drivers/char/hw_random/nomadik-rng.c | 1 - + drivers/dma/pl330.c | 1 - + drivers/hwtracing/coresight/coresight-catu.c | 1 - + drivers/hwtracing/coresight/coresight-cti-core.c | 1 - + drivers/hwtracing/coresight/coresight-etb10.c | 1 - + drivers/hwtracing/coresight/coresight-etm3x-core.c | 1 - + drivers/hwtracing/coresight/coresight-etm4x-core.c | 1 - + drivers/hwtracing/coresight/coresight-funnel.c | 1 - + drivers/hwtracing/coresight/coresight-replicator.c | 1 - + drivers/hwtracing/coresight/coresight-stm.c | 1 - + drivers/hwtracing/coresight/coresight-tmc-core.c | 1 - + drivers/hwtracing/coresight/coresight-tpda.c | 1 - + drivers/hwtracing/coresight/coresight-tpdm.c | 1 - + drivers/hwtracing/coresight/coresight-tpiu.c | 1 - + drivers/i2c/busses/i2c-nomadik.c | 1 - + drivers/input/serio/ambakmi.c | 1 - + drivers/memory/pl353-smc.c | 1 - + drivers/vfio/platform/vfio_amba.c | 1 - + include/linux/amba/bus.h | 11 +++++- + 32 files changed, 74 insertions(+), 41 deletions(-) +Merging mailbox/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU) +$ 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 (637ced031d3c Merge remote-tracking branch 'spi/for-6.10' 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 8 +- + Documentation/spi/pxa2xx.rst | 5 +- + Documentation/spi/spi-summary.rst | 5 - + MAINTAINERS | 2 +- + arch/arm/mach-pxa/devices.c | 18 ---- + arch/arm/mach-pxa/spitz.c | 14 ++- + drivers/soc/pxa/ssp.c | 2 +- + drivers/spi/Kconfig | 4 +- + drivers/spi/spi-amd.c | 112 ++++++++++++++++++++ + drivers/spi/spi-atmel.c | 8 +- + drivers/spi/spi-au1550.c | 29 ++---- + drivers/spi/spi-cadence-quadspi.c | 22 ++-- + drivers/spi/spi-cadence-xspi.c | 8 +- + drivers/spi/spi-coldfire-qspi.c | 1 - + drivers/spi/spi-fsl-cpm.c | 14 +-- + drivers/spi/spi-fsl-cpm.h | 5 +- + drivers/spi/spi-fsl-dspi.c | 1 - + drivers/spi/spi-fsl-spi.c | 7 +- + drivers/spi/spi-loopback-test.c | 1 - + drivers/spi/spi-mt65xx.c | 32 +++--- + drivers/spi/spi-mt7621.c | 95 ++++++++--------- + drivers/spi/spi-omap2-mcspi.c | 95 +++++++++++++---- + drivers/spi/spi-pxa2xx.c | 116 +++++++++++---------- + drivers/spi/spi-rspi.c | 12 +-- + drivers/spi/spi.c | 7 -- + include/linux/platform_data/spi-omap2-mcspi.h | 3 - + include/linux/pxa2xx_ssp.h | 2 +- + include/linux/spi/pxa2xx_spi.h | 10 +- + include/linux/spi/rspi.h | 18 ---- + include/linux/spi/spi.h | 12 +-- + include/linux/spi/xilinx_spi.h | 14 ++- + 31 files changed, 376 insertions(+), 306 deletions(-) + delete mode 100644 include/linux/spi/rspi.h +Merging tip/master (b4ba814ae4a4 Merge branch into tip/master: 'x86/shstk') +$ 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 MAINTAINERS +Auto-merging arch/riscv/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/setup.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/sched.h +Auto-merging init/main.c +Auto-merging kernel/events/core.c +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/admin-guide/hw-vuln/spectre.rst | 22 +- + Documentation/admin-guide/kernel-parameters.txt | 12 +- + .../bindings/interrupt-controller/riscv,aplic.yaml | 172 ++++ + .../interrupt-controller/riscv,imsics.yaml | 172 ++++ + Documentation/process/maintainer-tip.rst | 18 +- + Documentation/scheduler/sched-domains.rst | 12 +- + Documentation/scheduler/sched-stats.rst | 37 +- + .../translations/zh_CN/scheduler/sched-domains.rst | 10 +- + .../translations/zh_CN/scheduler/sched-stats.rst | 30 +- + MAINTAINERS | 20 + + arch/arm/kernel/topology.c | 2 +- + arch/powerpc/include/asm/vdso/gettimeofday.h | 26 +- + arch/riscv/Kconfig | 2 + + arch/s390/include/asm/vdso/gettimeofday.h | 7 +- + arch/um/include/asm/cpufeature.h | 3 +- + arch/x86/Kconfig | 39 +- + arch/x86/boot/compressed/head_64.S | 5 + + arch/x86/boot/main.c | 4 +- + arch/x86/entry/Makefile | 2 +- + arch/x86/entry/common.c | 30 +- + arch/x86/entry/entry_64_compat.S | 1 - + arch/x86/entry/syscall_32.c | 11 +- + arch/x86/entry/syscall_64.c | 8 +- + arch/x86/entry/syscall_x32.c | 7 +- + arch/x86/entry/syscalls/syscall_64.tbl | 2 +- + arch/x86/entry/{thunk_64.S => thunk.S} | 0 + arch/x86/entry/thunk_32.S | 18 - + arch/x86/events/amd/core.c | 37 +- + arch/x86/events/amd/lbr.c | 13 +- + arch/x86/events/core.c | 1 + + arch/x86/events/perf_event.h | 13 + + arch/x86/events/rapl.c | 7 +- + arch/x86/hyperv/hv_vtl.c | 1 - + arch/x86/include/asm/alternative.h | 22 +- + arch/x86/include/asm/apic.h | 5 +- + arch/x86/include/asm/asm.h | 3 - + arch/x86/include/asm/atomic.h | 12 +- + arch/x86/include/asm/atomic64_32.h | 81 +- + arch/x86/include/asm/atomic64_64.h | 12 +- + arch/x86/include/asm/boot.h | 5 - + arch/x86/include/asm/cmpxchg_32.h | 211 +++-- + arch/x86/include/asm/cmpxchg_64.h | 2 +- + arch/x86/include/asm/cpu_device_id.h | 8 + + arch/x86/include/asm/cpufeature.h | 16 +- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/extable_fixup_types.h | 2 +- + arch/x86/include/asm/ia32.h | 11 - + arch/x86/include/asm/ia32_unistd.h | 12 - + arch/x86/include/asm/irq_stack.h | 2 +- + arch/x86/include/asm/mce.h | 2 + + arch/x86/include/asm/msr-index.h | 9 +- + arch/x86/include/asm/page_types.h | 8 +- + arch/x86/include/asm/percpu.h | 157 ++-- + arch/x86/include/asm/processor.h | 12 +- + arch/x86/include/asm/prom.h | 9 +- + arch/x86/include/asm/seccomp.h | 2 +- + arch/x86/include/asm/special_insns.h | 8 +- + arch/x86/include/asm/string_64.h | 45 +- + arch/x86/include/asm/syscall.h | 8 +- + arch/x86/include/asm/text-patching.h | 2 +- + arch/x86/include/asm/uaccess.h | 4 +- + arch/x86/include/asm/vdso/gettimeofday.h | 42 +- + arch/x86/include/asm/vm86.h | 2 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/alternative.c | 135 ++-- + arch/x86/kernel/apic/apic.c | 14 +- + arch/x86/kernel/apic/x2apic_cluster.c | 7 +- + arch/x86/kernel/callthunks.c | 9 +- + arch/x86/kernel/cpu/amd.c | 12 + + arch/x86/kernel/cpu/bugs.c | 114 +-- + arch/x86/kernel/cpu/common.c | 65 +- + arch/x86/kernel/cpu/cpuid-deps.c | 3 + + arch/x86/kernel/cpu/intel.c | 1 + + arch/x86/kernel/cpu/mce/core.c | 18 + + arch/x86/kernel/cpu/mce/genpool.c | 36 +- + arch/x86/kernel/cpu/mce/severity.c | 17 +- + arch/x86/kernel/cpu/microcode/amd.c | 4 +- + arch/x86/kernel/cpu/topology.c | 7 +- + arch/x86/kernel/cpu/topology_amd.c | 49 +- + arch/x86/kernel/cpu/topology_ext.c | 15 + + arch/x86/kernel/devicetree.c | 24 +- + arch/x86/kernel/dumpstack.c | 4 +- + arch/x86/kernel/fpu/core.c | 4 +- + arch/x86/kernel/fpu/xstate.c | 4 +- + arch/x86/kernel/head_32.S | 13 +- + arch/x86/kernel/head_64.S | 4 +- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/rtc.c | 1 - + arch/x86/kernel/setup.c | 40 +- + arch/x86/kernel/shstk.c | 4 +- + arch/x86/kernel/signal_32.c | 2 +- + arch/x86/kernel/signal_64.c | 6 + + arch/x86/kernel/smpboot.c | 22 +- + arch/x86/kernel/topology.c | 43 - + arch/x86/kernel/tsc.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 10 +- + arch/x86/math-emu/fpu_etc.c | 9 +- + arch/x86/math-emu/fpu_trig.c | 6 +- + arch/x86/math-emu/reg_constant.c | 7 +- + arch/x86/mm/extable.c | 9 - + arch/x86/platform/ce4100/ce4100.c | 1 - + arch/x86/platform/iris/iris.c | 5 +- + arch/x86/platform/olpc/olpc-xo1-pm.c | 7 +- + arch/x86/platform/olpc/olpc-xo1-sci.c | 5 +- + arch/x86/tools/relocs.c | 371 ++++----- + arch/x86/virt/vmx/tdx/tdx.c | 1 - + arch/x86/xen/enlighten.c | 3 - + arch/x86/xen/xen-head.S | 2 +- + drivers/irqchip/Kconfig | 27 +- + drivers/irqchip/Makefile | 3 + + drivers/irqchip/irq-alpine-msi.c | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 8 +- + drivers/irqchip/irq-loongson-eiointc.c | 4 + + drivers/irqchip/irq-loongson-pch-msi.c | 2 +- + drivers/irqchip/irq-renesas-rzg2l.c | 28 +- + drivers/irqchip/irq-riscv-aplic-direct.c | 326 ++++++++ + drivers/irqchip/irq-riscv-aplic-main.c | 211 +++++ + drivers/irqchip/irq-riscv-aplic-main.h | 52 ++ + drivers/irqchip/irq-riscv-aplic-msi.c | 257 ++++++ + drivers/irqchip/irq-riscv-imsic-early.c | 201 +++++ + drivers/irqchip/irq-riscv-imsic-platform.c | 374 +++++++++ + drivers/irqchip/irq-riscv-imsic-state.c | 865 +++++++++++++++++++++ + drivers/irqchip/irq-riscv-imsic-state.h | 108 +++ + drivers/irqchip/irq-sunxi-nmi.c | 1 - + drivers/irqchip/irq-tb10x.c | 1 - + include/asm-generic/bug.h | 5 +- + include/asm-generic/sections.h | 5 + + include/asm-generic/vmlinux.lds.h | 8 +- + include/linux/cpuhotplug.h | 1 + + include/linux/irq.h | 2 +- + include/linux/irqchip/riscv-aplic.h | 145 ++++ + include/linux/irqchip/riscv-imsic.h | 87 +++ + include/linux/irqflags.h | 2 +- + include/linux/jump_label.h | 3 + + include/linux/math64.h | 8 +- + include/linux/perf_event.h | 6 + + include/linux/rwbase_rt.h | 4 +- + include/linux/rwsem.h | 6 +- + include/linux/sched.h | 3 +- + include/linux/sched/idle.h | 2 +- + include/linux/sched/topology.h | 2 +- + include/trace/events/mce.h | 25 +- + include/vdso/datapage.h | 4 + + include/vdso/math64.h | 38 + + init/init_task.c | 1 + + init/main.c | 1 + + kernel/context_tracking.c | 2 +- + kernel/cpu.c | 3 +- + kernel/events/core.c | 73 +- + kernel/irq/irqdomain.c | 5 +- + kernel/jump_label.c | 53 ++ + kernel/locking/lock_events.h | 4 +- + kernel/locking/qspinlock.c | 13 +- + kernel/locking/qspinlock_paravirt.h | 33 +- + kernel/sched/core.c | 6 +- + kernel/sched/fair.c | 438 ++++++----- + kernel/sched/loadavg.c | 2 +- + kernel/sched/pelt.c | 4 +- + kernel/sched/sched.h | 49 +- + kernel/sched/stats.c | 5 +- + kernel/sched/topology.c | 56 +- + kernel/time/clockevents.c | 2 +- + kernel/time/clocksource.c | 44 +- + kernel/time/hrtimer.c | 20 +- + kernel/time/tick-common.c | 17 +- + kernel/time/tick-sched.c | 36 +- + kernel/time/timekeeping.c | 106 +-- + kernel/time/timer.c | 2 +- + kernel/time/vsyscall.c | 6 + + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 2 +- + lib/vdso/Kconfig | 7 + + lib/vdso/gettimeofday.c | 55 +- + .../ftrace/test.d/ftrace/func_set_ftrace_file.tc | 2 +- + tools/testing/selftests/kselftest.h | 13 + + tools/testing/selftests/timers/posix_timers.c | 103 ++- + tools/testing/selftests/timers/valid-adjtimex.c | 73 +- + tools/testing/selftests/x86/amx.c | 27 +- + tools/testing/selftests/x86/lam.c | 2 +- + 179 files changed, 5019 insertions(+), 1652 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/riscv,aplic.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/riscv,imsics.yaml + rename arch/x86/entry/{thunk_64.S => thunk.S} (100%) + delete mode 100644 arch/x86/entry/thunk_32.S + delete mode 100644 arch/x86/include/asm/ia32_unistd.h + delete mode 100644 arch/x86/kernel/topology.c + create mode 100644 drivers/irqchip/irq-riscv-aplic-direct.c + create mode 100644 drivers/irqchip/irq-riscv-aplic-main.c + create mode 100644 drivers/irqchip/irq-riscv-aplic-main.h + create mode 100644 drivers/irqchip/irq-riscv-aplic-msi.c + create mode 100644 drivers/irqchip/irq-riscv-imsic-early.c + create mode 100644 drivers/irqchip/irq-riscv-imsic-platform.c + create mode 100644 drivers/irqchip/irq-riscv-imsic-state.c + create mode 100644 drivers/irqchip/irq-riscv-imsic-state.h + create mode 100644 include/linux/irqchip/riscv-aplic.h + create mode 100644 include/linux/irqchip/riscv-imsic.h +Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization) +$ 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 (8e95536e9495 Merge branch ras/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 +Merge made by the 'ort' strategy. + drivers/edac/altera_edac.c | 8 +++--- + drivers/edac/amd64_edac.h | 1 - + drivers/edac/amd8111_edac.c | 3 +-- + drivers/edac/armada_xp_edac.c | 2 +- + drivers/edac/cpc925_edac.c | 2 +- + drivers/edac/edac_device.c | 53 ++-------------------------------------- + drivers/edac/edac_device.h | 22 +++-------------- + drivers/edac/edac_device_sysfs.c | 22 +++-------------- + drivers/edac/edac_mc_sysfs.c | 47 +++++++++++++++++------------------ + drivers/edac/edac_pci.h | 5 ---- + drivers/edac/highbank_l2_edac.c | 2 +- + drivers/edac/mpc85xx_edac.c | 2 +- + drivers/edac/octeon_edac-l2c.c | 2 +- + drivers/edac/octeon_edac-pc.c | 2 +- + drivers/edac/qcom_edac.c | 1 - + drivers/edac/sifive_edac.c | 3 +-- + drivers/edac/skx_common.c | 2 +- + drivers/edac/thunderx_edac.c | 6 ++--- + drivers/edac/xgene_edac.c | 10 +++----- + drivers/edac/zynqmp_edac.c | 2 +- + 20 files changed, 50 insertions(+), 147 deletions(-) +Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Already up to date. +Merging rcu/rcu/next (8942ebe9e183 rcutorture: Make rcutorture support srcu double call test) + 56544e22cc3a ("fs/proc: remove redundant comments from /proc/bootconfig") + e6f3a323fcfa ("fs/proc: Skip bootloader comment if no embedded kernel parameters") +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging .mailmap +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/Kconfig +Auto-merging arch/x86/kernel/tsc.c +Auto-merging init/main.c +Auto-merging kernel/bpf/trampoline.c +Merge made by the 'ort' strategy. + .mailmap | 3 +- + .../RCU/Design/Requirements/Requirements.rst | 16 + + Documentation/RCU/whatisRCU.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 14 + + Documentation/atomic_t.txt | 4 +- + Documentation/litmus-tests/README | 45 ++ + .../atomic/cmpxchg-fail-ordered-1.litmus | 35 ++ + .../atomic/cmpxchg-fail-ordered-2.litmus | 30 ++ + .../atomic/cmpxchg-fail-unordered-1.litmus | 34 ++ + .../atomic/cmpxchg-fail-unordered-2.litmus | 30 ++ + MAINTAINERS | 2 +- + arch/Kconfig | 4 +- + arch/x86/kernel/tsc.c | 2 +- + include/linux/rcupdate.h | 82 +++- + include/linux/rcupdate_wait.h | 18 +- + include/linux/srcutiny.h | 2 + + include/trace/events/rcu.h | 27 ++ + kernel/bpf/Kconfig | 2 +- + kernel/bpf/trampoline.c | 2 +- + kernel/rcu/Kconfig | 8 +- + kernel/rcu/rcu.h | 20 +- + kernel/rcu/rcutorture.c | 133 +++--- + kernel/rcu/srcutiny.c | 31 +- + kernel/rcu/srcutree.c | 5 +- + kernel/rcu/sync.c | 8 +- + kernel/rcu/tasks.h | 43 +- + kernel/rcu/tiny.c | 4 +- + kernel/rcu/tree.c | 460 +++++++++++++++++++-- + kernel/rcu/tree.h | 25 +- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 4 +- + kernel/rcu/tree_stall.h | 11 +- + kernel/rcu/update.c | 4 +- + kernel/trace/Kconfig | 4 +- + kernel/trace/ftrace.c | 16 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 6 +- + .../selftests/rcutorture/configs/rcu/TREE09 | 5 +- + 37 files changed, 982 insertions(+), 165 deletions(-) + create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-ordered-1.litmus + create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-ordered-2.litmus + create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-unordered-1.litmus + create mode 100644 Documentation/litmus-tests/atomic/cmpxchg-fail-unordered-2.litmus +Merging kvm/next (415efaaf0d97 KVM: SEV: use u64_to_user_ptr throughout) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kernel/fpu/xstate.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging mm/memory.c +Auto-merging mm/migrate_device.c +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 2 + + .../virt/kvm/x86/amd-memory-encryption.rst | 52 ++- + arch/arm64/kvm/mmu.c | 34 -- + arch/loongarch/include/asm/kvm_host.h | 1 - + arch/loongarch/kvm/mmu.c | 32 -- + arch/mips/kvm/mmu.c | 30 -- + arch/powerpc/include/asm/kvm_ppc.h | 1 - + arch/powerpc/kvm/book3s.c | 5 - + arch/powerpc/kvm/book3s.h | 1 - + arch/powerpc/kvm/book3s_64_mmu_hv.c | 12 - + arch/powerpc/kvm/book3s_hv.c | 1 - + arch/powerpc/kvm/book3s_pr.c | 7 - + arch/powerpc/kvm/e500_mmu_host.c | 6 - + arch/riscv/kvm/mmu.c | 20 -- + arch/x86/include/asm/fpu/api.h | 3 + + arch/x86/include/asm/kvm-x86-ops.h | 1 + + arch/x86/include/asm/kvm_host.h | 12 +- + arch/x86/include/uapi/asm/kvm.h | 20 +- + arch/x86/kernel/fpu/xstate.c | 1 + + arch/x86/kernel/fpu/xstate.h | 2 - + arch/x86/kvm/Makefile | 9 +- + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 67 +--- + arch/x86/kvm/mmu/spte.c | 16 - + arch/x86/kvm/mmu/spte.h | 2 - + arch/x86/kvm/mmu/tdp_mmu.c | 46 --- + arch/x86/kvm/mmu/tdp_mmu.h | 1 - + arch/x86/kvm/svm/sev.c | 234 +++++++++---- + arch/x86/kvm/svm/svm.c | 27 +- + arch/x86/kvm/svm/svm.h | 54 ++- + arch/x86/kvm/vmx/main.c | 166 +++++++++ + arch/x86/kvm/vmx/vmx.c | 385 ++++++--------------- + arch/x86/kvm/vmx/x86_ops.h | 124 +++++++ + arch/x86/kvm/x86.c | 221 +++++++----- + arch/x86/kvm/x86.h | 2 + + include/linux/kvm_host.h | 2 - + include/linux/mmu_notifier.h | 44 --- + include/trace/events/kvm.h | 15 - + kernel/events/uprobes.c | 5 +- + mm/ksm.c | 4 +- + mm/memory.c | 7 +- + mm/migrate_device.c | 8 +- + mm/mmu_notifier.c | 17 - + tools/testing/selftests/kvm/Makefile | 1 + + .../testing/selftests/kvm/include/kvm_util_base.h | 11 +- + .../selftests/kvm/include/x86_64/processor.h | 6 - + tools/testing/selftests/kvm/include/x86_64/sev.h | 19 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 1 - + tools/testing/selftests/kvm/lib/x86_64/processor.c | 14 +- + tools/testing/selftests/kvm/lib/x86_64/sev.c | 44 ++- + .../testing/selftests/kvm/set_memory_region_test.c | 8 +- + .../testing/selftests/kvm/x86_64/sev_init2_tests.c | 152 ++++++++ + .../testing/selftests/kvm/x86_64/sev_smoke_test.c | 96 ++++- + virt/kvm/kvm_main.c | 50 +-- + 54 files changed, 1180 insertions(+), 923 deletions(-) + create mode 100644 arch/x86/kvm/vmx/main.c + create mode 100644 arch/x86/kvm/vmx/x86_ops.h + create mode 100644 tools/testing/selftests/kvm/x86_64/sev_init2_tests.c +$ git am -3 ../patches/0001-fix-up-for-mm-replace-set_pte_at_notify-with-just-se.patch +Applying: fix up for "mm: replace set_pte_at_notify() with just set_pte_at()" +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/events/uprobes.c +$ git add -A . +$ git commit -v -a --amend +[master 498ffcf188a8] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git + Date: Fri Apr 12 12:54:47 2024 +1000 +Merging kvm-arm/next (29b0075ed61c KVM: selftests: Fix __GUEST_ASSERT() format warnings in ARM's arch timer test) +$ 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 (00de073e2420 KVM: s390: selftest: memop: Fix undefined behavior) +$ 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 (41bccc98fb79 Linux 6.8-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 (8e936e98718f RISC-V: KVM: Fix APLIC in_clrip[x] read emulation) +$ 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 (f10f3621ad80 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'svm' and 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kvm/Makefile +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/mmu/tdp_mmu.c +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/svm/svm.c +CONFLICT (content): Merge conflict in arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/svm.h +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging tools/testing/selftests/kvm/set_memory_region_test.c +Auto-merging virt/kvm/kvm_main.c +Resolved 'arch/x86/kvm/svm/svm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4b71c8daab25] Merge branch 'next' of https://github.com/kvm-x86/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/x86/events/intel/lbr.c | 1 + + arch/x86/include/asm/kvm_host.h | 3 - + arch/x86/include/asm/perf_event.h | 1 + + arch/x86/kvm/Makefile | 5 - + arch/x86/kvm/cpuid.c | 41 ++++-- + arch/x86/kvm/kvm_emulate.h | 1 + + arch/x86/kvm/mmu.h | 2 + + arch/x86/kvm/mmu/mmu.c | 14 +- + arch/x86/kvm/mmu/page_track.c | 2 +- + arch/x86/kvm/mmu/paging_tmpl.h | 14 +- + arch/x86/kvm/mmu/tdp_mmu.c | 126 +++++++++-------- + arch/x86/kvm/pmu.c | 16 ++- + arch/x86/kvm/svm/sev.c | 2 +- + arch/x86/kvm/svm/svm.c | 17 ++- + arch/x86/kvm/svm/svm.h | 3 +- + arch/x86/kvm/svm/vmenter.S | 97 ++++++------- + arch/x86/kvm/vmx/nested.c | 30 +++- + arch/x86/kvm/vmx/pmu_intel.c | 2 +- + arch/x86/kvm/vmx/vmx.c | 43 ++++-- + arch/x86/kvm/vmx/vmx.h | 6 +- + arch/x86/kvm/x86.c | 6 +- + .../selftests/kvm/aarch64/page_fault_test.c | 4 +- + tools/testing/selftests/kvm/demand_paging_test.c | 90 +++++++++--- + .../selftests/kvm/include/userfaultfd_util.h | 16 ++- + tools/testing/selftests/kvm/lib/userfaultfd_util.c | 153 ++++++++++++--------- + .../testing/selftests/kvm/max_guest_memory_test.c | 15 +- + .../testing/selftests/kvm/set_memory_region_test.c | 2 +- + tools/testing/selftests/kvm/steal_time.c | 47 +++---- + .../selftests/kvm/x86_64/pmu_counters_test.c | 20 ++- + .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 60 ++++++-- + virt/kvm/kvm_main.c | 19 ++- + virt/kvm/kvm_mm.h | 6 +- + virt/kvm/pfncache.c | 50 +++++-- + 33 files changed, 582 insertions(+), 332 deletions(-) +Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted) +$ 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 (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (8a8a4bfdbe85 Merge branch 'for-6.10' into for-next) +$ 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. + Documentation/core-api/workqueue.rst | 6 +- + .../translations/zh_CN/core-api/workqueue.rst | 398 ++++++++++++++++-- + include/linux/workqueue.h | 52 ++- + include/trace/events/workqueue.h | 4 +- + kernel/workqueue.c | 467 +++++++++++++-------- + tools/workqueue/wq_monitor.py | 9 +- + 6 files changed, 707 insertions(+), 229 deletions(-) +Merging drivers-x86/for-next (88c0ef69dd88 platform/x86: asus-wmi: cleanup main struct to avoid some holes) +$ 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/intel/vbtn.c +Auto-merging drivers/platform/x86/toshiba_acpi.c +Auto-merging drivers/platform/x86/uv_sysfs.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-platform-asus-wmi | 26 + + .../bindings/platform/acer,aspire1-ec.yaml | 60 +++ + Documentation/wmi/driver-development-guide.rst | 178 +++++++ + Documentation/wmi/index.rst | 1 + + MAINTAINERS | 23 +- + arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 40 +- + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 1 + + drivers/platform/arm64/Kconfig | 35 ++ + drivers/platform/arm64/Makefile | 8 + + drivers/platform/arm64/acer-aspire1-ec.c | 562 +++++++++++++++++++++ + .../platform/surface/surface_aggregator_registry.c | 43 +- + .../platform/surface/surface_platform_profile.c | 88 +++- + drivers/platform/x86/Kconfig | 25 + + drivers/platform/x86/Makefile | 4 + + drivers/platform/x86/amd/hsmp.c | 2 +- + drivers/platform/x86/asus-wmi.c | 417 +++++++++++---- + drivers/platform/x86/hp/hp-wmi.c | 12 +- + drivers/platform/x86/huawei-wmi.c | 8 +- + drivers/platform/x86/inspur_platform_profile.c | 1 + + drivers/platform/x86/intel/vbtn.c | 3 +- + drivers/platform/x86/lenovo-wmi-camera.c | 127 +++++ + drivers/platform/x86/p2sb.c | 15 +- + drivers/platform/x86/quickstart.c | 246 +++++++++ + drivers/platform/x86/toshiba_acpi.c | 36 +- + drivers/platform/x86/uv_sysfs.c | 20 +- + drivers/platform/x86/wmi.c | 60 ++- + drivers/platform/x86/x86-android-tablets/other.c | 82 +++ + drivers/platform/x86/xiaomi-wmi.c | 30 +- + include/linux/platform_data/x86/asus-wmi.h | 6 + + 30 files changed, 1985 insertions(+), 176 deletions(-) + create mode 100644 Documentation/devicetree/bindings/platform/acer,aspire1-ec.yaml + create mode 100644 Documentation/wmi/driver-development-guide.rst + create mode 100644 drivers/platform/arm64/Kconfig + create mode 100644 drivers/platform/arm64/Makefile + create mode 100644 drivers/platform/arm64/acer-aspire1-ec.c + create mode 100644 drivers/platform/x86/lenovo-wmi-camera.c + create mode 100644 drivers/platform/x86/quickstart.c +Merging chrome-platform/for-next (70a5f3005008 platform/chrome: cros_ec_lpc: add quirks for the Framework Laptop (AMD)) +$ 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 +Auto-merging drivers/platform/chrome/wilco_ec/event.c +Merge made by the 'ort' strategy. + drivers/platform/chrome/Kconfig | 1 + + drivers/platform/chrome/cros_ec_chardev.c | 9 ++- + drivers/platform/chrome/cros_ec_debugfs.c | 9 ++- + drivers/platform/chrome/cros_ec_lightbar.c | 9 ++- + drivers/platform/chrome/cros_ec_lpc.c | 81 ++++++++++++++++++++++-- + drivers/platform/chrome/cros_ec_proto_test.c | 72 +++++++++------------ + drivers/platform/chrome/cros_ec_sensorhub.c | 9 ++- + drivers/platform/chrome/cros_ec_sysfs.c | 9 ++- + drivers/platform/chrome/cros_ec_vbc.c | 9 ++- + drivers/platform/chrome/cros_hps_i2c.c | 4 +- + drivers/platform/chrome/cros_kbd_led_backlight.c | 11 +++- + drivers/platform/chrome/cros_usbpd_logger.c | 9 ++- + drivers/platform/chrome/cros_usbpd_notify.c | 9 ++- + drivers/platform/chrome/wilco_ec/Kconfig | 1 + + drivers/platform/chrome/wilco_ec/core.c | 9 ++- + drivers/platform/chrome/wilco_ec/debugfs.c | 9 ++- + drivers/platform/chrome/wilco_ec/event.c | 1 - + drivers/platform/chrome/wilco_ec/sysfs.c | 2 +- + drivers/platform/chrome/wilco_ec/telemetry.c | 9 ++- + 19 files changed, 206 insertions(+), 66 deletions(-) +Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization) +$ 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 | 1 - + drivers/firmware/google/coreboot_table.c | 6 ++++-- + drivers/firmware/google/coreboot_table.h | 6 +++++- + 3 files changed, 9 insertions(+), 4 deletions(-) +Merging hsi/for-next (4cece7649650 Linux 6.9-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 (de6b3fd4bbc9 leds: trigger: netdev: Remove not needed call to led_set_brightness in deactivate) + da8310b24223 ("video: backlight: Make backlight_class constant") +$ 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 drivers/video/backlight/backlight.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 4 + + .../devicetree/bindings/leds/nxp,pca963x.yaml | 140 +++++++++++++++++++++ + Documentation/devicetree/bindings/leds/pca963x.txt | 52 -------- + arch/mips/configs/ci20_defconfig | 1 - + drivers/leds/led-triggers.c | 6 +- + drivers/leds/simple/simatic-ipc-leds-gpio-core.c | 1 + + drivers/leds/simple/simatic-ipc-leds-gpio-f7188x.c | 52 +++++++- + drivers/leds/trigger/Kconfig | 7 -- + drivers/leds/trigger/Makefile | 1 - + drivers/leds/trigger/ledtrig-audio.c | 67 ---------- + drivers/leds/trigger/ledtrig-netdev.c | 2 - + drivers/video/backlight/lcd.c | 23 ++-- + include/dt-bindings/leds/common.h | 3 + + include/linux/leds.h | 29 ++--- + sound/core/Kconfig | 1 - + sound/core/control_led.c | 20 ++- + 16 files changed, 243 insertions(+), 166 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/nxp,pca963x.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/pca963x.txt + delete mode 100644 drivers/leds/trigger/ledtrig-audio.c +Merging ipmi/for-next (6b4c04178660 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void) +$ 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/Makefile | 11 ++++------- + drivers/char/ipmi/bt-bmc.c | 5 ++--- + drivers/char/ipmi/ipmi_msghandler.c | 30 +++++++++++++++--------------- + drivers/char/ipmi/ipmi_powernv.c | 6 ++---- + drivers/char/ipmi/ipmi_si_intf.c | 3 ++- + drivers/char/ipmi/ipmi_si_pci.c | 3 +++ + drivers/char/ipmi/ipmi_si_platform.c | 6 ++---- + drivers/char/ipmi/ipmi_ssif.c | 5 ++--- + drivers/char/ipmi/kcs_bmc_aspeed.c | 6 ++---- + drivers/char/ipmi/kcs_bmc_npcm7xx.c | 6 ++---- + 10 files changed, 36 insertions(+), 45 deletions(-) +Merging driver-core/driver-core-next (0bb322be5d38 driver core: Remove unused platform_notify, platform_notify_remove) +$ 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 drivers/base/core.c +Auto-merging include/linux/device.h +Merge made by the 'ort' strategy. + drivers/base/core.c | 8 -------- + include/linux/device.h | 11 ----------- + 2 files changed, 19 deletions(-) +Merging usb/usb-next (1a395af9d53c usb: typec: ucsi_glink: drop special handling for CCI_BUSY) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/devicetree/bindings/usb/dwc2.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/usb/gadget/function/f_fs.c +CONFLICT (modify/delete): drivers/usb/misc/onboard_usb_hub.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/misc/onboard_usb_hub.c left in tree. +Auto-merging drivers/usb/typec/ucsi/ucsi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/usb/misc/onboard_usb_hub.c +rm 'drivers/usb/misc/onboard_usb_hub.c' +$ git commit --no-edit -v -a +[master 5ccf4ab0b2df] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git +$ git diff -M --stat --summary HEAD^.. + ...-usb-hub => sysfs-bus-platform-onboard-usb-dev} | 3 +- + .../devicetree/bindings/sound/xmos,xvf3500.yaml | 63 +++ + .../bindings/usb/chipidea,usb2-common.yaml | 200 ++++++++ + .../devicetree/bindings/usb/chipidea,usb2-imx.yaml | 287 +++++++++++ + .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 360 +------------- + .../devicetree/bindings/usb/cypress,hx3.yaml | 1 - + Documentation/devicetree/bindings/usb/dwc2.yaml | 1 + + .../devicetree/bindings/usb/microchip,usb2514.yaml | 63 +++ + .../devicetree/bindings/usb/qcom,pmic-typec.yaml | 1 + + .../devicetree/bindings/usb/renesas,usbhs.yaml | 6 +- + MAINTAINERS | 4 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +- + arch/arm64/configs/defconfig | 2 +- + drivers/gpu/drm/ci/arm64.config | 4 +- + drivers/soc/qcom/pmic_glink.c | 5 - + drivers/usb/chipidea/ci_hdrc_imx.c | 2 +- + drivers/usb/chipidea/ci_hdrc_npcm.c | 6 +- + drivers/usb/chipidea/core.c | 8 +- + drivers/usb/chipidea/ulpi.c | 5 - + drivers/usb/core/Makefile | 4 +- + drivers/usb/core/hub.c | 8 +- + drivers/usb/core/hub.h | 2 +- + drivers/usb/dwc2/core.c | 42 ++ + drivers/usb/dwc2/core.h | 8 + + drivers/usb/dwc2/core_intr.c | 26 +- + drivers/usb/dwc2/debugfs.c | 1 + + drivers/usb/dwc2/gadget.c | 28 +- + drivers/usb/dwc2/hcd.c | 10 + + drivers/usb/dwc2/hcd_queue.c | 52 +- + drivers/usb/dwc2/hw.h | 14 + + drivers/usb/dwc2/params.c | 43 ++ + drivers/usb/dwc3/dwc3-pci.c | 8 +- + drivers/usb/gadget/function/f_fs.c | 20 +- + drivers/usb/gadget/function/u_audio.c | 11 +- + drivers/usb/gadget/function/u_ether.c | 2 +- + drivers/usb/gadget/function/uvc_configfs.c | 14 +- + drivers/usb/gadget/function/uvc_v4l2.c | 24 +- + drivers/usb/gadget/udc/core.c | 9 + + drivers/usb/gadget/udc/mv_u3d_core.c | 4 +- + drivers/usb/gadget/udc/omap_udc.c | 10 +- + drivers/usb/host/ehci-dbg.c | 10 +- + drivers/usb/host/ehci-q.c | 20 +- + drivers/usb/host/ehci.h | 8 +- + drivers/usb/misc/Kconfig | 16 +- + drivers/usb/misc/Makefile | 2 +- + drivers/usb/misc/onboard_usb_dev.c | 546 +++++++++++++++++++++ + .../misc/{onboard_usb_hub.h => onboard_usb_dev.h} | 62 ++- + ...ard_usb_hub_pdevs.c => onboard_usb_dev_pdevs.c} | 47 +- + drivers/usb/misc/onboard_usb_hub.c | 507 ------------------- + drivers/usb/misc/uss720.c | 42 +- + drivers/usb/phy/phy-fsl-usb.c | 1 - + drivers/usb/phy/phy-generic.c | 1 + + drivers/usb/renesas_usbhs/common.c | 41 +- + drivers/usb/renesas_usbhs/rza.h | 1 + + drivers/usb/renesas_usbhs/rza2.c | 13 + + drivers/usb/typec/altmodes/displayport.c | 1 - + drivers/usb/typec/altmodes/nvidia.c | 1 - + drivers/usb/typec/mux/Kconfig | 2 +- + drivers/usb/typec/mux/ptn36502.c | 44 +- + drivers/usb/typec/stusb160x.c | 2 +- + drivers/usb/typec/ucsi/ucsi.c | 216 ++++---- + drivers/usb/typec/ucsi/ucsi.h | 3 +- + drivers/usb/typec/ucsi/ucsi_acpi.c | 56 +-- + drivers/usb/typec/ucsi/ucsi_glink.c | 25 +- + drivers/usb/typec/ucsi/ucsi_stm32g0.c | 1 + + include/linux/usb/onboard_dev.h | 18 + + include/linux/usb/onboard_hub.h | 18 - + 70 files changed, 1766 insertions(+), 1307 deletions(-) + rename Documentation/ABI/testing/{sysfs-bus-platform-onboard-usb-hub => sysfs-bus-platform-onboard-usb-dev} (74%) + create mode 100644 Documentation/devicetree/bindings/sound/xmos,xvf3500.yaml + create mode 100644 Documentation/devicetree/bindings/usb/chipidea,usb2-common.yaml + create mode 100644 Documentation/devicetree/bindings/usb/chipidea,usb2-imx.yaml + create mode 100644 Documentation/devicetree/bindings/usb/microchip,usb2514.yaml + create mode 100644 drivers/usb/misc/onboard_usb_dev.c + rename drivers/usb/misc/{onboard_usb_hub.h => onboard_usb_dev.h} (56%) + rename drivers/usb/misc/{onboard_usb_hub_pdevs.c => onboard_usb_dev_pdevs.c} (68%) + delete mode 100644 drivers/usb/misc/onboard_usb_hub.c + create mode 100644 include/linux/usb/onboard_dev.h + delete mode 100644 include/linux/usb/onboard_hub.h +$ git am -3 ../patches/0001-fix-up-for-usb-misc-onboard_hub-rename-to-onboard_de.patch +Applying: fix up for "usb: misc: onboard_hub: rename to onboard_dev" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/usb/misc/onboard_usb_dev.c +$ git add -A . +$ git commit -v -a --amend +[master 2e438df788dd] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git + Date: Fri Apr 12 14:19:32 2024 +1000 +Merging thunderbolt/next (9a966517a830 thunderbolt: Enable NVM upgrade support on Intel Maple Ridge) +$ 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/icm.c | 1 + + 1 file changed, 1 insertion(+) +Merging usb-serial/usb-next (b1a8da9ff139 USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M) +$ 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 (fff4a5d5609d serial: ar933x: Remove unneeded static structure) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging drivers/tty/serial/mxs-auart.c +Auto-merging drivers/tty/serial/pmac_zilog.c +Auto-merging drivers/tty/serial/serial_base.h +Auto-merging drivers/tty/serial/serial_core.c +CONFLICT (content): Merge conflict in drivers/tty/serial/serial_core.c +Auto-merging drivers/tty/serial/serial_port.c +Auto-merging include/linux/printk.h +Resolved 'drivers/tty/serial/serial_core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2745bb73c47b] Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 19 ++ + .../bindings/serial/actions,owl-uart.txt | 16 - + .../bindings/serial/actions,owl-uart.yaml | 48 +++ + .../devicetree/bindings/serial/renesas,scif.yaml | 1 + + drivers/tty/amiserial.c | 8 +- + drivers/tty/hvc/hvc_xen.c | 2 +- + drivers/tty/n_gsm.c | 2 +- + drivers/tty/serial/8250/8250_bcm7271.c | 14 +- + drivers/tty/serial/8250/8250_core.c | 8 +- + drivers/tty/serial/8250/8250_dma.c | 31 +- + drivers/tty/serial/8250/8250_exar.c | 5 +- + drivers/tty/serial/8250/8250_mtk.c | 2 +- + drivers/tty/serial/8250/8250_of.c | 37 +++ + drivers/tty/serial/8250/8250_omap.c | 49 ++- + drivers/tty/serial/8250/8250_pci1xxxx.c | 50 ++- + drivers/tty/serial/8250/8250_port.c | 29 +- + drivers/tty/serial/Kconfig | 7 +- + drivers/tty/serial/amba-pl011.c | 62 ++-- + drivers/tty/serial/ar933x_uart.c | 18 +- + drivers/tty/serial/arc_uart.c | 8 +- + drivers/tty/serial/atmel_serial.c | 146 ++++----- + drivers/tty/serial/clps711x.c | 12 +- + drivers/tty/serial/cpm_uart.c | 20 +- + drivers/tty/serial/digicolor-usart.c | 12 +- + drivers/tty/serial/dz.c | 13 +- + drivers/tty/serial/fsl_linflexuart.c | 17 +- + drivers/tty/serial/fsl_lpuart.c | 39 ++- + drivers/tty/serial/icom.c | 25 +- + drivers/tty/serial/imx.c | 54 ++-- + drivers/tty/serial/ip22zilog.c | 26 +- + drivers/tty/serial/jsm/jsm_cls.c | 31 +- + drivers/tty/serial/jsm/jsm_neo.c | 38 +-- + drivers/tty/serial/max3100.c | 337 +++++++++------------ + drivers/tty/serial/max310x.c | 37 +-- + drivers/tty/serial/men_z135_uart.c | 26 +- + drivers/tty/serial/meson_uart.c | 11 +- + drivers/tty/serial/milbeaut_usio.c | 15 +- + drivers/tty/serial/msm_serial.c | 114 +++---- + drivers/tty/serial/mvebu-uart.c | 8 +- + drivers/tty/serial/mxs-auart.c | 23 +- + drivers/tty/serial/pch_uart.c | 21 +- + drivers/tty/serial/pic32_uart.c | 17 +- + drivers/tty/serial/pmac_zilog.c | 33 +- + drivers/tty/serial/qcom_geni_serial.c | 36 +-- + drivers/tty/serial/rda-uart.c | 17 +- + drivers/tty/serial/samsung_tty.c | 54 ++-- + drivers/tty/serial/sb1250-duart.c | 13 +- + drivers/tty/serial/sc16is7xx.c | 42 +-- + drivers/tty/serial/sccnxp.c | 16 +- + drivers/tty/serial/serial-tegra.c | 43 +-- + drivers/tty/serial/serial_base.h | 24 ++ + drivers/tty/serial/serial_base_bus.c | 136 +++++++++ + drivers/tty/serial/serial_core.c | 62 ++-- + drivers/tty/serial/serial_port.c | 2 +- + drivers/tty/serial/sh-sci.c | 51 ++-- + drivers/tty/serial/sifive.c | 4 +- + drivers/tty/serial/sprd_serial.c | 20 +- + drivers/tty/serial/st-asc.c | 4 +- + drivers/tty/serial/stm32-usart.c | 52 ++-- + drivers/tty/serial/sunhv.c | 35 ++- + drivers/tty/serial/sunplus-uart.c | 16 +- + drivers/tty/serial/sunsab.c | 30 +- + drivers/tty/serial/sunsu.c | 15 +- + drivers/tty/serial/sunzilog.c | 27 +- + drivers/tty/serial/tegra-tcu.c | 10 +- + drivers/tty/serial/timbuart.c | 17 +- + drivers/tty/serial/uartlite.c | 13 +- + drivers/tty/serial/ucc_uart.c | 20 +- + drivers/tty/serial/xilinx_uartps.c | 20 +- + drivers/tty/serial/zs.c | 13 +- + drivers/tty/vt/conmakehash.c | 15 +- + include/linux/kfifo.h | 143 ++++++--- + include/linux/printk.h | 3 + + include/linux/serial_core.h | 49 +-- + include/linux/serial_max3100.h | 48 --- + kernel/printk/Makefile | 2 +- + kernel/printk/conopt.c | 146 +++++++++ + kernel/printk/console_cmdline.h | 6 + + kernel/printk/printk.c | 23 +- + lib/kfifo.c | 107 +++---- + 80 files changed, 1561 insertions(+), 1264 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/actions,owl-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/actions,owl-uart.yaml + delete mode 100644 include/linux/serial_max3100.h + create mode 100644 kernel/printk/conopt.c +$ git reset --hard HEAD^ +HEAD is now at eca05b2d0d1a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git +Merging next-20240410 version of tty +$ git merge -m next-20240410/tty fec50db7033ea478773b159e0e2efb135270e3b7 +Already up to date. +Merging char-misc/char-misc-next (fec50db7033e Linux 6.9-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 (576d7cc5a9e2 accel: constify the struct device_type usage) +$ 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 (a4f3057d19ff coresight-tpda: Change qcom,dsb-element-size to qcom,dsb-elem-bits) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (5d04660b29fb fpga: ice40-spi: Remove unused of_gpio.h) +$ 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. + .../bindings/fpga/xlnx,fpga-selectmap.yaml | 86 ++++++++ + Documentation/driver-api/fpga/fpga-bridge.rst | 7 +- + Documentation/driver-api/fpga/fpga-mgr.rst | 34 +-- + drivers/fpga/Kconfig | 12 ++ + drivers/fpga/Makefile | 2 + + drivers/fpga/altera-cvp.c | 1 - + drivers/fpga/altera-ps-spi.c | 1 - + drivers/fpga/fpga-bridge.c | 57 ++--- + drivers/fpga/fpga-mgr.c | 82 +++++--- + drivers/fpga/ice40-spi.c | 1 - + drivers/fpga/tests/fpga-bridge-test.c | 33 +-- + drivers/fpga/tests/fpga-mgr-test.c | 16 +- + drivers/fpga/tests/fpga-region-test.c | 41 ++-- + drivers/fpga/xilinx-core.c | 229 +++++++++++++++++++++ + drivers/fpga/xilinx-core.h | 27 +++ + drivers/fpga/xilinx-selectmap.c | 95 +++++++++ + drivers/fpga/xilinx-spi.c | 224 ++------------------ + include/linux/fpga/fpga-bridge.h | 10 +- + include/linux/fpga/fpga-mgr.h | 26 ++- + 19 files changed, 642 insertions(+), 342 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,fpga-selectmap.yaml + create mode 100644 drivers/fpga/xilinx-core.c + create mode 100644 drivers/fpga/xilinx-core.h + create mode 100644 drivers/fpga/xilinx-selectmap.c +$ git reset --hard HEAD^ +HEAD is now at eca05b2d0d1a Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git +Merging next-20240411 version of fpga +$ git merge -m next-20240411/fpga 4d2bc3f7dea4d17243924c6758e0447cc1aa0eea +Merge made by the 'ort' strategy. + .../bindings/fpga/xlnx,fpga-selectmap.yaml | 86 ++++++++ + Documentation/driver-api/fpga/fpga-bridge.rst | 7 +- + Documentation/driver-api/fpga/fpga-mgr.rst | 34 +-- + drivers/fpga/Kconfig | 12 ++ + drivers/fpga/Makefile | 2 + + drivers/fpga/altera-cvp.c | 1 - + drivers/fpga/altera-ps-spi.c | 1 - + drivers/fpga/fpga-bridge.c | 57 ++--- + drivers/fpga/fpga-mgr.c | 82 +++++--- + drivers/fpga/tests/fpga-bridge-test.c | 33 +-- + drivers/fpga/tests/fpga-mgr-test.c | 16 +- + drivers/fpga/tests/fpga-region-test.c | 41 ++-- + drivers/fpga/xilinx-core.c | 229 +++++++++++++++++++++ + drivers/fpga/xilinx-core.h | 27 +++ + drivers/fpga/xilinx-selectmap.c | 95 +++++++++ + drivers/fpga/xilinx-spi.c | 224 ++------------------ + include/linux/fpga/fpga-bridge.h | 10 +- + include/linux/fpga/fpga-mgr.h | 26 ++- + 18 files changed, 642 insertions(+), 341 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,fpga-selectmap.yaml + create mode 100644 drivers/fpga/xilinx-core.c + create mode 100644 drivers/fpga/xilinx-core.h + create mode 100644 drivers/fpga/xilinx-selectmap.c +Merging icc/icc-next (7af14fe58e5e 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. +Merging iio/togreg (27eea4778db8 iio: adc: ad7944: simplify adi,spi-mode property parsing) +$ 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/iio/health/maxim,max30102.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/iio/pressure/bmp280-core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/iio/adc/adi,ad7173.yaml | 279 ++++ + .../devicetree/bindings/iio/adc/adi,ad7944.yaml | 213 +++ + .../devicetree/bindings/iio/dac/ti,dac5571.yaml | 1 + + .../bindings/iio/health/maxim,max30102.yaml | 12 +- + .../bindings/iio/humidity/ti,hdc3020.yaml | 5 + + .../bindings/iio/light/avago,apds9300.yaml | 20 +- + .../bindings/iio/light/avago,apds9960.yaml | 44 - + Documentation/iio/ad7944.rst | 130 ++ + Documentation/iio/index.rst | 1 + + MAINTAINERS | 11 + + drivers/base/property.c | 14 - + drivers/iio/accel/adxl367.c | 2 +- + drivers/iio/accel/fxls8962af-core.c | 10 +- + drivers/iio/accel/mma8452.c | 6 +- + drivers/iio/adc/Kconfig | 27 + + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/ad7124.c | 55 +- + drivers/iio/adc/ad7173.c | 1190 +++++++++++++++++ + drivers/iio/adc/ad7192.c | 38 +- + drivers/iio/adc/ad7292.c | 13 +- + drivers/iio/adc/ad7944.c | 536 ++++++++ + drivers/iio/adc/ad_sigma_delta.c | 23 +- + drivers/iio/adc/fsl-imx25-gcq.c | 140 +- + drivers/iio/adc/hx711.c | 5 +- + drivers/iio/adc/max11410.c | 27 +- + drivers/iio/adc/rcar-gyroadc.c | 21 +- + drivers/iio/adc/rzg2l_adc.c | 11 +- + drivers/iio/adc/spear_adc.c | 25 +- + drivers/iio/adc/twl4030-madc.c | 19 +- + drivers/iio/addac/ad74413r.c | 10 +- + drivers/iio/dac/ltc2688.c | 28 +- + drivers/iio/dac/ti-dac5571.c | 3 + + drivers/iio/health/max30102.c | 2 + + drivers/iio/humidity/hdc3020.c | 111 +- + drivers/iio/humidity/hts221_core.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 542 +++++++- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 36 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 17 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 83 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 +- + drivers/iio/industrialio-buffer.c | 122 +- + drivers/iio/industrialio-core.c | 49 +- + drivers/iio/industrialio-trigger.c | 71 +- + drivers/iio/inkern.c | 263 ++-- + drivers/iio/light/Kconfig | 12 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/apds9306.c | 1355 ++++++++++++++++++++ + drivers/iio/light/st_uvis25_core.c | 2 +- + drivers/iio/pressure/bmp280-core.c | 16 +- + drivers/iio/pressure/hsc030pa_spi.c | 7 +- + drivers/iio/temperature/ltc2983.c | 137 +- + include/linux/iio/adc/ad_sigma_delta.h | 3 + + include/linux/property.h | 22 +- + 53 files changed, 4927 insertions(+), 849 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7173.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7944.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/avago,apds9960.yaml + create mode 100644 Documentation/iio/ad7944.rst + create mode 100644 drivers/iio/adc/ad7173.c + create mode 100644 drivers/iio/adc/ad7944.c + create mode 100644 drivers/iio/light/apds9306.c +Merging phy-next/next (0338e1d2f933 MAINTAINERS: Add phy-gs101-ufs file to Tensor GS101.) +$ 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-combo.c +Auto-merging drivers/phy/rockchip/phy-rockchip-naneng-combphy.c +Auto-merging drivers/phy/rockchip/phy-rockchip-snps-pcie3.c +Merge made by the 'ort' strategy. + .../bindings/phy/fsl,imx8mp-hdmi-phy.yaml | 62 ++ + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 1 + + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 27 +- + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 3 + + .../bindings/phy/qcom,snps-eusb2-repeater.yaml | 4 +- + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 1 + + MAINTAINERS | 1 + + drivers/phy/freescale/Kconfig | 6 + + drivers/phy/freescale/Makefile | 1 + + drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 720 +++++++++++++++++++++ + drivers/phy/phy-core.c | 26 +- + drivers/phy/qualcomm/phy-qcom-edp.c | 369 +++++++++-- + drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 17 + + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 56 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 100 ++- + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 71 ++ + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 4 +- + drivers/phy/rockchip/phy-rockchip-snps-pcie3.c | 12 +- + drivers/phy/samsung/Makefile | 1 + + drivers/phy/samsung/phy-exynos7-ufs.c | 1 + + drivers/phy/samsung/phy-exynosautov9-ufs.c | 1 + + drivers/phy/samsung/phy-fsd-ufs.c | 1 + + drivers/phy/samsung/phy-gs101-ufs.c | 182 ++++++ + drivers/phy/samsung/phy-samsung-ufs.c | 21 +- + drivers/phy/samsung/phy-samsung-ufs.h | 6 + + drivers/phy/xilinx/phy-zynqmp.c | 6 +- + include/dt-bindings/phy/phy-qcom-qmp.h | 4 + + 27 files changed, 1595 insertions(+), 109 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8mp-hdmi-phy.yaml + create mode 100644 drivers/phy/freescale/phy-fsl-samsung-hdmi.c + create mode 100644 drivers/phy/samsung/phy-gs101-ufs.c +Merging soundwire/next (4cd5ea6de156 soundwire: intel_init: resume all devices on exit.) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging drivers/soundwire/amd_manager.c +Auto-merging sound/soc/sof/intel/hda.c +Merge made by the 'ort' strategy. + drivers/soundwire/amd_init.c | 36 ++++++++--------- + drivers/soundwire/amd_init.h | 8 ++++ + drivers/soundwire/amd_manager.c | 13 +++---- + drivers/soundwire/bus.c | 14 +++---- + drivers/soundwire/bus_type.c | 5 ++- + drivers/soundwire/cadence_master.c | 36 ++++++++--------- + drivers/soundwire/intel.c | 68 ++++++++++++++++++++++++++++++--- + drivers/soundwire/intel_ace2x.c | 58 ++++++++++++++++++++-------- + drivers/soundwire/intel_auxdevice.c | 10 ++--- + drivers/soundwire/intel_auxdevice.h | 1 + + drivers/soundwire/intel_init.c | 14 +++++++ + drivers/soundwire/qcom.c | 28 ++++++++++++-- + drivers/soundwire/sysfs_local.h | 4 +- + drivers/soundwire/sysfs_slave.c | 66 +++++++++++++++----------------- + drivers/soundwire/sysfs_slave_dpn.c | 3 ++ + include/linux/soundwire/sdw.h | 17 +-------- + include/linux/soundwire/sdw_intel.h | 11 +++++- + include/linux/soundwire/sdw_registers.h | 2 +- + sound/soc/sof/intel/hda.c | 4 +- + 19 files changed, 255 insertions(+), 143 deletions(-) +Merging extcon/extcon-next (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + drivers/extcon/Kconfig | 3 ++- + drivers/extcon/extcon-adc-jack.c | 6 ++---- + drivers/extcon/extcon-intel-cht-wc.c | 6 ++---- + drivers/extcon/extcon-intel-mrfld.c | 26 +++++++++----------------- + drivers/extcon/extcon-max3355.c | 6 ++---- + drivers/extcon/extcon-max77843.c | 6 ++---- + drivers/extcon/extcon-rtk-type-c.c | 1 - + drivers/extcon/extcon-usb-gpio.c | 6 ++---- + drivers/extcon/extcon-usbc-cros-ec.c | 6 ++---- + 9 files changed, 23 insertions(+), 43 deletions(-) +Merging gnss/gnss-next (54be6c6c5ae8 Linux 6.8-rc3) +$ 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 (7447d911af69 vfio/fsl-mc: Block calling interrupt handler without trigger) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers) +$ 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. + drivers/w1/masters/w1-gpio.c | 62 ++++++++++++++++++-------------------------- + 1 file changed, 25 insertions(+), 37 deletions(-) +Merging spmi/spmi-next (897268aef3fa spmi: pmic-arb: Replace three IS_ERR() calls by null pointer checks in spmi_pmic_arb_probe()) +$ 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. + .../bindings/spmi/hisilicon,hisi-spmi-controller.yaml | 17 +++++++---------- + drivers/spmi/hisi-spmi-controller.c | 1 - + drivers/spmi/spmi-pmic-arb.c | 12 ++++++------ + drivers/spmi/spmi.c | 2 +- + 4 files changed, 14 insertions(+), 18 deletions(-) +Merging staging/staging-next (18f44de63f88 staging: greybus: change strncpy() to strscpy_pad()) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/axis-fifo/axis-fifo.c | 10 +- + drivers/staging/greybus/arche-apb-ctrl.c | 1 + + drivers/staging/greybus/arche-platform.c | 9 +- + drivers/staging/greybus/audio_manager_module.c | 2 +- + drivers/staging/greybus/camera.c | 58 +- + drivers/staging/greybus/fw-management.c | 12 +- + drivers/staging/greybus/light.c | 8 +- + drivers/staging/greybus/loopback.c | 1 + + drivers/staging/ks7010/ks7010_sdio.c | 2 +- + drivers/staging/nvec/nvec.c | 2 +- + drivers/staging/pi433/pi433_if.c | 697 ++-- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 11 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 16 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 24 +- + drivers/staging/rtl8192e/rtllib.h | 20 +- + drivers/staging/rtl8712/mlme_linux.c | 18 +- + drivers/staging/rtl8712/os_intfs.c | 3 +- + drivers/staging/rtl8712/rtl8712_led.c | 2 +- + drivers/staging/rtl8712/rtl8712_recv.c | 6 +- + drivers/staging/rtl8712/rtl8712_recv.h | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 92 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 5 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- + drivers/staging/rts5208/rtsx_scsi.c | 10 +- + .../staging/vc04_services/bcm2835-audio/Kconfig | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 11 +- + .../vc04_services/interface/vchiq_arm/vchiq_bus.c | 10 + + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 6 - + drivers/staging/vt6655/rf.h | 4 - + drivers/staging/vt6655/srom.c | 1 - + drivers/staging/wlan-ng/Kconfig | 13 - + drivers/staging/wlan-ng/Makefile | 8 - + drivers/staging/wlan-ng/README | 8 - + drivers/staging/wlan-ng/TODO | 16 - + drivers/staging/wlan-ng/cfg80211.c | 718 ---- + drivers/staging/wlan-ng/hfa384x.h | 1236 ------- + drivers/staging/wlan-ng/hfa384x_usb.c | 3880 -------------------- + drivers/staging/wlan-ng/p80211conv.c | 643 ---- + drivers/staging/wlan-ng/p80211conv.h | 141 - + drivers/staging/wlan-ng/p80211hdr.h | 189 - + drivers/staging/wlan-ng/p80211ioctl.h | 69 - + drivers/staging/wlan-ng/p80211metadef.h | 227 -- + drivers/staging/wlan-ng/p80211metastruct.h | 236 -- + drivers/staging/wlan-ng/p80211mgmt.h | 199 - + drivers/staging/wlan-ng/p80211msg.h | 39 - + drivers/staging/wlan-ng/p80211netdev.c | 988 ----- + drivers/staging/wlan-ng/p80211netdev.h | 212 -- + drivers/staging/wlan-ng/p80211req.c | 223 -- + drivers/staging/wlan-ng/p80211req.h | 33 - + drivers/staging/wlan-ng/p80211types.h | 292 -- + drivers/staging/wlan-ng/p80211wep.c | 207 -- + drivers/staging/wlan-ng/prism2fw.c | 1213 ------ + drivers/staging/wlan-ng/prism2mgmt.c | 1315 ------- + drivers/staging/wlan-ng/prism2mgmt.h | 89 - + drivers/staging/wlan-ng/prism2mib.c | 742 ---- + drivers/staging/wlan-ng/prism2sta.c | 1945 ---------- + drivers/staging/wlan-ng/prism2usb.c | 299 -- + 63 files changed, 482 insertions(+), 15766 deletions(-) + delete mode 100644 drivers/staging/wlan-ng/Kconfig + delete mode 100644 drivers/staging/wlan-ng/Makefile + delete mode 100644 drivers/staging/wlan-ng/README + delete mode 100644 drivers/staging/wlan-ng/TODO + delete mode 100644 drivers/staging/wlan-ng/cfg80211.c + delete mode 100644 drivers/staging/wlan-ng/hfa384x.h + delete mode 100644 drivers/staging/wlan-ng/hfa384x_usb.c + delete mode 100644 drivers/staging/wlan-ng/p80211conv.c + delete mode 100644 drivers/staging/wlan-ng/p80211conv.h + delete mode 100644 drivers/staging/wlan-ng/p80211hdr.h + delete mode 100644 drivers/staging/wlan-ng/p80211ioctl.h + delete mode 100644 drivers/staging/wlan-ng/p80211metadef.h + delete mode 100644 drivers/staging/wlan-ng/p80211metastruct.h + delete mode 100644 drivers/staging/wlan-ng/p80211mgmt.h + delete mode 100644 drivers/staging/wlan-ng/p80211msg.h + delete mode 100644 drivers/staging/wlan-ng/p80211netdev.c + delete mode 100644 drivers/staging/wlan-ng/p80211netdev.h + delete mode 100644 drivers/staging/wlan-ng/p80211req.c + delete mode 100644 drivers/staging/wlan-ng/p80211req.h + delete mode 100644 drivers/staging/wlan-ng/p80211types.h + delete mode 100644 drivers/staging/wlan-ng/p80211wep.c + delete mode 100644 drivers/staging/wlan-ng/prism2fw.c + delete mode 100644 drivers/staging/wlan-ng/prism2mgmt.c + delete mode 100644 drivers/staging/wlan-ng/prism2mgmt.h + delete mode 100644 drivers/staging/wlan-ng/prism2mib.c + delete mode 100644 drivers/staging/wlan-ng/prism2sta.c + delete mode 100644 drivers/staging/wlan-ng/prism2usb.c +Merging counter-next/counter-next (916baadd293a counter: ti-ecap-capture: Utilize COUNTER_COMP_FREQUENCY macro) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 30 +-- + drivers/counter/counter-core.c | 4 +- + drivers/counter/stm32-timer-cnt.c | 461 ++++++++++++++++++++++++++++++++++++-- + drivers/counter/ti-ecap-capture.c | 8 +- + drivers/counter/ti-eqep.c | 6 +- + include/linux/counter.h | 4 +- + include/linux/mfd/stm32-timers.h | 13 ++ + 7 files changed, 485 insertions(+), 41 deletions(-) +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 (44c026a73be8 Linux 6.4-rc3) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (4665be0e952f dmaengine: pch_dma: remove unused function chan2parent) +$ 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/idma64.c +Auto-merging drivers/dma/idxd/cdev.c +Auto-merging drivers/dma/xilinx/xilinx_dpdma.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/fsl,edma.yaml | 40 ++++++++++- + .../bindings/dma/snps,dma-spear1340.yaml | 42 ++++++------ + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 1 + + MAINTAINERS | 1 - + drivers/dma/dma-axi-dmac.c | 78 ++++++++++------------ + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 38 ++++++++--- + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 3 +- + drivers/dma/fsl-dpaa2-qdma/dpdmai.c | 62 ++--------------- + drivers/dma/fsl-dpaa2-qdma/dpdmai.h | 11 --- + drivers/dma/fsl-edma-common.c | 6 ++ + drivers/dma/fsl-edma-common.h | 2 - + drivers/dma/fsl-edma-main.c | 47 +++++++++---- + drivers/dma/idma64.c | 4 +- + drivers/dma/idxd/cdev.c | 17 ++--- + drivers/dma/imx-sdma.c | 68 ++++++++++++++++--- + drivers/dma/mcf-edma-main.c | 4 +- + drivers/dma/pch_dma.c | 5 -- + drivers/dma/virt-dma.h | 10 +++ + drivers/dma/xilinx/xilinx_dpdma.c | 10 ++- + 19 files changed, 254 insertions(+), 195 deletions(-) +Merging cgroup/for-next (a24e3b7d27c6 docs: cgroup-v1: Fix description for css_online) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging kernel/cpu.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v1/cgroups.rst | 2 +- + Documentation/admin-guide/cgroup-v2.rst | 15 ++- + include/linux/cpuset.h | 3 - + kernel/cgroup/cpuset.c | 141 ++++++++------------- + kernel/cpu.c | 48 ------- + kernel/power/process.c | 2 - + tools/testing/selftests/cgroup/Makefile | 2 +- + tools/testing/selftests/cgroup/cgroup_util.c | 8 +- + tools/testing/selftests/cgroup/cgroup_util.h | 2 +- + tools/testing/selftests/cgroup/test_core.c | 7 +- + tools/testing/selftests/cgroup/test_cpu.c | 2 +- + tools/testing/selftests/cgroup/test_cpuset.c | 2 +- + .../testing/selftests/cgroup/test_cpuset_v1_hp.sh | 46 +++++++ + tools/testing/selftests/cgroup/test_freezer.c | 2 +- + .../testing/selftests/cgroup/test_hugetlb_memcg.c | 2 +- + tools/testing/selftests/cgroup/test_kill.c | 2 +- + tools/testing/selftests/cgroup/test_kmem.c | 2 +- + tools/testing/selftests/cgroup/test_memcontrol.c | 2 +- + tools/testing/selftests/cgroup/test_zswap.c | 2 +- + 19 files changed, 133 insertions(+), 159 deletions(-) + create mode 100755 tools/testing/selftests/cgroup/test_cpuset_v1_hp.sh +Merging scsi/for-next (99033e81ab05 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/net/ethernet/qlogic/qed/qed_main.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Merge made by the 'ort' strategy. + Documentation/driver-api/scsi.rst | 15 +- + Documentation/scsi/scsi_mid_low_api.rst | 20 +-- + drivers/ata/libata-sata.c | 176 +++++++++++++++++------ + drivers/net/ethernet/qlogic/qed/qed_main.c | 2 +- + drivers/scsi/FlashPoint.c | 1 - + drivers/scsi/Kconfig | 4 +- + drivers/scsi/a3000.c | 8 +- + drivers/scsi/a4000t.c | 8 +- + drivers/scsi/aic7xxx/Kconfig.aic79xx | 75 +++++----- + drivers/scsi/aic7xxx/Kconfig.aic7xxx | 97 ++++++------- + drivers/scsi/aic94xx/aic94xx_init.c | 29 ++-- + drivers/scsi/atari_scsi.c | 8 +- + drivers/scsi/csiostor/csio_init.c | 3 - + drivers/scsi/cxlflash/lunmgt.c | 6 +- + drivers/scsi/cxlflash/main.c | 18 ++- + drivers/scsi/cxlflash/superpipe.c | 40 +++--- + drivers/scsi/cxlflash/superpipe.h | 11 +- + drivers/scsi/cxlflash/vlun.c | 9 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 18 +-- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 24 +--- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 24 +--- + drivers/scsi/isci/init.c | 29 ++-- + drivers/scsi/libsas/sas_ata.c | 84 +++++++++++ + drivers/scsi/mac_scsi.c | 8 +- + drivers/scsi/megaraid/Kconfig.megaraid | 113 ++++++++------- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 3 + + drivers/scsi/mpi3mr/mpi/mpi30_image.h | 20 +-- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 20 +-- + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 2 +- + drivers/scsi/mpi3mr/mpi3mr.h | 16 ++- + drivers/scsi/mpi3mr/mpi3mr_app.c | 21 ++- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 42 +++--- + drivers/scsi/mpi3mr/mpi3mr_os.c | 12 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 18 +-- + drivers/scsi/mvsas/mv_init.c | 26 ++-- + drivers/scsi/pm8001/pm8001_ctl.c | 5 + + drivers/scsi/pm8001/pm8001_init.c | 21 +-- + drivers/scsi/pm8001/pm8001_sas.h | 1 + + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/scsi/qla2xxx/Kconfig | 42 +++--- + drivers/scsi/qla2xxx/qla_os.c | 3 - + drivers/scsi/qla4xxx/ql4_mbx.c | 17 ++- + drivers/scsi/qla4xxx/ql4_os.c | 14 +- + drivers/scsi/scsi_debugfs.c | 56 ++++---- + drivers/scsi/scsi_devinfo.c | 18 +-- + drivers/scsi/scsi_sysfs.c | 5 +- + drivers/scsi/sd.c | 1 - + drivers/scsi/ses.c | 1 - + drivers/scsi/smartpqi/smartpqi_init.c | 5 +- + drivers/scsi/snic/snic_attrs.c | 11 +- + drivers/scsi/sr.c | 1 - + drivers/scsi/st.c | 1 - + drivers/scsi/wd33c93.c | 4 +- + drivers/ufs/core/ufshcd.c | 220 ++++++++++++----------------- + drivers/ufs/host/cdns-pltfrm.c | 2 +- + drivers/ufs/host/ufs-mediatek-sip.h | 94 ++++++++++++ + drivers/ufs/host/ufs-mediatek.c | 130 +++++++++++++++-- + drivers/ufs/host/ufs-mediatek.h | 90 ++---------- + drivers/ufs/host/ufs-qcom.c | 22 +-- + drivers/ufs/host/ufs-qcom.h | 12 +- + include/linux/libata.h | 6 + + include/scsi/iser.h | 2 +- + include/scsi/libfcoe.h | 25 +++- + include/scsi/libsas.h | 29 ++++ + include/scsi/sas_ata.h | 6 + + include/scsi/scsi.h | 7 +- + include/scsi/scsi_cmnd.h | 2 + + include/scsi/scsi_driver.h | 4 +- + include/scsi/scsi_transport_fc.h | 5 +- + include/scsi/scsi_transport_srp.h | 4 +- + include/ufs/ufshci.h | 2 +- + 72 files changed, 1075 insertions(+), 807 deletions(-) + create mode 100644 drivers/ufs/host/ufs-mediatek-sip.h +Merging scsi-mkp/for-next (8e50d1ee8f4c Merge patch series "convert SCSI to atomic queue limits, part 1 (v3)") +$ 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 block/blk-settings.c +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/ata/pata_macio.c +Auto-merging drivers/ata/sata_mv.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas_main.c +Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +Auto-merging drivers/scsi/hosts.c +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr_app.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_scan.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging drivers/ufs/host/ufs-qcom.c +Auto-merging drivers/usb/storage/uas.c +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/libata.h +Auto-merging include/scsi/scsi_host.h +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +- + block/blk-settings.c | 245 ---------------------------- + block/bsg-lib.c | 6 +- + drivers/ata/ahci.h | 2 +- + drivers/ata/libata-sata.c | 11 +- + drivers/ata/libata-scsi.c | 19 ++- + drivers/ata/libata.h | 3 +- + drivers/ata/pata_macio.c | 11 +- + drivers/ata/sata_mv.c | 2 +- + drivers/ata/sata_nv.c | 24 +-- + drivers/ata/sata_sil24.c | 2 +- + drivers/firewire/sbp2.c | 13 +- + drivers/message/fusion/mptfc.c | 1 + + drivers/message/fusion/mptsas.c | 1 + + drivers/message/fusion/mptscsih.c | 2 - + drivers/message/fusion/mptspi.c | 1 + + drivers/s390/block/dasd_eckd.c | 6 +- + drivers/scsi/aha152x.c | 8 +- + drivers/scsi/hisi_sas/hisi_sas.h | 3 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 7 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 7 +- + drivers/scsi/hosts.c | 6 + + drivers/scsi/hptiop.c | 8 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 5 +- + drivers/scsi/imm.c | 12 +- + drivers/scsi/ipr.c | 10 +- + drivers/scsi/iscsi_tcp.c | 2 +- + drivers/scsi/libsas/sas_scsi_host.c | 7 +- + drivers/scsi/megaraid/megaraid_sas.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 29 ++-- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 +- + drivers/scsi/mpi3mr/mpi3mr.h | 1 - + drivers/scsi/mpi3mr/mpi3mr_app.c | 12 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 76 ++++----- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 18 +- + drivers/scsi/pmcraid.c | 11 +- + drivers/scsi/ppa.c | 8 +- + drivers/scsi/qla2xxx/qla_os.c | 6 +- + drivers/scsi/scsi_lib.c | 42 ++--- + drivers/scsi/scsi_scan.c | 74 +++++---- + drivers/scsi/scsi_transport_fc.c | 15 +- + drivers/scsi/scsi_transport_iscsi.c | 6 +- + drivers/scsi/scsi_transport_sas.c | 4 +- + drivers/staging/rts5208/rtsx.c | 24 +-- + drivers/ufs/core/ufs_bsg.c | 3 +- + drivers/ufs/core/ufshcd.c | 172 ++----------------- + drivers/ufs/host/ufs-exynos.c | 9 +- + drivers/ufs/host/ufs-mediatek.c | 1 + + drivers/ufs/host/ufs-qcom.c | 3 +- + drivers/usb/image/microtek.c | 8 +- + drivers/usb/storage/scsiglue.c | 57 +++---- + drivers/usb/storage/uas.c | 13 +- + drivers/usb/storage/usb.c | 10 ++ + include/linux/blkdev.h | 26 +-- + include/linux/bsg-lib.h | 3 +- + include/linux/libata.h | 10 +- + include/linux/mmc/host.h | 4 +- + include/scsi/libsas.h | 5 +- + include/scsi/scsi_host.h | 9 + + include/scsi/scsi_transport.h | 2 +- + include/scsi/scsi_transport_fc.h | 1 + + include/ufs/ufshcd.h | 3 - + include/ufs/ufshci.h | 13 +- + 65 files changed, 356 insertions(+), 758 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 40c3eef99596 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git +Merging next-20240411 version of scsi-mkp +$ git merge -m next-20240411/scsi-mkp e63350dae44f01842dca229aaaa22c105356d7ab +Already up to date. +Merging vhost/linux-next (5b9f214d0540 vhost: Merge tag 'vduse-virtio-net' into vhost) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Merge made by the 'ort' strategy. + .../driver-api/virtio/writing_virtio_drivers.rst | 1 - + drivers/vdpa/vdpa_user/vduse_dev.c | 24 ++++++++++++++--- + drivers/vhost/vhost.c | 30 ++++++++++++++++++---- + drivers/virtio/virtio.c | 6 +++-- + include/linux/virtio.h | 7 +++-- + include/uapi/linux/vhost.h | 15 ++++++----- + 6 files changed, 62 insertions(+), 21 deletions(-) +Merging rpmsg/for-next (4d5aabb68439 Merge branches 'rpmsg-next' and 'rproc-next' into for-next) +$ 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 | 10 +++++++++- + drivers/remoteproc/remoteproc_internal.h | 2 +- + drivers/remoteproc/remoteproc_sysfs.c | 2 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 5 +++++ + drivers/rpmsg/rpmsg_char.c | 2 +- + drivers/rpmsg/rpmsg_core.c | 16 +++++++++------- + drivers/rpmsg/rpmsg_ctrl.c | 2 +- + drivers/rpmsg/rpmsg_internal.h | 2 +- + 8 files changed, 28 insertions(+), 13 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 (1685f72a6dcc gpiolib: Do not mention legacy GPIOF_* in the code) +$ 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/gpiolib.c +Merge made by the 'ort' strategy. + .../bindings/gpio/microchip,mpfs-gpio.yaml | 17 ++++++-- + Documentation/driver-api/gpio/legacy.rst | 16 -------- + .../translations/zh_CN/driver-api/gpio/legacy.rst | 16 -------- + Documentation/translations/zh_TW/gpio.txt | 17 -------- + .../userspace-api/gpio/gpio-v2-get-line-ioctl.rst | 2 +- + arch/arm/mach-pxa/spitz_pm.c | 22 +++++----- + arch/arm/mach-sa1100/h3600.c | 47 +++++++++++++++++----- + drivers/gpio/gpio-cros-ec.c | 8 ++++ + drivers/gpio/gpiolib-legacy.c | 39 ------------------ + drivers/gpio/gpiolib.c | 7 +++- + include/linux/gpio.h | 15 ------- + 11 files changed, 76 insertions(+), 130 deletions(-) +Merging gpio-intel/for-next (d8a26a18d971 gpiolib: acpi: Check for errors first in acpi_find_gpio()) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpio/gpiolib-acpi.c | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) +Merging pinctrl/for-next (07bd48cca03b 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,pmic-gpio.yaml | 26 ++++ + .../bindings/pinctrl/qcom,sm4450-tlmm.yaml | 52 +++----- + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 34 +++--- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 64 +++++++++- + drivers/pinctrl/core.c | 8 +- + drivers/pinctrl/mediatek/pinctrl-paris.c | 40 ++----- + drivers/pinctrl/meson/pinctrl-meson-a1.c | 6 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 3 - + drivers/pinctrl/pinconf-generic.c | 2 +- + drivers/pinctrl/pinctrl-aw9523.c | 131 ++++++++------------- + drivers/pinctrl/pinctrl-max77620.c | 2 - + drivers/pinctrl/pinctrl-single.c | 50 ++++---- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 55 ++++----- + drivers/pinctrl/pxa/pinctrl-pxa2xx.h | 15 +-- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 4 + + drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c | 1 - + 16 files changed, 238 insertions(+), 255 deletions(-) +Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3) +$ 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 (aa43c15a790c pinctrl: renesas: rzg2l: Execute atomically the interrupt configuration) +$ 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. + .../devicetree/bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 2 ++ + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 11 ++++++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) +Merging pinctrl-samsung/for-next (4184e4912ca6 dt-bindings: pinctrl: samsung: drop unused header with register constants) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + include/dt-bindings/pinctrl/samsung.h | 95 ----------------------------------- + 2 files changed, 96 deletions(-) + delete mode 100644 include/dt-bindings/pinctrl/samsung.h +Merging pwm/pwm/for-next (858fbbf538a6 pwm: bcm2835: Drop open coded variant of devm_clk_rate_exclusive_get()) +$ 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/hwmon/aspeed-g6-pwm-tach.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/atmel,at91sam-pwm.yaml | 3 + + .../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 3 + + drivers/hwmon/aspeed-g6-pwm-tach.c | 21 +- + drivers/pwm/Kconfig | 4 - + drivers/pwm/Makefile | 1 - + drivers/pwm/core.c | 996 ++++++++++++++++++++- + drivers/pwm/pwm-bcm2835.c | 30 +- + drivers/pwm/pwm-sti.c | 161 ++-- + drivers/pwm/pwm-stm32.c | 60 +- + drivers/pwm/sysfs.c | 545 ----------- + include/linux/pwm.h | 52 +- + include/uapi/linux/pwm.h | 23 + + 12 files changed, 1123 insertions(+), 776 deletions(-) + delete mode 100644 drivers/pwm/sysfs.c + create mode 100644 include/uapi/linux/pwm.h +Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type) +$ 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 (4f4ade6863ce selftests/clone3: Correct log message for waitpid() failures) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging tools/testing/selftests/kselftest.h +Auto-merging tools/testing/selftests/timers/valid-adjtimex.c +CONFLICT (content): Merge conflict in tools/testing/selftests/timers/valid-adjtimex.c +Recorded preimage for 'tools/testing/selftests/timers/valid-adjtimex.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'tools/testing/selftests/timers/valid-adjtimex.c'. +[master d5d1517b868b] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git +$ git diff -M --stat --summary HEAD^.. + tools/testing/selftests/clone3/clone3.c | 7 +- + tools/testing/selftests/clone3/clone3_set_tid.c | 117 ++-- + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 253 +++----- + tools/testing/selftests/exec/recursion-depth.c | 10 +- + tools/testing/selftests/ftrace/ftracetest | 8 +- + tools/testing/selftests/ftrace/ftracetest-ktap | 2 +- + tools/testing/selftests/kselftest.h | 37 ++ + tools/testing/selftests/perf_events/.gitignore | 1 + + tools/testing/selftests/perf_events/Makefile | 2 +- + .../selftests/perf_events/watermark_signal.c | 146 +++++ + tools/testing/selftests/resctrl/cat_test.c | 8 +- + tools/testing/selftests/resctrl/cmt_test.c | 4 +- + tools/testing/selftests/resctrl/mba_test.c | 8 +- + tools/testing/selftests/resctrl/mbm_test.c | 8 +- + tools/testing/selftests/resctrl/resctrl.h | 9 +- + tools/testing/selftests/resctrl/resctrl_tests.c | 20 +- + tools/testing/selftests/resctrl/resctrl_val.c | 8 +- + tools/testing/selftests/tty/tty_tstamp_update.c | 48 +- + tools/testing/selftests/x86/test_mremap_vdso.c | 43 +- + tools/testing/selftests/x86/test_vsyscall.c | 702 ++++++++++----------- + 20 files changed, 794 insertions(+), 647 deletions(-) + create mode 100644 tools/testing/selftests/perf_events/watermark_signal.c +Merging kunit/test (4cece7649650 Linux 6.9-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 (82b0beff3497 kunit: Add tests for fault) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + include/kunit/test.h | 24 +++++++++++++++++++++--- + include/kunit/try-catch.h | 3 --- + kernel/kthread.c | 1 + + lib/kunit/kunit-test.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- + lib/kunit/try-catch.c | 38 ++++++++++++++++++++++++++------------ + lib/kunit_iov_iter.c | 18 +++++++++--------- + 6 files changed, 101 insertions(+), 28 deletions(-) +Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' 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. +Merging rtc/rtc-next (8b59a11fb8e6 rtc: nuvoton: Modify part number value) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + .../bindings/rtc/alphascale,asm9260-rtc.txt | 19 ------- + .../bindings/rtc/alphascale,asm9260-rtc.yaml | 50 +++++++++++++++++++ + .../devicetree/bindings/rtc/armada-380-rtc.txt | 24 --------- + .../devicetree/bindings/rtc/digicolor-rtc.txt | 17 ------- + .../bindings/rtc/marvell,armada-380-rtc.yaml | 51 +++++++++++++++++++ + .../devicetree/bindings/rtc/nxp,lpc1788-rtc.txt | 21 -------- + .../devicetree/bindings/rtc/nxp,lpc1788-rtc.yaml | 58 ++++++++++++++++++++++ + .../devicetree/bindings/rtc/trivial-rtc.yaml | 2 + + drivers/rtc/lib_test.c | 33 +++++++++--- + drivers/rtc/rtc-cros-ec.c | 9 +++- + drivers/rtc/rtc-nct3018y.c | 15 +++--- + 11 files changed, 204 insertions(+), 95 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/rtc/alphascale,asm9260-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/alphascale,asm9260-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/armada-380-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/digicolor-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/marvell,armada-380-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.yaml +Merging nvdimm/libnvdimm-for-next (d9212b35da52 dax: remove SLAB_MEM_SPREAD flag usage) +$ 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 (4cece7649650 Linux 6.9-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 (9341b37ec17a ntb_perf: Fix printk format) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/test/ntb_perf.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging seccomp/for-next/seccomp (39cd87c4eb2b Linux 6.9-rc2) +$ 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 (b12bd525ca6e slimbus: qcom-ngd-ctrl: Add timeout for wait operation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. + drivers/slimbus/qcom-ctrl.c | 6 +++--- + drivers/slimbus/qcom-ngd-ctrl.c | 20 ++++++++++---------- + 2 files changed, 13 insertions(+), 13 deletions(-) +Merging nvmem/for-next (ea8f9ec2bbb7 nvmem: core: switch to use device_add_groups()) +$ 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/core.c | 2 +- + drivers/nvmem/layouts.c | 6 ++++-- + drivers/nvmem/layouts/onie-tlv.c | 1 - + drivers/nvmem/layouts/sl28vpd.c | 1 - + drivers/nvmem/sc27xx-efuse.c | 1 + + drivers/nvmem/sprd-efuse.c | 1 + + include/linux/nvmem-provider.h | 5 ++++- + 7 files changed, 11 insertions(+), 6 deletions(-) +Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/for-next (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y) +$ 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/Kconfig | 346 ++++++++++++++++++++------------------ + drivers/auxdisplay/Makefile | 10 +- + drivers/auxdisplay/charlcd.c | 3 + + drivers/auxdisplay/seg-led-gpio.c | 6 +- + 4 files changed, 189 insertions(+), 176 deletions(-) +Merging kgdb/kgdb/for-next (4f41d30cd6dc kdb: Fix a potential buffer overflow in kdb_local()) +$ 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 (6613476e225e Linux 6.8-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 (06c2afb862f9 Linux 6.5-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 (813e0ae613d6 bus: mhi: host: Add mhi_power_down_keep_dev() API to support system suspend/hibernation) +$ 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/internal.h | 4 +++- + drivers/bus/mhi/host/pm.c | 42 +++++++++++++++++++++++++++++++++++------ + include/linux/mhi.h | 18 +++++++++++++++++- + 3 files changed, 56 insertions(+), 8 deletions(-) +Merging memblock/for-next (2159bd4e9057 memblock: Return NUMA_NO_NODE instead of -1 to improve code readability) +$ 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 (ed1ff2fba7af Merge branch 'for-6.9/cxl-einj' into for-6.9/cxl) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +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 +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 (bf87a149828e efi: Clear up misconceptions about a maximum variable name size) +$ 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. + Documentation/ABI/removed/sysfs-firmware-efi-vars | 12 ++++ + Documentation/ABI/stable/sysfs-firmware-efi-vars | 79 ----------------------- + drivers/firmware/efi/efi-pstore.c | 10 ++- + drivers/firmware/efi/vars.c | 2 +- + fs/efivarfs/internal.h | 5 +- + fs/efivarfs/vars.c | 5 +- + include/linux/efi.h | 9 ++- + 7 files changed, 30 insertions(+), 92 deletions(-) + create mode 100644 Documentation/ABI/removed/sysfs-firmware-efi-vars + delete mode 100644 Documentation/ABI/stable/sysfs-firmware-efi-vars +Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/utf8-selftest.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging slab/slab/for-next (5aa5c7b9a09d mm/slub: remove duplicate initialization for early_kmem_cache_node_alloc()) +$ 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 mm/slab.h +Auto-merging mm/slab_common.c +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + lib/slub_kunit.c | 2 +- + mm/slab.h | 3 --- + mm/slab_common.c | 2 -- + mm/slub.c | 71 +++++++++++++++++++++++++++++++++++--------------------- + 4 files changed, 46 insertions(+), 32 deletions(-) +Merging random/master (4cece7649650 Linux 6.9-rc1) +$ 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 (028243655456 fs/ioctl: Add a comment to keep the logic in sync with LSM policies) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging MAINTAINERS +Auto-merging fs/ioctl.c +Merge made by the 'ort' strategy. + Documentation/userspace-api/landlock.rst | 76 ++++- + MAINTAINERS | 1 + + fs/ioctl.c | 3 + + include/uapi/linux/landlock.h | 38 ++- + samples/landlock/sandboxer.c | 18 +- + security/landlock/fs.c | 221 +++++++++++- + security/landlock/limits.h | 2 +- + security/landlock/syscalls.c | 8 +- + tools/testing/selftests/landlock/base_test.c | 2 +- + tools/testing/selftests/landlock/fs_test.c | 491 ++++++++++++++++++++++++++- + 10 files changed, 814 insertions(+), 46 deletions(-) +Merging rust/rust-next (8db31d3f3bd5 rust: workqueue: add `#[pin_data]` to `Work`) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Merge made by the 'ort' strategy. + Documentation/process/changes.rst | 2 +- + rust/alloc/alloc.rs | 6 +- + rust/alloc/boxed.rs | 4 +- + rust/alloc/lib.rs | 7 ++- + rust/alloc/raw_vec.rs | 13 ++-- + rust/alloc/slice.rs | 4 +- + rust/alloc/vec/into_iter.rs | 104 ++++++++++++++++++++------------ + rust/alloc/vec/mod.rs | 101 ++++++++++++++++++++++--------- + rust/kernel/init/macros.rs | 19 +++++- + rust/kernel/lib.rs | 8 ++- + rust/kernel/str.rs | 87 +++++++++++++++++++++++++- + rust/kernel/workqueue.rs | 33 +++++----- + rust/macros/helpers.rs | 124 ++++++++++++++++++++++++++++---------- + rust/macros/pin_data.rs | 2 + + rust/macros/zeroable.rs | 1 + + scripts/Makefile.build | 2 +- + scripts/Makefile.debug | 8 +++ + scripts/min-tool-version.sh | 2 +- + 18 files changed, 391 insertions(+), 136 deletions(-) +Merging sysctl/sysctl-next (4f1136a55dc8 scripts: check-sysctl-docs: handle per-namespace sysctls) +$ 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 (c82389947d90 tracing: Add sched_prepare_exec tracepoint) +$ 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 fs/exec.c +Merge made by the 'ort' strategy. + fs/exec.c | 8 ++++++++ + include/trace/events/sched.h | 35 +++++++++++++++++++++++++++++++++++ + 2 files changed, 43 insertions(+) +Merging bitmap/bitmap-for-next (fd8ed16c2419 bitmap: Step down as a reviewer) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Already up to date. +Merging hte/for-next (b85ea95d0864 Linux 6.7-rc1) +$ 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 (9c573cd31343 randomize_kstack: Improve entropy diffusion) +$ 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 +Already up to date. +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 (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. +Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT) +$ git merge -m Merge branch 'header_cleanup' of https://evilpiepirate.org/git/bcachefs.git header_cleanup/header_cleanup +Already up to date. +$ git am -3 ../patches/0001-fixup-for-mm-swap-introduce-swap_free_nr-for-batched.patch +Applying: fixup for "mm: swap: introduce swap_free_nr() for batched swap_free()" diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..6186076c17e2 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20240412 |