diff options
| -rw-r--r-- | Next/SHA1s | 407 | ||||
| -rw-r--r-- | Next/Trees | 407 | ||||
| -rw-r--r-- | Next/kselftest-targets | 109 | ||||
| -rw-r--r-- | Next/merge.log | 16360 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 17284 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 00000000000000..f4125d98fdfc2f --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,407 @@ +Name SHA1 +---- ---- +origin f14faaf3a1fb3b9e4cf2e56269711fb85fba9458 +ext4-fixes d250bdf531d9cd4096fedbb9f172bb2ca660c868 +vfs-brauner-fixes 8dfce8991b95d8625d0a1d2896e42f93b9d7f68d +fscrypt-current 1e39da974ce621ed874c6d3aaf65ad14848c9f0d +fsverity-current 211ddde0823f1442e4ad052a2f30f050145ccada +btrfs-fixes a32d98bf0efe08910e4bdb43500798ee4e53ede1 +vfs-fixes 99a706fa47949ece1fb02b5b1206efd4fb031d25 +erofs-fixes 7893cc12251f6f19e7689a4cf3ba803bddbd8437 +nfsd-fixes 0b88bfa42e5468baff71909c2f324a495318532b +v9fs-fixes 2014c95afecee3e76ca4a56956a936e23283f05b +fscrypt 211ddde0823f1442e4ad052a2f30f050145ccada +btrfs 29c5694011a2f75745b6eb239f6b33c78d109015 +ceph cf0f9566282a795c3cd165c059700eefdf4153ae +cifs f796e492246c0b61df02a0a8b2957d48a4a47aca +configfs 6363844fdbbb76afe1d44d678fe0746390204a5f +ecryptfs 2a9cb23307db71319e6b841e1c3d70066c0ff660 +dlm 2c3a0b730012ef87aaaf35243e1fbe9880666f7c +erofs 8f2fb72fd17eecd5a47c73ce7e228d157e613b80 +exfat 131331a504c41b0fd3b489d5176272aba9239898 +ext3 93a803d2ab6413e159926d34f08ff0a598b65d2c +ext4 4f5e8e6f012349a107531b02eed5b5ace6181449 +f2fs 91b76f1059b60f453b51877f29f0e35693737383 +fsverity 433fbcac9ebe491b518b21c7305fba9a748c7d2c +fuse 7897c0ae19458c0e5dca095937f21983276f8c77 +gfs2 da6f5bbc2e7902f578b503f2a4c3d8d09ca4b102 +jfs 7833570dae833028337bb53b7f389825b910c100 +ksmbd cc6aa375487e9aca11a345b5e37dbf09678a9f4d +nfs 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 +nfs-anna 5248d8474e594d156bee1ed10339cc16e207a28b +nfsd e939bd675634fd52d559b90e2cf58333e16afea8 +ntfs3 b2bc7c44ed1779fc9eaab9a186db0f0d01439622 +orangefs 9e835108a9ae1c37aef52a6f8d53265f474904a1 +overlayfs ad1423922781e6552f18d055a5742b1cff018cdc +ubifs 0695aef23d674815c352293c49d944a2375ee9c9 +v9fs ce8ded2e61f47747e31eeefb44dc24a2160a7e32 +v9fs-ericvh 2014c95afecee3e76ca4a56956a936e23283f05b +xfs e33839b514a8af27ba03f9f2a414d154aa980320 +zonefs a42938e80357a13f8b8592111e63f2e33a919863 +vfs-brauner f77e21ac4082da5b04ed8eeccaa3ebfc5cd2dbc4 +vfs 0787a93baa1aab9fd0cb8500105d11d3d3a58f7a +mm-hotfixes 5f591a22f86dec8ecb96f345afbfd6486a424a53 +fs-current f737824cd61db885e4cd558cbb15820933708ad3 +kbuild-current 8e24994872361212531a952c93adb01c485148f1 +arc-current d7b8f8e20813f0179d8ef519541a3527e7661d3a +arm-current 23ea2a4c72323feb6e3e025e8a6f18336513d5ad +arm64-fixes e2f8216ca2d8e61a23cb6ec355616339667e0ba6 +arm-soc-fixes c3cb2722e28969650c58d6defb09d57339a2a223 +davinci-current 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +drivers-memory-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current aaf4e92341b081bac1230f22619b0a298e285dab +powerpc-fixes 9ace4753a5202b02191d54e9fdf7f9e3d02b85eb +s390-fixes ddc6cbef3ef10359b5640b4ee810a520edc73586 +net 7d6ba706ae5ef7d3d00b67140d2873ae1da6d41f +bpf 63804fed149a6750ffd28610c5c1c98cce6bd377 +ipsec 0a4524bc69882a4ddb235bb6b279597721bda197 +netfilter 7576bd9017e35379db1ab1ef6b0e1d570eb28429 +ipvs 653267321f05316f159e05b3ef562aa700632db6 +wireless 7d6ba706ae5ef7d3d00b67140d2873ae1da6d41f +ath 1cac38910ecb881b09f61f57545a771bbe57ba68 +iwlwifi fb7f54aa2a99b07945911152c5d3d4a6eb39f797 +wpan 8ce4f287524c74a118b0af1eebd4b24a8efca57a +rdma-fixes 4d310797262f0ddf129e76c2aad2b950adaf1fda +sound-current 51db05283f7c9c95a3e6853a3044cd04226551bf +sound-asoc-fixes f514248727606b9087bc38a284ff686e0093abf1 +regmap-fixes 63804fed149a6750ffd28610c5c1c98cce6bd377 +regulator-fixes 41399c5d476156635c9a58de870d39318e22fa09 +spi-fixes 41d9a6795b95d6ea28439ac1e9ce8c95bbca20fc +pci-current 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +driver-core.current 63804fed149a6750ffd28610c5c1c98cce6bd377 +tty.current 63804fed149a6750ffd28610c5c1c98cce6bd377 +usb.current 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 +usb-serial-fixes 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 +phy 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 +staging.current 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +iio-fixes 88da5f4b46f55717202fb1d81052e91d4f88b296 +counter-current 9448598b22c50c8a5bb77a9103e2d49f134c9578 +char-misc.current ec4ddc90d201d09ef4e4bef8a2c6d9624525ad68 +soundwire-fixes 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 +thunderbolt-fixes 18f7fcd5e69a04df57b563360b88be72471d6b62 +input-current 19a5d9ba6208e9006a2a9d5962aea4d6e427d8ab +crypto-current 2397e9264676be7794f8f7f1e9763d90bd3c7335 +libcrypto-fixes 74d74bb78aeccc9edc10db216d6be121cf7ec176 +vfio-fixes 61ceaf236115f20f4fdd7cf60f883ada1063349a +kselftest-fixes 6e39903c73df08b256322d04c4dfe4a82ec63a45 +dmaengine-fixes 24d479d26b25bce5faea3ddd9fa8f3a6c3129ea7 +backlight-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +mtd-fixes 2f6d2c8d9ac05a7a1c02333f6ad30868246880d8 +mfd-fixes aa6e63373d91f82628b20f6fae7ffe9b97b568a5 +v4l-dvb-fixes 69d6c6fc79eb3a8309691250a3b0a9c1870c1f83 +reset-fixes 997c06330fd5c2e220b692f2a358986c6c8fd5a2 +mips-fixes 63804fed149a6750ffd28610c5c1c98cce6bd377 +at91-fixes 94ad504e67cd3be94fa1b2fed0cb87da0d8f9396 +omap-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +kvm-fixes 0de4a0eec25b9171f2a2abb1a820e125e6797770 +kvms390-fixes 5f9df945d4e862979b50e4ecaba3dc81fb06e8ed +hwmon-fixes 831a2b27914cc880130ffe8fb8d1e65a5324d07f +nvdimm-fixes d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +cxl-fixes 8441c7d3bd6c5a52ab2ecf77e43a5bf262004f5c +dma-mapping-fixes c33efdfcfa6f80e05ce1ee33694c1bad4994cd78 +drivers-x86-fixes 008bec8ffe6e7746588d1e12c5b3865fa478fc91 +samsung-krzk-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +pinctrl-samsung-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +devicetree-fixes 81122fba08fa3ccafab6ed272a5c6f2203923a7e +dt-krzk-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +scsi-fixes 0444568edbf87c1da76b61c798ce0f1c1e478467 +drm-fixes 18f7fcd5e69a04df57b563360b88be72471d6b62 +drm-intel-fixes 63804fed149a6750ffd28610c5c1c98cce6bd377 +mmc-fixes 63804fed149a6750ffd28610c5c1c98cce6bd377 +rtc-fixes c6cf26c15ce7f19d6c9d3366d40b360e58fe22aa +gnss-fixes 0f61b1860cc3f52aef9036d7235ed1f017632193 +hyperv-fixes 12ffd561d2de28825f39e15e8d22346d26b09688 +risc-v-fixes 0ea05c4f7527a98f5946f96c829733788934311d +riscv-dt-fixes 004c371d0bd140b02bf359fdab6e16613a6aa4a8 +riscv-soc-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx c86d39d6805474ab879c00ca6b938c6dd7e4d33f +gpio-brgl-fixes c62e0658d458d8f100445445c3ddb106f3824a45 +gpio-intel-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +pinctrl-intel-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +auxdisplay-fixes 9ace4753a5202b02191d54e9fdf7f9e3d02b85eb +kunit-fixes c33b68801fbe9d5ee8a9178beb5747ec65873530 +memblock-fixes be05f571464404432a0f8fe1c81a86a0862da283 +renesas-fixes 379c590113ce46f605439d4887996c60ab8820cc +perf-current 1eb217ab2e737609f8a861b517649e82e7236d05 +efi-fixes 4b22ec1685ce1fc0d862dcda3225d852fb107995 +battery-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +iommufd-fixes 2724138b2f7f6299812b3404e23b124304834759 +rust-fixes 18f7fcd5e69a04df57b563360b88be72471d6b62 +w1-fixes cc8f92e41eb76f450f05234fef2054afc3633100 +pmdomain-fixes e2c4c5b2bbd4f688a0f9f6da26cdf6d723c53478 +i2c-host-fixes b4b4d88ebfbfd3aadb4c9a0f2bfe1abdbaf5822c +sparc-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +clk-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +thead-clk-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +pwrseq-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +thead-dt-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +ftrace-fixes 1650a1b6cb1ae6cb99bb4fce21b30ebdf9fc238e +ring-buffer-fixes b042fdf18e89a347177a49e795d8e5184778b5b6 +trace-fixes 361eb853c655288f3b5c8020f6cd95d69ffe6479 +tracefs-fixes 8b55572e51805184353ee7d587c720a51818fb82 +spacemit-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +tip-fixes cfa04369dc10cd482ca38374da1055ee7dcabb29 +slab-fixes 3a38d13f90d4e4d79b1d2326c12b00610dd2872b +drm-msm-fixes dedb897f11c5d7e32c0e0a0eff7cec23a8047167 +uml-fixes df447a3b4a4b961c9979b4b3ffb74317394b9b40 +fwctl-fixes f8f9c1f4d0c7a64600e2ca312dec824a0bc2f1da +devsec-tsm-fixes c2012263047689e495e81c96d7d5b0586299578d +drm-rust-fixes 0f61b1860cc3f52aef9036d7235ed1f017632193 +tenstorrent-dt-fixes 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc-fixes 40b24d9cdd4141ef43eeaa7e57c3efc07a567473 +rust b8d687c7eeb52d0353ac27c4f71594a2e6aa365f +rust-alloc f8f9c1f4d0c7a64600e2ca312dec824a0bc2f1da +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init aeb5ecad5316f6af160993915163367290825b6b +rust-timekeeping 4521438fb076f8a6a52f45b0e508f6ef10ac0c49 +rust-xarray c455f19bbe6104debd980bb15515faf716bd81b8 +rust-analyzer 18f7fcd5e69a04df57b563360b88be72471d6b62 +mm-stable 50c7f34c5c7403a12003c6759f6f6ca9a5a10872 +mm-nonmm-stable 2e171ab29f916455a49274a2042bac4a4b35570e +mm-unstable 9e15c46c4bca8f5856130723f9df3626fdfa8972 +mm-nonmm-unstable b4481323245e9e034811469d352893f685842def +kbuild c7c88b20cd4226af0c9fbdb365fb6f221501c7da +clang-format 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +perf e205952db7717557f71f22baa96589f0a56d83c5 +compiler-attributes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +dma-mapping 8a840ab0567ff2b7d382694ba24a58a893d2c7af +asm-generic adbbd9714f8058730f93c8df5c5bf1679456424b +alpha d58041d2c63e09a1c9083e0e9f4151e487c4e16a +arm d37561b214ee237ec2d3112de9f2542445f5bfd0 +arm64 36c0de02575ce59dfd879eb4ef63d53a68bbf9ce +arm-perf ab26d9c85554c4ff1d95ca8341522880ed9219d6 +arm-soc 1c94e21cdb348ba1a5c619ab62dc0b4feb5a9519 +amlogic e3194dfb772304a1b7ca3bcfccacefec3468b7bf +asahi-soc d31647c698f632e0c08080a760e004ba4d71f8dd +at91 d75e671528b49294fc4c4be2152a71b93c7df1be +bmc 26705fad17bd111f062f4208df2dd60e7a9c2ecd +broadcom 8bb18f06da3148bdae80b4a7266d9966a1dc0f52 +cix 4d24b32aa342e32f93ab8e73f0cce579502abec0 +davinci 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +drivers-memory 9805f2cfc883018f7bf84c84e3af3786c37dac7b +fsl b244f59bc977c45e1cc545d5c80ce701d7f533af +imx-mxs 3cea6b209a3f2acbc4fcc9c60aea657e7f7d10fc +mediatek dee56d3440b5c5bbd2aa55f804aedd77ab4447dd +mvebu 8dcbe20fc92456507eb4d15fa1892dbba592e1af +omap 35ca43aadd4ea05e0f2af1e38deb134f84a4042a +qcom 1a0829927afbfe654c632eb2e779fa32df825b06 +renesas 08e16a461a8f66ae38b7e1febd4230c9aba9414f +reset 938ce3b16582657e67f3bd8a7efa59089c467c90 +rockchip 82cafae8c386c3b26aea6aafb2fce07e5c1d9af0 +samsung-krzk 4b2dd5ec2cab75875fab9507c7665899e2e51f42 +scmi 02b744bc8a71e0914790e77f9e25c14b8c225f49 +sophgo 85352e8c088c9993a2f74dd69a9f0e65607b9c38 +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit 5f499bb7a07fcdcf8877acaa8f413a5dc1fcfacc +stm32 291f393298f72091490dfa70ab4a0ebdbb4c7d7e +sunxi f36e738549d483878ebf4cc9826c46d9dc4aa496 +tee dca52747925434aae27deb46a15a8ea10f623686 +tegra 6ac0a03f5afe89865ab8a85dfe8818d1958a025a +tenstorrent-dt a71e6e8eea8ae2d624f097911f43357bba06d2a5 +thead-dt 34ce47c9cdfdd30317fb5b1b71c73ba9c2016a20 +ti 18258938db0c4ffcd51d7bebaf80db92564117f2 +xilinx 50d1a926f4631639d617bed8b62abae57aca950d +clk ea7282e99ead6d2a294cef40acd2a29ada3ab71d +clk-imx 3e6b0227b93c708e93e33f6c3485bad077650766 +clk-renesas 4fef3fd633be4a1a18c490a63f4131284f6ee0f4 +thead-clk baf4fc7c03bd0f68c768cfe27829674bd060c6b4 +csky 817d21578d51e801df58ab012654486a71073074 +loongarch cde0a836d89a484c972c558322c8e7cd4adab386 +m68k cb39cf99d88e8f2c68a41fb3bb01c4f40a8fcc30 +m68knommu 2ffdc7f231859dbfe6354fa8631fae5b6c529ef9 +microblaze 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +mips 3989ed41848346ea887bff5d53e3657be42b609c +openrisc 0dfffa5479d6260d04d021f69203b1926f73d889 +parisc-hd 252d28ade43d4ef0945dfb16a39b4df688fdbb9e +powerpc 1d72a02d65a733ad124bacc2db3fb90fa81a612b +risc-v 099ba40b1bd99308b7b70253baeec137b6e1a241 +riscv-dt 18649ffbb63bca40896f973b6997914f9d603b1e +riscv-soc fd69c5b3002c39889bc271116cc4e08cd02d7b21 +s390 8c8ef9323f018195031cb4825e31be26647ccec5 +sh 8f5ae30d69d7543eee0d70083daf4de8fe15d585 +sparc d2da7ee74f842389431b0ab97fe73962e2dcb4be +uml 68e25613ed4d06c987a42b0589f54ce88c13477c +xtensa 0d4b3ca115b5436d7e68453527566db3e87ab7f0 +fs-next 054a8722d6f75695039fe1bada40d8f25e29f9a1 +printk 77a69dd8425637919a91caee29305a24f4b3ff1b +pci f365bb1bf8702158f87ec50b1ee806f7af1a21a8 +pstore b692553573683b9e4ebab40c2782a3163f984cfd +hid 01204b2d878036561fc26c1229a04bedda90be9d +i2c 10592191e3e2a4d0c15b697acb835ae88b4e017d +i2c-host 51e8ce3630878fa6083e1eec84f58f49ec85089b +i3c ed318b3fb4ab317c533d38d160326fa5d7569497 +dmi 4d1b28a8119c615f1e932520f9ee1f80bdda5204 +hwmon-staging 1117702454262fb361869451be5b006c022eb08a +jc_docs 0a83293322fde69f1fb4722bd3c79c2d52eef436 +v4l-dvb c824345288d11e269ce41b36c105715bc2286050 +v4l-dvb-next adc218676eef25575469234709c2d87185ca223a +pm bf2bbd911e4089b20daad0532a4ef26c957e1d1b +cpufreq-arm 0b7fbf9333fa4699a53145bad8ce74ea986caa13 +cpupower 7799ba2160e4919913ecabca8a7fc1aa4c576fb4 +devfreq b08a82bd1f5737d1aacd2eac856acbd3f1a9592c +pmdomain 1fca2a4426aac222a724770a56c71e6bb3cf96f2 +opp fc72a587c6c9e40926b67452d880ee85bd2b87a3 +thermal 0061030929e2d09398ade9fae320528bdcba2bed +rdma 42e3aac65c1c9eb36cdee0d8312a326196e0822f +net-next 021718d2cc1a2df2f53b06968fa89280199371bd +bpf-next 75cd3beb64d0977009e3d1a2d0c03715d3e5e156 +ipsec-next 3eef6c061f97ab2a942dc98291bcdae9a16e5bda +mlx5-next 49e41f3ea3f7545c732a0b399cb123173afc5cfe +netfilter-next a22f57757f7e88c890499265c383ecb32900b645 +ipvs-next a22f57757f7e88c890499265c383ecb32900b645 +bluetooth 294cf04ca959817d017b4cf165a8038dd46368ee +wireless-next 333225e1e9ead7b06e5363389403bdac72ba3046 +ath-next 2c1ba9c2adf0fda96eaaebd8799268a7506a8fc9 +iwlwifi-next 66af8ac52d10ea229d5755b8700e2fe86fc037f7 +wpan-next 1dd9291eb90378f8096669d9cb33761fd84599e0 +wpan-staging 1dd9291eb90378f8096669d9cb33761fd84599e0 +mtd 875382759298650c96192bf2c12e2d1e4575de92 +nand 0f8a217670b6e3c28afff5cdf5985190633f62e1 +spi-nor ed26bd40df11ee438d623adc9c6cc2a7bf9c5dd3 +crypto 64ae90a81aa4a5e51d0b4c2e836778ef40295651 +libcrypto ffd42b6d0420c4be97cc28fd1bb5f4c29e286e98 +drm 3cc9398a9ea69b77de01b370463b706c354e52fb +drm-exynos 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc 69674c1c704c0199ca7a3947f3cdcd575973175d +amdgpu d6e04d2e675fefcb24cc8ba3b72a4adf98dabdb2 +drm-intel 3e28a67a85f9b569066f6dfcddadb39294c0c9d4 +drm-msm 50c4a49f7292b33b454ea1a16c4f77d6965405dc +drm-msm-lumag 50c4a49f7292b33b454ea1a16c4f77d6965405dc +drm-xe ec49857ad181f2a68a3bea15422f2936ff366d47 +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev a2797d4332e56a8b78e0985d76fa10c689135423 +regmap 4651c87b0083925540f6c3d26a6c5b4868d7b884 +sound e3474301824926ecce1d45f2ede7ecdda9a35840 +ieee1394 6b617317e5bc95e9962a712314ae0c4b7a4d5cc3 +sound-asoc 80bbbb45c6b2c7f40ff31e83542b5fbd14f737af +modules b68758e6f4307179247126b7641fa7ba7109c820 +input ed8a4ef29da3821ee3155d3b1925fa67fc92aae2 +block 47da703ba2e5d74d4e658bd2096e66384002a9ad +device-mapper 218b16992a37ea97b9e09b7659a25a864fb9976f +libata ff4a46c278ac6a4b3f39be1492a4568b6dcc6105 +pcmcia 4a81f78caa53e0633cf311ca1526377d9bff7479 +mmc a77252368f23f452814ae73c454a20d119c90a3b +mfd 845776177cf3b75be4e27213425f25dcb630d817 +backlight 83333aa97441ba7ce32b91e8a007c72d316a1c67 +battery 12bdf471e374b34cb0e48b29bb9eb9127ed26fc5 +regulator 3d54df872c8ee5c3e45f9b4d144e8d7de8a87daa +security 472711068fa950642b9b471aaebcc82e9930eb8c +apparmor 1b51bd761599b84e963d9cb510e7c7d8fbf9d1ee +integrity 0496fc9cdc384f67be4413b1c6156eb64fccd5c4 +selinux ea64aa57d596c4cbe518ffd043c52ef64089708d +smack 33d589ed60ae433b483761987b85e0d24e54584e +tomoyo bc8a1ba841e1b3681ad6cd30592ad6f149bc22d3 +tpmdd 3e91b44c93ad2871f89fc2a98c5e4fe6ca5db3d9 +watchdog 450517fa5aae98b857c68743fd12ce93e4b8989d +iommu 7dddaf3320f967004b0725101acc8bb286cd8116 +audit 76489955c6d4a065ca69dc88faf7a50a59b66f35 +devicetree 39451ebcf7fe19f21c65b39b03fbfb90c3d1a350 +dt-krzk 5cd532f7f017460395836d8f129ad3ee5ae63110 +mailbox 75df94d05fc03fd9d861eaf79ce10fbb7a548bd8 +spi f0b0677d8a1ebcd55d6395ff0303a8086597e211 +tip 847c9647bbd5593fef92eaaa42c323c26aecb9b1 +clockevents a83f9c04be4e807d1c3961eec3fe3310c60ed9aa +edac 148f30165b4bd17983f0b1f7c926fb66725f8959 +ftrace 2ad0b4fafa91a04f98391465686fb5926da5ce16 +rcu ed062c41dfda2de8d1712c91e089303dae013bb7 +paulmck 7f8fcc6f09fb732745b3252f481def76b18fb99c +kvm 0499add8efd72456514c6218c062911ccc922a99 +kvm-arm 6316366129d2885fae07c2774f4b7ae0a45fb55d +kvms390 52940a34a85bc8a17a095f6fae80c33a18c1f7ec +kvm-ppc 9448598b22c50c8a5bb77a9103e2d49f134c9578 +kvm-riscv 0ebad18dcacc650ea54153abd2949f57cd29161b +kvm-x86 e944fe2c09f405a2e2d147145c9b470084bc4c9a +xen-tip c307b6dc9c4f68d00524ec10899cdf21466b5c1e +percpu 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +workqueues 32d572e39031920691abfada68cdb19ad44b4eeb +sched-ext 3445c57d73330a05e4a0b88f87ab3ccddac7f708 +drivers-x86 eeeb4c9874bb7ad11d322156443b1d3ebfaaa1cf +chrome-platform 520e345dfdab89aed4a0ad98d5ec35086661a11a +chrome-platform-firmware 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +hsi 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +leds-lj b2c87f5e98cd88095dbc6802197526703d5e4e48 +ipmi 6b157b408d0c7d125e4d7c62e11e7d9376a5d150 +driver-core c5048ddee936ca5ce0aeb79172ce512130779d31 +usb 0a06917432a762d6233f88963c0b53e48dbac6b4 +thunderbolt 062191adfde0b11b01656ea6db51a9385fa3d104 +usb-serial 509f403f3ccec14188036212118651bf23599396 +tty 0a15f43b92ddaa2fdb476891a12ac2e207c7fcd2 +char-misc 4df29fb5bcebeea28b29386dec18355949512ca1 +coresight eebe8dbd8630f51cf70b1f68a440cd3d7f7a914d +fastrpc 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +fpga ae801944cbfb70326afc373c11a282d1ce3bae97 +icc 0e841d1d561376828ea9ecdf7d591f491046924c +iio 3674f3ca92730d9a07b42b311f1337d83c4d5605 +phy-next dbeea86fecef7cf2b93aded4525d74f6277376ef +soundwire dc3a6a942e9ee3f18560bfcb16c06bb94f37fabf +extcon cc59e9ce5c15e0272c0eb189c1b3e10424168ff0 +gnss 0f61b1860cc3f52aef9036d7235ed1f017632193 +vfio c3cbc276c2a33b04fc78a86cdb2ddce094cb3614 +w1 cc8f92e41eb76f450f05234fef2054afc3633100 +spmi 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +staging 1d264b88aea94c41470fb3e02caf068053396c73 +counter-next ad415677b7e3b733270adaf04e3a7a9c46f1e929 +mux 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +dmaengine ab736ed52e3409b58a4888715e4425b6e8ac444f +cgroup cdab91959f725a63396b947212e185556bc4539a +scsi 1eb218a5b49f949de67ea45aa8e9e9b0c88ff09c +scsi-mkp 1982257570b84dc33753d536dd969fd357a014e9 +vhost 996b8da17999a4a1c281920d37ac757b6ff1ea9f +rpmsg 85ab651885e1b542ee0bb9ec4642ef0b11716997 +gpio-brgl af9b4a56f0000fb11057e204ddfb05d72ba4dba0 +gpio-intel 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +pinctrl 8791fba411f56186d84067e8df689a55fe1c0ccc +pinctrl-intel 8e03e6ecc23537531ddae6488c9dd67546486a7b +pinctrl-renesas 829dde3369a91ad637ac15629ea8d73f3db2c562 +pinctrl-samsung 8c483209a6fc71a555fec4a0c99b05e46a5bd38c +pwm 9321f9d27fbaf6c4f32772fc2620961a0c492135 +ktest d3042cbe84a060b4df764eb6c5300bbe20d125ca +kselftest 6d6ad32e22f028c525d5df471c5522616e645a6b +kunit 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +kunit-next db0c35ca36526f3072affcb573631ccf8c85f827 +livepatching 51ab33fc0a8bef9454849371ef897a1241911b37 +rtc 8eeb611b3d16241559bbf81ae5d938368c87818c +nvdimm a9ba6733c7f1096c4506bf4e34a546e07242df74 +at24 de284988c270cc16a3fb41f8f6955394d4af2a12 +ntb 68113d26067408736fc3be948c2fe8db935aff1c +seccomp 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +slimbus 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +nvmem bfab89e362066c5556c0c39fc1c2651e7e50e740 +xarray 863810caeb3cf04ee479f3944a678574001af7a9 +hyperv afefdb2bc94571f0f9297dc129b2069942a70f4b +auxdisplay 693142d4d761dd188ead136a7bca1e870a6af8cd +kgdb fdbdd0ccb30af18d3b29e714ac8d5ab6163279e0 +hmm 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +cfi 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +mhi 91a0b0dce350766675961892ba4431363c4e29f7 +memblock f56ccc32468ee7885d3a9175e7d2cb608d301521 +cxl 63fbf275fa9f18f7020fb8acf54fa107e51d0f23 +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi c5a8f13f1e476c90f4bc184a58751d3e7ff88f2b +unicode bcfee135d584714c2130031c7e28aafa91057b9a +slab bc33906024eb5955294e28128c3d0f492d2ded5e +random bb9ff576fdff48c242876f55098a3ee20a29df5d +landlock 039b06ca8a1d6b67cfaa62b451611916297763a2 +sysctl d174174c6776a340f5c25aab1ac47a2dd950f380 +execve 46a03ea50b5f380bdb99178b8f90b39c6ba1f528 +bitmap e5134a74f7162fdc2c0425177d2cf93cc81530ac +hte 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +kspp a41e7fab5cdc0aa492a888b31b70fe6606bbc3ab +nolibc a5f00be9b3b07d92c6689997403851a32e1874cc +iommufd f8f9c1f4d0c7a64600e2ca312dec824a0bc2f1da +turbostat deee7e8ad5bd253a2fe4714dd5f7d4ca507c58a3 +pwrseq e1dccb485c2876ac1318f36ccc0155416c633a48 +capabilities-next 071588136007482d70fd2667b827036bc60b1f8f +ipe 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +kcsan dcb6fa37fd7bc9c3d2b066329b0d27dedf8becaa +crc dcb6fa37fd7bc9c3d2b066329b0d27dedf8becaa +keys-next 91db696adea4d76017b1e1f45915a5cbf04e8da3 +fwctl f8f9c1f4d0c7a64600e2ca312dec824a0bc2f1da +devsec-tsm 7dfbe9a6751973c17138ddc0d33deff5f5f35b94 +hisilicon 6c177775dcc5e70a64ddf4ee842c66af498f2c7c +kthread fa39ec4f89f2637ed1cdbcde3656825951787668 +drm-rust cea7b66a80412e2a5b74627b89ae25f1d0110a4b +drm-nova 93296e9d9528f0d87f2cf3fee494599060a0f14a diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 00000000000000..4143a3bd0cb79e --- /dev/null +++ b/Next/Trees @@ -0,0 +1,407 @@ +Trees included into this release: + +Name Url +---- --- +origin https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +ext4-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#fixes +vfs-brauner-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.fixes +fscrypt-current https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +btrfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +erofs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +nfsd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +v9fs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +fscrypt https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +btrfs https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph https://github.com/ceph/ceph-client.git#master +cifs git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git#configfs-next +ecryptfs https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +dlm https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +erofs https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs https://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs3 https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git#for-next +overlayfs https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next +ubifs https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs https://github.com/martinetd/linux#9p-next +v9fs-ericvh https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +vfs-brauner https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +mm-hotfixes https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-fixes-for-next +arc-current https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#fixes +arm64-fixes https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +sophgo-fixes https://github.com/sophgo/linux.git#fixes +sophgo-soc-fixes https://github.com/sophgo/linux.git#soc-fixes +m68k-current https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +net https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/#master +ipsec https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +ath https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-current +iwlwifi https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#fixes +wpan https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-linus +tty.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +libcrypto-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-fixes +vfio-fixes https://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +dmaengine-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git://linuxtv.org/media-ci/media-pending.git#fixes +reset-fixes https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#fixes +kvm-fixes git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +dma-mapping-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-fixes +drivers-x86-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes +drm-intel-fixes https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next-fixes +mmc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +risc-v-fixes https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +auxdisplay-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +kunit-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +memblock-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +renesas-fixes https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git#perf-tools +efi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +battery-fixes https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +iommufd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes https://github.com/Rust-for-Linux/linux.git#rust-fixes +w1-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +i2c-host-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-fixes +sparc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus +clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-fixes +thead-clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-fixes +pwrseq-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current +thead-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-fixes +ftrace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ftrace/fixes +ring-buffer-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ring-buffer/fixes +trace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#trace/fixes +tracefs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#tracefs/fixes +spacemit-fixes https://github.com/spacemit-com/linux#fixes +tip-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#tip/urgent +slab-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next-fixes +drm-msm-fixes https://gitlab.freedesktop.org/drm/msm.git#msm-fixes +uml-fixes https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +fwctl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-rc +devsec-tsm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#fixes +drm-rust-fixes https://gitlab.freedesktop.org/drm/rust/kernel.git#drm-rust-fixes +tenstorrent-dt-fixes https://github.com/tenstorrent/linux.git#tenstorrent-dt-fixes +drm-misc-fixes https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes +rust https://github.com/Rust-for-Linux/linux.git#rust-next +rust-alloc https://github.com/Rust-for-Linux/linux.git#alloc-next +rust-io https://github.com/Rust-for-Linux/linux.git#io-next +rust-pin-init https://github.com/Rust-for-Linux/linux.git#pin-init-next +rust-timekeeping https://github.com/Rust-for-Linux/linux.git#timekeeping-next +rust-xarray https://github.com/Rust-for-Linux/linux.git#xarray-next +rust-analyzer https://github.com/Rust-for-Linux/linux.git#rust-analyzer-next +mm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-unstable +mm-nonmm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-unstable +kbuild https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-for-next +clang-format https://github.com/ojeda/linux.git#clang-format +perf https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-for-next +asm-generic https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#master +alpha https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git#alpha-next +arm https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#for-next +arm64 https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +at91 https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +bmc https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git#for-next +broadcom https://github.com/Broadcom/stblinux.git#next +cix https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git#for-next +davinci https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +fsl https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git#soc_fsl +imx-mxs https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +mediatek https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next +mvebu https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#for-next +qcom https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset https://git.pengutronix.de/git/pza/linux#reset/next +rockchip https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sophgo https://github.com/sophgo/linux.git#for-next +sophgo-soc https://github.com/sophgo/linux.git#soc-for-next +spacemit https://github.com/spacemit-com/linux#for-next +stm32 https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git#next +tegra https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +tenstorrent-dt https://github.com/tenstorrent/linux.git#tenstorrent-dt-for-next +thead-dt https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-for-next +ti https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx https://github.com/Xilinx/linux-xlnx.git#for-next +clk https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +thead-clk https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-for-next +csky https://github.com/c-sky/csky-linux.git#linux-next +loongarch https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git://git.monstr.eu/linux-2.6-microblaze.git#next +mips https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc https://github.com/openrisc/linux.git#for-next +parisc-hd https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +risc-v https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +sparc https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-next +uml https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa https://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +printk https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i2c-host https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host +i3c https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git://git.lwn.net/linux.git#docs-next +v4l-dvb git://linuxtv.org/media-ci/media-pending.git#next +v4l-dvb-next git://linuxtv.org/mchehab/media-next.git#master +pm https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +pmdomain https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +opp https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +rdma https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +ath-next https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-next +iwlwifi-next https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#next +wpan-next https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +libcrypto https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-next +drm https://gitlab.freedesktop.org/drm/kernel.git#drm-next +drm-exynos https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next +amdgpu https://gitlab.freedesktop.org/agd5f/linux.git#drm-next +drm-intel https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next +drm-msm https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +drm-xe https://gitlab.freedesktop.org/drm/xe/kernel.git#drm-xe-next +etnaviv https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git#modules-next +input https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git#for-next +device-mapper https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#for-next +pcmcia https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +selinux https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack https://github.com/cschaufler/smack-next#next +tomoyo git://git.code.sf.net/p/tomoyo/tomoyo.git#master +tpmdd https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git#next +audit https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#for-next +spi https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git#timers/drivers/next +edac https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +ftrace https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux#next +paulmck https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#non-rcu/next +kvm git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-ppc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +kvm-riscv https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 https://github.com/kvm-x86/linux.git#next +xen-tip https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sched-ext https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git#for-next +drivers-x86 https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +chrome-platform-firmware https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next +hsi https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds-lj https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi https://github.com/cminyard/linux-ipmi.git#for-next +driver-core https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-next +usb https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +coresight https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio https://github.com/awilliam/linux-vfio.git#next +w1 https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +spmi https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-next +staging https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux https://gitlab.com/peda-linux/mux.git#for-next +dmaengine https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio-brgl https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#pwm/for-next +ktest https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git#for-next +rtc https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb https://github.com/jonmason/ntb.git#ntb-next +seccomp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +slimbus https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git://git.infradead.org/users/willy/xarray.git#main +hyperv https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#for-next +kgdb https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd https://github.com/terrelln/linux.git#zstd-next +efi https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next +random https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +sysctl https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git#sysctl-next +execve https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap https://github.com/norov/linux.git#bitmap-for-next +hte https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +nolibc https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git#for-next +iommufd https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +turbostat https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +pwrseq https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next +capabilities-next https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git#caps-next +ipe https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git#next +kcsan https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git#next +crc https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#crc-next +keys-next https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +fwctl https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-next +devsec-tsm https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#next +hisilicon https://github.com/hisilicon/linux-hisi.git#for-next +kthread https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#for-next +drm-rust https://gitlab.freedesktop.org/drm/rust/kernel.git#drm-rust-next +drm-nova https://gitlab.freedesktop.org/drm/nova.git#nova-next diff --git a/Next/kselftest-targets b/Next/kselftest-targets new file mode 100644 index 00000000000000..932bb653513e2c --- /dev/null +++ b/Next/kselftest-targets @@ -0,0 +1,109 @@ +acct +amd-pstate +breakpoints +cachestat +cgroup +clone3 +connector +core +coredump +cpufreq +cpu-hotplug +damon +devices/error_logs +devices/probe +dmabuf-heaps +drivers/dma-buf +drivers/net/bonding +drivers/net/team +drivers/net/virtio_net +dt +efivarfs +exec +filelock +filesystems +filesystems/binderfs +filesystems/epoll +filesystems/fat +filesystems/mount-notify +filesystems/overlayfs +filesystems/statmount +firmware +fpu +ftrace +futex +gpio +intel_pstate +iommu +ipc +ir +kcmp +kmod +kselftest_harness +kvm +landlock +lib +livepatch +lkdtm +locking +lsm +media_tests +membarrier +memory-hotplug +mincore +module +mount +mount_setattr +move_mount_set_group +mseal_system_mappings +namespaces +nci +net/can +net/forwarding +net/hsr +net/openvswitch +net/packetdrill +net/tcp_ao +pcie_bwctrl +pci_endpoint +perf_events +pidfd +pid_namespace +powerpc +power_supply +proc +pstore +ptp +ptrace +resctrl +ring-buffer +riscv +rlimits +rseq +rtc +rust +safesetid +sched +seccomp +sgx +signal +size +sparc64 +splice +static_keys +sync +syscall_user_dispatch +sysctl +tc-testing +tdx +timens +timers +tmpfs +tpm2 +tty +user_events +vDSO +verification +watchdog +x86 +zram diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 00000000000000..aa8d1805676628 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,16360 @@ +$ date -R +Thu, 05 Feb 2026 11:20:47 +0000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 40% (4257/10483)
Updating files: 41% (4299/10483)
Updating files: 42% (4403/10483)
Updating files: 43% (4508/10483)
Updating files: 44% (4613/10483)
Updating files: 45% (4718/10483)
Updating files: 46% (4823/10483)
Updating files: 47% (4928/10483)
Updating files: 48% (5032/10483)
Updating files: 49% (5137/10483)
Updating files: 50% (5242/10483)
Updating files: 51% (5347/10483)
Updating files: 52% (5452/10483)
Updating files: 53% (5556/10483)
Updating files: 54% (5661/10483)
Updating files: 55% (5766/10483)
Updating files: 56% (5871/10483)
Updating files: 57% (5976/10483)
Updating files: 58% (6081/10483)
Updating files: 59% (6185/10483)
Updating files: 60% (6290/10483)
Updating files: 61% (6395/10483)
Updating files: 62% (6500/10483)
Updating files: 63% (6605/10483)
Updating files: 64% (6710/10483)
Updating files: 65% (6814/10483)
Updating files: 66% (6919/10483)
Updating files: 67% (7024/10483)
Updating files: 68% (7129/10483)
Updating files: 69% (7234/10483)
Updating files: 70% (7339/10483)
Updating files: 71% (7443/10483)
Updating files: 71% (7514/10483)
Updating files: 72% (7548/10483)
Updating files: 73% (7653/10483)
Updating files: 74% (7758/10483)
Updating files: 75% (7863/10483)
Updating files: 76% (7968/10483)
Updating files: 77% (8072/10483)
Updating files: 78% (8177/10483)
Updating files: 79% (8282/10483)
Updating files: 80% (8387/10483)
Updating files: 81% (8492/10483)
Updating files: 82% (8597/10483)
Updating files: 83% (8701/10483)
Updating files: 84% (8806/10483)
Updating files: 85% (8911/10483)
Updating files: 86% (9016/10483)
Updating files: 87% (9121/10483)
Updating files: 88% (9226/10483)
Updating files: 89% (9330/10483)
Updating files: 90% (9435/10483)
Updating files: 91% (9540/10483)
Updating files: 92% (9645/10483)
Updating files: 93% (9750/10483)
Updating files: 94% (9855/10483)
Updating files: 95% (9959/10483)
Updating files: 96% (10064/10483)
Updating files: 97% (10169/10483)
Updating files: 98% (10274/10483)
Updating files: 99% (10379/10483)
Updating files: 100% (10483/10483)
Updating files: 100% (10483/10483), done. +HEAD is now at 5fd0a1df5d05a Merge tag 'v6.19rc8-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 +Merging origin/master (f14faaf3a1fb3 Merge tag 'tsm-fixes-for-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 5fd0a1df5d05a..f14faaf3a1fb3 +Fast-forward (no commit created; -m option ignored) + .mailmap | 3 +- + Documentation/ABI/testing/sysfs-class-tsm | 10 ------- + MAINTAINERS | 41 ++++++++++++++------------ + arch/x86/kvm/irq.c | 3 +- + arch/x86/kvm/svm/avic.c | 4 +-- + arch/x86/kvm/svm/svm.c | 2 ++ + arch/x86/kvm/vmx/vmx.c | 2 ++ + arch/x86/kvm/x86.c | 30 ++++++++++--------- + arch/x86/kvm/x86.h | 2 ++ + drivers/crypto/ccp/sev-dev-tsm.c | 15 +--------- + drivers/pci/ide.c | 10 ++----- + drivers/soc/qcom/smem.c | 5 ++-- + drivers/virt/coco/tsm-core.c | 30 ------------------- + include/linux/pci-ide.h | 4 +-- + include/linux/tsm.h | 3 -- + kernel/sched/ext.c | 48 +++++++++++++++++++++++++++++++ + tools/testing/selftests/kvm/Makefile.kvm | 1 + + virt/kvm/eventfd.c | 44 +++++++++++++++------------- + 18 files changed, 133 insertions(+), 124 deletions(-) +Merging ext4-fixes/fixes (d250bdf531d9c ext4: fix iloc.bh leak in ext4_xattr_inode_update_ref) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes +Already up to date. +Merging vfs-brauner-fixes/vfs.fixes (8dfce8991b95d Merge tag 'pinctrl-v6.19-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl) +$ git merge -m Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Already up to date. +Merging fscrypt-current/for-current (1e39da974ce62 fscrypt: fix left shift underflow when inode->i_blkbits > PAGE_SHIFT) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (211ddde0823f1 Linux 6.18-rc2) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging btrfs-fixes/next-fixes (a32d98bf0efe0 Merge branch 'misc-6.19' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (99a706fa47949 functionfs: use spinlock for FFS_DEACTIVATED/FFS_CLOSING transitions) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Merge made by the 'ort' strategy. + drivers/android/binder/rust_binderfs.c | 9 +-- + drivers/usb/gadget/function/f_fs.c | 102 ++++++++++++++++----------------- + drivers/usb/gadget/function/u_fs.h | 2 +- + 3 files changed, 52 insertions(+), 61 deletions(-) +Merging erofs-fixes/fixes (7893cc12251f6 erofs: fix file-backed mounts no longer working on EROFS partitions) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (0b88bfa42e546 NFSD: net ref data still needs to be freed even if net hasn't startup) +$ git merge -m Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (2014c95afecee Linux 6.14-rc1) +$ git merge -m Merge branch 'fixes/next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging fscrypt/for-next (211ddde0823f1 Linux 6.18-rc2) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging btrfs/for-next (29c5694011a2f Merge branch 'for-next-current-v6.18-20260204' into for-next-20260204) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. + fs/btrfs/Kconfig | 13 +- + fs/btrfs/Makefile | 7 +- + fs/btrfs/accessors.h | 30 + + fs/btrfs/backref.c | 4 +- + fs/btrfs/bio.c | 35 +- + fs/btrfs/bio.h | 19 +- + fs/btrfs/block-group.c | 455 +++++--- + fs/btrfs/block-group.h | 31 +- + fs/btrfs/block-rsv.c | 8 + + fs/btrfs/block-rsv.h | 1 + + fs/btrfs/compression.c | 217 ++-- + fs/btrfs/compression.h | 40 +- + fs/btrfs/ctree.c | 49 +- + fs/btrfs/ctree.h | 9 + + fs/btrfs/defrag.c | 10 +- + fs/btrfs/delayed-inode.c | 53 +- + fs/btrfs/delayed-inode.h | 15 - + fs/btrfs/direct-io.c | 29 +- + fs/btrfs/discard.c | 52 +- + fs/btrfs/disk-io.c | 284 +++-- + fs/btrfs/extent-io-tree.c | 7 +- + fs/btrfs/extent-tree.c | 457 ++++++-- + fs/btrfs/extent-tree.h | 4 +- + fs/btrfs/extent_io.c | 77 +- + fs/btrfs/extent_map.c | 12 + + fs/btrfs/file-item.c | 20 +- + fs/btrfs/file.c | 60 +- + fs/btrfs/free-space-cache.c | 108 +- + fs/btrfs/free-space-cache.h | 1 + + fs/btrfs/free-space-tree.c | 150 ++- + fs/btrfs/free-space-tree.h | 6 +- + fs/btrfs/fs.c | 102 +- + fs/btrfs/fs.h | 79 +- + fs/btrfs/inode-item.c | 7 +- + fs/btrfs/inode.c | 599 ++++++----- + fs/btrfs/ioctl.c | 46 +- + fs/btrfs/locking.c | 1 + + fs/btrfs/lzo.c | 295 ++++-- + fs/btrfs/messages.c | 26 +- + fs/btrfs/messages.h | 76 +- + fs/btrfs/qgroup.c | 125 ++- + fs/btrfs/reflink.c | 11 +- + fs/btrfs/relocation.c | 1765 ++++++++++++++++++++++++++++++- + fs/btrfs/relocation.h | 17 + + fs/btrfs/root-tree.c | 47 +- + fs/btrfs/scrub.c | 56 +- + fs/btrfs/send.c | 76 +- + fs/btrfs/space-info.c | 73 +- + fs/btrfs/space-info.h | 16 + + fs/btrfs/super.c | 17 +- + fs/btrfs/sysfs.c | 55 +- + fs/btrfs/tests/btrfs-tests.c | 6 + + fs/btrfs/tests/btrfs-tests.h | 17 + + fs/btrfs/tests/chunk-allocation-tests.c | 476 +++++++++ + fs/btrfs/tests/extent-map-tests.c | 16 +- + fs/btrfs/tests/free-space-tree-tests.c | 4 +- + fs/btrfs/tests/inode-tests.c | 126 +-- + fs/btrfs/tests/zoned-tests.c | 675 ++++++++++++ + fs/btrfs/transaction.c | 78 +- + fs/btrfs/tree-checker.c | 84 +- + fs/btrfs/tree-checker.h | 5 + + fs/btrfs/tree-log.c | 2 +- + fs/btrfs/uuid-tree.c | 16 +- + fs/btrfs/verity.c | 13 +- + fs/btrfs/volumes.c | 631 ++++++++--- + fs/btrfs/volumes.h | 57 +- + fs/btrfs/zlib.c | 97 +- + fs/btrfs/zoned.c | 401 +++++-- + fs/btrfs/zoned.h | 17 + + fs/btrfs/zstd.c | 139 +-- + include/uapi/linux/btrfs.h | 1 + + include/uapi/linux/btrfs_tree.h | 34 +- + 72 files changed, 6565 insertions(+), 2082 deletions(-) + create mode 100644 fs/btrfs/tests/chunk-allocation-tests.c + create mode 100644 fs/btrfs/tests/zoned-tests.c +Merging ceph/master (cf0f9566282a7 libceph: adapt ceph_x_challenge_blob hashing and msgr1 message signing) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + drivers/block/rbd.c | 33 ++++-- + fs/ceph/crypto.c | 9 +- + fs/ceph/mds_client.c | 5 +- + fs/ceph/mdsmap.c | 26 ++-- + fs/ceph/mdsmap.h | 1 + + fs/ceph/super.h | 16 ++- + include/linux/ceph/ceph_fs.h | 11 +- + net/ceph/Kconfig | 1 + + net/ceph/auth_x.c | 195 +++++++++++++++++++++--------- + net/ceph/auth_x_protocol.h | 38 ++++++ + net/ceph/crypto.c | 277 ++++++++++++++++++++++++++++++++++--------- + net/ceph/crypto.h | 21 +++- + net/ceph/messenger_v2.c | 16 +-- + 13 files changed, 503 insertions(+), 146 deletions(-) +Merging cifs/for-next (f796e492246c0 smb: common: add header guards to fs/smb/common/smb2status.h) +$ 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/netfs/read_collect.c | 10 + + fs/netfs/read_retry.c | 4 +- + fs/netfs/write_collect.c | 8 +- + fs/netfs/write_issue.c | 1 + + fs/netfs/write_retry.c | 1 - + fs/smb/Kconfig | 17 + + fs/smb/client/Makefile | 24 +- + fs/smb/client/cached_dir.c | 10 +- + fs/smb/client/cached_dir.h | 42 +- + fs/smb/client/cifs_debug.c | 18 +- + fs/smb/client/cifs_debug.h | 1 - + fs/smb/client/cifs_spnego.h | 4 +- + fs/smb/client/cifs_swn.h | 10 +- + fs/smb/client/cifs_unicode.c | 1 - + fs/smb/client/cifs_unicode.h | 17 +- + fs/smb/client/cifsacl.c | 1 - + fs/smb/client/cifsencrypt.c | 124 -- + fs/smb/client/cifsfs.c | 6 +- + fs/smb/client/cifsfs.h | 114 +- + fs/smb/client/cifsglob.h | 51 +- + fs/smb/client/cifspdu.h | 2377 +------------------------ + fs/smb/client/cifsproto.h | 768 +++----- + fs/smb/client/cifssmb.c | 147 +- + fs/smb/client/cifstransport.c | 265 --- + fs/smb/client/compress.h | 3 +- + fs/smb/client/connect.c | 329 +--- + fs/smb/client/dfs.h | 3 +- + fs/smb/client/dfs_cache.h | 19 +- + fs/smb/client/dir.c | 1 - + fs/smb/client/dns_resolve.h | 4 +- + fs/smb/client/file.c | 1 - + fs/smb/client/fs_context.c | 1 - + fs/smb/client/fs_context.h | 16 +- + fs/smb/client/fscache.h | 15 +- + fs/smb/client/gen_smb2_mapping | 86 + + fs/smb/client/inode.c | 1 - + fs/smb/client/ioctl.c | 1 - + fs/smb/client/link.c | 1 - + fs/smb/client/misc.c | 302 +--- + fs/smb/client/netlink.h | 4 +- + fs/smb/client/netmisc.c | 824 +-------- + fs/smb/client/nterr.c | 15 + + fs/smb/client/nterr.h | 13 + + fs/smb/client/ntlmssp.h | 15 +- + fs/smb/client/readdir.c | 1 - + fs/smb/client/reparse.h | 14 +- + fs/smb/client/sess.c | 982 ----------- + fs/smb/client/smb1debug.c | 25 + + fs/smb/client/smb1encrypt.c | 139 ++ + fs/smb/client/smb1maperror.c | 810 +++++++++ + fs/smb/client/smb1misc.c | 189 ++ + fs/smb/client/smb1ops.c | 279 ++- + fs/smb/client/smb1pdu.h | 2354 +++++++++++++++++++++++++ + fs/smb/client/smb1proto.h | 335 ++++ + fs/smb/client/smb1session.c | 995 +++++++++++ + fs/smb/client/smb1transport.c | 563 ++++++ + fs/smb/client/smb2file.c | 2 +- + fs/smb/client/smb2inode.c | 23 +- + fs/smb/client/smb2maperror.c | 2473 +------------------------- + fs/smb/client/smb2maperror_test.c | 45 + + fs/smb/client/smb2misc.c | 6 +- + fs/smb/client/smb2ops.c | 59 +- + fs/smb/client/smb2pdu.c | 195 ++- + fs/smb/client/smb2proto.h | 469 +++-- + fs/smb/client/smbencrypt.c | 1 - + fs/smb/client/smberr.h | 2 +- + fs/smb/client/trace.h | 1 + + fs/smb/client/transport.c | 1 - + fs/smb/client/xattr.c | 1 - + fs/smb/common/smb2pdu.h | 3 + + fs/smb/common/smb2status.h | 3499 +++++++++++++++++++------------------ + 71 files changed, 8642 insertions(+), 10499 deletions(-) + delete mode 100644 fs/smb/client/cifstransport.c + create mode 100644 fs/smb/client/gen_smb2_mapping + create mode 100644 fs/smb/client/smb1debug.c + create mode 100644 fs/smb/client/smb1encrypt.c + create mode 100644 fs/smb/client/smb1maperror.c + create mode 100644 fs/smb/client/smb1misc.c + create mode 100644 fs/smb/client/smb1pdu.h + create mode 100644 fs/smb/client/smb1proto.h + create mode 100644 fs/smb/client/smb1session.c + create mode 100644 fs/smb/client/smb1transport.c + create mode 100644 fs/smb/client/smb2maperror_test.c +Merging configfs/configfs-next (6363844fdbbb7 samples: configfs: Constify struct configfs_item_operations and configfs_group_operations) +$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git configfs/configfs-next +Merge made by the 'ort' strategy. + rust/kernel/configfs.rs | 9 +++++---- + samples/configfs/configfs_sample.c | 8 ++++---- + samples/rust/rust_configfs.rs | 5 ++--- + 3 files changed, 11 insertions(+), 11 deletions(-) +Merging ecryptfs/next (2a9cb23307db7 ecryptfs: Annotate struct ecryptfs_message with __counted_by) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Merge made by the 'ort' strategy. + fs/ecryptfs/crypto.c | 38 +++++++++++++------------------------- + fs/ecryptfs/debug.c | 1 - + fs/ecryptfs/ecryptfs_kernel.h | 5 ++--- + fs/ecryptfs/keystore.c | 19 ++++++++++--------- + fs/ecryptfs/main.c | 9 +++++---- + 5 files changed, 30 insertions(+), 42 deletions(-) +Merging dlm/next (2c3a0b730012e dlm: Avoid -Wflex-array-member-not-at-end warning) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'ort' strategy. + fs/dlm/config.c | 16 ++++++++-------- + fs/dlm/dir.c | 6 +++--- + fs/dlm/dlm_internal.h | 4 +++- + fs/dlm/lock.c | 22 +++------------------- + fs/dlm/member.c | 6 +----- + 5 files changed, 18 insertions(+), 36 deletions(-) +Merging erofs/dev (8f2fb72fd17ee erofs: update compression algorithm status) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Auto-merging fs/fuse/file.c +Auto-merging fs/iomap/buffered-io.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-erofs | 20 ++- + Documentation/filesystems/erofs.rst | 18 ++- + fs/erofs/Kconfig | 20 ++- + fs/erofs/Makefile | 1 + + fs/erofs/data.c | 111 ++++++++----- + fs/erofs/decompressor.c | 85 +++++----- + fs/erofs/decompressor_crypto.c | 2 +- + fs/erofs/decompressor_deflate.c | 1 - + fs/erofs/erofs_fs.h | 7 +- + fs/erofs/fileio.c | 45 +++--- + fs/erofs/fscache.c | 17 +- + fs/erofs/inode.c | 78 +++++---- + fs/erofs/internal.h | 74 ++++++++- + fs/erofs/ishare.c | 206 ++++++++++++++++++++++++ + fs/erofs/super.c | 142 ++++++++++++----- + fs/erofs/sysfs.c | 9 +- + fs/erofs/xattr.c | 266 ++++++++++++++++++++----------- + fs/erofs/xattr.h | 40 +---- + fs/erofs/zdata.c | 110 +++++++------ + fs/file_table.c | 1 + + fs/fuse/file.c | 4 +- + fs/iomap/buffered-io.c | 6 +- + include/linux/iomap.h | 8 +- + include/trace/events/erofs.h | 10 +- + 24 files changed, 847 insertions(+), 434 deletions(-) + create mode 100644 fs/erofs/ishare.c +Merging exfat/dev (131331a504c41 exfat: add blank line after declarations) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/cache.c | 149 +++++++++++++++++++++++++++++++++------------------- + fs/exfat/exfat_fs.h | 7 ++- + fs/exfat/fatent.c | 62 ++++++++++++++-------- + fs/exfat/file.c | 16 +++--- + fs/exfat/inode.c | 57 ++++++++------------ + fs/exfat/namei.c | 4 +- + 6 files changed, 170 insertions(+), 125 deletions(-) +Merging ext3/for_next (93a803d2ab641 Pull isofs name length improvement.) +$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. + Documentation/filesystems/ext2.rst | 2 +- + fs/isofs/rock.c | 2 +- + fs/notify/fsnotify.c | 69 ++---------------- + fs/notify/fsnotify.h | 5 +- + fs/notify/mark.c | 139 ++++++++++++++++++++++++++++++++++--- + fs/quota/quota.c | 1 + + fs/super.c | 4 +- + include/linux/fsnotify_backend.h | 5 +- + 8 files changed, 148 insertions(+), 79 deletions(-) +Merging ext4/dev (4f5e8e6f01234 et4: allow zeroout when doing written to unwritten split) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Merge made by the 'ort' strategy. + fs/ext4/ext4.h | 34 +- + fs/ext4/extents-test.c | 1027 +++++++++++++++++++++++++++++++++++++++++++ + fs/ext4/extents.c | 608 +++++++++++++------------ + fs/ext4/extents_status.c | 125 ++++-- + fs/ext4/fast_commit.c | 54 ++- + fs/ext4/fast_commit.h | 3 + + fs/ext4/file.c | 24 +- + fs/ext4/inode.c | 94 ++-- + fs/ext4/ioctl.c | 3 + + fs/ext4/mballoc-test.c | 2 +- + fs/ext4/mballoc.c | 73 ++- + fs/ext4/migrate.c | 12 + + fs/ext4/move_extent.c | 2 + + fs/ext4/super.c | 37 +- + fs/ext4/sysfs.c | 36 ++ + fs/ext4/verity.c | 2 + + include/trace/events/ext4.h | 8 +- + 17 files changed, 1680 insertions(+), 464 deletions(-) + create mode 100644 fs/ext4/extents-test.c +Merging f2fs/dev (91b76f1059b60 f2fs: fix incomplete block usage in compact SSA summaries) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 30 ++- + Documentation/filesystems/f2fs.rst | 49 +++- + fs/f2fs/checkpoint.c | 176 +++++++++++-- + fs/f2fs/compress.c | 18 +- + fs/f2fs/data.c | 424 +++++++++++++++++++++++++++----- + fs/f2fs/debug.c | 1 + + fs/f2fs/f2fs.h | 233 +++++++++++++----- + fs/f2fs/file.c | 84 ++++--- + fs/f2fs/gc.c | 84 ++++--- + fs/f2fs/inline.c | 10 +- + fs/f2fs/inode.c | 16 +- + fs/f2fs/namei.c | 65 ++--- + fs/f2fs/node.c | 99 ++++++-- + fs/f2fs/node.h | 8 - + fs/f2fs/recovery.c | 11 +- + fs/f2fs/segment.c | 133 +++++----- + fs/f2fs/segment.h | 108 ++++---- + fs/f2fs/super.c | 201 +++++++++------ + fs/f2fs/sysfs.c | 76 +++++- + fs/f2fs/xattr.c | 5 +- + include/linux/f2fs_fs.h | 73 +++--- + include/trace/events/f2fs.h | 85 ++++++- + 22 files changed, 1445 insertions(+), 544 deletions(-) +Merging fsverity/for-next (433fbcac9ebe4 fsverity: remove inode from fsverity_verification_ctx) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/verity.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/verity.c +Auto-merging fs/f2fs/compress.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/inode.c +Auto-merging fs/f2fs/super.c +Merge made by the 'ort' strategy. + fs/attr.c | 12 ++- + fs/btrfs/btrfs_inode.h | 4 - + fs/btrfs/extent_io.c | 53 +++++++----- + fs/btrfs/inode.c | 13 +-- + fs/btrfs/verity.c | 11 +-- + fs/buffer.c | 25 +++--- + fs/ext4/ext4.h | 8 +- + fs/ext4/inode.c | 31 ------- + fs/ext4/readpage.c | 64 +++++++++++---- + fs/ext4/super.c | 4 - + fs/ext4/verity.c | 36 +++----- + fs/f2fs/compress.c | 7 +- + fs/f2fs/data.c | 100 ++++++++++++++--------- + fs/f2fs/f2fs.h | 12 +-- + fs/f2fs/file.c | 6 +- + fs/f2fs/inode.c | 1 - + fs/f2fs/super.c | 3 - + fs/f2fs/verity.c | 36 +++----- + fs/inode.c | 9 ++ + fs/verity/Makefile | 1 + + fs/verity/enable.c | 41 ++++++---- + fs/verity/fsverity_private.h | 20 +++-- + fs/verity/open.c | 86 +++++++++++--------- + fs/verity/pagecache.c | 58 +++++++++++++ + fs/verity/read_metadata.c | 19 +++-- + fs/verity/verify.c | 91 +++++++++++++-------- + include/linux/fsverity.h | 190 +++++++++++++++++-------------------------- + mm/readahead.c | 15 ++-- + 28 files changed, 519 insertions(+), 437 deletions(-) + create mode 100644 fs/verity/pagecache.c +$ git am -3 ../patches/0001-f2fs-Fix-interaction-with-fsverity-changes.patch +Applying: f2fs: Fix interaction with fsverity changes +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/data.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[fs-next 45d2e674ee364] Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git + Date: Thu Feb 5 11:30:20 2026 +0000 +$ git am -3 ../patches/0001-f2fs-Fix-up-mismerge.patch +Applying: f2fs: Fix up mismerge +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/data.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[fs-next bbd83cfe37bf6] Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git + Date: Thu Feb 5 11:30:20 2026 +0000 +Merging fuse/for-next (7897c0ae19458 vfs: document d_dispose_if_unused()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/dir.c +Merge made by the 'ort' strategy. +Merging gfs2/for-next (da6f5bbc2e790 gfs2: fix memory leaks in gfs2_fill_super error path) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/bmap.c | 13 +++- + fs/gfs2/glock.c | 190 ++++++++++++++++++++++++++++++--------------------- + fs/gfs2/glock.h | 9 +-- + fs/gfs2/glops.c | 34 ++++----- + fs/gfs2/incore.h | 18 ++++- + fs/gfs2/inode.c | 18 +++-- + fs/gfs2/lock_dlm.c | 28 ++++---- + fs/gfs2/log.c | 7 +- + fs/gfs2/lops.c | 51 +++++++------- + fs/gfs2/lops.h | 4 +- + fs/gfs2/meta_io.c | 6 +- + fs/gfs2/meta_io.h | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/quota.c | 5 +- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/super.c | 4 +- + fs/gfs2/trace_gfs2.h | 50 +++++++------- + fs/gfs2/trans.c | 4 +- + 18 files changed, 261 insertions(+), 186 deletions(-) +Merging jfs/jfs-next (7833570dae833 jfs: avoid -Wtautological-constant-out-of-range-compare warning) +$ git merge -m Merge branch 'jfs-next' of https://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Merge made by the 'ort' strategy. + fs/jfs/jfs_dtree.c | 4 ++-- + fs/jfs/jfs_logmgr.c | 1 + + fs/jfs/namei.c | 6 ++++-- + 3 files changed, 7 insertions(+), 4 deletions(-) +Merging ksmbd/ksmbd-for-next (cc6aa375487e9 smb: server: make use of rdma_restrict_node_type()) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + drivers/infiniband/core/cma.c | 30 ++ + drivers/infiniband/core/cma_priv.h | 1 + + fs/smb/client/smbdirect.c | 549 ++++++++++++++++++++++------- + fs/smb/common/smbdirect/smbdirect_socket.h | 18 + + fs/smb/server/transport_rdma.c | 259 +++++++++++--- + include/rdma/rdma_cm.h | 17 + + 6 files changed, 707 insertions(+), 167 deletions(-) +Merging nfs/linux-next (24d479d26b25b Linux 6.19-rc6) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (5248d8474e594 pNFS: fix a missing wake up while waiting on NFS_LAYOUT_DRAIN) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Merge made by the 'ort' strategy. + fs/nfs/Kconfig | 26 +- + fs/nfs/Makefile | 4 +- + fs/nfs/callback.c | 13 +- + fs/nfs/callback.h | 3 - + fs/nfs/callback_proc.c | 16 +- + fs/nfs/callback_xdr.c | 21 -- + fs/nfs/client.c | 12 +- + fs/nfs/delegation.c | 604 ++++++++++++++++++------------------ + fs/nfs/delegation.h | 9 +- + fs/nfs/fs_context.c | 3 +- + fs/nfs/internal.h | 15 +- + fs/nfs/localio.c | 126 +++++--- + fs/nfs/netns.h | 4 +- + fs/nfs/nfs3proc.c | 3 +- + fs/nfs/nfs40.h | 19 ++ + fs/nfs/nfs40client.c | 245 +++++++++++++++ + fs/nfs/nfs40proc.c | 395 ++++++++++++++++++++++++ + fs/nfs/nfs42proc.c | 13 +- + fs/nfs/nfs4_fs.h | 83 ++--- + fs/nfs/nfs4client.c | 193 +----------- + fs/nfs/nfs4proc.c | 764 ++++++++++------------------------------------ + fs/nfs/nfs4session.c | 4 - + fs/nfs/nfs4session.h | 23 -- + fs/nfs/nfs4state.c | 91 +----- + fs/nfs/nfs4trace.c | 2 - + fs/nfs/nfs4trace.h | 21 +- + fs/nfs/nfs4xdr.c | 109 ++----- + fs/nfs/pnfs.c | 3 +- + fs/nfs/pnfs.h | 6 +- + fs/nfs/proc.c | 3 +- + fs/nfs/read.c | 4 +- + fs/nfs/super.c | 30 +- + fs/nfs/sysfs.c | 10 +- + fs/nfs/write.c | 2 +- + include/linux/nfs_fs_sb.h | 10 +- + include/linux/nfs_xdr.h | 9 +- + 36 files changed, 1353 insertions(+), 1545 deletions(-) + create mode 100644 fs/nfs/nfs40.h + create mode 100644 fs/nfs/nfs40client.c + create mode 100644 fs/nfs/nfs40proc.c +Merging nfsd/nfsd-next (e939bd675634f NFSD: Add POSIX ACL file attributes to SUPPATTR bitmasks) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/nfs/callback.c +Merge made by the 'ort' strategy. + Documentation/netlink/specs/nfsd.yaml | 5 + + Documentation/sunrpc/xdr/nfs4_1.x | 61 ++++ + fs/lockd/svc.c | 6 +- + fs/lockd/svclock.c | 4 - + fs/locks.c | 17 +- + fs/nfs/callback.c | 10 +- + fs/nfsd/Kconfig | 19 ++ + fs/nfsd/Makefile | 10 +- + fs/nfsd/acl.h | 1 + + fs/nfsd/netlink.c | 5 +- + fs/nfsd/netns.h | 7 +- + fs/nfsd/nfs2acl.c | 2 +- + fs/nfsd/nfs4acl.c | 17 +- + fs/nfsd/nfs4idmap.c | 52 ++- + fs/nfsd/nfs4proc.c | 265 ++++++++++++--- + fs/nfsd/nfs4state.c | 52 +-- + fs/nfsd/nfs4xdr.c | 363 ++++++++++++++++++++- + fs/nfsd/nfs4xdr_gen.c | 351 ++++++++++++++++++-- + fs/nfsd/nfs4xdr_gen.h | 12 +- + fs/nfsd/nfsctl.c | 7 + + fs/nfsd/nfsd.h | 24 +- + fs/nfsd/nfsproc.c | 2 +- + fs/nfsd/nfssvc.c | 64 +++- + fs/nfsd/state.h | 5 + + fs/nfsd/trace.h | 54 +++ + fs/nfsd/vfs.c | 34 +- + fs/nfsd/vfs.h | 3 +- + fs/nfsd/xdr4.h | 7 + + include/linux/nfs4.h | 4 + + include/linux/sunrpc/svc.h | 13 +- + include/linux/sunrpc/svcsock.h | 2 +- + include/linux/sunrpc/xdrgen/_builtins.h | 80 ++++- + include/linux/sunrpc/xdrgen/nfs4_1.h | 112 ++++++- + include/uapi/linux/nfs.h | 2 +- + include/uapi/linux/nfsd_netlink.h | 1 + + net/sunrpc/auth_gss/gss_rpc_xdr.c | 82 ++++- + net/sunrpc/svc.c | 216 +++++++----- + net/sunrpc/svc_xprt.c | 51 ++- + tools/net/sunrpc/xdrgen/README | 2 - + tools/net/sunrpc/xdrgen/generators/__init__.py | 5 +- + tools/net/sunrpc/xdrgen/generators/enum.py | 9 +- + tools/net/sunrpc/xdrgen/generators/passthru.py | 26 ++ + tools/net/sunrpc/xdrgen/generators/program.py | 38 ++- + tools/net/sunrpc/xdrgen/generators/typedef.py | 8 +- + tools/net/sunrpc/xdrgen/generators/union.py | 115 +++++-- + tools/net/sunrpc/xdrgen/grammars/xdr.lark | 10 +- + tools/net/sunrpc/xdrgen/subcmds/declarations.py | 28 +- + tools/net/sunrpc/xdrgen/subcmds/definitions.py | 31 +- + tools/net/sunrpc/xdrgen/subcmds/lint.py | 25 +- + tools/net/sunrpc/xdrgen/subcmds/source.py | 51 ++- + .../xdrgen/templates/C/enum/declaration/enum.j2 | 1 - + .../sunrpc/xdrgen/templates/C/enum/decoder/enum.j2 | 11 + + .../xdrgen/templates/C/enum/decoder/enum_be.j2 | 20 ++ + .../xdrgen/templates/C/enum/definition/close.j2 | 1 + + .../xdrgen/templates/C/enum/definition/close_be.j2 | 1 + + .../xdrgen/templates/C/passthru/definition.j2 | 3 + + .../sunrpc/xdrgen/templates/C/passthru/source.j2 | 3 + + .../xdrgen/templates/C/program/decoder/argument.j2 | 4 + + .../templates/C/program/definition/program.j2 | 5 + + .../xdrgen/templates/C/program/encoder/result.j2 | 6 + + .../xdrgen/templates/C/program/maxsize/max_args.j2 | 3 + + .../sunrpc/xdrgen/templates/C/source_top/client.j2 | 1 - + .../xdrgen/templates/C/union/decoder/bool_spec.j2 | 7 + + .../xdrgen/templates/C/union/definition/close.j2 | 1 + + .../xdrgen/templates/C/union/encoder/bool_spec.j2 | 7 + + tools/net/sunrpc/xdrgen/xdr_ast.py | 49 ++- + tools/net/sunrpc/xdrgen/xdr_parse.py | 138 ++++++++ + tools/net/sunrpc/xdrgen/xdrgen | 8 +- + 68 files changed, 2267 insertions(+), 372 deletions(-) + create mode 100644 tools/net/sunrpc/xdrgen/generators/passthru.py + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/passthru/definition.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/passthru/source.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/definition/program.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/maxsize/max_args.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/bool_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/bool_spec.j2 +Merging ntfs3/master (b2bc7c44ed177 fs/ntfs3: Fix slab-out-of-bounds read in DeleteIndexEntryRoot) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 81 +++--- + fs/ntfs3/attrlist.c | 9 + + fs/ntfs3/bitmap.c | 17 ++ + fs/ntfs3/dir.c | 108 +++++--- + fs/ntfs3/file.c | 439 +++++++++++++++++------------- + fs/ntfs3/frecord.c | 318 ++++++++++------------ + fs/ntfs3/fslog.c | 65 +++-- + fs/ntfs3/fsntfs.c | 53 ++-- + fs/ntfs3/index.c | 26 +- + fs/ntfs3/inode.c | 769 ++++++++++++++++++++++++++-------------------------- + fs/ntfs3/ntfs.h | 1 + + fs/ntfs3/ntfs_fs.h | 64 +++-- + fs/ntfs3/run.c | 13 +- + fs/ntfs3/super.c | 24 +- + 14 files changed, 1059 insertions(+), 928 deletions(-) +$ git am -3 ../patches/0001-ntfs3-Fix-merge-issue-with-ntfs3.patch +Applying: ntfs3: Fix merge issue with ntfs3 +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ntfs3/inode.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[fs-next c29f54ba0bd6b] Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git + Date: Thu Feb 5 11:30:31 2026 +0000 +Merging orangefs/for-next (9e835108a9ae1 fs/orangefs: Replace deprecated strcpy with memcpy + strscpy) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git orangefs/for-next +Merge made by the 'ort' strategy. + fs/orangefs/orangefs-debugfs.c | 36 +++++++++++++++++++----------------- + fs/orangefs/xattr.c | 12 ++++++------ + 2 files changed, 25 insertions(+), 23 deletions(-) +Merging overlayfs/overlayfs-next (ad1423922781e ovl: make sure that ovl_create_real() returns a hashed dentry) +$ git merge -m Merge branch 'overlayfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (0695aef23d674 ubifs: vmalloc(array_size()) -> vmalloc_array()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (ce8ded2e61f47 9p/xen: protect xen_9pfs_front_free against concurrent calls) +$ git merge -m Merge branch '9p-next' of https://github.com/martinetd/linux v9fs/9p-next +Merge made by the 'ort' strategy. + include/linux/wait.h | 15 ++++++++++ + net/9p/client.c | 4 +-- + net/9p/trans_virtio.c | 14 ++++----- + net/9p/trans_xen.c | 83 ++++++++++++++++++++++++++------------------------- + 4 files changed, 67 insertions(+), 49 deletions(-) +Merging v9fs-ericvh/ericvh/for-next (2014c95afecee Linux 6.14-rc1) +$ git merge -m Merge branch 'ericvh/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (e33839b514a8a xfs: add sysfs stats for zoned GC) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/erofs/internal.h +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/super.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/xfs.rst | 8 + + arch/alpha/include/uapi/asm/errno.h | 2 + + arch/mips/include/uapi/asm/errno.h | 2 + + arch/parisc/include/uapi/asm/errno.h | 2 + + arch/sparc/include/uapi/asm/errno.h | 2 + + block/bio.c | 34 + + fs/Makefile | 2 +- + fs/erofs/internal.h | 2 - + fs/ext2/ext2.h | 1 - + fs/ext4/ext4.h | 3 - + fs/ext4/ioctl.c | 2 + + fs/ext4/super.c | 13 +- + fs/f2fs/f2fs.h | 3 - + fs/fserror.c | 194 +++++ + fs/iomap/buffered-io.c | 23 +- + fs/iomap/direct-io.c | 12 + + fs/iomap/ioend.c | 6 + + fs/minix/minix.h | 2 - + fs/super.c | 3 + + fs/udf/udf_sb.h | 2 - + fs/xfs/Makefile | 2 + + fs/xfs/libxfs/xfs_ag.c | 2 +- + fs/xfs/libxfs/xfs_ag_resv.c | 2 +- + fs/xfs/libxfs/xfs_alloc.c | 10 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 2 +- + fs/xfs/libxfs/xfs_attr.c | 191 +++-- + fs/xfs/libxfs/xfs_attr.h | 6 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 197 ++++- + fs/xfs/libxfs/xfs_attr_leaf.h | 1 + + fs/xfs/libxfs/xfs_attr_remote.c | 2 +- + fs/xfs/libxfs/xfs_bit.c | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 2 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 2 +- + fs/xfs/libxfs/xfs_btree.c | 2 +- + fs/xfs/libxfs/xfs_btree_mem.c | 2 +- + fs/xfs/libxfs/xfs_btree_staging.c | 2 +- + fs/xfs/libxfs/xfs_da_btree.c | 2 +- + fs/xfs/libxfs/xfs_da_format.h | 2 +- + fs/xfs/libxfs/xfs_defer.c | 4 +- + fs/xfs/libxfs/xfs_dir2.c | 2 +- + fs/xfs/libxfs/xfs_dir2_block.c | 2 +- + fs/xfs/libxfs/xfs_dir2_data.c | 2 +- + fs/xfs/libxfs/xfs_dir2_leaf.c | 2 +- + fs/xfs/libxfs/xfs_dir2_node.c | 2 +- + fs/xfs/libxfs/xfs_dir2_sf.c | 2 +- + fs/xfs/libxfs/xfs_dquot_buf.c | 2 +- + fs/xfs/libxfs/xfs_errortag.h | 8 +- + fs/xfs/libxfs/xfs_exchmaps.c | 2 +- + fs/xfs/libxfs/xfs_fs.h | 189 +++++ + fs/xfs/libxfs/xfs_group.c | 2 +- + fs/xfs/libxfs/xfs_health.h | 5 + + fs/xfs/libxfs/xfs_ialloc.c | 2 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 2 +- + fs/xfs/libxfs/xfs_iext_tree.c | 2 +- + fs/xfs/libxfs/xfs_inode_buf.c | 2 +- + fs/xfs/libxfs/xfs_inode_fork.c | 2 +- + fs/xfs/libxfs/xfs_inode_util.c | 2 +- + fs/xfs/libxfs/xfs_log_format.h | 7 - + fs/xfs/libxfs/xfs_log_rlimit.c | 2 +- + fs/xfs/libxfs/xfs_metadir.c | 2 +- + fs/xfs/libxfs/xfs_metafile.c | 2 +- + fs/xfs/libxfs/xfs_parent.c | 16 +- + fs/xfs/libxfs/xfs_refcount.c | 2 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 2 +- + fs/xfs/libxfs/xfs_rmap.c | 2 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 2 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 2 +- + fs/xfs/libxfs/xfs_rtgroup.c | 2 +- + fs/xfs/libxfs/xfs_rtgroup.h | 15 + + fs/xfs/libxfs/xfs_rtrefcount_btree.c | 2 +- + fs/xfs/libxfs/xfs_rtrmap_btree.c | 2 +- + fs/xfs/libxfs/xfs_sb.c | 2 +- + fs/xfs/libxfs/xfs_symlink_remote.c | 2 +- + fs/xfs/libxfs/xfs_trans_inode.c | 2 +- + fs/xfs/libxfs/xfs_trans_resv.c | 2 +- + fs/xfs/libxfs/xfs_trans_space.c | 2 +- + fs/xfs/libxfs/xfs_types.c | 2 +- + fs/xfs/libxfs/xfs_zones.c | 151 +--- + fs/xfs/libxfs/xfs_zones.h | 6 +- + fs/xfs/scrub/agb_bitmap.c | 2 +- + fs/xfs/scrub/agheader.c | 2 +- + fs/xfs/scrub/agheader_repair.c | 23 +- + fs/xfs/scrub/alloc.c | 2 +- + fs/xfs/scrub/alloc_repair.c | 22 +- + fs/xfs/scrub/attr.c | 61 +- + fs/xfs/scrub/attr_repair.c | 28 +- + fs/xfs/scrub/bitmap.c | 2 +- + fs/xfs/scrub/bmap.c | 2 +- + fs/xfs/scrub/bmap_repair.c | 8 +- + fs/xfs/scrub/btree.c | 11 +- + fs/xfs/scrub/common.c | 9 +- + fs/xfs/scrub/common.h | 25 - + fs/xfs/scrub/cow_repair.c | 2 +- + fs/xfs/scrub/dabtree.c | 4 +- + fs/xfs/scrub/dir.c | 15 +- + fs/xfs/scrub/dir_repair.c | 21 +- + fs/xfs/scrub/dirtree.c | 21 +- + fs/xfs/scrub/dirtree_repair.c | 2 +- + fs/xfs/scrub/dqiterate.c | 2 +- + fs/xfs/scrub/findparent.c | 2 +- + fs/xfs/scrub/fscounters.c | 2 +- + fs/xfs/scrub/fscounters_repair.c | 2 +- + fs/xfs/scrub/health.c | 2 +- + fs/xfs/scrub/ialloc.c | 2 +- + fs/xfs/scrub/ialloc_repair.c | 27 +- + fs/xfs/scrub/inode.c | 2 +- + fs/xfs/scrub/inode_repair.c | 2 +- + fs/xfs/scrub/iscan.c | 2 +- + fs/xfs/scrub/listxattr.c | 2 +- + fs/xfs/scrub/metapath.c | 2 +- + fs/xfs/scrub/newbt.c | 2 +- + fs/xfs/scrub/nlinks.c | 11 +- + fs/xfs/scrub/nlinks_repair.c | 2 +- + fs/xfs/scrub/orphanage.c | 2 +- + fs/xfs/scrub/parent.c | 13 +- + fs/xfs/scrub/parent_repair.c | 25 +- + fs/xfs/scrub/quota.c | 2 +- + fs/xfs/scrub/quota_repair.c | 2 +- + fs/xfs/scrub/quotacheck.c | 15 +- + fs/xfs/scrub/quotacheck_repair.c | 2 +- + fs/xfs/scrub/rcbag.c | 2 +- + fs/xfs/scrub/rcbag_btree.c | 2 +- + fs/xfs/scrub/readdir.c | 2 +- + fs/xfs/scrub/reap.c | 2 +- + fs/xfs/scrub/refcount.c | 2 +- + fs/xfs/scrub/refcount_repair.c | 15 +- + fs/xfs/scrub/repair.c | 5 +- + fs/xfs/scrub/rgsuper.c | 2 +- + fs/xfs/scrub/rmap.c | 2 +- + fs/xfs/scrub/rmap_repair.c | 7 +- + fs/xfs/scrub/rtbitmap.c | 2 +- + fs/xfs/scrub/rtbitmap_repair.c | 8 +- + fs/xfs/scrub/rtrefcount.c | 2 +- + fs/xfs/scrub/rtrefcount_repair.c | 17 +- + fs/xfs/scrub/rtrmap.c | 2 +- + fs/xfs/scrub/rtrmap_repair.c | 7 +- + fs/xfs/scrub/rtsummary.c | 9 +- + fs/xfs/scrub/rtsummary_repair.c | 2 +- + fs/xfs/scrub/scrub.c | 4 +- + fs/xfs/scrub/stats.c | 2 +- + fs/xfs/scrub/symlink.c | 2 +- + fs/xfs/scrub/symlink_repair.c | 2 +- + fs/xfs/scrub/tempfile.c | 2 +- + fs/xfs/scrub/trace.c | 2 +- + fs/xfs/scrub/xfarray.c | 2 +- + fs/xfs/scrub/xfblob.c | 2 +- + fs/xfs/scrub/xfile.c | 2 +- + fs/xfs/xfs.h | 28 - + fs/xfs/xfs_acl.c | 2 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_attr_inactive.c | 2 +- + fs/xfs/xfs_attr_item.c | 29 +- + fs/xfs/xfs_attr_list.c | 2 +- + fs/xfs/xfs_bio_io.c | 2 +- + fs/xfs/xfs_bmap_item.c | 12 +- + fs/xfs/xfs_bmap_util.c | 2 +- + fs/xfs/xfs_buf.c | 2 +- + fs/xfs/xfs_buf_item.c | 21 +- + fs/xfs/xfs_buf_item_recover.c | 2 +- + fs/xfs/xfs_buf_mem.c | 2 +- + fs/xfs/xfs_dahash_test.c | 2 +- + fs/xfs/xfs_dir2_readdir.c | 2 +- + fs/xfs/xfs_discard.c | 2 +- + fs/xfs/xfs_dquot.c | 2 +- + fs/xfs/xfs_dquot_item.c | 11 +- + fs/xfs/xfs_dquot_item_recover.c | 2 +- + fs/xfs/xfs_drain.c | 2 +- + fs/xfs/xfs_error.c | 144 ++-- + fs/xfs/xfs_error.h | 23 +- + fs/xfs/xfs_exchmaps_item.c | 13 +- + fs/xfs/xfs_exchrange.c | 2 +- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_extent_busy.c | 2 +- + fs/xfs/xfs_extfree_item.c | 12 +- + fs/xfs/xfs_file.c | 2 +- + fs/xfs/xfs_filestream.c | 2 +- + fs/xfs/xfs_fsmap.c | 2 +- + fs/xfs/xfs_fsops.c | 8 +- + fs/xfs/xfs_globals.c | 2 +- + fs/xfs/xfs_handle.c | 2 +- + fs/xfs/xfs_health.c | 140 +++- + fs/xfs/xfs_healthmon.c | 1255 ++++++++++++++++++++++++++++ + fs/xfs/xfs_healthmon.h | 184 ++++ + fs/xfs/xfs_hooks.c | 2 +- + fs/xfs/xfs_icache.c | 2 +- + fs/xfs/xfs_icreate_item.c | 8 +- + fs/xfs/xfs_inode.c | 2 +- + fs/xfs/xfs_inode_item.c | 51 +- + fs/xfs/xfs_inode_item_recover.c | 2 +- + fs/xfs/xfs_ioctl.c | 9 +- + fs/xfs/xfs_ioctl32.c | 2 +- + fs/xfs/xfs_iomap.c | 2 +- + fs/xfs/xfs_iops.c | 2 +- + fs/xfs/xfs_itable.c | 2 +- + fs/xfs/xfs_iunlink_item.c | 2 +- + fs/xfs/xfs_iwalk.c | 2 +- + fs/xfs/xfs_log.c | 294 +++---- + fs/xfs/xfs_log.h | 65 +- + fs/xfs/xfs_log_cil.c | 113 ++- + fs/xfs/xfs_log_priv.h | 20 + + fs/xfs/xfs_log_recover.c | 29 +- + fs/xfs/xfs_message.c | 10 +- + fs/xfs/xfs_message.h | 2 - + fs/xfs/xfs_mount.c | 4 +- + fs/xfs/xfs_mount.h | 4 + + fs/xfs/xfs_mru_cache.c | 2 +- + fs/xfs/xfs_notify_failure.c | 23 +- + fs/xfs/{xfs_linux.h => xfs_platform.h} | 48 +- + fs/xfs/xfs_pnfs.c | 2 +- + fs/xfs/xfs_pwork.c | 2 +- + fs/xfs/xfs_qm.c | 2 +- + fs/xfs/xfs_qm_bhv.c | 2 +- + fs/xfs/xfs_qm_syscalls.c | 2 +- + fs/xfs/xfs_quotaops.c | 2 +- + fs/xfs/xfs_refcount_item.c | 12 +- + fs/xfs/xfs_reflink.c | 2 +- + fs/xfs/xfs_rmap_item.c | 12 +- + fs/xfs/xfs_rtalloc.c | 2 +- + fs/xfs/xfs_stats.c | 14 +- + fs/xfs/xfs_stats.h | 8 +- + fs/xfs/xfs_super.c | 38 +- + fs/xfs/xfs_symlink.c | 2 +- + fs/xfs/xfs_sysctl.c | 2 +- + fs/xfs/xfs_sysfs.c | 2 +- + fs/xfs/xfs_trace.c | 7 +- + fs/xfs/xfs_trace.h | 513 ++++++++++++ + fs/xfs/xfs_trans.c | 10 +- + fs/xfs/xfs_trans.h | 13 +- + fs/xfs/xfs_trans_ail.c | 2 +- + fs/xfs/xfs_trans_buf.c | 2 +- + fs/xfs/xfs_trans_dquot.c | 2 +- + fs/xfs/xfs_verify_media.c | 445 ++++++++++ + fs/xfs/xfs_verify_media.h | 13 + + fs/xfs/xfs_xattr.c | 2 +- + fs/xfs/xfs_zone_alloc.c | 220 ++--- + fs/xfs/xfs_zone_gc.c | 221 ++--- + fs/xfs/xfs_zone_info.c | 2 +- + fs/xfs/xfs_zone_priv.h | 1 - + fs/xfs/xfs_zone_space_resv.c | 2 +- + include/linux/bio.h | 1 + + include/linux/fs/super_types.h | 7 + + include/linux/fserror.h | 75 ++ + include/linux/jbd2.h | 3 - + include/uapi/asm-generic/errno.h | 2 + + tools/arch/alpha/include/uapi/asm/errno.h | 2 + + tools/arch/mips/include/uapi/asm/errno.h | 2 + + tools/arch/parisc/include/uapi/asm/errno.h | 2 + + tools/arch/sparc/include/uapi/asm/errno.h | 2 + + tools/include/uapi/asm-generic/errno.h | 2 + + 249 files changed, 4630 insertions(+), 1368 deletions(-) + create mode 100644 fs/fserror.c + delete mode 100644 fs/xfs/xfs.h + create mode 100644 fs/xfs/xfs_healthmon.c + create mode 100644 fs/xfs/xfs_healthmon.h + rename fs/xfs/{xfs_linux.h => xfs_platform.h} (95%) + create mode 100644 fs/xfs/xfs_verify_media.c + create mode 100644 fs/xfs/xfs_verify_media.h + create mode 100644 include/linux/fserror.h +Merging zonefs/for-next (a42938e80357a zonefs: correct some spelling mistakes) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging vfs-brauner/vfs.all (958ee0914bcda Merge branch 'vfs-7.0.minix' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging MAINTAINERS +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/buffer.c +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/erofs/data.c +Auto-merging fs/exfat/file.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/file_table.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/inode.c +Auto-merging fs/jfs/namei.c +Auto-merging fs/locks.c +Auto-merging fs/nfsd/nfs4proc.c +Auto-merging fs/ntfs3/dir.c +Auto-merging fs/ntfs3/file.c +CONFLICT (content): Merge conflict in fs/ntfs3/file.c +Auto-merging fs/smb/client/cifsfs.c +Auto-merging fs/verity/enable.c +Auto-merging fs/verity/fsverity_private.h +Auto-merging fs/verity/verify.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging mm/shmem.c +Resolved 'fs/ntfs3/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 62541f574c983] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 12 +- + Documentation/admin-guide/sysctl/kernel.rst | 6 - + Documentation/filesystems/fsverity.rst | 16 + + Documentation/filesystems/locking.rst | 13 +- + Documentation/filesystems/mount_api.rst | 2 - + Documentation/filesystems/nfs/exporting.rst | 40 +- + Documentation/filesystems/porting.rst | 16 +- + .../filesystems/ramfs-rootfs-initramfs.rst | 24 +- + Documentation/filesystems/vfs.rst | 76 +- + MAINTAINERS | 1 + + arch/arm/configs/neponset_defconfig | 2 +- + fs/9p/acl.c | 16 +- + fs/9p/vfs_dir.c | 2 - + fs/9p/vfs_file.c | 2 - + fs/Makefile | 2 +- + fs/affs/dir.c | 2 + + fs/affs/file.c | 2 + + fs/bad_inode.c | 3 +- + fs/befs/linuxvfs.c | 2 + + fs/btrfs/acl.c | 10 +- + fs/btrfs/file.c | 2 + + fs/btrfs/inode.c | 15 +- + fs/btrfs/ioctl.c | 73 +- + fs/buffer.c | 6 +- + fs/ceph/acl.c | 50 +- + fs/ceph/dir.c | 2 - + fs/ceph/file.c | 1 - + fs/char_dev.c | 19 +- + fs/cramfs/inode.c | 2 + + fs/crypto/fname.c | 2 +- + fs/dcache.c | 15 +- + fs/ecryptfs/crypto.c | 2 +- + fs/efs/dir.c | 2 + + fs/erofs/data.c | 2 + + fs/erofs/dir.c | 2 + + fs/exec.c | 2 +- + fs/exfat/dir.c | 2 + + fs/exfat/file.c | 2 + + fs/exportfs/expfs.c | 3 +- + fs/ext2/dir.c | 2 + + fs/ext2/file.c | 2 + + fs/ext4/dir.c | 2 + + fs/ext4/file.c | 2 + + fs/ext4/mballoc.c | 3 +- + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 2 +- + fs/f2fs/dir.c | 4 +- + fs/f2fs/file.c | 2 + + fs/f2fs/hash.c | 2 +- + fs/fat/dir.c | 8 +- + fs/fat/fat.h | 11 +- + fs/fat/file.c | 19 +- + fs/fat/inode.c | 2 +- + fs/fat/misc.c | 59 +- + fs/fat/namei_msdos.c | 13 +- + fs/fat/namei_vfat.c | 9 +- + fs/file.c | 10 +- + fs/file_attr.c | 10 +- + fs/file_table.c | 10 +- + fs/freevxfs/vxfs_lookup.c | 2 + + fs/fs-writeback.c | 33 +- + fs/fs_context.c | 208 +--- + fs/fs_struct.c | 1 + + fs/fsopen.c | 10 - + fs/fuse/acl.c | 12 +- + fs/fuse/dev.c | 2 +- + fs/fuse/dir.c | 1 - + fs/fuse/file.c | 9 +- + fs/gfs2/acl.c | 13 +- + fs/gfs2/file.c | 3 +- + fs/gfs2/inode.c | 9 +- + fs/init.c | 17 + + fs/inode.c | 307 +++--- + fs/internal.h | 6 +- + fs/iomap/buffered-io.c | 51 +- + fs/isofs/dir.c | 2 + + fs/jffs2/dir.c | 2 + + fs/jffs2/file.c | 2 + + fs/jfs/acl.c | 9 +- + fs/jfs/file.c | 2 + + fs/jfs/namei.c | 2 + + fs/libfs.c | 20 +- + fs/locks.c | 17 +- + fs/minix/inode.c | 50 +- + fs/mount.h | 1 + + fs/namei.c | 126 ++- + fs/namespace.c | 462 +++++--- + fs/nfs/dir.c | 1 - + fs/nfs/file.c | 1 - + fs/nfs/inode.c | 37 +- + fs/nfsd/export.c | 8 +- + fs/nfsd/nfs4proc.c | 11 +- + fs/nilfs2/dir.c | 3 +- + fs/nilfs2/file.c | 2 + + fs/nsfs.c | 13 + + fs/ntfs3/dir.c | 3 + + fs/ntfs3/file.c | 3 + + fs/ntfs3/xattr.c | 6 +- + fs/nullfs.c | 70 ++ + fs/ocfs2/file.c | 5 + + fs/open.c | 39 - + fs/orangefs/acl.c | 8 +- + fs/orangefs/dir.c | 4 +- + fs/orangefs/file.c | 1 + + fs/orangefs/inode.c | 29 +- + fs/orangefs/orangefs-kernel.h | 3 +- + fs/overlayfs/file.c | 2 + + fs/overlayfs/inode.c | 7 +- + fs/overlayfs/overlayfs.h | 3 +- + fs/overlayfs/readdir.c | 43 +- + fs/posix_acl.c | 21 +- + fs/qnx4/dir.c | 2 + + fs/qnx6/dir.c | 2 + + fs/read_write.c | 2 + + fs/select.c | 12 +- + fs/smb/client/cifsfs.c | 1 - + fs/smb/server/vfs.c | 2 +- + fs/splice.c | 2 +- + fs/squashfs/dir.c | 2 + + fs/squashfs/file.c | 4 +- + fs/sync.c | 4 +- + fs/ubifs/file.c | 28 +- + fs/ubifs/ubifs.h | 3 +- + fs/udf/dir.c | 2 + + fs/udf/file.c | 2 + + fs/ufs/dir.c | 2 + + fs/ufs/file.c | 2 + + fs/vboxsf/dir.c | 1 - + fs/vboxsf/file.c | 1 - + fs/verity/enable.c | 4 + + fs/verity/fsverity_private.h | 2 + + fs/verity/init.c | 1 + + fs/verity/verify.c | 9 + + fs/xfs/xfs_file.c | 3 + + fs/xfs/xfs_iops.c | 49 +- + fs/xfs/xfs_super.c | 29 - + include/linux/device_cgroup.h | 2 +- + include/linux/exportfs.h | 56 +- + include/linux/fileattr.h | 6 +- + include/linux/filelock.h | 18 +- + include/linux/fs.h | 55 +- + include/linux/fs/super_types.h | 1 - + include/linux/init_syscalls.h | 1 + + include/linux/initrd.h | 2 - + include/linux/ns/ns_common_types.h | 4 +- + include/linux/posix_acl_xattr.h | 5 +- + include/linux/restart_block.h | 4 +- + include/trace/events/fsverity.h | 146 +++ + include/trace/events/writeback.h | 6 - + include/uapi/linux/fs.h | 1 + + include/uapi/linux/magic.h | 1 + + include/uapi/linux/mount.h | 14 +- + include/uapi/linux/sysctl.h | 1 - + init/Kconfig | 7 +- + init/do_mounts.c | 23 +- + init/do_mounts.h | 18 +- + init/do_mounts_initrd.c | 107 +- + init/do_mounts_rd.c | 24 +- + init/initramfs_test.c | 48 + + kernel/pid.c | 131 ++- + mm/shmem.c | 2 + + rust/helpers/fs.c | 2 +- + rust/helpers/pid_namespace.c | 8 +- + rust/helpers/poll.c | 5 +- + rust/kernel/seq_file.rs | 4 +- + tools/include/uapi/linux/mount.h | 14 +- + .../selftests/filesystems/fsmount_ns/.gitignore | 1 + + .../selftests/filesystems/fsmount_ns/Makefile | 10 + + .../filesystems/fsmount_ns/fsmount_ns_test.c | 1138 ++++++++++++++++++++ + .../selftests/filesystems/open_tree_ns/.gitignore | 1 + + .../selftests/filesystems/open_tree_ns/Makefile | 10 + + .../filesystems/open_tree_ns/open_tree_ns_test.c | 1007 +++++++++++++++++ + .../selftests/filesystems/statmount/statmount.h | 42 +- + .../filesystems/statmount/statmount_test.c | 261 ++++- + .../filesystems/statmount/statmount_test_ns.c | 101 +- + tools/testing/selftests/filesystems/utils.c | 26 + + tools/testing/selftests/filesystems/utils.h | 1 + + 177 files changed, 4328 insertions(+), 1486 deletions(-) + create mode 100644 fs/nullfs.c + create mode 100644 include/trace/events/fsverity.h + create mode 100644 tools/testing/selftests/filesystems/fsmount_ns/.gitignore + create mode 100644 tools/testing/selftests/filesystems/fsmount_ns/Makefile + create mode 100644 tools/testing/selftests/filesystems/fsmount_ns/fsmount_ns_test.c + create mode 100644 tools/testing/selftests/filesystems/open_tree_ns/.gitignore + create mode 100644 tools/testing/selftests/filesystems/open_tree_ns/Makefile + create mode 100644 tools/testing/selftests/filesystems/open_tree_ns/open_tree_ns_test.c +$ git reset --hard HEAD^ +HEAD is now at 9d750e87504b5 Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git +Merging next-20260126 version of vfs-brauner +$ git merge -m next-20260126/vfs-brauner f77e21ac4082da5b04ed8eeccaa3ebfc5cd2dbc4 +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/buffer.c +Auto-merging fs/erofs/data.c +Auto-merging fs/exfat/file.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/file_table.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/fuse/file.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/inode.c +Auto-merging fs/jfs/namei.c +Auto-merging fs/locks.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfsd/nfs4proc.c +Auto-merging fs/ntfs3/dir.c +Auto-merging fs/ntfs3/file.c +CONFLICT (content): Merge conflict in fs/ntfs3/file.c +Auto-merging fs/smb/client/cifsfs.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging mm/shmem.c +Resolved 'fs/ntfs3/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 7a7f92cfb0f2d] next-20260126/vfs-brauner +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 12 +- + Documentation/admin-guide/sysctl/kernel.rst | 6 - + Documentation/filesystems/locking.rst | 13 +- + Documentation/filesystems/mount_api.rst | 2 - + Documentation/filesystems/nfs/exporting.rst | 40 +- + Documentation/filesystems/porting.rst | 16 +- + .../filesystems/ramfs-rootfs-initramfs.rst | 24 +- + Documentation/filesystems/vfs.rst | 76 +- + arch/arm/configs/neponset_defconfig | 2 +- + fs/9p/acl.c | 16 +- + fs/9p/vfs_dir.c | 2 - + fs/9p/vfs_file.c | 2 - + fs/Makefile | 2 +- + fs/affs/dir.c | 2 + + fs/affs/file.c | 2 + + fs/bad_inode.c | 3 +- + fs/befs/linuxvfs.c | 2 + + fs/btrfs/acl.c | 10 +- + fs/btrfs/file.c | 2 + + fs/btrfs/inode.c | 15 +- + fs/btrfs/ioctl.c | 73 +- + fs/buffer.c | 6 +- + fs/ceph/acl.c | 50 +- + fs/ceph/dir.c | 2 - + fs/ceph/file.c | 1 - + fs/char_dev.c | 19 +- + fs/cramfs/inode.c | 2 + + fs/dcache.c | 5 +- + fs/efs/dir.c | 2 + + fs/erofs/data.c | 2 + + fs/erofs/dir.c | 2 + + fs/exec.c | 2 +- + fs/exfat/dir.c | 2 + + fs/exfat/file.c | 2 + + fs/ext2/dir.c | 2 + + fs/ext2/file.c | 2 + + fs/ext4/dir.c | 2 + + fs/ext4/file.c | 2 + + fs/ext4/mballoc.c | 3 +- + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 2 +- + fs/f2fs/dir.c | 2 + + fs/f2fs/file.c | 2 + + fs/fat/dir.c | 8 +- + fs/fat/fat.h | 11 +- + fs/fat/file.c | 19 +- + fs/fat/inode.c | 2 +- + fs/fat/misc.c | 59 +- + fs/fat/namei_msdos.c | 13 +- + fs/fat/namei_vfat.c | 9 +- + fs/file_table.c | 10 +- + fs/freevxfs/vxfs_lookup.c | 2 + + fs/fs-writeback.c | 33 +- + fs/fs_context.c | 208 +--- + fs/fs_struct.c | 1 + + fs/fsopen.c | 10 - + fs/fuse/acl.c | 12 +- + fs/fuse/dev.c | 2 +- + fs/fuse/dir.c | 1 - + fs/fuse/file.c | 9 +- + fs/gfs2/acl.c | 13 +- + fs/gfs2/file.c | 3 +- + fs/gfs2/inode.c | 9 +- + fs/init.c | 17 + + fs/inode.c | 307 +++--- + fs/internal.h | 6 +- + fs/isofs/dir.c | 2 + + fs/jffs2/dir.c | 2 + + fs/jffs2/file.c | 2 + + fs/jfs/acl.c | 9 +- + fs/jfs/file.c | 2 + + fs/jfs/namei.c | 2 + + fs/libfs.c | 20 +- + fs/locks.c | 17 +- + fs/minix/inode.c | 50 +- + fs/mount.h | 1 + + fs/namei.c | 124 ++- + fs/namespace.c | 434 ++++++--- + fs/nfs/dir.c | 1 - + fs/nfs/file.c | 1 - + fs/nfs/inode.c | 37 +- + fs/nfsd/nfs4proc.c | 11 +- + fs/nilfs2/dir.c | 3 +- + fs/nilfs2/file.c | 2 + + fs/nsfs.c | 13 + + fs/ntfs3/dir.c | 3 + + fs/ntfs3/file.c | 3 + + fs/ntfs3/xattr.c | 6 +- + fs/nullfs.c | 70 ++ + fs/ocfs2/file.c | 5 + + fs/open.c | 39 - + fs/orangefs/acl.c | 8 +- + fs/orangefs/dir.c | 4 +- + fs/orangefs/file.c | 1 + + fs/orangefs/inode.c | 29 +- + fs/orangefs/orangefs-kernel.h | 3 +- + fs/overlayfs/file.c | 2 + + fs/overlayfs/inode.c | 7 +- + fs/overlayfs/overlayfs.h | 3 +- + fs/overlayfs/readdir.c | 2 + + fs/posix_acl.c | 21 +- + fs/qnx4/dir.c | 2 + + fs/qnx6/dir.c | 2 + + fs/read_write.c | 2 + + fs/select.c | 12 +- + fs/smb/client/cifsfs.c | 1 - + fs/splice.c | 2 +- + fs/squashfs/dir.c | 2 + + fs/squashfs/file.c | 4 +- + fs/sync.c | 4 +- + fs/ubifs/file.c | 28 +- + fs/ubifs/ubifs.h | 3 +- + fs/udf/dir.c | 2 + + fs/udf/file.c | 2 + + fs/ufs/dir.c | 2 + + fs/ufs/file.c | 2 + + fs/vboxsf/dir.c | 1 - + fs/vboxsf/file.c | 1 - + fs/xfs/xfs_file.c | 3 + + fs/xfs/xfs_iops.c | 49 +- + fs/xfs/xfs_super.c | 29 - + include/linux/device_cgroup.h | 2 +- + include/linux/exportfs.h | 33 +- + include/linux/filelock.h | 18 +- + include/linux/fs.h | 41 +- + include/linux/fs/super_types.h | 1 - + include/linux/init_syscalls.h | 1 + + include/linux/initrd.h | 2 - + include/linux/ns/ns_common_types.h | 4 +- + include/linux/posix_acl_xattr.h | 5 +- + include/linux/restart_block.h | 4 +- + include/trace/events/writeback.h | 6 - + include/uapi/linux/magic.h | 1 + + include/uapi/linux/mount.h | 13 +- + include/uapi/linux/sysctl.h | 1 - + init/Kconfig | 7 +- + init/do_mounts.c | 23 +- + init/do_mounts.h | 18 +- + init/do_mounts_initrd.c | 107 +- + init/do_mounts_rd.c | 24 +- + init/initramfs_test.c | 48 + + kernel/pid.c | 131 ++- + mm/shmem.c | 2 + + rust/helpers/fs.c | 2 +- + rust/helpers/pid_namespace.c | 8 +- + rust/helpers/poll.c | 5 +- + .../selftests/filesystems/open_tree_ns/.gitignore | 1 + + .../selftests/filesystems/open_tree_ns/Makefile | 10 + + .../filesystems/open_tree_ns/open_tree_ns_test.c | 1030 ++++++++++++++++++++ + .../selftests/filesystems/statmount/statmount.h | 15 +- + .../filesystems/statmount/statmount_test.c | 261 ++++- + .../filesystems/statmount/statmount_test_ns.c | 101 +- + tools/testing/selftests/filesystems/utils.c | 26 + + tools/testing/selftests/filesystems/utils.h | 1 + + 154 files changed, 2852 insertions(+), 1394 deletions(-) + create mode 100644 fs/nullfs.c + create mode 100644 tools/testing/selftests/filesystems/open_tree_ns/.gitignore + create mode 100644 tools/testing/selftests/filesystems/open_tree_ns/Makefile + create mode 100644 tools/testing/selftests/filesystems/open_tree_ns/open_tree_ns_test.c +Merging vfs/for-next (0787a93baa1aa sysfs(2): fs_index() argument is _not_ a pathname) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging Documentation/filesystems/porting.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst +Auto-merging fs/dcache.c +Auto-merging fs/exec.c +Auto-merging fs/fsopen.c +Auto-merging fs/init.c +Auto-merging fs/internal.h +Auto-merging fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/ntfs3/dir.c +CONFLICT (content): Merge conflict in fs/ntfs3/dir.c +Auto-merging fs/ntfs3/fsntfs.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/xattr.c +Auto-merging fs/open.c +Auto-merging fs/quota/quota.c +Auto-merging fs/smb/server/vfs.c +Auto-merging include/linux/fs.h +Resolved 'Documentation/filesystems/porting.rst' using previous resolution. +Resolved 'fs/ntfs3/dir.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 054a8722d6f75] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/porting.rst | 11 + + arch/alpha/kernel/osf_sys.c | 34 +-- + fs/coredump.c | 3 +- + fs/dcache.c | 8 +- + fs/exec.c | 178 +++++--------- + fs/fhandle.c | 5 +- + fs/file_attr.c | 12 +- + fs/filesystems.c | 9 +- + fs/fsopen.c | 6 +- + fs/init.c | 98 ++------ + fs/internal.h | 17 +- + fs/namei.c | 422 ++++++++++++++++++---------------- + fs/namespace.c | 22 +- + fs/ntfs3/dir.c | 5 +- + fs/ntfs3/fsntfs.c | 4 +- + fs/ntfs3/inode.c | 13 +- + fs/ntfs3/namei.c | 17 +- + fs/ntfs3/xattr.c | 5 +- + fs/open.c | 119 ++++------ + fs/quota/quota.c | 3 +- + fs/smb/server/vfs.c | 15 +- + fs/stat.c | 28 +-- + fs/statfs.c | 3 +- + fs/utimes.c | 8 +- + fs/xattr.c | 33 +-- + include/asm-generic/vmlinux.lds.h | 3 +- + include/linux/audit.h | 11 - + include/linux/fs.h | 41 ++-- + io_uring/fs.c | 106 +++++---- + io_uring/openclose.c | 26 +-- + io_uring/statx.c | 17 +- + io_uring/xattr.c | 30 +-- + ipc/mqueue.c | 11 +- + kernel/acct.c | 4 +- + kernel/auditsc.c | 29 +-- + mm/huge_memory.c | 15 +- + mm/swapfile.c | 21 +- + 37 files changed, 564 insertions(+), 828 deletions(-) +Merging mm-hotfixes/mm-hotfixes-unstable (5f591a22f86de mm/hugetlb: restore failed global reservations to subpool) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging .mailmap +Merge made by the 'ort' strategy. + .mailmap | 1 + + Documentation/admin-guide/kernel-parameters.txt | 5 +++ + arch/x86/include/asm/kfence.h | 7 +++-- + fs/proc/task_mmu.c | 42 ++++++++++++++++--------- + include/linux/buildid.h | 3 ++ + kernel/liveupdate/luo_file.c | 2 -- + lib/buildid.c | 42 ++++++++++++++++++------- + mm/hugetlb.c | 9 ++++++ + mm/shmem.c | 23 ++++++++------ + 9 files changed, 93 insertions(+), 41 deletions(-) +Merging fs-current (f737824cd61db Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. + drivers/android/binder/rust_binderfs.c | 9 +-- + drivers/usb/gadget/function/f_fs.c | 102 ++++++++++++++++----------------- + drivers/usb/gadget/function/u_fs.h | 2 +- + 3 files changed, 52 insertions(+), 61 deletions(-) +Merging kbuild-current/kbuild-fixes-for-next (8e24994872361 kbuild: Do not run kernel-doc when building external modules) +$ git merge -m Merge branch 'kbuild-fixes-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild-current/kbuild-fixes-for-next +Already up to date. +Merging arc-current/for-curr (d7b8f8e20813f Linux 6.16-rc5) +$ git merge -m Merge branch 'for-curr' of https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (23ea2a4c72323 ARM: 9468/1: fix memset64() on big-endian) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Merge made by the 'ort' strategy. + arch/arm/include/asm/string.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging arm64-fixes/for-next/fixes (e2f8216ca2d8e arm64: Set __nocfi on swsusp_arch_resume()) +$ git merge -m Merge branch 'for-next/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (c3cb2722e2896 Merge tag 'qcom-drivers-fixes-for-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging davinci-current/davinci/for-current (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'davinci/for-current' of https://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 (8f0b4cce4481f Linux 6.19-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 (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b428 Linux 6.15-rc1) +$ git merge -m Merge branch 'soc-fixes' of https://github.com/sophgo/linux.git sophgo-soc-fixes/soc-fixes +Already up to date. +Merging m68k-current/for-linus (aaf4e92341b08 m68k: defconfig: Update defconfigs for v6.18-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (9ace4753a5202 Linux 6.19-rc4) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (ddc6cbef3ef10 s390/boot/vmlinux.lds.S: Ensure bzImage ends with SecureBoot trailer) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging net/main (7d6ba706ae5ef Merge tag 'wireless-2026-02-04' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 12 ++ + drivers/net/ethernet/adi/adin1110.c | 3 + + drivers/net/ethernet/cavium/liquidio/lio_main.c | 39 ++--- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 4 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 10 ++ + drivers/net/ethernet/freescale/enetc/enetc.c | 11 +- + drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_cbdr.c | 4 - + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 17 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 77 ++++++--- + drivers/net/ethernet/google/gve/gve_main.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 1 - + drivers/net/ethernet/intel/ice/ice_main.c | 26 +-- + drivers/net/ethernet/intel/ice/ice_ptp.c | 179 +++++++++++++-------- + drivers/net/ethernet/intel/ice/ice_ptp.h | 18 ++- + drivers/net/ethernet/spacemit/k1_emac.c | 21 ++- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 +- + drivers/net/ethernet/ti/cpsw.c | 41 ++++- + drivers/net/ethernet/ti/cpsw_new.c | 34 +++- + drivers/net/ethernet/ti/cpsw_priv.h | 1 + + drivers/net/macvlan.c | 5 +- + drivers/net/phy/sfp.c | 2 + + drivers/net/usb/r8152.c | 29 ++-- + drivers/net/wireless/intel/iwlwifi/mld/iface.c | 2 - + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 6 +- + include/linux/skbuff.h | 12 ++ + net/core/filter.c | 8 +- + net/core/gro.c | 2 + + net/core/link_watch.c | 20 ++- + net/core/net-procfs.c | 50 ++++-- + net/ethtool/common.c | 3 - + net/ethtool/rss.c | 9 +- + net/sched/cls_u32.c | 13 +- + net/tipc/crypto.c | 4 +- + tools/testing/selftests/net/udpgro_fwd.sh | 64 ++++++++ + 36 files changed, 510 insertions(+), 232 deletions(-) +Merging bpf/master (63804fed149a6 Linux 6.19-rc7) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master +Already up to date. +Merging ipsec/master (0a4524bc69882 xfrm: skip templates check for packet offload tunnel mode) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/ipv6/xfrm6_policy.c | 7 +++++-- + net/xfrm/xfrm_policy.c | 11 +++++++++-- + 2 files changed, 14 insertions(+), 4 deletions(-) +Merging netfilter/main (7576bd9017e35 Merge branch 'net-cpsw-execute-ndo_set_rx_mode-callback-in-a-work-queue') +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (653267321f053 Merge branch 'net-netdevsim-fix-inconsistent-carrier-state-after-link-unlink') +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (7d6ba706ae5ef Merge tag 'wireless-2026-02-04' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging ath/for-current (1cac38910ecb8 Merge tag 'net-6.19-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Already up to date. +Merging iwlwifi/fixes (fb7f54aa2a99b wifi: iwlwifi: mvm: pause TCM on fast resume) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes +Already up to date. +Merging wpan/master (8ce4f287524c7 net: libwx: fix firmware mailbox abnormal return) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (4d310797262f0 Merge tag 'pm-6.19-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (51db05283f7c9 ALSA: hda/realtek: Enable headset mic for Acer Nitro 5) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/ti,tlv320aic3x.yaml | 1 + + drivers/firmware/cirrus/cs_dsp.c | 37 +++++++++++++ + drivers/firmware/cirrus/cs_dsp.h | 18 +++++++ + drivers/firmware/cirrus/test/cs_dsp_test_bin.c | 22 +++++++- + .../firmware/cirrus/test/cs_dsp_test_bin_error.c | 24 ++++++--- + drivers/firmware/cirrus/test/cs_dsp_test_wmfw.c | 26 ++++++++- + .../firmware/cirrus/test/cs_dsp_test_wmfw_error.c | 24 ++++++--- + drivers/firmware/cirrus/test/cs_dsp_tests.c | 1 + + sound/drivers/aloop.c | 62 +++++++++++++--------- + sound/hda/codecs/realtek/alc269.c | 1 + + sound/soc/amd/renoir/acp3x-pdm-dma.c | 2 + + sound/soc/amd/yc/acp6x-mach.c | 7 +++ + sound/soc/codecs/cs42l43-jack.c | 37 ++++++++++--- + sound/soc/codecs/rt1320-sdw.c | 2 + + sound/soc/fsl/fsl_xcvr.c | 3 ++ + sound/soc/intel/boards/sof_es8336.c | 9 ++++ + sound/soc/sof/intel/hda.c | 5 +- + sound/usb/mixer_quirks.c | 9 +--- + 18 files changed, 234 insertions(+), 56 deletions(-) + create mode 100644 drivers/firmware/cirrus/cs_dsp.h +Merging sound-asoc-fixes/for-linus (f514248727606 ASoC: fsl_xcvr: fix missing lock in fsl_xcvr_mode_put()) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Already up to date. +Merging regmap-fixes/for-linus (63804fed149a6 Linux 6.19-rc7) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (41399c5d47615 regulator: spacemit-p1: Fix n_voltages for BUCK and LDO regulators) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/spacemit-p1.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging spi-fixes/for-linus (41d9a6795b95d spi: tegra: Fix a memory leak in tegra_slink_probe()) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-tegra20-slink.c | 6 +++-- + drivers/spi/spi-tegra210-quad.c | 56 ++++++++++++++++++++++++++++++++++++++--- + 2 files changed, 56 insertions(+), 6 deletions(-) +Merging pci-current/for-linus (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (63804fed149a6 Linux 6.19-rc7) +$ git merge -m Merge branch 'driver-core-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (63804fed149a6 Linux 6.19-rc7) +$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (24d479d26b25b Linux 6.19-rc6) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (24d479d26b25b Linux 6.19-rc6) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (24d479d26b25b Linux 6.19-rc6) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'staging-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (88da5f4b46f55 Merge tag 'w1-drv-6.20' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1 into char-misc-linus) +$ git merge -m Merge branch 'fixes-togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Already up to date. +Merging counter-current/counter-current (9448598b22c50 Linux 6.19-rc2) +$ git merge -m Merge branch 'counter-current' of https://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 (ec4ddc90d201d binderfs: fix ida_alloc_max() upper bound) +$ git merge -m Merge branch 'char-misc-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Auto-merging drivers/android/binder/rust_binderfs.c +Merge made by the 'ort' strategy. + drivers/android/binder.c | 19 +++++- + drivers/android/binder/rust_binderfs.c | 8 +-- + drivers/android/binder/thread.rs | 109 +++++++++++++++++++++------------ + drivers/android/binderfs.c | 8 +-- + 4 files changed, 94 insertions(+), 50 deletions(-) +Merging soundwire-fixes/fixes (24d479d26b25b Linux 6.19-rc6) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (18f7fcd5e69a0 Linux 6.19-rc8) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (19a5d9ba6208e Input: i8042 - add quirks for MECHREVO Wujie 15X Pro) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (2397e9264676b crypto: authencesn - reject too-short AAD (assoclen<8) to match ESP/ESN spec) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging libcrypto-fixes/libcrypto-fixes (74d74bb78aecc lib/crypto: aes: Fix missing MMU protection for AES S-box) +$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Already up to date. +Merging vfio-fixes/for-linus (61ceaf236115f vfio: Prevent from pinned DMABUF importers to attach to VFIO DMABUF) +$ git merge -m Merge branch 'for-linus' of https://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (6e39903c73df0 selftests/tracing: Fix test_multiple_writes stall) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (24d479d26b25b Linux 6.19-rc6) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-backlight-fixes' of https://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 (2f6d2c8d9ac05 Revert "mtd: spinand: esmt: fix id code for F50D1G41LB") +$ git merge -m Merge branch 'mtd/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (aa6e63373d91f mfd: ls2kbmc: Use PCI API instead of direct accesses) +$ git merge -m Merge branch 'for-mfd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Merge made by the 'ort' strategy. + drivers/mfd/ls2k-bmc-core.c | 38 ++++++++++---------------------------- + 1 file changed, 10 insertions(+), 28 deletions(-) +Merging v4l-dvb-fixes/fixes (69d6c6fc79eb3 media: ov02c10: Remove unnecessary hflip and vflip pointers) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (997c06330fd5c reset: imx8mp-audiomix: Fix bad mask values) +$ 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 (63804fed149a6 Linux 6.19-rc7) +$ git merge -m Merge branch 'mips-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (94ad504e67cd3 ARM: dts: microchip: sama7d65: fix size-cells property for i2c3) +$ git merge -m Merge branch 'at91-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (0de4a0eec25b9 Merge tag 'kvm-x86-fixes-6.19-rc8' of https://github.com/kvm-x86/linux into HEAD) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (5f9df945d4e86 KVM: s390: Fix FOLL_*/FAULT_FLAG_* confusion) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (831a2b27914cc hwmon: (occ) Mark occ_init_attribute() as __printf) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/acpi_power_meter.c | 17 ++++++++++++++--- + drivers/hwmon/dell-smm-hwmon.c | 8 ++++++++ + drivers/hwmon/gpio-fan.c | 6 +++--- + drivers/hwmon/occ/common.c | 1 + + 4 files changed, 26 insertions(+), 6 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (d0b3b7b22dfa1 Linux 6.16-rc4) +$ git merge -m Merge branch 'libnvdimm-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (8441c7d3bd6c5 cxl: Check for invalid addresses returned from translation functions on errors) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/dma-mapping-fixes (c33efdfcfa6f8 dma: contiguous: Check return value of dma_contiguous_reserve_area()) +$ git merge -m Merge branch 'dma-mapping-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes +Merge made by the 'ort' strategy. + include/trace/events/dma.h | 25 +++++++++++++++++++------ + kernel/dma/contiguous.c | 10 ++++++---- + 2 files changed, 25 insertions(+), 10 deletions(-) +Merging drivers-x86-fixes/fixes (008bec8ffe6e7 platform/x86/intel/tpmi/plr: Make the file domain<n>/status writeable) +$ git merge -m Merge branch 'fixes' of https://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 (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (81122fba08fa3 of: fix reference count leak in of_alias_scan()) +$ git merge -m Merge branch 'dt/linus' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (0444568edbf87 scsi: ufs: amd-versal2: Fix PHY initialization in HCE enable notify) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (18f7fcd5e69a0 Linux 6.19-rc8) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (63804fed149a6 Linux 6.19-rc7) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (63804fed149a6 Linux 6.19-rc7) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (c6cf26c15ce7f rtc: interface: Alarm race handling should not discard preceding error) +$ git merge -m Merge branch 'rtc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Merge made by the 'ort' strategy. + drivers/rtc/interface.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging gnss-fixes/gnss-linus (0f61b1860cc3f Linux 6.19-rc5) +$ git merge -m Merge branch 'gnss-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (12ffd561d2de2 mshv: handle gpa intercepts for arm64) +$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging risc-v-fixes/fixes (0ea05c4f7527a riscv: compat: fix COMPAT_UTS_MACHINE definition) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging riscv-dt-fixes/riscv-dt-fixes (004c371d0bd14 riscv: dts: microchip: remove BeagleV Fire fabric.dtsi) +$ git merge -m Merge branch 'riscv-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Merge made by the 'ort' strategy. + .../dts/microchip/mpfs-beaglev-fire-fabric.dtsi | 82 ---------------------- + .../riscv/boot/dts/microchip/mpfs-beaglev-fire.dts | 5 -- + 2 files changed, 87 deletions(-) + delete mode 100644 arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi +Merging riscv-soc-fixes/riscv-soc-fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (c86d39d680547 kernel: debug: Add SPDX license ids to kdb files) +$ git merge -m Merge branch 'spdx-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Merge made by the 'ort' strategy. + include/linux/kdb.h | 5 +---- + include/linux/kgdb.h | 4 +--- + kernel/cpu.c | 3 +-- + kernel/debug/debug_core.h | 5 +---- + kernel/debug/kdb/kdb_bp.c | 5 +---- + kernel/debug/kdb/kdb_bt.c | 5 +---- + kernel/debug/kdb/kdb_debugger.c | 1 + + kernel/debug/kdb/kdb_io.c | 5 +---- + kernel/debug/kdb/kdb_keyboard.c | 4 +--- + kernel/debug/kdb/kdb_main.c | 5 +---- + kernel/debug/kdb/kdb_private.h | 1 + + kernel/debug/kdb/kdb_support.c | 5 +---- + kernel/relay.c | 3 +-- + 13 files changed, 13 insertions(+), 38 deletions(-) +Merging gpio-brgl-fixes/gpio/for-current (c62e0658d458d gpiolib: acpi: Fix gpio count with string references) +$ git merge -m Merge branch 'gpio/for-current' of https://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/gpiolib-acpi-core.c | 1 + + 1 file changed, 1 insertion(+) +Merging gpio-intel-fixes/fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://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 (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (9ace4753a5202 Linux 6.19-rc4) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (c33b68801fbe9 kunit: make FAULT_TEST default to n when PANIC_ON_OOPS) +$ git merge -m Merge branch 'kunit-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging memblock-fixes/fixes (be05f57146440 memblock test: include <linux/sizes.h> from tools mm.h stub) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Merge made by the 'ort' strategy. + tools/include/linux/mm.h | 1 + + 1 file changed, 1 insertion(+) +Merging renesas-fixes/fixes (379c590113ce4 ARM: shmobile: smp: Enforce shmobile_smp_* alignment) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf-tools (1eb217ab2e737 perf parse-events: Fix evsel allocation failure) +$ git merge -m Merge branch 'perf-tools' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (4b22ec1685ce1 efivarfs: fix error propagation in efivar_entry_get()) +$ git merge -m Merge branch 'urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging battery-fixes/fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (2724138b2f7f6 iommufd: Initialize batch->kind in batch_clear()) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (18f7fcd5e69a0 Linux 6.19-rc8) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging w1-fixes/fixes (cc8f92e41eb76 w1: fix redundant counter decrement in w1_attach_slave_device()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (e2c4c5b2bbd4f pmdomain: imx8mp-blk-ctrl: Keep usb phy power domain on for system wakeup) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pmdomain/imx/gpcv2.c | 8 ++------ + drivers/pmdomain/imx/imx8m-blk-ctrl.c | 2 +- + drivers/pmdomain/imx/imx8mp-blk-ctrl.c | 30 ++++++++++++++++++++++++++++++ + drivers/pmdomain/qcom/rpmpd.c | 2 +- + 4 files changed, 34 insertions(+), 8 deletions(-) +Merging i2c-host-fixes/i2c/i2c-host-fixes (b4b4d88ebfbfd i2c: imx-lpi2c: fix SMBus block read NACK after byte count) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-imx-lpi2c.c | 107 ++++++++++++++++++++++++++++--------- + drivers/i2c/busses/i2c-imx.c | 3 +- + 2 files changed, 85 insertions(+), 25 deletions(-) +Merging sparc-fixes/for-linus (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-linus' of https://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 (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Already up to date. +Merging thead-clk-fixes/thead-clk-fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'thead-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk-fixes/thead-clk-fixes +Already up to date. +Merging pwrseq-fixes/pwrseq/for-current (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'pwrseq/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current +Already up to date. +Merging thead-dt-fixes/thead-dt-fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt-fixes/thead-dt-fixes +Already up to date. +Merging ftrace-fixes/ftrace/fixes (1650a1b6cb1ae fgraph: Check ftrace_pids_enabled on registration for early filtering) +$ git merge -m Merge branch 'ftrace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes +Already up to date. +Merging ring-buffer-fixes/ring-buffer/fixes (b042fdf18e89a tracing: Fix WARN_ON in tracing_buffers_mmap_close for split VMAs) +$ git merge -m Merge branch 'ring-buffer/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ring-buffer-fixes/ring-buffer/fixes +Already up to date. +Merging trace-fixes/trace/fixes (361eb853c6552 scripts/tracepoint-update: Fix memory leak in add_string() on failure) +$ git merge -m Merge branch 'trace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes +Already up to date. +Merging tracefs-fixes/tracefs/fixes (8b55572e51805 tracing/selftests: Add tracefs mount options test) +$ git merge -m Merge branch 'tracefs/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes +Already up to date. +Merging spacemit-fixes/fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/spacemit-com/linux spacemit-fixes/fixes +Already up to date. +Merging tip-fixes/tip/urgent (cfa04369dc10c Merge branch into tip/master: 'sched/urgent') +$ git merge -m Merge branch 'tip/urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Merge made by the 'ort' strategy. + include/linux/rseq_types.h | 6 +- + kernel/sched/core.c | 184 +++++++++++++++++++++++++++++++-------------- + kernel/sched/sched.h | 44 ++++++++--- + 3 files changed, 163 insertions(+), 71 deletions(-) +Merging slab-fixes/slab/for-next-fixes (3a38d13f90d4e mm/slab: Add alloc_tagging_slab_free_hook for memcg_alloc_abort_single) +$ git merge -m Merge branch 'slab/for-next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes +Merge made by the 'ort' strategy. + mm/slub.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging drm-msm-fixes/msm-fixes (dedb897f11c5d drm/msm/a6xx: fix bogus hwcg register updates) +$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes +Already up to date. +Merging uml-fixes/fixes (df447a3b4a4b9 um: Fix FD copy size in os_rcv_fd_msg()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging fwctl-fixes/for-rc (f8f9c1f4d0c7a Linux 6.19-rc3) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl-fixes/for-rc +Already up to date. +Merging devsec-tsm-fixes/fixes (c201226304768 crypto/ccp: Allow multiple streams on the same root bridge) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm-fixes/fixes +Already up to date. +Merging drm-rust-fixes/drm-rust-fixes (0f61b1860cc3f Linux 6.19-rc5) +$ git merge -m Merge branch 'drm-rust-fixes' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-fixes/drm-rust-fixes +Already up to date. +Merging tenstorrent-dt-fixes/tenstorrent-dt-fixes (3a8660878839f Linux 6.18-rc1) +$ git merge -m Merge branch 'tenstorrent-dt-fixes' of https://github.com/tenstorrent/linux.git tenstorrent-dt-fixes/tenstorrent-dt-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (40b24d9cdd414 drm/bridge: imx8mp-hdmi-pai: enable PM runtime) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pai.c | 15 +++++++++ + drivers/gpu/drm/gma500/psb_irq.c | 36 ++++++++-------------- + drivers/gpu/drm/mgag200/mgag200_bmc.c | 31 ++++++++----------- + drivers/gpu/drm/mgag200/mgag200_drv.h | 6 ++++ + drivers/gpu/drm/nouveau/include/nvif/client.h | 2 +- + drivers/gpu/drm/nouveau/include/nvif/driver.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 3 +- + drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/core/object.h | 5 +-- + drivers/gpu/drm/nouveau/include/nvkm/core/oproxy.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h | 4 +-- + .../drm/nouveau/include/nvkm/core/suspend_state.h | 11 +++++++ + drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 6 ++++ + drivers/gpu/drm/nouveau/nouveau_display.c | 2 -- + drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_nvif.c | 10 ++++-- + drivers/gpu/drm/nouveau/nvif/client.c | 4 +-- + drivers/gpu/drm/nouveau/nvkm/core/engine.c | 4 +-- + drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | 4 +-- + drivers/gpu/drm/nouveau/nvkm/core/object.c | 20 +++++++++--- + drivers/gpu/drm/nouveau/nvkm/core/oproxy.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/core/subdev.c | 18 +++++++++-- + drivers/gpu/drm/nouveau/nvkm/core/uevent.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/ga100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 22 ++++++++++--- + drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c | 4 +-- + drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 4 +-- + drivers/gpu/drm/nouveau/nvkm/engine/disp/chan.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/falcon.c | 4 +-- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/uchan.c | 6 ++-- + drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c | 4 +-- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c | 4 +-- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/xtensa.c | 4 +-- + drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c | 4 +-- + drivers/gpu/drm/nouveau/nvkm/subdev/fault/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fault/user.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/gh100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/priv.h | 8 ++--- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fbsr.c | 2 +- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c | 8 ++--- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c | 6 ++++ + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/fbsr.c | 8 ++--- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/base.c | 6 ++-- + drivers/gpu/drm/nouveau/nvkm/subdev/timer/base.c | 2 +- + 67 files changed, 207 insertions(+), 138 deletions(-) + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/suspend_state.h +Merging rust/rust-next (b8d687c7eeb52 rust: safety: introduce `unsafe_precondition_assert!` macro) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging rust/Makefile +Auto-merging rust/kernel/i2c.rs +Auto-merging rust/kernel/rbtree.rs +Auto-merging rust/macros/fmt.rs +Auto-merging rust/macros/lib.rs +Auto-merging scripts/generate_rust_analyzer.py +CONFLICT (content): Merge conflict in scripts/generate_rust_analyzer.py +Auto-merging scripts/rustdoc_test_gen.rs +Resolved 'scripts/generate_rust_analyzer.py' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1762fdab5b32d] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 2 + + Documentation/process/programming-language.rst | 2 +- + Documentation/rust/index.rst | 18 - + MAINTAINERS | 27 +- + drivers/gpu/nova-core/firmware/fwsec.rs | 1 - + drivers/gpu/nova-core/firmware/gsp.rs | 12 +- + drivers/gpu/nova-core/firmware/riscv.rs | 2 - + drivers/gpu/nova-core/gsp/commands.rs | 6 +- + drivers/gpu/nova-core/gsp/sequencer.rs | 8 +- + drivers/gpu/nova-core/sbuffer.rs | 5 +- + rust/Makefile | 41 +- + rust/helpers/bug.c | 4 +- + rust/helpers/build_bug.c | 2 +- + rust/helpers/err.c | 6 +- + rust/helpers/maple_tree.c | 3 +- + rust/helpers/mm.c | 20 +- + rust/helpers/of.c | 2 +- + rust/helpers/page.c | 9 +- + rust/helpers/rbtree.c | 9 +- + rust/helpers/slab.c | 4 +- + rust/helpers/uaccess.c | 10 +- + rust/helpers/vmalloc.c | 2 +- + rust/helpers/workqueue.c | 8 +- + rust/helpers/xarray.c | 10 +- + rust/kernel/bug.rs | 20 +- + rust/kernel/build_assert.rs | 7 +- + rust/kernel/clk.rs | 8 +- + rust/kernel/debugfs/entry.rs | 2 +- + rust/kernel/i2c.rs | 8 +- + rust/kernel/impl_flags.rs | 272 ++++ + rust/kernel/init.rs | 40 +- + rust/kernel/kunit.rs | 39 +- + rust/kernel/lib.rs | 3 + + rust/kernel/print.rs | 153 +++ + rust/kernel/ptr.rs | 12 +- + rust/kernel/rbtree.rs | 27 +- + rust/kernel/safety.rs | 53 + + rust/kernel/transmute.rs | 8 + + rust/macros/concat_idents.rs | 39 +- + rust/macros/export.rs | 26 +- + rust/macros/fmt.rs | 4 +- + rust/macros/helpers.rs | 127 +- + rust/macros/kunit.rs | 273 ++-- + rust/macros/lib.rs | 43 +- + rust/macros/module.rs | 867 ++++++------ + rust/macros/paste.rs | 2 +- + rust/macros/quote.rs | 182 --- + rust/macros/vtable.rs | 175 +-- + rust/pin-init/README.md | 2 +- + rust/pin-init/examples/linked_list.rs | 19 +- + rust/pin-init/examples/pthread_mutex.rs | 10 +- + rust/pin-init/internal/src/diagnostics.rs | 30 + + rust/pin-init/internal/src/helpers.rs | 152 --- + rust/pin-init/internal/src/init.rs | 548 ++++++++ + rust/pin-init/internal/src/lib.rs | 48 +- + rust/pin-init/internal/src/pin_data.rs | 627 +++++++-- + rust/pin-init/internal/src/pinned_drop.rs | 88 +- + rust/pin-init/internal/src/zeroable.rs | 157 +-- + rust/pin-init/src/lib.rs | 200 +-- + rust/pin-init/src/macros.rs | 1677 ------------------------ + samples/rust/rust_driver_auxiliary.rs | 1 - + samples/rust/rust_driver_i2c.rs | 7 +- + samples/rust/rust_i2c_client.rs | 7 +- + samples/rust/rust_misc_device.rs | 2 - + samples/rust/rust_print_main.rs | 2 +- + scripts/generate_rust_analyzer.py | 2 +- + scripts/rustdoc_test_gen.rs | 4 +- + 67 files changed, 2758 insertions(+), 3428 deletions(-) + create mode 100644 rust/kernel/impl_flags.rs + create mode 100644 rust/kernel/safety.rs + delete mode 100644 rust/macros/quote.rs + create mode 100644 rust/pin-init/internal/src/diagnostics.rs + delete mode 100644 rust/pin-init/internal/src/helpers.rs + create mode 100644 rust/pin-init/internal/src/init.rs + delete mode 100644 rust/pin-init/src/macros.rs +Merging rust-alloc/alloc-next (f8f9c1f4d0c7a Linux 6.19-rc3) +$ git merge -m Merge branch 'alloc-next' of https://github.com/Rust-for-Linux/linux.git rust-alloc/alloc-next +Already up to date. +Merging rust-io/io-next (86731a2a651e5 Linux 6.16-rc3) +$ git merge -m Merge branch 'io-next' of https://github.com/Rust-for-Linux/linux.git rust-io/io-next +Already up to date. +Merging rust-pin-init/pin-init-next (aeb5ecad5316f rust: pin-init: Implement `InPlaceWrite<T>` for `&'static mut MaybeUninit<T>`) +$ git merge -m Merge branch 'pin-init-next' of https://github.com/Rust-for-Linux/linux.git rust-pin-init/pin-init-next +Already up to date. +Merging rust-timekeeping/timekeeping-next (4521438fb076f rust: time: Implement basic arithmetic operations for Delta) +$ git merge -m Merge branch 'timekeeping-next' of https://github.com/Rust-for-Linux/linux.git rust-timekeeping/timekeeping-next +Already up to date. +Merging rust-xarray/xarray-next (c455f19bbe610 rust: xarray: add __rust_helper to helpers) +$ git merge -m Merge branch 'xarray-next' of https://github.com/Rust-for-Linux/linux.git rust-xarray/xarray-next +Already up to date. +Merging rust-analyzer/rust-analyzer-next (18f7fcd5e69a0 Linux 6.19-rc8) +$ git merge -m Merge branch 'rust-analyzer-next' of https://github.com/Rust-for-Linux/linux.git rust-analyzer/rust-analyzer-next +Already up to date. +Merging mm-stable/mm-stable (50c7f34c5c740 mm, swap: remove no longer needed _swap_info_get) +$ git merge -m Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging Documentation/admin-guide/sysctl/vm.rst +Auto-merging MAINTAINERS +Auto-merging block/blk-mq.c +Auto-merging fs/proc/task_mmu.c +Auto-merging include/linux/cma.h +CONFLICT (content): Merge conflict in include/linux/cma.h +Auto-merging include/linux/sched.h +Auto-merging mm/hugetlb.c +Auto-merging mm/shmem.c +Auto-merging mm/slub.c +Resolved 'include/linux/cma.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d3ea84ae1f527] Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block-zram | 14 + + Documentation/ABI/testing/sysfs-kernel-mm-damon | 13 + + Documentation/admin-guide/blockdev/zram.rst | 24 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 5 +- + Documentation/admin-guide/laptops/index.rst | 1 - + Documentation/admin-guide/laptops/laptop-mode.rst | 770 --------------- + Documentation/admin-guide/mm/damon/lru_sort.rst | 37 + + Documentation/admin-guide/mm/damon/usage.rst | 19 +- + Documentation/admin-guide/mm/memory-hotplug.rst | 22 +- + Documentation/admin-guide/sysctl/vm.rst | 36 +- + Documentation/core-api/mm-api.rst | 2 +- + Documentation/driver-api/cxl/linux/early-boot.rst | 2 +- + Documentation/mm/damon/design.rst | 32 +- + Documentation/mm/damon/index.rst | 29 +- + Documentation/mm/damon/maintainer-profile.rst | 7 +- + Documentation/mm/memory-model.rst | 3 - + .../translations/zh_CN/mm/memory-model.rst | 2 - + MAINTAINERS | 13 +- + arch/alpha/include/asm/page.h | 1 - + arch/alpha/kernel/setup.c | 1 - + arch/alpha/mm/init.c | 16 +- + arch/arc/include/asm/page.h | 2 + + arch/arc/mm/init.c | 37 +- + arch/arm/include/asm/page-nommu.h | 1 - + arch/arm/include/asm/pgtable.h | 4 +- + arch/arm/mm/init.c | 25 +- + arch/arm/mm/mmu.c | 10 +- + arch/arm/mm/nommu.c | 10 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/hugetlb.h | 2 - + arch/arm64/include/asm/page.h | 1 - + arch/arm64/include/asm/pgtable.h | 87 +- + arch/arm64/include/asm/thread_info.h | 3 +- + arch/arm64/mm/hugetlbpage.c | 27 +- + arch/arm64/mm/init.c | 39 +- + arch/arm64/mm/mmu.c | 8 +- + arch/arm64/mm/pageattr.c | 4 +- + arch/csky/abiv1/inc/abi/page.h | 1 + + arch/csky/abiv2/inc/abi/page.h | 7 - + arch/csky/kernel/setup.c | 16 +- + arch/hexagon/include/asm/page.h | 1 - + arch/hexagon/mm/init.c | 19 +- + arch/loongarch/include/asm/page.h | 1 - + arch/loongarch/include/asm/pgtable.h | 2 - + arch/loongarch/kernel/setup.c | 10 - + arch/loongarch/mm/init.c | 6 +- + arch/m68k/include/asm/page_no.h | 1 - + arch/m68k/mm/init.c | 8 +- + arch/m68k/mm/mcfmmu.c | 3 - + arch/m68k/mm/motorola.c | 6 +- + arch/m68k/mm/sun3mmu.c | 9 - + arch/microblaze/include/asm/page.h | 1 - + arch/microblaze/mm/init.c | 22 +- + arch/mips/include/asm/page.h | 1 + + arch/mips/include/asm/pgalloc.h | 2 - + arch/mips/include/asm/pgtable.h | 2 +- + arch/mips/kernel/setup.c | 15 +- + arch/mips/loongson64/numa.c | 10 +- + arch/mips/mm/init.c | 8 +- + arch/mips/sgi-ip27/ip27-memory.c | 8 +- + arch/nios2/include/asm/page.h | 1 + + arch/nios2/mm/init.c | 12 +- + arch/openrisc/include/asm/page.h | 1 - + arch/openrisc/mm/init.c | 10 +- + arch/parisc/include/asm/page.h | 1 - + arch/parisc/mm/init.c | 11 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/book3s/32/pgtable.h | 12 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 62 +- + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 20 +- + arch/powerpc/include/asm/hugetlb.h | 5 - + arch/powerpc/include/asm/nohash/pgtable.h | 13 +- + arch/powerpc/include/asm/page.h | 1 + + arch/powerpc/include/asm/pgtable.h | 10 + + arch/powerpc/include/asm/setup.h | 4 + + arch/powerpc/include/asm/thread_info.h | 2 - + arch/powerpc/kernel/process.c | 25 - + arch/powerpc/kernel/setup-common.c | 1 - + arch/powerpc/mm/book3s64/hash_pgtable.c | 4 + + arch/powerpc/mm/book3s64/hash_tlb.c | 14 +- + arch/powerpc/mm/book3s64/pgtable.c | 25 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 9 +- + arch/powerpc/mm/book3s64/subpage_prot.c | 4 +- + arch/powerpc/mm/hugetlbpage.c | 11 +- + arch/powerpc/mm/mem.c | 27 +- + arch/powerpc/mm/numa.c | 2 - + arch/powerpc/mm/pgtable.c | 12 + + arch/powerpc/platforms/Kconfig.cputype | 1 + + arch/powerpc/platforms/pseries/Kconfig | 2 +- + arch/powerpc/platforms/pseries/cmm.c | 53 +- + arch/riscv/include/asm/page.h | 1 - + arch/riscv/include/asm/pgtable.h | 22 +- + arch/riscv/mm/hugetlbpage.c | 8 + + arch/riscv/mm/init.c | 10 +- + arch/s390/include/asm/page.h | 1 - + arch/s390/include/asm/tlb.h | 6 +- + arch/s390/kernel/setup.c | 2 - + arch/s390/mm/gmap_helpers.c | 2 +- + arch/s390/mm/hugetlbpage.c | 8 + + arch/s390/mm/init.c | 13 +- + arch/s390/mm/pgtable.c | 2 +- + arch/sh/mm/init.c | 12 +- + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/page_64.h | 1 + + arch/sparc/include/asm/tlbflush_64.h | 5 +- + arch/sparc/mm/init_64.c | 17 +- + arch/sparc/mm/srmmu.c | 17 +- + arch/sparc/mm/tlb.c | 20 +- + arch/um/include/asm/page.h | 1 - + arch/um/kernel/mem.c | 10 +- + arch/x86/Kconfig | 1 + + arch/x86/boot/compressed/misc.h | 1 + + arch/x86/boot/startup/sme.c | 1 + + arch/x86/include/asm/page.h | 6 - + arch/x86/include/asm/page_32.h | 6 + + arch/x86/include/asm/page_64.h | 76 +- + arch/x86/include/asm/paravirt.h | 1 - + arch/x86/include/asm/pgtable.h | 23 +- + arch/x86/include/asm/thread_info.h | 4 +- + arch/x86/kernel/setup.c | 5 - + arch/x86/lib/clear_page_64.S | 39 +- + arch/x86/mm/hugetlbpage.c | 8 + + arch/x86/mm/init.c | 8 +- + arch/x86/mm/init_32.c | 2 - + arch/x86/mm/init_64.c | 4 - + arch/x86/mm/mm_internal.h | 1 - + arch/x86/xen/enlighten_pv.c | 3 +- + arch/x86/xen/mmu_pv.c | 6 +- + arch/xtensa/include/asm/page.h | 1 - + arch/xtensa/mm/init.c | 16 +- + block/blk-mq.c | 3 - + drivers/block/zram/zram_drv.c | 1001 +++++++++++--------- + drivers/block/zram/zram_drv.h | 15 +- + drivers/misc/Kconfig | 2 +- + drivers/misc/vmw_balloon.c | 105 +- + drivers/virtio/Kconfig | 2 +- + drivers/virtio/virtio_balloon.c | 64 +- + fs/ext4/inode.c | 3 +- + fs/proc/task_mmu.c | 4 +- + fs/sync.c | 2 - + fs/xfs/xfs_super.c | 9 - + include/asm-generic/tlb.h | 5 +- + include/linux/backing-dev-defs.h | 3 - + include/linux/balloon.h | 77 ++ + include/linux/balloon_compaction.h | 160 ---- + include/linux/cma.h | 27 +- + include/linux/damon.h | 65 +- + include/linux/gfp.h | 56 +- + include/linux/gfp_types.h | 7 +- + include/linux/highmem.h | 98 +- + include/linux/hugetlb.h | 15 +- + include/linux/khugepaged.h | 9 +- + include/linux/maple_tree.h | 9 - + include/linux/memblock.h | 4 +- + include/linux/memcontrol.h | 48 +- + include/linux/mm.h | 72 +- + include/linux/mm_types.h | 57 +- + include/linux/mm_types_task.h | 5 + + include/linux/mmap_lock.h | 283 +++++- + include/linux/mmdebug.h | 10 + + include/linux/mmzone.h | 19 +- + include/linux/nodemask.h | 8 +- + include/linux/page-isolation.h | 2 + + include/linux/page_table_check.h | 69 +- + include/linux/pgtable.h | 168 +++- + include/linux/rmap.h | 76 +- + include/linux/sched.h | 45 + + include/linux/swap.h | 71 +- + include/linux/vm_event_item.h | 8 +- + include/linux/vmstat.h | 6 - + include/linux/writeback.h | 4 - + include/linux/zsmalloc.h | 8 +- + include/trace/events/damon.h | 41 + + include/trace/events/huge_memory.h | 3 +- + include/trace/events/vmscan.h | 51 + + include/trace/events/writeback.h | 1 - + include/uapi/linux/mempolicy.h | 3 + + include/uapi/linux/sysctl.h | 2 +- + init/main.c | 1 + + kernel/cgroup/cpuset.c | 7 +- + kernel/power/swap.c | 10 +- + lib/alloc_tag.c | 27 +- + lib/test_vmalloc.c | 11 +- + mm/Kconfig | 40 +- + mm/Makefile | 3 +- + mm/backing-dev.c | 9 +- + mm/{balloon_compaction.c => balloon.c} | 199 ++-- + mm/cma.c | 122 +-- + mm/damon/core.c | 235 +++-- + mm/damon/lru_sort.c | 120 ++- + mm/damon/paddr.c | 27 +- + mm/damon/reclaim.c | 10 +- + mm/damon/stat.c | 12 +- + mm/damon/sysfs-schemes.c | 58 +- + mm/damon/sysfs.c | 18 +- + mm/damon/tests/core-kunit.h | 51 +- + mm/damon/tests/vaddr-kunit.h | 2 +- + mm/damon/vaddr.c | 25 +- + mm/debug_vm_pgtable.c | 38 +- + mm/early_ioremap.c | 16 +- + mm/gup.c | 11 - + mm/highmem.c | 3 +- + mm/huge_memory.c | 8 +- + mm/hugetlb.c | 180 ++-- + mm/hugetlb_cgroup.c | 2 +- + mm/hugetlb_cma.c | 71 +- + mm/hugetlb_cma.h | 15 +- + mm/hugetlb_sysctl.c | 11 + + mm/hugetlb_vmemmap.c | 11 - + mm/internal.h | 88 +- + mm/kasan/kasan_test_c.c | 52 +- + mm/kasan/report.c | 8 +- + mm/kasan/shadow.c | 8 +- + mm/kfence/core.c | 6 +- + mm/khugepaged.c | 169 ++-- + mm/kmsan/kmsan_test.c | 64 +- + mm/list_lru.c | 6 +- + mm/madvise.c | 26 +- + mm/memblock.c | 4 +- + mm/memcontrol-v1.c | 28 +- + mm/memcontrol-v1.h | 6 +- + mm/memcontrol.c | 99 +- + mm/memory-failure.c | 2 +- + mm/memory-tiers.c | 7 +- + mm/memory.c | 371 ++++---- + mm/memory_hotplug.c | 8 +- + mm/mempolicy.c | 5 +- + mm/migrate.c | 14 +- + mm/migrate_device.c | 12 +- + mm/mm_init.c | 35 +- + mm/mmap_lock.c | 177 ++-- + mm/mmu_gather.c | 5 +- + mm/mprotect.c | 4 +- + mm/mremap.c | 10 +- + mm/mseal.c | 4 +- + mm/numa_memblks.c | 2 +- + mm/oom_kill.c | 26 +- + mm/page-writeback.c | 74 +- + mm/page_alloc.c | 431 ++++++--- + mm/page_io.c | 4 +- + mm/page_isolation.c | 189 ++-- + mm/page_reporting.c | 2 +- + mm/page_table_check.c | 41 +- + mm/pagewalk.c | 3 +- + mm/percpu.c | 15 +- + mm/rmap.c | 314 +++--- + mm/shmem.c | 87 +- + mm/show_mem.c | 3 +- + mm/shrinker_debug.c | 13 +- + mm/slub.c | 3 +- + mm/swap.c | 2 +- + mm/swap.h | 72 +- + mm/swap_state.c | 360 ++++--- + mm/swapfile.c | 866 ++++++++--------- + mm/tests/lazy_mmu_mode_kunit.c | 73 ++ + mm/userfaultfd.c | 18 +- + mm/vma.c | 16 +- + mm/vma.h | 14 +- + mm/vmalloc.c | 26 +- + mm/vmscan.c | 217 ++--- + mm/vmstat.c | 30 +- + mm/workingset.c | 8 +- + mm/zsmalloc.c | 86 +- + mm/zswap.c | 11 +- + tools/mm/slabinfo.c | 2 +- + tools/mm/thp_swap_allocator_test.c | 2 +- + tools/testing/selftests/damon/access_memory.c | 29 +- + .../selftests/damon/sysfs_memcg_path_leak.sh | 26 +- + ..._update_schemes_tried_regions_wss_estimation.py | 41 +- + tools/testing/selftests/mm/.gitignore | 1 - + tools/testing/selftests/mm/Makefile | 44 +- + .../selftests/mm/charge_reserved_hugetlb.sh | 55 +- + tools/testing/selftests/mm/check_config.sh | 3 +- + tools/testing/selftests/mm/cow.c | 43 +- + tools/testing/selftests/mm/hugetlb-madvise.c | 9 +- + tools/testing/selftests/mm/ksft_compaction.sh | 4 + + tools/testing/selftests/mm/ksft_cow.sh | 4 + + tools/testing/selftests/mm/ksft_gup_test.sh | 4 + + tools/testing/selftests/mm/ksft_hmm.sh | 4 + + tools/testing/selftests/mm/ksft_hugetlb.sh | 4 + + tools/testing/selftests/mm/ksft_hugevm.sh | 4 + + tools/testing/selftests/mm/ksft_ksm.sh | 4 + + tools/testing/selftests/mm/ksft_ksm_numa.sh | 4 + + tools/testing/selftests/mm/ksft_madv_guard.sh | 4 + + tools/testing/selftests/mm/ksft_madv_populate.sh | 4 + + tools/testing/selftests/mm/ksft_mdwe.sh | 4 + + tools/testing/selftests/mm/ksft_memfd_secret.sh | 4 + + tools/testing/selftests/mm/ksft_migration.sh | 4 + + tools/testing/selftests/mm/ksft_mkdirty.sh | 4 + + tools/testing/selftests/mm/ksft_mlock.sh | 4 + + tools/testing/selftests/mm/ksft_mmap.sh | 4 + + tools/testing/selftests/mm/ksft_mremap.sh | 4 + + tools/testing/selftests/mm/ksft_page_frag.sh | 4 + + tools/testing/selftests/mm/ksft_pagemap.sh | 4 + + tools/testing/selftests/mm/ksft_pfnmap.sh | 4 + + tools/testing/selftests/mm/ksft_pkey.sh | 4 + + tools/testing/selftests/mm/ksft_process_madv.sh | 4 + + .../testing/selftests/mm/ksft_process_mrelease.sh | 4 + + tools/testing/selftests/mm/ksft_rmap.sh | 4 + + tools/testing/selftests/mm/ksft_soft_dirty.sh | 4 + + tools/testing/selftests/mm/ksft_thp.sh | 4 + + tools/testing/selftests/mm/ksft_userfaultfd.sh | 4 + + tools/testing/selftests/mm/ksft_vma_merge.sh | 4 + + tools/testing/selftests/mm/ksft_vmalloc.sh | 4 + + tools/testing/selftests/mm/page_frag/Makefile | 2 +- + tools/testing/selftests/mm/pagemap_ioctl.c | 15 +- + tools/testing/selftests/mm/pfnmap.c | 93 +- + tools/testing/selftests/mm/run_vmtests.sh | 24 +- + tools/testing/selftests/mm/split_huge_page_test.c | 6 +- + tools/testing/selftests/mm/test_vmalloc.sh | 31 +- + tools/testing/selftests/mm/va_high_addr_switch.c | 10 +- + tools/testing/selftests/mm/va_high_addr_switch.sh | 12 +- + tools/testing/selftests/mm/virtual_address_range.c | 260 ----- + tools/testing/selftests/mm/vm_util.h | 7 + + tools/testing/selftests/mm/write_to_hugetlbfs.c | 9 +- + tools/testing/vma/vma_internal.h | 16 +- + 316 files changed, 6076 insertions(+), 5358 deletions(-) + delete mode 100644 Documentation/admin-guide/laptops/laptop-mode.rst + create mode 100644 include/linux/balloon.h + delete mode 100644 include/linux/balloon_compaction.h + rename mm/{balloon_compaction.c => balloon.c} (58%) + create mode 100644 mm/tests/lazy_mmu_mode_kunit.c + create mode 100755 tools/testing/selftests/mm/ksft_compaction.sh + create mode 100755 tools/testing/selftests/mm/ksft_cow.sh + create mode 100755 tools/testing/selftests/mm/ksft_gup_test.sh + create mode 100755 tools/testing/selftests/mm/ksft_hmm.sh + create mode 100755 tools/testing/selftests/mm/ksft_hugetlb.sh + create mode 100755 tools/testing/selftests/mm/ksft_hugevm.sh + create mode 100755 tools/testing/selftests/mm/ksft_ksm.sh + create mode 100755 tools/testing/selftests/mm/ksft_ksm_numa.sh + create mode 100755 tools/testing/selftests/mm/ksft_madv_guard.sh + create mode 100755 tools/testing/selftests/mm/ksft_madv_populate.sh + create mode 100755 tools/testing/selftests/mm/ksft_mdwe.sh + create mode 100755 tools/testing/selftests/mm/ksft_memfd_secret.sh + create mode 100755 tools/testing/selftests/mm/ksft_migration.sh + create mode 100755 tools/testing/selftests/mm/ksft_mkdirty.sh + create mode 100755 tools/testing/selftests/mm/ksft_mlock.sh + create mode 100755 tools/testing/selftests/mm/ksft_mmap.sh + create mode 100755 tools/testing/selftests/mm/ksft_mremap.sh + create mode 100755 tools/testing/selftests/mm/ksft_page_frag.sh + create mode 100755 tools/testing/selftests/mm/ksft_pagemap.sh + create mode 100755 tools/testing/selftests/mm/ksft_pfnmap.sh + create mode 100755 tools/testing/selftests/mm/ksft_pkey.sh + create mode 100755 tools/testing/selftests/mm/ksft_process_madv.sh + create mode 100755 tools/testing/selftests/mm/ksft_process_mrelease.sh + create mode 100755 tools/testing/selftests/mm/ksft_rmap.sh + create mode 100755 tools/testing/selftests/mm/ksft_soft_dirty.sh + create mode 100755 tools/testing/selftests/mm/ksft_thp.sh + create mode 100755 tools/testing/selftests/mm/ksft_userfaultfd.sh + create mode 100755 tools/testing/selftests/mm/ksft_vma_merge.sh + create mode 100755 tools/testing/selftests/mm/ksft_vmalloc.sh + delete mode 100644 tools/testing/selftests/mm/virtual_address_range.c +Merging mm-nonmm-stable/mm-nonmm-stable (2e171ab29f916 panic: add panic_force_cpu= parameter to redirect panic to a specific CPU) +$ git merge -m Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/mips/kernel/setup.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging drivers/android/binder.c +Auto-merging drivers/net/bonding/bond_options.c +Auto-merging drivers/net/netdevsim/dev.c +Auto-merging drivers/net/usb/r8152.c +Auto-merging drivers/net/usb/usbnet.c +Auto-merging fs/efivarfs/vars.c +Auto-merging include/linux/sched.h +Auto-merging init/main.c +Auto-merging kernel/trace/trace.c +Auto-merging mm/Makefile +Auto-merging mm/kmsan/kmsan_test.c +Auto-merging mm/memblock.c +Auto-merging mm/memcontrol-v1.c +Merge made by the 'ort' strategy. + .editorconfig | 4 +- + Documentation/accounting/delay-accounting.rst | 32 +- + Documentation/admin-guide/kernel-parameters.txt | 25 +- + Documentation/core-api/kho/abi.rst | 28 ++ + Documentation/core-api/kho/bindings/kho.yaml | 43 --- + .../core-api/kho/bindings/memblock/memblock.yaml | 39 --- + .../kho/bindings/memblock/reserve-mem.yaml | 40 --- + Documentation/core-api/kho/bindings/sub-fdt.yaml | 27 -- + Documentation/core-api/kho/concepts.rst | 74 ----- + Documentation/core-api/kho/fdt.rst | 80 ----- + Documentation/core-api/kho/index.rst | 82 ++++- + Documentation/core-api/liveupdate.rst | 2 +- + Documentation/dev-tools/checkpatch.rst | 5 + + Documentation/filesystems/sysfs.rst | 2 +- + Documentation/mm/memfd_preservation.rst | 2 +- + MAINTAINERS | 7 +- + arch/arm/configs/aspeed_g5_defconfig | 2 +- + arch/arm/configs/pxa3xx_defconfig | 2 +- + arch/arm64/net/bpf_jit_comp.c | 2 +- + arch/loongarch/net/bpf_jit.c | 2 +- + arch/m68k/configs/amiga_defconfig | 3 - + arch/m68k/configs/apollo_defconfig | 3 - + arch/m68k/configs/atari_defconfig | 3 - + arch/m68k/configs/bvme6000_defconfig | 3 - + arch/m68k/configs/hp300_defconfig | 3 - + arch/m68k/configs/mac_defconfig | 3 - + arch/m68k/configs/multi_defconfig | 3 - + arch/m68k/configs/mvme147_defconfig | 3 - + arch/m68k/configs/mvme16x_defconfig | 3 - + arch/m68k/configs/q40_defconfig | 3 - + arch/m68k/configs/sun3_defconfig | 3 - + arch/m68k/configs/sun3x_defconfig | 3 - + arch/mips/kernel/setup.c | 1 + + arch/mips/rb532/devices.c | 1 + + arch/openrisc/configs/or1klitex_defconfig | 2 +- + arch/powerpc/configs/ppc64_defconfig | 2 - + arch/powerpc/configs/skiroot_defconfig | 2 +- + arch/powerpc/kernel/btext.c | 1 + + arch/powerpc/net/bpf_jit_comp.c | 2 +- + arch/s390/configs/debug_defconfig | 2 +- + arch/s390/include/asm/processor.h | 1 + + arch/s390/kernel/alternative.c | 1 + + arch/s390/kernel/stackprotector.c | 1 + + arch/um/drivers/vector_kern.c | 1 + + arch/x86/kernel/setup.c | 6 + + arch/xtensa/platforms/iss/network.c | 1 + + certs/blacklist.c | 1 + + crypto/asymmetric_keys/asymmetric_type.c | 1 + + crypto/asymmetric_keys/x509_public_key.c | 1 + + crypto/krb5/selftest.c | 1 + + drivers/android/binder.c | 9 +- + drivers/android/binder_alloc.c | 2 +- + drivers/atm/nicstar.c | 1 + + drivers/auxdisplay/hd44780_common.c | 1 + + drivers/auxdisplay/lcd2s.c | 1 + + drivers/block/floppy.c | 2 - + drivers/bus/moxtet.c | 1 + + drivers/char/tpm/tpm.h | 1 + + drivers/comedi/drivers/jr3_pci.c | 1 + + drivers/firmware/broadcom/bcm47xx_sprom.c | 1 + + drivers/gpio/gpio-macsmc.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 10 - + drivers/gpu/drm/ci/arm.config | 2 +- + drivers/gpu/drm/ci/arm64.config | 2 +- + drivers/gpu/drm/ci/x86_64.config | 2 +- + drivers/gpu/drm/i915/gt/selftest_ring_submission.c | 1 + + drivers/gpu/drm/i915/i915_selftest.h | 2 + + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- + drivers/gpu/drm/panthor/panthor_gem.c | 2 +- + drivers/hid/hid-picolcd_debugfs.c | 1 + + drivers/hwmon/pmbus/q54sj108a2.c | 1 + + drivers/hwmon/pmbus/ucd9000.c | 1 + + drivers/infiniband/core/umem_odp.c | 4 +- + drivers/infiniband/ulp/srp/ib_srp.c | 1 + + drivers/infiniband/ulp/srpt/ib_srpt.c | 1 + + drivers/input/touchscreen/iqs5xx.c | 1 + + drivers/md/dm-crypt.c | 1 + + drivers/md/dm-integrity.c | 1 + + drivers/md/dm-verity-target.c | 1 + + .../extron-da-hd-4k-plus/extron-da-hd-4k-plus.c | 1 + + drivers/media/cec/usb/rainshadow/rainshadow-cec.c | 1 + + drivers/media/i2c/ccs/ccs-reg-access.c | 1 + + drivers/media/usb/pvrusb2/pvrusb2-debugifc.c | 1 + + drivers/misc/kgdbts.c | 1 + + drivers/misc/pch_phub.c | 1 + + drivers/net/bonding/bond_options.c | 1 + + drivers/net/can/can327.c | 1 + + drivers/net/can/slcan/slcan-core.c | 1 + + drivers/net/ethernet/chelsio/cxgb3/common.h | 1 + + .../mellanox/mlx5/core/steering/sws/dr_dbg.c | 1 + + drivers/net/ethernet/micrel/ksz884x.c | 1 + + drivers/net/ethernet/pasemi/pasemi_mac.c | 1 + + drivers/net/netconsole.c | 1 + + drivers/net/netdevsim/dev.c | 1 + + drivers/net/usb/r8152.c | 1 + + drivers/net/usb/usbnet.c | 1 + + drivers/net/wireless/ath/ath6kl/debug.c | 1 + + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 1 + + drivers/net/wireless/intel/iwlwifi/mld/debugfs.c | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 + + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 1 + + drivers/net/wireless/realtek/rtw89/debug.c | 1 + + drivers/net/wireless/silabs/wfx/fwio.c | 1 + + drivers/nvme/target/configfs.c | 1 + + drivers/nvme/target/core.c | 1 + + drivers/nvmem/brcm_nvram.c | 1 + + drivers/nvmem/layouts/u-boot-env.c | 1 + + drivers/of/kexec.c | 15 +- + drivers/platform/x86/intel/wmi/thunderbolt.c | 1 + + drivers/pnp/support.c | 1 + + drivers/ptp/ptp_pch.c | 1 + + drivers/rapidio/rio-scan.c | 3 +- + drivers/s390/cio/blacklist.c | 1 + + drivers/s390/crypto/ap_bus.c | 1 + + drivers/s390/crypto/zcrypt_cex4.c | 1 + + drivers/s390/virtio/virtio_ccw.c | 1 + + drivers/scsi/aacraid/rx.c | 1 + + drivers/scsi/ips.c | 1 + + drivers/scsi/libsas/sas_scsi_host.c | 1 + + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 1 + + drivers/scsi/scsi_transport_fc.c | 1 + + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 1 + + drivers/target/iscsi/iscsi_target_auth.c | 1 + + drivers/target/target_core_fabric_lib.c | 1 + + drivers/target/target_core_spc.c | 1 + + drivers/target/tcm_fc/tfc_conf.c | 1 + + drivers/thunderbolt/switch.c | 1 + + drivers/tty/vt/vt.c | 1 + + drivers/ufs/core/ufshcd.c | 1 + + drivers/usb/atm/speedtch.c | 1 + + drivers/usb/atm/ueagle-atm.c | 1 + + drivers/usb/gadget/function/u_ether.c | 1 + + drivers/usb/gadget/function/uvc_configfs.c | 1 + + drivers/usb/typec/ucsi/debugfs.c | 1 + + drivers/usb/typec/ucsi/ucsi_ccg.c | 1 + + drivers/watchdog/hpwdt.c | 1 + + fs/adfs/dir.c | 1 + + fs/binfmt_misc.c | 1 + + fs/ecryptfs/ecryptfs_kernel.h | 1 + + fs/efivarfs/vars.c | 1 + + fs/fat/cache.c | 4 +- + fs/fat/dir.c | 1 + + fs/fat/namei_msdos.c | 7 +- + fs/fat/namei_vfat.c | 8 +- + fs/gfs2/lock_dlm.c | 1 + + fs/nfsd/nfs4recover.c | 1 + + fs/ntfs3/ntfs_fs.h | 1 + + fs/ocfs2/alloc.c | 9 +- + fs/ocfs2/cluster/heartbeat.c | 4 +- + fs/ocfs2/cluster/nodemanager.c | 8 +- + fs/ocfs2/dlm/dlmdomain.c | 2 +- + fs/ocfs2/export.c | 6 +- + fs/ocfs2/inode.c | 32 +- + fs/ocfs2/localalloc.c | 4 +- + fs/ocfs2/move_extents.c | 7 +- + fs/ocfs2/ocfs2_fs.h | 4 +- + fs/ocfs2/slot_map.c | 27 +- + fs/ocfs2/suballoc.c | 334 +++++++++++++++++++-- + fs/ocfs2/xattr.c | 9 +- + fs/overlayfs/namei.c | 1 + + fs/proc/array.c | 1 + + fs/seq_file.c | 1 + + fs/udf/unicode.c | 1 + + include/asm-generic/atomic64.h | 2 +- + include/asm-generic/rqspinlock.h | 2 +- + include/linux/array_size.h | 6 + + include/linux/capability.h | 6 + + include/linux/compiler-clang.h | 2 +- + include/linux/delayacct.h | 8 + + include/linux/filter.h | 26 +- + include/linux/ftrace.h | 6 +- + include/linux/ima.h | 1 + + include/linux/instrumented.h | 17 ++ + include/linux/ioport.h | 7 +- + include/linux/kernel.h | 211 +------------ + include/linux/kexec_handover.h | 33 +- + include/linux/kho/abi/kexec_handover.h | 163 ++++++++++ + include/linux/kho/abi/luo.h | 8 +- + include/linux/kho/abi/memblock.h | 73 +++++ + include/linux/kho/abi/memfd.h | 6 +- + include/linux/log2.h | 2 +- + include/linux/module.h | 9 + + include/linux/moduleparam.h | 7 +- + include/linux/panic.h | 8 + + include/linux/sched.h | 5 + + include/linux/smp.h | 1 + + include/linux/sysfs.h | 13 + + include/linux/trace_printk.h | 204 +++++++++++++ + include/linux/types.h | 3 +- + include/linux/ww_mutex.h | 1 + + include/uapi/linux/shm.h | 3 - + include/uapi/linux/taskstats.h | 22 +- + init/main.c | 16 +- + ipc/ipc_sysctl.c | 2 +- + kernel/audit.c | 1 + + kernel/bpf/core.c | 5 +- + kernel/bpf/rqspinlock.c | 1 - + kernel/bpf/syscall.c | 1 + + kernel/configs/debug.config | 2 +- + kernel/crash_core.c | 17 +- + kernel/crash_dump_dm_crypt.c | 21 +- + kernel/debug/gdbstub.c | 1 + + kernel/delayacct.c | 31 +- + kernel/fork.c | 4 +- + kernel/kallsyms.c | 73 +++-- + kernel/kcsan/kcsan_test.c | 4 +- + kernel/kexec_file.c | 131 ++++---- + kernel/liveupdate/Kconfig | 17 +- + kernel/liveupdate/kexec_handover.c | 145 ++++----- + kernel/liveupdate/luo_core.c | 3 +- + kernel/module/kallsyms.c | 9 +- + kernel/panic.c | 164 +++++++++- + kernel/sched/stats.h | 8 +- + kernel/trace/ftrace.c | 5 +- + kernel/trace/trace.c | 7 +- + kernel/trace/trace.h | 2 +- + kernel/tsacct.c | 2 +- + kernel/ucount.c | 2 +- + kernel/vmcore_info.c | 6 +- + kernel/watchdog.c | 10 +- + lib/Kconfig | 13 - + lib/Kconfig.debug | 81 +++-- + lib/Makefile | 3 - + lib/build_OID_registry | 26 +- + lib/globtest.c | 167 ----------- + lib/group_cpus.c | 271 +++++++++++++---- + lib/hexdump.c | 1 + + lib/kfifo.c | 2 +- + lib/kstrtox.c | 4 +- + lib/once.c | 2 +- + lib/string_helpers.c | 1 + + lib/test_kho.c | 7 +- + lib/test_uuid.c | 134 --------- + lib/tests/Makefile | 3 + + lib/tests/glob_kunit.c | 125 ++++++++ + lib/{test_min_heap.c => tests/min_heap_kunit.c} | 145 ++++----- + lib/tests/uuid_kunit.c | 106 +++++++ + lib/uuid.c | 1 + + lib/vsprintf.c | 1 + + mm/Makefile | 2 +- + mm/kfence/kfence_test.c | 4 +- + mm/kmemleak.c | 2 +- + mm/kmsan/kmsan_test.c | 2 +- + mm/memblock.c | 4 +- + mm/memcontrol-v1.c | 4 +- + net/bridge/br_sysfs_br.c | 1 + + net/core/netclassid_cgroup.c | 2 +- + net/core/pktgen.c | 1 + + net/core/utils.c | 1 + + net/ipv4/arp.c | 1 + + net/mac80211/debugfs_netdev.c | 1 + + net/sunrpc/cache.c | 1 + + net/tipc/core.h | 1 + + rust/kernel/task.rs | 24 +- + scripts/bloat-o-meter | 1 + + scripts/checkpatch.pl | 10 + + security/integrity/evm/evm_crypto.c | 1 + + security/integrity/ima/ima_api.c | 1 + + security/integrity/ima/ima_kexec.c | 35 +++ + security/ipe/digest.c | 1 + + security/keys/encrypted-keys/encrypted.c | 1 + + security/keys/trusted-keys/trusted_core.c | 1 + + security/keys/trusted-keys/trusted_tpm1.c | 1 + + security/loadpin/loadpin.c | 1 + + security/selinux/selinuxfs.c | 1 + + sound/pci/riptide/riptide.c | 1 + + sound/usb/6fire/firmware.c | 1 + + tools/accounting/getdelays.c | 172 +++++++++-- + tools/debugging/kernel-chktaint | 18 +- + tools/testing/selftests/bpf/config | 2 +- + .../testing/selftests/wireguard/qemu/kernel.config | 2 +- + 274 files changed, 2605 insertions(+), 1513 deletions(-) + create mode 100644 Documentation/core-api/kho/abi.rst + delete mode 100644 Documentation/core-api/kho/bindings/kho.yaml + delete mode 100644 Documentation/core-api/kho/bindings/memblock/memblock.yaml + delete mode 100644 Documentation/core-api/kho/bindings/memblock/reserve-mem.yaml + delete mode 100644 Documentation/core-api/kho/bindings/sub-fdt.yaml + delete mode 100644 Documentation/core-api/kho/concepts.rst + delete mode 100644 Documentation/core-api/kho/fdt.rst + create mode 100644 include/linux/kho/abi/kexec_handover.h + create mode 100644 include/linux/kho/abi/memblock.h + create mode 100644 include/linux/trace_printk.h + delete mode 100644 lib/globtest.c + delete mode 100644 lib/test_uuid.c + create mode 100644 lib/tests/glob_kunit.c + rename lib/{test_min_heap.c => tests/min_heap_kunit.c} (58%) + create mode 100644 lib/tests/uuid_kunit.c +Merging mm-unstable/mm-unstable (9e15c46c4bca8 mm/zswap: use %pe to print error pointers) +$ git merge -m Merge branch 'mm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-unstable/mm-unstable +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging kernel/relay.c +Auto-merging mm/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + arch/alpha/Kconfig | 1 + + arch/alpha/include/asm/tlb.h | 6 +- + arch/arm64/include/asm/pgtable.h | 23 +- + arch/arm64/mm/contpte.c | 62 +- + arch/loongarch/Kconfig | 1 + + arch/loongarch/include/asm/pgalloc.h | 7 +- + arch/mips/Kconfig | 1 + + arch/mips/include/asm/pgalloc.h | 7 +- + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/tlb.h | 4 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/tlb.h | 1 - + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/tlb_64.h | 1 - + arch/um/Kconfig | 1 + + arch/x86/Kconfig | 1 - + arch/x86/kernel/cpu/sgx/ioctl.c | 2 +- + drivers/char/mem.c | 6 +- + drivers/dax/device.c | 10 +- + drivers/gpu/drm/drm_gem.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 3 +- + drivers/gpu/drm/i915/gt/shmem_utils.c | 3 +- + drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 2 +- + drivers/gpu/drm/ttm/ttm_backup.c | 3 +- + drivers/gpu/drm/ttm/ttm_tt.c | 2 +- + fs/aio.c | 2 +- + fs/erofs/data.c | 5 +- + fs/ext4/file.c | 4 +- + fs/hugetlbfs/inode.c | 14 +- + fs/ntfs3/file.c | 2 +- + fs/orangefs/file.c | 4 +- + fs/ramfs/file-nommu.c | 2 +- + fs/resctrl/pseudo_lock.c | 2 +- + fs/romfs/mmap-nommu.c | 2 +- + fs/xfs/scrub/xfile.c | 3 +- + fs/xfs/xfs_buf_mem.c | 2 +- + fs/xfs/xfs_file.c | 4 +- + fs/zonefs/file.c | 3 +- + include/asm-generic/tlb.h | 2 +- + include/linux/cpuset.h | 6 +- + include/linux/dax.h | 8 +- + include/linux/hugetlb.h | 6 +- + include/linux/hugetlb_inline.h | 10 + + include/linux/memcontrol.h | 6 +- + include/linux/memory-tiers.h | 6 +- + include/linux/mm.h | 252 +++- + include/linux/mm_types.h | 23 +- + include/linux/mmu_notifier.h | 9 +- + include/linux/pgtable.h | 69 +- + include/linux/shmem_fs.h | 8 +- + ipc/shm.c | 12 +- + kernel/cgroup/cpuset.c | 54 +- + kernel/relay.c | 2 +- + mm/Kconfig | 8 +- + mm/Makefile | 1 - + mm/cma.c | 3 +- + mm/damon/core.c | 15 +- + mm/filemap.c | 2 +- + mm/hugetlb.c | 22 +- + mm/internal.h | 28 +- + mm/khugepaged.c | 18 +- + mm/ksm.c | 15 +- + mm/madvise.c | 2 +- + mm/memcontrol.c | 16 +- + mm/memfd.c | 6 +- + mm/memory-tiers.c | 21 +- + mm/memory.c | 185 ++- + mm/mmap.c | 110 +- + mm/mremap.c | 2 +- + mm/pt_reclaim.c | 72 -- + mm/readahead.c | 2 +- + mm/rmap.c | 41 +- + mm/secretmem.c | 7 +- + mm/shmem.c | 61 +- + mm/util.c | 2 +- + mm/vma.c | 67 +- + mm/vma.h | 50 +- + mm/vma_internal.h | 1 + + mm/vmscan.c | 37 +- + mm/zswap.c | 53 +- + security/keys/big_key.c | 2 +- + tools/include/linux/bitmap.h | 22 + + tools/lib/bitmap.c | 29 + + tools/testing/vma/Makefile | 7 +- + tools/testing/vma/include/custom.h | 119 ++ + tools/testing/vma/include/dup.h | 1320 ++++++++++++++++++++ + tools/testing/vma/include/stubs.h | 428 +++++++ + tools/testing/vma/main.c | 55 + + tools/testing/vma/shared.c | 131 ++ + tools/testing/vma/shared.h | 114 ++ + tools/testing/vma/{vma.c => tests/merge.c} | 332 +---- + tools/testing/vma/tests/mmap.c | 57 + + tools/testing/vma/tests/vma.c | 339 +++++ + tools/testing/vma/vma_internal.h | 1849 +--------------------------- + 96 files changed, 3619 insertions(+), 2712 deletions(-) + delete mode 100644 mm/pt_reclaim.c + create mode 100644 tools/testing/vma/include/custom.h + create mode 100644 tools/testing/vma/include/dup.h + create mode 100644 tools/testing/vma/include/stubs.h + create mode 100644 tools/testing/vma/main.c + create mode 100644 tools/testing/vma/shared.c + create mode 100644 tools/testing/vma/shared.h + rename tools/testing/vma/{vma.c => tests/merge.c} (82%) + create mode 100644 tools/testing/vma/tests/mmap.c + create mode 100644 tools/testing/vma/tests/vma.c +Merging mm-nonmm-unstable/mm-nonmm-unstable (b4481323245e9 scripts/gdb: implement x86_page_ops in mm.py) +$ git merge -m Merge branch 'mm-nonmm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/core-api/list.rst | 9 + + Documentation/core-api/liveupdate.rst | 11 + + MAINTAINERS | 1 + + arch/s390/configs/debug_defconfig | 2 +- + fs/ocfs2/quota_global.c | 49 ++- + fs/proc/array.c | 2 +- + include/linux/compiler_types.h | 23 +- + include/linux/kho/abi/luo.h | 81 ++++ + include/linux/list_private.h | 256 +++++++++++ + include/linux/liveupdate.h | 156 ++++++- + include/uapi/linux/taskstats.h | 27 +- + kernel/delayacct.c | 6 +- + kernel/hung_task.c | 5 +- + kernel/liveupdate/Makefile | 1 + + kernel/liveupdate/kexec_handover.c | 2 +- + kernel/liveupdate/luo_core.c | 7 +- + kernel/liveupdate/luo_file.c | 80 +++- + kernel/liveupdate/luo_flb.c | 654 +++++++++++++++++++++++++++++ + kernel/liveupdate/luo_internal.h | 22 +- + kernel/watchdog.c | 2 +- + kernel/watchdog_perf.c | 50 ++- + lib/Kconfig.debug | 49 +++ + lib/objpool.c | 2 +- + lib/random32.c | 173 +------- + lib/tests/Makefile | 2 + + lib/tests/list-private-test.c | 76 ++++ + lib/tests/liveupdate.c | 158 +++++++ + lib/tests/random32_kunit.c | 174 ++++++++ + mm/memfd_luo.c | 7 +- + scripts/gdb/linux/constants.py.in | 2 +- + scripts/gdb/linux/mm.py | 173 +++++++- + tools/testing/selftests/memfd/memfd_test.c | 113 ++++- + 32 files changed, 2082 insertions(+), 293 deletions(-) + create mode 100644 include/linux/list_private.h + create mode 100644 kernel/liveupdate/luo_flb.c + create mode 100644 lib/tests/list-private-test.c + create mode 100644 lib/tests/liveupdate.c + create mode 100644 lib/tests/random32_kunit.c +Merging kbuild/kbuild-for-next (c7c88b20cd422 scripts/make_fit: Compress dtbs in parallel) +$ git merge -m Merge branch 'kbuild-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild/kbuild-for-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging drivers/gpu/drm/Makefile +Auto-merging kernel/kallsyms.c +Auto-merging kernel/vmcore_info.c +Merge made by the 'ort' strategy. + Documentation/dev-tools/container.rst | 227 ++++++++++++++ + Documentation/dev-tools/index.rst | 1 + + Documentation/kbuild/gendwarfksyms.rst | 123 ++++---- + Documentation/kbuild/kconfig-language.rst | 22 +- + MAINTAINERS | 8 + + Makefile | 10 +- + arch/hexagon/include/{uapi => }/asm/signal.h | 0 + arch/mips/boot/tools/relocs.c | 2 + + arch/mips/boot/tools/relocs.h | 7 + + arch/mips/include/asm/elf.h | 2 + + drivers/gpu/drm/Makefile | 1 - + fs/btrfs/Makefile | 1 - + include/linux/overflow.h | 10 +- + include/uapi/linux/hyperv.h | 2 +- + include/uapi/linux/vbox_vmmdev_types.h | 4 +- + init/Kconfig | 2 +- + kernel/kallsyms.c | 6 +- + kernel/kallsyms_internal.h | 1 - + kernel/vmcore_info.c | 1 - + scripts/Kconfig.include | 2 - + scripts/Makefile.lib | 2 +- + scripts/Makefile.package | 1 - + scripts/Makefile.warn | 27 +- + scripts/container | 199 +++++++++++++ + scripts/dummy-tools/python3 | 4 + + scripts/kallsyms.c | 62 +--- + scripts/kconfig/Makefile | 4 +- + scripts/kconfig/gconf.c | 35 ++- + scripts/kconfig/icons/back.xpm | 29 ++ + scripts/kconfig/icons/choice_no.xpm | 18 ++ + scripts/kconfig/icons/choice_yes.xpm | 18 ++ + scripts/kconfig/icons/load.xpm | 31 ++ + scripts/kconfig/icons/menu.xpm | 18 ++ + scripts/kconfig/icons/menuback.xpm | 18 ++ + scripts/kconfig/icons/save.xpm | 31 ++ + scripts/kconfig/icons/single_view.xpm | 28 ++ + scripts/kconfig/icons/split_view.xpm | 28 ++ + scripts/kconfig/icons/symbol_mod.xpm | 18 ++ + scripts/kconfig/icons/symbol_no.xpm | 18 ++ + scripts/kconfig/icons/symbol_yes.xpm | 18 ++ + scripts/kconfig/icons/tree_view.xpm | 28 ++ + scripts/kconfig/images.c | 328 --------------------- + scripts/kconfig/images.h | 33 --- + scripts/kconfig/lkc.h | 2 +- + scripts/kconfig/menu.c | 12 +- + scripts/kconfig/merge_config.sh | 274 +++++++++++++---- + scripts/kconfig/parser.y | 6 +- + scripts/kconfig/qconf.cc | 29 +- + scripts/kconfig/streamline_config.pl | 2 +- + scripts/kconfig/tests/conditional_dep/Kconfig | 32 ++ + scripts/kconfig/tests/conditional_dep/__init__.py | 14 + + .../kconfig/tests/conditional_dep/expected_config1 | 11 + + .../kconfig/tests/conditional_dep/expected_config2 | 9 + + .../kconfig/tests/conditional_dep/expected_config3 | 11 + + scripts/kconfig/tests/conditional_dep/test_config1 | 6 + + scripts/kconfig/tests/conditional_dep/test_config2 | 7 + + scripts/kconfig/tests/conditional_dep/test_config3 | 6 + + scripts/link-vmlinux.sh | 4 + + scripts/make_fit.py | 185 +++++++++--- + scripts/mod/modpost.c | 6 +- + tools/perf/tests/vmlinux-kallsyms.c | 1 - + usr/include/Makefile | 87 +++++- + usr/include/headers_check.pl | 8 - + 63 files changed, 1514 insertions(+), 626 deletions(-) + create mode 100644 Documentation/dev-tools/container.rst + rename arch/hexagon/include/{uapi => }/asm/signal.h (100%) + create mode 100755 scripts/container + create mode 100755 scripts/dummy-tools/python3 + create mode 100644 scripts/kconfig/icons/back.xpm + create mode 100644 scripts/kconfig/icons/choice_no.xpm + create mode 100644 scripts/kconfig/icons/choice_yes.xpm + create mode 100644 scripts/kconfig/icons/load.xpm + create mode 100644 scripts/kconfig/icons/menu.xpm + create mode 100644 scripts/kconfig/icons/menuback.xpm + create mode 100644 scripts/kconfig/icons/save.xpm + create mode 100644 scripts/kconfig/icons/single_view.xpm + create mode 100644 scripts/kconfig/icons/split_view.xpm + create mode 100644 scripts/kconfig/icons/symbol_mod.xpm + create mode 100644 scripts/kconfig/icons/symbol_no.xpm + create mode 100644 scripts/kconfig/icons/symbol_yes.xpm + create mode 100644 scripts/kconfig/icons/tree_view.xpm + delete mode 100644 scripts/kconfig/images.c + delete mode 100644 scripts/kconfig/images.h + create mode 100644 scripts/kconfig/tests/conditional_dep/Kconfig + create mode 100644 scripts/kconfig/tests/conditional_dep/__init__.py + create mode 100644 scripts/kconfig/tests/conditional_dep/expected_config1 + create mode 100644 scripts/kconfig/tests/conditional_dep/expected_config2 + create mode 100644 scripts/kconfig/tests/conditional_dep/expected_config3 + create mode 100644 scripts/kconfig/tests/conditional_dep/test_config1 + create mode 100644 scripts/kconfig/tests/conditional_dep/test_config2 + create mode 100644 scripts/kconfig/tests/conditional_dep/test_config3 +Merging clang-format/clang-format (8f0b4cce4481f Linux 6.19-rc1) +$ 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 (e205952db7717 perf jevents: Validate that all names given an Event) +$ git merge -m Merge branch 'perf-tools-next' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Merge made by the 'ort' strategy. + tools/arch/arm64/include/uapi/asm/unistd.h | 24 +- + tools/build/Makefile.feature | 2 +- + tools/build/feature/Makefile | 4 +- + tools/build/feature/test-libbfd-buildid.c | 8 - + tools/build/feature/test-libbfd-threadsafe.c | 18 + + tools/include/linux/bitfield.h | 1 + + tools/include/linux/list.h | 10 + + tools/lib/perf/Documentation/libperf.txt | 2 + + tools/lib/perf/Makefile | 15 +- + tools/lib/perf/include/perf/event.h | 69 ++ + tools/lib/perf/include/perf/schedstat-v15.h | 146 +++ + tools/lib/perf/include/perf/schedstat-v16.h | 146 +++ + tools/lib/perf/include/perf/schedstat-v17.h | 164 +++ + tools/lib/subcmd/help.c | 10 +- + tools/perf/.gitignore | 6 + + tools/perf/Documentation/perf-c2c.txt | 49 +- + tools/perf/Documentation/perf-data.txt | 28 + + tools/perf/Documentation/perf-inject.txt | 5 + + tools/perf/Documentation/perf-record.txt | 10 +- + tools/perf/Documentation/perf-sched.txt | 261 ++++- + tools/perf/Documentation/perf.data-file-format.txt | 17 + + tools/perf/Makefile.config | 74 +- + tools/perf/Makefile.perf | 20 +- + tools/perf/arch/arc/annotate/instructions.c | 11 - + tools/perf/arch/arm/util/Build | 1 - + tools/perf/arch/arm/util/cs-etm.c | 207 ++-- + tools/perf/arch/arm/util/perf_regs.c | 9 - + tools/perf/arch/arm/util/unwind-libdw.c | 39 - + tools/perf/arch/arm64/util/Build | 1 - + tools/perf/arch/arm64/util/arm-spe.c | 17 +- + tools/perf/arch/arm64/util/header.c | 1 - + tools/perf/arch/arm64/util/machine.c | 14 +- + tools/perf/arch/arm64/util/mem-events.c | 4 +- + tools/perf/arch/arm64/util/perf_regs.c | 45 +- + tools/perf/arch/arm64/util/unwind-libdw.c | 61 -- + tools/perf/arch/csky/util/Build | 2 - + tools/perf/arch/csky/util/perf_regs.c | 9 - + tools/perf/arch/csky/util/unwind-libdw.c | 78 -- + tools/perf/arch/loongarch/util/perf_regs.c | 9 - + tools/perf/arch/loongarch/util/unwind-libdw.c | 57 - + tools/perf/arch/mips/util/perf_regs.c | 9 - + tools/perf/arch/powerpc/util/Build | 1 - + tools/perf/arch/powerpc/util/perf_regs.c | 68 -- + tools/perf/arch/powerpc/util/skip-callchain-idx.c | 50 +- + tools/perf/arch/powerpc/util/unwind-libdw.c | 76 -- + tools/perf/arch/riscv/util/Build | 1 - + tools/perf/arch/riscv/util/perf_regs.c | 9 - + tools/perf/arch/riscv/util/unwind-libdw.c | 58 - + tools/perf/arch/riscv64/annotate/instructions.c | 36 - + tools/perf/arch/s390/util/Build | 2 - + tools/perf/arch/s390/util/perf_regs.c | 9 - + tools/perf/arch/s390/util/unwind-libdw.c | 65 -- + tools/perf/arch/x86/tests/bp-modify.c | 30 +- + tools/perf/arch/x86/util/Build | 2 - + tools/perf/arch/x86/util/archinsn.c | 27 - + tools/perf/arch/x86/util/intel-pt.c | 3 +- + tools/perf/arch/x86/util/perf_regs.c | 47 - + tools/perf/arch/x86/util/unwind-libdw.c | 54 - + tools/perf/bench/uprobe.c | 2 +- + tools/perf/builtin-daemon.c | 8 +- + tools/perf/builtin-data.c | 3 + + tools/perf/builtin-diff.c | 12 +- + tools/perf/builtin-help.c | 51 +- + tools/perf/builtin-inject.c | 160 ++- + tools/perf/builtin-list.c | 4 +- + tools/perf/builtin-probe.c | 3 +- + tools/perf/builtin-record.c | 46 +- + tools/perf/builtin-report.c | 19 +- + tools/perf/builtin-sched.c | 1034 +++++++++++++++++- + tools/perf/builtin-script.c | 59 +- + tools/perf/builtin-stat.c | 9 +- + tools/perf/builtin-trace.c | 40 +- + tools/perf/check-headers.sh | 1 - + tools/perf/command-list.txt | 36 - + tools/perf/jvmti/libjvmti.c | 2 +- + tools/perf/perf.c | 18 +- + tools/perf/pmu-events/Build | 64 +- + tools/perf/pmu-events/amd_metrics.py | 492 +++++++++ + .../pmu-events/arch/arm64/arm/cortex-a510/pmu.json | 8 - + .../arch/arm64/common-and-microarch.json | 12 - + .../pmu-events/arch/arm64/fujitsu/monaka/pmu.json | 10 - + .../arch/powerpc/power9/nest_metrics.json | 8 +- + tools/perf/pmu-events/arch/riscv/mapfile.csv | 1 + + .../arch/riscv/openhwgroup/cva6/firmware.json | 68 ++ + .../arch/riscv/openhwgroup/cva6/instructions.json | 47 + + .../arch/riscv/openhwgroup/cva6/memory.json | 42 + + .../arch/riscv/openhwgroup/cva6/microarch.json | 27 + + .../pmu-events/arch/x86/amdzen5/load-store.json | 6 +- + .../arch/x86/amdzen6/branch-prediction.json | 93 ++ + tools/perf/pmu-events/arch/x86/amdzen6/decode.json | 139 +++ + .../pmu-events/arch/x86/amdzen6/execution.json | 192 ++++ + .../arch/x86/amdzen6/floating-point.json | 1106 +++++++++++++++++++ + .../pmu-events/arch/x86/amdzen6/inst-cache.json | 120 +++ + .../perf/pmu-events/arch/x86/amdzen6/l2-cache.json | 326 ++++++ + .../perf/pmu-events/arch/x86/amdzen6/l3-cache.json | 177 +++ + .../pmu-events/arch/x86/amdzen6/load-store.json | 523 +++++++++ + .../arch/x86/amdzen6/memory-controller.json | 101 ++ + .../perf/pmu-events/arch/x86/amdzen6/pipeline.json | 99 ++ + .../pmu-events/arch/x86/amdzen6/recommended.json | 339 ++++++ + tools/perf/pmu-events/arch/x86/mapfile.csv | 3 +- + tools/perf/pmu-events/arm64_metrics.py | 49 + + tools/perf/pmu-events/common_metrics.py | 19 + + tools/perf/pmu-events/intel_metrics.py | 1129 ++++++++++++++++++++ + tools/perf/pmu-events/metric.py | 171 ++- + .../perf/scripts/python/Perf-Trace-Util/Context.c | 2 +- + tools/perf/tests/builtin-test.c | 1 + + tools/perf/tests/dlfilter-test.c | 1 - + tools/perf/tests/kallsyms-split.c | 1 + + tools/perf/tests/make | 8 +- + tools/perf/tests/parse-events.c | 10 +- + tools/perf/tests/pmu.c | 93 +- + tools/perf/tests/shell/addr2line_inlines.sh | 68 ++ + tools/perf/tests/shell/evlist.sh | 9 +- + tools/perf/tests/shell/inject-callchain.sh | 45 + + tools/perf/tests/shell/perf_sched_stats.sh | 64 ++ + tools/perf/tests/shell/sched.sh | 2 +- + tools/perf/tests/shell/script_dlfilter.sh | 10 +- + tools/perf/tests/shell/stat.sh | 2 +- + tools/perf/tests/shell/stat_all_metricgroups.sh | 26 +- + tools/perf/tests/shell/stat_all_metrics.sh | 29 +- + tools/perf/tests/shell/test_arm_coresight.sh | 54 + + tools/perf/tests/shell/test_java_symbol.sh | 4 + + tools/perf/tests/subcmd-help.c | 26 + + tools/perf/tests/sw-clock.c | 3 +- + tools/perf/tests/tests.h | 1 + + tools/perf/tests/util.c | 85 +- + tools/perf/tests/workloads/Build | 2 + + tools/perf/tests/workloads/inlineloop.c | 52 + + tools/perf/ui/browsers/annotate.c | 6 +- + tools/perf/ui/browsers/hists.c | 3 +- + tools/perf/util/Build | 24 +- + tools/perf/util/addr2line.c | 20 +- + tools/perf/util/addr_location.c | 6 +- + tools/perf/util/addr_location.h | 1 - + tools/perf/util/annotate-arch/Build | 11 + + tools/perf/util/annotate-arch/annotate-arc.c | 18 + + .../annotate-arch/annotate-arm.c} | 50 +- + .../annotate-arch/annotate-arm64.c} | 59 +- + .../annotate-arch/annotate-csky.c} | 29 +- + .../annotate-arch/annotate-loongarch.c} | 69 +- + .../annotate-arch/annotate-mips.c} | 29 +- + .../annotate-arch/annotate-powerpc.c} | 127 ++- + tools/perf/util/annotate-arch/annotate-riscv64.c | 41 + + .../annotate-arch/annotate-s390.c} | 66 +- + .../annotate-arch/annotate-sparc.c} | 28 +- + .../annotate-arch/annotate-x86.c} | 91 +- + tools/perf/util/annotate-data.c | 12 +- + tools/perf/util/annotate-data.h | 2 +- + tools/perf/util/annotate.c | 93 +- + tools/perf/util/annotate.h | 10 +- + tools/perf/util/archinsn.h | 12 - + .../perf/util/arm64-frame-pointer-unwind-support.c | 3 +- + tools/perf/util/blake2s.c | 151 +++ + tools/perf/util/blake2s.h | 73 ++ + tools/perf/util/bpf-event.c | 14 +- + tools/perf/util/bpf-utils.c | 4 +- + tools/perf/util/bpf_lock_contention.c | 2 +- + tools/perf/util/callchain.c | 16 +- + tools/perf/util/callchain.h | 2 +- + tools/perf/util/cap.c | 3 +- + tools/perf/util/capstone.c | 18 +- + tools/perf/util/config.c | 4 + + tools/perf/util/cs-etm.c | 4 +- + tools/perf/util/data-convert-bt.c | 37 +- + tools/perf/util/data-convert-json.c | 42 +- + tools/perf/util/data-convert.h | 1 + + tools/perf/util/data.c | 29 +- + tools/perf/util/db-export.c | 1 - + tools/perf/util/demangle-java.c | 2 +- + tools/perf/util/disasm.c | 441 +++----- + tools/perf/util/disasm.h | 93 +- + tools/perf/util/dlfilter.c | 3 +- + tools/perf/util/dso.c | 212 +++- + tools/perf/util/dso.h | 47 +- + tools/perf/util/dwarf-regs-arch/Build | 9 + + tools/perf/util/dwarf-regs-arch/dwarf-regs-arm.c | 12 + + tools/perf/util/dwarf-regs-arch/dwarf-regs-arm64.c | 12 + + tools/perf/util/dwarf-regs-arch/dwarf-regs-csky.c | 126 +++ + .../util/dwarf-regs-arch/dwarf-regs-loongarch.c | 12 + + tools/perf/util/dwarf-regs-arch/dwarf-regs-mips.c | 14 + + .../perf/util/dwarf-regs-arch/dwarf-regs-powerpc.c | 136 +++ + tools/perf/util/dwarf-regs-arch/dwarf-regs-riscv.c | 12 + + tools/perf/util/dwarf-regs-arch/dwarf-regs-s390.c | 53 + + tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c | 260 +++++ + tools/perf/util/dwarf-regs-csky.c | 50 - + tools/perf/util/dwarf-regs-powerpc.c | 61 -- + tools/perf/util/dwarf-regs-x86.c | 50 - + tools/perf/util/dwarf-regs.c | 151 ++- + tools/perf/util/env.c | 29 + + tools/perf/util/env.h | 17 + + tools/perf/util/event.c | 54 +- + tools/perf/util/event.h | 2 + + tools/perf/util/evlist.c | 34 +- + tools/perf/util/evsel.c | 156 ++- + tools/perf/util/evsel.h | 6 +- + tools/perf/util/evsel_config.h | 7 +- + tools/perf/util/evsel_fprintf.c | 8 +- + tools/perf/util/genelf.c | 58 +- + tools/perf/util/generate-cmdlist.sh | 70 -- + tools/perf/util/header.c | 277 +++++ + tools/perf/util/header.h | 4 + + tools/perf/util/hist.c | 18 +- + tools/perf/util/hwmon_pmu.c | 2 +- + tools/perf/util/include/dwarf-regs.h | 28 +- + tools/perf/util/jitdump.c | 5 +- + tools/perf/util/libbfd.c | 6 +- + tools/perf/util/libdw.c | 172 +++ + tools/perf/util/libdw.h | 58 + + tools/perf/util/llvm.c | 8 +- + tools/perf/util/lzma.c | 6 +- + tools/perf/util/machine.c | 115 +- + tools/perf/util/map_symbol.c | 5 +- + tools/perf/util/map_symbol.h | 3 +- + tools/perf/util/maps.c | 37 +- + tools/perf/util/maps.h | 4 + + tools/perf/util/metricgroup.c | 5 +- + tools/perf/util/parse-events.c | 250 +++-- + tools/perf/util/parse-regs-options.c | 106 +- + tools/perf/util/perf-regs-arch/perf_regs_csky.c | 19 +- + tools/perf/util/perf_regs.c | 125 ++- + tools/perf/util/perf_regs.h | 24 +- + tools/perf/util/pmu.c | 95 +- + tools/perf/util/pmu.h | 34 +- + tools/perf/util/print-events.c | 11 +- + tools/perf/util/record.h | 2 + + tools/perf/util/sample.c | 77 ++ + tools/perf/util/sample.h | 7 + + .../util/scripting-engines/trace-event-python.c | 24 +- + tools/perf/util/session.c | 140 ++- + tools/perf/util/session.h | 1 + + tools/perf/util/sha1.c | 97 -- + tools/perf/util/sha1.h | 6 - + tools/perf/util/sort.c | 101 +- + tools/perf/util/srcline.c | 116 +- + tools/perf/util/srcline.h | 3 + + tools/perf/util/stat-display.c | 26 +- + tools/perf/util/strlist.c | 37 +- + tools/perf/util/strlist.h | 2 - + tools/perf/util/symbol-elf.c | 6 +- + tools/perf/util/symbol.c | 17 +- + tools/perf/util/symbol_conf.h | 10 + + tools/perf/util/synthetic-events.c | 196 ++++ + tools/perf/util/synthetic-events.h | 3 + + tools/perf/util/thread-stack.c | 4 +- + tools/perf/util/thread.c | 62 +- + tools/perf/util/thread.h | 16 +- + tools/perf/util/thread_map.c | 18 +- + tools/perf/util/time-utils.c | 4 +- + tools/perf/util/tool.c | 20 + + tools/perf/util/tool.h | 4 +- + tools/perf/util/tp_pmu.c | 2 +- + tools/perf/util/trace-event-info.c | 2 +- + tools/perf/util/trace-event-scripting.c | 16 - + tools/perf/util/trace-event.h | 3 - + tools/perf/util/units.c | 2 +- + tools/perf/util/unwind-libdw.c | 162 ++- + tools/perf/util/unwind-libdw.h | 11 +- + tools/perf/util/unwind-libunwind-local.c | 9 +- + tools/perf/util/util.c | 49 + + tools/perf/util/util.h | 5 + + 260 files changed, 12646 insertions(+), 3116 deletions(-) + delete mode 100644 tools/build/feature/test-libbfd-buildid.c + create mode 100644 tools/build/feature/test-libbfd-threadsafe.c + create mode 100644 tools/lib/perf/include/perf/schedstat-v15.h + create mode 100644 tools/lib/perf/include/perf/schedstat-v16.h + create mode 100644 tools/lib/perf/include/perf/schedstat-v17.h + delete mode 100644 tools/perf/arch/arc/annotate/instructions.c + delete mode 100644 tools/perf/arch/arm/util/unwind-libdw.c + delete mode 100644 tools/perf/arch/arm64/util/unwind-libdw.c + delete mode 100644 tools/perf/arch/csky/util/unwind-libdw.c + delete mode 100644 tools/perf/arch/loongarch/util/unwind-libdw.c + delete mode 100644 tools/perf/arch/powerpc/util/unwind-libdw.c + delete mode 100644 tools/perf/arch/riscv/util/unwind-libdw.c + delete mode 100644 tools/perf/arch/riscv64/annotate/instructions.c + delete mode 100644 tools/perf/arch/s390/util/unwind-libdw.c + delete mode 100644 tools/perf/arch/x86/util/archinsn.c + delete mode 100644 tools/perf/arch/x86/util/unwind-libdw.c + delete mode 100644 tools/perf/command-list.txt + create mode 100755 tools/perf/pmu-events/amd_metrics.py + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a510/pmu.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/fujitsu/monaka/pmu.json + create mode 100644 tools/perf/pmu-events/arch/riscv/openhwgroup/cva6/firmware.json + create mode 100644 tools/perf/pmu-events/arch/riscv/openhwgroup/cva6/instructions.json + create mode 100644 tools/perf/pmu-events/arch/riscv/openhwgroup/cva6/memory.json + create mode 100644 tools/perf/pmu-events/arch/riscv/openhwgroup/cva6/microarch.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen6/branch-prediction.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen6/decode.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen6/execution.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen6/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen6/inst-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen6/l2-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen6/l3-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen6/load-store.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen6/memory-controller.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen6/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen6/recommended.json + create mode 100755 tools/perf/pmu-events/arm64_metrics.py + create mode 100644 tools/perf/pmu-events/common_metrics.py + create mode 100755 tools/perf/pmu-events/intel_metrics.py + create mode 100755 tools/perf/tests/shell/addr2line_inlines.sh + create mode 100755 tools/perf/tests/shell/inject-callchain.sh + create mode 100755 tools/perf/tests/shell/perf_sched_stats.sh + create mode 100644 tools/perf/tests/workloads/inlineloop.c + create mode 100644 tools/perf/util/annotate-arch/Build + create mode 100644 tools/perf/util/annotate-arch/annotate-arc.c + rename tools/perf/{arch/arm/annotate/instructions.c => util/annotate-arch/annotate-arm.c} (59%) + rename tools/perf/{arch/arm64/annotate/instructions.c => util/annotate-arch/annotate-arm64.c} (70%) + rename tools/perf/{arch/csky/annotate/instructions.c => util/annotate-arch/annotate-csky.c} (67%) + rename tools/perf/{arch/loongarch/annotate/instructions.c => util/annotate-arch/annotate-loongarch.c} (60%) + rename tools/perf/{arch/mips/annotate/instructions.c => util/annotate-arch/annotate-mips.c} (59%) + rename tools/perf/{arch/powerpc/annotate/instructions.c => util/annotate-arch/annotate-powerpc.c} (73%) + create mode 100644 tools/perf/util/annotate-arch/annotate-riscv64.c + rename tools/perf/{arch/s390/annotate/instructions.c => util/annotate-arch/annotate-s390.c} (66%) + rename tools/perf/{arch/sparc/annotate/instructions.c => util/annotate-arch/annotate-sparc.c} (85%) + rename tools/perf/{arch/x86/annotate/instructions.c => util/annotate-arch/annotate-x86.c} (93%) + delete mode 100644 tools/perf/util/archinsn.h + create mode 100644 tools/perf/util/blake2s.c + create mode 100644 tools/perf/util/blake2s.h + create mode 100644 tools/perf/util/dwarf-regs-arch/Build + create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-arm.c + create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-arm64.c + create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-csky.c + create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-loongarch.c + create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-mips.c + create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-powerpc.c + create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-riscv.c + create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-s390.c + create mode 100644 tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c + delete mode 100644 tools/perf/util/dwarf-regs-csky.c + delete mode 100644 tools/perf/util/dwarf-regs-powerpc.c + delete mode 100644 tools/perf/util/dwarf-regs-x86.c + delete mode 100755 tools/perf/util/generate-cmdlist.sh + create mode 100644 tools/perf/util/libdw.c + create mode 100644 tools/perf/util/libdw.h + delete mode 100644 tools/perf/util/sha1.c + delete mode 100644 tools/perf/util/sha1.h +Merging compiler-attributes/compiler-attributes (8f0b4cce4481f Linux 6.19-rc1) +$ 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/dma-mapping-for-next (8a840ab0567ff dma-mapping: Remove dma_mark_clean (again)) +$ git merge -m Merge branch 'dma-mapping-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next +Merge made by the 'ort' strategy. + include/linux/dma-map-ops.h | 8 -------- + kernel/dma/Kconfig | 6 ------ + kernel/dma/direct.c | 3 --- + kernel/dma/direct.h | 3 --- + 4 files changed, 20 deletions(-) +Merging asm-generic/master (adbbd9714f805 scripts: headers_install.sh: Remove config leak ignore machinery) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic asm-generic/master +Merge made by the 'ort' strategy. + arch/arc/Kconfig | 5 --- + arch/arc/Makefile | 3 +- + arch/arc/include/uapi/asm/swab.h | 63 -------------------------------- + arch/arm/include/asm/processor.h | 3 +- + arch/arm/include/uapi/asm/ptrace.h | 9 ----- + arch/arm/kernel/signal.c | 3 +- + arch/nios2/include/{uapi => }/asm/swab.h | 0 + arch/x86/include/uapi/asm/auxvec.h | 2 +- + include/asm-generic/topology.h | 8 +--- + scripts/headers_install.sh | 30 +-------------- + 10 files changed, 10 insertions(+), 116 deletions(-) + rename arch/nios2/include/{uapi => }/asm/swab.h (100%) +Merging alpha/alpha-next (d58041d2c63e0 MAINTAINERS: Add Magnus Lindholm as maintainer for alpha port) +$ git merge -m Merge branch 'alpha-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next +Already up to date. +Merging arm/for-next (d37561b214ee2 Merge branches 'fixes' and 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Merge made by the 'ort' strategy. + arch/arm/mm/physaddr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arm64/for-next/core (36c0de02575ce perf/arm-cmn: Reject unsupported hardware configurations) +$ git merge -m Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/kvm_emulate.h +Auto-merging arch/arm64/include/asm/thread_info.h +Auto-merging arch/arm64/kernel/ptrace.c +Auto-merging arch/arm64/kvm/at.c +Auto-merging arch/arm64/kvm/hyp/entry.S +CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp/entry.S +Auto-merging arch/arm64/kvm/mmu.c +Auto-merging arch/arm64/mm/proc.S +Auto-merging arch/arm64/net/bpf_jit_comp.c +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'arch/arm64/kvm/hyp/entry.S' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 162ebbeb33109] Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/arch/arm64/booting.rst | 12 +++ + Documentation/arch/arm64/elf_hwcaps.rst | 7 ++ + Documentation/arch/arm64/silicon-errata.rst | 1 + + Documentation/virt/kvm/api.rst | 43 +++++++++-- + MAINTAINERS | 2 + + arch/arm/include/asm/syscall.h | 2 - + arch/arm64/Kbuild | 4 + + arch/arm64/Kconfig | 52 +++++-------- + arch/arm64/include/asm/assembler.h | 10 +++ + arch/arm64/include/asm/cpucaps.h | 2 - + arch/arm64/include/asm/el2_setup.h | 12 ++- + arch/arm64/include/asm/esr.h | 8 ++ + arch/arm64/include/asm/hwcap.h | 1 + + arch/arm64/include/asm/insn.h | 23 ------ + arch/arm64/include/asm/kvm_emulate.h | 7 ++ + arch/arm64/include/asm/lse.h | 9 --- + arch/arm64/include/asm/rwonce.h | 2 +- + arch/arm64/include/asm/syscall.h | 18 +++-- + arch/arm64/include/asm/thread_info.h | 6 -- + arch/arm64/include/asm/uaccess.h | 6 +- + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/kernel/cpu_errata.c | 31 ++++++++ + arch/arm64/kernel/cpufeature.c | 34 +++++++-- + arch/arm64/kernel/cpuinfo.c | 1 + + arch/arm64/kernel/kexec_image.c | 2 +- + arch/arm64/kernel/probes/uprobes.c | 5 +- + arch/arm64/kernel/proton-pack.c | 1 + + arch/arm64/kernel/ptrace.c | 50 ++++++++---- + arch/arm64/kernel/topology.c | 66 +++++++++++++++- + arch/arm64/kvm/at.c | 7 -- + arch/arm64/kvm/inject_fault.c | 34 +++++++++ + arch/arm64/kvm/mmio.c | 27 ++++++- + arch/arm64/kvm/mmu.c | 14 +++- + arch/arm64/lib/insn.c | 2 - + arch/arm64/mm/gcs.c | 4 +- + arch/arm64/mm/ioremap.c | 3 +- + arch/arm64/mm/proc.S | 10 +-- + arch/arm64/net/bpf_jit_comp.c | 7 -- + arch/arm64/tools/cpucaps | 3 + + arch/xtensa/include/asm/syscall.h | 1 - + drivers/acpi/arm64/agdi.c | 101 ++++++++++++++++++++++--- + drivers/base/arch_topology.c | 9 ++- + drivers/cpufreq/cpufreq.c | 6 ++ + drivers/perf/arm-cmn.c | 19 ++++- + drivers/perf/arm_dsu_pmu.c | 37 +++++---- + drivers/perf/arm_spe_pmu.c | 18 +++-- + drivers/perf/cxl_pmu.c | 2 +- + drivers/perf/riscv_pmu_sbi.c | 2 +- + drivers/perf/starfive_starlink_pmu.c | 3 +- + include/linux/cpufreq.h | 5 ++ + include/uapi/linux/kvm.h | 3 +- + tools/testing/selftests/arm64/Makefile | 6 +- + tools/testing/selftests/arm64/abi/hwcap.c | 49 ++++++++++++ + tools/testing/selftests/arm64/abi/tpidr2.c | 3 +- + tools/testing/selftests/arm64/fp/fp-pidbench.S | 6 +- + tools/testing/selftests/arm64/gcs/basic-gcs.c | 40 ++++------ + tools/testing/selftests/arm64/mte/.gitignore | 1 + + 57 files changed, 627 insertions(+), 213 deletions(-) +$ git am -3 ../patches/0001-KVM-arm64-Fix-up-mismerge.patch +Applying: KVM: arm64: Fix up mismerge +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm64/kvm/hyp/entry.S +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 0a643794f8f7c] Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux + Date: Thu Feb 5 12:40:29 2026 +0000 +Merging arm-perf/for-next/perf (ab26d9c85554c perf/cxlpmu: Replace IRQF_ONESHOT with IRQF_NO_THREAD) +$ git merge -m Merge branch 'for-next/perf' of https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (1c94e21cdb348 soc: document merges) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/irqchip/irq-ls-extirq.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-tee | 10 + + Documentation/devicetree/bindings/arm/altera.yaml | 27 + + Documentation/devicetree/bindings/arm/amlogic.yaml | 8 + + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 3 + + .../devicetree/bindings/arm/atmel-at91.yaml | 6 +- + Documentation/devicetree/bindings/arm/cix.yaml | 6 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 34 +- + .../devicetree/bindings/arm/intel,socfpga.yaml | 40 - + .../devicetree/bindings/arm/mediatek.yaml | 2 + + .../bindings/arm/mediatek/mediatek,audsys.yaml | 46 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 33 + + Documentation/devicetree/bindings/arm/realtek.yaml | 42 +- + .../devicetree/bindings/arm/rockchip.yaml | 42 +- + .../bindings/arm/tegra/nvidia,tegra186-pmc.yaml | 11 +- + .../devicetree/bindings/cache/qcom,llcc.yaml | 46 +- + .../bindings/clock/google,gs101-clock.yaml | 21 +- + .../bindings/clock/qcom,x1e80100-gcc.yaml | 8 +- + .../devicetree/bindings/crypto/qcom,prng.yaml | 1 + + .../display/tegra/nvidia,tegra114-mipi.yaml | 1 + + .../bindings/display/tegra/nvidia,tegra20-vi.yaml | 19 +- + .../bindings/display/tegra/nvidia,tegra20-vip.yaml | 9 +- + .../bindings/dma/nvidia,tegra210-adma.yaml | 15 +- + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 3 + + .../bindings/input/touchscreen/goodix.yaml | 2 + + .../interrupt-controller/fsl,qe-ports-ic.yaml | 51 + + .../bindings/interrupt-controller/qcom,pdc.yaml | 2 + + .../bindings/interrupt-controller/riscv,aplic.yaml | 1 + + .../interrupt-controller/riscv,imsics.yaml | 1 + + .../devicetree/bindings/iommu/arm,smmu-v3.yaml | 27 +- + .../bindings/iommu/nvidia,tegra264-cmdqv.yaml | 42 + + .../bindings/mailbox/qcom,cpucp-mbox.yaml | 2 + + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 2 + + .../devicetree/bindings/media/st,stm32-dcmipp.yaml | 3 + + .../bindings/media/st,stm32mp25-csi.yaml | 3 + + .../memory-controllers/ddr/jedec,ddr4.yaml | 34 + + .../memory-controllers/ddr/jedec,lpddr-props.yaml | 74 - + .../memory-controllers/ddr/jedec,lpddr2.yaml | 2 +- + .../memory-controllers/ddr/jedec,lpddr3.yaml | 2 +- + .../memory-controllers/ddr/jedec,lpddr4.yaml | 2 +- + .../memory-controllers/ddr/jedec,lpddr5.yaml | 2 +- + ...lpddr-channel.yaml => jedec,sdram-channel.yaml} | 40 +- + .../memory-controllers/ddr/jedec,sdram-props.yaml | 94 + + .../memory-controllers/nvidia,tegra186-mc.yaml | 13 + + .../bindings/mtd/nvidia,tegra20-nand.yaml | 102 + + .../bindings/mtd/nvidia-tegra20-nand.txt | 64 - + .../bindings/nvmem/google,gs101-otp.yaml | 61 + + .../devicetree/bindings/power/fsl,imx-gpc.yaml | 3 + + .../bindings/remoteproc/qcom,pas-common.yaml | 3 + + Documentation/devicetree/bindings/riscv/cpus.yaml | 1 + + .../devicetree/bindings/riscv/extensions.yaml | 194 +- + .../devicetree/bindings/riscv/spacemit.yaml | 5 + + .../devicetree/bindings/riscv/starfive.yaml | 1 + + .../bindings/rng/samsung,exynos5250-trng.yaml | 13 +- + .../bindings/soc/altera/altr,sys-mgr.yaml | 6 +- + .../soc/mediatek/mediatek,mt8183-dvfsrc.yaml | 6 + + .../soc/renesas/renesas,rzn1-gpioirqmux.yaml | 87 + + .../bindings/soc/samsung/exynos-pmu.yaml | 26 +- + .../bindings/soc/spacemit/spacemit,k1-syscon.yaml | 8 +- + Documentation/devicetree/bindings/sram/sram.yaml | 2 + + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + .../devicetree/bindings/tpm/tcg,tpm-tis-i2c.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 10 + + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 1 + + .../bindings/watchdog/xlnx,versal-wwdt.yaml | 3 + + Documentation/driver-api/tee.rst | 18 +- + MAINTAINERS | 9 +- + arch/arm/arm-soc-for-next-contents.txt | 187 ++ + .../dts/allwinner/sun4i-a10-dserve-dsrv9703c.dts | 2 +- + .../dts/allwinner/sun4i-a10-pov-protab2-ips9.dts | 2 +- + arch/arm/boot/dts/allwinner/sun5i-a13-utoo-p66.dts | 1 + + .../boot/dts/allwinner/sun6i-a31-hummingbird.dts | 2 +- + arch/arm/boot/dts/allwinner/sun6i-a31s-primo81.dts | 2 +- + arch/arm/boot/dts/allwinner/sun8i-t113s.dtsi | 33 + + arch/arm/boot/dts/amlogic/meson.dtsi | 5 - + arch/arm/boot/dts/arm/vexpress-v2m-rs1.dtsi | 8 +- + arch/arm/boot/dts/aspeed/Makefile | 3 + + arch/arm/boot/dts/aspeed/aspeed-ast2600-evb.dts | 7 +- + .../boot/dts/aspeed/aspeed-bmc-asrock-altrad8.dts | 637 +++++ + .../dts/aspeed/aspeed-bmc-facebook-anacapa.dts | 1045 ++++++++ + .../dts/aspeed/aspeed-bmc-facebook-bletchley.dts | 112 +- + .../dts/aspeed/aspeed-bmc-facebook-clemente.dts | 43 +- + .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 8 +- + .../aspeed/aspeed-bmc-facebook-santabarbara.dts | 29 +- + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 128 +- + .../boot/dts/aspeed/aspeed-bmc-nvidia-msx4-bmc.dts | 246 ++ + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 12 +- + arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi | 64 +- + arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi | 64 +- + arch/arm/boot/dts/broadcom/bcm2711.dtsi | 4 +- + arch/arm/boot/dts/intel/socfpga/socfpga.dtsi | 6 +- + .../boot/dts/intel/socfpga/socfpga_arria10.dtsi | 6 +- + arch/arm/boot/dts/microchip/Makefile | 3 +- + arch/arm/boot/dts/microchip/lan966x-pcb8385.dts | 131 + + arch/arm/boot/dts/microchip/sama7d65.dtsi | 279 +++ + arch/arm/boot/dts/microchip/usb_a9g20-dab-mmx.dtsi | 93 - + .../boot/dts/nuvoton/nuvoton-common-npcm7xx.dtsi | 4 +- + arch/arm/boot/dts/nvidia/tegra20.dtsi | 4 + + arch/arm/boot/dts/nvidia/tegra30.dtsi | 8 + + arch/arm/boot/dts/nxp/imx/e60k02.dtsi | 35 +- + arch/arm/boot/dts/nxp/imx/imx50-kobo-aura.dts | 60 +- + arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi | 6 +- + .../boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi | 6 +- + .../dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi | 3 + + .../boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts | 55 +- + arch/arm/boot/dts/nxp/imx/imx6sl-tolino-shine3.dts | 26 + + arch/arm/boot/dts/nxp/imx/imx6sl.dtsi | 2 +- + .../boot/dts/nxp/imx/imx6sll-kobo-clara2e-b.dts | 61 +- + arch/arm/boot/dts/nxp/imx/imx6sll-kobo-clarahd.dts | 26 + + arch/arm/boot/dts/nxp/imx/imx6sll.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6sx.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts | 6 +- + arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi | 6 +- + .../dts/nxp/imx/imx6ul-phytec-phycore-som.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi | 12 +- + .../boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi | 12 +- + .../boot/dts/nxp/imx/imx6ull-myir-mys-6ulx.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts | 6 +- + arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi | 8 +- + arch/arm/boot/dts/nxp/lpc/lpc3250-ea3250.dts | 18 +- + arch/arm/boot/dts/nxp/lpc/lpc3250-phy3250.dts | 8 +- + arch/arm/boot/dts/nxp/lpc/lpc32xx.dtsi | 135 +- + .../arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts | 13 - + arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 4 +- + .../dts/qcom/qcom-msm8960-samsung-expressatt.dts | 109 + + arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 96 + + .../qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 14 +- + .../boot/dts/qcom/qcom-msm8974-samsung-hlte.dts | 12 - + .../dts/qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 12 - + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 50 +- + .../dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 8 - + arch/arm/boot/dts/qcom/qcom-msm8974pro-htc-m8.dts | 11 - + .../dts/qcom/qcom-msm8974pro-oneplus-bacon.dts | 9 - + .../qcom/qcom-msm8974pro-samsung-klte-common.dtsi | 11 +- + ...qcom-msm8974pro-sony-xperia-shinano-common.dtsi | 12 - + .../dts/renesas/gr-peach-audiocamerashield.dtsi | 75 - + .../boot/dts/renesas/r8a77xx-aa121td01-panel.dtsi | 39 - + arch/arm/boot/dts/renesas/r9a06g032.dtsi | 165 ++ + arch/arm/boot/dts/rockchip/rk3036.dtsi | 3 - + arch/arm/boot/dts/rockchip/rk3288.dtsi | 17 +- + arch/arm/boot/dts/samsung/s3c6400.dtsi | 38 - + arch/arm/boot/dts/st/spear320s.dtsi | 24 - + arch/arm/boot/dts/st/stm32429i-eval.dts | 73 +- + arch/arm/boot/dts/st/stm32746g-eval.dts | 15 +- + arch/arm/boot/dts/st/stm32f429-disco.dts | 15 +- + arch/arm/boot/dts/st/stm32f469-disco.dts | 15 +- + arch/arm/boot/dts/st/stm32f746-disco.dts | 12 +- + arch/arm/boot/dts/st/stm32f769-disco.dts | 14 +- + arch/arm/boot/dts/st/stm32h743i-disco.dts | 34 + + arch/arm/boot/dts/st/stm32h743i-eval.dts | 25 + + arch/arm/boot/dts/st/stm32h747i-disco.dts | 15 +- + arch/arm/boot/dts/st/stm32mp135f-dk.dts | 15 +- + arch/arm/boot/dts/st/stm32mp157c-ed1.dts | 15 +- + arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 3 +- + arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 19 +- + arch/arm/boot/dts/st/stm32mp15xxab-pinctrl.dtsi | 57 - + arch/arm/boot/dts/ti/omap/Makefile | 1 - + arch/arm/boot/dts/ti/omap/am335x-baltos-leds.dtsi | 1 + + arch/arm/boot/dts/ti/omap/am335x-base0033.dts | 92 - + arch/arm/boot/dts/ti/omap/am3703.dtsi | 14 - + arch/arm/boot/dts/ti/omap/am3715.dtsi | 10 - + arch/arm/boot/dts/ti/omap/dra7-l4.dtsi | 1 - + arch/arm/boot/dts/ti/omap/omap2430.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap3.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap3430es1-clocks.dtsi | 237 -- + arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts | 5 + + arch/arm/boot/dts/ti/omap/omap4-l4-abe.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap4-l4.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap5-l4.dtsi | 2 +- + arch/arm/boot/dts/tps65910.dtsi | 4 + + arch/arm/configs/imx_v4_v5_defconfig | 12 +- + arch/arm/configs/imx_v6_v7_defconfig | 3 +- + arch/arm/configs/multi_v7_defconfig | 51 +- + arch/arm/configs/shmobile_defconfig | 2 +- + arch/arm/mach-at91/at91rm9200.c | 12 +- + arch/arm/mach-at91/at91sam9.c | 12 +- + arch/arm/mach-at91/sam9x60.c | 12 +- + arch/arm/mach-at91/sam9x7.c | 12 +- + arch/arm/mach-at91/sama5.c | 21 +- + arch/arm/mach-at91/sama7.c | 11 +- + arch/arm/mach-omap1/Kconfig | 1 - + arch/arm/mach-omap2/control.c | 14 +- + arch/arm64/Kconfig.platforms | 2 +- + arch/arm64/boot/dts/airoha/en7581-evb.dts | 6 +- + arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 14 + + arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi | 94 + + .../boot/dts/allwinner/sun55i-t527-orangepi-4a.dts | 15 + + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 2 +- + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 2 +- + .../dts/altera/socfpga_stratix10_socdk_nand.dts | 4 +- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 13 +- + .../boot/dts/amlogic/amlogic-t7-a311d2-an400.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 5 +- + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9 + + arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts | 9 - + .../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 9 - + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 9 - + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 9 - + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 9 - + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 8 + + .../dts/amlogic/meson-g12b-a311d-libretech-cc.dts | 13 - + arch/arm64/boot/dts/amlogic/meson-g12b-a311d.dtsi | 24 + + .../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 1 - + .../meson-g12b-bananapi-cm4-mnt-reform2.dts | 1 - + .../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 12 - + .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 13 - + .../boot/dts/amlogic/meson-g12b-dreambox.dtsi | 1 - + .../arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts | 1 - + .../boot/dts/amlogic/meson-g12b-gtking-pro.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 1 - + .../boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 12 - + .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 13 - + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 1 - + .../boot/dts/amlogic/meson-g12b-odroid-n2l.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi | 12 - + .../boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 51 +- + arch/arm64/boot/dts/amlogic/meson-g12b-s922x.dtsi | 24 + + .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 12 - + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 7 + + .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 1 - + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 1 - + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 1 - + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 1 - + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 1 - + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 1 - + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 1 - + .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 1 - + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9 + + .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 1 - + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 1 - + .../dts/amlogic/meson-gxl-s805y-xiaomi-aquaman.dts | 1 - + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 1 - + .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 1 - + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 1 - + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 1 - + .../boot/dts/amlogic/meson-gxl-s905x-vero4k.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 9 + + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 1 - + .../boot/dts/amlogic/meson-gxm-mecool-kiii-pro.dts | 2 +- + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 1 - + .../dts/amlogic/meson-libretech-cottonwood.dtsi | 1 - + .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 2 +- + .../dts/amlogic/meson-s4-s905y4-khadas-vim1s.dts | 259 ++ + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13 +- + .../boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 1 - + .../boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi | 8 - + .../boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 1 - + .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 1 - + .../arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 8 - + arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 1 - + .../boot/dts/amlogic/meson-sm1-khadas-vim3l.dts | 8 - + .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2 + + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 12 +- + .../dts/amlogic/meson-sm1-s905d3-libretech-cc.dts | 9 - + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 9 - + .../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 8 + + arch/arm64/boot/dts/apm/apm-merlin.dts | 1 + + arch/arm64/boot/dts/apm/apm-mustang.dts | 1 + + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 20 +- + arch/arm64/boot/dts/apm/apm-storm.dtsi | 4 +- + arch/arm64/boot/dts/apple/s8001-j98a-j99a.dtsi | 4 + + arch/arm64/boot/dts/apple/s8001.dtsi | 7 + + arch/arm64/boot/dts/apple/t6001.dtsi | 1 + + arch/arm64/boot/dts/apple/t6002-j375d.dts | 150 ++ + arch/arm64/boot/dts/apple/t6002.dtsi | 1 + + arch/arm64/boot/dts/apple/t600x-die0.dtsi | 6 + + arch/arm64/boot/dts/apple/t600x-dieX.dtsi | 212 ++ + arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi | 236 ++ + arch/arm64/boot/dts/apple/t600x-j375.dtsi | 272 ++ + arch/arm64/boot/dts/apple/t6022-j180d.dts | 417 ++++ + arch/arm64/boot/dts/apple/t6022-j475d.dts | 31 + + arch/arm64/boot/dts/apple/t6022-jxxxd.dtsi | 133 + + arch/arm64/boot/dts/apple/t602x-die0.dtsi | 6 + + arch/arm64/boot/dts/apple/t602x-dieX.dtsi | 212 ++ + arch/arm64/boot/dts/apple/t8103-j274.dts | 13 + + arch/arm64/boot/dts/apple/t8103-j293.dts | 13 + + arch/arm64/boot/dts/apple/t8103-j313.dts | 13 + + arch/arm64/boot/dts/apple/t8103-j456.dts | 13 + + arch/arm64/boot/dts/apple/t8103-j457.dts | 13 + + arch/arm64/boot/dts/apple/t8103-jxxx.dtsi | 134 + + arch/arm64/boot/dts/apple/t8103-pmgr.dtsi | 3 + + arch/arm64/boot/dts/apple/t8103.dtsi | 111 + + arch/arm64/boot/dts/apple/t8112-j413.dts | 13 + + arch/arm64/boot/dts/apple/t8112-j415.dts | 13 + + arch/arm64/boot/dts/apple/t8112-j473.dts | 32 + + arch/arm64/boot/dts/apple/t8112-j493.dts | 13 + + arch/arm64/boot/dts/apple/t8112-jxxx.dtsi | 134 + + arch/arm64/boot/dts/apple/t8112.dtsi | 111 + + arch/arm64/boot/dts/arm/morello-fvp.dts | 8 +- + arch/arm64/boot/dts/arm/morello-sdp.dts | 7 + + arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 15 + + .../dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts | 3 - + .../boot/dts/broadcom/northstar2/ns2-clock.dtsi | 105 - + .../arm64/boot/dts/broadcom/northstar2/ns2-svk.dts | 26 +- + .../arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts | 2 +- + arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 87 +- + .../boot/dts/broadcom/stingray/bcm958742-base.dtsi | 2 +- + .../boot/dts/broadcom/stingray/stingray-clock.dtsi | 182 -- + .../boot/dts/broadcom/stingray/stingray-fs4.dtsi | 130 +- + .../boot/dts/broadcom/stingray/stingray-pcie.dtsi | 2 +- + .../dts/broadcom/stingray/stingray-pinctrl.dtsi | 2 +- + .../boot/dts/broadcom/stingray/stingray-usb.dtsi | 21 +- + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 148 +- + arch/arm64/boot/dts/cavium/Makefile | 1 - + arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 8 +- + arch/arm64/boot/dts/cavium/thunder2-99xx.dts | 30 - + arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi | 144 -- + arch/arm64/boot/dts/cix/Makefile | 1 + + arch/arm64/boot/dts/cix/sky1-xcp.dts | 83 + + arch/arm64/boot/dts/cix/sky1.dtsi | 2 +- + arch/arm64/boot/dts/exynos/exynosautov920.dtsi | 11 + + arch/arm64/boot/dts/exynos/google/gs101.dtsi | 42 +- + arch/arm64/boot/dts/freescale/Makefile | 48 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 +- + .../fsl-ls1028a-tqmls1028a-mbls1028a-ind.dts | 68 + + .../freescale/fsl-ls1028a-tqmls1028a-mbls1028a.dts | 118 + + .../fsl-ls1028a-tqmls1028a-mbls1028a.dtsi | 287 +++ + .../boot/dts/freescale/fsl-ls1028a-tqmls1028a.dtsi | 124 + + .../boot/dts/freescale/fsl-ls1046a-tqmls1046a.dtsi | 12 + + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 6 +- + .../arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 32 +- + .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 4 + + arch/arm64/boot/dts/freescale/imx8-ss-ddr.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8dxl-ss-ddr.dtsi | 22 + + arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 7 + + .../boot/dts/freescale/imx8mm-phycore-rpmsg.dtso | 2 +- + .../boot/dts/freescale/imx8mm-phycore-som.dtsi | 1 + + .../boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts | 13 +- + .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 39 +- + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 15 + + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 2 +- + .../boot/dts/freescale/imx8mn-tqma8mqnl-mba8mx.dts | 29 +- + .../arm64/boot/dts/freescale/imx8mn-tqma8mqnl.dtsi | 37 +- + .../freescale/imx8mn-vhip4-evalboard-common.dtsi | 396 +++ + .../imx8mn-vhip4-evalboard-ksz8794-common.dtsi | 98 + + .../imx8mn-vhip4-evalboard-v1-overlay-ksz8794.dtso | 24 + + .../imx8mn-vhip4-evalboard-v1-overlay-ksz9031.dtso | 48 + + .../dts/freescale/imx8mn-vhip4-evalboard-v1.dts | 258 ++ + ...imx8mn-vhip4-evalboard-v2-overlay-adin1300.dtso | 60 + + .../imx8mn-vhip4-evalboard-v2-overlay-ksz8794.dtso | 24 + + .../dts/freescale/imx8mn-vhip4-evalboard-v2.dts | 221 ++ + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 5 + + .../dts/freescale/imx8mp-data-modul-edm-sbc.dts | 148 +- + arch/arm64/boot/dts/freescale/imx8mp-edm-g-wb.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 123 +- + arch/arm64/boot/dts/freescale/imx8mp-frdm.dts | 355 +++ + .../imx8mp-hummingboard-pulse-common.dtsi | 2 +- + .../imx8mp-libra-rdk-fpsc-lvds-etml1010g3dra.dtso | 2 +- + .../imx8mp-libra-rdk-fpsc-lvds-peb-av-10.dtsi | 196 ++ + .../imx8mp-libra-rdk-fpsc-lvds-peb-av-10.dtso | 9 + + ...8mp-libra-rdk-fpsc-lvds-ph128800t006-zhc01.dtso | 44 + + .../boot/dts/freescale/imx8mp-libra-rdk-fpsc.dts | 6 +- + .../imx8mp-phyboard-pollux-peb-wlbt-05.dtso | 108 + + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 33 +- + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 8 + + arch/arm64/boot/dts/freescale/imx8mp-sr-som.dtsi | 6 +- + .../dts/freescale/imx8mp-toradex-smarc-dev.dts | 4 + + .../boot/dts/freescale/imx8mp-toradex-smarc.dtsi | 6 +- + .../freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 23 +- + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 31 +- + .../boot/dts/freescale/imx8mp-var-som-symphony.dts | 145 ++ + arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi | 331 ++- + .../boot/dts/freescale/imx8mp-venice-gw71xx.dtsi | 15 + + .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 4 + + .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 4 + + .../boot/dts/freescale/imx8mp-verdin-mallow.dtsi | 4 + + .../boot/dts/freescale/imx8mp-verdin-yavia.dtsi | 4 + + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 4 - + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 73 +- + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 12 +- + arch/arm64/boot/dts/freescale/imx8qm-ss-ddr.dtsi | 19 + + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 10 +- + .../dts/freescale/imx8qp-apalis-v1.1-eval-v1.2.dts | 26 + + .../boot/dts/freescale/imx8qp-apalis-v1.1-eval.dts | 16 + + .../freescale/imx8qp-apalis-v1.1-ixora-v1.1.dts | 16 + + .../freescale/imx8qp-apalis-v1.1-ixora-v1.2.dts | 16 + + .../boot/dts/freescale/imx8qp-apalis-v1.1.dtsi | 16 + + arch/arm64/boot/dts/freescale/imx8qp.dtsi | 24 + + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 38 +- + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 17 + + arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi | 31 +- + arch/arm64/boot/dts/freescale/imx91-11x11-evk.dts | 181 +- + arch/arm64/boot/dts/freescale/imx91-11x11-frdm.dts | 906 +++++++ + arch/arm64/boot/dts/freescale/imx91.dtsi | 58 + + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 17 +- + arch/arm64/boot/dts/freescale/imx93-11x11-frdm.dts | 807 ++++++ + arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts | 74 + + .../boot/dts/freescale/imx93-9x9-qsb-can1.dtso | 63 + + .../boot/dts/freescale/imx93-var-som-symphony.dts | 84 + + arch/arm64/boot/dts/freescale/imx93-var-som.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx94.dtsi | 172 +- + arch/arm64/boot/dts/freescale/imx943-evk.dts | 178 ++ + arch/arm64/boot/dts/freescale/imx95-15x15-evk.dts | 17 +- + arch/arm64/boot/dts/freescale/imx95-15x15-frdm.dts | 964 +++++++ + arch/arm64/boot/dts/freescale/imx95-clock.h | 1 + + .../boot/dts/freescale/imx95-toradex-smarc.dtsi | 2 +- + .../arm64/boot/dts/freescale/imx95-tqma9596sa.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx95.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx952-clock.h | 215 ++ + arch/arm64/boot/dts/freescale/imx952-evk.dts | 596 +++++ + arch/arm64/boot/dts/freescale/imx952-pinfunc.h | 867 +++++++ + arch/arm64/boot/dts/freescale/imx952-power.h | 44 + + arch/arm64/boot/dts/freescale/imx952.dtsi | 1266 ++++++++++ + arch/arm64/boot/dts/freescale/mba8xx.dtsi | 4 +- + arch/arm64/boot/dts/freescale/s32g3.dtsi | 4 +- + arch/arm64/boot/dts/freescale/s32gxxxa-evb.dtsi | 20 +- + arch/arm64/boot/dts/freescale/s32gxxxa-rdb.dtsi | 20 +- + .../boot/dts/freescale/tqma8xxs-mb-smarc-2.dtsi | 12 +- + arch/arm64/boot/dts/freescale/tqma8xxs.dtsi | 16 +- + arch/arm64/boot/dts/intel/Makefile | 2 + + arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi | 128 +- + .../dts/intel/socfpga_agilex5_socdk_modular.dts | 109 + + arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 2 +- + .../boot/dts/intel/socfpga_agilex_socdk_emmc.dts | 105 + + arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts | 4 +- + arch/arm64/boot/dts/lg/lg131x.dtsi | 2 +- + arch/arm64/boot/dts/marvell/Makefile | 1 + + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 1 + + .../dts/marvell/armada-3720-espressobin-ultra.dts | 2 +- + .../boot/dts/marvell/armada-3720-gl-mv1000.dts | 9 +- + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 3 +- + .../boot/dts/marvell/armada-7020-comexpress.dtsi | 161 ++ + arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 7 + + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 2 + + arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 4 +- + arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 3 +- + arch/arm64/boot/dts/marvell/cn9130-cf-base.dts | 2 +- + arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 3 +- + arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 4 +- + arch/arm64/boot/dts/marvell/cn9131-cf-solidwan.dts | 2 + + .../boot/dts/marvell/cn9131-db-comexpress.dtsi | 3 +- + arch/arm64/boot/dts/marvell/cn9131-db.dtsi | 1 + + arch/arm64/boot/dts/marvell/cn9132-db.dtsi | 3 +- + .../boot/dts/marvell/db-falcon-carrier-a7k.dts | 27 + + arch/arm64/boot/dts/marvell/db-falcon-carrier.dtsi | 22 + + arch/arm64/boot/dts/mediatek/Makefile | 2 + + arch/arm64/boot/dts/mediatek/mt6331.dtsi | 2 +- + .../boot/dts/mediatek/mt6795-sony-xperia-m5.dts | 50 +- + arch/arm64/boot/dts/mediatek/mt6795.dtsi | 3 +- + .../boot/dts/mediatek/mt7981b-openwrt-one.dts | 129 +- + arch/arm64/boot/dts/mediatek/mt7981b.dtsi | 220 +- + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 28 +- + arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi | 34 +- + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 167 +- + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 68 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 28 +- + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 36 +- + .../dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 2 +- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 6 +- + arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 16 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 37 +- + arch/arm64/boot/dts/mediatek/mt8186-evb.dts | 13 + + arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt8188.dtsi | 88 +- + arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 85 + + .../boot/dts/mediatek/mt8370-tungsten-smarc.dts | 14 + + .../boot/dts/mediatek/mt8390-genio-common.dtsi | 150 ++ + .../boot/dts/mediatek/mt8390-tungsten-smarc.dts | 22 + + .../boot/dts/mediatek/mt8390-tungsten-smarc.dtsi | 1489 +++++++++++ + .../boot/dts/mediatek/mt8395-genio-common.dtsi | 150 ++ + .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 150 ++ + .../arm64/boot/dts/nuvoton/nuvoton-npcm845-evb.dts | 1 + + arch/arm64/boot/dts/nuvoton/nuvoton-npcm845.dtsi | 4 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 - + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 15 - + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 25 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 15 - + arch/arm64/boot/dts/nvidia/tegra264-p3834.dtsi | 8 + + arch/arm64/boot/dts/nvidia/tegra264.dtsi | 64 +- + arch/arm64/boot/dts/qcom/Makefile | 30 + + arch/arm64/boot/dts/qcom/agatti.dtsi | 101 +- + arch/arm64/boot/dts/qcom/glymur-ipcc.h | 68 + + arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts | 273 +- + arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi | 80 +- + arch/arm64/boot/dts/qcom/hamoa.dtsi | 114 +- + arch/arm64/boot/dts/qcom/ipq5018.dtsi | 10 +- + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 10 +- + arch/arm64/boot/dts/qcom/kaanapali-ipcc.h | 58 + + arch/arm64/boot/dts/qcom/kaanapali-mtp.dts | 754 ++++++ + arch/arm64/boot/dts/qcom/kaanapali-qrd.dts | 712 ++++++ + arch/arm64/boot/dts/qcom/kaanapali.dtsi | 1606 ++++++++++++ + arch/arm64/boot/dts/qcom/kodiak.dtsi | 15 +- + arch/arm64/boot/dts/qcom/lemans-el2.dtso | 35 + + arch/arm64/boot/dts/qcom/lemans-evk.dts | 127 +- + arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi | 8 + + arch/arm64/boot/dts/qcom/lemans.dtsi | 486 +++- + arch/arm64/boot/dts/qcom/milos-fairphone-fp6.dts | 790 ++++++ + arch/arm64/boot/dts/qcom/milos.dtsi | 2633 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/monaco-evk.dts | 106 + + arch/arm64/boot/dts/qcom/monaco.dtsi | 1493 ++++++++++- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 8 +- + arch/arm64/boot/dts/qcom/msm8917.dtsi | 12 +- + arch/arm64/boot/dts/qcom/msm8937.dtsi | 13 +- + arch/arm64/boot/dts/qcom/msm8939-asus-z00t.dts | 79 +- + arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi | 4 + + arch/arm64/boot/dts/qcom/msm8939.dtsi | 146 ++ + arch/arm64/boot/dts/qcom/msm8953.dtsi | 668 ++--- + arch/arm64/boot/dts/qcom/msm8976.dtsi | 4 +- + arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 2 +- + .../dts/qcom/msm8994-huawei-angler-rev-101.dts | 2 +- + .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 16 +- + arch/arm64/boot/dts/qcom/pm7550.dtsi | 67 + + arch/arm64/boot/dts/qcom/pm8550vs.dtsi | 8 + + arch/arm64/boot/dts/qcom/pmiv0104.dtsi | 73 + + arch/arm64/boot/dts/qcom/qcs615-ride.dts | 30 + + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 128 + + .../boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts | 1410 +++++++++++ + arch/arm64/boot/dts/qcom/qcs8300-ride.dts | 126 + + arch/arm64/boot/dts/qcom/qcs8550-aim300.dtsi | 16 + + arch/arm64/boot/dts/qcom/qdu1000.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qrb2210-arduino-imola.dts | 459 ++++ + .../dts/qcom/qrb2210-rb1-vision-mezzanine.dtso | 66 + + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 75 + + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 2 +- + arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 5 + + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 146 +- + arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 57 + + arch/arm64/boot/dts/qcom/sdm636.dtsi | 23 +- + arch/arm64/boot/dts/qcom/sdm660.dtsi | 163 +- + arch/arm64/boot/dts/qcom/sdm670.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8 +- + .../arm64/boot/dts/qcom/sdm845-google-blueline.dts | 89 + + arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi | 536 ++++ + .../boot/dts/qcom/sdm845-google-crosshatch.dts | 36 + + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 45 +- + .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 10 +- + arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 4 + + .../boot/dts/qcom/sdm845-samsung-starqltechn.dts | 15 +- + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 23 +- + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 49 +- + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 17 +- + .../dts/qcom/sdm850-huawei-matebook-e-2019.dts | 17 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 12 +- + arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 12 +- + .../dts/qcom/sm6350-sony-xperia-lena-pdx213.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 3 + + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 72 +- + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 4 + + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 4 + + arch/arm64/boot/dts/qcom/sm8150.dtsi | 11 +- + arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 4 + + .../boot/dts/qcom/sm8550-hdk-rear-camera-card.dtso | 7 +- + arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 16 + + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 16 + + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 23 +- + arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts | 16 + + .../dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 16 + + .../boot/dts/qcom/sm8650-hdk-rear-camera-card.dtso | 88 + + arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 16 + + arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 16 + + arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 59 + + arch/arm64/boot/dts/qcom/sm8650.dtsi | 299 +++ + arch/arm64/boot/dts/qcom/sm8750-mtp.dts | 33 +- + arch/arm64/boot/dts/qcom/sm8750-qrd.dts | 27 + + arch/arm64/boot/dts/qcom/sm8750.dtsi | 1301 +++++++++- + arch/arm64/boot/dts/qcom/talos.dtsi | 450 ++-- + arch/arm64/boot/dts/qcom/x1-el2.dtso | 4 + + arch/arm64/boot/dts/qcom/x1-microsoft-denali.dtsi | 1322 ++++++++++ + arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 24 +- + .../dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 153 +- + .../boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 410 ++- + .../boot/dts/qcom/x1e80100-asus-zenbook-a14.dts | 3 + + .../boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 14 +- + .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 8 +- + .../dts/qcom/x1e80100-medion-sprchrgd-14-s1.dts | 1515 +++++++++++ + .../dts/qcom/x1e80100-microsoft-denali-oled.dts | 19 + + .../boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 19 +- + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 21 +- + .../boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts | 90 + + .../boot/dts/qcom/x1p64100-microsoft-denali.dts | 15 + + arch/arm64/boot/dts/realtek/Makefile | 7 +- + arch/arm64/boot/dts/realtek/kent.dtsi | 166 ++ + arch/arm64/boot/dts/realtek/rtd1501.dtsi | 12 + + .../boot/dts/realtek/rtd1501s-phantom-8gb.dts | 25 + + arch/arm64/boot/dts/realtek/rtd1501s-phantom.dtsi | 118 + + arch/arm64/boot/dts/realtek/rtd1861.dtsi | 12 + + .../boot/dts/realtek/rtd1861b-krypton-8gb.dts | 25 + + arch/arm64/boot/dts/realtek/rtd1861b-krypton.dtsi | 72 + + arch/arm64/boot/dts/realtek/rtd1920.dtsi | 12 + + .../boot/dts/realtek/rtd1920s-smallville-4gb.dts | 23 + + .../boot/dts/realtek/rtd1920s-smallville.dtsi | 128 + + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 2 +- + arch/arm64/boot/dts/renesas/condor-common.dtsi | 9 +- + arch/arm64/boot/dts/renesas/draak.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ebisu.dtsi | 2 +- + arch/arm64/boot/dts/renesas/gmsl-cameras.dtsi | 332 --- + arch/arm64/boot/dts/renesas/hihope-rev4.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 52 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 52 +- + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 52 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 52 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 52 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 52 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 52 +- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 4 +- + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 4 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 32 + + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 9 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 89 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 160 ++ + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 160 ++ + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 112 + + arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 112 + + arch/arm64/boot/dts/renesas/r8a779m0.dtsi | 12 - + arch/arm64/boot/dts/renesas/r8a779m2.dtsi | 12 - + arch/arm64/boot/dts/renesas/r8a779m4.dtsi | 12 - + arch/arm64/boot/dts/renesas/r8a779m6.dtsi | 12 - + arch/arm64/boot/dts/renesas/r8a779m7.dtsi | 12 - + arch/arm64/boot/dts/renesas/r8a779m8.dtsi | 17 - + arch/arm64/boot/dts/renesas/r8a779mb.dtsi | 12 - + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r9a07g044c1.dtsi | 25 - + arch/arm64/boot/dts/renesas/r9a07g044l1.dtsi | 18 - + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r9a07g054l1.dtsi | 18 - + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 65 + + arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 250 ++ + arch/arm64/boot/dts/renesas/r9a09g047e37.dtsi | 18 - + arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 75 +- + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 794 ++++++ + .../boot/dts/renesas/r9a09g056n48-rzv2n-evk.dts | 97 + + arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 429 ++++ + .../boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts | 103 +- + arch/arm64/boot/dts/renesas/r9a09g057h48-kakip.dts | 41 +- + arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 334 +++ + .../boot/dts/renesas/r9a09g077m44-rzt2h-evk.dts | 112 +- + arch/arm64/boot/dts/renesas/r9a09g087.dtsi | 334 +++ + .../boot/dts/renesas/r9a09g087m44-rzn2h-evk.dts | 189 +- + arch/arm64/boot/dts/renesas/renesas-smarc2.dtsi | 21 +- + arch/arm64/boot/dts/renesas/rzg3e-smarc-som.dtsi | 18 + + arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 5 + + arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 11 + + .../boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 161 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 4 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/Makefile | 15 + + .../rockchip/rk3368-lion-haikou-video-demo.dtso | 170 ++ + .../arm64/boot/dts/rockchip/rk3368-lion-haikou.dts | 38 +- + arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 27 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 51 + + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 4 - + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 47 +- + .../arm64/boot/dts/rockchip/rk3399-roc-pc-plus.dts | 4 + + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 1 - + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 8 + + arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts | 12 + + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 8 + + .../boot/dts/rockchip/rk3399-rockpro64-v2.dts | 7 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 7 + + .../boot/dts/rockchip/rk3528-armsom-sige1.dts | 18 + + arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 49 + + arch/arm64/boot/dts/rockchip/rk3566-qnap-ts133.dts | 71 + + arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts | 1 + + .../boot/dts/rockchip/rk3568-anbernic-rg-ds.dts | 1237 +++++++++ + arch/arm64/boot/dts/rockchip/rk3568-qnap-ts233.dts | 18 +- + arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 18 +- + .../arm64/boot/dts/rockchip/rk3568-qnap-tsx33.dtsi | 21 +- + .../arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 10 +- + .../dts/rockchip/rk3568-radxa-cm3j-rpi-cm4.dts | 204 ++ + .../arm64/boot/dts/rockchip/rk3568-radxa-cm3j.dtsi | 558 +++++ + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 8 + + arch/arm64/boot/dts/rockchip/rk3568-rock-3b.dts | 8 + + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 2 +- + .../boot/dts/rockchip/rk3576-armsom-sige5.dts | 19 +- + .../boot/dts/rockchip/rk3576-evb1-v10-pcie1.dtso | 31 + + arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts | 129 + + .../boot/dts/rockchip/rk3576-luckfox-core3576.dtsi | 8 + + arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts | 34 +- + .../arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts | 23 +- + arch/arm64/boot/dts/rockchip/rk3576-pinctrl.dtsi | 7 + + arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts | 14 + + arch/arm64/boot/dts/rockchip/rk3576.dtsi | 42 +- + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 78 +- + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 7 +- + arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 6 +- + .../rockchip/rk3588-friendlyelec-cm3588-nas.dts | 38 + + .../dts/rockchip/rk3588-friendlyelec-cm3588.dtsi | 35 +- + arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts | 35 +- + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 36 +- + arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 23 + + .../boot/dts/rockchip/rk3588-rock-5b-plus.dts | 10 + + arch/arm64/boot/dts/rockchip/rk3588-rock-5t.dts | 10 + + arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 35 +- + .../arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 35 +- + .../boot/dts/rockchip/rk3588s-gameforce-ace.dts | 63 + + .../dts/rockchip/rk3588s-orangepi-cm5-base.dts | 355 +++ + .../boot/dts/rockchip/rk3588s-orangepi-cm5.dtsi | 472 ++++ + .../boot/dts/rockchip/rk3588s-radxa-cm5-io.dts | 339 +++ + .../arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi | 280 +++ + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 1 + + arch/arm64/boot/dts/sprd/sc9860.dtsi | 7 +- + arch/arm64/boot/dts/sprd/sc9863a.dtsi | 4 +- + arch/arm64/boot/dts/sprd/sharkl64.dtsi | 2 +- + arch/arm64/boot/dts/sprd/whale2.dtsi | 8 +- + arch/arm64/boot/dts/st/stm32mp21xc.dtsi | 8 - + arch/arm64/boot/dts/st/stm32mp231.dtsi | 19 +- + arch/arm64/boot/dts/st/stm32mp235f-dk.dts | 21 +- + arch/arm64/boot/dts/st/stm32mp23xc.dtsi | 8 - + arch/arm64/boot/dts/st/stm32mp251.dtsi | 30 +- + arch/arm64/boot/dts/st/stm32mp257f-dk.dts | 28 +- + arch/arm64/boot/dts/st/stm32mp257f-ev1.dts | 39 +- + arch/arm64/boot/dts/st/stm32mp25xc.dtsi | 8 - + arch/arm64/boot/dts/st/stm32mp25xxal-pinctrl.dtsi | 71 - + arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi | 8 + + arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi | 8 + + arch/arm64/boot/dts/ti/k3-am62d2-evm.dts | 2 +- + .../boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 17 + + arch/arm64/boot/dts/ti/k3-am62p-verdin.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62p.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 2 +- + .../boot/dts/ti/k3-am62p5-var-som-symphony.dts | 4 +- + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 18 +- + .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 6 +- + ...m642-phyboard-electra-x27-gpio1-spi1-uart3.dtso | 4 +- + .../dts/ti/k3-am65-iot2050-arduino-connector.dtsi | 58 +- + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 2 +- + .../boot/dts/ti/k3-am67a-kontron-sa67-base.dts | 4 +- + arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 14 +- + arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 7 +- + arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 4 +- + arch/arm64/boot/dts/ti/k3-am69-aquila.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-am69-sk.dts | 26 +- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 24 +- + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 19 +- + arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 2 +- + arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 5 + + arch/arm64/boot/dts/ti/k3-j722s.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-j742s2-mcu-wakeup.dtsi | 4 + + .../boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi | 4 +- + .../boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 36 - + .../dts/ti/k3-j784s4-j742s2-mcu-wakeup-common.dtsi | 17 + + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 58 +- + arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts | 2 +- + .../boot/dts/toshiba/tmpv7708-visrobo-vrb.dts | 2 +- + .../boot/dts/toshiba/tmpv7708-visrobo-vrc.dtsi | 2 +- + arch/arm64/boot/dts/toshiba/tmpv7708.dtsi | 4 +- + arch/arm64/boot/dts/toshiba/tmpv7708_pins.dtsi | 2 +- + arch/arm64/boot/dts/xilinx/versal-net.dtsi | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 2 +- + .../boot/dts/xilinx/zynqmp-sck-kd-g-revA.dtso | 7 - + .../boot/dts/xilinx/zynqmp-sck-kr-g-revA.dtso | 7 - + .../boot/dts/xilinx/zynqmp-sck-kr-g-revB.dtso | 7 - + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 6 - + .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 6 - + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 25 +- + arch/arm64/configs/defconfig | 90 + + .../dts/allwinner/sun20i-d1-lichee-rv-dock.dts | 12 + + arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 13 + + arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi | 6 + + arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 31 + + arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 31 + + arch/riscv/boot/dts/anlogic/dr1v90.dtsi | 5 +- + arch/riscv/boot/dts/microchip/mpfs.dtsi | 34 +- + arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 3 +- + arch/riscv/boot/dts/sophgo/cv180x.dtsi | 4 +- + arch/riscv/boot/dts/sophgo/sg2042-cpus.dtsi | 305 +++ + .../riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts | 21 + + arch/riscv/boot/dts/sophgo/sg2042.dtsi | 479 +--- + arch/riscv/boot/dts/sophgo/sg2044-cpus.dtsi | 256 +- + arch/riscv/boot/dts/spacemit/Makefile | 1 + + arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts | 90 + + arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts | 135 + + arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts | 2 + + arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts | 2 + + arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi | 33 + + arch/riscv/boot/dts/spacemit/k1.dtsi | 254 +- + arch/riscv/boot/dts/spacemit/k3-pico-itx.dts | 29 + + arch/riscv/boot/dts/spacemit/k3.dtsi | 578 +++++ + .../jh7110-starfive-visionfive-2-lite-emmc.dts | 2 +- + .../starfive/jh7110-starfive-visionfive-2-lite.dts | 2 +- + arch/riscv/configs/defconfig | 2 +- + drivers/bus/Kconfig | 2 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 89 +- + drivers/bus/omap-ocp2scp.c | 13 +- + drivers/bus/qcom-ebi2.c | 7 +- + drivers/char/hw_random/optee-rng.c | 26 +- + drivers/char/tpm/tpm_ftpm_tee.c | 35 +- + drivers/clk/qcom/common.c | 2 +- + drivers/cpuidle/cpuidle-zynq.c | 2 +- + drivers/firmware/arm_ffa/driver.c | 48 +- + drivers/firmware/arm_scmi/base.c | 11 +- + drivers/firmware/arm_scmi/clock.c | 24 +- + drivers/firmware/arm_scmi/driver.c | 98 +- + drivers/firmware/arm_scmi/perf.c | 59 +- + drivers/firmware/arm_scmi/pinctrl.c | 120 +- + drivers/firmware/arm_scmi/power.c | 18 +- + drivers/firmware/arm_scmi/powercap.c | 21 +- + drivers/firmware/arm_scmi/protocols.h | 9 +- + drivers/firmware/arm_scmi/reset.c | 68 +- + drivers/firmware/arm_scmi/sensors.c | 22 +- + drivers/firmware/arm_scmi/shmem.c | 5 +- + drivers/firmware/arm_scmi/system.c | 14 +- + drivers/firmware/arm_scmi/transports/optee.c | 32 +- + drivers/firmware/arm_scmi/vendors/imx/imx-sm-bbm.c | 10 +- + drivers/firmware/arm_scmi/vendors/imx/imx-sm-cpu.c | 9 +- + drivers/firmware/arm_scmi/vendors/imx/imx-sm-lmm.c | 9 +- + .../firmware/arm_scmi/vendors/imx/imx-sm-misc.c | 93 +- + drivers/firmware/arm_scmi/voltage.c | 13 +- + drivers/firmware/broadcom/tee_bnxt_fw.c | 30 +- + drivers/firmware/efi/stmm/tee_stmm_efi.c | 25 +- + drivers/firmware/imx/sm-misc.c | 37 +- + drivers/firmware/qcom/qcom_scm.c | 508 +++- + drivers/firmware/qcom/qcom_scm.h | 2 + + drivers/firmware/ti_sci.h | 29 +- + drivers/hwspinlock/omap_hwspinlock.c | 4 +- + drivers/irqchip/irq-ls-extirq.c | 47 +- + drivers/irqchip/irq-renesas-rza1.c | 43 +- + drivers/mailbox/mtk-cmdq-mailbox.c | 74 +- + drivers/memory/mtk-smi.c | 38 +- + drivers/of/irq.c | 70 + + drivers/of/unittest-data/tests-interrupts.dtsi | 9 + + drivers/of/unittest.c | 116 + + drivers/remoteproc/qcom_q6v5_pas.c | 165 +- + drivers/reset/Kconfig | 14 +- + drivers/reset/Makefile | 2 +- + drivers/reset/core.c | 7 +- + drivers/reset/reset-gpio.c | 9 +- + drivers/reset/reset-imx8mp-audiomix.c | 169 +- + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 110 +- + drivers/reset/spacemit/Kconfig | 36 + + drivers/reset/spacemit/Makefile | 5 + + drivers/reset/spacemit/reset-spacemit-common.c | 77 + + drivers/reset/spacemit/reset-spacemit-common.h | 42 + + .../reset-spacemit-k1.c} | 109 +- + drivers/reset/spacemit/reset-spacemit-k3.c | 233 ++ + drivers/rtc/rtc-optee.c | 27 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 1 + + drivers/soc/apple/rtkit.c | 16 + + drivers/soc/dove/pmu.c | 9 +- + drivers/soc/fsl/qe/Makefile | 2 +- + drivers/soc/fsl/qe/qe_ports_ic.c | 141 ++ + drivers/soc/fsl/qe/qmc.c | 13 +- + drivers/soc/imx/soc-imx8m.c | 6 +- + drivers/soc/imx/soc-imx9.c | 46 +- + drivers/soc/mediatek/mtk-cmdq-helper.c | 77 +- + drivers/soc/mediatek/mtk-dvfsrc.c | 366 ++- + drivers/soc/mediatek/mtk-socinfo.c | 1 + + drivers/soc/mediatek/mtk-svs.c | 5 +- + drivers/soc/qcom/cmd-db.c | 7 +- + drivers/soc/qcom/llcc-qcom.c | 207 ++ + drivers/soc/qcom/mdt_loader.c | 51 +- + drivers/soc/qcom/pmic_glink_altmode.c | 188 +- + drivers/soc/qcom/qmi_encdec.c | 137 +- + drivers/soc/qcom/smem.c | 4 +- + drivers/soc/renesas/Kconfig | 5 + + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/rzn1_irqmux.c | 127 + + drivers/soc/rockchip/grf.c | 49 +- + drivers/soc/samsung/exynos-chipid.c | 133 +- + drivers/soc/tegra/pmc.c | 433 +++- + drivers/soc/ti/Kconfig | 2 +- + drivers/soc/ti/k3-socinfo.c | 2 +- + drivers/soc/ti/knav_dma.c | 21 +- + drivers/soc/ti/knav_qmss_queue.c | 25 +- + drivers/soc/ti/pruss.c | 6 +- + drivers/soc/xilinx/zynqmp_power.c | 6 +- + drivers/tee/amdtee/call.c | 8 +- + drivers/tee/optee/core.c | 23 + + drivers/tee/optee/ffa_abi.c | 54 +- + drivers/tee/optee/optee_private.h | 19 + + drivers/tee/optee/rpc.c | 6 +- + drivers/tee/optee/smc_abi.c | 15 +- + drivers/tee/qcomtee/call.c | 17 +- + drivers/tee/qcomtee/mem_obj.c | 4 +- + drivers/tee/qcomtee/user_obj.c | 8 +- + drivers/tee/tee_core.c | 135 +- + include/dt-bindings/clock/google,gs101.h | 36 + + include/dt-bindings/clock/qcom,gcc-msm8917.h | 1 + + include/dt-bindings/clock/qcom,x1e80100-gcc.h | 3 + + .../dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h | 3 + + .../dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h | 3 + + include/dt-bindings/reset/spacemit,k3-resets.h | 171 ++ + include/linux/firmware/qcom/qcom_scm.h | 30 +- + include/linux/mailbox/mtk-cmdq-mailbox.h | 19 + + include/linux/of_irq.h | 41 +- + include/linux/platform_data/hwmon-s3c.h | 36 - + include/linux/scmi_imx_protocol.h | 2 + + include/linux/soc/apple/rtkit.h | 7 + + include/linux/soc/mediatek/mtk-cmdq.h | 93 + + include/linux/soc/qcom/llcc-qcom.h | 4 + + include/linux/soc/qcom/mdt_loader.h | 22 +- + include/linux/soc/qcom/ubwc.h | 1 + + include/linux/tee_core.h | 9 + + include/linux/tee_drv.h | 12 + + include/soc/spacemit/ccu.h | 21 + + include/soc/spacemit/k1-syscon.h | 12 +- + include/soc/spacemit/k3-syscon.h | 273 ++ + include/soc/tegra/pmc.h | 60 +- + security/keys/trusted-keys/trusted_tee.c | 17 +- + 921 files changed, 57711 insertions(+), 7139 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/intel,socfpga.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,qe-ports-ic.yaml + create mode 100644 Documentation/devicetree/bindings/iommu/nvidia,tegra264-cmdqv.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,ddr4.yaml + delete mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,lpddr-props.yaml + rename Documentation/devicetree/bindings/memory-controllers/ddr/{jedec,lpddr-channel.yaml => jedec,sdram-channel.yaml} (76%) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/ddr/jedec,sdram-props.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/nvidia,tegra20-nand.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/nvidia-tegra20-nand.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/google,gs101-otp.yaml + create mode 100644 Documentation/devicetree/bindings/soc/renesas/renesas,rzn1-gpioirqmux.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-altrad8.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-anacapa.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-nvidia-msx4-bmc.dts + create mode 100644 arch/arm/boot/dts/microchip/lan966x-pcb8385.dts + delete mode 100644 arch/arm/boot/dts/microchip/usb_a9g20-dab-mmx.dtsi + delete mode 100644 arch/arm/boot/dts/renesas/gr-peach-audiocamerashield.dtsi + delete mode 100644 arch/arm/boot/dts/renesas/r8a77xx-aa121td01-panel.dtsi + delete mode 100644 arch/arm/boot/dts/samsung/s3c6400.dtsi + delete mode 100644 arch/arm/boot/dts/st/spear320s.dtsi + delete mode 100644 arch/arm/boot/dts/st/stm32mp15xxab-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/ti/omap/am335x-base0033.dts + delete mode 100644 arch/arm/boot/dts/ti/omap/am3703.dtsi + delete mode 100644 arch/arm/boot/dts/ti/omap/am3715.dtsi + delete mode 100644 arch/arm/boot/dts/ti/omap/omap3430es1-clocks.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-s4-s905y4-khadas-vim1s.dts + delete mode 100644 arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi + delete mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-clock.dtsi + delete mode 100644 arch/arm64/boot/dts/cavium/thunder2-99xx.dts + delete mode 100644 arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi + create mode 100644 arch/arm64/boot/dts/cix/sky1-xcp.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-tqmls1028a-mbls1028a-ind.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-tqmls1028a-mbls1028a.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-tqmls1028a-mbls1028a.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1028a-tqmls1028a.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-evalboard-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-evalboard-ksz8794-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-evalboard-v1-overlay-ksz8794.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-evalboard-v1-overlay-ksz9031.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-evalboard-v1.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-evalboard-v2-overlay-adin1300.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-evalboard-v2-overlay-ksz8794.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-evalboard-v2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-frdm.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-libra-rdk-fpsc-lvds-peb-av-10.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-libra-rdk-fpsc-lvds-peb-av-10.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-libra-rdk-fpsc-lvds-ph128800t006-zhc01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-peb-wlbt-05.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-ss-ddr.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qp-apalis-v1.1-eval-v1.2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qp-apalis-v1.1-eval.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qp-apalis-v1.1-ixora-v1.1.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qp-apalis-v1.1-ixora-v1.2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qp-apalis-v1.1.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qp.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx91-11x11-frdm.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93-11x11-frdm.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93-9x9-qsb-can1.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx95-15x15-frdm.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx952-clock.h + create mode 100644 arch/arm64/boot/dts/freescale/imx952-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx952-pinfunc.h + create mode 100644 arch/arm64/boot/dts/freescale/imx952-power.h + create mode 100644 arch/arm64/boot/dts/freescale/imx952.dtsi + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex5_socdk_modular.dts + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex_socdk_emmc.dts + create mode 100644 arch/arm64/boot/dts/marvell/armada-7020-comexpress.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/db-falcon-carrier-a7k.dts + create mode 100644 arch/arm64/boot/dts/marvell/db-falcon-carrier.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8370-tungsten-smarc.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8390-tungsten-smarc.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8390-tungsten-smarc.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/glymur-ipcc.h + create mode 100644 arch/arm64/boot/dts/qcom/kaanapali-ipcc.h + create mode 100644 arch/arm64/boot/dts/qcom/kaanapali-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/kaanapali-qrd.dts + create mode 100644 arch/arm64/boot/dts/qcom/kaanapali.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/lemans-el2.dtso + create mode 100644 arch/arm64/boot/dts/qcom/milos-fairphone-fp6.dts + create mode 100644 arch/arm64/boot/dts/qcom/milos.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm7550.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmiv0104.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts + create mode 100644 arch/arm64/boot/dts/qcom/qrb2210-arduino-imola.dts + create mode 100644 arch/arm64/boot/dts/qcom/qrb2210-rb1-vision-mezzanine.dtso + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-google-blueline.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-google-crosshatch.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8650-hdk-rear-camera-card.dtso + create mode 100644 arch/arm64/boot/dts/qcom/x1-microsoft-denali.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-medion-sprchrgd-14-s1.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-microsoft-denali-oled.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1p64100-microsoft-denali.dts + create mode 100644 arch/arm64/boot/dts/realtek/kent.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd1501.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd1501s-phantom-8gb.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1501s-phantom.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd1861.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd1861b-krypton-8gb.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1861b-krypton.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd1920.dtsi + create mode 100644 arch/arm64/boot/dts/realtek/rtd1920s-smallville-4gb.dts + create mode 100644 arch/arm64/boot/dts/realtek/rtd1920s-smallville.dtsi + delete mode 100644 arch/arm64/boot/dts/renesas/gmsl-cameras.dtsi + delete mode 100644 arch/arm64/boot/dts/renesas/r8a779m0.dtsi + delete mode 100644 arch/arm64/boot/dts/renesas/r8a779m2.dtsi + delete mode 100644 arch/arm64/boot/dts/renesas/r8a779m4.dtsi + delete mode 100644 arch/arm64/boot/dts/renesas/r8a779m6.dtsi + delete mode 100644 arch/arm64/boot/dts/renesas/r8a779m7.dtsi + delete mode 100644 arch/arm64/boot/dts/renesas/r8a779m8.dtsi + delete mode 100644 arch/arm64/boot/dts/renesas/r8a779mb.dtsi + delete mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c1.dtsi + delete mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l1.dtsi + delete mode 100644 arch/arm64/boot/dts/renesas/r9a07g054l1.dtsi + delete mode 100644 arch/arm64/boot/dts/renesas/r9a09g047e37.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-lion-haikou-video-demo.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-qnap-ts133.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-anbernic-rg-ds.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3j-rpi-cm4.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3j.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-evb1-v10-pcie1.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5-base.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-orangepi-cm5.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5-io.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-radxa-cm5.dtsi + delete mode 100644 arch/arm64/boot/dts/st/stm32mp21xc.dtsi + delete mode 100644 arch/arm64/boot/dts/st/stm32mp23xc.dtsi + delete mode 100644 arch/arm64/boot/dts/st/stm32mp25xc.dtsi + delete mode 100644 arch/arm64/boot/dts/st/stm32mp25xxal-pinctrl.dtsi + create mode 100644 arch/riscv/boot/dts/spacemit/k3-pico-itx.dts + create mode 100644 arch/riscv/boot/dts/spacemit/k3.dtsi + create mode 100644 drivers/reset/spacemit/Kconfig + create mode 100644 drivers/reset/spacemit/Makefile + create mode 100644 drivers/reset/spacemit/reset-spacemit-common.c + create mode 100644 drivers/reset/spacemit/reset-spacemit-common.h + rename drivers/reset/{reset-spacemit.c => spacemit/reset-spacemit-k1.c} (78%) + create mode 100644 drivers/reset/spacemit/reset-spacemit-k3.c + create mode 100644 drivers/soc/fsl/qe/qe_ports_ic.c + create mode 100644 drivers/soc/renesas/rzn1_irqmux.c + create mode 100644 include/dt-bindings/reset/spacemit,k3-resets.h + delete mode 100644 include/linux/platform_data/hwmon-s3c.h + create mode 100644 include/soc/spacemit/ccu.h + create mode 100644 include/soc/spacemit/k3-syscon.h +Merging amlogic/for-next (e3194dfb77230 Merge branch 'v6.20/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. +Merging asahi-soc/asahi-soc/for-next (d31647c698f63 Merge branch 'apple-soc/drivers-6.20' into asahi-soc/for-next) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Merge made by the 'ort' strategy. +Merging at91/at91-next (d75e671528b49 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. + .../bindings/clock/microchip,mpfs-ccc.yaml | 6 +++- + .../bindings/clock/microchip,mpfs-clkcfg.yaml | 16 +++++++++- + drivers/clk/microchip/Kconfig | 4 +-- + drivers/clk/microchip/clk-core.c | 36 ++++++++-------------- + 4 files changed, 34 insertions(+), 28 deletions(-) +Merging bmc/for-next (26705fad17bd1 Merge branches 'aspeed/arm/dt', 'nuvoton/arm/fixes' and 'nuvoton/arm64/dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next +Merge made by the 'ort' strategy. +Merging broadcom/next (8bb18f06da314 Merge branch 'devicetree/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging arch/arm64/boot/dts/broadcom/bcm2712.dtsi +Merge made by the 'ort' strategy. + arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 28 ++++++++++++++++++++-- + .../boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi | 4 ++++ + arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 14 +++++++++++ + 3 files changed, 44 insertions(+), 2 deletions(-) +Merging cix/for-next (4d24b32aa342e Merge remote-tracking branch 'cix/dt-bindings' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git cix/for-next +Merge made by the 'ort' strategy. +Merging davinci/davinci/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'davinci/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (9805f2cfc8830 dt-bindings: memory: SDRAM channel: standardise node name) +$ 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 +Already up to date. +Merging fsl/soc_fsl (b244f59bc977c soc: fsl: qbman: fix race condition in qman_destroy_fq) +$ git merge -m Merge branch 'soc_fsl' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git fsl/soc_fsl +Merge made by the 'ort' strategy. + drivers/soc/fsl/qbman/qman.c | 24 ++++++++++++++++++++++-- + 1 file changed, 22 insertions(+), 2 deletions(-) +Merging imx-mxs/for-next (3cea6b209a3f2 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (dee56d3440b5c Merge branch 'v6.19-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (8dcbe20fc9245 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (35ca43aadd4ea Merge branch 'omap-for-v6.20/drivers' into tmp/omap-next-20260122.103154) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (1a0829927afbf Merge branches 'arm32-for-6.20', 'arm64-defconfig-for-6.20', 'arm64-fixes-for-6.19', 'arm64-for-6.20', 'clk-for-6.20', 'drivers-fixes-for-6.19' and 'drivers-for-6.20' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Merge made by the 'ort' strategy. + .../bindings/clock/qcom,gcc-msm8953.yaml | 6 +- + .../bindings/clock/qcom,kaanapali-gxclkctl.yaml | 63 + + .../bindings/clock/qcom,sm8450-camcc.yaml | 11 + + .../bindings/clock/qcom,sm8450-gpucc.yaml | 2 + + .../bindings/clock/qcom,sm8450-videocc.yaml | 3 + + .../bindings/clock/qcom,sm8550-dispcc.yaml | 2 + + drivers/clk/qcom/Kconfig | 71 +- + drivers/clk/qcom/Makefile | 7 + + drivers/clk/qcom/cambistmclkcc-kaanapali.c | 437 +++ + drivers/clk/qcom/cambistmclkcc-sm8750.c | 454 +++ + drivers/clk/qcom/camcc-kaanapali.c | 2661 +++++++++++++++ + drivers/clk/qcom/camcc-sm8750.c | 2710 +++++++++++++++ + drivers/clk/qcom/clk-alpha-pll.c | 41 +- + drivers/clk/qcom/clk-alpha-pll.h | 7 + + drivers/clk/qcom/clk-rcg2.c | 7 +- + drivers/clk/qcom/clk-regmap-divider.c | 16 +- + drivers/clk/qcom/clk-rpmh.c | 60 +- + drivers/clk/qcom/dispcc-kaanapali.c | 1956 +++++++++++ + drivers/clk/qcom/dispcc-sdm845.c | 4 +- + drivers/clk/qcom/dispcc-sm7150.c | 2 +- + drivers/clk/qcom/gcc-glymur.c | 4 +- + drivers/clk/qcom/gcc-ipq5018.c | 1 + + drivers/clk/qcom/gcc-kaanapali.c | 3540 ++++++++++++++++++++ + drivers/clk/qcom/gcc-milos.c | 6 +- + drivers/clk/qcom/gcc-msm8917.c | 282 +- + drivers/clk/qcom/gcc-msm8953.c | 1 - + drivers/clk/qcom/gcc-qdu1000.c | 4 +- + drivers/clk/qcom/gcc-sdx75.c | 4 +- + drivers/clk/qcom/gcc-sm4450.c | 6 +- + drivers/clk/qcom/gcc-sm8450.c | 4 +- + drivers/clk/qcom/gcc-sm8550.c | 4 +- + drivers/clk/qcom/gcc-sm8650.c | 4 +- + drivers/clk/qcom/gcc-sm8750.c | 4 +- + drivers/clk/qcom/gcc-x1e80100.c | 76 +- + drivers/clk/qcom/gpucc-kaanapali.c | 482 +++ + drivers/clk/qcom/gxclkctl-kaanapali.c | 76 + + drivers/clk/qcom/tcsrcc-kaanapali.c | 141 + + drivers/clk/qcom/videocc-kaanapali.c | 821 +++++ + drivers/clk/qcom/videocc-sm8750.c | 2 +- + include/dt-bindings/clock/qcom,gcc-msm8917.h | 1 + + .../clock/qcom,kaanapali-cambistmclkcc.h | 33 + + include/dt-bindings/clock/qcom,kaanapali-camcc.h | 147 + + include/dt-bindings/clock/qcom,kaanapali-dispcc.h | 109 + + include/dt-bindings/clock/qcom,kaanapali-gpucc.h | 47 + + .../dt-bindings/clock/qcom,kaanapali-gxclkctl.h | 13 + + include/dt-bindings/clock/qcom,kaanapali-videocc.h | 58 + + .../dt-bindings/clock/qcom,sm8750-cambistmclkcc.h | 30 + + include/dt-bindings/clock/qcom,sm8750-camcc.h | 151 + + 48 files changed, 14493 insertions(+), 78 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,kaanapali-gxclkctl.yaml + create mode 100644 drivers/clk/qcom/cambistmclkcc-kaanapali.c + create mode 100644 drivers/clk/qcom/cambistmclkcc-sm8750.c + create mode 100644 drivers/clk/qcom/camcc-kaanapali.c + create mode 100644 drivers/clk/qcom/camcc-sm8750.c + create mode 100644 drivers/clk/qcom/dispcc-kaanapali.c + create mode 100644 drivers/clk/qcom/gcc-kaanapali.c + create mode 100644 drivers/clk/qcom/gpucc-kaanapali.c + create mode 100644 drivers/clk/qcom/gxclkctl-kaanapali.c + create mode 100644 drivers/clk/qcom/tcsrcc-kaanapali.c + create mode 100644 drivers/clk/qcom/videocc-kaanapali.c + create mode 100644 include/dt-bindings/clock/qcom,kaanapali-cambistmclkcc.h + create mode 100644 include/dt-bindings/clock/qcom,kaanapali-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,kaanapali-dispcc.h + create mode 100644 include/dt-bindings/clock/qcom,kaanapali-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,kaanapali-gxclkctl.h + create mode 100644 include/dt-bindings/clock/qcom,kaanapali-videocc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8750-cambistmclkcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8750-camcc.h +Merging renesas/next (08e16a461a8f6 Merge branch 'renesas-dts-for-v6.20' into renesas-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. +Merging reset/reset/next (938ce3b165826 reset: spacemit: Add SpacemiT K3 reset driver) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (82cafae8c386c Merge branch 'v6.20-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + drivers/clk/rockchip/clk.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging samsung-krzk/for-next (4b2dd5ec2cab7 Merge branches 'next/clk', 'next/drivers' and 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + .../bindings/clock/google,gs101-clock.yaml | 19 +- + .../clock/samsung,exynosautov920-clock.yaml | 19 ++ + .../soc/samsung/samsung,exynos-sysreg.yaml | 2 + + drivers/clk/samsung/clk-exynos-arm64.c | 92 +++++- + drivers/clk/samsung/clk-exynos4.c | 12 +- + drivers/clk/samsung/clk-exynos4412-isp.c | 4 +- + drivers/clk/samsung/clk-exynos5250.c | 2 +- + drivers/clk/samsung/clk-exynos5420.c | 4 +- + drivers/clk/samsung/clk-exynosautov920.c | 40 +++ + drivers/clk/samsung/clk-gs101.c | 338 +++++++++++++++++++++ + drivers/clk/samsung/clk-s3c64xx.c | 4 +- + drivers/clk/samsung/clk-s5pv210.c | 2 +- + drivers/clk/samsung/clk.c | 207 +++++++++++-- + drivers/clk/samsung/clk.h | 56 +++- + include/dt-bindings/clock/samsung,exynosautov920.h | 4 + + 15 files changed, 756 insertions(+), 49 deletions(-) +Merging scmi/for-linux-next (02b744bc8a71e Merge tags 'juno-updates-7.0', 'ffa-updates-7.0' and 'scmi-updates-7.0' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. +Merging sophgo/for-next (85352e8c088c9 Merge branch 'dt/riscv' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. +Merging sophgo-soc/soc-for-next (c8754c7deab4c soc: sophgo: cv1800: rtcsys: New driver (handling RTC only)) +$ git merge -m Merge branch 'soc-for-next' of https://github.com/sophgo/linux.git sophgo-soc/soc-for-next +Already up to date. +Merging spacemit/for-next (5f499bb7a07fc Merge branch 'spacemit-clk-for-6.20' into spacemit-for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next +Auto-merging Documentation/devicetree/bindings/soc/spacemit/spacemit,k1-syscon.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/spacemit,k1-pll.yaml | 9 +- + .../bindings/soc/spacemit/spacemit,k1-syscon.yaml | 14 +- + drivers/clk/spacemit/Kconfig | 20 +- + drivers/clk/spacemit/Makefile | 12 +- + drivers/clk/spacemit/ccu-k1.c | 192 +-- + drivers/clk/spacemit/ccu-k3.c | 1487 ++++++++++++++++++++ + drivers/clk/spacemit/ccu_common.c | 177 +++ + drivers/clk/spacemit/ccu_common.h | 11 + + drivers/clk/spacemit/ccu_ddn.c | 1 + + drivers/clk/spacemit/ccu_mix.c | 21 +- + drivers/clk/spacemit/ccu_mix.h | 12 + + drivers/clk/spacemit/ccu_pll.c | 119 ++ + drivers/clk/spacemit/ccu_pll.h | 57 +- + include/dt-bindings/clock/spacemit,k3-clocks.h | 390 +++++ + 14 files changed, 2313 insertions(+), 209 deletions(-) + create mode 100644 drivers/clk/spacemit/ccu-k3.c + create mode 100644 drivers/clk/spacemit/ccu_common.c + create mode 100644 include/dt-bindings/clock/spacemit,k3-clocks.h +Merging stm32/stm32-next (291f393298f72 arm/arm64: dts: st: Drop unused .dtsi) +$ git merge -m Merge branch 'stm32-next' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'ort' strategy. +Merging sunxi/sunxi/for-next (f36e738549d48 riscv: dts: allwinner: d1: Add CPU thermal sensor and zone) +$ git merge -m Merge branch 'sunxi/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Already up to date. +Merging tee/next (dca5274792543 Merge branches 'qcomtee_fixes_for_6.20', 'optee_update_for_6.20', 'tee_bus_callback_for_6.20', 'amdtee_update_for_6.20' and 'tee_sysfs_for_6.20' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (6ac0a03f5afe8 Merge branch for-6.20/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + drivers/clk/tegra/clk-device.c | 13 ++++++++++++- + drivers/clk/tegra/clk-tegra114.c | 7 ++++++- + drivers/clk/tegra/clk-tegra124-emc.c | 8 ++++---- + drivers/clk/tegra/clk-tegra20.c | 26 ++++++++++++++++---------- + drivers/clk/tegra/clk-tegra30.c | 20 ++++++++++++++++++-- + drivers/soc/tegra/pmc.c | 2 ++ + 6 files changed, 58 insertions(+), 18 deletions(-) +Merging tenstorrent-dt/tenstorrent-dt-for-next (a71e6e8eea8ae riscv: defconfig: Enable Tenstorrent SoCs) +$ git merge -m Merge branch 'tenstorrent-dt-for-next' of https://github.com/tenstorrent/linux.git tenstorrent-dt/tenstorrent-dt-for-next +Already up to date. +Merging thead-dt/thead-dt-for-next (34ce47c9cdfdd riscv: dts: thead: lichee-pi-4a: enable HDMI) +$ git merge -m Merge branch 'thead-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt/thead-dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts | 25 +++++++++ + arch/riscv/boot/dts/thead/th1520.dtsi | 66 +++++++++++++++++++++++ + 2 files changed, 91 insertions(+) +Merging ti/ti-next (18258938db0c4 Merge branches 'ti-k3-dts-next' and 'ti-k3-config-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (50d1a926f4631 Merge remote-tracking branch 'git/zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. +Merging clk/clk-next (ea7282e99ead6 Merge branch 'clk-qcom' into clk-next) +$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../clock/amlogic,t7-peripherals-clkc.yaml | 116 ++ + .../bindings/clock/amlogic,t7-pll-clkc.yaml | 114 ++ + .../bindings/clock/mediatek,mt7622-pciesys.yaml | 10 +- + .../devicetree/bindings/clock/renesas,9series.yaml | 11 +- + MAINTAINERS | 9 + + drivers/clk/.kunitconfig | 2 +- + drivers/clk/Kconfig | 13 +- + drivers/clk/Makefile | 3 +- + drivers/clk/actions/owl-composite.c | 11 +- + drivers/clk/actions/owl-divider.c | 17 +- + drivers/clk/actions/owl-divider.h | 5 - + drivers/clk/aspeed/Kconfig | 21 + + drivers/clk/aspeed/Makefile | 4 + + drivers/clk/{ => aspeed}/clk-aspeed.c | 2 + + drivers/clk/{ => aspeed}/clk-aspeed.h | 0 + drivers/clk/{ => aspeed}/clk-ast2600.c | 0 + drivers/clk/aspeed/clk-ast2700.c | 1055 ++++++++++++++++ + drivers/clk/clk-apple-nco.c | 1 + + drivers/clk/clk-bm1880.c | 13 +- + drivers/clk/clk-lmk04832.c | 4 +- + drivers/clk/clk-loongson1.c | 5 +- + drivers/clk/clk-milbeaut.c | 15 +- + drivers/clk/clk-renesas-pcie.c | 10 +- + drivers/clk/clk-scpi.c | 5 +- + drivers/clk/clk-versaclock3.c | 7 +- + drivers/clk/hisilicon/clkdivider-hi6220.c | 6 +- + drivers/clk/imx/clk-fracn-gppll.c | 4 +- + drivers/clk/mediatek/Kconfig | 2 +- + drivers/clk/mediatek/clk-mt2701.c | 2 +- + drivers/clk/mediatek/clk-mt2712-apmixedsys.c | 2 +- + drivers/clk/mediatek/clk-mt6735-apmixedsys.c | 4 +- + drivers/clk/mediatek/clk-mt6765.c | 2 +- + drivers/clk/mediatek/clk-mt6779.c | 2 +- + drivers/clk/mediatek/clk-mt6795-apmixedsys.c | 2 +- + drivers/clk/mediatek/clk-mt6797.c | 2 +- + drivers/clk/mediatek/clk-mt7622-apmixedsys.c | 2 +- + drivers/clk/mediatek/clk-mt7629.c | 2 +- + drivers/clk/mediatek/clk-mt7981-apmixed.c | 2 +- + drivers/clk/mediatek/clk-mt7981-eth.c | 6 +- + drivers/clk/mediatek/clk-mt7986-apmixed.c | 2 +- + drivers/clk/mediatek/clk-mt7988-apmixed.c | 2 +- + drivers/clk/mediatek/clk-mt8135-apmixedsys.c | 3 +- + drivers/clk/mediatek/clk-mt8167-apmixedsys.c | 2 +- + drivers/clk/mediatek/clk-mt8173-apmixedsys.c | 14 +- + drivers/clk/mediatek/clk-mt8183-apmixedsys.c | 2 +- + drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 2 +- + drivers/clk/mediatek/clk-mt8188-apmixedsys.c | 2 +- + drivers/clk/mediatek/clk-mt8192-apmixedsys.c | 2 +- + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 2 +- + drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 3 +- + drivers/clk/mediatek/clk-mt8196-apmixedsys.c | 3 +- + drivers/clk/mediatek/clk-mt8196-mcu.c | 2 +- + drivers/clk/mediatek/clk-mt8196-mfg.c | 15 +- + drivers/clk/mediatek/clk-mt8196-vlpckgen.c | 2 +- + drivers/clk/mediatek/clk-mt8365-apmixedsys.c | 2 +- + drivers/clk/mediatek/clk-mt8516-apmixedsys.c | 2 +- + drivers/clk/mediatek/clk-mt8516.c | 2 +- + drivers/clk/mediatek/clk-mtk.c | 12 +- + drivers/clk/mediatek/clk-pll.c | 19 +- + drivers/clk/mediatek/clk-pll.h | 15 +- + drivers/clk/mediatek/clk-pllfh.c | 13 +- + drivers/clk/mediatek/clk-pllfh.h | 2 +- + drivers/clk/meson/Kconfig | 28 + + drivers/clk/meson/Makefile | 2 + + drivers/clk/meson/g12a.c | 17 +- + drivers/clk/meson/gxbb.c | 23 +- + drivers/clk/meson/s4-peripherals.c | 206 +++- + drivers/clk/meson/t7-peripherals.c | 1271 ++++++++++++++++++++ + drivers/clk/meson/t7-pll.c | 1074 +++++++++++++++++ + drivers/clk/nuvoton/clk-ma35d1-divider.c | 7 +- + drivers/clk/nxp/clk-lpc32xx.c | 6 +- + drivers/clk/qcom/cambistmclkcc-sm8750.c | 2 +- + drivers/clk/qcom/camcc-sm8750.c | 2 +- + drivers/clk/renesas/clk-vbattb.c | 4 +- + drivers/clk/renesas/r9a09g056-cpg.c | 188 +++ + drivers/clk/renesas/r9a09g057-cpg.c | 136 +++ + drivers/clk/renesas/r9a09g077-cpg.c | 206 +++- + drivers/clk/renesas/renesas-cpg-mssr.c | 58 +- + drivers/clk/renesas/rzg2l-cpg.c | 189 ++- + drivers/clk/renesas/rzv2h-cpg.c | 15 +- + drivers/clk/sophgo/clk-cv18xx-ip.c | 154 +-- + drivers/clk/sophgo/clk-sg2042-clkgen.c | 15 +- + drivers/clk/sprd/div.c | 6 +- + drivers/clk/stm32/clk-stm32-core.c | 42 +- + drivers/clk/sunxi-ng/ccu_div.c | 25 +- + drivers/clk/sunxi-ng/ccu_mp.c | 26 +- + drivers/clk/sunxi-ng/ccu_mult.c | 16 +- + drivers/clk/sunxi-ng/ccu_mux.c | 49 +- + drivers/clk/sunxi-ng/ccu_mux.h | 8 +- + drivers/clk/sunxi-ng/ccu_nkm.c | 25 +- + drivers/clk/tegra/clk-tegra124-emc.c | 2 +- + drivers/clk/thead/clk-th1520-ap.c | 350 +++++- + drivers/clk/versatile/clk-impd1.c | 7 +- + drivers/clk/x86/clk-cgu.c | 6 +- + drivers/clk/zynqmp/divider.c | 10 +- + drivers/clk/zynqmp/pll.c | 5 +- + drivers/rtc/rtc-ac100.c | 73 +- + .../clock/amlogic,s4-peripherals-clkc.h | 11 + + .../clock/amlogic,t7-peripherals-clkc.h | 228 ++++ + include/dt-bindings/clock/amlogic,t7-pll-clkc.h | 56 + + include/dt-bindings/clock/amlogic,t7-scmi.h | 47 + + include/dt-bindings/clock/aspeed-clock.h | 1 + + include/dt-bindings/clock/thead,th1520-clk-ap.h | 1 + + include/linux/clk.h | 104 +- + include/linux/clk/renesas.h | 11 + + 105 files changed, 5767 insertions(+), 563 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,t7-peripherals-clkc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,t7-pll-clkc.yaml + create mode 100644 drivers/clk/aspeed/Kconfig + create mode 100644 drivers/clk/aspeed/Makefile + rename drivers/clk/{ => aspeed}/clk-aspeed.c (99%) + rename drivers/clk/{ => aspeed}/clk-aspeed.h (100%) + rename drivers/clk/{ => aspeed}/clk-ast2600.c (100%) + create mode 100644 drivers/clk/aspeed/clk-ast2700.c + create mode 100644 drivers/clk/meson/t7-peripherals.c + create mode 100644 drivers/clk/meson/t7-pll.c + create mode 100644 include/dt-bindings/clock/amlogic,t7-peripherals-clkc.h + create mode 100644 include/dt-bindings/clock/amlogic,t7-pll-clkc.h + create mode 100644 include/dt-bindings/clock/amlogic,t7-scmi.h +Merging clk-imx/for-next (3e6b0227b93c7 clk: imx: fracn-gppll: Add 241.90 MHz Support) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (4fef3fd633be4 clk: renesas: Add missing log message terminators) +$ git merge -m Merge branch 'renesas-clk' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging thead-clk/thead-clk-for-next (baf4fc7c03bd0 clk: thead: th1520-ap: Support CPU frequency scaling) +$ git merge -m Merge branch 'thead-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk/thead-clk-for-next +Already up to date. +Merging csky/linux-next (817d21578d51e csky: Remove compile warning for CONFIG_SMP) +$ git merge -m Merge branch 'linux-next' of https://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (cde0a836d89a4 Merge branch 'loongarch-kvm' into loongarch-next) +$ git merge -m Merge branch 'loongarch-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/kernel/setup.c +Auto-merging arch/loongarch/net/bpf_jit.c +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Auto-merging tools/testing/selftests/mm/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + arch/loongarch/Kconfig | 4 + + arch/loongarch/boot/dts/loongson-2k0500-ref.dts | 19 +++ + arch/loongarch/boot/dts/loongson-2k0500.dtsi | 12 +- + arch/loongarch/boot/dts/loongson-2k1000-ref.dts | 22 +++ + arch/loongarch/boot/dts/loongson-2k1000.dtsi | 13 +- + arch/loongarch/include/asm/cmpxchg.h | 53 ++++++ + arch/loongarch/include/asm/cpu-features.h | 1 + + arch/loongarch/include/asm/cpu.h | 62 +++---- + arch/loongarch/include/asm/kvm_host.h | 7 + + arch/loongarch/include/asm/kvm_para.h | 4 +- + arch/loongarch/include/asm/loongarch.h | 1 + + arch/loongarch/include/asm/qspinlock.h | 4 + + arch/loongarch/include/asm/setup.h | 3 + + arch/loongarch/include/asm/topology.h | 2 +- + arch/loongarch/include/asm/unistd.h | 1 + + arch/loongarch/include/uapi/asm/hwcap.h | 1 + + arch/loongarch/include/uapi/asm/kvm.h | 1 + + arch/loongarch/include/uapi/asm/kvm_para.h | 1 + + arch/loongarch/kernel/Makefile.syscalls | 5 +- + arch/loongarch/kernel/cpu-probe.c | 4 + + arch/loongarch/kernel/kgdb.c | 2 +- + arch/loongarch/kernel/paravirt.c | 21 ++- + arch/loongarch/kernel/proc.c | 63 +++++--- + arch/loongarch/kernel/setup.c | 1 + + arch/loongarch/kernel/smp.c | 13 ++ + arch/loongarch/kernel/unwind_orc.c | 18 ++- + arch/loongarch/kernel/unwind_prologue.c | 6 +- + arch/loongarch/kvm/intc/eiointc.c | 43 ++--- + arch/loongarch/kvm/intc/ipi.c | 26 +-- + arch/loongarch/kvm/intc/pch_pic.c | 31 ++-- + arch/loongarch/kvm/interrupt.c | 4 +- + arch/loongarch/kvm/main.c | 8 + + arch/loongarch/kvm/vcpu.c | 83 +++++++++- + arch/loongarch/kvm/vm.c | 39 +++-- + arch/loongarch/mm/kasan_init.c | 80 ++++----- + arch/loongarch/mm/tlb.c | 3 +- + arch/loongarch/net/bpf_jit.c | 206 +++++++++++++++++++----- + arch/loongarch/net/bpf_jit.h | 4 +- + tools/testing/selftests/kvm/Makefile.kvm | 1 + + tools/testing/selftests/kvm/steal_time.c | 96 +++++++++++ + tools/testing/selftests/mm/Makefile | 2 +- + 42 files changed, 728 insertions(+), 244 deletions(-) +Merging m68k/for-next (cb39cf99d88e8 m68k: sun3: Replace vsprintf() with bounded vsnprintf()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'ort' strategy. + arch/m68k/sun3/prom/printf.c | 4 ++-- + drivers/nubus/bus.c | 13 ++----------- + drivers/nubus/nubus.c | 12 +++++++++--- + include/linux/nubus.h | 3 +-- + 4 files changed, 14 insertions(+), 18 deletions(-) +Merging m68knommu/for-next (2ffdc7f231859 m68knommu: Replace deprecated strcpy with strscpy in init_ucsimm) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/68000/ucsimm.c | 3 ++- + arch/m68k/configs/amcore_defconfig | 2 -- + arch/m68k/configs/m5475evb_defconfig | 1 - + arch/m68k/configs/stmark2_defconfig | 1 - + arch/m68k/lib/memmove.c | 18 ++++++++++++++++++ + 5 files changed, 20 insertions(+), 5 deletions(-) +Merging microblaze/next (8f0b4cce4481f Linux 6.19-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 (3989ed4184834 MIPS: Loongson64: env: Fixup serial clock-frequency when using LEFI) +$ git merge -m Merge branch 'mips-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Auto-merging MAINTAINERS +Auto-merging arch/mips/Kconfig +Auto-merging drivers/clk/microchip/Kconfig +Auto-merging drivers/clk/microchip/clk-core.c +CONFLICT (content): Merge conflict in drivers/clk/microchip/clk-core.c +Resolved 'drivers/clk/microchip/clk-core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5c036aa6c2388] Merge branch 'mips-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + arch/mips/Kconfig | 1 - + arch/mips/boot/dts/loongson/ls7a-pch.dtsi | 6 +- + arch/mips/include/asm/mach-loongson2ef/loongson.h | 6 ++ + arch/mips/include/asm/mach-loongson64/topology.h | 2 +- + arch/mips/loongson2ef/common/pci.c | 18 ++-- + arch/mips/loongson2ef/common/setup.c | 1 + + arch/mips/loongson64/env.c | 98 ++++++++++++++++++++++ + arch/mips/pic32/common/reset.c | 3 +- + arch/mips/pic32/pic32mzda/config.c | 3 +- + arch/mips/pic32/pic32mzda/early_clk.c | 3 +- + arch/mips/pic32/pic32mzda/early_console.c | 3 +- + drivers/clk/microchip/Kconfig | 2 +- + drivers/clk/microchip/clk-core.c | 6 +- + drivers/irqchip/irq-pic32-evic.c | 2 +- + drivers/mmc/host/sdhci-pic32.c | 2 +- + drivers/pinctrl/pinctrl-pic32.c | 3 +- + drivers/rtc/rtc-pic32.c | 3 +- + drivers/tty/serial/pic32_uart.c | 3 +- + drivers/watchdog/pic32-dmt.c | 3 +- + drivers/watchdog/pic32-wdt.c | 3 +- + .../linux/platform_data}/pic32.h | 17 ++-- + 22 files changed, 152 insertions(+), 37 deletions(-) + rename {arch/mips/include/asm/mach-pic32 => include/linux/platform_data}/pic32.h (70%) +Merging openrisc/for-next (0dfffa5479d62 openrisc: define arch-specific version of nop()) +$ git merge -m Merge branch 'for-next' of https://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'ort' strategy. + arch/openrisc/boot/dts/de0-nano-common.dtsi | 42 ++++++++++ + arch/openrisc/boot/dts/de0-nano-multicore.dts | 25 ++++++ + arch/openrisc/boot/dts/de0-nano.dts | 54 +++++++++++++ + arch/openrisc/boot/dts/simple-smp.dts | 25 ++++++ + .../boot/dts/{simple_smp.dts => simple-smp.dtsi} | 11 ++- + arch/openrisc/configs/de0_nano_defconfig | 79 +++++++++++++++++++ + arch/openrisc/configs/de0_nano_multicore_defconfig | 92 ++++++++++++++++++++++ + arch/openrisc/configs/simple_smp_defconfig | 2 +- + arch/openrisc/include/asm/barrier.h | 2 + + arch/openrisc/include/asm/smp.h | 3 +- + arch/openrisc/kernel/smp.c | 22 +++++- + drivers/irqchip/irq-ompic.c | 17 ++-- + drivers/irqchip/irq-or1k-pic.c | 27 ++++++- + 13 files changed, 386 insertions(+), 15 deletions(-) + create mode 100644 arch/openrisc/boot/dts/de0-nano-common.dtsi + create mode 100644 arch/openrisc/boot/dts/de0-nano-multicore.dts + create mode 100644 arch/openrisc/boot/dts/de0-nano.dts + create mode 100644 arch/openrisc/boot/dts/simple-smp.dts + rename arch/openrisc/boot/dts/{simple_smp.dts => simple-smp.dtsi} (90%) + create mode 100644 arch/openrisc/configs/de0_nano_defconfig + create mode 100644 arch/openrisc/configs/de0_nano_multicore_defconfig +Merging parisc-hd/for-next (252d28ade43d4 parisc: Fix module path output in qemu tables) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/kernel/drivers.c | 12 ++++++++---- + arch/parisc/kernel/process.c | 3 +++ + arch/parisc/kernel/processor.c | 26 +++++++++++++------------- + 3 files changed, 24 insertions(+), 17 deletions(-) +Merging powerpc/next (1d72a02d65a73 docs: trusted-encryped: add PKWM as a new trust source) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/powerpc/include/asm/book3s/32/pgtable.h +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/net/bpf_jit_comp.c +Auto-merging include/linux/dma-map-ops.h +Auto-merging security/keys/trusted-keys/trusted_core.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-firmware-plpks | 58 ++ + Documentation/ABI/testing/sysfs-secvar | 65 -- + Documentation/admin-guide/kernel-parameters.txt | 1 + + Documentation/arch/powerpc/papr_hcalls.rst | 43 ++ + Documentation/security/keys/trusted-encrypted.rst | 50 ++ + MAINTAINERS | 9 + + arch/powerpc/Kconfig | 3 +- + arch/powerpc/include/asm/barrier.h | 2 +- + arch/powerpc/include/asm/book3s/32/kup.h | 3 +- + arch/powerpc/include/asm/book3s/32/mmu-hash.h | 5 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 4 - + arch/powerpc/include/asm/book3s/64/kup.h | 6 +- + arch/powerpc/include/asm/eeh.h | 2 + + arch/powerpc/include/asm/hvcall.h | 4 +- + arch/powerpc/include/asm/kgdb.h | 1 - + arch/powerpc/include/asm/kup.h | 52 +- + arch/powerpc/include/asm/nohash/32/kup-8xx.h | 3 +- + arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 4 - + arch/powerpc/include/asm/nohash/kup-booke.h | 3 +- + arch/powerpc/include/asm/plpks.h | 95 +-- + arch/powerpc/include/asm/secvar.h | 1 - + arch/powerpc/include/asm/task_size_32.h | 28 +- + arch/powerpc/include/asm/uaccess.h | 140 +++-- + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/kernel/dma-iommu.c | 30 +- + arch/powerpc/kernel/eeh_driver.c | 11 +- + arch/powerpc/kernel/eeh_pe.c | 74 ++- + arch/powerpc/kernel/head_book3s_32.S | 6 +- + arch/powerpc/kernel/secvar-sysfs.c | 21 +- + arch/powerpc/kernel/smp.c | 2 + + arch/powerpc/mm/book3s32/mmu.c | 4 +- + arch/powerpc/mm/mem.c | 2 - + arch/powerpc/mm/nohash/8xx.c | 2 - + arch/powerpc/mm/ptdump/segment_regs.c | 2 +- + arch/powerpc/net/bpf_jit.h | 16 + + arch/powerpc/net/bpf_jit_comp.c | 102 +++- + arch/powerpc/net/bpf_jit_comp64.c | 303 ++++++++-- + arch/powerpc/platforms/pseries/Makefile | 2 +- + arch/powerpc/platforms/pseries/iommu.c | 6 +- + arch/powerpc/platforms/pseries/msi.c | 44 +- + arch/powerpc/platforms/pseries/plpks-secvar.c | 29 - + arch/powerpc/platforms/pseries/plpks-sysfs.c | 96 +++ + arch/powerpc/platforms/pseries/plpks.c | 687 +++++++++++++++++++++- + include/keys/trusted-type.h | 7 +- + include/keys/trusted_pkwm.h | 33 ++ + include/linux/dma-map-ops.h | 4 + + kernel/dma/mapping.c | 4 +- + security/keys/trusted-keys/Kconfig | 8 + + security/keys/trusted-keys/Makefile | 2 + + security/keys/trusted-keys/trusted_core.c | 6 +- + security/keys/trusted-keys/trusted_pkwm.c | 190 ++++++ + 51 files changed, 1856 insertions(+), 421 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-plpks + create mode 100644 arch/powerpc/platforms/pseries/plpks-sysfs.c + create mode 100644 include/keys/trusted_pkwm.h + create mode 100644 security/keys/trusted-keys/trusted_pkwm.c +Merging risc-v/for-next (099ba40b1bd99 riscv: lib: optimize strlen loop efficiency) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/riscv/extensions.yaml +Auto-merging arch/riscv/configs/defconfig +Auto-merging arch/riscv/include/asm/page.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/page.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/mm/init.c +Auto-merging include/linux/mm.h +Resolved 'arch/riscv/include/asm/page.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8c7f9baff9e6a] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 8 + + Documentation/arch/riscv/hwprobe.rst | 6 +- + Documentation/arch/riscv/index.rst | 2 + + Documentation/arch/riscv/zicfilp.rst | 122 +++ + Documentation/arch/riscv/zicfiss.rst | 194 +++++ + .../devicetree/bindings/riscv/extensions.yaml | 14 + + arch/riscv/Kconfig | 22 + + arch/riscv/Makefile | 8 +- + arch/riscv/configs/defconfig | 2 +- + arch/riscv/configs/hardening.config | 4 + + arch/riscv/include/asm/asm-prototypes.h | 1 + + arch/riscv/include/asm/assembler.h | 44 + + arch/riscv/include/asm/cpufeature.h | 12 + + arch/riscv/include/asm/csr.h | 31 + + arch/riscv/include/asm/entry-common.h | 2 + + arch/riscv/include/asm/hwcap.h | 2 + + arch/riscv/include/asm/hwprobe.h | 3 +- + arch/riscv/include/asm/mman.h | 26 + + arch/riscv/include/asm/mmu_context.h | 7 + + arch/riscv/include/asm/page.h | 3 +- + arch/riscv/include/asm/pgtable.h | 30 +- + arch/riscv/include/asm/processor.h | 1 + + arch/riscv/include/asm/thread_info.h | 3 + + arch/riscv/include/asm/usercfi.h | 97 +++ + arch/riscv/include/asm/vdso.h | 13 +- + arch/riscv/include/uapi/asm/hwprobe.h | 4 + + arch/riscv/include/uapi/asm/ptrace.h | 34 + + arch/riscv/include/uapi/asm/sigcontext.h | 1 + + arch/riscv/kernel/Makefile | 2 + + arch/riscv/kernel/asm-offsets.c | 10 + + arch/riscv/kernel/cpufeature.c | 25 + + arch/riscv/kernel/entry.S | 38 + + arch/riscv/kernel/head.S | 27 + + arch/riscv/kernel/process.c | 27 +- + arch/riscv/kernel/ptrace.c | 193 ++++- + arch/riscv/kernel/signal.c | 86 ++ + arch/riscv/kernel/sys_hwprobe.c | 170 ++-- + arch/riscv/kernel/sys_riscv.c | 10 + + arch/riscv/kernel/traps.c | 54 ++ + arch/riscv/kernel/usercfi.c | 542 ++++++++++++ + arch/riscv/kernel/vdso.c | 7 + + arch/riscv/kernel/vdso/Makefile | 40 +- + arch/riscv/kernel/vdso/flush_icache.S | 4 + + arch/riscv/kernel/vdso/gen_vdso_offsets.sh | 4 +- + arch/riscv/kernel/vdso/getcpu.S | 4 + + arch/riscv/kernel/vdso/note.S | 3 + + arch/riscv/kernel/vdso/rt_sigreturn.S | 4 + + arch/riscv/kernel/vdso/sys_hwprobe.S | 4 + + arch/riscv/kernel/vdso/vgetrandom-chacha.S | 5 +- + arch/riscv/kernel/vdso_cfi/Makefile | 25 + + arch/riscv/kernel/vdso_cfi/vdso-cfi.S | 11 + + arch/riscv/kernel/vector.c | 12 +- + arch/riscv/lib/strlen.S | 8 +- + arch/riscv/mm/init.c | 2 +- + arch/riscv/mm/pgtable.c | 16 + + drivers/iommu/riscv/iommu.c | 8 +- + include/linux/cpu.h | 4 + + include/linux/mm.h | 5 +- + include/uapi/linux/elf.h | 2 + + include/uapi/linux/prctl.h | 27 + + kernel/sys.c | 30 + + tools/testing/selftests/riscv/Makefile | 2 +- + tools/testing/selftests/riscv/cfi/.gitignore | 2 + + tools/testing/selftests/riscv/cfi/Makefile | 23 + + tools/testing/selftests/riscv/cfi/cfi_rv_test.h | 82 ++ + tools/testing/selftests/riscv/cfi/cfitests.c | 173 ++++ + tools/testing/selftests/riscv/cfi/shadowstack.c | 385 +++++++++ + tools/testing/selftests/riscv/cfi/shadowstack.h | 27 + + tools/testing/selftests/riscv/hwprobe/which-cpus.c | 18 +- + tools/testing/selftests/riscv/vector/.gitignore | 2 + + tools/testing/selftests/riscv/vector/Makefile | 10 +- + tools/testing/selftests/riscv/vector/v_helpers.c | 23 + + tools/testing/selftests/riscv/vector/v_helpers.h | 2 + + .../selftests/riscv/vector/validate_v_ptrace.c | 915 +++++++++++++++++++++ + .../selftests/riscv/vector/vstate_exec_nolibc.c | 8 +- + 75 files changed, 3655 insertions(+), 122 deletions(-) + create mode 100644 Documentation/arch/riscv/zicfilp.rst + create mode 100644 Documentation/arch/riscv/zicfiss.rst + create mode 100644 arch/riscv/configs/hardening.config + create mode 100644 arch/riscv/include/asm/mman.h + create mode 100644 arch/riscv/include/asm/usercfi.h + create mode 100644 arch/riscv/kernel/usercfi.c + create mode 100644 arch/riscv/kernel/vdso_cfi/Makefile + create mode 100644 arch/riscv/kernel/vdso_cfi/vdso-cfi.S + create mode 100644 tools/testing/selftests/riscv/cfi/.gitignore + create mode 100644 tools/testing/selftests/riscv/cfi/Makefile + create mode 100644 tools/testing/selftests/riscv/cfi/cfi_rv_test.h + create mode 100644 tools/testing/selftests/riscv/cfi/cfitests.c + create mode 100644 tools/testing/selftests/riscv/cfi/shadowstack.c + create mode 100644 tools/testing/selftests/riscv/cfi/shadowstack.h + create mode 100644 tools/testing/selftests/riscv/vector/validate_v_ptrace.c +Merging riscv-dt/riscv-dt-for-next (18649ffbb63bc riscv: dts: anlogic: dr1v90: Add "b" ISA extension) +$ git merge -m Merge branch 'riscv-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Already up to date. +Merging riscv-soc/riscv-soc-for-next (fd69c5b3002c3 Merge branch 'k230-basic' into riscv-soc-for-next) +$ git merge -m Merge branch 'riscv-soc-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Auto-merging Documentation/devicetree/bindings/timer/sifive,clint.yaml +Merge made by the 'ort' strategy. + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../devicetree/bindings/riscv/canaan.yaml | 8 +- + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + arch/riscv/boot/dts/canaan/Makefile | 2 + + arch/riscv/boot/dts/canaan/k230-canmv.dts | 332 +++++++++++++++++++++ + arch/riscv/boot/dts/canaan/k230-evb.dts | 28 ++ + arch/riscv/boot/dts/canaan/k230-pinctrl.h | 18 ++ + arch/riscv/boot/dts/canaan/k230.dtsi | 157 ++++++++++ + 8 files changed, 546 insertions(+), 1 deletion(-) + 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-pinctrl.h + create mode 100644 arch/riscv/boot/dts/canaan/k230.dtsi +Merging s390/for-next (8c8ef9323f018 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging drivers/s390/crypto/ap_bus.c +Merge made by the 'ort' strategy. + Documentation/arch/s390/mm.rst | 4 + + .../features/debug/stackprotector/arch-support.txt | 2 +- + arch/s390/Kconfig | 19 + + arch/s390/boot/Makefile | 1 + + arch/s390/boot/startup.c | 1 + + arch/s390/configs/debug_defconfig | 1 + + arch/s390/configs/defconfig | 1 + + arch/s390/include/asm/ap.h | 2 +- + arch/s390/include/asm/asm-prototypes.h | 1 + + arch/s390/include/asm/asm.h | 2 +- + arch/s390/include/asm/bug.h | 145 +- + arch/s390/include/asm/pci_io.h | 1 + + arch/s390/include/asm/preempt.h | 47 +- + arch/s390/include/asm/ptrace.h | 42 +- + arch/s390/include/uapi/asm/tape390.h | 103 -- + arch/s390/kernel/entry.S | 11 + + arch/s390/kernel/machine_kexec_file.c | 4 +- + arch/s390/kernel/perf_cpum_sf.c | 2 +- + arch/s390/kernel/traps.c | 46 +- + arch/s390/pci/pci.c | 35 +- + arch/s390/purgatory/Makefile | 1 + + drivers/s390/char/Kconfig | 15 +- + drivers/s390/char/Makefile | 3 +- + drivers/s390/char/tape.h | 9 +- + drivers/s390/char/tape_3490.c | 833 ++++++++++ + drivers/s390/char/tape_34xx.c | 1204 --------------- + drivers/s390/char/tape_3590.c | 1612 -------------------- + drivers/s390/char/tape_3590.h | 175 --- + drivers/s390/char/tape_char.c | 5 +- + drivers/s390/char/tape_core.c | 4 +- + drivers/s390/char/tape_std.c | 32 - + drivers/s390/char/tape_std.h | 45 +- + drivers/s390/crypto/ap_bus.c | 12 +- + drivers/s390/crypto/zcrypt_api.c | 2 +- + 34 files changed, 1148 insertions(+), 3274 deletions(-) + delete mode 100644 arch/s390/include/uapi/asm/tape390.h + create mode 100644 drivers/s390/char/tape_3490.c + delete mode 100644 drivers/s390/char/tape_34xx.c + delete mode 100644 drivers/s390/char/tape_3590.c + delete mode 100644 drivers/s390/char/tape_3590.h +Merging sh/for-next (8f5ae30d69d75 Linux 6.17-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (d2da7ee74f842 sparc: Add architecture support for clone3) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Auto-merging arch/sparc/Kconfig +Merge made by the 'ort' strategy. + arch/sparc/Kconfig | 11 +++++++ + arch/sparc/include/asm/syscalls.h | 1 + + arch/sparc/include/asm/unistd.h | 2 -- + arch/sparc/kernel/entry.S | 15 ++++++++++ + arch/sparc/kernel/kernel.h | 1 + + arch/sparc/kernel/process.c | 52 +++++++++++++++++++++++++--------- + arch/sparc/kernel/process_32.c | 23 +++++++++++---- + arch/sparc/kernel/process_64.c | 27 ++++++++++++++---- + arch/sparc/kernel/syscalls.S | 8 ++++++ + arch/sparc/kernel/syscalls/syscall.tbl | 2 +- + 10 files changed, 113 insertions(+), 29 deletions(-) +Merging uml/next (68e25613ed4d0 arch/um: remove unused varible err in remove_files_and_dir()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Merge made by the 'ort' strategy. + arch/um/drivers/virtio_uml.c | 51 +++++++++++++++++++++++++++++++++++++++++++- + arch/um/os-Linux/signal.c | 9 +++++--- + arch/um/os-Linux/umid.c | 3 +-- + 3 files changed, 57 insertions(+), 6 deletions(-) +Merging xtensa/xtensa-for-next (0d4b3ca115b54 xtensa: align: validate access in fast_load_store) +$ git merge -m Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/kernel/align.S | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging fs-next (054a8722d6f75 Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +CONFLICT (content): Merge conflict in Documentation/admin-guide/kernel-parameters.txt +Auto-merging fs/btrfs/Makefile +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/erofs/data.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/fat/dir.c +CONFLICT (content): Merge conflict in fs/fat/dir.c +Auto-merging fs/fat/namei_msdos.c +Auto-merging fs/fat/namei_vfat.c +Auto-merging fs/gfs2/lock_dlm.c +Auto-merging fs/ntfs3/file.c +CONFLICT (content): Merge conflict in fs/ntfs3/file.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/orangefs/file.c +Auto-merging fs/sync.c +Auto-merging fs/xfs/scrub/xfile.c +Auto-merging fs/xfs/xfs_buf_mem.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging include/trace/events/writeback.h +Auto-merging include/uapi/linux/sysctl.h +Auto-merging init/Kconfig +Auto-merging mm/huge_memory.c +Auto-merging mm/readahead.c +Auto-merging mm/shmem.c +Auto-merging mm/swapfile.c +Resolved 'Documentation/admin-guide/kernel-parameters.txt' using previous resolution. +Resolved 'fs/fat/dir.c' using previous resolution. +Resolved 'fs/ntfs3/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2b9d5ea14503a] Merge branch 'fs-next' of linux-next +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-fs-erofs | 20 +- + Documentation/ABI/testing/sysfs-fs-f2fs | 30 +- + Documentation/admin-guide/kernel-parameters.txt | 12 +- + Documentation/admin-guide/sysctl/kernel.rst | 6 - + Documentation/admin-guide/xfs.rst | 8 + + Documentation/filesystems/erofs.rst | 18 +- + Documentation/filesystems/ext2.rst | 2 +- + Documentation/filesystems/f2fs.rst | 49 +- + Documentation/filesystems/locking.rst | 13 +- + Documentation/filesystems/mount_api.rst | 2 - + Documentation/filesystems/nfs/exporting.rst | 40 +- + Documentation/filesystems/porting.rst | 27 +- + .../filesystems/ramfs-rootfs-initramfs.rst | 24 +- + Documentation/filesystems/vfs.rst | 76 +- + Documentation/netlink/specs/nfsd.yaml | 5 + + Documentation/sunrpc/xdr/nfs4_1.x | 61 + + arch/alpha/include/uapi/asm/errno.h | 2 + + arch/alpha/kernel/osf_sys.c | 34 +- + arch/arm/configs/neponset_defconfig | 2 +- + arch/mips/include/uapi/asm/errno.h | 2 + + arch/parisc/include/uapi/asm/errno.h | 2 + + arch/sparc/include/uapi/asm/errno.h | 2 + + block/bio.c | 34 + + drivers/block/rbd.c | 33 +- + drivers/infiniband/core/cma.c | 30 + + drivers/infiniband/core/cma_priv.h | 1 + + fs/9p/acl.c | 16 +- + fs/9p/vfs_dir.c | 2 - + fs/9p/vfs_file.c | 2 - + fs/Makefile | 2 +- + fs/affs/dir.c | 2 + + fs/affs/file.c | 2 + + fs/attr.c | 12 +- + fs/bad_inode.c | 3 +- + fs/befs/linuxvfs.c | 2 + + fs/btrfs/Kconfig | 13 +- + fs/btrfs/Makefile | 7 +- + fs/btrfs/accessors.h | 30 + + fs/btrfs/acl.c | 10 +- + fs/btrfs/backref.c | 4 +- + fs/btrfs/bio.c | 35 +- + fs/btrfs/bio.h | 19 +- + fs/btrfs/block-group.c | 455 ++- + fs/btrfs/block-group.h | 31 +- + fs/btrfs/block-rsv.c | 8 + + fs/btrfs/block-rsv.h | 1 + + fs/btrfs/btrfs_inode.h | 4 - + fs/btrfs/compression.c | 217 +- + fs/btrfs/compression.h | 40 +- + fs/btrfs/ctree.c | 49 +- + fs/btrfs/ctree.h | 9 + + fs/btrfs/defrag.c | 10 +- + fs/btrfs/delayed-inode.c | 53 +- + fs/btrfs/delayed-inode.h | 15 - + fs/btrfs/direct-io.c | 29 +- + fs/btrfs/discard.c | 52 +- + fs/btrfs/disk-io.c | 284 +- + fs/btrfs/extent-io-tree.c | 7 +- + fs/btrfs/extent-tree.c | 457 ++- + fs/btrfs/extent-tree.h | 4 +- + fs/btrfs/extent_io.c | 130 +- + fs/btrfs/extent_map.c | 12 + + fs/btrfs/file-item.c | 20 +- + fs/btrfs/file.c | 62 +- + fs/btrfs/free-space-cache.c | 108 +- + fs/btrfs/free-space-cache.h | 1 + + fs/btrfs/free-space-tree.c | 150 +- + fs/btrfs/free-space-tree.h | 6 +- + fs/btrfs/fs.c | 102 +- + fs/btrfs/fs.h | 79 +- + fs/btrfs/inode-item.c | 7 +- + fs/btrfs/inode.c | 627 ++-- + fs/btrfs/ioctl.c | 119 +- + fs/btrfs/locking.c | 1 + + fs/btrfs/lzo.c | 295 +- + fs/btrfs/messages.c | 26 +- + fs/btrfs/messages.h | 76 +- + fs/btrfs/qgroup.c | 125 +- + fs/btrfs/reflink.c | 11 +- + fs/btrfs/relocation.c | 1765 +++++++++- + fs/btrfs/relocation.h | 17 + + fs/btrfs/root-tree.c | 47 +- + fs/btrfs/scrub.c | 56 +- + fs/btrfs/send.c | 76 +- + fs/btrfs/space-info.c | 73 +- + fs/btrfs/space-info.h | 16 + + fs/btrfs/super.c | 17 +- + fs/btrfs/sysfs.c | 55 +- + fs/btrfs/tests/btrfs-tests.c | 6 + + fs/btrfs/tests/btrfs-tests.h | 17 + + fs/btrfs/tests/chunk-allocation-tests.c | 476 +++ + fs/btrfs/tests/extent-map-tests.c | 16 +- + fs/btrfs/tests/free-space-tree-tests.c | 4 +- + fs/btrfs/tests/inode-tests.c | 126 +- + fs/btrfs/tests/zoned-tests.c | 675 ++++ + fs/btrfs/transaction.c | 78 +- + fs/btrfs/tree-checker.c | 84 +- + fs/btrfs/tree-checker.h | 5 + + fs/btrfs/tree-log.c | 2 +- + fs/btrfs/uuid-tree.c | 16 +- + fs/btrfs/verity.c | 24 +- + fs/btrfs/volumes.c | 631 +++- + fs/btrfs/volumes.h | 57 +- + fs/btrfs/zlib.c | 97 +- + fs/btrfs/zoned.c | 401 ++- + fs/btrfs/zoned.h | 17 + + fs/btrfs/zstd.c | 139 +- + fs/buffer.c | 31 +- + fs/ceph/acl.c | 50 +- + fs/ceph/crypto.c | 9 +- + fs/ceph/dir.c | 2 - + fs/ceph/file.c | 1 - + fs/ceph/mds_client.c | 5 +- + fs/ceph/mdsmap.c | 26 +- + fs/ceph/mdsmap.h | 1 + + fs/ceph/super.h | 16 +- + fs/char_dev.c | 19 +- + fs/coredump.c | 3 +- + fs/cramfs/inode.c | 2 + + fs/dcache.c | 13 +- + fs/dlm/config.c | 16 +- + fs/dlm/dir.c | 6 +- + fs/dlm/dlm_internal.h | 4 +- + fs/dlm/lock.c | 22 +- + fs/dlm/member.c | 6 +- + fs/ecryptfs/crypto.c | 38 +- + fs/ecryptfs/debug.c | 1 - + fs/ecryptfs/ecryptfs_kernel.h | 5 +- + fs/ecryptfs/keystore.c | 19 +- + fs/ecryptfs/main.c | 9 +- + fs/efs/dir.c | 2 + + fs/erofs/Kconfig | 20 +- + fs/erofs/Makefile | 1 + + fs/erofs/data.c | 113 +- + fs/erofs/decompressor.c | 85 +- + fs/erofs/decompressor_crypto.c | 2 +- + fs/erofs/decompressor_deflate.c | 1 - + fs/erofs/dir.c | 2 + + fs/erofs/erofs_fs.h | 7 +- + fs/erofs/fileio.c | 45 +- + fs/erofs/fscache.c | 17 +- + fs/erofs/inode.c | 78 +- + fs/erofs/internal.h | 76 +- + fs/erofs/ishare.c | 206 ++ + fs/erofs/super.c | 142 +- + fs/erofs/sysfs.c | 9 +- + fs/erofs/xattr.c | 266 +- + fs/erofs/xattr.h | 40 +- + fs/erofs/zdata.c | 110 +- + fs/exec.c | 180 +- + fs/exfat/cache.c | 149 +- + fs/exfat/dir.c | 2 + + fs/exfat/exfat_fs.h | 7 +- + fs/exfat/fatent.c | 62 +- + fs/exfat/file.c | 18 +- + fs/exfat/inode.c | 57 +- + fs/exfat/namei.c | 4 +- + fs/ext2/dir.c | 2 + + fs/ext2/ext2.h | 1 - + fs/ext2/file.c | 2 + + fs/ext4/dir.c | 2 + + fs/ext4/ext4.h | 45 +- + fs/ext4/extents-test.c | 1027 ++++++ + fs/ext4/extents.c | 608 ++-- + fs/ext4/extents_status.c | 125 +- + fs/ext4/fast_commit.c | 54 +- + fs/ext4/fast_commit.h | 3 + + fs/ext4/file.c | 26 +- + fs/ext4/inode.c | 125 +- + fs/ext4/ioctl.c | 5 + + fs/ext4/mballoc-test.c | 2 +- + fs/ext4/mballoc.c | 76 +- + fs/ext4/migrate.c | 12 + + fs/ext4/move_extent.c | 2 + + fs/ext4/readpage.c | 64 +- + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 56 +- + fs/ext4/sysfs.c | 36 + + fs/ext4/verity.c | 38 +- + fs/f2fs/checkpoint.c | 176 +- + fs/f2fs/compress.c | 25 +- + fs/f2fs/data.c | 525 ++- + fs/f2fs/debug.c | 1 + + fs/f2fs/dir.c | 2 + + fs/f2fs/f2fs.h | 248 +- + fs/f2fs/file.c | 92 +- + fs/f2fs/gc.c | 84 +- + fs/f2fs/inline.c | 10 +- + fs/f2fs/inode.c | 17 +- + fs/f2fs/namei.c | 65 +- + fs/f2fs/node.c | 99 +- + fs/f2fs/node.h | 8 - + fs/f2fs/recovery.c | 11 +- + fs/f2fs/segment.c | 133 +- + fs/f2fs/segment.h | 108 +- + fs/f2fs/super.c | 204 +- + fs/f2fs/sysfs.c | 76 +- + fs/f2fs/verity.c | 36 +- + fs/f2fs/xattr.c | 5 +- + fs/fat/dir.c | 8 +- + fs/fat/fat.h | 11 +- + fs/fat/file.c | 19 +- + fs/fat/inode.c | 2 +- + fs/fat/misc.c | 59 +- + fs/fat/namei_msdos.c | 13 +- + fs/fat/namei_vfat.c | 9 +- + fs/fhandle.c | 5 +- + fs/file_attr.c | 12 +- + fs/file_table.c | 11 +- + fs/filesystems.c | 9 +- + fs/freevxfs/vxfs_lookup.c | 2 + + fs/fs-writeback.c | 33 +- + fs/fs_context.c | 208 +- + fs/fs_struct.c | 1 + + fs/fserror.c | 194 ++ + fs/fsopen.c | 16 +- + fs/fuse/acl.c | 12 +- + fs/fuse/dev.c | 2 +- + fs/fuse/dir.c | 1 - + fs/fuse/file.c | 13 +- + fs/gfs2/acl.c | 13 +- + fs/gfs2/bmap.c | 13 +- + fs/gfs2/file.c | 3 +- + fs/gfs2/glock.c | 190 +- + fs/gfs2/glock.h | 9 +- + fs/gfs2/glops.c | 34 +- + fs/gfs2/incore.h | 18 +- + fs/gfs2/inode.c | 27 +- + fs/gfs2/lock_dlm.c | 28 +- + fs/gfs2/log.c | 7 +- + fs/gfs2/lops.c | 51 +- + fs/gfs2/lops.h | 4 +- + fs/gfs2/meta_io.c | 6 +- + fs/gfs2/meta_io.h | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/quota.c | 5 +- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/super.c | 4 +- + fs/gfs2/trace_gfs2.h | 50 +- + fs/gfs2/trans.c | 4 +- + fs/init.c | 115 +- + fs/inode.c | 316 +- + fs/internal.h | 23 +- + fs/iomap/buffered-io.c | 29 +- + fs/iomap/direct-io.c | 12 + + fs/iomap/ioend.c | 6 + + fs/isofs/dir.c | 2 + + fs/isofs/rock.c | 2 +- + fs/jffs2/dir.c | 2 + + fs/jffs2/file.c | 2 + + fs/jfs/acl.c | 9 +- + fs/jfs/file.c | 2 + + fs/jfs/jfs_dtree.c | 4 +- + fs/jfs/jfs_logmgr.c | 1 + + fs/jfs/namei.c | 8 +- + fs/libfs.c | 20 +- + fs/lockd/svc.c | 6 +- + fs/lockd/svclock.c | 4 - + fs/locks.c | 34 +- + fs/minix/inode.c | 50 +- + fs/minix/minix.h | 2 - + fs/mount.h | 1 + + fs/namei.c | 546 +-- + fs/namespace.c | 456 ++- + fs/netfs/read_collect.c | 10 + + fs/netfs/read_retry.c | 4 +- + fs/netfs/write_collect.c | 8 +- + fs/netfs/write_issue.c | 1 + + fs/netfs/write_retry.c | 1 - + fs/nfs/Kconfig | 26 +- + fs/nfs/Makefile | 4 +- + fs/nfs/callback.c | 23 +- + fs/nfs/callback.h | 3 - + fs/nfs/callback_proc.c | 16 +- + fs/nfs/callback_xdr.c | 21 - + fs/nfs/client.c | 12 +- + fs/nfs/delegation.c | 604 ++-- + fs/nfs/delegation.h | 9 +- + fs/nfs/dir.c | 1 - + fs/nfs/file.c | 1 - + fs/nfs/fs_context.c | 3 +- + fs/nfs/inode.c | 37 +- + fs/nfs/internal.h | 15 +- + fs/nfs/localio.c | 126 +- + fs/nfs/netns.h | 4 +- + fs/nfs/nfs3proc.c | 3 +- + fs/nfs/nfs40.h | 19 + + fs/nfs/nfs40client.c | 245 ++ + fs/nfs/nfs40proc.c | 395 +++ + fs/nfs/nfs42proc.c | 13 +- + fs/nfs/nfs4_fs.h | 83 +- + fs/nfs/nfs4client.c | 193 +- + fs/nfs/nfs4proc.c | 764 +---- + fs/nfs/nfs4session.c | 4 - + fs/nfs/nfs4session.h | 23 - + fs/nfs/nfs4state.c | 91 +- + fs/nfs/nfs4trace.c | 2 - + fs/nfs/nfs4trace.h | 21 +- + fs/nfs/nfs4xdr.c | 109 +- + fs/nfs/pnfs.c | 3 +- + fs/nfs/pnfs.h | 6 +- + fs/nfs/proc.c | 3 +- + fs/nfs/read.c | 4 +- + fs/nfs/super.c | 30 +- + fs/nfs/sysfs.c | 10 +- + fs/nfs/write.c | 2 +- + fs/nfsd/Kconfig | 19 + + fs/nfsd/Makefile | 10 +- + fs/nfsd/acl.h | 1 + + fs/nfsd/netlink.c | 5 +- + fs/nfsd/netns.h | 7 +- + fs/nfsd/nfs2acl.c | 2 +- + fs/nfsd/nfs4acl.c | 17 +- + fs/nfsd/nfs4idmap.c | 52 +- + fs/nfsd/nfs4proc.c | 276 +- + fs/nfsd/nfs4state.c | 52 +- + fs/nfsd/nfs4xdr.c | 363 +- + fs/nfsd/nfs4xdr_gen.c | 351 +- + fs/nfsd/nfs4xdr_gen.h | 12 +- + fs/nfsd/nfsctl.c | 7 + + fs/nfsd/nfsd.h | 24 +- + fs/nfsd/nfsproc.c | 2 +- + fs/nfsd/nfssvc.c | 64 +- + fs/nfsd/state.h | 5 + + fs/nfsd/trace.h | 54 + + fs/nfsd/vfs.c | 34 +- + fs/nfsd/vfs.h | 3 +- + fs/nfsd/xdr4.h | 7 + + fs/nilfs2/dir.c | 3 +- + fs/nilfs2/file.c | 2 + + fs/notify/fsnotify.c | 69 +- + fs/notify/fsnotify.h | 5 +- + fs/notify/mark.c | 139 +- + fs/nsfs.c | 13 + + fs/ntfs3/attrib.c | 81 +- + fs/ntfs3/attrlist.c | 9 + + fs/ntfs3/bitmap.c | 17 + + fs/ntfs3/dir.c | 116 +- + fs/ntfs3/file.c | 442 +-- + fs/ntfs3/frecord.c | 318 +- + fs/ntfs3/fslog.c | 65 +- + fs/ntfs3/fsntfs.c | 57 +- + fs/ntfs3/index.c | 26 +- + fs/ntfs3/inode.c | 782 ++--- + fs/ntfs3/namei.c | 17 +- + fs/ntfs3/ntfs.h | 1 + + fs/ntfs3/ntfs_fs.h | 64 +- + fs/ntfs3/run.c | 13 +- + fs/ntfs3/super.c | 24 +- + fs/ntfs3/xattr.c | 11 +- + fs/nullfs.c | 70 + + fs/ocfs2/file.c | 5 + + fs/open.c | 158 +- + fs/orangefs/acl.c | 8 +- + fs/orangefs/dir.c | 4 +- + fs/orangefs/file.c | 1 + + fs/orangefs/inode.c | 29 +- + fs/orangefs/orangefs-debugfs.c | 36 +- + fs/orangefs/orangefs-kernel.h | 3 +- + fs/orangefs/xattr.c | 12 +- + fs/overlayfs/file.c | 2 + + fs/overlayfs/inode.c | 7 +- + fs/overlayfs/overlayfs.h | 3 +- + fs/overlayfs/readdir.c | 2 + + fs/posix_acl.c | 21 +- + fs/qnx4/dir.c | 2 + + fs/qnx6/dir.c | 2 + + fs/quota/quota.c | 4 +- + fs/read_write.c | 2 + + fs/select.c | 12 +- + fs/smb/Kconfig | 17 + + fs/smb/client/Makefile | 24 +- + fs/smb/client/cached_dir.c | 10 +- + fs/smb/client/cached_dir.h | 42 +- + fs/smb/client/cifs_debug.c | 18 +- + fs/smb/client/cifs_debug.h | 1 - + fs/smb/client/cifs_spnego.h | 4 +- + fs/smb/client/cifs_swn.h | 10 +- + fs/smb/client/cifs_unicode.c | 1 - + fs/smb/client/cifs_unicode.h | 17 +- + fs/smb/client/cifsacl.c | 1 - + fs/smb/client/cifsencrypt.c | 124 - + fs/smb/client/cifsfs.c | 7 +- + fs/smb/client/cifsfs.h | 114 +- + fs/smb/client/cifsglob.h | 51 +- + fs/smb/client/cifspdu.h | 2377 +------------ + fs/smb/client/cifsproto.h | 768 ++--- + fs/smb/client/cifssmb.c | 147 +- + fs/smb/client/cifstransport.c | 265 -- + fs/smb/client/compress.h | 3 +- + fs/smb/client/connect.c | 329 +- + fs/smb/client/dfs.h | 3 +- + fs/smb/client/dfs_cache.h | 19 +- + fs/smb/client/dir.c | 1 - + fs/smb/client/dns_resolve.h | 4 +- + fs/smb/client/file.c | 1 - + fs/smb/client/fs_context.c | 1 - + fs/smb/client/fs_context.h | 16 +- + fs/smb/client/fscache.h | 15 +- + fs/smb/client/gen_smb2_mapping | 86 + + fs/smb/client/inode.c | 1 - + fs/smb/client/ioctl.c | 1 - + fs/smb/client/link.c | 1 - + fs/smb/client/misc.c | 302 +- + fs/smb/client/netlink.h | 4 +- + fs/smb/client/netmisc.c | 824 +---- + fs/smb/client/nterr.c | 15 + + fs/smb/client/nterr.h | 13 + + fs/smb/client/ntlmssp.h | 15 +- + fs/smb/client/readdir.c | 1 - + fs/smb/client/reparse.h | 14 +- + fs/smb/client/sess.c | 982 ------ + fs/smb/client/smb1debug.c | 25 + + fs/smb/client/smb1encrypt.c | 139 + + fs/smb/client/smb1maperror.c | 810 +++++ + fs/smb/client/smb1misc.c | 189 ++ + fs/smb/client/smb1ops.c | 279 +- + fs/smb/client/smb1pdu.h | 2354 +++++++++++++ + fs/smb/client/smb1proto.h | 335 ++ + fs/smb/client/smb1session.c | 995 ++++++ + fs/smb/client/smb1transport.c | 563 ++++ + fs/smb/client/smb2file.c | 2 +- + fs/smb/client/smb2inode.c | 23 +- + fs/smb/client/smb2maperror.c | 2473 +------------- + fs/smb/client/smb2maperror_test.c | 45 + + fs/smb/client/smb2misc.c | 6 +- + fs/smb/client/smb2ops.c | 59 +- + fs/smb/client/smb2pdu.c | 195 +- + fs/smb/client/smb2proto.h | 469 ++- + fs/smb/client/smbdirect.c | 549 ++- + fs/smb/client/smbencrypt.c | 1 - + fs/smb/client/smberr.h | 2 +- + fs/smb/client/trace.h | 1 + + fs/smb/client/transport.c | 1 - + fs/smb/client/xattr.c | 1 - + fs/smb/common/smb2pdu.h | 3 + + fs/smb/common/smb2status.h | 3499 ++++++++++---------- + fs/smb/common/smbdirect/smbdirect_socket.h | 18 + + fs/smb/server/transport_rdma.c | 259 +- + fs/smb/server/vfs.c | 15 +- + fs/splice.c | 2 +- + fs/squashfs/dir.c | 2 + + fs/squashfs/file.c | 4 +- + fs/stat.c | 28 +- + fs/statfs.c | 3 +- + fs/super.c | 7 +- + fs/sync.c | 4 +- + fs/ubifs/file.c | 28 +- + fs/ubifs/ubifs.h | 3 +- + fs/udf/dir.c | 2 + + fs/udf/file.c | 2 + + fs/udf/udf_sb.h | 2 - + fs/ufs/dir.c | 2 + + fs/ufs/file.c | 2 + + fs/utimes.c | 8 +- + fs/vboxsf/dir.c | 1 - + fs/vboxsf/file.c | 1 - + fs/verity/Makefile | 1 + + fs/verity/enable.c | 41 +- + fs/verity/fsverity_private.h | 20 +- + fs/verity/open.c | 86 +- + fs/verity/pagecache.c | 58 + + fs/verity/read_metadata.c | 19 +- + fs/verity/verify.c | 91 +- + fs/xattr.c | 33 +- + fs/xfs/Makefile | 2 + + fs/xfs/libxfs/xfs_ag.c | 2 +- + fs/xfs/libxfs/xfs_ag_resv.c | 2 +- + fs/xfs/libxfs/xfs_alloc.c | 10 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 2 +- + fs/xfs/libxfs/xfs_attr.c | 191 +- + fs/xfs/libxfs/xfs_attr.h | 6 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 197 +- + fs/xfs/libxfs/xfs_attr_leaf.h | 1 + + fs/xfs/libxfs/xfs_attr_remote.c | 2 +- + fs/xfs/libxfs/xfs_bit.c | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 2 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 2 +- + fs/xfs/libxfs/xfs_btree.c | 2 +- + fs/xfs/libxfs/xfs_btree_mem.c | 2 +- + fs/xfs/libxfs/xfs_btree_staging.c | 2 +- + fs/xfs/libxfs/xfs_da_btree.c | 2 +- + fs/xfs/libxfs/xfs_da_format.h | 2 +- + fs/xfs/libxfs/xfs_defer.c | 4 +- + fs/xfs/libxfs/xfs_dir2.c | 2 +- + fs/xfs/libxfs/xfs_dir2_block.c | 2 +- + fs/xfs/libxfs/xfs_dir2_data.c | 2 +- + fs/xfs/libxfs/xfs_dir2_leaf.c | 2 +- + fs/xfs/libxfs/xfs_dir2_node.c | 2 +- + fs/xfs/libxfs/xfs_dir2_sf.c | 2 +- + fs/xfs/libxfs/xfs_dquot_buf.c | 2 +- + fs/xfs/libxfs/xfs_errortag.h | 8 +- + fs/xfs/libxfs/xfs_exchmaps.c | 2 +- + fs/xfs/libxfs/xfs_fs.h | 189 ++ + fs/xfs/libxfs/xfs_group.c | 2 +- + fs/xfs/libxfs/xfs_health.h | 5 + + fs/xfs/libxfs/xfs_ialloc.c | 2 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 2 +- + fs/xfs/libxfs/xfs_iext_tree.c | 2 +- + fs/xfs/libxfs/xfs_inode_buf.c | 2 +- + fs/xfs/libxfs/xfs_inode_fork.c | 2 +- + fs/xfs/libxfs/xfs_inode_util.c | 2 +- + fs/xfs/libxfs/xfs_log_format.h | 7 - + fs/xfs/libxfs/xfs_log_rlimit.c | 2 +- + fs/xfs/libxfs/xfs_metadir.c | 2 +- + fs/xfs/libxfs/xfs_metafile.c | 2 +- + fs/xfs/libxfs/xfs_parent.c | 16 +- + fs/xfs/libxfs/xfs_refcount.c | 2 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 2 +- + fs/xfs/libxfs/xfs_rmap.c | 2 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 2 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 2 +- + fs/xfs/libxfs/xfs_rtgroup.c | 2 +- + fs/xfs/libxfs/xfs_rtgroup.h | 15 + + fs/xfs/libxfs/xfs_rtrefcount_btree.c | 2 +- + fs/xfs/libxfs/xfs_rtrmap_btree.c | 2 +- + fs/xfs/libxfs/xfs_sb.c | 2 +- + fs/xfs/libxfs/xfs_symlink_remote.c | 2 +- + fs/xfs/libxfs/xfs_trans_inode.c | 2 +- + fs/xfs/libxfs/xfs_trans_resv.c | 2 +- + fs/xfs/libxfs/xfs_trans_space.c | 2 +- + fs/xfs/libxfs/xfs_types.c | 2 +- + fs/xfs/libxfs/xfs_zones.c | 151 +- + fs/xfs/libxfs/xfs_zones.h | 6 +- + fs/xfs/scrub/agb_bitmap.c | 2 +- + fs/xfs/scrub/agheader.c | 2 +- + fs/xfs/scrub/agheader_repair.c | 23 +- + fs/xfs/scrub/alloc.c | 2 +- + fs/xfs/scrub/alloc_repair.c | 22 +- + fs/xfs/scrub/attr.c | 61 +- + fs/xfs/scrub/attr_repair.c | 28 +- + fs/xfs/scrub/bitmap.c | 2 +- + fs/xfs/scrub/bmap.c | 2 +- + fs/xfs/scrub/bmap_repair.c | 8 +- + fs/xfs/scrub/btree.c | 11 +- + fs/xfs/scrub/common.c | 9 +- + fs/xfs/scrub/common.h | 25 - + fs/xfs/scrub/cow_repair.c | 2 +- + fs/xfs/scrub/dabtree.c | 4 +- + fs/xfs/scrub/dir.c | 15 +- + fs/xfs/scrub/dir_repair.c | 21 +- + fs/xfs/scrub/dirtree.c | 21 +- + fs/xfs/scrub/dirtree_repair.c | 2 +- + fs/xfs/scrub/dqiterate.c | 2 +- + fs/xfs/scrub/findparent.c | 2 +- + fs/xfs/scrub/fscounters.c | 2 +- + fs/xfs/scrub/fscounters_repair.c | 2 +- + fs/xfs/scrub/health.c | 2 +- + fs/xfs/scrub/ialloc.c | 2 +- + fs/xfs/scrub/ialloc_repair.c | 27 +- + fs/xfs/scrub/inode.c | 2 +- + fs/xfs/scrub/inode_repair.c | 2 +- + fs/xfs/scrub/iscan.c | 2 +- + fs/xfs/scrub/listxattr.c | 2 +- + fs/xfs/scrub/metapath.c | 2 +- + fs/xfs/scrub/newbt.c | 2 +- + fs/xfs/scrub/nlinks.c | 11 +- + fs/xfs/scrub/nlinks_repair.c | 2 +- + fs/xfs/scrub/orphanage.c | 2 +- + fs/xfs/scrub/parent.c | 13 +- + fs/xfs/scrub/parent_repair.c | 25 +- + fs/xfs/scrub/quota.c | 2 +- + fs/xfs/scrub/quota_repair.c | 2 +- + fs/xfs/scrub/quotacheck.c | 15 +- + fs/xfs/scrub/quotacheck_repair.c | 2 +- + fs/xfs/scrub/rcbag.c | 2 +- + fs/xfs/scrub/rcbag_btree.c | 2 +- + fs/xfs/scrub/readdir.c | 2 +- + fs/xfs/scrub/reap.c | 2 +- + fs/xfs/scrub/refcount.c | 2 +- + fs/xfs/scrub/refcount_repair.c | 15 +- + fs/xfs/scrub/repair.c | 5 +- + fs/xfs/scrub/rgsuper.c | 2 +- + fs/xfs/scrub/rmap.c | 2 +- + fs/xfs/scrub/rmap_repair.c | 7 +- + fs/xfs/scrub/rtbitmap.c | 2 +- + fs/xfs/scrub/rtbitmap_repair.c | 8 +- + fs/xfs/scrub/rtrefcount.c | 2 +- + fs/xfs/scrub/rtrefcount_repair.c | 17 +- + fs/xfs/scrub/rtrmap.c | 2 +- + fs/xfs/scrub/rtrmap_repair.c | 7 +- + fs/xfs/scrub/rtsummary.c | 9 +- + fs/xfs/scrub/rtsummary_repair.c | 2 +- + fs/xfs/scrub/scrub.c | 4 +- + fs/xfs/scrub/stats.c | 2 +- + fs/xfs/scrub/symlink.c | 2 +- + fs/xfs/scrub/symlink_repair.c | 2 +- + fs/xfs/scrub/tempfile.c | 2 +- + fs/xfs/scrub/trace.c | 2 +- + fs/xfs/scrub/xfarray.c | 2 +- + fs/xfs/scrub/xfblob.c | 2 +- + fs/xfs/scrub/xfile.c | 2 +- + fs/xfs/xfs.h | 28 - + fs/xfs/xfs_acl.c | 2 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_attr_inactive.c | 2 +- + fs/xfs/xfs_attr_item.c | 29 +- + fs/xfs/xfs_attr_list.c | 2 +- + fs/xfs/xfs_bio_io.c | 2 +- + fs/xfs/xfs_bmap_item.c | 12 +- + fs/xfs/xfs_bmap_util.c | 2 +- + fs/xfs/xfs_buf.c | 2 +- + fs/xfs/xfs_buf_item.c | 21 +- + fs/xfs/xfs_buf_item_recover.c | 2 +- + fs/xfs/xfs_buf_mem.c | 2 +- + fs/xfs/xfs_dahash_test.c | 2 +- + fs/xfs/xfs_dir2_readdir.c | 2 +- + fs/xfs/xfs_discard.c | 2 +- + fs/xfs/xfs_dquot.c | 2 +- + fs/xfs/xfs_dquot_item.c | 11 +- + fs/xfs/xfs_dquot_item_recover.c | 2 +- + fs/xfs/xfs_drain.c | 2 +- + fs/xfs/xfs_error.c | 144 +- + fs/xfs/xfs_error.h | 23 +- + fs/xfs/xfs_exchmaps_item.c | 13 +- + fs/xfs/xfs_exchrange.c | 2 +- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_extent_busy.c | 2 +- + fs/xfs/xfs_extfree_item.c | 12 +- + fs/xfs/xfs_file.c | 5 +- + fs/xfs/xfs_filestream.c | 2 +- + fs/xfs/xfs_fsmap.c | 2 +- + fs/xfs/xfs_fsops.c | 8 +- + fs/xfs/xfs_globals.c | 2 +- + fs/xfs/xfs_handle.c | 2 +- + fs/xfs/xfs_health.c | 140 +- + fs/xfs/xfs_healthmon.c | 1255 +++++++ + fs/xfs/xfs_healthmon.h | 184 + + fs/xfs/xfs_hooks.c | 2 +- + fs/xfs/xfs_icache.c | 2 +- + fs/xfs/xfs_icreate_item.c | 8 +- + fs/xfs/xfs_inode.c | 2 +- + fs/xfs/xfs_inode_item.c | 51 +- + fs/xfs/xfs_inode_item_recover.c | 2 +- + fs/xfs/xfs_ioctl.c | 9 +- + fs/xfs/xfs_ioctl32.c | 2 +- + fs/xfs/xfs_iomap.c | 2 +- + fs/xfs/xfs_iops.c | 51 +- + fs/xfs/xfs_itable.c | 2 +- + fs/xfs/xfs_iunlink_item.c | 2 +- + fs/xfs/xfs_iwalk.c | 2 +- + fs/xfs/xfs_log.c | 294 +- + fs/xfs/xfs_log.h | 65 +- + fs/xfs/xfs_log_cil.c | 113 +- + fs/xfs/xfs_log_priv.h | 20 + + fs/xfs/xfs_log_recover.c | 29 +- + fs/xfs/xfs_message.c | 10 +- + fs/xfs/xfs_message.h | 2 - + fs/xfs/xfs_mount.c | 4 +- + fs/xfs/xfs_mount.h | 4 + + fs/xfs/xfs_mru_cache.c | 2 +- + fs/xfs/xfs_notify_failure.c | 23 +- + fs/xfs/{xfs_linux.h => xfs_platform.h} | 48 +- + fs/xfs/xfs_pnfs.c | 2 +- + fs/xfs/xfs_pwork.c | 2 +- + fs/xfs/xfs_qm.c | 2 +- + fs/xfs/xfs_qm_bhv.c | 2 +- + fs/xfs/xfs_qm_syscalls.c | 2 +- + fs/xfs/xfs_quotaops.c | 2 +- + fs/xfs/xfs_refcount_item.c | 12 +- + fs/xfs/xfs_reflink.c | 2 +- + fs/xfs/xfs_rmap_item.c | 12 +- + fs/xfs/xfs_rtalloc.c | 2 +- + fs/xfs/xfs_stats.c | 14 +- + fs/xfs/xfs_stats.h | 8 +- + fs/xfs/xfs_super.c | 67 +- + fs/xfs/xfs_symlink.c | 2 +- + fs/xfs/xfs_sysctl.c | 2 +- + fs/xfs/xfs_sysfs.c | 2 +- + fs/xfs/xfs_trace.c | 7 +- + fs/xfs/xfs_trace.h | 513 +++ + fs/xfs/xfs_trans.c | 10 +- + fs/xfs/xfs_trans.h | 13 +- + fs/xfs/xfs_trans_ail.c | 2 +- + fs/xfs/xfs_trans_buf.c | 2 +- + fs/xfs/xfs_trans_dquot.c | 2 +- + fs/xfs/xfs_verify_media.c | 445 +++ + fs/xfs/xfs_verify_media.h | 13 + + fs/xfs/xfs_xattr.c | 2 +- + fs/xfs/xfs_zone_alloc.c | 220 +- + fs/xfs/xfs_zone_gc.c | 221 +- + fs/xfs/xfs_zone_info.c | 2 +- + fs/xfs/xfs_zone_priv.h | 1 - + fs/xfs/xfs_zone_space_resv.c | 2 +- + include/asm-generic/vmlinux.lds.h | 3 +- + include/linux/audit.h | 11 - + include/linux/bio.h | 1 + + include/linux/ceph/ceph_fs.h | 11 +- + include/linux/device_cgroup.h | 2 +- + include/linux/exportfs.h | 33 +- + include/linux/f2fs_fs.h | 73 +- + include/linux/filelock.h | 18 +- + include/linux/fs.h | 82 +- + include/linux/fs/super_types.h | 8 +- + include/linux/fserror.h | 75 + + include/linux/fsnotify_backend.h | 5 +- + include/linux/fsverity.h | 190 +- + include/linux/init_syscalls.h | 1 + + include/linux/initrd.h | 2 - + include/linux/iomap.h | 8 +- + include/linux/jbd2.h | 3 - + include/linux/nfs4.h | 4 + + include/linux/nfs_fs_sb.h | 10 +- + include/linux/nfs_xdr.h | 9 +- + include/linux/ns/ns_common_types.h | 4 +- + include/linux/posix_acl_xattr.h | 5 +- + include/linux/restart_block.h | 4 +- + include/linux/sunrpc/svc.h | 13 +- + include/linux/sunrpc/svcsock.h | 2 +- + include/linux/sunrpc/xdrgen/_builtins.h | 80 +- + include/linux/sunrpc/xdrgen/nfs4_1.h | 112 +- + include/linux/wait.h | 15 + + include/rdma/rdma_cm.h | 17 + + include/trace/events/erofs.h | 10 +- + include/trace/events/ext4.h | 8 +- + include/trace/events/f2fs.h | 85 +- + include/trace/events/writeback.h | 6 - + include/uapi/asm-generic/errno.h | 2 + + include/uapi/linux/btrfs.h | 1 + + include/uapi/linux/btrfs_tree.h | 34 +- + include/uapi/linux/magic.h | 1 + + include/uapi/linux/mount.h | 13 +- + include/uapi/linux/nfs.h | 2 +- + include/uapi/linux/nfsd_netlink.h | 1 + + include/uapi/linux/sysctl.h | 1 - + init/Kconfig | 7 +- + init/do_mounts.c | 23 +- + init/do_mounts.h | 18 +- + init/do_mounts_initrd.c | 107 +- + init/do_mounts_rd.c | 24 +- + init/initramfs_test.c | 48 + + io_uring/fs.c | 106 +- + io_uring/openclose.c | 26 +- + io_uring/statx.c | 17 +- + io_uring/xattr.c | 30 +- + ipc/mqueue.c | 11 +- + kernel/acct.c | 4 +- + kernel/auditsc.c | 29 +- + kernel/pid.c | 131 +- + mm/huge_memory.c | 15 +- + mm/readahead.c | 15 +- + mm/shmem.c | 2 + + mm/swapfile.c | 21 +- + net/9p/client.c | 4 +- + net/9p/trans_virtio.c | 14 +- + net/9p/trans_xen.c | 83 +- + net/ceph/Kconfig | 1 + + net/ceph/auth_x.c | 195 +- + net/ceph/auth_x_protocol.h | 38 + + net/ceph/crypto.c | 277 +- + net/ceph/crypto.h | 21 +- + net/ceph/messenger_v2.c | 16 +- + net/sunrpc/auth_gss/gss_rpc_xdr.c | 82 +- + net/sunrpc/svc.c | 216 +- + net/sunrpc/svc_xprt.c | 51 +- + rust/helpers/fs.c | 2 +- + rust/helpers/pid_namespace.c | 8 +- + rust/helpers/poll.c | 5 +- + rust/kernel/configfs.rs | 9 +- + samples/configfs/configfs_sample.c | 8 +- + samples/rust/rust_configfs.rs | 5 +- + tools/arch/alpha/include/uapi/asm/errno.h | 2 + + tools/arch/mips/include/uapi/asm/errno.h | 2 + + tools/arch/parisc/include/uapi/asm/errno.h | 2 + + tools/arch/sparc/include/uapi/asm/errno.h | 2 + + tools/include/uapi/asm-generic/errno.h | 2 + + tools/net/sunrpc/xdrgen/README | 2 - + tools/net/sunrpc/xdrgen/generators/__init__.py | 5 +- + tools/net/sunrpc/xdrgen/generators/enum.py | 9 +- + tools/net/sunrpc/xdrgen/generators/passthru.py | 26 + + tools/net/sunrpc/xdrgen/generators/program.py | 38 +- + tools/net/sunrpc/xdrgen/generators/typedef.py | 8 +- + tools/net/sunrpc/xdrgen/generators/union.py | 115 +- + tools/net/sunrpc/xdrgen/grammars/xdr.lark | 10 +- + tools/net/sunrpc/xdrgen/subcmds/declarations.py | 28 +- + tools/net/sunrpc/xdrgen/subcmds/definitions.py | 31 +- + tools/net/sunrpc/xdrgen/subcmds/lint.py | 25 +- + tools/net/sunrpc/xdrgen/subcmds/source.py | 51 +- + .../xdrgen/templates/C/enum/declaration/enum.j2 | 1 - + .../sunrpc/xdrgen/templates/C/enum/decoder/enum.j2 | 11 + + .../xdrgen/templates/C/enum/decoder/enum_be.j2 | 20 + + .../xdrgen/templates/C/enum/definition/close.j2 | 1 + + .../xdrgen/templates/C/enum/definition/close_be.j2 | 1 + + .../xdrgen/templates/C/passthru/definition.j2 | 3 + + .../sunrpc/xdrgen/templates/C/passthru/source.j2 | 3 + + .../xdrgen/templates/C/program/decoder/argument.j2 | 4 + + .../templates/C/program/definition/program.j2 | 5 + + .../xdrgen/templates/C/program/encoder/result.j2 | 6 + + .../xdrgen/templates/C/program/maxsize/max_args.j2 | 3 + + .../sunrpc/xdrgen/templates/C/source_top/client.j2 | 1 - + .../xdrgen/templates/C/union/decoder/bool_spec.j2 | 7 + + .../xdrgen/templates/C/union/definition/close.j2 | 1 + + .../xdrgen/templates/C/union/encoder/bool_spec.j2 | 7 + + tools/net/sunrpc/xdrgen/xdr_ast.py | 49 +- + tools/net/sunrpc/xdrgen/xdr_parse.py | 138 + + tools/net/sunrpc/xdrgen/xdrgen | 8 +- + .../selftests/filesystems/open_tree_ns/.gitignore | 1 + + .../selftests/filesystems/open_tree_ns/Makefile | 10 + + .../filesystems/open_tree_ns/open_tree_ns_test.c | 1030 ++++++ + .../selftests/filesystems/statmount/statmount.h | 15 +- + .../filesystems/statmount/statmount_test.c | 261 +- + .../filesystems/statmount/statmount_test_ns.c | 101 +- + tools/testing/selftests/filesystems/utils.c | 26 + + tools/testing/selftests/filesystems/utils.h | 1 + + 804 files changed, 34370 insertions(+), 21762 deletions(-) + create mode 100644 fs/btrfs/tests/chunk-allocation-tests.c + create mode 100644 fs/btrfs/tests/zoned-tests.c + create mode 100644 fs/erofs/ishare.c + create mode 100644 fs/ext4/extents-test.c + create mode 100644 fs/fserror.c + create mode 100644 fs/nfs/nfs40.h + create mode 100644 fs/nfs/nfs40client.c + create mode 100644 fs/nfs/nfs40proc.c + create mode 100644 fs/nullfs.c + delete mode 100644 fs/smb/client/cifstransport.c + create mode 100644 fs/smb/client/gen_smb2_mapping + create mode 100644 fs/smb/client/smb1debug.c + create mode 100644 fs/smb/client/smb1encrypt.c + create mode 100644 fs/smb/client/smb1maperror.c + create mode 100644 fs/smb/client/smb1misc.c + create mode 100644 fs/smb/client/smb1pdu.h + create mode 100644 fs/smb/client/smb1proto.h + create mode 100644 fs/smb/client/smb1session.c + create mode 100644 fs/smb/client/smb1transport.c + create mode 100644 fs/smb/client/smb2maperror_test.c + create mode 100644 fs/verity/pagecache.c + delete mode 100644 fs/xfs/xfs.h + create mode 100644 fs/xfs/xfs_healthmon.c + create mode 100644 fs/xfs/xfs_healthmon.h + rename fs/xfs/{xfs_linux.h => xfs_platform.h} (95%) + create mode 100644 fs/xfs/xfs_verify_media.c + create mode 100644 fs/xfs/xfs_verify_media.h + create mode 100644 include/linux/fserror.h + create mode 100644 tools/net/sunrpc/xdrgen/generators/passthru.py + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/passthru/definition.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/passthru/source.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/definition/program.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/maxsize/max_args.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/bool_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/bool_spec.j2 + create mode 100644 tools/testing/selftests/filesystems/open_tree_ns/.gitignore + create mode 100644 tools/testing/selftests/filesystems/open_tree_ns/Makefile + create mode 100644 tools/testing/selftests/filesystems/open_tree_ns/open_tree_ns_test.c +Merging printk/for-next (77a69dd842563 Merge branch 'for-6.20' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. + kernel/printk/nbcon.c | 7 +++++-- + lib/tests/printf_kunit.c | 20 +++++++++++--------- + 2 files changed, 16 insertions(+), 11 deletions(-) +Merging pci/next (f365bb1bf8702 Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging MAINTAINERS +Auto-merging drivers/pci/controller/dwc/pcie-qcom.c +CONFLICT (content): Merge conflict in drivers/pci/controller/dwc/pcie-qcom.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/setup-bus.c +Auto-merging include/linux/ioport.h +Auto-merging include/linux/pci.h +Resolved 'drivers/pci/controller/dwc/pcie-qcom.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fd50e4929f4ec] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git +$ git diff -M --stat --summary HEAD^.. + Documentation/PCI/endpoint/pci-endpoint.rst | 24 + + Documentation/PCI/endpoint/pci-test-howto.rst | 19 + + Documentation/PCI/endpoint/pci-vntb-howto.rst | 14 +- + Documentation/PCI/msi-howto.rst | 6 +- + .../bindings/pci/aspeed,ast2600-pcie.yaml | 182 ++++ + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 7 +- + .../devicetree/bindings/pci/loongson.yaml | 2 + + .../bindings/pci/mediatek-pcie-gen3.yaml | 1 + + .../devicetree/bindings/pci/qcom,pcie-apq8064.yaml | 170 +++ + .../devicetree/bindings/pci/qcom,pcie-apq8084.yaml | 109 ++ + .../devicetree/bindings/pci/qcom,pcie-ipq4019.yaml | 146 +++ + .../devicetree/bindings/pci/qcom,pcie-ipq5018.yaml | 189 ++++ + .../devicetree/bindings/pci/qcom,pcie-ipq6018.yaml | 179 ++++ + .../devicetree/bindings/pci/qcom,pcie-ipq8074.yaml | 165 +++ + .../devicetree/bindings/pci/qcom,pcie-ipq9574.yaml | 183 ++++ + .../devicetree/bindings/pci/qcom,pcie-msm8996.yaml | 156 +++ + .../devicetree/bindings/pci/qcom,pcie-qcs404.yaml | 131 +++ + .../devicetree/bindings/pci/qcom,pcie-sc8180x.yaml | 168 --- + .../devicetree/bindings/pci/qcom,pcie-sdm845.yaml | 190 ++++ + .../devicetree/bindings/pci/qcom,pcie-sdx55.yaml | 172 +++ + .../devicetree/bindings/pci/qcom,pcie-sm8150.yaml | 1 + + .../bindings/pci/qcom,pcie-x1e80100.yaml | 7 +- + .../devicetree/bindings/pci/qcom,pcie.yaml | 782 -------------- + .../bindings/pci/qcom,sa8255p-pcie-ep.yaml | 110 ++ + .../bindings/pci/snps,dw-pcie-common.yaml | 6 + + .../bindings/pci/socionext,uniphier-pcie.yaml | 4 +- + Documentation/trace/events-pci.rst | 74 ++ + Documentation/trace/index.rst | 1 + + MAINTAINERS | 9 + + drivers/cpuidle/cpuidle-tegra.c | 1 + + drivers/misc/pci_endpoint_test.c | 203 +++- + drivers/pci/Makefile | 4 + + drivers/pci/bus.c | 21 +- + drivers/pci/controller/Kconfig | 19 +- + drivers/pci/controller/Makefile | 1 + + drivers/pci/controller/cadence/pci-j721e.c | 41 +- + .../controller/cadence/pcie-cadence-host-common.c | 12 +- + drivers/pci/controller/cadence/pcie-cadence.c | 4 +- + drivers/pci/controller/dwc/Kconfig | 4 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 1 + + drivers/pci/controller/dwc/pci-imx6.c | 77 +- + drivers/pci/controller/dwc/pci-keystone.c | 1 + + drivers/pci/controller/dwc/pcie-artpec6.c | 1 + + .../pci/controller/dwc/pcie-designware-debugfs.c | 52 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 399 +++++-- + drivers/pci/controller/dwc/pcie-designware-host.c | 154 ++- + drivers/pci/controller/dwc/pcie-designware-plat.c | 1 + + drivers/pci/controller/dwc/pcie-designware.c | 146 ++- + drivers/pci/controller/dwc/pcie-designware.h | 45 +- + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 101 +- + drivers/pci/controller/dwc/pcie-keembay.c | 1 + + drivers/pci/controller/dwc/pcie-qcom-ep.c | 68 +- + drivers/pci/controller/dwc/pcie-qcom.c | 229 ++-- + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 1 + + drivers/pci/controller/dwc/pcie-sophgo.c | 18 + + drivers/pci/controller/dwc/pcie-stm32-ep.c | 1 + + drivers/pci/controller/dwc/pcie-tegra194.c | 1 + + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2 + + drivers/pci/controller/pci-tegra.c | 35 +- + drivers/pci/controller/pcie-aspeed.c | 1111 ++++++++++++++++++++ + drivers/pci/controller/pcie-mediatek.c | 4 +- + drivers/pci/controller/pcie-rzg3s-host.c | 34 +- + drivers/pci/controller/pcie-xilinx.c | 9 +- + drivers/pci/controller/plda/pcie-starfive.c | 25 +- + drivers/pci/devres.c | 3 - + drivers/pci/endpoint/functions/pci-epf-mhi.c | 2 +- + drivers/pci/endpoint/functions/pci-epf-ntb.c | 9 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 271 ++++- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 9 +- + drivers/pci/endpoint/pci-ep-cfs.c | 23 +- + drivers/pci/endpoint/pci-epc-core.c | 8 + + drivers/pci/hotplug/pciehp_ctrl.c | 31 +- + drivers/pci/hotplug/pciehp_hpc.c | 3 +- + drivers/pci/hotplug/pnv_php.c | 2 +- + drivers/pci/hotplug/shpchp_core.c | 3 +- + drivers/pci/iov.c | 9 +- + drivers/pci/of.c | 1 + + drivers/pci/p2pdma.c | 10 +- + drivers/pci/pci-acpi.c | 59 +- + drivers/pci/pci-driver.c | 28 - + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/pci.c | 64 +- + drivers/pci/pci.h | 111 +- + drivers/pci/pcie/aer.c | 3 - + drivers/pci/pcie/bwctrl.c | 4 +- + drivers/pci/pcie/portdrv.c | 55 +- + drivers/pci/pcie/ptm.c | 5 +- + drivers/pci/probe.c | 237 ++--- + drivers/pci/pwrctrl/Kconfig | 1 + + drivers/pci/pwrctrl/core.c | 260 ++++- + drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c | 84 +- + drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 226 ++-- + drivers/pci/pwrctrl/slot.c | 103 +- + drivers/pci/quirks.c | 37 + + drivers/pci/remove.c | 20 - + drivers/pci/search.c | 2 + + drivers/pci/setup-bus.c | 636 ++++------- + drivers/pci/setup-cardbus.c | 306 ++++++ + drivers/pci/setup-res.c | 2 +- + drivers/pci/trace.c | 11 + + drivers/pcmcia/yenta_socket.c | 2 +- + drivers/usb/host/ehci-pci.c | 1 - + include/linux/ioport.h | 2 +- + include/linux/pci-epc.h | 9 + + include/linux/pci-epf.h | 23 + + include/linux/pci-p2pdma.h | 2 + + include/linux/pci-pwrctrl.h | 16 +- + include/linux/pci.h | 12 +- + include/linux/pci_ids.h | 2 + + include/trace/events/pci.h | 129 +++ + include/uapi/linux/pci.h | 7 + + include/uapi/linux/pci_regs.h | 5 + + include/uapi/linux/pcitest.h | 1 + + kernel/irq/irqdomain.c | 1 + + kernel/resource.c | 2 +- + .../selftests/pci_endpoint/pci_endpoint_test.c | 17 + + 116 files changed, 6496 insertions(+), 2409 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/aspeed,ast2600-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-apq8064.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-apq8084.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-ipq4019.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-ipq5018.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-ipq6018.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-ipq8074.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-ipq9574.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-msm8996.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-qcs404.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-sc8180x.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-sdm845.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-sdx55.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,sa8255p-pcie-ep.yaml + create mode 100644 Documentation/trace/events-pci.rst + create mode 100644 drivers/pci/controller/pcie-aspeed.c + create mode 100644 drivers/pci/setup-cardbus.c + create mode 100644 drivers/pci/trace.c + create mode 100644 include/trace/events/pci.h +Merging pstore/for-next/pstore (b692553573683 pstore/ram: Update module parameters from platform data) +$ git merge -m Merge branch 'for-next/pstore' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (01204b2d87803 Merge branches 'for-6.20/sony' and 'for-6.19/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. + Documentation/hid/intel-ish-hid.rst | 19 ++- + drivers/hid/Kconfig | 11 +- + drivers/hid/Makefile | 1 + + drivers/hid/hid-alps.c | 6 +- + drivers/hid/hid-apple.c | 1 + + drivers/hid/hid-appletb-kbd.c | 8 +- + drivers/hid/hid-asus.c | 116 ++++++++++++++++- + drivers/hid/hid-elecom.c | 16 +++ + drivers/hid/hid-ids.h | 22 ++++ + drivers/hid/hid-lenovo.c | 6 +- + drivers/hid/hid-logitech-dj.c | 8 +- + drivers/hid/hid-logitech-hidpp.c | 4 +- + drivers/hid/hid-magicmouse.c | 5 + + drivers/hid/hid-multitouch.c | 75 +++++++++++ + drivers/hid/hid-nintendo.c | 11 +- + drivers/hid/hid-picolcd_core.c | 10 +- + drivers/hid/hid-pl.c | 7 +- + drivers/hid/hid-playstation.c | 4 +- + drivers/hid/hid-prodikeys.c | 4 + + drivers/hid/hid-quirks.c | 3 + + drivers/hid/hid-rapoo.c | 101 +++++++++++++++ + drivers/hid/hid-sensor-hub.c | 10 +- + drivers/hid/hid-sony.c | 141 +++++++++++++++++++-- + drivers/hid/hid-uclogic-core.c | 8 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 2 +- + drivers/hid/intel-ish-hid/ishtp/loader.c | 58 ++++++++- + .../intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 14 +- + .../intel-thc-hid/intel-quicki2c/quicki2c-dev.h | 2 +- + .../intel-thc-hid/intel-quicki2c/quicki2c-hid.c | 8 ++ + .../intel-quicki2c/quicki2c-protocol.c | 95 ++++++++------ + .../intel-quicki2c/quicki2c-protocol.h | 5 +- + .../hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 2 + + drivers/hid/usbhid/hid-pidff.c | 16 ++- + drivers/hid/wacom_sys.c | 8 +- + include/linux/platform_data/x86/asus-wmi.h | 1 + + 35 files changed, 676 insertions(+), 132 deletions(-) + create mode 100644 drivers/hid/hid-rapoo.c +Merging i2c/i2c/for-next (10592191e3e2a Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging drivers/i2c/busses/i2c-imx-lpi2c.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/eeprom/at24.yaml | 4 + + .../devicetree/bindings/i2c/atmel,at91sam-i2c.yaml | 1 + + .../devicetree/bindings/i2c/i2c-mt65xx.yaml | 1 + + .../devicetree/bindings/i2c/spacemit,k1-i2c.yaml | 3 + + drivers/i2c/busses/Kconfig | 11 +- + drivers/i2c/busses/Makefile | 2 +- + drivers/i2c/busses/i2c-amd-mp2-pci.c | 8 +- + drivers/i2c/busses/i2c-designware-amdisp.c | 4 +- + drivers/i2c/busses/i2c-designware-common.c | 246 +++++++++++++++-- + drivers/i2c/busses/i2c-designware-core.h | 40 ++- + drivers/i2c/busses/i2c-designware-master.c | 187 ++----------- + drivers/i2c/busses/i2c-designware-platdrv.c | 72 +---- + drivers/i2c/busses/i2c-designware-slave.c | 131 ++------- + drivers/i2c/busses/i2c-imx-lpi2c.c | 84 +++++- + drivers/i2c/busses/i2c-k1.c | 19 +- + drivers/i2c/busses/i2c-mlxbf.c | 13 +- + drivers/i2c/busses/i2c-mt65xx.c | 11 +- + drivers/i2c/busses/i2c-nomadik.c | 7 +- + drivers/i2c/busses/i2c-rk3x.c | 12 +- + drivers/i2c/busses/i2c-rtl9300.c | 17 +- + drivers/i2c/busses/i2c-st.c | 3 +- + drivers/i2c/busses/i2c-synquacer.c | 3 +- + drivers/i2c/busses/i2c-tegra.c | 306 +++++++++++++++++---- + drivers/i2c/i2c-core-base.c | 10 +- + drivers/misc/eeprom/at24.c | 20 +- + include/linux/units.h | 3 + + 26 files changed, 700 insertions(+), 518 deletions(-) +Merging i2c-host/i2c/i2c-host (51e8ce3630878 i2c: designware: Remove an unnecessary condition) +$ git merge -m Merge branch 'i2c/i2c-host' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host +Already up to date. +Merging i3c/i3c/next (ed318b3fb4ab3 i3c: dw-i3c-master: fix SIR reject bit mapping for dynamic addresses) +$ git merge -m Merge branch 'i3c/next' of https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-i3c | 11 + + drivers/i3c/device.c | 46 +- + drivers/i3c/internals.h | 4 + + drivers/i3c/master.c | 213 ++++++++-- + drivers/i3c/master/Kconfig | 1 + + drivers/i3c/master/dw-i3c-master.c | 121 ++++-- + drivers/i3c/master/mipi-i3c-hci/cmd_v1.c | 2 - + drivers/i3c/master/mipi-i3c-hci/cmd_v2.c | 2 - + drivers/i3c/master/mipi-i3c-hci/core.c | 465 +++++++++++++++------ + drivers/i3c/master/mipi-i3c-hci/dat.h | 2 +- + drivers/i3c/master/mipi-i3c-hci/dat_v1.c | 46 +- + drivers/i3c/master/mipi-i3c-hci/dma.c | 171 +++++--- + drivers/i3c/master/mipi-i3c-hci/ext_caps.c | 58 ++- + drivers/i3c/master/mipi-i3c-hci/ext_caps.h | 1 - + drivers/i3c/master/mipi-i3c-hci/hci.h | 17 +- + drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c | 186 ++++++--- + drivers/i3c/master/mipi-i3c-hci/pio.c | 64 ++- + drivers/i3c/master/renesas-i3c.c | 319 ++++++++------ + drivers/i3c/master/svc-i3c-master.c | 4 +- + include/linux/i3c/device.h | 24 +- + include/linux/i3c/master.h | 11 + + include/linux/platform_data/mipi-i3c-hci.h | 15 + + 22 files changed, 1269 insertions(+), 514 deletions(-) + create mode 100644 include/linux/platform_data/mipi-i3c-hci.h +Merging dmi/dmi-for-next (4d1b28a8119c6 firmware: dmi: Add info message for number of populated and total memory slots) +$ git merge -m Merge branch 'dmi-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (1117702454262 hwmon: pmbus: fix table in STEF48H28 documentation) +$ git merge -m Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/hwmon/aspeed,ast2400-pwm-tacho.yaml | 106 +++++++++++ + .../devicetree/bindings/hwmon/aspeed-pwm-tacho.txt | 73 -------- + .../bindings/hwmon/microchip,sparx5-temp.yaml | 8 +- + .../devicetree/bindings/hwmon/ti,tmp108.yaml | 21 ++- + .../devicetree/bindings/trivial-devices.yaml | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/hwmon/asus_ec_sensors.rst | 2 + + Documentation/hwmon/coretemp.rst | 59 ++++-- + Documentation/hwmon/cros_ec_hwmon.rst | 29 ++- + Documentation/hwmon/gpd-fan.rst | 3 + + Documentation/hwmon/hac300s.rst | 37 ++++ + Documentation/hwmon/index.rst | 3 + + Documentation/hwmon/mp5926.rst | 92 ++++++++++ + Documentation/hwmon/nct6683.rst | 1 + + Documentation/hwmon/sht3x.rst | 18 +- + Documentation/hwmon/stef48h28.rst | 71 ++++++++ + Documentation/hwmon/submitting-patches.rst | 5 +- + Documentation/hwmon/tmp108.rst | 17 ++ + MAINTAINERS | 21 +++ + drivers/hwmon/Kconfig | 6 +- + drivers/hwmon/acpi_power_meter.c | 4 +- + drivers/hwmon/asus-ec-sensors.c | 17 +- + drivers/hwmon/coretemp.c | 9 + + drivers/hwmon/cros_ec_hwmon.c | 133 +++++++++++--- + drivers/hwmon/dell-smm-hwmon.c | 7 + + drivers/hwmon/emc2305.c | 8 +- + drivers/hwmon/f71882fg.c | 6 +- + drivers/hwmon/fam15h_power.c | 11 +- + drivers/hwmon/gpd-fan.c | 27 ++- + drivers/hwmon/hwmon.c | 11 +- + drivers/hwmon/max6639.c | 7 +- + drivers/hwmon/nct6683.c | 3 + + drivers/hwmon/nct6775-platform.c | 1 + + drivers/hwmon/nct7363.c | 8 +- + drivers/hwmon/pmbus/Kconfig | 27 +++ + drivers/hwmon/pmbus/Makefile | 3 + + drivers/hwmon/pmbus/hac300s.c | 132 ++++++++++++++ + drivers/hwmon/pmbus/mp2925.c | 23 ++- + drivers/hwmon/pmbus/mp5926.c | 184 +++++++++++++++++++ + drivers/hwmon/pmbus/stef48h28.c | 75 ++++++++ + drivers/hwmon/sht3x.c | 1 + + drivers/hwmon/tmp108.c | 197 +++++++++++++++++---- + 42 files changed, 1269 insertions(+), 205 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/aspeed,ast2400-pwm-tacho.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/aspeed-pwm-tacho.txt + create mode 100644 Documentation/hwmon/hac300s.rst + create mode 100644 Documentation/hwmon/mp5926.rst + create mode 100644 Documentation/hwmon/stef48h28.rst + create mode 100644 drivers/hwmon/pmbus/hac300s.c + create mode 100644 drivers/hwmon/pmbus/mp5926.c + create mode 100644 drivers/hwmon/pmbus/stef48h28.c +Merging jc_docs/docs-next (0a83293322fde doc: development-process: add notice on testing) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging CREDITS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/arch/riscv/index.rst +Auto-merging Documentation/core-api/kho/index.rst +CONFLICT (content): Merge conflict in Documentation/core-api/kho/index.rst +Auto-merging Documentation/dev-tools/checkpatch.rst +Auto-merging Documentation/dev-tools/index.rst +CONFLICT (content): Merge conflict in Documentation/dev-tools/index.rst +Auto-merging Documentation/filesystems/erofs.rst +Auto-merging Documentation/hwmon/index.rst +Auto-merging Documentation/kbuild/kconfig-language.rst +Auto-merging Documentation/process/index.rst +CONFLICT (content): Merge conflict in Documentation/process/index.rst +Auto-merging Documentation/rust/index.rst +Auto-merging Documentation/trace/index.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +Resolved 'Documentation/core-api/kho/index.rst' using previous resolution. +Resolved 'Documentation/dev-tools/index.rst' using previous resolution. +Resolved 'Documentation/process/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 34a5fb759140b] Merge branch 'docs-next' of git://git.lwn.net/linux.git +$ git diff -M --stat --summary HEAD^.. + CREDITS | 8 +- + Documentation/ABI/testing/pstore | 2 +- + Documentation/Makefile | 3 +- + Documentation/RCU/index.rst | 7 - + Documentation/accel/index.rst | 7 - + Documentation/admin-guide/README.rst | 2 +- + Documentation/admin-guide/aoe/index.rst | 7 - + Documentation/admin-guide/auxdisplay/index.rst | 7 - + Documentation/admin-guide/bug-hunting.rst | 6 +- + Documentation/admin-guide/cgroup-v1/hugetlb.rst | 18 +- + Documentation/admin-guide/cgroup-v1/index.rst | 7 - + Documentation/admin-guide/cgroup-v2.rst | 2 +- + Documentation/admin-guide/cifs/index.rst | 7 - + Documentation/admin-guide/device-mapper/index.rst | 7 - + Documentation/admin-guide/devices.rst | 10 +- + Documentation/admin-guide/devices.txt | 6 +- + Documentation/admin-guide/gpio/index.rst | 7 - + Documentation/admin-guide/index.rst | 7 - + Documentation/admin-guide/initrd.rst | 2 +- + Documentation/admin-guide/kdump/index.rst | 7 - + Documentation/admin-guide/kdump/kdump.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 4 + + Documentation/admin-guide/mm/nommu-mmap.rst | 2 +- + Documentation/admin-guide/sysctl/kernel.rst | 3 + + Documentation/arch/arc/index.rst | 7 - + Documentation/arch/arm/index.rst | 8 - + Documentation/arch/arm/keystone/knav-qmss.rst | 2 +- + Documentation/arch/arm/keystone/overview.rst | 2 +- + Documentation/arch/arm64/arm-acpi.rst | 4 +- + Documentation/arch/arm64/index.rst | 7 - + Documentation/arch/loongarch/index.rst | 7 - + Documentation/arch/m68k/index.rst | 7 - + Documentation/arch/mips/index.rst | 7 - + Documentation/arch/openrisc/index.rst | 7 - + Documentation/arch/parisc/index.rst | 7 - + Documentation/arch/powerpc/index.rst | 7 - + Documentation/arch/riscv/index.rst | 7 - + Documentation/arch/s390/driver-model.rst | 2 +- + Documentation/arch/s390/index.rst | 7 - + Documentation/arch/x86/shstk.rst | 2 +- + Documentation/bpf/index.rst | 7 - + Documentation/cdrom/index.rst | 7 - + Documentation/conf.py | 55 +- + Documentation/core-api/index.rst | 7 - + Documentation/core-api/kobject.rst | 2 +- + .../core-api/real-time/architecture-porting.rst | 3 +- + Documentation/core-api/real-time/hardware.rst | 132 + + Documentation/core-api/real-time/index.rst | 1 + + Documentation/dev-tools/checkpatch.rst | 2 +- + Documentation/dev-tools/clang-format.rst | 2 +- + Documentation/dev-tools/index.rst | 8 - + Documentation/doc-guide/index.rst | 7 - + Documentation/doc-guide/kernel-doc.rst | 63 +- + Documentation/driver-api/80211/index.rst | 7 - + Documentation/driver-api/basics.rst | 17 +- + Documentation/driver-api/coco/index.rst | 2 - + Documentation/driver-api/crypto/iaa/index.rst | 7 - + Documentation/driver-api/crypto/index.rst | 7 - + Documentation/driver-api/cxl/index.rst | 2 - + Documentation/driver-api/dmaengine/index.rst | 7 - + Documentation/driver-api/driver-model/binding.rst | 9 +- + .../driver-api/driver-model/design-patterns.rst | 2 +- + Documentation/driver-api/driver-model/index.rst | 7 - + Documentation/driver-api/early-userspace/index.rst | 7 - + Documentation/driver-api/firmware/index.rst | 7 - + Documentation/driver-api/index.rst | 7 - + Documentation/driver-api/mailbox.rst | 2 +- + Documentation/driver-api/memory-devices/index.rst | 7 - + Documentation/driver-api/pci/index.rst | 7 - + Documentation/driver-api/phy/index.rst | 8 - + Documentation/driver-api/phy/phy.rst | 2 +- + Documentation/driver-api/pm/index.rst | 7 - + Documentation/driver-api/serial/index.rst | 7 - + Documentation/driver-api/soundwire/index.rst | 7 - + .../surface_aggregator/clients/index.rst | 7 - + .../driver-api/surface_aggregator/index.rst | 7 - + Documentation/driver-api/tty/tty_ldisc.rst | 2 +- + Documentation/driver-api/usb/gadget.rst | 2 +- + Documentation/driver-api/usb/index.rst | 7 - + Documentation/driver-api/xilinx/index.rst | 7 - + Documentation/fault-injection/index.rst | 7 - + Documentation/fb/index.rst | 7 - + Documentation/filesystems/api-summary.rst | 3 + + Documentation/filesystems/erofs.rst | 2 +- + Documentation/filesystems/proc.rst | 6 +- + Documentation/filesystems/relay.rst | 2 +- + Documentation/filesystems/resctrl.rst | 2 +- + Documentation/filesystems/spufs/spu_create.rst | 4 +- + Documentation/filesystems/spufs/spu_run.rst | 4 +- + .../firmware-guide/acpi/DSD-properties-rules.rst | 2 +- + Documentation/firmware-guide/acpi/enumeration.rst | 2 +- + Documentation/fpga/index.rst | 7 - + Documentation/gpu/drivers.rst | 7 - + Documentation/gpu/index.rst | 7 - + Documentation/hwmon/index.rst | 7 - + Documentation/i2c/index.rst | 7 - + Documentation/infiniband/index.rst | 7 - + Documentation/input/devices/index.rst | 7 - + Documentation/input/gamepad.rst | 2 +- + Documentation/input/index.rst | 7 - + Documentation/input/input.rst | 2 +- + Documentation/isdn/index.rst | 7 - + Documentation/kbuild/index.rst | 7 - + Documentation/kbuild/kbuild.rst | 2 +- + Documentation/kbuild/kconfig-language.rst | 2 +- + Documentation/kbuild/makefiles.rst | 2 +- + Documentation/kernel-hacking/hacking.rst | 183 +- + Documentation/livepatch/index.rst | 7 - + Documentation/locking/index.rst | 7 - + Documentation/mhi/index.rst | 7 - + Documentation/netlabel/index.rst | 7 - + .../networking/device_drivers/atm/index.rst | 7 - + .../networking/device_drivers/can/index.rst | 7 - + .../networking/device_drivers/cellular/index.rst | 7 - + .../networking/device_drivers/ethernet/index.rst | 7 - + .../ethernet/mellanox/mlx5/index.rst | 7 - + .../networking/device_drivers/fddi/index.rst | 7 - + .../networking/device_drivers/hamradio/index.rst | 7 - + Documentation/networking/device_drivers/index.rst | 7 - + .../networking/device_drivers/wifi/index.rst | 7 - + .../networking/device_drivers/wwan/index.rst | 7 - + Documentation/networking/diagnostic/index.rst | 7 - + Documentation/networking/index.rst | 7 - + Documentation/pcmcia/index.rst | 7 - + Documentation/peci/index.rst | 7 - + Documentation/power/index.rst | 7 - + Documentation/process/1.Intro.rst | 2 +- + Documentation/process/2.Process.rst | 2 +- + Documentation/process/4.Coding.rst | 6 +- + Documentation/process/5.Posting.rst | 7 +- + Documentation/process/7.AdvancedTopics.rst | 2 +- + Documentation/process/adding-syscalls.rst | 20 +- + Documentation/process/changes.rst | 2 +- + Documentation/process/coding-assistants.rst | 59 + + Documentation/process/coding-style.rst | 12 +- + Documentation/process/debugging/index.rst | 9 - + Documentation/process/debugging/kgdb.rst | 7 + + Documentation/process/email-clients.rst | 9 +- + Documentation/process/generated-content.rst | 109 + + Documentation/process/index.rst | 9 +- + Documentation/process/maintainer-pgp-guide.rst | 4 +- + Documentation/process/security-bugs.rst | 6 +- + Documentation/process/submitting-patches.rst | 6 +- + Documentation/rust/index.rst | 7 - + Documentation/scheduler/index.rst | 7 - + Documentation/scsi/ChangeLog.sym53c8xx | 6 +- + .../scsi/link_power_management_policy.rst | 23 +- + Documentation/sound/hd-audio/notes.rst | 2 +- + Documentation/sound/index.rst | 7 - + Documentation/sphinx-includes/subproject-index.rst | 7 + + Documentation/sphinx-static/custom.css | 20 +- + Documentation/sphinx/automarkup.py | 10 + + Documentation/sphinx/kerneldoc.py | 60 +- + Documentation/spi/index.rst | 7 - + Documentation/staging/rpmsg.rst | 7 +- + Documentation/target/index.rst | 7 - + Documentation/tee/index.rst | 7 - + Documentation/timers/index.rst | 7 - + Documentation/tools/feat.rst | 10 + + Documentation/tools/index.rst | 8 +- + Documentation/tools/jobserver.rst | 10 + + Documentation/tools/kabi.rst | 13 + + Documentation/tools/kabi_helpers.rst | 11 + + Documentation/tools/kabi_parser.rst | 10 + + Documentation/tools/kabi_regex.rst | 10 + + Documentation/tools/kabi_symbols.rst | 10 + + Documentation/tools/kdoc.rst | 12 + + Documentation/tools/kdoc_ancillary.rst | 46 + + Documentation/tools/kdoc_output.rst | 14 + + Documentation/tools/kdoc_parser.rst | 29 + + Documentation/tools/python.rst | 13 + + Documentation/tools/rtla/index.rst | 7 - + Documentation/tools/rv/index.rst | 7 - + Documentation/trace/fprobe.rst | 2 +- + Documentation/trace/ftrace-uses.rst | 2 +- + Documentation/trace/index.rst | 7 - + .../trace/rv/da_monitor_instrumentation.rst | 6 +- + .../translations/it_IT/doc-guide/kernel-doc.rst | 8 +- + .../translations/it_IT/process/adding-syscalls.rst | 16 +- + Documentation/translations/ja_JP/index.rst | 1 + + Documentation/translations/ja_JP/process/howto.rst | 6 +- + .../ja_JP/process/submit-checklist.rst | 4 +- + .../ja_JP/process/submitting-patches.rst | 56 + + .../ko_KR/core-api/wrappers/memory-barriers.rst | 18 - + Documentation/translations/ko_KR/index.rst | 1 - + .../translations/ko_KR/memory-barriers.txt | 2952 -------------------- + .../translations/sp_SP/process/adding-syscalls.rst | 16 +- + .../translations/sp_SP/process/coding-style.rst | 2 +- + .../translations/zh_CN/doc-guide/kernel-doc.rst | 10 +- + Documentation/translations/zh_CN/kbuild/kbuild.rst | 2 +- + .../translations/zh_CN/process/coding-style.rst | 2 +- + .../translations/zh_TW/process/coding-style.rst | 2 +- + Documentation/usb/index.rst | 7 - + Documentation/userspace-api/gpio/index.rst | 7 - + Documentation/userspace-api/index.rst | 7 - + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 +- + Documentation/virt/index.rst | 7 - + Documentation/w1/index.rst | 7 - + Documentation/watchdog/index.rst | 7 - + Documentation/wmi/devices/index.rst | 7 - + Documentation/wmi/index.rst | 8 - + MAINTAINERS | 5 +- + Makefile | 2 +- + README | 12 + + drivers/gpu/drm/i915/Makefile | 2 +- + include/linux/util_macros.h | 2 +- + include/media/v4l2-ioctl.h | 15 + + scripts/kernel-doc | 2 +- + tools/docs/find-unused-docs.sh | 4 +- + scripts/kernel-doc.py => tools/docs/kernel-doc | 89 +- + tools/docs/sphinx-build-wrapper | 139 +- + tools/lib/python/abi/abi_parser.py | 33 +- + tools/lib/python/abi/abi_regex.py | 26 +- + tools/lib/python/abi/helpers.py | 42 +- + tools/lib/python/abi/system_symbols.py | 14 +- + tools/lib/python/feat/parse_features.py | 27 +- + tools/lib/python/jobserver.py | 158 +- + tools/lib/python/kdoc/enrich_formatter.py | 20 +- + tools/lib/python/kdoc/kdoc_files.py | 23 +- + tools/lib/python/kdoc/kdoc_item.py | 18 + + tools/lib/python/kdoc/kdoc_output.py | 104 +- + tools/lib/python/kdoc/kdoc_parser.py | 285 +- + tools/lib/python/kdoc/kdoc_re.py | 28 +- + tools/lib/python/kdoc/latex_fonts.py | 95 +- + tools/lib/python/kdoc/parse_data_structs.py | 62 +- + tools/lib/python/kdoc/python_version.py | 20 +- + 226 files changed, 1812 insertions(+), 4382 deletions(-) + create mode 100644 Documentation/core-api/real-time/hardware.rst + create mode 100644 Documentation/process/coding-assistants.rst + create mode 100644 Documentation/process/generated-content.rst + create mode 100644 Documentation/sphinx-includes/subproject-index.rst + create mode 100644 Documentation/tools/feat.rst + create mode 100644 Documentation/tools/jobserver.rst + create mode 100644 Documentation/tools/kabi.rst + create mode 100644 Documentation/tools/kabi_helpers.rst + create mode 100644 Documentation/tools/kabi_parser.rst + create mode 100644 Documentation/tools/kabi_regex.rst + create mode 100644 Documentation/tools/kabi_symbols.rst + create mode 100644 Documentation/tools/kdoc.rst + create mode 100644 Documentation/tools/kdoc_ancillary.rst + create mode 100644 Documentation/tools/kdoc_output.rst + create mode 100644 Documentation/tools/kdoc_parser.rst + create mode 100644 Documentation/tools/python.rst + create mode 100644 Documentation/translations/ja_JP/process/submitting-patches.rst + delete mode 100644 Documentation/translations/ko_KR/core-api/wrappers/memory-barriers.rst + delete mode 100644 Documentation/translations/ko_KR/memory-barriers.txt + rename scripts/kernel-doc.py => tools/docs/kernel-doc (88%) +Merging v4l-dvb/next (c824345288d11 media: uvcvideo: Pass allocation size directly to uvc_alloc_urb_buffer) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Auto-merging MAINTAINERS +Auto-merging drivers/media/mc/mc-request.c +CONFLICT (content): Merge conflict in drivers/media/mc/mc-request.c +Resolved 'drivers/media/mc/mc-request.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 74d2b1930090b] Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/media/mgb4.rst | 11 +- + .../devicetree/bindings/media/i2c/adi,adv7180.yaml | 97 +- + .../bindings/media/i2c/ovti,os05b10.yaml | 103 + + .../devicetree/bindings/media/i2c/ovti,ov5647.yaml | 14 +- + .../bindings/media/i2c/samsung,s5k3m5.yaml | 103 + + .../bindings/media/i2c/samsung,s5kjn1.yaml | 103 + + .../bindings/media/i2c/toshiba,et8ek8.txt | 55 - + .../bindings/media/i2c/toshiba,et8ek8.yaml | 87 + + .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 6 + + .../bindings/media/qcom,qcs8300-camss.yaml | 13 + + .../bindings/media/qcom,sa8775p-camss.yaml | 4 +- + .../bindings/media/qcom,sc7280-camss.yaml | 4 +- + .../bindings/media/qcom,sc8280xp-camss.yaml | 4 +- + .../bindings/media/qcom,sdm670-camss.yaml | 4 +- + .../bindings/media/qcom,sdm845-camss.yaml | 4 +- + .../bindings/media/qcom,sm6150-camss.yaml | 439 +++ + .../bindings/media/qcom,sm8250-camss.yaml | 4 +- + .../bindings/media/qcom,sm8550-camss.yaml | 4 +- + .../bindings/media/qcom,x1e80100-camss.yaml | 4 +- + .../devicetree/bindings/media/renesas,fcp.yaml | 1 + + .../bindings/media/rockchip,rk3568-mipi-csi2.yaml | 141 + + .../devicetree/bindings/media/ti,omap3isp.txt | 71 - + .../devicetree/bindings/media/ti,omap3isp.yaml | 189 + + .../devicetree/bindings/media/ti,vip.yaml | 152 + + Documentation/driver-api/media/v4l2-dev.rst | 8 +- + Documentation/userspace-api/media/conf_nitpick.py | 2 - + .../userspace-api/media/v4l/dev-decoder.rst | 5 +- + .../userspace-api/media/v4l/dev-raw-vbi.rst | 6 +- + .../userspace-api/media/v4l/dev-subdev.rst | 17 +- + .../media/v4l/ext-ctrls-codec-stateless.rst | 120 + + .../userspace-api/media/v4l/ext-ctrls-flash.rst | 42 + + .../userspace-api/media/v4l/pixfmt-compressed.rst | 8 + + .../userspace-api/media/v4l/subdev-formats.rst | 2 +- + .../media/v4l/videodev2.h.rst.exceptions | 2 + + .../userspace-api/media/v4l/vidioc-queryctrl.rst | 12 + + .../media/v4l/vidioc-subdev-g-routing.rst | 9 +- + MAINTAINERS | 39 +- + drivers/media/common/videobuf2/videobuf2-core.c | 49 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 14 - + drivers/media/dvb-core/dmxdev.c | 46 +- + drivers/media/dvb-core/dvb_vb2.c | 45 +- + drivers/media/i2c/Kconfig | 33 + + drivers/media/i2c/Makefile | 3 + + drivers/media/i2c/adv7180.c | 55 +- + drivers/media/i2c/adv7604.c | 8 +- + drivers/media/i2c/aptina-pll.c | 2 + + drivers/media/i2c/ccs/ccs-core.c | 946 ++--- + drivers/media/i2c/ccs/ccs.h | 17 +- + drivers/media/i2c/dw9714.c | 2 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 4 + + drivers/media/i2c/imx219.c | 29 +- + drivers/media/i2c/mt9m114.c | 271 +- + drivers/media/i2c/og0ve1b.c | 55 +- + drivers/media/i2c/os05b10.c | 1130 ++++++ + drivers/media/i2c/ov01a10.c | 916 +++-- + drivers/media/i2c/ov2735.c | 2 +- + drivers/media/i2c/ov5647.c | 894 ++--- + drivers/media/i2c/ov6211.c | 55 +- + drivers/media/i2c/ov9282.c | 173 +- + drivers/media/i2c/s5k3m5.c | 1377 ++++++++ + drivers/media/i2c/s5kjn1.c | 1487 ++++++++ + drivers/media/i2c/saa6588.c | 27 +- + drivers/media/i2c/tw9903.c | 1 + + drivers/media/i2c/tw9906.c | 1 + + drivers/media/mc/mc-device.c | 30 + + drivers/media/mc/mc-devnode.c | 5 + + drivers/media/mc/mc-request.c | 47 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 4 +- + drivers/media/pci/cx25821/cx25821-alsa.c | 1 + + drivers/media/pci/cx25821/cx25821-core.c | 1 + + drivers/media/pci/cx88/cx88-alsa.c | 4 +- + drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 2 +- + drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 73 +- + drivers/media/pci/intel/ipu6/ipu6-isys-queue.h | 1 - + drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c | 36 - + drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h | 4 - + drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 88 +- + drivers/media/pci/intel/ipu6/ipu6-isys-video.h | 6 +- + drivers/media/pci/intel/ipu6/ipu6-isys.c | 23 +- + drivers/media/pci/intel/ipu6/ipu6-isys.h | 2 - + drivers/media/pci/intel/ipu6/ipu6-mmu.c | 4 +- + drivers/media/pci/intel/ipu6/ipu6.c | 12 +- + drivers/media/pci/mgb4/mgb4_core.c | 22 +- + drivers/media/pci/mgb4/mgb4_core.h | 16 +- + drivers/media/pci/mgb4/mgb4_sysfs.h | 6 +- + drivers/media/pci/mgb4/mgb4_sysfs_in.c | 49 +- + drivers/media/pci/mgb4/mgb4_sysfs_out.c | 38 +- + drivers/media/pci/mgb4/mgb4_vin.c | 93 +- + drivers/media/pci/mgb4/mgb4_vout.c | 64 +- + drivers/media/pci/solo6x10/solo6x10-tw28.c | 8 +- + drivers/media/platform/amphion/vdec.c | 78 +- + drivers/media/platform/amphion/venc.c | 20 +- + drivers/media/platform/amphion/vpu_cmds.c | 15 +- + drivers/media/platform/amphion/vpu_core.c | 11 +- + drivers/media/platform/amphion/vpu_v4l2.c | 3 - + drivers/media/platform/aspeed/aspeed-video.c | 22 +- + .../platform/chips-media/wave5/wave5-helper.c | 28 +- + .../platform/chips-media/wave5/wave5-helper.h | 1 + + .../media/platform/chips-media/wave5/wave5-hw.c | 2 +- + .../platform/chips-media/wave5/wave5-vpu-dec.c | 194 +- + .../platform/chips-media/wave5/wave5-vpu-enc.c | 17 +- + .../media/platform/chips-media/wave5/wave5-vpu.c | 123 +- + .../media/platform/chips-media/wave5/wave5-vpu.h | 2 +- + .../platform/chips-media/wave5/wave5-vpuapi.c | 68 +- + .../platform/chips-media/wave5/wave5-vpuapi.h | 12 + + .../platform/chips-media/wave5/wave5-vpuconfig.h | 1 + + drivers/media/platform/mediatek/mdp/mtk_mdp_core.c | 17 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 6 +- + .../mediatek/vcodec/decoder/mtk_vcodec_dec.c | 4 +- + .../mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h | 17 + + .../mediatek/vcodec/decoder/mtk_vcodec_dec_pm.c | 6 +- + .../vcodec/decoder/mtk_vcodec_dec_stateless.c | 119 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp9_if.c | 3 +- + .../platform/mediatek/vcodec/decoder/vdec_vpu_if.c | 12 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 12 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc_pm.c | 6 +- + .../platform/mediatek/vcodec/encoder/venc_vpu_if.c | 15 +- + drivers/media/platform/mediatek/vpu/mtk_vpu.h | 3 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 70 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 1 + + drivers/media/platform/nxp/imx-mipi-csis.c | 31 +- + drivers/media/platform/nxp/imx7-media-csi.c | 14 +- + .../media/platform/nxp/imx8-isi/imx8-isi-core.c | 17 +- + .../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 2 +- + drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 58 +- + drivers/media/platform/qcom/camss/camss-csid-340.c | 10 +- + drivers/media/platform/qcom/camss/camss-csid.c | 18 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 21 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 19 +- + drivers/media/platform/qcom/camss/camss-csiphy.h | 1 + + drivers/media/platform/qcom/camss/camss-vfe-480.c | 6 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 2 + + drivers/media/platform/qcom/camss/camss.c | 586 +++- + drivers/media/platform/qcom/camss/camss.h | 3 +- + drivers/media/platform/qcom/iris/Makefile | 1 + + drivers/media/platform/qcom/iris/iris_buffer.c | 7 +- + drivers/media/platform/qcom/iris/iris_buffer.h | 2 + + drivers/media/platform/qcom/iris/iris_ctrls.c | 103 + + drivers/media/platform/qcom/iris/iris_ctrls.h | 3 + + drivers/media/platform/qcom/iris/iris_firmware.c | 23 +- + drivers/media/platform/qcom/iris/iris_hfi_common.h | 3 + + .../platform/qcom/iris/iris_hfi_gen1_command.c | 6 +- + .../platform/qcom/iris/iris_hfi_gen2_command.c | 153 +- + .../platform/qcom/iris/iris_hfi_gen2_defines.h | 28 + + .../platform/qcom/iris/iris_hfi_gen2_response.c | 24 + + drivers/media/platform/qcom/iris/iris_instance.h | 9 + + .../platform/qcom/iris/iris_platform_common.h | 29 +- + .../media/platform/qcom/iris/iris_platform_gen1.c | 47 +- + .../media/platform/qcom/iris/iris_platform_gen2.c | 257 +- + .../platform/qcom/iris/iris_platform_sc7280.h | 5 + + drivers/media/platform/qcom/iris/iris_power.c | 2 +- + drivers/media/platform/qcom/iris/iris_probe.c | 20 +- + drivers/media/platform/qcom/iris/iris_resources.c | 16 +- + drivers/media/platform/qcom/iris/iris_resources.h | 1 + + drivers/media/platform/qcom/iris/iris_utils.c | 6 + + drivers/media/platform/qcom/iris/iris_utils.h | 1 + + drivers/media/platform/qcom/iris/iris_vb2.c | 18 +- + drivers/media/platform/qcom/iris/iris_vdec.c | 31 +- + drivers/media/platform/qcom/iris/iris_venc.c | 48 +- + drivers/media/platform/qcom/iris/iris_vidc.c | 11 +- + drivers/media/platform/qcom/iris/iris_vpu3x.c | 199 +- + drivers/media/platform/qcom/iris/iris_vpu4x.c | 369 ++ + drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 701 +++- + drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 140 + + drivers/media/platform/qcom/iris/iris_vpu_common.c | 188 +- + drivers/media/platform/qcom/iris/iris_vpu_common.h | 5 + + .../platform/qcom/iris/iris_vpu_register_defines.h | 61 + + drivers/media/platform/qcom/venus/vdec.c | 20 +- + drivers/media/platform/qcom/venus/venc.c | 6 +- + drivers/media/platform/raspberrypi/rp1-cfe/csi2.c | 2 +- + drivers/media/platform/rockchip/rga/rga-buf.c | 3 + + .../platform/rockchip/rkisp1/rkisp1-capture.c | 5 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 6 - + drivers/media/platform/rockchip/rkvdec/Makefile | 14 +- + .../rkvdec/{rkvdec-hevc-data.c => rkvdec-cabac.c} | 506 ++- + .../media/platform/rockchip/rkvdec/rkvdec-cabac.h | 21 + + .../platform/rockchip/rkvdec/rkvdec-h264-common.c | 258 ++ + .../platform/rockchip/rkvdec/rkvdec-h264-common.h | 85 + + .../media/platform/rockchip/rkvdec/rkvdec-h264.c | 899 +---- + .../platform/rockchip/rkvdec/rkvdec-hevc-common.c | 511 +++ + .../platform/rockchip/rkvdec/rkvdec-hevc-common.h | 107 + + .../media/platform/rockchip/rkvdec/rkvdec-hevc.c | 282 +- + .../media/platform/rockchip/rkvdec/rkvdec-rcb.c | 179 + + .../media/platform/rockchip/rkvdec/rkvdec-rcb.h | 29 + + .../media/platform/rockchip/rkvdec/rkvdec-regs.h | 586 +++- + .../platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c | 469 +++ + .../platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c | 639 ++++ + .../platform/rockchip/rkvdec/rkvdec-vdpu381-regs.h | 430 +++ + .../platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c | 538 +++ + .../platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c | 652 ++++ + .../platform/rockchip/rkvdec/rkvdec-vdpu383-regs.h | 281 ++ + .../media/platform/rockchip/rkvdec/rkvdec-vp9.c | 230 +- + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 633 +++- + drivers/media/platform/rockchip/rkvdec/rkvdec.h | 50 +- + .../st/stm32/stm32-dcmipp/dcmipp-bytecap.c | 24 +- + .../st/stm32/stm32-dcmipp/dcmipp-byteproc.c | 24 +- + .../platform/st/stm32/stm32-dcmipp/dcmipp-core.c | 7 +- + .../platform/st/stm32/stm32-dcmipp/dcmipp-input.c | 10 + + drivers/media/platform/synopsys/Kconfig | 18 + + drivers/media/platform/synopsys/Makefile | 2 + + drivers/media/platform/synopsys/dw-mipi-csi2rx.c | 722 ++++ + .../media/platform/synopsys/hdmirx/snps_hdmirx.c | 90 +- + .../media/platform/synopsys/hdmirx/snps_hdmirx.h | 2 + + drivers/media/platform/ti/Kconfig | 13 + + drivers/media/platform/ti/omap3isp/ispccdc.c | 1 + + drivers/media/platform/ti/omap3isp/ispccp2.c | 3 +- + drivers/media/platform/ti/omap3isp/ispcsi2.c | 1 + + drivers/media/platform/ti/omap3isp/isppreview.c | 26 +- + drivers/media/platform/ti/omap3isp/ispresizer.c | 3 +- + drivers/media/platform/ti/omap3isp/ispstat.c | 1 + + drivers/media/platform/ti/omap3isp/ispvideo.c | 178 +- + drivers/media/platform/ti/vpe/Makefile | 2 + + drivers/media/platform/ti/vpe/vip.c | 3673 ++++++++++++++++++++ + drivers/media/platform/ti/vpe/vip.h | 717 ++++ + drivers/media/platform/ti/vpe/vpdma.c | 51 +- + drivers/media/platform/ti/vpe/vpdma.h | 6 + + drivers/media/platform/verisilicon/hantro.h | 2 + + drivers/media/platform/verisilicon/hantro_drv.c | 42 +- + drivers/media/platform/verisilicon/imx8m_vpu_hw.c | 8 + + .../verisilicon/rockchip_vpu981_hw_av1_dec.c | 43 +- + drivers/media/radio/radio-keene.c | 2 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 21 +- + drivers/media/test-drivers/visl/visl-dec.c | 7 + + drivers/media/test-drivers/visl/visl-dec.h | 3 + + drivers/media/test-drivers/visl/visl-trace-hevc.h | 59 + + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 5 + + drivers/media/usb/uvc/uvc_ctrl.c | 79 +- + drivers/media/usb/uvc/uvc_driver.c | 54 +- + drivers/media/usb/uvc/uvc_queue.c | 14 +- + drivers/media/usb/uvc/uvc_v4l2.c | 10 +- + drivers/media/usb/uvc/uvc_video.c | 15 +- + drivers/media/usb/uvc/uvcvideo.h | 5 +- + drivers/media/v4l2-core/v4l2-async.c | 45 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 31 +- + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 13 + + drivers/media/v4l2-core/v4l2-fwnode.c | 3 + + drivers/media/v4l2-core/v4l2-ioctl.c | 1 + + drivers/media/v4l2-core/v4l2-mem2mem.c | 33 +- + drivers/media/v4l2-core/v4l2-subdev.c | 2 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 5 +- + .../isp/kernels/fc/fc_1.0/ia_css_formats.host.c | 3 +- + drivers/staging/media/av7110/av7110_hw.c | 20 +- + drivers/staging/media/av7110/sp8870.c | 2 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 106 +- + drivers/staging/media/ipu7/ipu7-buttress.c | 17 +- + drivers/staging/media/ipu7/ipu7-isys-csi-phy.c | 13 +- + drivers/staging/media/ipu7/ipu7-mmu.c | 2 +- + drivers/staging/media/ipu7/ipu7.c | 6 +- + drivers/staging/media/tegra-video/csi.c | 4 - + drivers/staging/media/tegra-video/csi.h | 4 + + drivers/staging/media/tegra-video/vi.c | 13 +- + drivers/staging/media/tegra-video/vip.c | 4 - + drivers/staging/media/tegra-video/vip.h | 4 + + include/linux/usb/uvc.h | 8 + + include/media/dvb_vb2.h | 17 +- + include/media/media-device.h | 9 + + include/media/media-devnode.h | 4 + + include/media/media-request.h | 40 +- + include/media/v4l2-ctrls.h | 3 + + include/media/v4l2-fwnode.h | 8 +- + include/media/v4l2-mem2mem.h | 21 + + include/media/videobuf2-core.h | 23 +- + include/media/videobuf2-v4l2.h | 18 - + include/uapi/linux/v4l2-controls.h | 63 + + include/uapi/linux/videodev2.h | 3 + + 265 files changed, 23552 insertions(+), 4743 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,os05b10.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/samsung,s5k3m5.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/samsung,s5kjn1.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/toshiba,et8ek8.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/toshiba,et8ek8.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,sm6150-camss.yaml + create mode 100644 Documentation/devicetree/bindings/media/rockchip,rk3568-mipi-csi2.yaml + delete mode 100644 Documentation/devicetree/bindings/media/ti,omap3isp.txt + create mode 100644 Documentation/devicetree/bindings/media/ti,omap3isp.yaml + create mode 100644 Documentation/devicetree/bindings/media/ti,vip.yaml + create mode 100644 drivers/media/i2c/os05b10.c + create mode 100644 drivers/media/i2c/s5k3m5.c + create mode 100644 drivers/media/i2c/s5kjn1.c + create mode 100644 drivers/media/platform/qcom/iris/iris_vpu4x.c + rename drivers/media/platform/rockchip/rkvdec/{rkvdec-hevc-data.c => rkvdec-cabac.c} (86%) + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-cabac.h + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.c + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-h264-common.h + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.c + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-hevc-common.h + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-rcb.c + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-rcb.h + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-h264.c + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu381-regs.h + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-vdpu383-regs.h + create mode 100644 drivers/media/platform/synopsys/dw-mipi-csi2rx.c + create mode 100644 drivers/media/platform/ti/vpe/vip.c + create mode 100644 drivers/media/platform/ti/vpe/vip.h +Merging v4l-dvb-next/master (adc218676eef2 Linux 6.12) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (bf2bbd911e408 Merge branch 'pm-cpufreq' into linux-next) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging drivers/hwspinlock/omap_hwspinlock.c +Auto-merging drivers/media/i2c/ccs/ccs-core.c +Auto-merging drivers/pci/pci-acpi.c +Auto-merging drivers/pci/pcie/aer.c +Auto-merging kernel/irq/irqdomain.c +Auto-merging kernel/power/swap.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/pm/cpufreq.rst | 2 +- + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 2 + + .../devicetree/bindings/nvmem/mediatek,efuse.yaml | 1 + + .../bindings/thermal/mediatek,lvts-thermal.yaml | 3 + + .../bindings/thermal/renesas,r9a09g047-tsu.yaml | 34 +- + Documentation/driver-api/acpi/acpi-drivers.rst | 80 ++++ + Documentation/driver-api/acpi/index.rst | 1 + + Documentation/driver-api/thermal/intel_dptf.rst | 3 + + Documentation/power/energy-model.rst | 18 +- + Documentation/power/runtime_pm.rst | 7 +- + Documentation/scheduler/sched-energy.rst | 8 +- + MAINTAINERS | 2 +- + drivers/acpi/Kconfig | 2 + + drivers/acpi/acpi_extlog.c | 64 +++ + drivers/acpi/acpi_platform.c | 42 +- + drivers/acpi/acpi_pnp.c | 19 +- + drivers/acpi/acpi_processor.c | 28 +- + drivers/acpi/acpi_video.c | 62 ++- + drivers/acpi/acpi_watchdog.c | 4 +- + drivers/acpi/acpica/acpredef.h | 3 + + drivers/acpi/acpica/evregion.c | 4 +- + drivers/acpi/acpica/exoparg3.c | 51 +-- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/acpica/utobject.c | 2 +- + drivers/acpi/acpica/utosi.c | 6 +- + drivers/acpi/apei/Makefile | 5 + + drivers/acpi/apei/einj-core.c | 2 +- + drivers/acpi/apei/ghes.c | 187 +++++--- + drivers/acpi/apei/ghes_helpers.c | 66 +++ + drivers/acpi/arm64/iort.c | 193 ++++++-- + drivers/acpi/battery.c | 80 ++-- + drivers/acpi/bus.c | 485 ++++++++++++--------- + drivers/acpi/button.c | 128 +++--- + drivers/acpi/cppc_acpi.c | 50 ++- + drivers/acpi/device_pm.c | 16 +- + drivers/acpi/device_sysfs.c | 51 ++- + drivers/acpi/ec.c | 54 +-- + drivers/acpi/hed.c | 23 +- + drivers/acpi/nfit/core.c | 47 +- + drivers/acpi/pci_root.c | 2 +- + drivers/acpi/pci_slot.c | 10 +- + drivers/acpi/processor_driver.c | 13 +- + drivers/acpi/processor_idle.c | 162 ++++--- + drivers/acpi/resource.c | 8 + + drivers/acpi/sbs.c | 48 +- + drivers/acpi/sbshc.c | 43 +- + drivers/acpi/scan.c | 226 ++++++---- + drivers/acpi/sysfs.c | 30 +- + drivers/acpi/thermal.c | 90 ++-- + drivers/acpi/tiny-power-button.c | 27 +- + drivers/acpi/x86/s2idle.c | 9 +- + drivers/base/power/main.c | 7 +- + drivers/base/power/wakeirq.c | 11 +- + drivers/base/power/wakeup.c | 4 +- + drivers/cpufreq/Kconfig.arm | 5 - + drivers/cpufreq/Makefile | 1 - + drivers/cpufreq/amd-pstate.c | 13 + + drivers/cpufreq/cppc_cpufreq.c | 170 ++++---- + drivers/cpufreq/cpufreq-dt-platdev.c | 6 + + drivers/cpufreq/cpufreq.c | 13 +- + drivers/cpufreq/cpufreq_ondemand.c | 7 +- + drivers/cpufreq/cpufreq_userspace.c | 4 +- + drivers/cpufreq/intel_pstate.c | 2 +- + drivers/cpufreq/omap-cpufreq.c | 195 --------- + drivers/cpufreq/rcpufreq_dt.rs | 5 +- + drivers/cpufreq/scmi-cpufreq.c | 3 +- + drivers/cpufreq/ti-cpufreq.c | 34 +- + drivers/cpuidle/governors/menu.c | 24 +- + drivers/cpuidle/governors/teo.c | 98 ++++- + drivers/cxl/core/ras.c | 3 +- + drivers/firmware/efi/cper-arm.c | 12 +- + drivers/firmware/efi/cper.c | 8 +- + drivers/gpu/drm/arm/malidp_crtc.c | 6 +- + drivers/gpu/drm/bridge/imx/imx8qm-ldb.c | 4 +- + drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c | 4 +- + .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 5 +- + drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 5 +- + drivers/gpu/drm/imagination/pvr_power.h | 4 +- + drivers/gpu/drm/imx/dc/dc-crtc.c | 12 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 5 +- + drivers/gpu/drm/vc4/vc4_vec.c | 12 +- + drivers/hwspinlock/omap_hwspinlock.c | 4 +- + drivers/hwtracing/coresight/coresight-cpu-debug.c | 12 +- + drivers/idle/intel_idle.c | 268 ++++++++++-- + drivers/irqchip/irq-gic-its-msi-parent.c | 43 +- + drivers/irqchip/irq-gic-v5-irs.c | 247 ++++++++--- + drivers/irqchip/irq-gic-v5-its.c | 132 +++++- + drivers/irqchip/irq-gic-v5-iwb.c | 42 +- + drivers/irqchip/irq-gic-v5.c | 138 +++++- + drivers/media/i2c/ccs/ccs-core.c | 4 +- + drivers/opp/core.c | 2 +- + drivers/opp/of.c | 4 +- + drivers/pci/msi/irqdomain.c | 23 +- + drivers/pci/pci-acpi.c | 15 +- + drivers/pci/pcie/aer.c | 2 +- + drivers/platform/chrome/cros_hps_i2c.c | 4 +- + drivers/platform/x86/intel/hid.c | 41 +- + drivers/platform/x86/intel/vbtn.c | 30 +- + drivers/powercap/intel_rapl_msr.c | 1 + + drivers/powercap/powercap_sys.c | 13 +- + drivers/ras/ras.c | 6 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 8 +- + .../int340x_thermal/processor_thermal_device.c | 5 +- + .../intel/int340x_thermal/processor_thermal_rfim.c | 9 +- + .../int340x_thermal/processor_thermal_wt_hint.c | 57 ++- + .../int340x_thermal/processor_thermal_wt_req.c | 7 +- + drivers/thermal/intel/intel_pch_thermal.c | 1 - + drivers/thermal/intel/intel_tcc.c | 8 +- + drivers/thermal/intel/intel_tcc_cooling.c | 13 +- + drivers/thermal/intel/therm_throt.c | 5 +- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 3 + + drivers/thermal/mediatek/lvts_thermal.c | 362 ++++++++++++++- + drivers/thermal/qcom/lmh.c | 3 +- + drivers/thermal/renesas/rzg3e_thermal.c | 123 +++--- + drivers/thermal/st/stm_thermal.c | 4 +- + drivers/thermal/thermal_core.c | 8 +- + drivers/thermal/thermal_core.h | 7 +- + drivers/thermal/thermal_debugfs.c | 2 +- + drivers/thermal/thermal_hwmon.c | 4 +- + drivers/thermal/thermal_of.c | 4 +- + drivers/thermal/thermal_sysfs.c | 38 +- + drivers/ufs/core/ufshcd-priv.h | 4 +- + drivers/usb/core/driver.c | 8 +- + drivers/watchdog/rzg2l_wdt.c | 4 +- + drivers/watchdog/rzv2h_wdt.c | 8 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl1.h | 257 +++++++++++ + include/acpi/actbl2.h | 194 ++++++++- + include/acpi/actbl3.h | 1 + + include/acpi/acuuid.h | 6 + + include/acpi/cppc_acpi.h | 11 +- + include/acpi/ghes.h | 2 + + include/acpi/processor.h | 34 +- + include/cxl/event.h | 22 + + .../dt-bindings/thermal/mediatek,lvts-thermal.h | 29 ++ + include/linux/acpi.h | 1 + + include/linux/acpi_iort.h | 11 +- + include/linux/cper.h | 3 +- + include/linux/irq.h | 2 +- + include/linux/irqchip/arm-gic-v5.h | 8 + + include/linux/irqdomain.h | 30 +- + include/linux/msi.h | 3 +- + include/linux/pci-acpi.h | 3 +- + include/linux/pm.h | 2 +- + include/linux/tick.h | 2 + + kernel/irq/chip.c | 22 +- + kernel/irq/irqdomain.c | 14 +- + kernel/power/main.c | 2 +- + kernel/power/swap.c | 8 +- + kernel/time/hrtimer.c | 2 +- + kernel/time/tick-internal.h | 2 - + kernel/time/tick-sched.c | 8 +- + kernel/time/timer.c | 2 +- + rust/helpers/cpufreq.c | 3 +- + rust/kernel/cpufreq.rs | 5 +- + rust/kernel/cpumask.rs | 10 +- + tools/lib/thermal/libthermal.pc.template | 4 +- + tools/power/cpupower/Makefile | 17 +- + tools/power/cpupower/lib/cpuidle.c | 7 +- + tools/power/cpupower/utils/cpufreq-info.c | 2 +- + tools/power/cpupower/utils/cpuidle-info.c | 2 +- + .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 2 +- + .../intel/workload_hint/workload_hint_test.c | 80 ++-- + 163 files changed, 3881 insertions(+), 1847 deletions(-) + create mode 100644 Documentation/driver-api/acpi/acpi-drivers.rst + create mode 100644 drivers/acpi/apei/ghes_helpers.c + delete mode 100644 drivers/cpufreq/omap-cpufreq.c +Merging cpufreq-arm/cpufreq/arm/linux-next (0b7fbf9333fa4 cpufreq: scmi: Fix device_node reference leak in scmi_cpu_domain_id()) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (7799ba2160e49 cpupower: make systemd unit installation optional) +$ git merge -m Merge branch 'cpupower' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (b08a82bd1f573 PM / devfreq: Remove unneeded casting for HZ_PER_KHZ) +$ git merge -m Merge branch 'devfreq-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/devfreq.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging pmdomain/next (1fca2a4426aac pmdomain: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Merge made by the 'ort' strategy. + .../bindings/power/mediatek,mt8196-gpufreq.yaml | 13 + + .../bindings/power/mediatek,power-controller.yaml | 1 + + drivers/pmdomain/core.c | 59 ++- + drivers/pmdomain/imx/gpcv2.c | 4 +- + drivers/pmdomain/imx/imx93-blk-ctrl.c | 77 ++-- + drivers/pmdomain/imx/scu-pd.c | 1 + + .../pmdomain/marvell/pxa1908-power-controller.c | 39 +- + drivers/pmdomain/mediatek/mt8189-pm-domains.h | 485 +++++++++++++++++++++ + drivers/pmdomain/mediatek/mtk-mfg-pmdomain.c | 59 +++ + drivers/pmdomain/mediatek/mtk-pm-domains.c | 44 +- + drivers/pmdomain/mediatek/mtk-pm-domains.h | 5 + + drivers/pmdomain/mediatek/mtk-scpsys.c | 10 + + drivers/pmdomain/qcom/rpmpd.c | 2 +- + drivers/pmdomain/ti/omap_prm.c | 1 + + drivers/pmdomain/ti/ti_sci_pm_domains.c | 5 +- + include/dt-bindings/power/marvell,pxa1908-power.h | 1 + + include/dt-bindings/power/mediatek,mt8189-power.h | 38 ++ + include/dt-bindings/power/mt7622-power.h | 1 + + include/linux/pm_domain.h | 5 +- + 19 files changed, 779 insertions(+), 71 deletions(-) + create mode 100644 drivers/pmdomain/mediatek/mt8189-pm-domains.h + create mode 100644 include/dt-bindings/power/mediatek,mt8189-power.h +Merging opp/opp/linux-next (fc72a587c6c9e OPP: debugfs: Use performance level if available to distinguish between rates) +$ git merge -m Merge branch 'opp/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Merge made by the 'ort' strategy. + drivers/opp/debugfs.c | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) +Merging thermal/thermal/linux-next (0061030929e2d thermal: renesas: rzg3e: add support for RZ/T2H and RZ/N2H) +$ git merge -m Merge branch 'thermal/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging rdma/for-next (42e3aac65c1c9 IB/core: Extend rate limit support for RC QPs) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/infiniband/core/verbs.c +Auto-merging drivers/infiniband/hw/bnxt_re/ib_verbs.c +Auto-merging drivers/infiniband/hw/irdma/utils.c +Auto-merging drivers/infiniband/hw/mana/cq.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/mana/cq.c +Auto-merging drivers/infiniband/sw/rxe/rxe_odp.c +Auto-merging drivers/infiniband/ulp/rtrs/rtrs-clt.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/port.c +Resolved 'drivers/infiniband/hw/mana/cq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a284c31d3875e] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 3 +- + drivers/infiniband/core/cache.c | 3 +- + drivers/infiniband/core/device.c | 31 +- + drivers/infiniband/core/iwcm.c | 56 +-- + drivers/infiniband/core/iwcm.h | 1 - + drivers/infiniband/core/rw.c | 521 +++++++++++++++++++-- + drivers/infiniband/core/sysfs.c | 56 +-- + drivers/infiniband/core/umem_dmabuf.c | 3 - + drivers/infiniband/core/uverbs_cmd.c | 7 +- + drivers/infiniband/core/uverbs_std_types_device.c | 42 ++ + drivers/infiniband/core/verbs.c | 61 ++- + drivers/infiniband/hw/bnxt_re/debugfs.c | 14 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 34 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 12 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 3 + + drivers/infiniband/hw/bnxt_re/qplib_res.h | 6 + + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 5 + + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 + + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 13 +- + drivers/infiniband/hw/efa/efa_com.c | 99 ++-- + drivers/infiniband/hw/hns/hns_roce_ah.c | 23 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 12 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 6 + + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 220 ++++++++- + drivers/infiniband/hw/hns/hns_roce_main.c | 5 + + drivers/infiniband/hw/hns/hns_roce_qp.c | 49 +- + drivers/infiniband/hw/hns/hns_roce_restrack.c | 4 +- + drivers/infiniband/hw/irdma/ctrl.c | 67 +-- + drivers/infiniband/hw/irdma/hw.c | 108 ++++- + drivers/infiniband/hw/irdma/main.h | 2 + + drivers/infiniband/hw/irdma/puda.c | 14 + + drivers/infiniband/hw/irdma/type.h | 18 +- + drivers/infiniband/hw/irdma/uk.c | 6 +- + drivers/infiniband/hw/irdma/utils.c | 11 +- + drivers/infiniband/hw/irdma/verbs.c | 21 +- + drivers/infiniband/hw/mana/cq.c | 4 +- + drivers/infiniband/hw/mana/device.c | 7 + + drivers/infiniband/hw/mana/mana_ib.h | 12 + + drivers/infiniband/hw/mana/mr.c | 130 +++++ + drivers/infiniband/hw/mlx5/main.c | 233 ++++++++- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 + + drivers/infiniband/hw/mlx5/mr.c | 11 +- + drivers/infiniband/hw/mlx5/qp.c | 5 + + drivers/infiniband/hw/mlx5/std_types.c | 4 +- + drivers/infiniband/hw/ocrdma/ocrdma.h | 2 - + drivers/infiniband/hw/qedr/qedr.h | 20 - + drivers/infiniband/sw/rxe/rxe_comp.c | 3 + + drivers/infiniband/sw/rxe/rxe_mr.c | 286 +++++++---- + drivers/infiniband/sw/rxe/rxe_odp.c | 1 - + drivers/infiniband/sw/rxe/rxe_req.c | 3 + + drivers/infiniband/sw/rxe/rxe_srq.c | 6 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 11 +- + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 8 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 131 ++++-- + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 3 - + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 12 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 192 +++++--- + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 1 + + drivers/infiniband/ulp/rtrs/rtrs.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 215 +++++++++ + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h | 11 + + .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 39 ++ + .../net/ethernet/mellanox/mlx5/core/lag/mpesw.h | 14 + + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/port.c | 24 + + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 74 +++ + include/linux/mlx5/driver.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 9 +- + include/linux/mlx5/vport.h | 6 + + include/net/mana/gdma.h | 47 +- + include/rdma/ib_verbs.h | 61 ++- + include/rdma/rw.h | 22 + + include/uapi/rdma/bnxt_re-abi.h | 16 + + include/uapi/rdma/ib_user_ioctl_cmds.h | 6 + + include/uapi/rdma/mana-abi.h | 3 + + net/sunrpc/xprtrdma/svc_rdma_rw.c | 155 +++--- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 8 +- + 77 files changed, 2652 insertions(+), 696 deletions(-) +Merging net-next/main (021718d2cc1a2 Merge branch 'move-can-skb-headroom-content-to-skb-extensions') +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging CREDITS +Auto-merging Documentation/networking/device_drivers/ethernet/index.rst +Auto-merging Documentation/networking/index.rst +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/configs/ppc64_defconfig +Auto-merging arch/powerpc/configs/skiroot_defconfig +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/configs/defconfig +Auto-merging drivers/net/ethernet/adi/adin1110.c +Auto-merging drivers/net/ethernet/google/gve/gve_ethtool.c +Auto-merging drivers/net/ethernet/google/gve/gve_main.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/micrel/ksz884x.c +Auto-merging drivers/net/ethernet/spacemit/k1_emac.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/spacemit/k1_emac.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/netconsole.c +Auto-merging drivers/net/phy/sfp.c +Auto-merging drivers/net/usb/r8152.c +Auto-merging drivers/net/usb/usbnet.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mld/debugfs.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mld/iface.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mld/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/d3.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging drivers/net/wireless/realtek/rtw89/debug.c +Auto-merging include/linux/audit.h +Auto-merging include/linux/clk.h +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/skbuff.h +Auto-merging include/net/mana/gdma.h +Auto-merging net/bridge/br_sysfs_br.c +Auto-merging net/core/gro.c +Auto-merging net/ethtool/common.c +Resolved 'drivers/net/ethernet/spacemit/k1_emac.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8f201c149354c] Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + CREDITS | 8 + + Documentation/.renames.txt | 1 - + Documentation/PCI/pci-error-recovery.rst | 1 - + Documentation/admin-guide/sysctl/net.rst | 13 +- + .../devicetree/bindings/net/adi,adin.yaml | 14 + + .../devicetree/bindings/net/airoha,en7581-npu.yaml | 28 +- + .../devicetree/bindings/net/airoha,en8811h.yaml | 11 +- + .../net/bluetooth/qcom,bluetooth-common.yaml | 25 + + .../bindings/net/bluetooth/qcom,qca2066-bt.yaml | 49 + + .../bindings/net/bluetooth/qcom,qca6390-bt.yaml | 64 + + .../bindings/net/bluetooth/qcom,qca9377-bt.yaml | 58 + + .../bindings/net/bluetooth/qcom,wcn3950-bt.yaml | 67 + + .../bindings/net/bluetooth/qcom,wcn3990-bt.yaml | 66 + + .../bindings/net/bluetooth/qcom,wcn6750-bt.yaml | 91 + + .../bindings/net/bluetooth/qcom,wcn6855-bt.yaml | 99 + + .../bindings/net/bluetooth/qcom,wcn7850-bt.yaml | 94 + + .../bindings/net/bluetooth/qualcomm-bluetooth.yaml | 259 - + .../bindings/net/can/renesas,rcar-canfd.yaml | 117 +- + .../devicetree/bindings/net/dsa/lantiq,gswip.yaml | 28 +- + .../bindings/net/dsa/marvell,mv88e6xxx.yaml | 2 +- + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 3 + + .../bindings/net/ethernet-connector.yaml | 56 + + .../devicetree/bindings/net/ethernet-phy.yaml | 18 + + .../devicetree/bindings/net/micrel,gigabit.yaml | 253 + + .../devicetree/bindings/net/micrel-ksz90x1.txt | 228 - + Documentation/devicetree/bindings/net/micrel.txt | 57 - + Documentation/devicetree/bindings/net/micrel.yaml | 131 + + .../bindings/net/microchip,sparx5-switch.yaml | 15 +- + .../devicetree/bindings/net/mscc,miim.yaml | 11 +- + .../devicetree/bindings/net/nxp,s32-dwmac.yaml | 13 + + .../bindings/net/pcs/mediatek,sgmiisys.yaml | 7 +- + .../bindings/net/pcs/renesas,rzn1-miic.yaml | 7 + + .../bindings/net/renesas,rzv2h-gbeth.yaml | 81 +- + .../devicetree/bindings/net/rockchip-dwmac.yaml | 2 + + .../devicetree/bindings/net/snps,dwmac.yaml | 3 + + .../devicetree/bindings/net/ti,dp83822.yaml | 9 +- + .../bindings/net/wireless/qcom,ath11k-pci.yaml | 1 + + .../bindings/net/wireless/qcom,ath11k.yaml | 9 - + .../devicetree/bindings/phy/phy-common-props.yaml | 157 + + .../bindings/phy/transmit-amplitude.yaml | 103 - + .../devicetree/bindings/ptp/amazon,vmclock.yaml | 46 + + Documentation/netlink/specs/dpll.yaml | 12 + + Documentation/netlink/specs/rt-link.yaml | 3 + + Documentation/netlink/specs/tc.yaml | 3 + + .../networking/device_drivers/ethernet/index.rst | 1 - + .../device_drivers/ethernet/neterion/s2io.rst | 196 - + Documentation/networking/index.rst | 1 + + Documentation/networking/iou-zcrx.rst | 20 + + Documentation/networking/ip-sysctl.rst | 4 +- + .../networking/net_cachelines/tcp_sock.rst | 1 + + Documentation/networking/netdevices.rst | 4 +- + Documentation/networking/phy-port.rst | 111 + + Documentation/networking/phy.rst | 22 +- + Documentation/networking/scaling.rst | 12 +- + Documentation/networking/timestamping.rst | 7 +- + Documentation/networking/tls-offload.rst | 30 + + MAINTAINERS | 51 +- + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/loongson2k_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 3 - + arch/powerpc/configs/powernv_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/configs/skiroot_defconfig | 1 - + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + drivers/atm/idt77252.c | 4 +- + drivers/bluetooth/btintel_pcie.c | 3 +- + drivers/bluetooth/btmtksdio.c | 8 +- + drivers/bluetooth/btnxpuart.c | 6 +- + drivers/bluetooth/btqca.c | 58 +- + drivers/bluetooth/btusb.c | 26 +- + drivers/bluetooth/hci_bcm4377.c | 11 +- + drivers/bluetooth/hci_intel.c | 10 +- + drivers/bluetooth/hci_qca.c | 52 +- + drivers/clk/clk-devres.c | 50 + + drivers/dpll/dpll_netlink.c | 81 +- + drivers/dpll/dpll_nl.c | 1 + + drivers/dpll/zl3073x/core.c | 7 +- + drivers/dpll/zl3073x/dpll.c | 112 + + drivers/infiniband/hw/bnxt_re/main.c | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 6 +- + drivers/mmc/core/sdio_bus.c | 25 + + drivers/net/Kconfig | 2 - + drivers/net/Makefile | 1 - + drivers/net/arcnet/com20020.c | 16 - + drivers/net/bonding/bond_3ad.c | 16 +- + drivers/net/bonding/bond_main.c | 115 +- + drivers/net/can/dev/skb.c | 121 +- + drivers/net/can/rcar/rcar_canfd.c | 32 +- + drivers/net/can/sja1000/sja1000.c | 58 +- + drivers/net/can/vxcan.c | 15 +- + drivers/net/dsa/Kconfig | 1 + + drivers/net/dsa/dsa_loop.c | 8 +- + drivers/net/dsa/lantiq/Kconfig | 4 +- + drivers/net/dsa/lantiq/lantiq_gswip.c | 46 +- + drivers/net/dsa/lantiq/lantiq_gswip.h | 7 +- + drivers/net/dsa/lantiq/lantiq_gswip_common.c | 33 +- + drivers/net/dsa/lantiq/mxl-gsw1xx.c | 191 +- + drivers/net/dsa/lantiq/mxl-gsw1xx.h | 4 + + drivers/net/dsa/microchip/ksz_common.c | 15 +- + drivers/net/dsa/microchip/ksz_common.h | 7 + + drivers/net/dsa/microchip/ksz_ptp.c | 63 +- + drivers/net/dsa/microchip/ksz_ptp_reg.h | 16 +- + drivers/net/dsa/mt7530-mdio.c | 4 +- + drivers/net/dsa/sja1105/sja1105_main.c | 84 +- + drivers/net/dsa/yt921x.c | 496 +- + drivers/net/dsa/yt921x.h | 75 +- + drivers/net/ethernet/8390/8390.c | 14 - + drivers/net/ethernet/8390/8390p.c | 11 - + drivers/net/ethernet/Kconfig | 13 - + drivers/net/ethernet/Makefile | 2 - + drivers/net/ethernet/adi/adin1110.c | 2 +- + drivers/net/ethernet/airoha/airoha_eth.c | 41 +- + drivers/net/ethernet/airoha/airoha_eth.h | 2 +- + drivers/net/ethernet/airoha/airoha_npu.c | 60 +- + drivers/net/ethernet/alacritech/slic.h | 50 +- + drivers/net/ethernet/alacritech/slicoss.c | 8 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 22 +- + drivers/net/ethernet/amd/declance.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 3 + + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 8 + + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 1 + + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 64 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 1 + + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 18 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 3 - + drivers/net/ethernet/broadcom/asp2/bcmasp.c | 32 +- + drivers/net/ethernet/broadcom/asp2/bcmasp.h | 36 - + drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 58 +- + drivers/net/ethernet/broadcom/bnge/Makefile | 3 +- + drivers/net/ethernet/broadcom/bnge/bnge_devlink.c | 2 +- + drivers/net/ethernet/broadcom/bnge/bnge_hw_def.h | 446 + + drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.c | 65 + + drivers/net/ethernet/broadcom/bnge/bnge_hwrm_lib.h | 2 + + drivers/net/ethernet/broadcom/bnge/bnge_netdev.c | 409 +- + drivers/net/ethernet/broadcom/bnge/bnge_netdev.h | 121 +- + drivers/net/ethernet/broadcom/bnge/bnge_txrx.c | 1645 ++++ + drivers/net/ethernet/broadcom/bnge/bnge_txrx.h | 126 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 170 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 8 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 131 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 51 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 2 +- + drivers/net/ethernet/cadence/macb_main.c | 29 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 11 +- + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 11 +- + drivers/net/ethernet/dlink/dl2k.c | 17 +- + drivers/net/ethernet/dnet.c | 877 -- + drivers/net/ethernet/dnet.h | 220 - + drivers/net/ethernet/emulex/benet/be.h | 8 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 6 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 6 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 43 +- + drivers/net/ethernet/emulex/benet/be_hw.h | 6 +- + drivers/net/ethernet/emulex/benet/be_main.c | 16 +- + drivers/net/ethernet/engleder/tsnep_ethtool.c | 11 +- + drivers/net/ethernet/freescale/fec_main.c | 2 + + .../net/ethernet/fungible/funeth/funeth_ethtool.c | 14 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 11 +- + drivers/net/ethernet/google/gve/gve_main.c | 9 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 16 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 12 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 12 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 11 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 11 +- + drivers/net/ethernet/huawei/hinic/hinic_ethtool.c | 19 +- + drivers/net/ethernet/huawei/hinic3/Makefile | 1 + + drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c | 3 - + drivers/net/ethernet/huawei/hinic3/hinic3_csr.h | 6 + + drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c | 3 +- + drivers/net/ethernet/huawei/hinic3/hinic3_filter.c | 417 + + .../net/ethernet/huawei/hinic3/hinic3_hw_comm.c | 115 + + .../net/ethernet/huawei/hinic3/hinic3_hw_comm.h | 6 + + .../net/ethernet/huawei/hinic3/hinic3_hw_intf.h | 24 + + drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.c | 99 +- + drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.h | 21 + + drivers/net/ethernet/huawei/hinic3/hinic3_hwif.c | 90 +- + drivers/net/ethernet/huawei/hinic3/hinic3_hwif.h | 23 + + drivers/net/ethernet/huawei/hinic3/hinic3_irq.c | 97 +- + drivers/net/ethernet/huawei/hinic3/hinic3_lld.c | 58 +- + drivers/net/ethernet/huawei/hinic3/hinic3_main.c | 186 +- + drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c | 55 +- + drivers/net/ethernet/huawei/hinic3/hinic3_mbox.h | 2 + + drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.c | 313 +- + drivers/net/ethernet/huawei/hinic3/hinic3_mgmt.h | 53 + + .../ethernet/huawei/hinic3/hinic3_mgmt_interface.h | 69 + + .../net/ethernet/huawei/hinic3/hinic3_netdev_ops.c | 377 +- + .../net/ethernet/huawei/hinic3/hinic3_nic_cfg.c | 290 +- + .../net/ethernet/huawei/hinic3/hinic3_nic_cfg.h | 47 + + .../net/ethernet/huawei/hinic3/hinic3_nic_dev.h | 58 + + drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.c | 6 +- + drivers/net/ethernet/huawei/hinic3/hinic3_rx.c | 27 + + drivers/net/ethernet/huawei/hinic3/hinic3_rx.h | 21 + + drivers/net/ethernet/huawei/hinic3/hinic3_tx.c | 34 +- + drivers/net/ethernet/huawei/hinic3/hinic3_tx.h | 16 + + drivers/net/ethernet/intel/ice/ice.h | 3 - + drivers/net/ethernet/intel/ice/ice_base.c | 4 +- + drivers/net/ethernet/intel/ice/ice_common.c | 81 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 31 +- + drivers/net/ethernet/intel/ice/ice_irq.c | 5 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 68 +- + drivers/net/ethernet/intel/ice/ice_lib.h | 6 + + drivers/net/ethernet/intel/ice/ice_main.c | 196 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 46 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 203 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 5 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.h | 2 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 4 +- + drivers/net/ethernet/intel/idpf/idpf.h | 179 +- + drivers/net/ethernet/intel/idpf/idpf_dev.c | 18 +- + drivers/net/ethernet/intel/idpf/idpf_ethtool.c | 93 +- + drivers/net/ethernet/intel/idpf/idpf_lib.c | 238 +- + drivers/net/ethernet/intel/idpf/idpf_ptp.c | 17 +- + drivers/net/ethernet/intel/idpf/idpf_txrx.c | 808 +- + drivers/net/ethernet/intel/idpf/idpf_txrx.h | 44 +- + drivers/net/ethernet/intel/idpf/idpf_vf_dev.c | 21 +- + drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 1098 +-- + drivers/net/ethernet/intel/idpf/idpf_virtchnl.h | 84 +- + drivers/net/ethernet/intel/idpf/xdp.c | 79 +- + drivers/net/ethernet/intel/idpf/xdp.h | 26 +- + drivers/net/ethernet/intel/idpf/xsk.c | 12 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 7 + + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 2 + + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 45 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 2 + + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 2 + + .../net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 26 + + .../net/ethernet/marvell/octeon_ep/octep_cnxk_pf.c | 2 +- + .../marvell/octeon_ep/octep_regs_cn9k_pf.h | 30 + + .../marvell/octeon_ep/octep_regs_cnxk_pf.h | 1 + + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 12 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 13 +- + .../ethernet/marvell/octeontx2/nic/otx2_devlink.h | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 22 +- + .../net/ethernet/marvell/prestera/prestera_pci.c | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 34 +- + drivers/net/ethernet/mellanox/mlx5/core/dpll.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 26 +- + drivers/net/ethernet/mellanox/mlx5/core/en/dcbnl.h | 4 + + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 1 + + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 3 + + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 6 +- + .../mellanox/mlx5/core/en_accel/en_accel.h | 17 - + .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 10 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c | 26 +- + .../mellanox/mlx5/core/en_accel/ktls_txrx.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 66 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 142 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 41 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 35 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 3 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 47 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_pool.c | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_pool.h | 5 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 4 +- + .../mellanox/mlx5/core/steering/hws/fs_hws_pools.c | 8 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 12 - + drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 12 + + drivers/net/ethernet/meta/fbnic/fbnic_debugfs.c | 407 + + drivers/net/ethernet/meta/fbnic/fbnic_devlink.c | 8 +- + drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 14 +- + drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 44 +- + drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 10 + + drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 24 +- + drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 4 + + drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 28 +- + drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 6 + + drivers/net/ethernet/micrel/ks8842.c | 4 +- + drivers/net/ethernet/micrel/ks8851_common.c | 2 +- + drivers/net/ethernet/micrel/ks8851_spi.c | 4 +- + drivers/net/ethernet/micrel/ksz884x.c | 4 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 13 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 77 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 13 +- + drivers/net/ethernet/neterion/Kconfig | 35 - + drivers/net/ethernet/neterion/Makefile | 6 - + drivers/net/ethernet/neterion/s2io-regs.h | 958 --- + drivers/net/ethernet/neterion/s2io.c | 8572 -------------------- + drivers/net/ethernet/neterion/s2io.h | 1124 --- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 11 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 18 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 12 +- + drivers/net/ethernet/realtek/8139too.c | 40 +- + drivers/net/ethernet/realtek/Kconfig | 16 +- + drivers/net/ethernet/realtek/Makefile | 1 - + drivers/net/ethernet/realtek/atp.c | 886 -- + drivers/net/ethernet/realtek/atp.h | 262 - + drivers/net/ethernet/realtek/r8169.h | 3 +- + drivers/net/ethernet/realtek/r8169_firmware.c | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 243 +- + drivers/net/ethernet/renesas/rcar_gen4_ptp.c | 34 +- + drivers/net/ethernet/renesas/rcar_gen4_ptp.h | 18 +- + drivers/net/ethernet/renesas/rswitch_main.c | 11 +- + drivers/net/ethernet/renesas/rtsn.c | 30 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_mtl.c | 2 +- + drivers/net/ethernet/sfc/ef100_ethtool.c | 1 + + drivers/net/ethernet/sfc/ethtool.c | 1 + + drivers/net/ethernet/sfc/ethtool_common.c | 11 +- + drivers/net/ethernet/sfc/ethtool_common.h | 1 + + drivers/net/ethernet/sfc/falcon/ethtool.c | 12 +- + drivers/net/ethernet/sfc/nic.h | 7 +- + drivers/net/ethernet/sfc/siena/ethtool.c | 1 + + drivers/net/ethernet/sfc/siena/ethtool_common.c | 11 +- + drivers/net/ethernet/sfc/siena/ethtool_common.h | 1 + + drivers/net/ethernet/sis/sis900.c | 31 +- + drivers/net/ethernet/smsc/epic100.c | 35 +- + drivers/net/ethernet/socionext/sni_ave.c | 4 +- + drivers/net/ethernet/spacemit/k1_emac.c | 111 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 9 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/common.h | 7 +- + drivers/net/ethernet/stmicro/stmmac/descs.h | 7 - + drivers/net/ethernet/stmicro/stmmac/descs_com.h | 48 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 18 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 4 - + .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 18 +- + .../net/ethernet/stmicro/stmmac/dwmac-motorcomm.c | 384 + + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 3 - + .../ethernet/stmicro/stmmac/dwmac-renesas-gbeth.c | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 942 +-- + drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c | 28 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c | 10 +- + drivers/net/ethernet/stmicro/stmmac/dwmac100.h | 36 +- + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 70 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 28 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 18 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 79 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 35 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 70 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h | 8 - + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 46 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 163 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 172 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 10 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 41 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 27 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 39 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 76 +- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 29 +- + drivers/net/ethernet/stmicro/stmmac/hwif.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 4 +- + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 25 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 15 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 190 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c | 45 + + drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h | 68 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 - + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 2 +- + drivers/net/ethernet/sun/niu.c | 11 +- + drivers/net/ethernet/ti/Makefile | 2 +- + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 5 +- + drivers/net/ethernet/ti/cpsw_ale.c | 5 - + drivers/net/ethernet/ti/cpsw_ethtool.c | 5 +- + drivers/net/ethernet/ti/icssm/icssm_prueth.c | 545 +- + drivers/net/ethernet/ti/icssm/icssm_prueth.h | 20 +- + .../net/ethernet/ti/icssm/icssm_prueth_fdb_tbl.h | 76 + + .../net/ethernet/ti/icssm/icssm_prueth_switch.c | 1065 +++ + .../net/ethernet/ti/icssm/icssm_prueth_switch.h | 37 + + drivers/net/ethernet/ti/icssm/icssm_switch.h | 103 + + drivers/net/ethernet/ti/icssm/icssm_switchdev.c | 333 + + drivers/net/ethernet/ti/icssm/icssm_switchdev.h | 13 + + .../ti/icssm/icssm_vlan_mcast_filter_mmap.h | 120 + + drivers/net/ethernet/ti/netcp.h | 8 +- + drivers/net/ethernet/ti/netcp_core.c | 16 +- + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 17 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c | 12 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 83 +- + drivers/net/geneve.c | 557 +- + drivers/net/hamradio/hdlcdrv.c | 20 - + drivers/net/hippi/Kconfig | 40 - + drivers/net/hippi/Makefile | 6 - + drivers/net/hippi/rrunner.c | 1687 ---- + drivers/net/hippi/rrunner.h | 848 -- + drivers/net/ifb.c | 18 +- + drivers/net/ipvlan/ipvlan_core.c | 55 +- + drivers/net/macsec.c | 6 +- + drivers/net/mctp/mctp-i2c.c | 9 + + drivers/net/net_failover.c | 13 - + drivers/net/netconsole.c | 305 +- + drivers/net/netdevsim/netdev.c | 7 +- + drivers/net/netdevsim/netdevsim.h | 8 +- + drivers/net/netdevsim/psp.c | 18 +- + drivers/net/ovpn/peer.c | 2 +- + drivers/net/pcs/Kconfig | 1 + + drivers/net/pcs/pcs-mtk-lynxi.c | 63 +- + drivers/net/pcs/pcs-rzn1-miic.c | 105 +- + drivers/net/phy/Kconfig | 1 + + drivers/net/phy/Makefile | 2 +- + drivers/net/phy/adin.c | 20 + + drivers/net/phy/air_en8811h.c | 499 +- + drivers/net/phy/ax88796b_rust.rs | 7 +- + drivers/net/phy/dp83822.c | 71 +- + drivers/net/phy/dp83867.c | 63 +- + drivers/net/phy/fixed_phy.c | 87 +- + drivers/net/phy/marvell-88x2222.c | 94 +- + drivers/net/phy/marvell.c | 92 +- + drivers/net/phy/marvell10g.c | 51 +- + drivers/net/phy/mdio_device.c | 13 - + drivers/net/phy/mediatek/mtk-ge-soc.c | 2 + + drivers/net/phy/micrel.c | 58 +- + drivers/net/phy/microchip_rds_ptp.c | 34 +- + drivers/net/phy/motorcomm.c | 4 + + drivers/net/phy/mxl-gpy.c | 61 +- + drivers/net/phy/phy-caps.h | 6 + + drivers/net/phy/phy-core.c | 8 + + drivers/net/phy/phy_caps.c | 67 + + drivers/net/phy/phy_device.c | 427 +- + drivers/net/phy/phy_port.c | 212 + + drivers/net/phy/phylib-internal.h | 6 - + drivers/net/phy/phylib.h | 5 + + drivers/net/phy/phylink.c | 79 +- + drivers/net/phy/qcom/at803x.c | 79 +- + drivers/net/phy/qcom/qca807x.c | 78 +- + drivers/net/phy/qt2025.rs | 5 +- + drivers/net/phy/realtek/realtek_main.c | 432 +- + drivers/net/phy/sfp.c | 8 +- + drivers/net/ppp/ppp_generic.c | 30 +- + drivers/net/thunderbolt/main.c | 53 + + drivers/net/usb/Kconfig | 2 +- + drivers/net/usb/aqc111.c | 5 - + drivers/net/usb/asix.h | 3 - + drivers/net/usb/asix_common.c | 8 - + drivers/net/usb/asix_devices.c | 30 +- + drivers/net/usb/ax88172a.c | 2 +- + drivers/net/usb/ax88179_178a.c | 8 +- + drivers/net/usb/catc.c | 7 - + drivers/net/usb/dm9601.c | 27 +- + drivers/net/usb/int51x1.c | 39 +- + drivers/net/usb/mcs7830.c | 15 +- + drivers/net/usb/pegasus.c | 3 - + drivers/net/usb/r8152.c | 12 +- + drivers/net/usb/rtl8150.c | 3 - + drivers/net/usb/sierra_net.c | 14 +- + drivers/net/usb/smsc75xx.c | 7 +- + drivers/net/usb/smsc95xx.c | 13 +- + drivers/net/usb/sr9700.c | 251 +- + drivers/net/usb/sr9700.h | 22 +- + drivers/net/usb/sr9800.c | 30 +- + drivers/net/usb/sr9800.h | 3 +- + drivers/net/usb/usbnet.c | 8 + + drivers/net/vxlan/vxlan_core.c | 18 +- + drivers/net/vxlan/vxlan_vnifilter.c | 2 +- + drivers/net/wan/framer/framer-core.c | 6 +- + drivers/net/wireless/ath/ath10k/sdio.c | 6 + + drivers/net/wireless/ath/ath10k/snoc.c | 53 +- + drivers/net/wireless/ath/ath10k/snoc.h | 3 + + drivers/net/wireless/ath/ath10k/wmi.c | 4 +- + drivers/net/wireless/ath/ath11k/Kconfig | 11 + + drivers/net/wireless/ath/ath11k/Makefile | 1 + + drivers/net/wireless/ath/ath11k/cfr.c | 1023 +++ + drivers/net/wireless/ath/ath11k/cfr.h | 308 + + drivers/net/wireless/ath/ath11k/core.c | 108 +- + drivers/net/wireless/ath/ath11k/core.h | 23 +- + drivers/net/wireless/ath/ath11k/dbring.c | 50 +- + drivers/net/wireless/ath/ath11k/dbring.h | 8 +- + drivers/net/wireless/ath/ath11k/debug.h | 8 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 2 +- + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 142 +- + drivers/net/wireless/ath/ath11k/dp.c | 12 +- + drivers/net/wireless/ath/ath11k/dp.h | 1 - + drivers/net/wireless/ath/ath11k/dp_tx.c | 9 +- + drivers/net/wireless/ath/ath11k/hal.c | 3 +- + drivers/net/wireless/ath/ath11k/hw.c | 19 +- + drivers/net/wireless/ath/ath11k/hw.h | 8 +- + drivers/net/wireless/ath/ath11k/mac.c | 23 +- + drivers/net/wireless/ath/ath11k/reg.c | 9 +- + drivers/net/wireless/ath/ath11k/wmi.c | 147 +- + drivers/net/wireless/ath/ath11k/wmi.h | 97 +- + drivers/net/wireless/ath/ath12k/Makefile | 8 +- + drivers/net/wireless/ath/ath12k/ahb.c | 171 +- + drivers/net/wireless/ath/ath12k/ahb.h | 31 +- + drivers/net/wireless/ath/ath12k/ce.c | 326 +- + drivers/net/wireless/ath/ath12k/ce.h | 7 +- + drivers/net/wireless/ath/ath12k/cmn_defs.h | 20 + + drivers/net/wireless/ath/ath12k/core.c | 75 +- + drivers/net/wireless/ath/ath12k/core.h | 179 +- + drivers/net/wireless/ath/ath12k/dbring.c | 6 +- + drivers/net/wireless/ath/ath12k/debug.c | 8 +- + drivers/net/wireless/ath/ath12k/debugfs.c | 8 +- + .../net/wireless/ath/ath12k/debugfs_htt_stats.c | 197 +- + .../net/wireless/ath/ath12k/debugfs_htt_stats.h | 85 +- + drivers/net/wireless/ath/ath12k/debugfs_sta.c | 62 +- + drivers/net/wireless/ath/ath12k/dp.c | 565 +- + drivers/net/wireless/ath/ath12k/dp.h | 1752 +--- + drivers/net/wireless/ath/ath12k/dp_cmn.h | 106 + + drivers/net/wireless/ath/ath12k/dp_htt.c | 1353 +++ + drivers/net/wireless/ath/ath12k/dp_htt.h | 1546 ++++ + drivers/net/wireless/ath/ath12k/dp_mon.c | 3517 +------- + drivers/net/wireless/ath/ath12k/dp_mon.h | 58 +- + drivers/net/wireless/ath/ath12k/dp_peer.c | 690 ++ + drivers/net/wireless/ath/ath12k/dp_peer.h | 182 + + drivers/net/wireless/ath/ath12k/dp_rx.c | 3482 +------- + drivers/net/wireless/ath/ath12k/dp_rx.h | 191 +- + drivers/net/wireless/ath/ath12k/dp_tx.c | 1638 +--- + drivers/net/wireless/ath/ath12k/dp_tx.h | 39 +- + drivers/net/wireless/ath/ath12k/fw.c | 10 +- + drivers/net/wireless/ath/ath12k/fw.h | 3 +- + drivers/net/wireless/ath/ath12k/hal.c | 2304 +----- + drivers/net/wireless/ath/ath12k/hal.h | 1509 ++-- + drivers/net/wireless/ath/ath12k/htc.c | 3 +- + drivers/net/wireless/ath/ath12k/hw.c | 1680 ---- + drivers/net/wireless/ath/ath12k/hw.h | 96 +- + drivers/net/wireless/ath/ath12k/mac.c | 1255 +-- + drivers/net/wireless/ath/ath12k/mac.h | 142 +- + drivers/net/wireless/ath/ath12k/mhi.c | 132 +- + drivers/net/wireless/ath/ath12k/mhi.h | 5 +- + drivers/net/wireless/ath/ath12k/pci.c | 259 +- + drivers/net/wireless/ath/ath12k/pci.h | 49 +- + drivers/net/wireless/ath/ath12k/peer.c | 453 +- + drivers/net/wireless/ath/ath12k/peer.h | 112 +- + drivers/net/wireless/ath/ath12k/qmi.c | 180 +- + drivers/net/wireless/ath/ath12k/qmi.h | 16 + + drivers/net/wireless/ath/ath12k/testmode.c | 3 +- + drivers/net/wireless/ath/ath12k/wifi7/Makefile | 20 + + drivers/net/wireless/ath/ath12k/wifi7/ahb.c | 75 + + drivers/net/wireless/ath/ath12k/wifi7/ahb.h | 20 + + drivers/net/wireless/ath/ath12k/wifi7/ce.c | 973 +++ + drivers/net/wireless/ath/ath12k/wifi7/ce.h | 22 + + drivers/net/wireless/ath/ath12k/wifi7/core.c | 68 + + drivers/net/wireless/ath/ath12k/wifi7/core.h | 11 + + drivers/net/wireless/ath/ath12k/wifi7/dp.c | 181 + + drivers/net/wireless/ath/ath12k/wifi7/dp.h | 20 + + drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c | 3385 ++++++++ + drivers/net/wireless/ath/ath12k/wifi7/dp_mon.h | 23 + + drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c | 2246 +++++ + drivers/net/wireless/ath/ath12k/wifi7/dp_rx.h | 60 + + drivers/net/wireless/ath/ath12k/wifi7/dp_tx.c | 978 +++ + drivers/net/wireless/ath/ath12k/wifi7/dp_tx.h | 16 + + drivers/net/wireless/ath/ath12k/wifi7/hal.c | 713 ++ + drivers/net/wireless/ath/ath12k/wifi7/hal.h | 561 ++ + .../net/wireless/ath/ath12k/{ => wifi7}/hal_desc.h | 331 +- + .../net/wireless/ath/ath12k/wifi7/hal_qcc2072.c | 503 ++ + .../net/wireless/ath/ath12k/wifi7/hal_qcc2072.h | 13 + + .../net/wireless/ath/ath12k/wifi7/hal_qcn9274.c | 1038 +++ + .../net/wireless/ath/ath12k/wifi7/hal_qcn9274.h | 45 + + .../net/wireless/ath/ath12k/{ => wifi7}/hal_rx.c | 284 +- + .../net/wireless/ath/ath12k/{ => wifi7}/hal_rx.h | 424 +- + .../ath/ath12k/{rx_desc.h => wifi7/hal_rx_desc.h} | 72 +- + .../net/wireless/ath/ath12k/{ => wifi7}/hal_tx.c | 23 +- + .../net/wireless/ath/ath12k/{ => wifi7}/hal_tx.h | 30 +- + .../net/wireless/ath/ath12k/wifi7/hal_wcn7850.c | 809 ++ + .../net/wireless/ath/ath12k/wifi7/hal_wcn7850.h | 40 + + drivers/net/wireless/ath/ath12k/wifi7/hw.c | 1049 +++ + drivers/net/wireless/ath/ath12k/wifi7/hw.h | 13 + + drivers/net/wireless/ath/ath12k/wifi7/mhi.c | 138 + + drivers/net/wireless/ath/ath12k/wifi7/mhi.h | 11 + + drivers/net/wireless/ath/ath12k/wifi7/pci.c | 215 + + drivers/net/wireless/ath/ath12k/wifi7/pci.h | 12 + + drivers/net/wireless/ath/ath12k/wifi7/wmi.c | 110 + + drivers/net/wireless/ath/ath12k/wifi7/wmi.h | 15 + + drivers/net/wireless/ath/ath12k/wmi.c | 334 +- + drivers/net/wireless/ath/ath12k/wmi.h | 61 +- + drivers/net/wireless/ath/ath12k/wow.c | 21 +- + drivers/net/wireless/ath/ath5k/debug.h | 4 +- + drivers/net/wireless/ath/ath9k/Kconfig | 2 +- + drivers/net/wireless/ath/ath9k/common-debug.h | 8 +- + drivers/net/wireless/ath/ath9k/common.c | 12 - + drivers/net/wireless/ath/ath9k/debug.h | 15 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 33 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 4 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 8 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 4 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 9 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 + + drivers/net/wireless/intel/iwlegacy/3945-rs.c | 7 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 + + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 12 - + drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c | 12 + + drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c | 1 - + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 121 +- + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 159 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 34 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 41 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 95 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 2 + + drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 206 +- + drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 9 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 17 +- + drivers/net/wireless/intel/iwlwifi/fw/smem.c | 8 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 74 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 1 - + drivers/net/wireless/intel/iwlwifi/mld/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/mld/d3.c | 2 - + drivers/net/wireless/intel/iwlwifi/mld/debugfs.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mld/iface.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mld/iface.h | 2 + + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 114 +- + drivers/net/wireless/intel/iwlwifi/mld/mld.c | 3 + + drivers/net/wireless/intel/iwlwifi/mld/mld.h | 3 + + drivers/net/wireless/intel/iwlwifi/mld/mlo.c | 59 +- + drivers/net/wireless/intel/iwlwifi/mld/mlo.h | 5 + + drivers/net/wireless/intel/iwlwifi/mld/nan.c | 299 + + drivers/net/wireless/intel/iwlwifi/mld/nan.h | 28 + + drivers/net/wireless/intel/iwlwifi/mld/notif.c | 13 + + drivers/net/wireless/intel/iwlwifi/mld/notif.h | 1 + + drivers/net/wireless/intel/iwlwifi/mld/power.c | 39 +- + .../net/wireless/intel/iwlwifi/mld/regulatory.c | 64 +- + drivers/net/wireless/intel/iwlwifi/mld/rx.c | 142 +- + drivers/net/wireless/intel/iwlwifi/mld/scan.c | 12 +- + drivers/net/wireless/intel/iwlwifi/mld/sta.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mld/tlc.c | 85 +- + drivers/net/wireless/intel/iwlwifi/mld/tx.c | 11 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 51 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 202 +- + drivers/net/wireless/intel/iwlwifi/mvm/link.c | 22 - + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 25 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 68 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c | 29 - + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 193 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 28 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 60 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 8 - + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 18 +- + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 4 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 39 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 51 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 4 - + drivers/net/wireless/intersil/p54/main.c | 4 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 2 + + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 13 +- + drivers/net/wireless/realtek/rtl8xxxu/core.c | 1 + + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c | 13 - + drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +- + drivers/net/wireless/realtek/rtw88/main.c | 54 +- + drivers/net/wireless/realtek/rtw88/main.h | 2 +- + drivers/net/wireless/realtek/rtw88/phy.c | 20 + + drivers/net/wireless/realtek/rtw88/phy.h | 2 + + drivers/net/wireless/realtek/rtw88/rtw8723cs.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8723ds.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8821cs.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8821cu.c | 2 + + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8822bs.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8822cs.c | 2 +- + drivers/net/wireless/realtek/rtw88/sdio.c | 3 +- + drivers/net/wireless/realtek/rtw88/sdio.h | 2 +- + drivers/net/wireless/realtek/rtw88/usb.c | 3 +- + drivers/net/wireless/realtek/rtw89/cam.c | 134 + + drivers/net/wireless/realtek/rtw89/cam.h | 129 + + drivers/net/wireless/realtek/rtw89/chan.c | 69 +- + drivers/net/wireless/realtek/rtw89/chan.h | 2 + + drivers/net/wireless/realtek/rtw89/core.c | 237 +- + drivers/net/wireless/realtek/rtw89/core.h | 198 +- + drivers/net/wireless/realtek/rtw89/debug.c | 162 +- + drivers/net/wireless/realtek/rtw89/debug.h | 1 + + drivers/net/wireless/realtek/rtw89/efuse.c | 4 - + drivers/net/wireless/realtek/rtw89/efuse.h | 6 + + drivers/net/wireless/realtek/rtw89/efuse_be.c | 26 + + drivers/net/wireless/realtek/rtw89/fw.c | 1163 ++- + drivers/net/wireless/realtek/rtw89/fw.h | 519 +- + drivers/net/wireless/realtek/rtw89/mac.c | 199 +- + drivers/net/wireless/realtek/rtw89/mac.h | 102 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 44 +- + drivers/net/wireless/realtek/rtw89/mac_be.c | 696 +- + drivers/net/wireless/realtek/rtw89/pci.c | 22 +- + drivers/net/wireless/realtek/rtw89/pci.h | 57 +- + drivers/net/wireless/realtek/rtw89/pci_be.c | 138 +- + drivers/net/wireless/realtek/rtw89/phy.c | 438 +- + drivers/net/wireless/realtek/rtw89/phy.h | 36 +- + drivers/net/wireless/realtek/rtw89/phy_be.c | 563 +- + drivers/net/wireless/realtek/rtw89/ps.c | 4 +- + drivers/net/wireless/realtek/rtw89/reg.h | 934 ++- + drivers/net/wireless/realtek/rtw89/regd.c | 21 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 10 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 10 +- + drivers/net/wireless/realtek/rtw89/rtw8852au.c | 4 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 32 +- + .../net/wireless/realtek/rtw89/rtw8852b_common.c | 2 - + drivers/net/wireless/realtek/rtw89/rtw8852bt.c | 8 + + drivers/net/wireless/realtek/rtw89/rtw8852bu.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 10 +- + drivers/net/wireless/realtek/rtw89/rtw8852cu.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 89 +- + drivers/net/wireless/realtek/rtw89/rtw8922a_rfk.c | 48 +- + drivers/net/wireless/realtek/rtw89/ser.c | 10 + + drivers/net/wireless/realtek/rtw89/txrx.h | 22 + + drivers/net/wireless/realtek/rtw89/usb.c | 2 +- + drivers/net/wireless/realtek/rtw89/wow.c | 14 +- + drivers/net/wireless/realtek/rtw89/wow.h | 1 + + drivers/net/wireless/rsi/rsi_91x_main.c | 29 - + drivers/net/wireless/rsi/rsi_91x_sdio.c | 5 +- + drivers/net/wireless/ti/wl1251/acx.c | 11 +- + drivers/net/wireless/ti/wlcore/cmd.h | 1 + + drivers/net/wireless/ti/wlcore/main.c | 9 + + drivers/net/wireless/ti/wlcore/sdio.c | 6 +- + drivers/net/wireless/virtual/mac80211_hwsim.c | 2 - + drivers/net/wwan/Kconfig | 1 + + drivers/net/wwan/mhi_wwan_ctrl.c | 1 + + drivers/net/wwan/mhi_wwan_mbim.c | 3 +- + drivers/net/wwan/wwan_core.c | 278 +- + drivers/net/wwan/wwan_hwsim.c | 201 +- + drivers/net/xen-netback/hash.c | 2 +- + drivers/net/xen-netfront.c | 24 +- + drivers/phy/Kconfig | 22 + + drivers/phy/Makefile | 2 + + drivers/phy/phy-common-props-test.c | 422 + + drivers/phy/phy-common-props.c | 209 + + drivers/ptp/Kconfig | 2 +- + drivers/ptp/ptp_vmclock.c | 236 +- + drivers/vhost/vsock.c | 44 +- + include/crypto/sha1.h | 10 - + include/dt-bindings/phy/phy.h | 4 + + include/linux/audit.h | 1 - + include/linux/bnxt/hsi.h | 167 +- + include/linux/can/core.h | 1 + + include/linux/can/skb.h | 38 +- + include/linux/clk.h | 23 + + include/linux/dpll.h | 5 + + include/linux/ethtool.h | 36 +- + include/linux/framer/framer.h | 5 +- + include/linux/hippidevice.h | 40 - + include/linux/ieee80211-eht.h | 13 +- + include/linux/ieee80211-s1g.h | 2 +- + include/linux/ieee80211-uhr.h | 220 + + include/linux/ieee80211.h | 40 +- + include/linux/inetdevice.h | 2 +- + include/linux/ipv6.h | 8 - + include/linux/mdio.h | 1 - + include/linux/mlx5/device.h | 5 + + include/linux/mlx5/mlx5_ifc.h | 7 +- + include/linux/mmc/sdio_func.h | 1 + + include/linux/mod_devicetable.h | 1 - + include/linux/netdevice.h | 6 +- + include/linux/netfilter/nf_conntrack_proto_gre.h | 3 - + include/linux/pci_ids.h | 3 - + include/linux/pcs/pcs-mtk-lynxi.h | 5 +- + include/linux/phy.h | 72 +- + include/linux/phy/phy-common-props.h | 32 + + include/linux/phy_port.h | 99 + + include/linux/phylink.h | 12 +- + include/linux/skbuff.h | 6 +- + include/linux/skbuff_ref.h | 10 +- + include/linux/stmmac.h | 20 +- + include/linux/tcp.h | 9 +- + include/linux/u64_stats_sync.h | 15 + + include/linux/udp.h | 2 +- + include/linux/usb/usbnet.h | 1 + + include/linux/virtio_vsock.h | 9 +- + include/linux/wwan.h | 2 + + include/net/af_vsock.h | 61 +- + include/net/ax25.h | 8 +- + include/net/bluetooth/bluetooth.h | 47 +- + include/net/bluetooth/hci.h | 336 +- + include/net/bluetooth/hci_core.h | 9 + + include/net/bluetooth/hci_sync.h | 3 + + include/net/bluetooth/l2cap.h | 3 +- + include/net/bonding.h | 2 + + include/net/can.h | 28 + + include/net/cfg80211.h | 117 +- + include/net/dst.h | 6 + + include/net/gro.h | 5 +- + include/net/inet_ecn.h | 20 +- + include/net/inet_sock.h | 24 +- + include/net/ip6_route.h | 6 + + include/net/ipv6.h | 66 +- + include/net/iucv/iucv.h | 207 +- + include/net/l3mdev.h | 7 +- + include/net/mac80211.h | 140 +- + include/net/mana/gdma.h | 7 +- + include/net/mana/mana.h | 3 +- + include/net/net_namespace.h | 4 + + include/net/netdev_queues.h | 73 +- + include/net/netdev_rx_queue.h | 2 + + include/net/netfilter/nf_conntrack.h | 1 + + include/net/netfilter/nf_conntrack_count.h | 1 + + include/net/netfilter/nf_conntrack_tuple.h | 2 +- + include/net/netfilter/nf_queue.h | 3 + + include/net/netfilter/nf_tables.h | 3 +- + include/net/netmem.h | 32 +- + include/net/netns/ipv6.h | 10 +- + include/net/netns/vsock.h | 21 + + include/net/page_pool/types.h | 1 + + include/net/phy/realtek_phy.h | 7 + + include/net/sch_priv.h | 27 + + include/net/sock.h | 11 +- + include/net/tcp.h | 95 +- + include/net/tcp_ecn.h | 103 +- + include/net/udp.h | 8 +- + include/net/udp_tunnel.h | 32 + + include/net/xsk_buff_pool.h | 5 - + include/trace/events/mptcp.h | 80 + + include/trace/events/tcp.h | 2 +- + include/uapi/linux/dpll.h | 1 + + include/uapi/linux/ethtool.h | 28 +- + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/netfilter_bridge.h | 9 +- + include/uapi/linux/netfilter_ipv4.h | 9 +- + include/uapi/linux/netfilter_ipv6.h | 7 +- + include/uapi/linux/nl80211.h | 107 +- + include/uapi/linux/pkt_sched.h | 1 + + include/uapi/linux/tcp.h | 26 +- + include/uapi/linux/typelimits.h | 8 + + include/uapi/linux/vmclock-abi.h | 20 + + lib/crypto/sha1.c | 63 +- + net/802/Makefile | 1 - + net/802/hippi.c | 193 - + net/ax25/Kconfig | 14 - + net/ax25/ax25_dev.c | 2 - + net/bluetooth/hci_conn.c | 162 +- + net/bluetooth/hci_core.c | 1 + + net/bluetooth/hci_event.c | 79 +- + net/bluetooth/hci_sync.c | 125 +- + net/bluetooth/iso.c | 10 +- + net/bluetooth/l2cap_core.c | 46 +- + net/bluetooth/l2cap_sock.c | 20 +- + net/bluetooth/mgmt_config.c | 21 + + net/bridge/br_multicast.c | 2 +- + net/bridge/br_stp_if.c | 8 +- + net/bridge/br_sysfs_br.c | 108 +- + net/bridge/br_sysfs_if.c | 32 +- + net/bridge/netfilter/nf_conntrack_bridge.c | 3 +- + net/can/Kconfig | 1 + + net/can/af_can.c | 23 +- + net/can/bcm.c | 26 +- + net/can/gw.c | 42 +- + net/can/isotp.c | 46 +- + net/can/j1939/socket.c | 16 +- + net/can/j1939/transport.c | 39 +- + net/can/raw.c | 23 +- + net/core/Makefile | 1 + + net/core/dev.c | 18 +- + net/core/dev.h | 5 + + net/core/dev_ioctl.c | 60 +- + net/core/devmem.c | 27 +- + net/core/devmem.h | 17 +- + net/core/gro.c | 2 +- + net/core/neighbour.c | 150 +- + net/core/netdev_config.c | 78 + + net/core/netdev_rx_queue.c | 53 +- + net/core/skbuff.c | 132 +- + net/core/sock.c | 16 +- + net/core/sysctl_net_core.c | 11 +- + net/devlink/core.c | 6 +- + net/devlink/dev.c | 7 +- + net/devlink/devl_internal.h | 6 +- + net/devlink/rate.c | 13 +- + net/dsa/tag_yt921x.c | 89 +- + net/ethtool/common.c | 301 +- + net/ipv4/Makefile | 2 +- + net/ipv4/cipso_ipv4.c | 3 +- + net/ipv4/fib_lookup.h | 6 +- + net/ipv4/fib_trie.c | 4 +- + net/ipv4/icmp.c | 106 +- + net/ipv4/igmp.c | 4 +- + net/ipv4/inet_connection_sock.c | 5 +- + net/ipv4/ip_output.c | 17 +- + net/ipv4/ip_sockglue.c | 2 +- + net/ipv4/ipconfig.c | 87 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/metrics.c | 2 +- + net/ipv4/netfilter/nf_reject_ipv4.c | 2 +- + net/ipv4/ping.c | 7 +- + net/ipv4/raw.c | 7 +- + net/ipv4/route.c | 8 +- + net/ipv4/sysctl_net_ipv4.c | 4 +- + net/ipv4/tcp.c | 84 +- + net/ipv4/tcp_cong.c | 5 +- + net/ipv4/tcp_input.c | 305 +- + net/ipv4/tcp_ipv4.c | 29 +- + net/ipv4/tcp_minisocks.c | 39 +- + net/ipv4/tcp_offload.c | 3 +- + net/ipv4/tcp_output.c | 117 +- + net/ipv4/tcp_rate.c | 209 - + net/ipv4/tcp_recovery.c | 75 - + net/ipv4/tcp_timer.c | 3 + + net/ipv4/udp.c | 32 +- + net/ipv4/udp_offload.c | 6 +- + net/ipv6/Makefile | 2 +- + net/ipv6/addrconf.c | 23 +- + net/ipv6/af_inet6.c | 4 +- + net/ipv6/exthdrs.c | 79 +- + net/ipv6/icmp.c | 3 +- + net/ipv6/inet6_connection_sock.c | 10 +- + net/ipv6/ip6_fib.c | 12 +- + net/ipv6/ip6_gre.c | 2 +- + net/ipv6/ip6_offload.c | 43 +- + net/ipv6/ip6_output.c | 108 +- + net/ipv6/ip6_tunnel.c | 33 +- + net/ipv6/ipv6_sockglue.c | 4 +- + net/ipv6/raw.c | 2 +- + net/ipv6/route.c | 41 +- + net/ipv6/sit.c | 2 +- + net/ipv6/tcp_ipv6.c | 14 +- + net/ipv6/tcpv6_offload.c | 12 +- + net/ipv6/udp.c | 5 +- + net/ipv6/udp_offload.c | 3 +- + net/iucv/iucv.c | 227 +- + net/mac80211/Makefile | 2 +- + net/mac80211/cfg.c | 60 +- + net/mac80211/driver-ops.h | 21 + + net/mac80211/drop.h | 46 +- + net/mac80211/eht.c | 175 + + net/mac80211/ieee80211_i.h | 36 +- + net/mac80211/iface.c | 18 +- + net/mac80211/link.c | 4 +- + net/mac80211/main.c | 15 +- + net/mac80211/mlme.c | 164 +- + net/mac80211/parse.c | 25 +- + net/mac80211/rx.c | 148 +- + net/mac80211/sta_info.c | 35 +- + net/mac80211/sta_info.h | 84 +- + net/mac80211/trace.h | 32 + + net/mac80211/tx.c | 4 +- + net/mac80211/uhr.c | 30 + + net/mac80211/util.c | 126 +- + net/mac80211/wpa.c | 6 +- + net/mptcp/protocol.c | 274 +- + net/mptcp/protocol.h | 10 +- + net/mptcp/subflow.c | 2 - + net/netfilter/nf_conncount.c | 30 +- + net/netfilter/nf_conntrack_bpf.c | 1 + + net/netfilter/nf_conntrack_h323_main.c | 1 + + net/netfilter/nf_conntrack_netlink.c | 1 + + net/netfilter/nf_conntrack_proto_generic.c | 1 + + net/netfilter/nf_conntrack_proto_gre.c | 2 + + net/netfilter/nf_conntrack_proto_icmp.c | 1 + + net/netfilter/nf_conntrack_proto_icmpv6.c | 1 + + net/netfilter/nf_flow_table_ip.c | 245 +- + net/netfilter/nf_flow_table_offload.c | 1 + + net/netfilter/nf_flow_table_path.c | 1 + + net/netfilter/nf_nat_ovs.c | 3 + + net/netfilter/nf_nat_proto.c | 1 + + net/netfilter/nf_synproxy_core.c | 1 + + net/netfilter/nf_tables_api.c | 11 +- + net/netfilter/nfnetlink_queue.c | 221 +- + net/netfilter/nft_compat.c | 13 +- + net/netfilter/nft_flow_offload.c | 1 + + net/netfilter/nft_set_pipapo.c | 2 + + net/netfilter/nft_set_rbtree.c | 423 +- + net/netfilter/nft_synproxy.c | 1 + + net/netfilter/xt_tcpmss.c | 2 +- + net/netfilter/xt_time.c | 8 +- + net/rds/cong.c | 2 +- + net/rds/connection.c | 38 +- + net/rds/ib_recv.c | 2 +- + net/rds/ib_send.c | 44 +- + net/rds/message.c | 66 +- + net/rds/rds.h | 170 +- + net/rds/recv.c | 39 +- + net/rds/send.c | 139 +- + net/rds/stats.c | 1 + + net/rds/tcp.c | 28 +- + net/rds/tcp.h | 27 +- + net/rds/tcp_connect.c | 79 +- + net/rds/tcp_listen.c | 212 +- + net/rds/tcp_recv.c | 6 +- + net/rds/tcp_send.c | 4 +- + net/rds/threads.c | 16 +- + net/sched/act_ct.c | 2 + + net/sched/act_ctinfo.c | 1 + + net/sched/sch_cake.c | 493 +- + net/sched/sch_fq.c | 4 +- + net/sched/sch_mq.c | 71 +- + net/smc/af_smc.c | 91 +- + net/vmw_vsock/af_vsock.c | 335 +- + net/vmw_vsock/hyperv_transport.c | 7 +- + net/vmw_vsock/virtio_transport.c | 22 +- + net/vmw_vsock/virtio_transport_common.c | 62 +- + net/vmw_vsock/vmci_transport.c | 28 +- + net/vmw_vsock/vsock_loopback.c | 22 +- + net/wireless/core.c | 38 +- + net/wireless/core.h | 4 +- + net/wireless/nl80211.c | 172 +- + net/wireless/pmsr.c | 27 +- + net/wireless/reg.c | 17 +- + net/wireless/scan.c | 2 +- + net/wireless/sysfs.c | 2 +- + net/wireless/trace.h | 13 +- + net/wireless/util.c | 106 +- + net/xdp/xsk.c | 15 +- + net/xdp/xsk_buff_pool.c | 6 +- + net/xdp/xsk_queue.h | 5 + + rust/kernel/net/phy.rs | 6 +- + rust/kernel/pci/id.rs | 1 - + tools/net/ynl/pyynl/cli.py | 281 +- + tools/net/ynl/pyynl/ethtool.py | 47 +- + tools/net/ynl/pyynl/lib/__init__.py | 10 +- + tools/net/ynl/pyynl/lib/doc_generator.py | 3 +- + tools/net/ynl/pyynl/lib/nlspec.py | 77 +- + tools/net/ynl/pyynl/lib/ynl.py | 208 +- + tools/net/ynl/pyynl/ynl_gen_c.py | 178 +- + tools/net/ynl/pyynl/ynl_gen_rst.py | 2 + + tools/net/ynl/ynltool/Makefile | 2 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/drivers/net/Makefile | 6 - + tools/testing/selftests/drivers/net/gro.c | 539 +- + tools/testing/selftests/drivers/net/gro.py | 164 +- + tools/testing/selftests/drivers/net/hw/Makefile | 1 + + tools/testing/selftests/drivers/net/hw/iou-zcrx.c | 72 +- + tools/testing/selftests/drivers/net/hw/iou-zcrx.py | 191 +- + tools/testing/selftests/drivers/net/hw/ncdevmem.c | 1 + + .../selftests/drivers/net/hw/nic_timestamp.py | 128 +- + tools/testing/selftests/drivers/net/hw/rss_drv.py | 88 + + .../selftests/drivers/net/hw/rss_flow_label.py | 11 +- + .../selftests/drivers/net/hw/rss_input_xfrm.py | 44 +- + tools/testing/selftests/drivers/net/hw/toeplitz.c | 2 +- + tools/testing/selftests/drivers/net/lib/py/env.py | 8 +- + .../selftests/drivers/net/lib/sh/lib_netcons.sh | 35 +- + .../selftests/drivers/net/netconsole/Makefile | 19 + + .../selftests/drivers/net/netconsole/config | 6 + + .../drivers/net/{ => netconsole}/netcons_basic.sh | 2 +- + .../net/{ => netconsole}/netcons_cmdline.sh | 2 +- + .../net/{ => netconsole}/netcons_fragmented_msg.sh | 2 +- + .../net/{ => netconsole}/netcons_overflow.sh | 2 +- + .../drivers/net/netconsole/netcons_resume.sh | 124 + + .../net/{ => netconsole}/netcons_sysdata.sh | 2 +- + .../net/{ => netconsole}/netcons_torture.sh | 2 +- + tools/testing/selftests/drivers/net/psp.py | 6 +- + .../testing/selftests/drivers/net/psp_responder.c | 50 +- + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 18 +- + tools/testing/selftests/net/config | 1 + + tools/testing/selftests/net/double_udp_encap.sh | 393 + + tools/testing/selftests/net/fib-onlink-tests.sh | 28 +- + .../selftests/net/forwarding/local_termination.sh | 18 +- + tools/testing/selftests/net/icmp_rfc4884.c | 679 ++ + tools/testing/selftests/net/ioam6.sh | 2 +- + tools/testing/selftests/net/ipsec.c | 11 +- + tools/testing/selftests/net/lib/csum.c | 2 +- + tools/testing/selftests/net/lib/py/ksft.py | 44 +- + tools/testing/selftests/net/lib/py/utils.py | 32 +- + tools/testing/selftests/net/mptcp/Makefile | 1 + + tools/testing/selftests/net/mptcp/mptcp_connect.c | 96 +- + .../selftests/net/mptcp/mptcp_connect_splice.sh | 5 + + tools/testing/selftests/net/mptcp/mptcp_diag.c | 29 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 107 +- + .../selftests/net/netfilter/nft_flowtable.sh | 62 +- + .../packetdrill/tcp_accecn_2nd_data_as_first.pkt | 24 + + .../tcp_accecn_2nd_data_as_first_connect.pkt | 30 + + .../tcp_accecn_3rd_ack_after_synack_rxmt.pkt | 19 + + .../tcp_accecn_3rd_ack_ce_updates_received_ce.pkt | 18 + + .../tcp_accecn_3rd_ack_lost_data_ce.pkt | 22 + + .../net/packetdrill/tcp_accecn_3rd_dups.pkt | 26 + + .../packetdrill/tcp_accecn_acc_ecn_disabled.pkt | 13 + + .../tcp_accecn_accecn_then_notecn_syn.pkt | 28 + + .../packetdrill/tcp_accecn_accecn_to_rfc3168.pkt | 18 + + .../tcp_accecn_client_accecn_options_drop.pkt | 34 + + .../tcp_accecn_client_accecn_options_lost.pkt | 38 + + .../packetdrill/tcp_accecn_clientside_disabled.pkt | 12 + + ...cp_accecn_close_local_close_then_remote_fin.pkt | 25 + + .../tcp_accecn_delivered_2ndlargeack.pkt | 25 + + .../tcp_accecn_delivered_falseoverflow_detect.pkt | 31 + + .../packetdrill/tcp_accecn_delivered_largeack.pkt | 24 + + .../packetdrill/tcp_accecn_delivered_largeack2.pkt | 25 + + .../packetdrill/tcp_accecn_delivered_maxack.pkt | 25 + + .../packetdrill/tcp_accecn_delivered_updates.pkt | 70 + + .../selftests/net/packetdrill/tcp_accecn_ecn3.pkt | 12 + + .../tcp_accecn_ecn_field_updates_opt.pkt | 35 + + .../net/packetdrill/tcp_accecn_ipflags_drop.pkt | 14 + + .../net/packetdrill/tcp_accecn_listen_opt_drop.pkt | 16 + + .../tcp_accecn_multiple_syn_ack_drop.pkt | 28 + + .../packetdrill/tcp_accecn_multiple_syn_drop.pkt | 18 + + .../packetdrill/tcp_accecn_negotiation_bleach.pkt | 23 + + .../packetdrill/tcp_accecn_negotiation_connect.pkt | 23 + + .../packetdrill/tcp_accecn_negotiation_listen.pkt | 26 + + .../tcp_accecn_negotiation_noopt_connect.pkt | 23 + + .../tcp_accecn_negotiation_optenable.pkt | 23 + + .../packetdrill/tcp_accecn_no_ecn_after_accecn.pkt | 20 + + .../selftests/net/packetdrill/tcp_accecn_noopt.pkt | 27 + + .../net/packetdrill/tcp_accecn_noprogress.pkt | 27 + + .../tcp_accecn_notecn_then_accecn_syn.pkt | 28 + + .../packetdrill/tcp_accecn_rfc3168_to_fallback.pkt | 18 + + .../packetdrill/tcp_accecn_rfc3168_to_rfc3168.pkt | 18 + + .../net/packetdrill/tcp_accecn_sack_space_grab.pkt | 28 + + .../tcp_accecn_sack_space_grab_with_ts.pkt | 39 + + .../tcp_accecn_serverside_accecn_disabled1.pkt | 20 + + .../tcp_accecn_serverside_accecn_disabled2.pkt | 20 + + .../packetdrill/tcp_accecn_serverside_broken.pkt | 19 + + .../tcp_accecn_serverside_ecn_disabled.pkt | 19 + + .../net/packetdrill/tcp_accecn_serverside_only.pkt | 18 + + ...accecn_syn_ace_flags_acked_after_retransmit.pkt | 18 + + .../packetdrill/tcp_accecn_syn_ace_flags_drop.pkt | 16 + + ...cn_syn_ack_ace_flags_acked_after_retransmit.pkt | 27 + + .../tcp_accecn_syn_ack_ace_flags_drop.pkt | 26 + + .../net/packetdrill/tcp_accecn_syn_ce.pkt | 13 + + .../net/packetdrill/tcp_accecn_syn_ect0.pkt | 13 + + .../net/packetdrill/tcp_accecn_syn_ect1.pkt | 13 + + .../net/packetdrill/tcp_accecn_synack_ce.pkt | 27 + + .../tcp_accecn_synack_ce_updates_delivered_ce.pkt | 22 + + .../net/packetdrill/tcp_accecn_synack_ect0.pkt | 24 + + .../net/packetdrill/tcp_accecn_synack_ect1.pkt | 24 + + .../net/packetdrill/tcp_accecn_synack_rexmit.pkt | 15 + + .../net/packetdrill/tcp_accecn_synack_rxmt.pkt | 25 + + .../net/packetdrill/tcp_accecn_tsnoprogress.pkt | 26 + + .../net/packetdrill/tcp_accecn_tsprogress.pkt | 25 + + .../selftests/net/packetdrill/tcp_basic_client.pkt | 24 + + .../selftests/net/packetdrill/tcp_basic_server.pkt | 35 + + .../tcp_timestamping_tcp_tx_timestamp_bug.pkt | 70 + + tools/testing/selftests/net/tfo.c | 13 +- + tools/testing/selftests/net/tfo_passive.sh | 13 +- + tools/testing/selftests/net/tls.c | 16 +- + tools/testing/selftests/net/tun.c | 898 +- + tools/testing/selftests/net/tuntap_helpers.h | 390 + + tools/testing/selftests/net/txtimestamp.c | 10 +- + tools/testing/selftests/ptp/phc.sh | 60 +- + .../tc-testing/tc-tests/qdiscs/cake_mq.json | 559 ++ + tools/testing/selftests/vsock/settings | 2 +- + tools/testing/selftests/vsock/vmtest.sh | 1057 ++- + 1114 files changed, 67445 insertions(+), 46022 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/qcom,bluetooth-common.yaml + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/qcom,qca2066-bt.yaml + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/qcom,qca6390-bt.yaml + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/qcom,qca9377-bt.yaml + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/qcom,wcn3950-bt.yaml + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/qcom,wcn3990-bt.yaml + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/qcom,wcn6750-bt.yaml + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/qcom,wcn6855-bt.yaml + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/qcom,wcn7850-bt.yaml + delete mode 100644 Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml + create mode 100644 Documentation/devicetree/bindings/net/ethernet-connector.yaml + create mode 100644 Documentation/devicetree/bindings/net/micrel,gigabit.yaml + delete mode 100644 Documentation/devicetree/bindings/net/micrel-ksz90x1.txt + delete mode 100644 Documentation/devicetree/bindings/net/micrel.txt + create mode 100644 Documentation/devicetree/bindings/net/micrel.yaml + create mode 100644 Documentation/devicetree/bindings/phy/phy-common-props.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/transmit-amplitude.yaml + create mode 100644 Documentation/devicetree/bindings/ptp/amazon,vmclock.yaml + delete mode 100644 Documentation/networking/device_drivers/ethernet/neterion/s2io.rst + create mode 100644 Documentation/networking/phy-port.rst + create mode 100644 drivers/net/ethernet/broadcom/bnge/bnge_hw_def.h + create mode 100644 drivers/net/ethernet/broadcom/bnge/bnge_txrx.c + create mode 100644 drivers/net/ethernet/broadcom/bnge/bnge_txrx.h + delete mode 100644 drivers/net/ethernet/dnet.c + delete mode 100644 drivers/net/ethernet/dnet.h + create mode 100644 drivers/net/ethernet/huawei/hinic3/hinic3_filter.c + delete mode 100644 drivers/net/ethernet/neterion/Kconfig + delete mode 100644 drivers/net/ethernet/neterion/Makefile + delete mode 100644 drivers/net/ethernet/neterion/s2io-regs.h + delete mode 100644 drivers/net/ethernet/neterion/s2io.c + delete mode 100644 drivers/net/ethernet/neterion/s2io.h + delete mode 100644 drivers/net/ethernet/realtek/atp.c + delete mode 100644 drivers/net/ethernet/realtek/atp.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-motorcomm.c + create mode 100644 drivers/net/ethernet/ti/icssm/icssm_prueth_fdb_tbl.h + create mode 100644 drivers/net/ethernet/ti/icssm/icssm_prueth_switch.c + create mode 100644 drivers/net/ethernet/ti/icssm/icssm_prueth_switch.h + create mode 100644 drivers/net/ethernet/ti/icssm/icssm_switchdev.c + create mode 100644 drivers/net/ethernet/ti/icssm/icssm_switchdev.h + create mode 100644 drivers/net/ethernet/ti/icssm/icssm_vlan_mcast_filter_mmap.h + delete mode 100644 drivers/net/hippi/Kconfig + delete mode 100644 drivers/net/hippi/Makefile + delete mode 100644 drivers/net/hippi/rrunner.c + delete mode 100644 drivers/net/hippi/rrunner.h + create mode 100644 drivers/net/phy/phy_port.c + create mode 100644 drivers/net/wireless/ath/ath11k/cfr.c + create mode 100644 drivers/net/wireless/ath/ath11k/cfr.h + create mode 100644 drivers/net/wireless/ath/ath12k/cmn_defs.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp_cmn.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp_htt.c + create mode 100644 drivers/net/wireless/ath/ath12k/dp_htt.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp_peer.c + create mode 100644 drivers/net/wireless/ath/ath12k/dp_peer.h + delete mode 100644 drivers/net/wireless/ath/ath12k/hw.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/Makefile + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/ahb.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/ahb.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/ce.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/ce.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/core.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/core.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_mon.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_rx.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_tx.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/dp_tx.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal.h + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_desc.h (91%) + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_qcc2072.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_qcc2072.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_qcn9274.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_qcn9274.h + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_rx.c (80%) + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_rx.h (75%) + rename drivers/net/wireless/ath/ath12k/{rx_desc.h => wifi7/hal_rx_desc.h} (97%) + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_tx.c (87%) + rename drivers/net/wireless/ath/ath12k/{ => wifi7}/hal_tx.h (88%) + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_wcn7850.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hal_wcn7850.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hw.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/hw.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/mhi.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/mhi.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/pci.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/pci.h + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/wmi.c + create mode 100644 drivers/net/wireless/ath/ath12k/wifi7/wmi.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/nan.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/nan.h + create mode 100644 drivers/phy/phy-common-props-test.c + create mode 100644 drivers/phy/phy-common-props.c + delete mode 100644 include/linux/hippidevice.h + create mode 100644 include/linux/ieee80211-uhr.h + create mode 100644 include/linux/phy/phy-common-props.h + create mode 100644 include/linux/phy_port.h + create mode 100644 include/net/can.h + create mode 100644 include/net/netns/vsock.h + create mode 100644 include/net/phy/realtek_phy.h + create mode 100644 include/net/sch_priv.h + create mode 100644 include/uapi/linux/typelimits.h + delete mode 100644 net/802/hippi.c + create mode 100644 net/core/netdev_config.c + delete mode 100644 net/ipv4/tcp_rate.c + create mode 100644 net/mac80211/uhr.c + create mode 100755 tools/testing/selftests/drivers/net/hw/rss_drv.py + create mode 100644 tools/testing/selftests/drivers/net/netconsole/Makefile + create mode 100644 tools/testing/selftests/drivers/net/netconsole/config + rename tools/testing/selftests/drivers/net/{ => netconsole}/netcons_basic.sh (98%) + rename tools/testing/selftests/drivers/net/{ => netconsole}/netcons_cmdline.sh (97%) + rename tools/testing/selftests/drivers/net/{ => netconsole}/netcons_fragmented_msg.sh (98%) + rename tools/testing/selftests/drivers/net/{ => netconsole}/netcons_overflow.sh (97%) + create mode 100755 tools/testing/selftests/drivers/net/netconsole/netcons_resume.sh + rename tools/testing/selftests/drivers/net/{ => netconsole}/netcons_sysdata.sh (99%) + rename tools/testing/selftests/drivers/net/{ => netconsole}/netcons_torture.sh (98%) + create mode 100755 tools/testing/selftests/net/double_udp_encap.sh + create mode 100644 tools/testing/selftests/net/icmp_rfc4884.c + create mode 100755 tools/testing/selftests/net/mptcp/mptcp_connect_splice.sh + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_2nd_data_as_first.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_2nd_data_as_first_connect.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_3rd_ack_after_synack_rxmt.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_3rd_ack_ce_updates_received_ce.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_3rd_ack_lost_data_ce.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_3rd_dups.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_acc_ecn_disabled.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_accecn_then_notecn_syn.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_accecn_to_rfc3168.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_client_accecn_options_drop.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_client_accecn_options_lost.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_clientside_disabled.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_close_local_close_then_remote_fin.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_delivered_2ndlargeack.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_delivered_falseoverflow_detect.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_delivered_largeack.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_delivered_largeack2.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_delivered_maxack.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_delivered_updates.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_ecn3.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_ecn_field_updates_opt.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_ipflags_drop.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_listen_opt_drop.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_multiple_syn_ack_drop.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_multiple_syn_drop.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_negotiation_bleach.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_negotiation_connect.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_negotiation_listen.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_negotiation_noopt_connect.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_negotiation_optenable.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_no_ecn_after_accecn.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_noopt.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_noprogress.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_notecn_then_accecn_syn.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_rfc3168_to_fallback.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_rfc3168_to_rfc3168.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_sack_space_grab.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_sack_space_grab_with_ts.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_serverside_accecn_disabled1.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_serverside_accecn_disabled2.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_serverside_broken.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_serverside_ecn_disabled.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_serverside_only.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_syn_ace_flags_acked_after_retransmit.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_syn_ace_flags_drop.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_syn_ack_ace_flags_acked_after_retransmit.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_syn_ack_ace_flags_drop.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_syn_ce.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_syn_ect0.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_syn_ect1.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_synack_ce.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_synack_ce_updates_delivered_ce.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_synack_ect0.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_synack_ect1.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_synack_rexmit.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_synack_rxmt.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_tsnoprogress.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_accecn_tsprogress.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_basic_client.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_basic_server.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_timestamping_tcp_tx_timestamp_bug.pkt + create mode 100644 tools/testing/selftests/net/tuntap_helpers.h + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/qdiscs/cake_mq.json +$ git am -3 ../patches/0001-fix-up-for-wifi-ath12k-Move-ieee80211_ops-callback-t.patch +Applying: fix up for "wifi: ath12k: Move ieee80211_ops callback to the arch specific module" +Using index info to reconstruct a base tree... +M drivers/net/wireless/ath/ath12k/wifi7/hw.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/net/wireless/ath/ath12k/wifi7/hw.c +No changes -- Patch already applied. +Merging bpf-next/for-next (75cd3beb64d09 Merge branch 'fix-for-bpf_wq-retry-loop-during-free') +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging Documentation/process/changes.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging arch/x86/Kconfig +Auto-merging include/asm-generic/rqspinlock.h +Auto-merging include/linux/filter.h +Auto-merging include/linux/ftrace.h +Auto-merging include/linux/memcontrol.h +Auto-merging init/Kconfig +Auto-merging kernel/bpf/core.c +Auto-merging kernel/bpf/rqspinlock.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/sched/ext.c +Auto-merging kernel/trace/ftrace.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/Makefile +Auto-merging mm/memcontrol-v1.h +Auto-merging mm/memcontrol.c +Auto-merging net/core/filter.c +Auto-merging net/netfilter/nf_conntrack_bpf.c +Auto-merging scripts/Makefile.vmlinux +Auto-merging scripts/link-vmlinux.sh +Merge made by the 'ort' strategy. + Documentation/bpf/bpf_prog_run.rst | 3 +- + Documentation/bpf/kfuncs.rst | 454 +++--- + Documentation/process/changes.rst | 4 +- + Documentation/scheduler/sched-ext.rst | 1 - + MAINTAINERS | 11 + + Makefile | 15 +- + arch/arm64/net/bpf_jit_comp.c | 75 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/ftrace.h | 2 +- + arch/x86/kernel/ftrace_64.S | 5 +- + arch/x86/net/bpf_jit_comp.c | 88 +- + drivers/hid/bpf/hid_bpf_dispatch.c | 5 +- + drivers/hid/bpf/progs/hid_bpf_helpers.h | 8 +- + fs/bpf_fs_kfuncs.c | 23 +- + fs/verity/measure.c | 2 +- + include/asm-generic/rqspinlock.h | 2 +- + include/linux/bpf-cgroup.h | 4 +- + include/linux/bpf.h | 178 ++- + include/linux/bpf_mprog.h | 10 + + include/linux/bpf_verifier.h | 14 +- + include/linux/btf.h | 9 +- + include/linux/filter.h | 1 + + include/linux/ftrace.h | 31 +- + include/linux/ftrace_regs.h | 25 + + include/linux/memcontrol.h | 19 + + include/linux/skmsg.h | 70 +- + include/linux/tnum.h | 5 + + include/uapi/linux/bpf.h | 28 + + init/Kconfig | 2 +- + kernel/bpf/Makefile | 12 +- + kernel/bpf/arena.c | 407 +++++- + kernel/bpf/arraymap.c | 31 +- + kernel/bpf/bpf_insn_array.c | 4 +- + kernel/bpf/bpf_iter.c | 2 +- + kernel/bpf/bpf_lsm.c | 5 +- + kernel/bpf/bpf_lsm_proto.c | 19 + + kernel/bpf/bpf_struct_ops.c | 88 ++ + kernel/bpf/btf.c | 230 ++- + kernel/bpf/cgroup.c | 6 +- + kernel/bpf/cgroup_iter.c | 26 +- + kernel/bpf/core.c | 15 +- + kernel/bpf/cpumap.c | 21 +- + kernel/bpf/cpumask.c | 2 +- + kernel/bpf/crypto.c | 10 +- + kernel/bpf/hashtab.c | 105 +- + kernel/bpf/helpers.c | 696 +++++---- + kernel/bpf/inode.c | 42 +- + kernel/bpf/local_storage.c | 27 +- + kernel/bpf/map_iter.c | 2 +- + kernel/bpf/offload.c | 12 +- + kernel/bpf/range_tree.c | 5 +- + kernel/bpf/ringbuf.c | 1 + + kernel/bpf/rqspinlock.c | 7 +- + kernel/bpf/stream.c | 24 +- + kernel/bpf/syscall.c | 161 ++- + kernel/bpf/tnum.c | 16 + + kernel/bpf/token.c | 1 + + kernel/bpf/trampoline.c | 320 ++++- + kernel/bpf/verifier.c | 1475 +++++++++++++++----- + kernel/sched/ext.c | 8 +- + kernel/trace/Kconfig | 3 + + kernel/trace/bpf_trace.c | 84 +- + kernel/trace/ftrace.c | 407 +++++- + lib/Kconfig.debug | 13 +- + mm/Makefile | 3 + + mm/bpf_memcontrol.c | 193 +++ + mm/memcontrol-v1.h | 1 - + mm/memcontrol.c | 16 + + net/bpf/test_run.c | 1 + + net/core/bpf_sk_storage.c | 1 + + net/core/filter.c | 34 +- + net/core/skmsg.c | 30 +- + net/core/xdp.c | 2 +- + net/ipv4/tcp_bpf.c | 25 +- + net/ipv4/udp_bpf.c | 23 +- + net/netfilter/nf_conntrack_bpf.c | 22 +- + net/netfilter/nf_flow_table_bpf.c | 2 +- + net/netfilter/nf_nat_bpf.c | 2 +- + net/sched/bpf_qdisc.c | 20 +- + net/xfrm/xfrm_state_bpf.c | 2 +- + scripts/Makefile.btf | 21 +- + scripts/Makefile.modfinal | 5 +- + scripts/Makefile.vmlinux | 2 +- + scripts/gen-btf.sh | 147 ++ + scripts/link-vmlinux.sh | 43 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 30 +- + tools/bpf/bpftool/Makefile | 4 +- + tools/bpf/bpftool/bash-completion/bpftool | 9 +- + tools/bpf/bpftool/common.c | 1 + + tools/bpf/bpftool/gen.c | 8 +- + tools/bpf/bpftool/net.c | 31 +- + tools/bpf/resolve_btfids/Makefile | 3 +- + tools/bpf/resolve_btfids/main.c | 954 +++++++++++-- + tools/include/uapi/linux/bpf.h | 28 + + tools/lib/bpf/bpf.c | 20 + + tools/lib/bpf/bpf.h | 29 + + tools/lib/bpf/bpf_helpers.h | 6 +- + tools/lib/bpf/btf.c | 317 ++++- + tools/lib/bpf/btf.h | 42 + + tools/lib/bpf/btf_dump.c | 9 + + tools/lib/bpf/libbpf.c | 95 +- + tools/lib/bpf/libbpf.h | 37 +- + tools/lib/bpf/libbpf.map | 3 + + tools/sched_ext/README.md | 1 - + tools/testing/selftests/bpf/.gitignore | 4 +- + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + tools/testing/selftests/bpf/Makefile | 26 +- + tools/testing/selftests/bpf/bench.c | 4 + + tools/testing/selftests/bpf/bench.h | 1 + + tools/testing/selftests/bpf/benchs/bench_trigger.c | 1 + + .../selftests/bpf/benchs/run_bench_ringbufs.sh | 5 + + tools/testing/selftests/bpf/bpf_experimental.h | 85 +- + tools/testing/selftests/bpf/bpf_kfuncs.h | 3 - + tools/testing/selftests/bpf/bpftool_helpers.c | 74 + + tools/testing/selftests/bpf/bpftool_helpers.h | 11 + + tools/testing/selftests/bpf/cgroup_iter_memcg.h | 18 + + .../testing/selftests/bpf/prog_tests/arena_list.c | 20 +- + tools/testing/selftests/bpf/prog_tests/bpf_gotox.c | 208 +++ + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 5 +- + .../selftests/bpf/prog_tests/bpftool_maps_access.c | 371 +++++ + .../selftests/bpf/prog_tests/bpftool_metadata.c | 144 ++ + .../testing/selftests/bpf/prog_tests/btf_permute.c | 244 ++++ + .../testing/selftests/bpf/prog_tests/cgroup_iter.c | 12 + + .../selftests/bpf/prog_tests/cgroup_iter_memcg.c | 223 +++ + .../testing/selftests/bpf/prog_tests/dmabuf_iter.c | 2 +- + tools/testing/selftests/bpf/prog_tests/exe_ctx.c | 59 + + .../selftests/bpf/prog_tests/fsession_test.c | 140 ++ + .../selftests/bpf/prog_tests/get_func_args_test.c | 4 + + .../selftests/bpf/prog_tests/get_func_ip_test.c | 2 + + tools/testing/selftests/bpf/prog_tests/iters.c | 8 +- + .../selftests/bpf/prog_tests/kfunc_implicit_args.c | 10 + + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 44 + + tools/testing/selftests/bpf/prog_tests/map_kptr.c | 23 + + .../selftests/bpf/prog_tests/percpu_alloc.c | 335 +++++ + .../selftests/bpf/prog_tests/resolve_btfids.c | 4 +- + .../selftests/bpf/prog_tests/sk_bypass_prot_mem.c | 7 +- + .../selftests/bpf/prog_tests/sockmap_basic.c | 294 +++- + .../selftests/bpf/prog_tests/stacktrace_ips.c | 120 +- + .../selftests/bpf/prog_tests/string_kfuncs.c | 1 + + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 74 + + .../selftests/bpf/prog_tests/task_local_data.h | 4 +- + .../bpf/prog_tests/test_struct_ops_assoc.c | 191 +++ + .../bpf/prog_tests/test_task_local_data.c | 2 +- + tools/testing/selftests/bpf/prog_tests/timer.c | 250 +++- + .../bpf/prog_tests/timer_start_deadlock.c | 33 + + .../bpf/prog_tests/timer_start_delete_race.c | 137 ++ + .../selftests/bpf/prog_tests/tracing_failure.c | 2 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 10 + + tools/testing/selftests/bpf/prog_tests/wq.c | 5 +- + .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 19 +- + .../selftests/bpf/prog_tests/xdp_pull_data.c | 16 +- + tools/testing/selftests/bpf/progs/arena_list.c | 11 + + .../bpf/progs/cgroup_hierarchical_stats.c | 6 +- + .../selftests/bpf/progs/cgroup_iter_memcg.c | 39 + + .../selftests/bpf/progs/compute_live_registers.c | 41 + + .../testing/selftests/bpf/progs/cpumask_failure.c | 2 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 2 +- + tools/testing/selftests/bpf/progs/file_reader.c | 2 +- + tools/testing/selftests/bpf/progs/free_timer.c | 10 + + tools/testing/selftests/bpf/progs/fsession_test.c | 179 +++ + .../selftests/bpf/progs/get_func_args_test.c | 84 +- + .../testing/selftests/bpf/progs/get_func_ip_test.c | 23 + + tools/testing/selftests/bpf/progs/iters.c | 140 ++ + tools/testing/selftests/bpf/progs/iters_css.c | 9 +- + .../selftests/bpf/progs/kfunc_implicit_args.c | 41 + + .../selftests/bpf/progs/kprobe_multi_override.c | 15 + + .../bpf/progs/kprobe_multi_session_cookie.c | 15 +- + tools/testing/selftests/bpf/progs/map_kptr.c | 18 + + tools/testing/selftests/bpf/progs/map_kptr_fail.c | 4 +- + .../selftests/bpf/progs/percpu_alloc_array.c | 32 + + tools/testing/selftests/bpf/progs/rbtree_fail.c | 2 +- + tools/testing/selftests/bpf/progs/rcu_read_lock.c | 10 + + tools/testing/selftests/bpf/progs/stacktrace_ips.c | 27 + + tools/testing/selftests/bpf/progs/stream.c | 53 + + tools/testing/selftests/bpf/progs/stream_fail.c | 6 +- + .../selftests/bpf/progs/string_kfuncs_failure1.c | 6 + + .../selftests/bpf/progs/string_kfuncs_failure2.c | 1 + + .../selftests/bpf/progs/string_kfuncs_success.c | 7 + + .../testing/selftests/bpf/progs/struct_ops_assoc.c | 105 ++ + .../bpf/progs/struct_ops_assoc_in_timer.c | 77 + + .../selftests/bpf/progs/struct_ops_assoc_reuse.c | 75 + + .../struct_ops_kptr_return_fail__wrong_type.c | 2 +- + .../selftests/bpf/progs/tailcall_sleepable.c | 43 + + .../selftests/bpf/progs/task_local_data.bpf.h | 2 +- + tools/testing/selftests/bpf/progs/task_work.c | 7 +- + tools/testing/selftests/bpf/progs/task_work_fail.c | 8 +- + .../testing/selftests/bpf/progs/task_work_stress.c | 4 +- + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 7 - + .../testing/selftests/bpf/progs/test_bpf_nf_fail.c | 57 + + .../selftests/bpf/progs/test_btf_decl_tag.c | 2 +- + tools/testing/selftests/bpf/progs/test_ctx.c | 48 + + .../selftests/bpf/progs/test_kfunc_dynptr_param.c | 5 +- + .../bpf/progs/test_kfunc_param_nullable.c | 2 +- + .../selftests/bpf/progs/test_sockmap_pass_prog.c | 14 + + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 21 +- + tools/testing/selftests/bpf/progs/timer.c | 118 +- + .../selftests/bpf/progs/timer_start_deadlock.c | 70 + + .../selftests/bpf/progs/timer_start_delete_race.c | 66 + + tools/testing/selftests/bpf/progs/trigger_bench.c | 46 +- + .../selftests/bpf/progs/uprobe_multi_session.c | 7 +- + .../bpf/progs/uprobe_multi_session_cookie.c | 15 +- + .../bpf/progs/uprobe_multi_session_recursive.c | 11 +- + tools/testing/selftests/bpf/progs/verifier_arena.c | 223 +++ + .../selftests/bpf/progs/verifier_arena_globals1.c | 87 ++ + .../selftests/bpf/progs/verifier_arena_globals2.c | 49 + + .../selftests/bpf/progs/verifier_arena_large.c | 50 +- + .../bpf/progs/verifier_async_cb_context.c | 8 +- + .../testing/selftests/bpf/progs/verifier_bounds.c | 2 +- + tools/testing/selftests/bpf/progs/verifier_bswap.c | 43 + + .../bpf/progs/verifier_default_trusted_ptr.c | 29 + + .../selftests/bpf/progs/verifier_div_mod_bounds.c | 1149 +++++++++++++++ + .../selftests/bpf/progs/verifier_global_ptr_args.c | 2 +- + .../bpf/progs/verifier_helper_restricted.c | 111 -- + .../selftests/bpf/progs/verifier_jit_inline.c | 20 + + .../bpf/progs/verifier_kfunc_prog_types.c | 6 +- + .../selftests/bpf/progs/verifier_linked_scalars.c | 336 ++++- + tools/testing/selftests/bpf/progs/verifier_lsm.c | 31 +- + .../selftests/bpf/progs/verifier_scalar_ids.c | 53 +- + .../testing/selftests/bpf/progs/verifier_subreg.c | 153 ++ + .../testing/selftests/bpf/progs/verifier_unpriv.c | 22 + + .../bpf/progs/verifier_value_illegal_alu.c | 7 +- + tools/testing/selftests/bpf/progs/verifier_xdp.c | 35 + + tools/testing/selftests/bpf/progs/wq_failures.c | 4 +- + tools/testing/selftests/bpf/test_bpftool_map.sh | 398 ------ + .../testing/selftests/bpf/test_bpftool_metadata.sh | 85 -- + .../selftests/bpf/test_kmods/bpf_testmod-events.h | 10 + + .../testing/selftests/bpf/test_kmods/bpf_testmod.c | 122 +- + .../selftests/bpf/test_kmods/bpf_testmod_kfunc.h | 12 +- + tools/testing/selftests/bpf/trace_helpers.h | 12 + + tools/testing/selftests/bpf/verifier/calls.c | 2 +- + .../selftests/bpf/verifier/direct_value_access.c | 4 +- + tools/testing/selftests/bpf/verifier/precise.c | 4 +- + tools/testing/selftests/bpf/veristat.c | 2 +- + .../testing/selftests/hid/progs/hid_bpf_helpers.h | 8 +- + 234 files changed, 13039 insertions(+), 2497 deletions(-) + create mode 100644 kernel/bpf/bpf_lsm_proto.c + create mode 100644 mm/bpf_memcontrol.c + create mode 100755 scripts/gen-btf.sh + create mode 100644 tools/testing/selftests/bpf/bpftool_helpers.c + create mode 100644 tools/testing/selftests/bpf/bpftool_helpers.h + create mode 100644 tools/testing/selftests/bpf/cgroup_iter_memcg.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpftool_maps_access.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpftool_metadata.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_permute.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_iter_memcg.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/exe_ctx.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/fsession_test.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/kfunc_implicit_args.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_assoc.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/timer_start_deadlock.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/timer_start_delete_race.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_iter_memcg.c + create mode 100644 tools/testing/selftests/bpf/progs/fsession_test.c + create mode 100644 tools/testing/selftests/bpf/progs/kfunc_implicit_args.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_assoc.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_assoc_in_timer.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_assoc_reuse.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_sleepable.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ctx.c + create mode 100644 tools/testing/selftests/bpf/progs/timer_start_deadlock.c + create mode 100644 tools/testing/selftests/bpf/progs/timer_start_delete_race.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_arena_globals1.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_arena_globals2.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_default_trusted_ptr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_div_mod_bounds.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_jit_inline.c + delete mode 100755 tools/testing/selftests/bpf/test_bpftool_map.sh + delete mode 100755 tools/testing/selftests/bpf/test_bpftool_metadata.sh +Merging ipsec-next/master (3eef6c061f97a net: ethernet: ti: netcp: Use u64_stats_t with u64_stats_sync properly) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (49e41f3ea3f75 net/mlx5: Add IFC bits for extended ETS rate limit bandwidth value) +$ git merge -m Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/main (a22f57757f7e8 Merge tag 'linux-can-next-for-6.20-20260131' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (a22f57757f7e8 Merge tag 'linux-can-next-for-6.20-20260131' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (294cf04ca9598 Bluetooth: hci_core: Rate limit the logging of invalid ISO handle) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btusb.c | 2 ++ + net/bluetooth/hci_core.c | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging wireless-next/for-next (333225e1e9ead Merge tag 'wireless-next-2026-02-04' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging ath-next/for-next (2c1ba9c2adf0f wifi: ath12k: clear stale link mapping of ahvif->links_map) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Already up to date. +Merging iwlwifi-next/next (66af8ac52d10e wifi: iwlwifi: rename struct iwl_mcc_allowed_ap_type_cmd::offset_map) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi-next/next +Already up to date. +Merging wpan-next/master (1dd9291eb9037 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Merge made by the 'ort' strategy. + net/ieee802154/core.c | 49 ++++++++++++++++++++++++++++--------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) +Merging wpan-staging/staging (1dd9291eb9037 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'staging' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (8753827592986 dt-bindings: mtd: cdns,hp-nfc: Add dma-coherent property) +$ git merge -m Merge branch 'mtd/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Auto-merging Documentation/devicetree/bindings/mtd/partitions/arm,arm-firmware-suite.yaml +Auto-merging Documentation/devicetree/bindings/mtd/partitions/redboot-fis.yaml +CONFLICT (modify/delete): Documentation/devicetree/bindings/mtd/partitions/seama.yaml deleted in mtd/mtd/next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/mtd/partitions/seama.yaml left in tree. +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a8fd528e5b5b7] Merge branch 'mtd/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mmc/mmc-card.yaml | 20 ++---- + .../devicetree/bindings/mtd/brcm,brcmnand.yaml | 1 - + .../devicetree/bindings/mtd/cdns,hp-nfc.yaml | 2 + + .../bindings/mtd/microchip,mchp23k256.txt | 18 ----- + .../bindings/mtd/microchip,mchp23k256.yaml | 49 ++++++++++++++ + Documentation/devicetree/bindings/mtd/mtd.yaml | 10 +-- + .../mtd/mxic,multi-itfc-v009-nand-controller.yaml | 78 ++++++++++++++++++++++ + .../devicetree/bindings/mtd/mxic-nand.txt | 36 ---------- + .../mtd/partitions/arm,arm-firmware-suite.yaml | 2 - + .../devicetree/bindings/mtd/partitions/binman.yaml | 53 --------------- + .../mtd/partitions/brcm,bcm4908-partitions.yaml | 8 +-- + .../partitions/brcm,bcm947xx-cfe-partitions.yaml | 2 - + .../mtd/partitions/brcm,bcm963xx-imagetag.txt | 45 ------------- + .../bindings/mtd/partitions/brcm,trx.txt | 42 ------------ + .../bindings/mtd/partitions/brcm,trx.yaml | 65 ++++++++++++++++++ + .../bindings/mtd/partitions/fixed-partitions.yaml | 43 +++--------- + .../mtd/partitions/linksys,ns-partitions.yaml | 10 +-- + .../bindings/mtd/partitions/partition.yaml | 44 +++++++++++- + .../bindings/mtd/partitions/partitions.yaml | 42 ------------ + .../bindings/mtd/partitions/redboot-fis.yaml | 4 -- + .../devicetree/bindings/mtd/partitions/seama.yaml | 44 ------------ + .../bindings/mtd/partitions/simple-partition.yaml | 61 +++++++++++++++++ + .../partitions/tplink,safeloader-partitions.yaml | 2 +- + .../devicetree/bindings/mtd/partitions/u-boot.yaml | 2 +- + .../devicetree/bindings/mtd/spear_smi.txt | 29 -------- + .../devicetree/bindings/mtd/st,spear600-smi.yaml | 72 ++++++++++++++++++++ + .../devicetree/bindings/mtd/st,spi-fsm.yaml | 68 +++++++++++++++++++ + Documentation/devicetree/bindings/mtd/st-fsm.txt | 25 ------- + .../devicetree/bindings/mtd/ti,davinci-nand.yaml | 4 +- + .../devicetree/bindings/mtd/ti,gpmc-onenand.yaml | 2 +- + MAINTAINERS | 5 -- + drivers/mtd/chips/jedec_probe.c | 4 +- + drivers/mtd/devices/mtd_intel_dg.c | 9 ++- + drivers/mtd/maps/physmap-core.c | 2 +- + drivers/mtd/parsers/ofpart_bcm4908.h | 6 -- + drivers/mtd/parsers/ofpart_core.c | 24 ++++++- + drivers/mtd/parsers/ofpart_linksys_ns.h | 7 -- + drivers/mtd/parsers/tplink_safeloader.c | 1 + + 38 files changed, 497 insertions(+), 444 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mtd/microchip,mchp23k256.txt + create mode 100644 Documentation/devicetree/bindings/mtd/microchip,mchp23k256.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/mxic,multi-itfc-v009-nand-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/mxic-nand.txt + delete mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-imagetag.txt + delete mode 100644 Documentation/devicetree/bindings/mtd/partitions/brcm,trx.txt + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/brcm,trx.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/partitions/partitions.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/partitions/seama.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/simple-partition.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/spear_smi.txt + create mode 100644 Documentation/devicetree/bindings/mtd/st,spear600-smi.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/st,spi-fsm.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/st-fsm.txt +Merging nand/nand/next (0f8a217670b6e mtd: spinand: winbond: Remove unneeded semicolon) +$ git merge -m Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging drivers/mtd/nand/spi/esmt.c +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/atmel/nand-controller.c | 6 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 10 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 2 +- + drivers/mtd/nand/raw/denali_dt.c | 7 +- + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 4 +- + drivers/mtd/nand/raw/qcom_nandc.c | 8 +- + drivers/mtd/nand/raw/sunxi_nand.c | 6 - + drivers/mtd/nand/raw/vf610_nfc.c | 6 +- + drivers/mtd/nand/spi/Makefile | 4 +- + drivers/mtd/nand/spi/core.c | 396 ++++++++++++++++++++---- + drivers/mtd/nand/spi/dosilicon.c | 91 ++++++ + drivers/mtd/nand/spi/esmt.c | 4 +- + drivers/mtd/nand/spi/foresee.c | 34 ++ + drivers/mtd/nand/spi/gigadevice.c | 8 +- + drivers/mtd/nand/spi/macronix.c | 49 ++- + drivers/mtd/nand/spi/micron.c | 8 +- + drivers/mtd/nand/spi/toshiba.c | 3 +- + drivers/mtd/nand/spi/winbond.c | 129 ++++++-- + drivers/mtd/spi-nor/controllers/hisi-sfc.c | 7 +- + drivers/spi/spi-mem.c | 15 +- + include/linux/mtd/spinand.h | 162 ++++++++-- + include/linux/spi/spi-mem.h | 22 +- + 22 files changed, 813 insertions(+), 168 deletions(-) + create mode 100644 drivers/mtd/nand/spi/dosilicon.c +Merging spi-nor/spi-nor/next (ed26bd40df11e mailmap: update Pratyush Yadav's email address) +$ git merge -m Merge branch 'spi-nor/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (64ae90a81aa4a dt-bindings: crypto: atmel,at91sam9g46-sha: add microchip,lan9691-sha) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging Documentation/devicetree/bindings/crypto/qcom,prng.yaml +Auto-merging drivers/crypto/ccp/sev-dev-tsm.c +Merge made by the 'ort' strategy. + .../bindings/crypto/atmel,at91sam9g46-aes.yaml | 1 + + .../bindings/crypto/atmel,at91sam9g46-sha.yaml | 1 + + .../bindings/crypto/qcom,inline-crypto-engine.yaml | 1 + + .../devicetree/bindings/crypto/qcom,prng.yaml | 1 + + .../bindings/crypto/xlnx,zynqmp-aes.yaml | 2 + + .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 1 + + arch/s390/crypto/paes_s390.c | 93 +- + arch/s390/crypto/phmac_s390.c | 29 +- + arch/s390/include/asm/pkey.h | 8 +- + crypto/acompress.c | 18 +- + crypto/aead.c | 5 +- + crypto/ahash.c | 17 +- + crypto/akcipher.c | 6 +- + crypto/algapi.c | 14 +- + crypto/blowfish_common.c | 2 +- + crypto/crypto_engine.c | 33 +- + crypto/drbg.c | 49 +- + crypto/ecc.c | 29 +- + crypto/fips.c | 2 +- + crypto/khazad.c | 5 +- + crypto/kpp.c | 6 +- + crypto/lskcipher.c | 12 +- + crypto/rng.c | 5 +- + crypto/scompress.c | 18 +- + crypto/shash.c | 17 +- + crypto/simd.c | 4 +- + crypto/skcipher.c | 17 +- + crypto/testmgr.c | 4 + + drivers/char/hw_random/airoha-trng.c | 1 + + drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 4 +- + drivers/crypto/caam/caamalg_qi2.c | 27 +- + drivers/crypto/caam/caamalg_qi2.h | 2 + + drivers/crypto/cavium/cpt/cptvf_main.c | 3 +- + drivers/crypto/ccp/ccp-ops.c | 2 +- + drivers/crypto/ccp/sev-dev-tsm.c | 2 +- + drivers/crypto/ccp/sev-dev.c | 59 +- + drivers/crypto/hisilicon/Kconfig | 2 + + drivers/crypto/hisilicon/hpre/hpre.h | 5 +- + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 418 ++++---- + drivers/crypto/hisilicon/hpre/hpre_main.c | 2 +- + drivers/crypto/hisilicon/qm.c | 387 +++++--- + drivers/crypto/hisilicon/sec2/sec.h | 7 - + drivers/crypto/hisilicon/sec2/sec_crypto.c | 163 ++-- + drivers/crypto/hisilicon/sec2/sec_main.c | 21 +- + drivers/crypto/hisilicon/sgl.c | 2 +- + drivers/crypto/hisilicon/trng/trng.c | 123 ++- + drivers/crypto/hisilicon/zip/zip.h | 2 +- + drivers/crypto/hisilicon/zip/zip_crypto.c | 202 ++-- + drivers/crypto/hisilicon/zip/zip_main.c | 4 +- + drivers/crypto/inside-secure/eip93/eip93-main.c | 94 +- + drivers/crypto/intel/iaa/iaa_crypto_main.c | 36 +- + .../crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c | 3 + + .../intel/qat/qat_common/adf_pfvf_pf_proto.c | 10 + + .../crypto/intel/qat/qat_common/qat_asym_algs.c | 12 +- + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 2 +- + drivers/crypto/marvell/octeontx/otx_cptvf_main.c | 3 +- + drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 5 +- + drivers/crypto/nx/nx-common-powernv.c | 7 +- + drivers/crypto/omap-aes.c | 3 +- + drivers/crypto/omap-sham.c | 5 +- + drivers/crypto/starfive/jh7110-cryp.h | 4 +- + drivers/crypto/stm32/stm32-cryp.c | 29 +- + drivers/crypto/stm32/stm32-hash.c | 6 +- + drivers/crypto/virtio/virtio_crypto_common.h | 2 +- + drivers/crypto/virtio/virtio_crypto_core.c | 5 + + .../crypto/virtio/virtio_crypto_skcipher_algs.c | 2 - + drivers/crypto/xilinx/zynqmp-aes-gcm.c | 1019 +++++++++++++++----- + drivers/firmware/xilinx/Makefile | 2 +- + drivers/firmware/xilinx/zynqmp-crypto.c | 238 +++++ + drivers/firmware/xilinx/zynqmp.c | 49 - + drivers/s390/crypto/pkey_cca.c | 5 + + drivers/s390/crypto/pkey_ep11.c | 5 + + drivers/s390/crypto/pkey_pckmo.c | 12 +- + include/crypto/internal/skcipher.h | 7 + + include/linux/firmware/xlnx-zynqmp-crypto.h | 119 +++ + include/linux/firmware/xlnx-zynqmp.h | 14 +- + include/linux/hisi_acc_qm.h | 15 +- + kernel/padata.c | 22 +- + 78 files changed, 2406 insertions(+), 1167 deletions(-) + create mode 100644 drivers/firmware/xilinx/zynqmp-crypto.c + create mode 100644 include/linux/firmware/xlnx-zynqmp-crypto.h +Merging libcrypto/libcrypto-next (ffd42b6d0420c lib/crypto: mldsa: Clarify the documentation for mldsa_verify() slightly) +$ git merge -m Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/m68k/configs/amiga_defconfig +Auto-merging arch/m68k/configs/apollo_defconfig +Auto-merging arch/m68k/configs/atari_defconfig +Auto-merging arch/m68k/configs/bvme6000_defconfig +Auto-merging arch/m68k/configs/hp300_defconfig +Auto-merging arch/m68k/configs/mac_defconfig +Auto-merging arch/m68k/configs/multi_defconfig +Auto-merging arch/m68k/configs/mvme147_defconfig +Auto-merging arch/m68k/configs/mvme16x_defconfig +Auto-merging arch/m68k/configs/q40_defconfig +Auto-merging arch/m68k/configs/sun3_defconfig +Auto-merging arch/m68k/configs/sun3x_defconfig +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/configs/defconfig +Auto-merging crypto/drbg.c +Auto-merging crypto/testmgr.c +Merge made by the 'ort' strategy. + Documentation/filesystems/fscrypt.rst | 5 - + arch/arm/configs/milbeaut_m10v_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/omap2plus_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/crypto/Kconfig | 29 - + arch/arm/crypto/Makefile | 4 - + arch/arm/crypto/aes-cipher-glue.c | 69 - + arch/arm/crypto/aes-cipher.h | 13 - + arch/arm/crypto/aes-neonbs-glue.c | 29 +- + arch/arm/crypto/ghash-ce-glue.c | 14 +- + arch/arm/crypto/nhpoly1305-neon-glue.c | 80 - + arch/arm64/crypto/Kconfig | 39 +- + arch/arm64/crypto/Makefile | 9 - + arch/arm64/crypto/aes-ce-ccm-glue.c | 2 - + arch/arm64/crypto/aes-ce-glue.c | 178 -- + arch/arm64/crypto/aes-ce-setkey.h | 6 - + arch/arm64/crypto/aes-cipher-glue.c | 63 - + arch/arm64/crypto/aes-glue.c | 2 - + arch/arm64/crypto/ghash-ce-glue.c | 27 +- + arch/arm64/crypto/nhpoly1305-neon-glue.c | 79 - + arch/m68k/configs/amiga_defconfig | 1 - + arch/m68k/configs/apollo_defconfig | 1 - + arch/m68k/configs/atari_defconfig | 1 - + arch/m68k/configs/bvme6000_defconfig | 1 - + arch/m68k/configs/hp300_defconfig | 1 - + arch/m68k/configs/mac_defconfig | 1 - + arch/m68k/configs/multi_defconfig | 1 - + arch/m68k/configs/mvme147_defconfig | 1 - + arch/m68k/configs/mvme16x_defconfig | 1 - + arch/m68k/configs/q40_defconfig | 1 - + arch/m68k/configs/sun3_defconfig | 1 - + arch/m68k/configs/sun3x_defconfig | 1 - + arch/powerpc/crypto/Kconfig | 2 +- + arch/powerpc/crypto/Makefile | 9 +- + arch/powerpc/crypto/aes-gcm-p10-glue.c | 4 +- + arch/powerpc/crypto/aes-spe-glue.c | 88 +- + arch/powerpc/crypto/aes.c | 134 -- + arch/powerpc/crypto/aes_cbc.c | 4 +- + arch/powerpc/crypto/aes_ctr.c | 2 +- + arch/powerpc/crypto/aes_xts.c | 6 +- + arch/powerpc/crypto/aesp8-ppc.h | 22 - + arch/powerpc/crypto/vmx.c | 10 +- + arch/riscv/crypto/Kconfig | 2 - + arch/riscv/crypto/aes-macros.S | 12 +- + arch/riscv/crypto/aes-riscv64-glue.c | 81 +- + arch/riscv/crypto/aes-riscv64-zvkned.S | 27 - + arch/s390/configs/debug_defconfig | 2 +- + arch/s390/configs/defconfig | 2 +- + arch/s390/crypto/Kconfig | 2 - + arch/s390/crypto/aes_s390.c | 113 -- + arch/sparc/crypto/Kconfig | 2 +- + arch/sparc/crypto/Makefile | 2 +- + arch/sparc/crypto/aes_glue.c | 140 +- + arch/x86/crypto/Kconfig | 22 - + arch/x86/crypto/Makefile | 5 - + arch/x86/crypto/aes-gcm-aesni-x86_64.S | 33 +- + arch/x86/crypto/aes-gcm-vaes-avx2.S | 21 +- + arch/x86/crypto/aes-gcm-vaes-avx512.S | 25 +- + arch/x86/crypto/aesni-intel_asm.S | 25 - + arch/x86/crypto/aesni-intel_glue.c | 119 +- + arch/x86/crypto/nhpoly1305-avx2-glue.c | 81 - + arch/x86/crypto/nhpoly1305-sse2-glue.c | 80 - + crypto/Kconfig | 31 +- + crypto/Makefile | 5 +- + crypto/adiantum.c | 460 ++--- + crypto/aegis.h | 2 +- + crypto/aes.c | 66 + + crypto/aes_generic.c | 1320 -------------- + crypto/aes_ti.c | 83 - + crypto/crypto_user.c | 2 +- + crypto/df_sp80090a.c | 30 +- + crypto/drbg.c | 12 +- + crypto/nhpoly1305.c | 255 --- + crypto/testmgr.c | 49 +- + crypto/testmgr.h | 1372 -------------- + drivers/char/tpm/tpm2-sessions.c | 10 +- + drivers/crypto/amcc/crypto4xx_alg.c | 10 +- + drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 4 +- + drivers/crypto/chelsio/chcr_algo.c | 10 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 12 +- + drivers/crypto/inside-secure/safexcel_hash.c | 14 +- + drivers/crypto/omap-aes-gcm.c | 6 +- + drivers/crypto/omap-aes.h | 2 +- + drivers/crypto/starfive/jh7110-aes.c | 10 +- + drivers/crypto/xilinx/xilinx-trng.c | 8 +- + .../chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c | 4 +- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 8 +- + .../chelsio/inline_crypto/chtls/chtls_hw.c | 4 +- + drivers/net/phy/mscc/mscc_macsec.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 20 +- + include/crypto/aes.h | 280 ++- + include/crypto/df_sp80090a.h | 2 +- + include/crypto/gcm.h | 2 +- + include/crypto/mldsa.h | 62 + + include/crypto/nh.h | 52 + + include/crypto/nhpoly1305.h | 74 - + lib/crypto/Kconfig | 32 + + lib/crypto/Makefile | 59 +- + lib/crypto/aes.c | 471 +++-- + lib/crypto/aescfb.c | 30 +- + lib/crypto/aesgcm.c | 12 +- + .../crypto => lib/crypto/arm}/aes-cipher-core.S | 4 +- + lib/crypto/arm/aes.h | 56 + + {arch/arm/crypto => lib/crypto/arm}/nh-neon-core.S | 0 + lib/crypto/arm/nh.h | 33 + + .../crypto => lib/crypto/arm64}/aes-ce-core.S | 0 + .../crypto => lib/crypto/arm64}/aes-cipher-core.S | 4 +- + lib/crypto/arm64/aes.h | 164 ++ + .../crypto => lib/crypto/arm64}/nh-neon-core.S | 3 +- + lib/crypto/arm64/nh.h | 34 + + lib/crypto/fips-mldsa.h | 458 +++++ + lib/crypto/md5.c | 2 +- + lib/crypto/mldsa.c | 682 +++++++ + lib/crypto/nh.c | 82 + + lib/crypto/powerpc/.gitignore | 2 + + .../crypto => lib/crypto/powerpc}/aes-spe-core.S | 0 + .../crypto => lib/crypto/powerpc}/aes-spe-keys.S | 0 + .../crypto => lib/crypto/powerpc}/aes-spe-modes.S | 0 + .../crypto => lib/crypto/powerpc}/aes-spe-regs.h | 0 + .../crypto => lib/crypto/powerpc}/aes-tab-4k.S | 0 + lib/crypto/powerpc/aes.h | 238 +++ + .../crypto => lib/crypto/powerpc}/aesp8-ppc.pl | 1 + + lib/crypto/riscv/aes-riscv64-zvkned.S | 84 + + lib/crypto/riscv/aes.h | 63 + + lib/crypto/s390/aes.h | 106 ++ + lib/crypto/sparc/aes.h | 149 ++ + {arch/sparc/crypto => lib/crypto/sparc}/aes_asm.S | 0 + lib/crypto/tests/Kconfig | 17 + + lib/crypto/tests/Makefile | 2 + + lib/crypto/tests/mldsa-testvecs.h | 1887 ++++++++++++++++++++ + lib/crypto/tests/mldsa_kunit.c | 438 +++++ + lib/crypto/tests/nh-testvecs.h | 298 ++++ + lib/crypto/tests/nh_kunit.c | 43 + + lib/crypto/x86/aes-aesni.S | 261 +++ + lib/crypto/x86/aes.h | 85 + + .../nh-avx2-x86_64.S => lib/crypto/x86/nh-avx2.S | 3 +- + .../nh-sse2-x86_64.S => lib/crypto/x86/nh-sse2.S | 3 +- + lib/crypto/x86/nh.h | 45 + + net/bluetooth/smp.c | 8 +- + scripts/crypto/gen-hash-testvecs.py | 40 + + 141 files changed, 6668 insertions(+), 5264 deletions(-) + delete mode 100644 arch/arm/crypto/aes-cipher-glue.c + delete mode 100644 arch/arm/crypto/aes-cipher.h + delete mode 100644 arch/arm/crypto/nhpoly1305-neon-glue.c + delete mode 100644 arch/arm64/crypto/aes-ce-glue.c + delete mode 100644 arch/arm64/crypto/aes-ce-setkey.h + delete mode 100644 arch/arm64/crypto/aes-cipher-glue.c + delete mode 100644 arch/arm64/crypto/nhpoly1305-neon-glue.c + delete mode 100644 arch/powerpc/crypto/aes.c + delete mode 100644 arch/x86/crypto/nhpoly1305-avx2-glue.c + delete mode 100644 arch/x86/crypto/nhpoly1305-sse2-glue.c + create mode 100644 crypto/aes.c + delete mode 100644 crypto/aes_generic.c + delete mode 100644 crypto/aes_ti.c + delete mode 100644 crypto/nhpoly1305.c + create mode 100644 include/crypto/mldsa.h + create mode 100644 include/crypto/nh.h + delete mode 100644 include/crypto/nhpoly1305.h + rename {arch/arm/crypto => lib/crypto/arm}/aes-cipher-core.S (97%) + create mode 100644 lib/crypto/arm/aes.h + rename {arch/arm/crypto => lib/crypto/arm}/nh-neon-core.S (100%) + create mode 100644 lib/crypto/arm/nh.h + rename {arch/arm64/crypto => lib/crypto/arm64}/aes-ce-core.S (100%) + rename {arch/arm64/crypto => lib/crypto/arm64}/aes-cipher-core.S (96%) + create mode 100644 lib/crypto/arm64/aes.h + rename {arch/arm64/crypto => lib/crypto/arm64}/nh-neon-core.S (97%) + create mode 100644 lib/crypto/arm64/nh.h + create mode 100644 lib/crypto/fips-mldsa.h + create mode 100644 lib/crypto/mldsa.c + create mode 100644 lib/crypto/nh.c + create mode 100644 lib/crypto/powerpc/.gitignore + rename {arch/powerpc/crypto => lib/crypto/powerpc}/aes-spe-core.S (100%) + rename {arch/powerpc/crypto => lib/crypto/powerpc}/aes-spe-keys.S (100%) + rename {arch/powerpc/crypto => lib/crypto/powerpc}/aes-spe-modes.S (100%) + rename {arch/powerpc/crypto => lib/crypto/powerpc}/aes-spe-regs.h (100%) + rename {arch/powerpc/crypto => lib/crypto/powerpc}/aes-tab-4k.S (100%) + create mode 100644 lib/crypto/powerpc/aes.h + rename {arch/powerpc/crypto => lib/crypto/powerpc}/aesp8-ppc.pl (99%) + create mode 100644 lib/crypto/riscv/aes-riscv64-zvkned.S + create mode 100644 lib/crypto/riscv/aes.h + create mode 100644 lib/crypto/s390/aes.h + create mode 100644 lib/crypto/sparc/aes.h + rename {arch/sparc/crypto => lib/crypto/sparc}/aes_asm.S (100%) + create mode 100644 lib/crypto/tests/mldsa-testvecs.h + create mode 100644 lib/crypto/tests/mldsa_kunit.c + create mode 100644 lib/crypto/tests/nh-testvecs.h + create mode 100644 lib/crypto/tests/nh_kunit.c + create mode 100644 lib/crypto/x86/aes-aesni.S + create mode 100644 lib/crypto/x86/aes.h + rename arch/x86/crypto/nh-avx2-x86_64.S => lib/crypto/x86/nh-avx2.S (98%) + rename arch/x86/crypto/nh-sse2-x86_64.S => lib/crypto/x86/nh-sse2.S (97%) + create mode 100644 lib/crypto/x86/nh.h +Merging drm/drm-next (3cc9398a9ea69 Merge tag 'exynos-drm-next-for-v6.20' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging .mailmap +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/process/debugging/kgdb.rst +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/Makefile +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc21.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_dpm.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c +Auto-merging drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c +Auto-merging drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c +Auto-merging drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c +Auto-merging drivers/gpu/drm/drm_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/drm_pagemap.c +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gem/i915_gem_shmem.c +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_catalog.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_gem.c +Auto-merging drivers/gpu/drm/panthor/panthor_gem.c +Auto-merging drivers/gpu/drm/ttm/ttm_tt.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_exec.c +Auto-merging drivers/gpu/drm/xe/xe_lrc.c +Auto-merging drivers/gpu/drm/xe/xe_nvm.c +Auto-merging drivers/gpu/drm/xe/xe_pci.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_pci.c +Auto-merging drivers/gpu/drm/xe/xe_pci_types.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_pci_types.h +Auto-merging drivers/gpu/nova-core/firmware/fwsec.rs +Auto-merging drivers/gpu/nova-core/firmware/gsp.rs +Auto-merging drivers/gpu/nova-core/gsp/commands.rs +Auto-merging drivers/gpu/nova-core/gsp/sequencer.rs +Auto-merging drivers/tty/vt/vt.c +Resolved 'drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_process.c' using previous resolution. +Resolved 'drivers/gpu/drm/drm_gem.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/gem/i915_gem_shmem.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_pci.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_pci_types.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1fa73b00f2809] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 5 +- + .../ABI/testing/sysfs-driver-intel-xe-hwmon | 110 + + .../ABI/testing/sysfs-driver-intel-xe-sriov | 2 +- + .../ABI/testing/sysfs-kernel-dmabuf-buffers | 24 - + .../bindings/display/bridge/renesas,dsi.yaml | 120 +- + .../bindings/display/bridge/simple-bridge.yaml | 1 + + .../bindings/display/msm/dsi-controller-main.yaml | 7 + + .../bindings/display/msm/dsi-phy-7nm.yaml | 31 +- + .../devicetree/bindings/display/msm/gpu.yaml | 81 +- + .../bindings/display/msm/qcom,adreno-rgmu.yaml | 126 + + .../bindings/display/msm/qcom,kaanapali-mdss.yaml | 297 + + .../bindings/display/msm/qcom,qcs8300-mdss.yaml | 102 +- + .../bindings/display/msm/qcom,sm8650-dpu.yaml | 1 + + .../bindings/display/panel/jadard,jd9365da-h3.yaml | 2 + + .../bindings/display/panel/lg,sw43408.yaml | 13 +- + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 8 +- + .../bindings/display/panel/samsung,s6e3fc2x01.yaml | 20 +- + .../display/rockchip/rockchip,dw-hdmi.yaml | 1 + + .../display/rockchip/rockchip,dw-mipi-dsi.yaml | 2 + + .../rockchip/rockchip,rk3588-dw-hdmi-qp.yaml | 6 + + .../bindings/display/rockchip/rockchip-vop.yaml | 1 + + .../bindings/display/sitronix,st7571.yaml | 25 + + .../bindings/display/sitronix,st7920.yaml | 58 + + .../bindings/gpu/arm,mali-valhall-csf.yaml | 14 + + .../devicetree/bindings/gpu/img,powervr-rogue.yaml | 2 + + .../devicetree/bindings/phy/mediatek,hdmi-phy.yaml | 29 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/dma-buf.rst | 5 - + Documentation/gpu/amdgpu/amd_overview_block.svg | 687 + + Documentation/gpu/amdgpu/amdgpu-glossary.rst | 48 + + Documentation/gpu/amdgpu/apu-asic-info-table.csv | 3 + + Documentation/gpu/amdgpu/display/dc-glossary.rst | 3 - + Documentation/gpu/amdgpu/driver-core.rst | 31 + + Documentation/gpu/amdgpu/driver-misc.rst | 26 + + Documentation/gpu/amdgpu/enforce_isolation.svg | 654 + + Documentation/gpu/amdgpu/gc/index.rst | 24 +- + Documentation/gpu/amdgpu/gfx_pipeline_seq.svg | 413 + + Documentation/gpu/amdgpu/index.rst | 1 + + Documentation/gpu/amdgpu/no_enforce_isolation.svg | 707 + + Documentation/gpu/amdgpu/process-isolation.rst | 1 + + Documentation/gpu/amdgpu/ring-buffer.rst | 95 + + Documentation/gpu/amdgpu/ring_buffers.svg | 1633 + + Documentation/gpu/amdgpu/userq.rst | 2 + + Documentation/gpu/drm-mm.rst | 29 +- + Documentation/gpu/nova/core/todo.rst | 59 +- + Documentation/gpu/todo.rst | 61 + + Documentation/gpu/xe/xe_exec_queue.rst | 14 + + Documentation/process/debugging/kgdb.rst | 28 - + MAINTAINERS | 33 +- + drivers/accel/amdxdna/Makefile | 1 - + drivers/accel/amdxdna/aie2_ctx.c | 18 +- + drivers/accel/amdxdna/aie2_error.c | 10 +- + drivers/accel/amdxdna/aie2_message.c | 125 +- + drivers/accel/amdxdna/aie2_msg_priv.h | 8 +- + drivers/accel/amdxdna/aie2_pci.c | 38 +- + drivers/accel/amdxdna/aie2_pci.h | 14 +- + drivers/accel/amdxdna/aie2_pm.c | 17 +- + drivers/accel/amdxdna/aie2_psp.c | 15 + + drivers/accel/amdxdna/aie2_smu.c | 27 +- + drivers/accel/amdxdna/amdxdna_ctx.h | 1 + + drivers/accel/amdxdna/amdxdna_mailbox.c | 46 +- + drivers/accel/amdxdna/amdxdna_pci_drv.c | 32 +- + drivers/accel/amdxdna/amdxdna_pci_drv.h | 2 - + drivers/accel/amdxdna/amdxdna_pm.c | 22 +- + drivers/accel/amdxdna/npu1_regs.c | 8 +- + drivers/accel/amdxdna/npu2_regs.c | 115 - + drivers/accel/amdxdna/npu4_regs.c | 12 +- + drivers/accel/amdxdna/npu5_regs.c | 4 +- + drivers/accel/amdxdna/npu6_regs.c | 4 +- + drivers/accel/ivpu/ivpu_debugfs.c | 4 +- + drivers/accel/ivpu/ivpu_drv.c | 4 +- + drivers/accel/ivpu/ivpu_fw.c | 13 +- + drivers/accel/ivpu/ivpu_fw.h | 9 +- + drivers/accel/ivpu/ivpu_gem.c | 2 +- + drivers/accel/ivpu/ivpu_hw_40xx_reg.h | 6 + + drivers/accel/ivpu/ivpu_hw_ip.c | 84 +- + drivers/accel/ivpu/ivpu_hw_ip.h | 1 - + drivers/accel/ivpu/ivpu_mmu_context.c | 20 +- + drivers/accel/ivpu/ivpu_mmu_context.h | 5 +- + drivers/accel/ivpu/ivpu_pm.c | 13 +- + drivers/accel/ivpu/ivpu_pm.h | 1 - + drivers/accel/rocket/rocket_core.c | 7 +- + drivers/accel/rocket/rocket_drv.c | 30 +- + drivers/crypto/tegra/tegra-se-main.c | 4 +- + drivers/dma-buf/Kconfig | 17 +- + drivers/dma-buf/Makefile | 1 - + drivers/dma-buf/dma-buf-sysfs-stats.c | 202 - + drivers/dma-buf/dma-buf-sysfs-stats.h | 35 - + drivers/dma-buf/dma-buf.c | 141 +- + drivers/dma-buf/dma-fence.c | 100 +- + drivers/dma-buf/dma-heap.c | 5 + + drivers/dma-buf/heaps/cma_heap.c | 2 +- + drivers/dma-buf/heaps/system_heap.c | 7 +- + drivers/dma-buf/st-dma-fence.c | 55 +- + drivers/gpu/drm/Kconfig | 213 +- + drivers/gpu/drm/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 184 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 10 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12_1.c | 387 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 77 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 516 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 110 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 18 + + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 148 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 83 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 48 + + drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ip.c | 315 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h | 125 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 62 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 172 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 111 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 85 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 347 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 34 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 212 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 160 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 3 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 3 - + drivers/gpu/drm/amd/amdgpu/atom.c | 2 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 6 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 13 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 73 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 55 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 4066 ++ + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.h | 31 + + drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h | 475 + + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 68 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 82 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 208 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 39 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.c | 893 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.h | 31 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 27 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 132 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c | 637 + + drivers/gpu/drm/amd/amdgpu/gmc_v12_1.h | 30 + + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 57 +- + drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/imu_v12_1.c | 166 + + drivers/gpu/drm/amd/amdgpu/imu_v12_1.h | 30 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 11 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 11 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_3_0.c | 714 + + drivers/gpu/drm/amd/amdgpu/jpeg_v5_3_0.h | 35 + + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 68 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_1.c | 1968 + + drivers/gpu/drm/amd/amdgpu/mes_v12_1.h | 29 + + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 34 + + drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c | 916 + + drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.h | 28 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 17 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 4 +- + drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 73 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 5 - + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 2 + + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/psp_v15_0.c | 202 + + drivers/gpu/drm/amd/amdgpu/psp_v15_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.c | 342 + + drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.h | 30 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 30 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 1806 + + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.h | 31 + + drivers/gpu/drm/amd/amdgpu/sdma_v7_1_0_pkt_open.h | 5673 +++ + drivers/gpu/drm/amd/amdgpu/si.c | 13 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/smu_v11_0_i2c.c | 8 +- + drivers/gpu/drm/amd/amdgpu/smuio_v15_0_0.c | 50 + + drivers/gpu/drm/amd/amdgpu/smuio_v15_0_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/smuio_v15_0_8.c | 213 + + drivers/gpu/drm/amd/amdgpu/smuio_v15_0_8.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 1 - + drivers/gpu/drm/amd/amdgpu/soc21.c | 44 +- + drivers/gpu/drm/amd/amdgpu/soc24.c | 5 - + drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 862 + + drivers/gpu/drm/amd/amdgpu/soc_v1_0.h | 37 + + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 9 +- + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 8 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 45 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 134 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c | 93 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 5 - + drivers/gpu/drm/amd/amdkfd/Makefile | 3 + + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 1453 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm | 980 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 97 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 17 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 182 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 47 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 + + .../amd/amdkfd/kfd_device_queue_manager_v12_1.c | 98 + + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 29 + + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v12_1.c | 391 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 65 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 20 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 23 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 25 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c | 725 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 41 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 4 - + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_vi.c | 5 - + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 41 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 263 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 54 +- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 76 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 67 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 67 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 6 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 135 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 19 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 3 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 29 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 73 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 8 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 6 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 22 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 9 +- + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.h | 8 + + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 133 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.h | 5 - + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 90 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.h | 1 - + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 2 - + drivers/gpu/drm/amd/display/dc/core/dc.c | 648 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 10 +- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 23 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 44 +- + drivers/gpu/drm/amd/display/dc/dc.h | 95 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 54 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 35 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 6 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 31 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 29 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 49 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 8 +- + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 13 - + .../amd/display/dc/dcn201/dcn201_link_encoder.c | 3 + + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 3 + + .../amd/display/dc/dio/dcn10/dcn10_link_encoder.c | 43 + + .../amd/display/dc/dio/dcn10/dcn10_link_encoder.h | 11 +- + .../amd/display/dc/dio/dcn20/dcn20_link_encoder.c | 3 + + .../display/dc/dio/dcn30/dcn30_dio_link_encoder.c | 3 + + .../dc/dio/dcn301/dcn301_dio_link_encoder.c | 3 + + .../display/dc/dio/dcn31/dcn31_dio_link_encoder.c | 3 + + .../display/dc/dio/dcn32/dcn32_dio_link_encoder.c | 18 +- + .../dc/dio/dcn321/dcn321_dio_link_encoder.c | 3 + + .../display/dc/dio/dcn35/dcn35_dio_link_encoder.c | 4 +- + .../dc/dio/dcn401/dcn401_dio_link_encoder.c | 3 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 1 + + drivers/gpu/drm/amd/display/dc/dml2_0/Makefile | 8 +- + .../drm/amd/display/dc/dml2_0/dml21/dml21_utils.c | 3 +- + .../amd/display/dc/dml2_0/dml21/dml21_wrapper.h | 7 +- + .../dml2_0/dml21/inc/dml_top_display_cfg_types.h | 1 + + .../display/dc/dml2_0/dml21/inc/dml_top_types.h | 1 + + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 5 +- + .../dml21/src/dml2_core/dml2_core_shared_types.h | 1 + + .../gpu/drm/amd/display/dc/dml2_0/dml2_wrapper.c | 599 +- + .../gpu/drm/amd/display/dc/dml2_0/dml2_wrapper.h | 9 + + .../drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.c | 604 + + .../drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.h | 25 + + .../gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp.h | 1 + + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h | 9 + + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 96 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 2 +- + .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c | 18 + + .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h | 10 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 14 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 58 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 11 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.h | 2 + + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 18 +- + .../drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.c | 1 + + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 1 + + .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn301/dcn301_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 17 +- + .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 8 +- + .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 56 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 3 + + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 3 +- + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 28 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 1 - + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 13 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 8 + + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 28 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/link_service.h | 11 +- + drivers/gpu/drm/amd/display/dc/link/Makefile | 2 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 3 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 79 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 141 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 310 +- + .../display/dc/link/protocols/link_dp_capability.c | 54 +- + .../dc/link/protocols/link_dp_irq_handler.c | 43 + + .../dc/link/protocols/link_dp_panel_replay.c | 353 + + .../dc/link/protocols/link_dp_panel_replay.h | 38 + + .../link_dp_training_fixed_vs_pe_retimer.c | 2 +- + .../dc/link/protocols/link_edp_panel_control.c | 147 +- + .../dc/link/protocols/link_edp_panel_control.h | 3 +- + .../drm/amd/display/dc/link/protocols/link_hpd.c | 171 +- + .../drm/amd/display/dc/link/protocols/link_hpd.h | 1 - + drivers/gpu/drm/amd/display/dc/os_types.h | 2 - + .../display/dc/resource/dce110/dce110_resource.c | 2 + + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 8 +- + .../amd/display/dc/resource/dcn21/dcn21_resource.c | 2 - + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 11 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.h | 5 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 2 +- + .../display/dc/resource/dcn351/dcn351_resource.c | 2 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 2 +- + .../display/dc/resource/dcn401/dcn401_resource.h | 3 + + drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c | 189 +- + drivers/gpu/drm/amd/display/dc/sspl/dc_spl.h | 8 - + .../gpu/drm/amd/display/dc/sspl/dc_spl_filters.c | 4 +- + .../gpu/drm/amd/display/dc/sspl/dc_spl_filters.h | 4 +- + .../amd/display/dc/sspl/dc_spl_isharp_filters.c | 31 +- + .../amd/display/dc/sspl/dc_spl_isharp_filters.h | 16 +- + .../amd/display/dc/sspl/dc_spl_scl_easf_filters.c | 155 +- + .../amd/display/dc/sspl/dc_spl_scl_easf_filters.h | 35 +- + .../drm/amd/display/dc/sspl/dc_spl_scl_filters.c | 27 +- + .../drm/amd/display/dc/sspl/dc_spl_scl_filters.h | 3 +- + .../gpu/drm/amd/display/dc/sspl/spl_custom_float.c | 11 +- + .../gpu/drm/amd/display/dc/sspl/spl_custom_float.h | 4 +- + .../gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c | 78 +- + .../gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.h | 56 +- + drivers/gpu/drm/amd/display/dc/sspl/spl_os_types.h | 9 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 49 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 194 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 6 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn30.c | 6 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 6 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 6 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 9 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c | 6 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 64 +- + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 32 + + .../drm/amd/display/modules/inc/mod_info_packet.h | 6 + + .../amd/display/modules/info_packet/info_packet.c | 369 +- + .../drm/amd/display/modules/power/power_helpers.c | 8 +- + drivers/gpu/drm/amd/include/amd_acpi.h | 34 +- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + .../drm/amd/include/asic_reg/gc/gc_10_3_0_offset.h | 16 + + .../amd/include/asic_reg/gc/gc_10_3_0_sh_mask.h | 27 + + .../drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h | 12418 ++++++ + .../amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h | 44638 +++++++++++++++++++ + .../include/asic_reg/mmhub/mmhub_4_2_0_offset.h | 802 + + .../include/asic_reg/mmhub/mmhub_4_2_0_sh_mask.h | 3013 ++ + .../drm/amd/include/asic_reg/mp/mp_15_0_0_offset.h | 423 + + .../amd/include/asic_reg/mp/mp_15_0_0_sh_mask.h | 626 + + .../drm/amd/include/asic_reg/mp/mp_15_0_8_offset.h | 868 + + .../amd/include/asic_reg/mp/mp_15_0_8_sh_mask.h | 616 + + .../amd/include/asic_reg/oss/osssys_7_1_0_offset.h | 280 + + .../include/asic_reg/oss/osssys_7_1_0_sh_mask.h | 1024 + + .../include/asic_reg/smuio/smuio_15_0_0_offset.h | 100 + + .../include/asic_reg/smuio/smuio_15_0_0_sh_mask.h | 190 + + .../include/asic_reg/smuio/smuio_15_0_8_offset.h | 512 + + .../include/asic_reg/smuio/smuio_15_0_8_sh_mask.h | 1113 + + .../amd/include/asic_reg/thm/thm_15_0_0_offset.h | 157 + + .../amd/include/asic_reg/thm/thm_15_0_0_sh_mask.h | 567 + + .../amd/include/asic_reg/vcn/vcn_5_3_0_offset.h | 1783 + + .../amd/include/asic_reg/vcn/vcn_5_3_0_sh_mask.h | 8262 ++++ + .../amd/include/ivsrcid/gfx/irqsrcs_gfx_12_1_0.h | 136 + + .../drm/amd/include/ivsrcid/vmc/irqsrcs_vmc_1_0.h | 2 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 5 +- + drivers/gpu/drm/amd/include/mes_v12_api_def.h | 69 +- + drivers/gpu/drm/amd/include/soc15_hw_ip.h | 2 + + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 1 + + drivers/gpu/drm/amd/include/soc_v1_0_enum.h | 38 + + drivers/gpu/drm/amd/include/soc_v1_0_ih_clientid.h | 52 + + drivers/gpu/drm/amd/include/v12_structs.h | 2054 + + drivers/gpu/drm/amd/pm/Makefile | 1 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 41 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 83 +- + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 5 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 23 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 65 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 87 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 29 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 141 - + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 52 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 211 +- + drivers/gpu/drm/amd/pm/swsmu/Makefile | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 111 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 432 +- + .../pm/swsmu/inc/pmfw_if/smu15_driver_if_v15_0_0.h | 231 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_pmfw.h | 8 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v15_0_0_pmfw.h | 160 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v15_0_0_ppsmc.h | 133 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 6 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 52 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v12_0.h | 3 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 50 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 53 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v15_0.h | 245 + + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 220 +- + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 37 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 515 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 342 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 64 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 104 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 84 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 20 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 307 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 123 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 306 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 112 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 63 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 67 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 452 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 4 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 325 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 49 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 100 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 64 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 331 +- + drivers/gpu/drm/amd/pm/swsmu/smu15/Makefile | 30 + + drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c | 1846 + + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.c | 1361 + + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.h | 28 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 913 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 38 +- + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 4 +- + drivers/gpu/drm/amd/ras/ras_mgr/Makefile | 1 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c | 5 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c | 60 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.h | 3 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c | 469 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.h | 57 + + drivers/gpu/drm/amd/ras/rascore/ras.h | 2 + + drivers/gpu/drm/amd/ras/rascore/ras_cmd.h | 33 + + drivers/gpu/drm/amd/ras/rascore/ras_core.c | 23 + + drivers/gpu/drm/amd/ras/rascore/ras_psp.c | 1 + + drivers/gpu/drm/amd/ras/rascore/ras_psp.h | 1 + + drivers/gpu/drm/amd/ras/rascore/ras_ta_if.h | 1 + + drivers/gpu/drm/amd/ras/rascore/ras_umc.c | 63 +- + drivers/gpu/drm/amd/ras/rascore/ras_umc.h | 3 + + drivers/gpu/drm/ast/ast_cursor.c | 94 +- + drivers/gpu/drm/ast/ast_mode.c | 11 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 32 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 40 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 1 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 50 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 98 +- + drivers/gpu/drm/bridge/Kconfig | 7 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 166 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 2 +- + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c | 15 +- + drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c | 15 +- + .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 9 +- + drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 9 +- + drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 66 +- + .../{rockchip/inno_hdmi.c => bridge/inno-hdmi.c} | 525 +- + drivers/gpu/drm/bridge/ite-it6263.c | 87 +- + drivers/gpu/drm/bridge/ite-it66121.c | 7 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 31 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 145 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 125 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 37 +- + drivers/gpu/drm/bridge/sii902x.c | 7 +- + drivers/gpu/drm/bridge/simple-bridge.c | 20 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 146 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 7 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 7 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 86 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 27 +- + drivers/gpu/drm/bridge/ti-tpd12s015.c | 8 +- + .../xfails/msm-sc7180-trogdor-kingoftown-fails.txt | 4 + + .../msm-sc7180-trogdor-lazor-limozeen-fails.txt | 4 + + drivers/gpu/drm/clients/drm_log.c | 2 +- + drivers/gpu/drm/display/drm_bridge_connector.c | 193 +- + drivers/gpu/drm/display/drm_dp_helper.c | 103 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 3 +- + drivers/gpu/drm/display/drm_hdmi_state_helper.c | 114 +- + drivers/gpu/drm/drm_atomic.c | 33 + + drivers/gpu/drm/drm_atomic_helper.c | 1 + + drivers/gpu/drm/drm_atomic_uapi.c | 32 +- + drivers/gpu/drm/drm_bridge.c | 134 +- + drivers/gpu/drm/drm_buddy.c | 10 + + drivers/gpu/drm/drm_connector.c | 6 + + drivers/gpu/drm/drm_debugfs.c | 7 + + drivers/gpu/drm/drm_draw.c | 29 + + drivers/gpu/drm/drm_draw_internal.h | 2 + + drivers/gpu/drm/drm_fb_helper.c | 108 - + drivers/gpu/drm/drm_gem.c | 205 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 146 +- + drivers/gpu/drm/drm_gpusvm.c | 127 + + drivers/gpu/drm/drm_gpuvm.c | 26 +- + drivers/gpu/drm/drm_mode_object.c | 25 + + drivers/gpu/drm/drm_pagemap.c | 564 +- + drivers/gpu/drm/drm_pagemap_util.c | 568 + + drivers/gpu/drm/drm_panic.c | 104 +- + drivers/gpu/drm/drm_plane.c | 4 +- + drivers/gpu/drm/drm_property.c | 13 +- + drivers/gpu/drm/drm_syncobj.c | 65 +- + drivers/gpu/drm/drm_vblank.c | 52 +- + drivers/gpu/drm/etnaviv/Makefile | 1 + + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 75 +- + drivers/gpu/drm/etnaviv/etnaviv_buffer.h | 99 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 3 + + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 3 + + drivers/gpu/drm/etnaviv/etnaviv_flop_reset.c | 224 + + drivers/gpu/drm/etnaviv/etnaviv_flop_reset.h | 21 + + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 11 + + drivers/gpu/drm/etnaviv/state_3d.xml.h | 95 + + drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 + + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 74 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 4 +- + drivers/gpu/drm/hisilicon/hibmc/dp/dp_comm.h | 4 + + drivers/gpu/drm/hisilicon/hibmc/dp/dp_config.h | 2 + + drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.c | 38 +- + drivers/gpu/drm/hisilicon/hibmc/dp/dp_hw.h | 8 + + drivers/gpu/drm/hisilicon/hibmc/dp/dp_reg.h | 3 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 71 +- + drivers/gpu/drm/hyperv/Kconfig | 14 + + drivers/gpu/drm/i915/Makefile | 29 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 5 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 2 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 9 +- + drivers/gpu/drm/i915/display/i9xx_wm.c | 22 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 4 +- + drivers/gpu/drm/i915/display/intel_alpm.c | 6 +- + drivers/gpu/drm/i915/display/intel_alpm.h | 4 +- + drivers/gpu/drm/i915/display/intel_audio.c | 6 +- + drivers/gpu/drm/i915/display/intel_bios.c | 76 +- + drivers/gpu/drm/i915/display/intel_bios.h | 2 + + drivers/gpu/drm/i915/display/intel_bo.c | 6 + + drivers/gpu/drm/i915/display/intel_bo.h | 1 + + drivers/gpu/drm/i915/display/intel_bw.c | 24 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 73 +- + drivers/gpu/drm/i915/display/intel_cmtg.c | 3 +- + drivers/gpu/drm/i915/display/intel_colorop.c | 2 + + drivers/gpu/drm/i915/display/intel_colorop.h | 4 +- + drivers/gpu/drm/i915/display/intel_connector.c | 16 +- + drivers/gpu/drm/i915/display/intel_crt.c | 6 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 31 +- + drivers/gpu/drm/i915/display/intel_crtc.h | 2 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 8 + + drivers/gpu/drm/i915/display/intel_cursor.c | 5 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 1094 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 31 +- + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 4 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 116 +- + drivers/gpu/drm/i915/display/intel_display.c | 148 +- + drivers/gpu/drm/i915/display/intel_display.h | 1 + + drivers/gpu/drm/i915/display/intel_display_core.h | 18 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 2 +- + .../gpu/drm/i915/display/intel_display_device.c | 5 + + .../gpu/drm/i915/display/intel_display_device.h | 27 +- + .../gpu/drm/i915/display/intel_display_driver.c | 22 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 203 +- + drivers/gpu/drm/i915/display/intel_display_irq.h | 2 + + .../gpu/drm/i915/display/intel_display_params.h | 2 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 51 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 48 +- + .../drm/i915/display/intel_display_power_well.c | 64 +- + .../gpu/drm/i915/display/intel_display_reg_defs.h | 15 +- + drivers/gpu/drm/i915/display/intel_display_regs.h | 23 +- + drivers/gpu/drm/i915/display/intel_display_reset.c | 5 +- + drivers/gpu/drm/i915/display/intel_display_rps.c | 31 +- + drivers/gpu/drm/i915/display/intel_display_rps.h | 21 - + drivers/gpu/drm/i915/display/intel_display_types.h | 64 +- + drivers/gpu/drm/i915/display/intel_display_utils.h | 4 - + drivers/gpu/drm/i915/display/intel_display_wa.c | 10 +- + drivers/gpu/drm/i915/display/intel_display_wa.h | 10 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 27 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 5 + + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 60 + + drivers/gpu/drm/i915/display/intel_dp.c | 723 +- + drivers/gpu/drm/i915/display/intel_dp.h | 26 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 16 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 4 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 110 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 24 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 336 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 11 +- + drivers/gpu/drm/i915/{soc => display}/intel_dram.c | 421 +- + drivers/gpu/drm/i915/{soc => display}/intel_dram.h | 12 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 73 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 4 +- + drivers/gpu/drm/i915/display/intel_dsb_buffer.c | 43 +- + drivers/gpu/drm/i915/display/intel_dsb_buffer.h | 17 +- + drivers/gpu/drm/i915/display/intel_dsi.h | 7 +- + drivers/gpu/drm/i915/display/intel_fb.c | 6 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 293 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 3 + + drivers/gpu/drm/i915/display/intel_fbc_regs.h | 12 + + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 109 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 10 +- + drivers/gpu/drm/i915/display/intel_gvt_api.c | 43 + + drivers/gpu/drm/i915/display/intel_gvt_api.h | 21 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 22 - + .../gpu/drm/i915/display/intel_hdcp_gsc_message.c | 78 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 4 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 8 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 5 +- + drivers/gpu/drm/i915/display/intel_initial_plane.c | 193 + + ...intel_plane_initial.h => intel_initial_plane.h} | 6 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 1 - + drivers/gpu/drm/i915/display/intel_lt_phy.c | 72 +- + drivers/gpu/drm/i915/display/intel_lt_phy.h | 6 +- + drivers/gpu/drm/i915/display/intel_lt_phy_regs.h | 4 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 2 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 2 +- + .../gpu/drm/i915/display/intel_modeset_verify.c | 1 - + drivers/gpu/drm/i915/display/intel_panic.c | 27 - + drivers/gpu/drm/i915/display/intel_panic.h | 14 - + drivers/gpu/drm/i915/display/intel_parent.c | 214 + + drivers/gpu/drm/i915/display/intel_parent.h | 70 + + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 8 +- + drivers/gpu/drm/i915/display/intel_plane.c | 96 +- + drivers/gpu/drm/i915/display/intel_plane.h | 4 +- + drivers/gpu/drm/i915/display/intel_plane_initial.c | 440 - + drivers/gpu/drm/i915/display/intel_pps.c | 63 +- + drivers/gpu/drm/i915/display/intel_pps.h | 14 +- + drivers/gpu/drm/i915/display/intel_psr.c | 324 +- + drivers/gpu/drm/i915/display/intel_psr.h | 5 +- + drivers/gpu/drm/i915/{soc => display}/intel_rom.c | 8 +- + drivers/gpu/drm/i915/{soc => display}/intel_rom.h | 0 + drivers/gpu/drm/i915/display/intel_sprite.c | 9 +- + drivers/gpu/drm/i915/display/intel_tc.c | 40 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 46 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 3 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 37 +- + drivers/gpu/drm/i915/display/intel_vga.c | 44 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 281 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 10 + + drivers/gpu/drm/i915/display/intel_vrr_regs.h | 68 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 19 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 8 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 58 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 52 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 21 +- + drivers/gpu/drm/i915/gem/i915_gemfs.c | 71 - + drivers/gpu/drm/i915/gem/i915_gemfs.h | 14 - + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 15 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 9 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_debugfs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_engines_debugfs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 15 +- + drivers/gpu/drm/i915/gt/intel_gt_print.h | 5 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 4 - + drivers/gpu/drm/i915/gt/intel_rps.c | 40 +- + drivers/gpu/drm/i915/gt/intel_rps.h | 2 + + drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_wopcm.c | 3 - + drivers/gpu/drm/i915/gt/selftest_rps.c | 34 +- + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_debugfs.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_debugfs.c | 13 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log_debugfs.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 - + drivers/gpu/drm/i915/gt/uc/intel_huc_debugfs.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 17 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 64 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 5 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 2 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 26 +- + drivers/gpu/drm/i915/gvt/debugfs.c | 4 +- + drivers/gpu/drm/i915/gvt/display.c | 23 +- + drivers/gpu/drm/i915/gvt/display.h | 2 +- + drivers/gpu/drm/i915/gvt/display_helpers.h | 37 + + drivers/gpu/drm/i915/gvt/dmabuf.c | 6 +- + drivers/gpu/drm/i915/gvt/dmabuf.h | 7 +- + drivers/gpu/drm/i915/gvt/edid.c | 1 + + drivers/gpu/drm/i915/gvt/execlist.c | 2 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 14 +- + drivers/gpu/drm/i915/gvt/fb_decoder.h | 2 - + drivers/gpu/drm/i915/gvt/firmware.c | 4 +- + drivers/gpu/drm/i915/gvt/gtt.c | 9 +- + drivers/gpu/drm/i915/gvt/gvt.h | 26 +- + drivers/gpu/drm/i915/gvt/handlers.c | 21 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 5 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 24 +- + drivers/gpu/drm/i915/gvt/mmio.c | 13 +- + drivers/gpu/drm/i915/gvt/mmio_context.h | 5 - + drivers/gpu/drm/i915/gvt/opregion.c | 3 +- + drivers/gpu/drm/i915/gvt/page_track.c | 3 +- + drivers/gpu/drm/i915/gvt/sched_policy.c | 3 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 8 +- + drivers/gpu/drm/i915/gvt/trace.h | 2 +- + drivers/gpu/drm/i915/gvt/trace_points.c | 2 + + drivers/gpu/drm/i915/gvt/vgpu.c | 6 +- + drivers/gpu/drm/i915/i915_config.c | 3 +- + drivers/gpu/drm/i915/i915_config.h | 10 +- + drivers/gpu/drm/i915/i915_display_pc8.c | 31 + + drivers/gpu/drm/i915/i915_display_pc8.h | 9 + + drivers/gpu/drm/i915/i915_driver.c | 77 +- + drivers/gpu/drm/i915/i915_drv.h | 8 - + drivers/gpu/drm/i915/i915_edram.c | 44 + + drivers/gpu/drm/i915/i915_edram.h | 11 + + drivers/gpu/drm/i915/i915_freq.c | 111 + + drivers/gpu/drm/i915/i915_freq.h | 13 + + drivers/gpu/drm/i915/i915_gem.c | 4 +- + .../gpu/drm/i915/{soc/intel_gmch.c => i915_gmch.c} | 61 +- + drivers/gpu/drm/i915/i915_gmch.h | 13 + + .../{display/intel_hdcp_gsc.c => i915_hdcp_gsc.c} | 22 +- + drivers/gpu/drm/i915/i915_hdcp_gsc.h | 9 + + drivers/gpu/drm/i915/i915_initial_plane.c | 290 + + drivers/gpu/drm/i915/i915_initial_plane.h | 9 + + drivers/gpu/drm/i915/i915_irq.c | 16 + + drivers/gpu/drm/i915/i915_irq.h | 2 + + drivers/gpu/drm/i915/i915_panic.c | 35 + + drivers/gpu/drm/i915/i915_panic.h | 9 + + drivers/gpu/drm/i915/i915_params.c | 5 - + drivers/gpu/drm/i915/i915_params.h | 1 - + drivers/gpu/drm/i915/i915_pci.c | 6 +- + drivers/gpu/drm/i915/i915_request.c | 3 +- + drivers/gpu/drm/i915/i915_utils.c | 30 +- + drivers/gpu/drm/i915/i915_utils.h | 26 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 10 +- + drivers/gpu/drm/i915/intel_clock_gating.h | 6 +- + drivers/gpu/drm/i915/intel_gvt.c | 16 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 4 +- + drivers/gpu/drm/i915/intel_mchbar_regs.h | 68 +- + drivers/gpu/drm/i915/intel_uncore.c | 4 +- + drivers/gpu/drm/i915/intel_wakeref.c | 2 +- + drivers/gpu/drm/i915/intel_wakeref.h | 14 +- + drivers/gpu/drm/i915/soc/intel_gmch.h | 20 - + drivers/gpu/drm/i915/vlv_suspend.c | 2 +- + drivers/gpu/drm/imagination/Kconfig | 12 + + drivers/gpu/drm/imagination/Makefile | 3 +- + drivers/gpu/drm/imagination/pvr_debugfs.c | 2 - + drivers/gpu/drm/imagination/pvr_device.c | 200 +- + drivers/gpu/drm/imagination/pvr_device.h | 24 +- + drivers/gpu/drm/imagination/pvr_fw_trace.c | 125 +- + drivers/gpu/drm/imagination/pvr_fw_trace.h | 3 - + drivers/gpu/drm/imagination/pvr_params.c | 147 - + drivers/gpu/drm/imagination/pvr_params.h | 72 - + drivers/gpu/drm/imagination/pvr_test.c | 73 + + drivers/gpu/drm/imagination/pvr_vm.c | 2 +- + drivers/gpu/drm/imx/ipuv3/dw_hdmi-imx.c | 7 +- + drivers/gpu/drm/mediatek/mtk_crtc.c | 24 +- + drivers/gpu/drm/mediatek/mtk_dp.c | 57 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 4 + + drivers/gpu/drm/mediatek/mtk_hdmi.c | 4 +- + drivers/gpu/drm/mediatek/mtk_hdmi_common.c | 12 +- + drivers/gpu/drm/mediatek/mtk_hdmi_common.h | 1 - + drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 116 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 6 +- + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 7 +- + drivers/gpu/drm/meson/meson_encoder_dsi.c | 7 +- + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 10 +- + drivers/gpu/drm/meson/meson_venc.c | 4 +- + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a2xx_catalog.c | 12 + + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 5 +- + drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 14 +- + drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 4 + + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 +- + .../drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h | 492 + + .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 5 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 5 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 5 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 86 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 18 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 178 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 45 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 19 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 3 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 54 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.h | 26 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 89 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 49 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 180 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 56 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp_v13.c | 321 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 7 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 18 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 10 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 17 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 72 +- + drivers/gpu/drm/msm/disp/dpu1/msm_media_info.h | 1155 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 314 - + drivers/gpu/drm/msm/disp/mdp_format.c | 772 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 80 +- + drivers/gpu/drm/msm/dp/dp_display.c | 7 +- + drivers/gpu/drm/msm/dp/dp_drm.h | 3 +- + drivers/gpu/drm/msm/dp/dp_link.h | 3 + + drivers/gpu/drm/msm/dp/dp_panel.c | 93 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 13 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 7 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 23 + + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 195 +- + drivers/gpu/drm/msm/msm_drv.c | 24 +- + drivers/gpu/drm/msm/msm_gem.c | 49 - + drivers/gpu/drm/msm/msm_gem.h | 5 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 10 +- + drivers/gpu/drm/msm/msm_mdss.c | 12 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 24 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.c | 2 +- + drivers/gpu/drm/nova/driver.rs | 18 +- + drivers/gpu/drm/nova/gem.rs | 6 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 1 + + drivers/gpu/drm/panel/Kconfig | 13 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-edp.c | 10 + + drivers/gpu/drm/panel/panel-himax-hx83102.c | 12 +- + drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 147 +- + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 281 +- + drivers/gpu/drm/panel/panel-jdi-lpm102a188a.c | 4 +- + drivers/gpu/drm/panel/panel-lg-sw43408.c | 64 +- + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 35 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 175 +- + drivers/gpu/drm/panel/panel-samsung-ltl106hl02.c | 179 + + drivers/gpu/drm/panel/panel-simple.c | 57 + + drivers/gpu/drm/panfrost/panfrost_device.c | 3 + + drivers/gpu/drm/panfrost/panfrost_device.h | 1 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 112 +- + drivers/gpu/drm/panfrost/panfrost_drv.h | 9 + + drivers/gpu/drm/panfrost/panfrost_gem.c | 257 + + drivers/gpu/drm/panfrost/panfrost_gem.h | 12 + + drivers/gpu/drm/panfrost/panfrost_gpu.c | 26 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 40 +- + drivers/gpu/drm/panfrost/panfrost_regs.h | 10 +- + drivers/gpu/drm/panthor/panthor_device.c | 13 +- + drivers/gpu/drm/panthor/panthor_drv.c | 89 +- + drivers/gpu/drm/panthor/panthor_drv.h | 9 + + drivers/gpu/drm/panthor/panthor_fw.c | 8 +- + drivers/gpu/drm/panthor/panthor_gem.c | 258 +- + drivers/gpu/drm/panthor/panthor_gem.h | 8 + + drivers/gpu/drm/panthor/panthor_gpu.c | 21 +- + drivers/gpu/drm/panthor/panthor_hw.c | 36 +- + drivers/gpu/drm/panthor/panthor_mmu.c | 406 +- + drivers/gpu/drm/panthor/panthor_sched.c | 270 +- + drivers/gpu/drm/panthor/panthor_sched.h | 1 + + drivers/gpu/drm/pl111/pl111_display.c | 4 +- + drivers/gpu/drm/pl111/pl111_drv.c | 29 +- + drivers/gpu/drm/pl111/pl111_nomadik.c | 5 +- + drivers/gpu/drm/pl111/pl111_nomadik.h | 4 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 53 +- + drivers/gpu/drm/pl111/pl111_versatile.h | 2 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 74 +- + drivers/gpu/drm/radeon/evergreen.c | 112 +- + drivers/gpu/drm/radeon/radeon_display.c | 66 +- + drivers/gpu/drm/radeon/radeon_gem.c | 6 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 15 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 23 +- + drivers/gpu/drm/radeon/radeon_mode.h | 10 +- + drivers/gpu/drm/radeon/radeon_vce.c | 5 +- + drivers/gpu/drm/radeon/uvd_v1_0.c | 26 +- + drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c | 10 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 461 + + .../gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h | 34 + + drivers/gpu/drm/rockchip/Kconfig | 5 +- + drivers/gpu/drm/rockchip/Makefile | 2 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 20 + + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 16 + + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 17 +- + drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c | 189 + + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 47 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 163 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 57 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 14 + + drivers/gpu/drm/scheduler/sched_main.c | 40 +- + drivers/gpu/drm/sitronix/Kconfig | 48 +- + drivers/gpu/drm/sitronix/Makefile | 3 + + drivers/gpu/drm/sitronix/st7571-i2c.c | 1003 +- + drivers/gpu/drm/sitronix/st7571-spi.c | 76 + + drivers/gpu/drm/sitronix/st7571.c | 918 + + drivers/gpu/drm/sitronix/st7571.h | 91 + + drivers/gpu/drm/sitronix/st7920.c | 867 + + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 42 +- + drivers/gpu/drm/tegra/drm.c | 4 +- + drivers/gpu/drm/tegra/dsi.c | 6 +- + drivers/gpu/drm/tests/drm_buddy_test.c | 35 + + drivers/gpu/drm/tests/drm_client_modeset_test.c | 3 + + drivers/gpu/drm/tests/drm_connector_test.c | 19 + + drivers/gpu/drm/tests/drm_gem_shmem_test.c | 30 +- + drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 667 + + drivers/gpu/drm/tests/drm_kunit_edid.h | 119 + + drivers/gpu/drm/tests/drm_panic_test.c | 221 + + drivers/gpu/drm/tiny/arcpgu.c | 5 +- + drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 64 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 57 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 12 +- + drivers/gpu/drm/ttm/ttm_device.c | 5 +- + drivers/gpu/drm/ttm/ttm_pool.c | 26 +- + drivers/gpu/drm/ttm/ttm_resource.c | 14 +- + drivers/gpu/drm/ttm/ttm_tt.c | 2 +- + drivers/gpu/drm/tyr/driver.rs | 55 +- + drivers/gpu/drm/tyr/gpu.rs | 68 +- + drivers/gpu/drm/v3d/Makefile | 3 +- + drivers/gpu/drm/v3d/v3d_bo.c | 14 +- + drivers/gpu/drm/v3d/v3d_drv.c | 10 +- + drivers/gpu/drm/v3d/v3d_drv.h | 11 +- + drivers/gpu/drm/v3d/v3d_gem.c | 37 +- + drivers/gpu/drm/v3d/v3d_gemfs.c | 62 - + drivers/gpu/drm/v3d/v3d_irq.c | 8 +- + drivers/gpu/drm/v3d/v3d_mmu.c | 6 +- + drivers/gpu/drm/v3d/v3d_sched.c | 6 +- + drivers/gpu/drm/v3d/v3d_submit.c | 140 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 105 +- + drivers/gpu/drm/vgem/Kconfig | 9 + + drivers/gpu/drm/vkms/vkms_composer.c | 1 + + drivers/gpu/drm/vkms/vkms_drv.c | 1 + + drivers/gpu/drm/xe/Makefile | 32 +- + drivers/gpu/drm/xe/abi/guc_actions_abi.h | 6 + + drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 67 +- + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 73 + + drivers/gpu/drm/xe/abi/guc_lfd_abi.h | 170 + + drivers/gpu/drm/xe/abi/guc_lic_abi.h | 77 + + drivers/gpu/drm/xe/abi/guc_log_abi.h | 42 +- + drivers/gpu/drm/xe/abi/guc_scheduler_abi.h | 57 + + .../xe/compat-i915-headers/gem/i915_gem_object.h | 13 - + .../xe/compat-i915-headers/gem/i915_gem_stolen.h | 40 - + .../drm/xe/compat-i915-headers/gt/intel_gt_types.h | 11 - + .../gpu/drm/xe/compat-i915-headers/i915_active.h | 22 - + .../drm/xe/compat-i915-headers/i915_active_types.h | 13 - + .../gpu/drm/xe/compat-i915-headers/i915_config.h | 5 +- + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 37 - + drivers/gpu/drm/xe/compat-i915-headers/i915_irq.h | 6 - + .../gpu/drm/xe/compat-i915-headers/i915_utils.h | 13 - + drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h | 18 - + drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h | 4 +- + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 11 +- + .../gpu/drm/xe/compat-i915-headers/intel_wakeref.h | 10 - + .../gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h | 29 - + .../drm/xe/compat-i915-headers/soc/intel_dram.h | 6 - + .../drm/xe/compat-i915-headers/soc/intel_gmch.h | 6 - + .../gpu/drm/xe/compat-i915-headers/soc/intel_rom.h | 6 - + drivers/gpu/drm/xe/display/ext/i915_irq.c | 85 - + drivers/gpu/drm/xe/display/intel_bo.c | 8 +- + drivers/gpu/drm/xe/display/xe_display.c | 30 +- + drivers/gpu/drm/xe/display/xe_display_misc.c | 16 - + drivers/gpu/drm/xe/display/xe_display_rpm.c | 3 + + drivers/gpu/drm/xe/display/xe_dsb_buffer.c | 49 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 113 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 60 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.h | 9 + + drivers/gpu/drm/xe/display/xe_initial_plane.c | 189 + + drivers/gpu/drm/xe/display/xe_initial_plane.h | 9 + + drivers/gpu/drm/xe/display/xe_panic.c | 16 +- + drivers/gpu/drm/xe/display/xe_panic.h | 9 + + drivers/gpu/drm/xe/display/xe_plane_initial.c | 319 - + drivers/gpu/drm/xe/display/xe_stolen.c | 64 +- + drivers/gpu/drm/xe/display/xe_stolen.h | 9 + + drivers/gpu/drm/xe/instructions/xe_gpu_commands.h | 1 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 9 + + drivers/gpu/drm/xe/regs/xe_gtt_defs.h | 1 + + drivers/gpu/drm/xe/regs/xe_guc_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_irq_regs.h | 1 + + drivers/gpu/drm/xe/regs/xe_mert_regs.h | 23 + + drivers/gpu/drm/xe/regs/xe_oa_regs.h | 17 + + drivers/gpu/drm/xe/regs/xe_pcode_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_pmt.h | 3 - + drivers/gpu/drm/xe/regs/xe_soc_remapper_regs.h | 14 + + drivers/gpu/drm/xe/tests/xe_args_test.c | 54 + + drivers/gpu/drm/xe/tests/xe_bo.c | 11 +- + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 3 +- + drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c | 2 +- + drivers/gpu/drm/xe/tests/xe_migrate.c | 10 +- + drivers/gpu/drm/xe/tests/xe_mocs.c | 27 +- + drivers/gpu/drm/xe/xe_args.h | 27 + + drivers/gpu/drm/xe/xe_bb.c | 3 +- + drivers/gpu/drm/xe/xe_bo.c | 40 +- + drivers/gpu/drm/xe/xe_bo.h | 9 +- + drivers/gpu/drm/xe/xe_debugfs.c | 144 +- + drivers/gpu/drm/xe/xe_devcoredump.c | 33 +- + drivers/gpu/drm/xe/xe_device.c | 253 +- + drivers/gpu/drm/xe/xe_device.h | 9 + + drivers/gpu/drm/xe/xe_device_sysfs.c | 33 +- + drivers/gpu/drm/xe/xe_device_types.h | 62 +- + drivers/gpu/drm/xe/xe_drm_client.c | 67 +- + drivers/gpu/drm/xe/xe_exec.c | 10 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 422 +- + drivers/gpu/drm/xe/xe_exec_queue.h | 66 + + drivers/gpu/drm/xe/xe_exec_queue_types.h | 58 + + drivers/gpu/drm/xe/xe_execlist.c | 5 +- + drivers/gpu/drm/xe/xe_force_wake.c | 7 + + drivers/gpu/drm/xe/xe_force_wake.h | 40 + + drivers/gpu/drm/xe/xe_gen_wa_oob.c | 3 +- + drivers/gpu/drm/xe/xe_ggtt.c | 220 +- + drivers/gpu/drm/xe/xe_ggtt.h | 14 +- + drivers/gpu/drm/xe/xe_ggtt_types.h | 32 +- + drivers/gpu/drm/xe/xe_gpu_scheduler.c | 9 +- + drivers/gpu/drm/xe/xe_gpu_scheduler.h | 37 +- + drivers/gpu/drm/xe/xe_gpu_scheduler_types.h | 2 + + drivers/gpu/drm/xe/xe_gsc.c | 34 +- + drivers/gpu/drm/xe/xe_gsc_debugfs.c | 8 +- + drivers/gpu/drm/xe/xe_gsc_proxy.c | 19 +- + drivers/gpu/drm/xe/xe_gsc_submit.c | 2 - + drivers/gpu/drm/xe/xe_gt.c | 206 +- + drivers/gpu/drm/xe/xe_gt.h | 14 +- + drivers/gpu/drm/xe/xe_gt_ccs_mode.c | 8 +- + drivers/gpu/drm/xe/xe_gt_ccs_mode.h | 2 +- + drivers/gpu/drm/xe/xe_gt_clock.c | 6 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 31 +- + drivers/gpu/drm/xe/xe_gt_freq.c | 27 +- + drivers/gpu/drm/xe/xe_gt_idle.c | 42 +- + drivers/gpu/drm/xe/xe_gt_mcr.c | 1 - + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 20 + + drivers/gpu/drm/xe/xe_gt_sriov_pf.h | 8 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 319 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 10 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config_types.h | 5 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 317 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c | 4 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c | 330 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.h | 10 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy_types.h | 39 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 5 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 238 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c | 12 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 15 + + drivers/gpu/drm/xe/xe_gt_stats.c | 17 +- + drivers/gpu/drm/xe/xe_gt_stats.h | 32 + + drivers/gpu/drm/xe/xe_gt_stats_types.h | 10 + + drivers/gpu/drm/xe/xe_gt_sysfs.c | 2 +- + drivers/gpu/drm/xe/xe_gt_throttle.c | 11 +- + drivers/gpu/drm/xe/xe_gt_types.h | 5 + + drivers/gpu/drm/xe/xe_guc.c | 82 +- + drivers/gpu/drm/xe/xe_guc.h | 23 + + drivers/gpu/drm/xe/xe_guc_ads.c | 10 +- + drivers/gpu/drm/xe/xe_guc_buf.c | 3 +- + drivers/gpu/drm/xe/xe_guc_capture.c | 30 +- + drivers/gpu/drm/xe/xe_guc_capture.h | 2 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 280 +- + drivers/gpu/drm/xe/xe_guc_ct.h | 8 +- + drivers/gpu/drm/xe/xe_guc_debugfs.c | 20 +- + drivers/gpu/drm/xe/xe_guc_exec_queue_types.h | 2 - + drivers/gpu/drm/xe/xe_guc_fwif.h | 60 +- + drivers/gpu/drm/xe/xe_guc_hwconfig.c | 4 +- + drivers/gpu/drm/xe/xe_guc_klv_helpers.c | 9 + + .../gpu/drm/xe/xe_guc_klv_thresholds_set_types.h | 6 + + drivers/gpu/drm/xe/xe_guc_log.c | 509 +- + drivers/gpu/drm/xe/xe_guc_log.h | 30 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 98 +- + drivers/gpu/drm/xe/xe_guc_relay.c | 3 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 1079 +- + drivers/gpu/drm/xe/xe_guc_submit.h | 11 +- + drivers/gpu/drm/xe/xe_guc_submit_types.h | 22 +- + drivers/gpu/drm/xe/xe_guc_tlb_inval.c | 44 +- + drivers/gpu/drm/xe/xe_heci_gsc.c | 1 - + drivers/gpu/drm/xe/xe_huc.c | 8 +- + drivers/gpu/drm/xe/xe_huc_debugfs.c | 8 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 1 - + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 18 +- + drivers/gpu/drm/xe/xe_hw_engine_group.c | 81 +- + drivers/gpu/drm/xe/xe_hw_engine_group.h | 4 +- + drivers/gpu/drm/xe/xe_hw_fence.c | 24 +- + drivers/gpu/drm/xe/xe_hw_fence.h | 2 - + drivers/gpu/drm/xe/xe_hwmon.c | 331 +- + drivers/gpu/drm/xe/xe_i2c.c | 15 +- + drivers/gpu/drm/xe/xe_irq.c | 3 +- + drivers/gpu/drm/xe/xe_lmtt.c | 25 +- + drivers/gpu/drm/xe/xe_lrc.c | 115 +- + drivers/gpu/drm/xe/xe_lrc.h | 10 +- + drivers/gpu/drm/xe/xe_lrc_types.h | 3 + + drivers/gpu/drm/xe/xe_memirq.c | 2 - + drivers/gpu/drm/xe/xe_mert.c | 118 + + drivers/gpu/drm/xe/xe_mert.h | 35 + + drivers/gpu/drm/xe/xe_migrate.c | 64 +- + drivers/gpu/drm/xe/xe_migrate.h | 3 + + drivers/gpu/drm/xe/xe_mmio.c | 4 - + drivers/gpu/drm/xe/xe_mocs.c | 20 +- + drivers/gpu/drm/xe/xe_module.c | 10 +- + drivers/gpu/drm/xe/xe_module.h | 2 +- + drivers/gpu/drm/xe/xe_nvm.c | 35 +- + drivers/gpu/drm/xe/xe_oa.c | 94 +- + drivers/gpu/drm/xe/xe_oa_types.h | 1 + + drivers/gpu/drm/xe/xe_page_reclaim.c | 132 + + drivers/gpu/drm/xe/xe_page_reclaim.h | 125 + + drivers/gpu/drm/xe/xe_pagefault.c | 36 +- + drivers/gpu/drm/xe/xe_pat.c | 272 +- + drivers/gpu/drm/xe/xe_pat.h | 23 + + drivers/gpu/drm/xe/xe_pci.c | 42 +- + drivers/gpu/drm/xe/xe_pci_rebar.c | 106 + + drivers/gpu/drm/xe/xe_pci_rebar.h | 13 + + drivers/gpu/drm/xe/xe_pci_sriov.c | 10 +- + drivers/gpu/drm/xe/xe_pci_types.h | 9 + + drivers/gpu/drm/xe/xe_pcode_api.h | 9 + + drivers/gpu/drm/xe/xe_pm.c | 34 +- + drivers/gpu/drm/xe/xe_pmu.c | 2 +- + drivers/gpu/drm/xe/xe_psmi.c | 2 +- + drivers/gpu/drm/xe/xe_pt.c | 167 +- + drivers/gpu/drm/xe/xe_pt_types.h | 6 + + drivers/gpu/drm/xe/xe_pxp.c | 56 +- + drivers/gpu/drm/xe/xe_pxp_debugfs.c | 2 +- + drivers/gpu/drm/xe/xe_query.c | 23 +- + drivers/gpu/drm/xe/xe_reg_sr.c | 22 +- + drivers/gpu/drm/xe/xe_reg_whitelist.c | 82 +- + drivers/gpu/drm/xe/xe_ring_ops.c | 99 +- + drivers/gpu/drm/xe/xe_rtp.c | 1 - + drivers/gpu/drm/xe/xe_sa.c | 69 +- + drivers/gpu/drm/xe/xe_sa.h | 20 +- + drivers/gpu/drm/xe/xe_sa_types.h | 3 + + drivers/gpu/drm/xe/xe_sched_job.c | 3 +- + drivers/gpu/drm/xe/xe_sched_job_types.h | 2 + + drivers/gpu/drm/xe/xe_soc_remapper.c | 52 + + drivers/gpu/drm/xe/xe_soc_remapper.h | 13 + + drivers/gpu/drm/xe/xe_sriov_packet.c | 3 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 2 + + drivers/gpu/drm/xe/xe_sriov_pf_debugfs.c | 7 +- + drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 16 +- + drivers/gpu/drm/xe/xe_sriov_vf.c | 85 +- + drivers/gpu/drm/xe/xe_sriov_vf_ccs.c | 27 +- + drivers/gpu/drm/xe/xe_sriov_vf_ccs.h | 1 + + drivers/gpu/drm/xe/xe_step.c | 3 +- + drivers/gpu/drm/xe/xe_survivability_mode.c | 282 +- + drivers/gpu/drm/xe/xe_survivability_mode_types.h | 28 +- + drivers/gpu/drm/xe/xe_svm.c | 754 +- + drivers/gpu/drm/xe/xe_svm.h | 85 +- + drivers/gpu/drm/xe/xe_sync.c | 33 +- + drivers/gpu/drm/xe/xe_sync.h | 2 + + drivers/gpu/drm/xe/xe_tile.c | 42 +- + drivers/gpu/drm/xe/xe_tile.h | 21 + + drivers/gpu/drm/xe/xe_tile_debugfs.c | 17 +- + drivers/gpu/drm/xe/xe_tile_sriov_pf_debugfs.c | 3 +- + drivers/gpu/drm/xe/xe_tlb_inval.c | 44 +- + drivers/gpu/drm/xe/xe_tlb_inval.h | 2 +- + drivers/gpu/drm/xe/xe_tlb_inval_job.c | 36 +- + drivers/gpu/drm/xe/xe_tlb_inval_job.h | 4 + + drivers/gpu/drm/xe/xe_tlb_inval_types.h | 7 +- + drivers/gpu/drm/xe/xe_trace.h | 51 +- + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 1 - + drivers/gpu/drm/xe/xe_ttm_sys_mgr.c | 1 - + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 1 - + drivers/gpu/drm/xe/xe_uc.c | 37 +- + drivers/gpu/drm/xe/xe_uc.h | 2 + + drivers/gpu/drm/xe/xe_uc_debugfs.c | 2 +- + drivers/gpu/drm/xe/xe_uc_fw.c | 24 +- + drivers/gpu/drm/xe/xe_userptr.c | 2 +- + drivers/gpu/drm/xe/xe_validation.c | 1 - + drivers/gpu/drm/xe/xe_vm.c | 251 +- + drivers/gpu/drm/xe/xe_vm.h | 4 + + drivers/gpu/drm/xe/xe_vm_madvise.c | 106 +- + drivers/gpu/drm/xe/xe_vm_types.h | 22 +- + drivers/gpu/drm/xe/xe_vram.c | 101 +- + drivers/gpu/drm/xe/xe_vram.h | 1 - + drivers/gpu/drm/xe/xe_vram_freq.c | 1 - + drivers/gpu/drm/xe/xe_vram_types.h | 15 +- + drivers/gpu/drm/xe/xe_vsec.c | 7 +- + drivers/gpu/drm/xe/xe_wa.c | 54 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 6 +- + drivers/gpu/drm/xe/xe_wait_user_fence.c | 1 - + drivers/gpu/drm/xe/xe_wopcm.c | 2 +- + drivers/gpu/host1x/bus.c | 67 +- + drivers/gpu/nova-core/driver.rs | 5 +- + drivers/gpu/nova-core/falcon.rs | 107 +- + drivers/gpu/nova-core/falcon/hal.rs | 26 + + drivers/gpu/nova-core/falcon/hal/ga102.rs | 43 +- + drivers/gpu/nova-core/falcon/hal/tu102.rs | 77 + + drivers/gpu/nova-core/fb.rs | 2 +- + drivers/gpu/nova-core/firmware.rs | 203 +- + drivers/gpu/nova-core/firmware/booter.rs | 43 +- + drivers/gpu/nova-core/firmware/fwsec.rs | 51 +- + drivers/gpu/nova-core/firmware/gsp.rs | 146 +- + drivers/gpu/nova-core/gpu.rs | 4 +- + drivers/gpu/nova-core/gsp.rs | 75 +- + drivers/gpu/nova-core/gsp/boot.rs | 18 +- + drivers/gpu/nova-core/gsp/cmdq.rs | 2 +- + drivers/gpu/nova-core/gsp/commands.rs | 29 +- + drivers/gpu/nova-core/gsp/fw.rs | 14 +- + drivers/gpu/nova-core/gsp/sequencer.rs | 14 +- + drivers/gpu/nova-core/nova_core.rs | 1 - + drivers/gpu/nova-core/regs.rs | 42 +- + drivers/gpu/nova-core/util.rs | 16 - + drivers/gpu/nova-core/vbios.rs | 73 +- + drivers/staging/media/tegra-video/video.c | 4 +- + drivers/tty/vt/vt.c | 32 +- + drivers/video/fbdev/core/fbcon.c | 24 - + drivers/video/fbdev/core/fbcon.h | 1 - + include/drm/bridge/inno_hdmi.h | 35 + + include/drm/bridge/samsung-dsim.h | 1 - + include/drm/display/drm_dp_helper.h | 3 + + include/drm/drm_atomic.h | 44 +- + include/drm/drm_bridge.h | 156 +- + include/drm/drm_connector.h | 115 +- + include/drm/drm_device.h | 15 + + include/drm/drm_fb_helper.h | 21 - + include/drm/drm_file.h | 7 +- + include/drm/drm_gem.h | 45 +- + include/drm/drm_gem_shmem_helper.h | 14 +- + include/drm/drm_gpusvm.h | 29 + + include/drm/drm_gpuvm.h | 12 +- + include/drm/drm_mode_object.h | 3 + + include/drm/drm_modeset_helper_vtables.h | 23 - + include/drm/drm_of.h | 6 +- + include/drm/drm_pagemap.h | 106 +- + include/drm/drm_pagemap_util.h | 92 + + include/drm/drm_property.h | 1 + + include/drm/drm_vblank.h | 3 +- + include/drm/gpu_scheduler.h | 52 + + include/drm/intel/display_parent_interface.h | 104 + + include/drm/intel/intel_lb_mei_interface.h | 3 +- + include/linux/console.h | 8 - + include/linux/dma-buf.h | 12 - + include/linux/dma-fence.h | 35 +- + include/linux/dma-heap.h | 2 + + include/linux/fb.h | 4 - + include/linux/host1x.h | 2 +- + include/trace/events/dma_buf.h | 159 + + include/uapi/drm/amdgpu_drm.h | 25 +- + include/uapi/drm/amdxdna_accel.h | 8 + + include/uapi/drm/panfrost_drm.h | 76 +- + include/uapi/drm/panthor_drm.h | 157 +- + include/uapi/drm/rocket_accel.h | 98 +- + include/uapi/drm/xe_drm.h | 95 +- + include/uapi/linux/kfd_ioctl.h | 16 +- + include/uapi/linux/kfd_sysfs.h | 3 +- + rust/helpers/drm.c | 7 +- + rust/kernel/drm/driver.rs | 6 +- + rust/kernel/drm/gem/mod.rs | 8 +- + rust/kernel/page.rs | 36 +- + 1328 files changed, 154448 insertions(+), 23403 deletions(-) + delete mode 100644 Documentation/ABI/testing/sysfs-kernel-dmabuf-buffers + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,adreno-rgmu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,kaanapali-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/sitronix,st7920.yaml + create mode 100644 Documentation/gpu/amdgpu/amd_overview_block.svg + create mode 100644 Documentation/gpu/amdgpu/enforce_isolation.svg + create mode 100644 Documentation/gpu/amdgpu/gfx_pipeline_seq.svg + create mode 100644 Documentation/gpu/amdgpu/no_enforce_isolation.svg + create mode 100644 Documentation/gpu/amdgpu/ring-buffer.rst + create mode 100644 Documentation/gpu/amdgpu/ring_buffers.svg + delete mode 100644 drivers/accel/amdxdna/npu2_regs.c + delete mode 100644 drivers/dma-buf/dma-buf-sysfs-stats.c + delete mode 100644 drivers/dma-buf/dma-buf-sysfs-stats.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_3_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_3_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v12_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v15_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v15_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v7_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v7_1_0_pkt_open.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v15_0_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v15_0_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v15_0_8.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v15_0_8.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v12_1.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml2_wrapper_fpu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_panel_replay.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_4_2_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_4_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_15_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_15_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_15_0_8_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_15_0_8_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_7_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_7_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_15_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_15_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_15_0_8_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_15_0_8_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_15_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_15_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_5_3_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_5_3_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/gfx/irqsrcs_gfx_12_1_0.h + create mode 100644 drivers/gpu/drm/amd/include/soc_v1_0_enum.h + create mode 100644 drivers/gpu/drm/amd/include/soc_v1_0_ih_clientid.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu15_driver_if_v15_0_0.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v15_0_0_pmfw.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v15_0_0_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/smu_v15_0.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu15/Makefile + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.h + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.h + rename drivers/gpu/drm/{rockchip/inno_hdmi.c => bridge/inno-hdmi.c} (69%) + create mode 100644 drivers/gpu/drm/drm_pagemap_util.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_buffer.h + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_flop_reset.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_flop_reset.h + create mode 100644 drivers/gpu/drm/hyperv/Kconfig + rename drivers/gpu/drm/i915/{soc => display}/intel_dram.c (53%) + rename drivers/gpu/drm/i915/{soc => display}/intel_dram.h (68%) + create mode 100644 drivers/gpu/drm/i915/display/intel_gvt_api.c + create mode 100644 drivers/gpu/drm/i915/display/intel_gvt_api.h + delete mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_gsc.h + create mode 100644 drivers/gpu/drm/i915/display/intel_initial_plane.c + rename drivers/gpu/drm/i915/display/{intel_plane_initial.h => intel_initial_plane.h} (60%) + delete mode 100644 drivers/gpu/drm/i915/display/intel_panic.c + delete mode 100644 drivers/gpu/drm/i915/display/intel_panic.h + create mode 100644 drivers/gpu/drm/i915/display/intel_parent.c + create mode 100644 drivers/gpu/drm/i915/display/intel_parent.h + delete mode 100644 drivers/gpu/drm/i915/display/intel_plane_initial.c + rename drivers/gpu/drm/i915/{soc => display}/intel_rom.c (96%) + rename drivers/gpu/drm/i915/{soc => display}/intel_rom.h (100%) + delete mode 100644 drivers/gpu/drm/i915/gem/i915_gemfs.c + delete mode 100644 drivers/gpu/drm/i915/gem/i915_gemfs.h + create mode 100644 drivers/gpu/drm/i915/gvt/display_helpers.h + create mode 100644 drivers/gpu/drm/i915/i915_display_pc8.c + create mode 100644 drivers/gpu/drm/i915/i915_display_pc8.h + create mode 100644 drivers/gpu/drm/i915/i915_edram.c + create mode 100644 drivers/gpu/drm/i915/i915_edram.h + create mode 100644 drivers/gpu/drm/i915/i915_freq.c + create mode 100644 drivers/gpu/drm/i915/i915_freq.h + rename drivers/gpu/drm/i915/{soc/intel_gmch.c => i915_gmch.c} (68%) + create mode 100644 drivers/gpu/drm/i915/i915_gmch.h + rename drivers/gpu/drm/i915/{display/intel_hdcp_gsc.c => i915_hdcp_gsc.c} (89%) + create mode 100644 drivers/gpu/drm/i915/i915_hdcp_gsc.h + create mode 100644 drivers/gpu/drm/i915/i915_initial_plane.c + create mode 100644 drivers/gpu/drm/i915/i915_initial_plane.h + create mode 100644 drivers/gpu/drm/i915/i915_panic.c + create mode 100644 drivers/gpu/drm/i915/i915_panic.h + delete mode 100644 drivers/gpu/drm/i915/soc/intel_gmch.h + delete mode 100644 drivers/gpu/drm/imagination/pvr_params.c + delete mode 100644 drivers/gpu/drm/imagination/pvr_params.h + create mode 100644 drivers/gpu/drm/imagination/pvr_test.c + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp_v13.c + delete mode 100644 drivers/gpu/drm/msm/disp/dpu1/msm_media_info.h + create mode 100644 drivers/gpu/drm/panel/panel-samsung-ltl106hl02.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_drv.h + create mode 100644 drivers/gpu/drm/panthor/panthor_drv.h + create mode 100644 drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c + create mode 100644 drivers/gpu/drm/sitronix/st7571-spi.c + create mode 100644 drivers/gpu/drm/sitronix/st7571.c + create mode 100644 drivers/gpu/drm/sitronix/st7571.h + create mode 100644 drivers/gpu/drm/sitronix/st7920.c + create mode 100644 drivers/gpu/drm/tests/drm_panic_test.c + delete mode 100644 drivers/gpu/drm/v3d/v3d_gemfs.c + create mode 100644 drivers/gpu/drm/vgem/Kconfig + create mode 100644 drivers/gpu/drm/xe/abi/guc_lfd_abi.h + create mode 100644 drivers/gpu/drm/xe/abi/guc_lic_abi.h + create mode 100644 drivers/gpu/drm/xe/abi/guc_scheduler_abi.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gt/intel_gt_types.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_active.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_active_types.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_irq.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_utils.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/pxp/intel_pxp.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_dram.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_gmch.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_rom.h + delete mode 100644 drivers/gpu/drm/xe/display/ext/i915_irq.c + delete mode 100644 drivers/gpu/drm/xe/display/xe_display_misc.c + create mode 100644 drivers/gpu/drm/xe/display/xe_hdcp_gsc.h + create mode 100644 drivers/gpu/drm/xe/display/xe_initial_plane.c + create mode 100644 drivers/gpu/drm/xe/display/xe_initial_plane.h + create mode 100644 drivers/gpu/drm/xe/display/xe_panic.h + delete mode 100644 drivers/gpu/drm/xe/display/xe_plane_initial.c + create mode 100644 drivers/gpu/drm/xe/display/xe_stolen.h + create mode 100644 drivers/gpu/drm/xe/regs/xe_mert_regs.h + create mode 100644 drivers/gpu/drm/xe/regs/xe_soc_remapper_regs.h + create mode 100644 drivers/gpu/drm/xe/xe_mert.c + create mode 100644 drivers/gpu/drm/xe/xe_mert.h + create mode 100644 drivers/gpu/drm/xe/xe_page_reclaim.c + create mode 100644 drivers/gpu/drm/xe/xe_page_reclaim.h + create mode 100644 drivers/gpu/drm/xe/xe_pci_rebar.c + create mode 100644 drivers/gpu/drm/xe/xe_pci_rebar.h + create mode 100644 drivers/gpu/drm/xe/xe_soc_remapper.c + create mode 100644 drivers/gpu/drm/xe/xe_soc_remapper.h + create mode 100644 drivers/gpu/nova-core/falcon/hal/tu102.rs + delete mode 100644 drivers/gpu/nova-core/util.rs + create mode 100644 include/drm/bridge/inno_hdmi.h + create mode 100644 include/drm/drm_pagemap_util.h + create mode 100644 include/trace/events/dma_buf.h +Merging drm-exynos/for-linux-next (3a8660878839f Linux 6.18-rc1) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (69674c1c704c0 accel/amdxdna: Move RPM resume into job run function) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c +Merge made by the 'ort' strategy. + drivers/accel/amdxdna/aie2_ctx.c | 48 +++++-------- + drivers/accel/amdxdna/aie2_message.c | 3 + + drivers/accel/amdxdna/aie2_pm.c | 3 + + drivers/accel/amdxdna/aie2_smu.c | 2 - + drivers/accel/amdxdna/amdxdna_ctx.h | 5 -- + drivers/accel/amdxdna/amdxdna_pci_drv.c | 3 + + drivers/accel/amdxdna/amdxdna_pci_drv.h | 1 + + drivers/accel/amdxdna/amdxdna_ubuf.c | 10 ++- + .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 82 ++++++++++++++-------- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 16 +++-- + drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 4 -- + 13 files changed, 103 insertions(+), 80 deletions(-) +Merging amdgpu/drm-next (d6e04d2e675fe drm/amd/pm: Remove buffer allocation in SMUv13.0.6) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 18 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.c | 21 +++++ + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 9 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 40 +++++---- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 15 +++- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 70 +++++++++++++++- + .../amd/display/amdgpu_dm/amdgpu_dm_irq_params.h | 1 + + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h | 6 ++ + drivers/gpu/drm/amd/display/dc/core/dc.c | 24 ++++-- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 7 ++ + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 1 + + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 15 +++- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 27 +++++- + .../gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.c | 54 +++++++++++- + .../gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.h | 18 +++- + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c | 30 +++---- + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h | 17 ++++ + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 3 + + .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 3 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 37 +++++++-- + drivers/gpu/drm/amd/display/dc/dio/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dio/dcn10/dcn10_dio.c | 47 +++++++++++ + .../gpu/drm/amd/display/dc/dio/dcn10/dcn10_dio.h | 42 ++++++++++ + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 1 + + .../dc/dml2_0/dml21/dml21_translation_helper.c | 3 + + .../dml2_0/dml21/inc/dml_top_soc_parameter_types.h | 3 + + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 26 ++++-- + .../dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 59 ++++++++----- + .../dml21/src/inc/dml2_internal_shared_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dsc/dsc.h | 1 + + .../drm/amd/display/dc/dwb/dcn30/dcn30_cm_common.h | 2 +- + .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.c | 2 + + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c | 2 + + .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c | 2 + + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 7 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 9 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 30 ++----- + .../drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.c | 10 ++- + .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 9 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 18 ++-- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 15 ++-- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 27 +++--- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 13 ++- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 25 +++--- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/dio.h | 22 +++++ + .../drm/amd/display/dc/inc/hw/timing_generator.h | 7 ++ + .../dc/link/protocols/link_dp_panel_replay.c | 52 ++++++++++++ + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 19 ++++- + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 96 +++++++++++++++++++++- + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.h | 10 +++ + .../dc/resource/dcn32/dcn32_resource_helpers.c | 3 +- + .../amd/display/dc/resource/dcn36/dcn36_resource.c | 12 ++- + .../display/dc/resource/dcn401/dcn401_resource.c | 46 +++++++++++ + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 10 +++ + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 19 +++-- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 29 ++++++- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 22 ++--- + .../drm/amd/pm/swsmu/smu11/cyan_skillfish_ppt.c | 24 +++--- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 27 +++--- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 27 +++--- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 29 ++++--- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 26 +++--- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 23 +++--- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 20 +++-- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 34 ++++---- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 29 ++++--- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 54 ++++++------ + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 23 +++--- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 29 ++++--- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 33 ++++---- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 19 +++-- + drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.c | 33 ++++---- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 76 ++++++++--------- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 2 +- + 92 files changed, 1227 insertions(+), 459 deletions(-) + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_dio.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn10/dcn10_dio.h + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/dio.h +Merging drm-intel/for-linux-next (3e28a67a85f9b drm/i915/display: fix the pixel normalization handling for xe3p_lpd) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Merge made by the 'ort' strategy. + .../gpu/drm/i915/display/intel_display_device.h | 1 + + drivers/gpu/drm/i915/display/intel_fbc.c | 10 +++--- + drivers/gpu/drm/i915/display/intel_fbc.h | 3 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 36 +++++++++++----------- + 4 files changed, 26 insertions(+), 24 deletions(-) +Merging drm-msm/msm-next (50c4a49f7292b drm/msm/a8xx: Add UBWC v6 support) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (50c4a49f7292b drm/msm/a8xx: Add UBWC v6 support) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging drm-xe/drm-xe-next (ec49857ad181f drm/gpusvm: Allow device pages to be mapped in mixed mappings after system pages) +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe/drm-xe-next +Auto-merging drivers/gpu/drm/Makefile +Auto-merging drivers/gpu/drm/xe/xe_configfs.c +Auto-merging drivers/gpu/drm/xe/xe_device.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_guc_submit.c +Auto-merging drivers/gpu/drm/xe/xe_migrate.c +Auto-merging drivers/gpu/drm/xe/xe_nvm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_nvm.c +Auto-merging drivers/gpu/drm/xe/xe_pci.c +Auto-merging drivers/gpu/drm/xe/xe_pci_types.h +Auto-merging drivers/gpu/drm/xe/xe_vm.c +Resolved 'drivers/gpu/drm/xe/xe_nvm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 16b2dcc714c8e] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_gpusvm.c | 3 +- + drivers/gpu/drm/xe/abi/guc_scheduler_abi.h | 2 +- + .../gpu/drm/xe/tests/xe_gt_sriov_pf_config_kunit.c | 2 +- + drivers/gpu/drm/xe/xe_configfs.c | 64 +++++- + drivers/gpu/drm/xe/xe_configfs.h | 16 +- + drivers/gpu/drm/xe/xe_defaults.h | 26 +++ + drivers/gpu/drm/xe/xe_devcoredump.c | 2 +- + drivers/gpu/drm/xe/xe_device.c | 32 ++- + drivers/gpu/drm/xe/xe_device.h | 11 +- + drivers/gpu/drm/xe/xe_device_types.h | 12 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 8 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 14 +- + drivers/gpu/drm/xe/xe_execlist.c | 9 +- + drivers/gpu/drm/xe/xe_ggtt.c | 2 +- + drivers/gpu/drm/xe/xe_gt.c | 7 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c | 2 +- + drivers/gpu/drm/xe/xe_guc.c | 42 +++- + drivers/gpu/drm/xe/xe_guc.h | 2 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 16 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 176 ++++++++++----- + drivers/gpu/drm/xe/xe_guc_tlb_inval.c | 242 +++++++++++++++++---- + drivers/gpu/drm/xe/xe_hw_engine_group.c | 3 +- + drivers/gpu/drm/xe/xe_migrate.c | 2 +- + drivers/gpu/drm/xe/xe_module.c | 42 ++-- + drivers/gpu/drm/xe/xe_nvm.c | 10 +- + drivers/gpu/drm/xe/xe_oa.c | 2 +- + drivers/gpu/drm/xe/xe_pat.c | 67 ++---- + drivers/gpu/drm/xe/xe_pci.c | 3 + + drivers/gpu/drm/xe/xe_pci_types.h | 1 + + drivers/gpu/drm/xe/xe_pm.c | 13 +- + drivers/gpu/drm/xe/xe_query.c | 5 +- + drivers/gpu/drm/xe/xe_sleep.h | 57 +++++ + drivers/gpu/drm/xe/xe_sriov.c | 2 +- + drivers/gpu/drm/xe/xe_sriov.h | 7 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 10 +- + drivers/gpu/drm/xe/xe_sriov_pf_helpers.h | 3 +- + drivers/gpu/drm/xe/xe_sriov_pf_types.h | 3 + + drivers/gpu/drm/xe/xe_survivability_mode.c | 4 - + drivers/gpu/drm/xe/xe_tlb_inval.c | 35 ++- + drivers/gpu/drm/xe/xe_tlb_inval.h | 2 + + drivers/gpu/drm/xe/xe_tlb_inval_job.c | 2 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 16 +- + drivers/gpu/drm/xe/xe_vm.c | 74 ++++++- + drivers/gpu/drm/xe/xe_vm.h | 3 + + drivers/gpu/drm/xe/xe_vm_types.h | 16 ++ + drivers/gpu/drm/xe/xe_wa.c | 21 +- + 46 files changed, 817 insertions(+), 276 deletions(-) + create mode 100644 drivers/gpu/drm/xe/xe_defaults.h + create mode 100644 drivers/gpu/drm/xe/xe_sleep.h +Merging etnaviv/etnaviv/next (6bde14ba5f7ef drm/etnaviv: add optional reset support) +$ 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 (a2797d4332e56 staging: fbtft: Make framebuffer registration message debug-only) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/Kconfig +CONFLICT (content): Merge conflict in drivers/gpu/drm/Kconfig +Auto-merging drivers/tty/vt/vt.c +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging include/linux/console.h +Auto-merging include/linux/fb.h +Resolved 'drivers/gpu/drm/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ce6131ec04d67] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 10 - + arch/sh/configs/dreamcast_defconfig | 2 - + arch/sh/configs/ecovec24_defconfig | 2 - + arch/sh/configs/kfr2r09_defconfig | 2 - + arch/sh/configs/migor_defconfig | 2 - + arch/sh/configs/rts7751r2d1_defconfig | 2 - + arch/sh/configs/rts7751r2dplus_defconfig | 2 - + arch/sh/configs/se7724_defconfig | 2 - + arch/sh/configs/se7780_defconfig | 2 - + arch/sh/configs/sh7785lcr_defconfig | 3 - + arch/sh/configs/urquell_defconfig | 3 - + drivers/gpu/drm/Kconfig | 212 ++- + drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 15 +- + drivers/hv/vmbus_drv.c | 4 +- + drivers/staging/fbtft/Kconfig | 5 +- + drivers/staging/fbtft/fbtft-core.c | 19 +- + drivers/staging/fbtft/fbtft-sysfs.c | 20 +- + drivers/tty/vt/vt.c | 1 - + drivers/video/console/newport_con.c | 4 +- + drivers/video/fbdev/Kconfig | 11 - + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/au1100fb.c | 5 +- + drivers/video/fbdev/core/fbcon.c | 9 +- + drivers/video/fbdev/core/fbmem.c | 2 +- + drivers/video/fbdev/core/fbsysfs.c | 36 +- + drivers/video/fbdev/hyperv_fb.c | 1388 -------------------- + drivers/video/fbdev/omap/omapfb_main.c | 10 +- + drivers/video/fbdev/omap2/omapfb/Kconfig | 3 +- + drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c | 18 +- + drivers/video/fbdev/riva/riva_hw.c | 3 + + drivers/video/fbdev/sh_mobile_lcdcfb.c | 5 +- + drivers/video/fbdev/smscufx.c | 8 +- + drivers/video/fbdev/vt8500lcdfb.c | 5 +- + drivers/video/logo/Kconfig | 84 +- + drivers/video/logo/Makefile | 29 +- + drivers/video/logo/logo.c | 46 +- + drivers/video/logo/logo_mac_clut224.ppm | 1604 ----------------------- + drivers/video/of_display_timing.c | 4 +- + include/linux/console.h | 1 - + include/linux/fb.h | 10 +- + include/linux/linux_logo.h | 8 - + kernel/printk/printk.c | 16 - + 42 files changed, 303 insertions(+), 3315 deletions(-) + delete mode 100644 drivers/video/fbdev/hyperv_fb.c + delete mode 100644 drivers/video/logo/logo_mac_clut224.ppm +$ git am -3 ../patches/0001-fix-up-for-drm-hyperv-Remove-reference-to-hyperv_fb-.patch +Applying: fix up for "drm/hyperv: Remove reference to hyperv_fb driver" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/hyperv/Kconfig +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 819e3b676b691] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git + Date: Thu Feb 5 12:44:47 2026 +0000 +Merging regmap/for-next (4651c87b00839 regmap: reg_default_cb for flat cache defaults) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/Kconfig | 2 +- + drivers/base/regmap/internal.h | 3 ++ + drivers/base/regmap/regcache-flat.c | 19 ++++++++ + drivers/base/regmap/regcache.c | 5 +- + drivers/base/regmap/regmap-kunit.c | 91 +++++++++++++++++++++++++++++++++++++ + drivers/base/regmap/regmap.c | 2 + + include/linux/regmap.h | 14 ++++++ + 7 files changed, 133 insertions(+), 3 deletions(-) +Merging sound/for-next (e347430182492 ALSA: hda/realtek: Add quirk for Minisforum V3 SE) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/hda/codecs/realtek/alc269.c +Auto-merging sound/usb/mixer_quirks.c +Auto-merging sound/usb/mixer_scarlett2.c +Auto-merging sound/usb/quirks.c +Merge made by the 'ort' strategy. + include/sound/seq_device.h | 2 + + sound/core/compress_offload.c | 28 +- + sound/core/control.c | 12 +- + sound/core/control_compat.c | 21 +- + sound/core/control_led.c | 12 +- + sound/core/ctljack.c | 18 +- + sound/core/oss/mixer_oss.c | 64 +-- + sound/core/oss/pcm_oss.c | 19 +- + sound/core/pcm.c | 4 +- + sound/core/pcm_compat.c | 9 +- + sound/core/pcm_native.c | 46 ++- + sound/core/seq/oss/seq_oss.c | 4 +- + sound/core/seq/oss/seq_oss_init.c | 4 +- + sound/core/seq/oss/seq_oss_midi.c | 45 +- + sound/core/seq/oss/seq_oss_synth.c | 35 +- + sound/core/seq/oss/seq_oss_synth.h | 4 +- + sound/core/seq/seq_clientmgr.c | 171 ++++---- + sound/core/seq/seq_compat.c | 4 +- + sound/core/seq/seq_midi.c | 25 +- + sound/core/seq/seq_ports.c | 11 +- + sound/core/seq/seq_queue.c | 32 +- + sound/core/seq/seq_ump_client.c | 27 +- + sound/core/seq/seq_virmidi.c | 4 +- + sound/core/seq_device.c | 26 +- + sound/core/timer.c | 12 +- + sound/core/vmaster.c | 12 +- + sound/drivers/opl3/opl3_seq.c | 13 +- + sound/drivers/opl4/opl4_seq.c | 13 +- + sound/hda/codecs/cirrus/Kconfig | 1 + + sound/hda/codecs/cirrus/cs8409-tables.c | 76 +++- + sound/hda/codecs/cirrus/cs8409.c | 172 ++++++++ + sound/hda/codecs/cirrus/cs8409.h | 13 + + sound/hda/codecs/cm9825.c | 290 ++++++++++++- + sound/hda/codecs/conexant.c | 1 + + sound/hda/codecs/generic.c | 4 +- + sound/hda/codecs/realtek/alc269.c | 261 +++++++++++- + sound/hda/codecs/realtek/realtek.c | 5 +- + sound/hda/codecs/side-codecs/cirrus_scodec_test.c | 61 ++- + sound/hda/codecs/side-codecs/cs35l41_hda.c | 23 +- + sound/hda/codecs/side-codecs/cs35l56_hda.c | 36 +- + sound/hda/codecs/side-codecs/tas2781_hda_i2c.c | 10 +- + sound/hda/codecs/side-codecs/tas2781_hda_spi.c | 13 +- + sound/hda/common/codec.c | 4 +- + sound/hda/common/hda_jack.h | 4 +- + sound/hda/common/hda_local.h | 2 +- + sound/hda/common/sysfs.c | 5 +- + sound/hda/controllers/tegra.c | 14 +- + sound/isa/sb/emu8000_synth.c | 13 +- + sound/pci/echoaudio/echoaudio.c | 2 +- + sound/pci/echoaudio/echoaudio_dsp.c | 6 +- + sound/pci/emu10k1/emu10k1_synth.c | 13 +- + sound/pci/ice1712/ice1724.c | 2 +- + sound/pci/mixart/mixart.h | 2 +- + sound/usb/fcp.c | 36 +- + sound/usb/mixer_quirks.c | 3 + + sound/usb/mixer_s1810c.c | 222 ++++++---- + sound/usb/mixer_scarlett.c | 476 +++++++++++++++++++++- + sound/usb/mixer_scarlett.h | 1 + + sound/usb/mixer_scarlett2.c | 21 +- + sound/usb/quirks.c | 13 +- + sound/usb/usx2y/us144mkii.c | 4 +- + sound/usb/usx2y/us144mkii_controls.c | 4 +- + sound/usb/usx2y/us144mkii_pcm.c | 4 +- + sound/x86/intel_hdmi_audio.c | 10 +- + 64 files changed, 1890 insertions(+), 614 deletions(-) +Merging ieee1394/for-next (6b617317e5bc9 ALSA: firewire: remove PCM buffer size constraint from isoc context header) +$ 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 | 4 +- + drivers/firewire/core-cdev.c | 71 +++++-------- + drivers/firewire/core-iso.c | 104 ++++++++++--------- + drivers/firewire/core.h | 14 ++- + drivers/firewire/ohci.c | 236 ++++++++++++++++++++++++------------------ + include/linux/firewire.h | 36 +++++-- + sound/firewire/amdtp-stream.c | 31 ++---- + 7 files changed, 268 insertions(+), 228 deletions(-) +Merging sound-asoc/for-next (80bbbb45c6b2c Merge remote-tracking branch 'asoc/for-6.20' into asoc-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Auto-merging include/linux/pci_ids.h +Auto-merging sound/hda/codecs/side-codecs/tas2781_hda_i2c.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/goldfish/audio.txt | 17 - + .../devicetree/bindings/sound/awinic,aw87390.yaml | 34 +- + .../devicetree/bindings/sound/awinic,aw88395.yaml | 13 + + .../bindings/sound/davinci-mcasp-audio.yaml | 71 +- + .../devicetree/bindings/sound/everest,es8389.yaml | 12 + + .../devicetree/bindings/sound/fsl,audmix.yaml | 16 +- + .../devicetree/bindings/sound/fsl,mqs.yaml | 12 +- + .../devicetree/bindings/sound/fsl,rpmsg.yaml | 22 +- + .../devicetree/bindings/sound/fsl,sai.yaml | 16 + + .../bindings/sound/google,goldfish-audio.yaml | 38 + + .../devicetree/bindings/sound/mt8192-afe-pcm.yaml | 176 ++- + .../devicetree/bindings/sound/realtek,rt5575.yaml | 61 + + .../devicetree/bindings/sound/realtek,rt5651.yaml | 100 ++ + .../devicetree/bindings/sound/richtek,rtq9128.yaml | 12 +- + Documentation/devicetree/bindings/sound/rt5651.txt | 63 - + .../bindings/sound/sophgo,cv1800b-codecs.yaml | 46 + + .../bindings/sound/sophgo,cv1800b-i2s.yaml | 67 ++ + .../devicetree/bindings/sound/tas2552.txt | 36 - + .../devicetree/bindings/sound/ti,tas2552.yaml | 62 + + .../bindings/sound/ti,tlv320adcx140.yaml | 7 +- + MAINTAINERS | 2 +- + drivers/firmware/cirrus/cs_dsp.c | 50 +- + drivers/firmware/cirrus/test/cs_dsp_mock_bin.c | 38 +- + .../firmware/cirrus/test/cs_dsp_mock_mem_maps.c | 8 +- + drivers/firmware/cirrus/test/cs_dsp_mock_regmap.c | 16 +- + drivers/firmware/cirrus/test/cs_dsp_test_bin.c | 1017 ++++++++++------ + .../firmware/cirrus/test/cs_dsp_test_bin_error.c | 14 +- + drivers/spi/spi.c | 23 +- + include/linux/firmware/cirrus/cs_dsp_test_utils.h | 6 +- + include/linux/firmware/cirrus/wmfw.h | 7 +- + include/linux/firmware/imx/sm.h | 2 + + include/linux/pci_ids.h | 4 +- + include/linux/platform_data/davinci_asp.h | 3 +- + include/linux/soc/qcom/apr.h | 6 +- + include/linux/spi/spi.h | 9 + + include/sound/ak4641.h | 23 - + include/sound/cs-amp-lib.h | 3 + + include/sound/sdca_function.h | 4 + + include/sound/sdca_interrupts.h | 7 + + include/sound/sdca_jack.h | 32 + + include/sound/soc-acpi-intel-ssp-common.h | 4 + + include/sound/soc-component.h | 29 +- + include/sound/soc-dapm.h | 44 +- + include/sound/soc.h | 4 +- + include/sound/sof.h | 3 + + include/sound/sof/ipc4/header.h | 75 ++ + include/sound/tas2781.h | 3 +- + include/uapi/sound/sof/tokens.h | 6 + + sound/arm/Kconfig | 10 - + sound/arm/Makefile | 3 - + sound/arm/pxa2xx-ac97-lib.c | 50 +- + sound/arm/pxa2xx-ac97.c | 286 ----- + sound/hda/codecs/side-codecs/tas2781_hda.c | 9 +- + sound/hda/codecs/side-codecs/tas2781_hda_i2c.c | 13 - + sound/hda/controllers/intel.c | 3 +- + sound/hda/core/intel-dsp-config.c | 8 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/amd/Kconfig | 2 - + sound/soc/amd/acp/Kconfig | 9 +- + sound/soc/amd/acp/Makefile | 2 + + sound/soc/amd/acp/acp-sdw-legacy-mach.c | 8 +- + sound/soc/amd/acp/acp-sdw-sof-mach.c | 8 +- + sound/soc/amd/acp/amd-acp70-acpi-match.c | 404 ++++++- + sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.c | 42 + + sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.h | 25 + + sound/soc/codecs/Kconfig | 36 +- + sound/soc/codecs/Makefile | 7 +- + sound/soc/codecs/ak4641.c | 641 ---------- + sound/soc/codecs/alc5623.c | 5 - + sound/soc/codecs/aw87390.c | 175 ++- + sound/soc/codecs/aw87390.h | 86 ++ + sound/soc/codecs/aw88261.c | 16 +- + sound/soc/codecs/aw88261.h | 2 - + sound/soc/codecs/cs-amp-lib-test.c | 169 +++ + sound/soc/codecs/cs-amp-lib.c | 158 ++- + sound/soc/codecs/cs35l56-test.c | 366 ++++++ + sound/soc/codecs/cs35l56.c | 74 +- + sound/soc/codecs/cs35l56.h | 4 + + sound/soc/codecs/da7213.c | 4 +- + sound/soc/codecs/es8323.c | 294 ++--- + sound/soc/codecs/es8323.h | 105 +- + sound/soc/codecs/es8326.c | 18 +- + sound/soc/codecs/es8326.h | 3 + + sound/soc/codecs/es8328.c | 160 ++- + sound/soc/codecs/es8375.c | 2 - + sound/soc/codecs/es8389.c | 246 ++-- + sound/soc/codecs/es8389.h | 8 + + sound/soc/codecs/max98390.c | 3 + + sound/soc/codecs/nau8821.c | 48 +- + sound/soc/codecs/nau8821.h | 1 + + sound/soc/codecs/rt1320-sdw.c | 1227 +++++++++++++++++++- + sound/soc/codecs/rt1320-sdw.h | 66 ++ + sound/soc/codecs/rt274.c | 12 +- + sound/soc/codecs/rt286.c | 12 +- + sound/soc/codecs/rt298.c | 12 +- + sound/soc/codecs/rt5575-spi.c | 118 ++ + sound/soc/codecs/rt5575-spi.h | 27 + + sound/soc/codecs/rt5575.c | 352 ++++++ + sound/soc/codecs/rt5575.h | 58 + + sound/soc/codecs/rt5640.c | 4 +- + sound/soc/codecs/rt5651.c | 2 +- + sound/soc/codecs/rt5659.c | 2 +- + sound/soc/codecs/rt5663.c | 4 +- + sound/soc/codecs/rt5665.c | 2 +- + sound/soc/codecs/rt5668.c | 2 +- + sound/soc/codecs/rt5682-i2c.c | 2 +- + sound/soc/codecs/rtq9128.c | 114 +- + sound/soc/codecs/sdw-mockup.c | 6 - + sound/soc/codecs/tas2780.c | 31 +- + sound/soc/codecs/tas2781-fmwlib.c | 138 ++- + sound/soc/codecs/tas2781-i2c.c | 11 +- + sound/soc/codecs/tas2783-sdw.c | 354 +++--- + sound/soc/codecs/tas2783.h | 1 + + sound/soc/codecs/tlv320adcx140.c | 136 ++- + sound/soc/codecs/wcd-mbhc-v2.c | 12 - + sound/soc/codecs/wcd939x-sdw.c | 19 +- + sound/soc/codecs/wm0010.c | 2 +- + sound/soc/codecs/wm8731.c | 11 +- + sound/soc/codecs/wm8962.c | 47 +- + sound/soc/fsl/Kconfig | 6 +- + sound/soc/fsl/fsl_audmix.c | 3 + + sound/soc/fsl/fsl_sai.c | 21 + + sound/soc/fsl/fsl_sai.h | 4 + + sound/soc/fsl/fsl_ssi.c | 2 +- + sound/soc/intel/avs/board_selection.c | 2 +- + sound/soc/intel/avs/core.c | 2 +- + sound/soc/intel/avs/path.c | 2 +- + sound/soc/intel/boards/Kconfig | 5 + + sound/soc/intel/boards/Makefile | 3 + + sound/soc/intel/boards/sof_rt5682.c | 6 + + sound/soc/intel/boards/sof_sdw.c | 43 +- + sound/soc/intel/boards/sof_ti_common.c | 77 ++ + sound/soc/intel/boards/sof_ti_common.h | 24 + + sound/soc/intel/catpt/core.h | 7 +- + sound/soc/intel/catpt/device.c | 6 +- + sound/soc/intel/catpt/ipc.c | 12 +- + sound/soc/intel/catpt/loader.c | 8 +- + sound/soc/intel/catpt/messages.c | 89 +- + sound/soc/intel/catpt/pcm.c | 46 +- + sound/soc/intel/catpt/sysfs.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-arl-match.c | 23 +- + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 14 +- + sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 55 +- + sound/soc/intel/common/soc-acpi-intel-ssp-common.c | 3 + + sound/soc/mediatek/mt8189/mt8189-nau8825.c | 6 +- + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 44 +- + sound/soc/pxa/Kconfig | 1 - + sound/soc/pxa/pxa2xx-ac97.c | 5 +- + sound/soc/qcom/qdsp6/audioreach.c | 229 +++- + sound/soc/qcom/qdsp6/audioreach.h | 55 +- + sound/soc/qcom/qdsp6/q6adm.c | 8 +- + sound/soc/qcom/qdsp6/q6afe.c | 26 +- + sound/soc/qcom/qdsp6/q6apm.c | 19 +- + sound/soc/qcom/qdsp6/q6asm.c | 33 +- + sound/soc/qcom/qdsp6/q6core.c | 6 +- + sound/soc/qcom/qdsp6/q6prm.c | 22 +- + sound/soc/qcom/qdsp6/topology.c | 118 +- + sound/soc/renesas/rz-ssi.c | 143 ++- + sound/soc/rockchip/rockchip_sai.c | 5 +- + sound/soc/sdca/Kconfig | 2 + + sound/soc/sdca/Makefile | 2 +- + sound/soc/sdca/sdca_asoc.c | 91 +- + sound/soc/sdca/sdca_class.c | 34 + + sound/soc/sdca/sdca_class.h | 2 + + sound/soc/sdca/sdca_class_function.c | 149 ++- + sound/soc/sdca/sdca_fdl.c | 8 +- + sound/soc/sdca/sdca_functions.c | 75 +- + sound/soc/sdca/sdca_interrupts.c | 188 +-- + sound/soc/sdca/sdca_jack.c | 248 ++++ + sound/soc/sdca/sdca_regmap.c | 14 +- + sound/soc/sdca/sdca_ump.c | 2 +- + sound/soc/sdw_utils/soc_sdw_ti_amp.c | 4 + + sound/soc/sdw_utils/soc_sdw_utils.c | 39 +- + sound/soc/soc-component.c | 82 -- + sound/soc/soc-core.c | 10 + + sound/soc/soc-dapm.c | 352 +++--- + sound/soc/sof/amd/acp-ipc.c | 4 +- + sound/soc/sof/compress.c | 8 + + sound/soc/sof/control.c | 13 +- + sound/soc/sof/core.c | 1 + + sound/soc/sof/debug.c | 7 +- + sound/soc/sof/imx/imx-common.c | 8 +- + sound/soc/sof/intel/atom.c | 7 +- + sound/soc/sof/intel/bdw.c | 7 +- + sound/soc/sof/intel/cnl.c | 11 +- + sound/soc/sof/intel/hda-codec.c | 1 - + sound/soc/sof/intel/hda-dai-ops.c | 25 +- + sound/soc/sof/intel/hda-dai.c | 22 +- + sound/soc/sof/intel/hda-ipc.c | 11 +- + sound/soc/sof/intel/hda-loader.c | 94 +- + sound/soc/sof/intel/hda-mlink.c | 29 +- + sound/soc/sof/intel/hda-sdw-bpt.c | 16 +- + sound/soc/sof/intel/hda-stream.c | 168 ++- + sound/soc/sof/intel/hda.c | 42 +- + sound/soc/sof/intel/hda.h | 16 +- + sound/soc/sof/intel/mtl.c | 5 +- + sound/soc/sof/intel/nvl.c | 24 + + sound/soc/sof/intel/pci-apl.c | 2 +- + sound/soc/sof/intel/pci-lnl.c | 1 + + sound/soc/sof/intel/pci-nvl.c | 32 + + sound/soc/sof/intel/pci-ptl.c | 2 + + sound/soc/sof/ipc.c | 9 +- + sound/soc/sof/ipc3-dtrace.c | 7 +- + sound/soc/sof/ipc3-topology.c | 6 +- + sound/soc/sof/ipc3.c | 8 +- + sound/soc/sof/ipc4-control.c | 195 +++- + sound/soc/sof/ipc4-loader.c | 19 +- + sound/soc/sof/ipc4-mtrace.c | 24 +- + sound/soc/sof/ipc4-pcm.c | 3 +- + sound/soc/sof/ipc4-topology.c | 214 +++- + sound/soc/sof/ipc4-topology.h | 13 +- + sound/soc/sof/ipc4.c | 64 +- + sound/soc/sof/mediatek/mtk-adsp-common.c | 4 +- + sound/soc/sof/ops.c | 34 +- + sound/soc/sof/ops.h | 10 +- + sound/soc/sof/pcm.c | 91 +- + sound/soc/sof/pm.c | 175 +-- + sound/soc/sof/sof-audio.c | 229 ++-- + sound/soc/sof/sof-audio.h | 20 + + sound/soc/sof/sof-client-ipc-flood-test.c | 7 +- + sound/soc/sof/sof-client-ipc-kernel-injector.c | 4 +- + sound/soc/sof/sof-client-ipc-msg-injector.c | 14 +- + sound/soc/sof/sof-client-probes.c | 26 +- + sound/soc/sof/sof-client.c | 46 +- + sound/soc/sof/sof-client.h | 3 + + sound/soc/sof/sof-priv.h | 3 + + sound/soc/sophgo/Kconfig | 47 + + sound/soc/sophgo/Makefile | 5 + + sound/soc/sophgo/cv1800b-sound-adc.c | 319 +++++ + sound/soc/sophgo/cv1800b-sound-dac.c | 208 ++++ + sound/soc/sophgo/cv1800b-tdm.c | 716 ++++++++++++ + sound/soc/sunxi/sun4i-spdif.c | 4 + + sound/soc/sunxi/sun50i-dmic.c | 3 + + sound/soc/tegra/tegra186_asrc.c | 1 + + sound/soc/tegra/tegra186_dspk.c | 1 + + sound/soc/tegra/tegra210_admaif.c | 3 + + sound/soc/tegra/tegra210_adx.c | 2 + + sound/soc/tegra/tegra210_ahub.c | 60 + + sound/soc/tegra/tegra210_ahub.h | 30 + + sound/soc/tegra/tegra210_amx.c | 3 + + sound/soc/tegra/tegra210_dmic.c | 1 + + sound/soc/tegra/tegra210_i2s.c | 2 + + sound/soc/tegra/tegra210_mbdrc.c | 1 + + sound/soc/tegra/tegra210_mixer.c | 1 + + sound/soc/tegra/tegra210_mvc.c | 1 + + sound/soc/tegra/tegra210_ope.c | 1 + + sound/soc/tegra/tegra210_peq.c | 1 + + sound/soc/tegra/tegra210_sfc.c | 1 + + sound/soc/ti/davinci-mcasp.c | 517 +++++++-- + sound/soc/ti/davinci-mcasp.h | 10 + + 251 files changed, 10872 insertions(+), 3959 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/goldfish/audio.txt + create mode 100644 Documentation/devicetree/bindings/sound/google,goldfish-audio.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5575.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5651.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/rt5651.txt + create mode 100644 Documentation/devicetree/bindings/sound/sophgo,cv1800b-codecs.yaml + create mode 100644 Documentation/devicetree/bindings/sound/sophgo,cv1800b-i2s.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/tas2552.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,tas2552.yaml + delete mode 100644 include/sound/ak4641.h + create mode 100644 include/sound/sdca_jack.h + delete mode 100644 sound/arm/pxa2xx-ac97.c + create mode 100644 sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.c + create mode 100644 sound/soc/amd/acp/soc-acpi-amd-sdca-quirks.h + delete mode 100644 sound/soc/codecs/ak4641.c + create mode 100644 sound/soc/codecs/cs35l56-test.c + create mode 100644 sound/soc/codecs/rt5575-spi.c + create mode 100644 sound/soc/codecs/rt5575-spi.h + create mode 100644 sound/soc/codecs/rt5575.c + create mode 100644 sound/soc/codecs/rt5575.h + create mode 100644 sound/soc/intel/boards/sof_ti_common.c + create mode 100644 sound/soc/intel/boards/sof_ti_common.h + create mode 100644 sound/soc/sdca/sdca_jack.c + create mode 100644 sound/soc/sophgo/Kconfig + create mode 100644 sound/soc/sophgo/Makefile + create mode 100644 sound/soc/sophgo/cv1800b-sound-adc.c + create mode 100644 sound/soc/sophgo/cv1800b-sound-dac.c + create mode 100644 sound/soc/sophgo/cv1800b-tdm.c +Merging modules/modules-next (b68758e6f4307 modules: moduleparam.h: fix kernel-doc comments) +$ git merge -m Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Auto-merging MAINTAINERS +Auto-merging include/linux/module.h +Auto-merging include/linux/moduleparam.h +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +-- + include/linux/module.h | 18 ++++------- + include/linux/moduleparam.h | 8 +++-- + kernel/module/Kconfig | 5 ---- + kernel/module/decompress.c | 10 +++---- + kernel/module/dups.c | 4 +-- + kernel/params.c | 15 ++++------ + scripts/gendwarfksyms/dwarf.c | 4 ++- + scripts/gendwarfksyms/symbols.c | 5 ++-- + scripts/sign-file.c | 66 ++--------------------------------------- + 10 files changed, 35 insertions(+), 104 deletions(-) +Merging input/next (ed8a4ef29da38 Input: gpio_keys - fall back to platform_get_irq() for interrupt-only keys) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/goldfish/events.txt | 17 -- + .../bindings/input/focaltech,ft8112.yaml | 66 ++++++ + .../input/google,goldfish-events-keypad.yaml | 41 ++++ + .../bindings/input/touchscreen/edt-ft5x06.yaml | 1 + + .../bindings/input/touchscreen/ilitek,ili210x.yaml | 51 +++++ + .../input/touchscreen/sitronix,st1232.yaml | 10 +- + .../bindings/input/touchscreen/ti,tsc2007.yaml | 3 + + .../bindings/input/touchscreen/trivial-touch.yaml | 4 - + MAINTAINERS | 2 +- + drivers/hid/i2c-hid/i2c-hid-of-elan.c | 8 + + drivers/input/keyboard/cros_ec_keyb.c | 3 +- + drivers/input/keyboard/gpio_keys.c | 19 +- + drivers/input/keyboard/omap4-keypad.c | 4 - + drivers/input/misc/cs40l50-vibra.c | 4 - + drivers/input/misc/gpio_decoder.c | 72 +++---- + drivers/input/misc/palmas-pwrbutton.c | 2 +- + drivers/input/misc/pf1550-onkey.c | 2 +- + drivers/input/misc/twl4030-pwrbutton.c | 67 ++++++- + drivers/input/mouse/appletouch.c | 9 +- + drivers/input/mouse/byd.c | 6 +- + drivers/input/mouse/cyapa.c | 3 - + drivers/input/mouse/cyapa_gen5.c | 1 - + drivers/input/mouse/psmouse-smbus.c | 2 +- + drivers/input/mouse/synaptics_i2c.c | 221 +++++++++------------ + drivers/input/serio/altera_ps2.c | 2 +- + drivers/input/serio/arc_ps2.c | 3 +- + drivers/input/serio/olpc_apsp.c | 2 +- + drivers/input/touchscreen/dynapro.c | 4 +- + drivers/input/touchscreen/edt-ft5x06.c | 6 + + drivers/input/touchscreen/egalax_ts_serial.c | 3 +- + drivers/input/touchscreen/elo.c | 2 +- + drivers/input/touchscreen/fujitsu_ts.c | 3 +- + drivers/input/touchscreen/gunze.c | 2 +- + drivers/input/touchscreen/hampshire.c | 4 +- + drivers/input/touchscreen/ili210x.c | 96 +++++---- + drivers/input/touchscreen/ilitek_ts_i2c.c | 10 +- + drivers/input/touchscreen/inexio.c | 2 +- + drivers/input/touchscreen/mtouch.c | 2 +- + drivers/input/touchscreen/novatek-nvt-ts.c | 5 - + drivers/input/touchscreen/penmount.c | 2 +- + drivers/input/touchscreen/stmfts.c | 21 +- + drivers/input/touchscreen/touchit213.c | 4 +- + drivers/input/touchscreen/touchright.c | 2 +- + drivers/input/touchscreen/touchwin.c | 2 +- + drivers/input/touchscreen/tsc40.c | 2 +- + drivers/input/touchscreen/wdt87xx_i2c.c | 14 +- + include/linux/input/adp5589.h | 180 ----------------- + 47 files changed, 494 insertions(+), 497 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/goldfish/events.txt + create mode 100644 Documentation/devicetree/bindings/input/focaltech,ft8112.yaml + create mode 100644 Documentation/devicetree/bindings/input/google,goldfish-events-keypad.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/ilitek,ili210x.yaml + delete mode 100644 include/linux/input/adp5589.h +Merging block/for-next (47da703ba2e5d Merge branch 'for-7.0/block' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git block/for-next +Auto-merging MAINTAINERS +Auto-merging block/bio.c +Auto-merging block/blk-mq.c +Auto-merging fs/buffer.c +Auto-merging fs/ext4/readpage.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/iomap/direct-io.c +Auto-merging fs/iomap/ioend.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging include/linux/bio.h +Auto-merging include/linux/iomap.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/types.h +Auto-merging io_uring/openclose.c +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-block | 34 + + Documentation/block/biovecs.rst | 1 - + Documentation/block/inline-encryption.rst | 6 + + Documentation/block/ublk.rst | 64 +- + MAINTAINERS | 1 + + block/bdev.c | 1 - + block/bfq-iosched.c | 65 +- + block/bio-integrity-auto.c | 14 +- + block/bio.c | 339 ++-- + block/blk-core.c | 21 +- + block/blk-crypto-fallback.c | 473 ++--- + block/blk-crypto-internal.h | 30 +- + block/blk-crypto.c | 78 +- + block/blk-flush.c | 6 +- + block/blk-iocost.c | 2 +- + block/blk-iolatency.c | 5 +- + block/blk-lib.c | 9 +- + block/blk-merge.c | 38 +- + block/blk-mq-debugfs.c | 68 +- + block/blk-mq-debugfs.h | 8 +- + block/blk-mq-dma.c | 14 +- + block/blk-mq-sched.h | 5 + + block/blk-mq.c | 77 +- + block/blk-rq-qos.c | 11 - + block/blk-sysfs.c | 81 +- + block/blk-wbt.c | 158 +- + block/blk-wbt.h | 7 +- + block/blk-zoned.c | 10 +- + block/blk.h | 29 +- + block/elevator.c | 1 + + block/ioctl.c | 2 +- + block/kyber-iosched.c | 33 +- + block/mq-deadline.c | 39 +- + block/partitions/core.c | 3 +- + block/sed-opal.c | 3 +- + drivers/block/brd.c | 3 +- + drivers/block/loop.c | 2 +- + drivers/block/null_blk/main.c | 4 +- + drivers/block/rnbd/rnbd-clt-sysfs.c | 8 + + drivers/block/rnbd/rnbd-clt.c | 19 +- + drivers/block/rnbd/rnbd-proto.h | 18 +- + drivers/block/rnbd/rnbd-srv-trace.h | 22 +- + drivers/block/rnbd/rnbd-srv.c | 36 +- + drivers/block/rnull/configfs.rs | 3 +- + drivers/block/rnull/rnull.rs | 3 - + drivers/block/ublk_drv.c | 1915 +++++++++++++++++--- + drivers/md/dm-rq.c | 3 +- + drivers/md/md-bitmap.c | 7 +- + drivers/md/md-cluster.c | 7 +- + drivers/md/md-llbitmap.c | 4 +- + drivers/md/md.c | 188 +- + drivers/md/md.h | 29 +- + drivers/md/raid0.c | 4 +- + drivers/md/raid1-10.c | 5 - + drivers/md/raid1.c | 89 +- + drivers/md/raid1.h | 5 - + drivers/md/raid10.c | 178 +- + drivers/md/raid10.h | 5 - + drivers/md/raid5.c | 143 +- + drivers/md/raid5.h | 4 +- + drivers/nvme/host/core.c | 3 +- + drivers/nvme/host/ioctl.c | 23 +- + drivers/nvme/host/pci.c | 20 +- + drivers/nvme/target/admin-cmd.c | 4 +- + drivers/nvme/target/passthru.c | 3 +- + drivers/scsi/scsi_error.c | 3 +- + drivers/scsi/sg.c | 6 +- + drivers/scsi/st.c | 3 +- + drivers/target/target_core_pscsi.c | 6 +- + fs/buffer.c | 3 +- + fs/crypto/bio.c | 91 +- + fs/ext4/page-io.c | 3 +- + fs/ext4/readpage.c | 9 +- + fs/f2fs/data.c | 4 +- + fs/f2fs/file.c | 3 +- + fs/iomap/direct-io.c | 194 +- + fs/iomap/ioend.c | 8 + + fs/xfs/xfs_aops.c | 8 +- + fs/xfs/xfs_file.c | 41 +- + include/linux/bio.h | 32 +- + include/linux/blk-crypto.h | 32 + + include/linux/blk-integrity.h | 6 +- + include/linux/blk-mq-dma.h | 2 +- + include/linux/blk-mq.h | 4 +- + include/linux/blk_types.h | 7 +- + include/linux/blkdev.h | 24 +- + include/linux/io_uring.h | 14 +- + include/linux/io_uring_types.h | 42 +- + include/linux/iomap.h | 9 + + include/linux/sched.h | 1 + + include/linux/types.h | 5 + + include/linux/uio.h | 3 + + include/uapi/linux/io_uring.h | 24 +- + include/uapi/linux/io_uring/bpf_filter.h | 62 + + include/uapi/linux/ublk_cmd.h | 121 +- + io_uring/Kconfig | 5 + + io_uring/Makefile | 15 +- + io_uring/alloc_cache.h | 2 + + io_uring/bpf_filter.c | 430 +++++ + io_uring/bpf_filter.h | 48 + + io_uring/cancel.c | 5 +- + io_uring/cmd_net.c | 1 + + io_uring/eventfd.h | 1 + + io_uring/fdinfo.c | 112 +- + io_uring/fdinfo.h | 10 + + io_uring/filetable.h | 1 - + io_uring/futex.c | 2 +- + io_uring/io-wq.c | 51 +- + io_uring/io-wq.h | 2 + + io_uring/io_uring.c | 837 +-------- + io_uring/io_uring.h | 91 +- + io_uring/memmap.c | 2 +- + io_uring/memmap.h | 1 + + io_uring/mock_file.c | 1 + + io_uring/msg_ring.c | 28 +- + io_uring/net.c | 15 +- + io_uring/net.h | 6 + + io_uring/notif.c | 1 + + io_uring/openclose.c | 9 + + io_uring/openclose.h | 3 + + io_uring/refs.h | 1 + + io_uring/register.c | 133 +- + io_uring/rsrc.c | 13 +- + io_uring/rsrc.h | 2 +- + io_uring/rw.c | 39 +- + io_uring/slist.h | 13 +- + io_uring/sqpoll.c | 8 +- + io_uring/sync.c | 2 + + io_uring/tctx.c | 53 +- + io_uring/timeout.c | 2 +- + io_uring/tw.c | 355 ++++ + io_uring/tw.h | 116 ++ + io_uring/uring_cmd.c | 9 + + io_uring/wait.c | 308 ++++ + io_uring/wait.h | 49 + + io_uring/zcrx.c | 47 +- + kernel/fork.c | 5 + + kernel/trace/blktrace.c | 2 +- + lib/iov_iter.c | 98 + + rust/kernel/block/mq/gen_disk.rs | 3 +- + rust/kernel/block/mq/tag_set.rs | 4 +- + tools/testing/selftests/ublk/.gitignore | 6 +- + tools/testing/selftests/ublk/Makefile | 70 +- + tools/testing/selftests/ublk/batch.c | 607 +++++++ + tools/testing/selftests/ublk/common.c | 6 +- + tools/testing/selftests/ublk/fault_inject.c | 1 + + tools/testing/selftests/ublk/file_backed.c | 101 +- + tools/testing/selftests/ublk/kublk.c | 293 ++- + tools/testing/selftests/ublk/kublk.h | 238 ++- + tools/testing/selftests/ublk/metadata_size.c | 36 + + tools/testing/selftests/ublk/null.c | 19 +- + tools/testing/selftests/ublk/settings | 1 + + tools/testing/selftests/ublk/stripe.c | 23 +- + tools/testing/selftests/ublk/test_batch_01.sh | 31 + + tools/testing/selftests/ublk/test_batch_02.sh | 29 + + tools/testing/selftests/ublk/test_batch_03.sh | 29 + + tools/testing/selftests/ublk/test_common.sh | 73 +- + tools/testing/selftests/ublk/test_generic_01.sh | 48 - + tools/testing/selftests/ublk/test_generic_02.sh | 23 +- + tools/testing/selftests/ublk/test_generic_03.sh | 1 - + tools/testing/selftests/ublk/test_generic_06.sh | 1 - + tools/testing/selftests/ublk/test_generic_07.sh | 1 - + tools/testing/selftests/ublk/test_generic_08.sh | 1 - + tools/testing/selftests/ublk/test_generic_09.sh | 1 - + tools/testing/selftests/ublk/test_generic_10.sh | 1 - + tools/testing/selftests/ublk/test_generic_12.sh | 1 - + tools/testing/selftests/ublk/test_generic_13.sh | 1 - + tools/testing/selftests/ublk/test_generic_16.sh | 56 + + tools/testing/selftests/ublk/test_integrity_01.sh | 105 ++ + tools/testing/selftests/ublk/test_integrity_02.sh | 141 ++ + tools/testing/selftests/ublk/test_loop_01.sh | 1 - + tools/testing/selftests/ublk/test_loop_02.sh | 1 - + tools/testing/selftests/ublk/test_loop_03.sh | 1 - + tools/testing/selftests/ublk/test_loop_04.sh | 1 - + tools/testing/selftests/ublk/test_loop_05.sh | 1 - + tools/testing/selftests/ublk/test_loop_06.sh | 1 - + tools/testing/selftests/ublk/test_loop_07.sh | 1 - + tools/testing/selftests/ublk/test_null_01.sh | 1 - + tools/testing/selftests/ublk/test_null_02.sh | 1 - + tools/testing/selftests/ublk/test_null_03.sh | 1 - + tools/testing/selftests/ublk/test_part_01.sh | 104 ++ + .../ublk/{test_generic_15.sh => test_part_02.sh} | 7 +- + .../{test_generic_04.sh => test_recover_01.sh} | 6 +- + .../{test_generic_05.sh => test_recover_02.sh} | 6 +- + .../{test_generic_11.sh => test_recover_03.sh} | 1 - + .../{test_generic_14.sh => test_recover_04.sh} | 1 - + tools/testing/selftests/ublk/test_stress_01.sh | 1 - + tools/testing/selftests/ublk/test_stress_02.sh | 1 - + tools/testing/selftests/ublk/test_stress_03.sh | 1 - + tools/testing/selftests/ublk/test_stress_04.sh | 1 - + tools/testing/selftests/ublk/test_stress_05.sh | 1 - + tools/testing/selftests/ublk/test_stress_06.sh | 1 - + tools/testing/selftests/ublk/test_stress_07.sh | 1 - + tools/testing/selftests/ublk/test_stress_08.sh | 44 + + tools/testing/selftests/ublk/test_stress_09.sh | 43 + + tools/testing/selftests/ublk/test_stripe_01.sh | 1 - + tools/testing/selftests/ublk/test_stripe_02.sh | 1 - + tools/testing/selftests/ublk/test_stripe_03.sh | 1 - + tools/testing/selftests/ublk/test_stripe_04.sh | 1 - + tools/testing/selftests/ublk/test_stripe_05.sh | 1 - + tools/testing/selftests/ublk/test_stripe_06.sh | 1 - + tools/testing/selftests/ublk/trace/seq_io.bt | 49 +- + tools/testing/selftests/ublk/utils.h | 64 + + 203 files changed, 7736 insertions(+), 2760 deletions(-) + create mode 100644 include/uapi/linux/io_uring/bpf_filter.h + create mode 100644 io_uring/bpf_filter.c + create mode 100644 io_uring/bpf_filter.h + create mode 100644 io_uring/tw.c + create mode 100644 io_uring/tw.h + create mode 100644 io_uring/wait.c + create mode 100644 io_uring/wait.h + create mode 100644 tools/testing/selftests/ublk/batch.c + create mode 100644 tools/testing/selftests/ublk/metadata_size.c + create mode 100644 tools/testing/selftests/ublk/settings + create mode 100755 tools/testing/selftests/ublk/test_batch_01.sh + create mode 100755 tools/testing/selftests/ublk/test_batch_02.sh + create mode 100755 tools/testing/selftests/ublk/test_batch_03.sh + delete mode 100755 tools/testing/selftests/ublk/test_generic_01.sh + create mode 100755 tools/testing/selftests/ublk/test_generic_16.sh + create mode 100755 tools/testing/selftests/ublk/test_integrity_01.sh + create mode 100755 tools/testing/selftests/ublk/test_integrity_02.sh + create mode 100755 tools/testing/selftests/ublk/test_part_01.sh + rename tools/testing/selftests/ublk/{test_generic_15.sh => test_part_02.sh} (94%) + rename tools/testing/selftests/ublk/{test_generic_04.sh => test_recover_01.sh} (81%) + rename tools/testing/selftests/ublk/{test_generic_05.sh => test_recover_02.sh} (82%) + rename tools/testing/selftests/ublk/{test_generic_11.sh => test_recover_03.sh} (98%) + rename tools/testing/selftests/ublk/{test_generic_14.sh => test_recover_04.sh} (98%) + create mode 100755 tools/testing/selftests/ublk/test_stress_08.sh + create mode 100755 tools/testing/selftests/ublk/test_stress_09.sh +$ git am -3 ../patches/0001-Merge-fixup-for-Rust-error.patch +Applying: Merge fixup for Rust error +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/block/rnull/configfs.rs +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master c6081e1eace70] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Thu Feb 5 12:45:04 2026 +0000 +$ git am -3 ../patches/0001-Revert-block-remove-bio_last_bvec_all.patch +Applying: Revert "block: remove bio_last_bvec_all" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/block/biovecs.rst +M include/linux/bio.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 78afd5bd48c65] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Thu Feb 5 12:45:04 2026 +0000 +Merging device-mapper/for-next (218b16992a37e dm mpath: make pg_init_delay_msecs settable) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/md/dm-integrity.c +Auto-merging drivers/md/dm-rq.c +Auto-merging drivers/md/dm-verity-target.c +Auto-merging drivers/md/md.c +Merge made by the 'ort' strategy. + .../admin-guide/device-mapper/dm-raid.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 7 + + drivers/md/Kconfig | 4 +- + drivers/md/dm-bufio.c | 179 +++-- + drivers/md/dm-cache-target.c | 10 +- + drivers/md/dm-clone-target.c | 19 +- + drivers/md/dm-core.h | 1 - + drivers/md/dm-crypt.c | 6 +- + drivers/md/dm-delay.c | 4 +- + drivers/md/dm-exception-store.c | 2 +- + drivers/md/dm-integrity.c | 30 +- + drivers/md/dm-ioctl.c | 7 +- + drivers/md/dm-kcopyd.c | 3 +- + drivers/md/dm-log-userspace-base.c | 3 +- + drivers/md/dm-log.c | 2 +- + drivers/md/dm-mpath.c | 27 +- + drivers/md/dm-path-selector.c | 2 +- + drivers/md/dm-raid1.c | 5 +- + drivers/md/dm-rq.c | 16 +- + drivers/md/dm-snap-persistent.c | 3 +- + drivers/md/dm-stripe.c | 12 +- + drivers/md/dm-table.c | 44 +- + drivers/md/dm-target.c | 2 +- + drivers/md/dm-unstripe.c | 2 +- + drivers/md/dm-vdo/data-vio.h | 4 +- + drivers/md/dm-vdo/encodings.c | 11 +- + drivers/md/dm-vdo/encodings.h | 25 - + drivers/md/dm-verity-fec.c | 134 ++-- + drivers/md/dm-verity-fec.h | 35 +- + drivers/md/dm-verity-target.c | 65 +- + drivers/md/dm-verity-verify-sig.c | 45 ++ + drivers/md/dm-verity-verify-sig.h | 12 + + drivers/md/dm-verity.h | 5 +- + drivers/md/dm-writecache.c | 3 +- + drivers/md/dm-zone.c | 11 +- + drivers/md/dm.c | 5 +- + drivers/md/md.c | 4 +- + tools/testing/selftests/dm-verity/Makefile | 5 + + tools/testing/selftests/dm-verity/config | 10 + + .../selftests/dm-verity/test-dm-verity-keyring.sh | 873 +++++++++++++++++++++ + 40 files changed, 1303 insertions(+), 336 deletions(-) + create mode 100644 tools/testing/selftests/dm-verity/Makefile + create mode 100644 tools/testing/selftests/dm-verity/config + create mode 100755 tools/testing/selftests/dm-verity/test-dm-verity-keyring.sh +Merging libata/for-next (ff4a46c278ac6 ata: pata_ftide010: Fix some DMA timings) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/ata/sata-common.yaml +Auto-merging drivers/ata/libata-core.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 + + .../devicetree/bindings/ata/ahci-platform.yaml | 20 - + .../devicetree/bindings/ata/sata-common.yaml | 3 + + drivers/ata/Kconfig | 17 +- + drivers/ata/ahci_dwc.c | 10 +- + drivers/ata/ahci_imx.c | 2 +- + drivers/ata/ahci_xgene.c | 2 +- + drivers/ata/libata-core.c | 241 ++++-- + drivers/ata/libata-eh.c | 9 +- + drivers/ata/libata-scsi.c | 182 ++++- + drivers/ata/libata.h | 3 + + drivers/ata/pata_cypress.c | 2 +- + drivers/ata/pata_ftide010.c | 6 +- + drivers/ata/pata_legacy.c | 867 +-------------------- + include/linux/ata.h | 3 - + include/linux/libata.h | 73 +- + 16 files changed, 404 insertions(+), 1041 deletions(-) +Merging pcmcia/pcmcia-next (4a81f78caa53e pcmcia: Add error handling for add_interval() in do_validate_mem()) +$ git merge -m Merge branch 'pcmcia-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (e2ccce3c5986d mmc: host: renesas_sdhi_core: support selecting an optional mux) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 2 + + .../devicetree/bindings/mmc/arm,pl18x.yaml | 2 +- + .../devicetree/bindings/mmc/brcm,iproc-sdhci.yaml | 5 + + .../devicetree/bindings/mmc/bst,c1200-sdhci.yaml | 70 ++ + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 2 - + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 3 + + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 6 + + .../devicetree/bindings/mmc/spacemit,sdhci.yaml | 14 +- + MAINTAINERS | 2 + + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 4 +- + arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts | 4 +- + drivers/i2c/busses/i2c-omap.c | 24 +- + drivers/mmc/core/card.h | 11 + + drivers/mmc/core/mmc.c | 12 + + drivers/mmc/core/queue.c | 9 +- + drivers/mmc/core/quirks.h | 12 + + drivers/mmc/host/Kconfig | 14 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/atmel-mci.c | 12 +- + drivers/mmc/host/cavium-octeon.c | 5 +- + drivers/mmc/host/cavium.c | 4 +- + drivers/mmc/host/dw_mmc-bluefield.c | 2 +- + drivers/mmc/host/dw_mmc-exynos.c | 9 +- + drivers/mmc/host/dw_mmc-hi3798cv200.c | 6 +- + drivers/mmc/host/dw_mmc-hi3798mv200.c | 17 +- + drivers/mmc/host/dw_mmc-k3.c | 51 +- + drivers/mmc/host/dw_mmc-pci.c | 37 +- + drivers/mmc/host/dw_mmc-pltfm.c | 17 +- + drivers/mmc/host/dw_mmc-rockchip.c | 47 +- + drivers/mmc/host/dw_mmc-starfive.c | 5 +- + drivers/mmc/host/dw_mmc.c | 768 ++++++++------------- + drivers/mmc/host/dw_mmc.h | 146 +--- + drivers/mmc/host/jz4740_mmc.c | 2 +- + drivers/mmc/host/loongson2-mmc.c | 1 - + drivers/mmc/host/mmci_qcom_dml.c | 1 + + drivers/mmc/host/mtk-sd.c | 32 +- + drivers/mmc/host/renesas_sdhi_core.c | 6 + + drivers/mmc/host/sdhci-esdhc-imx.c | 18 + + drivers/mmc/host/sdhci-msm.c | 77 +++ + drivers/mmc/host/sdhci-of-aspeed.c | 5 +- + drivers/mmc/host/sdhci-of-bst.c | 521 ++++++++++++++ + drivers/mmc/host/sdhci-of-k1.c | 39 +- + drivers/mmc/host/sdhci.c | 23 +- + drivers/mux/Kconfig | 8 +- + drivers/mux/core.c | 210 +++++- + drivers/phy/phy-can-transceiver.c | 10 - + include/linux/mmc/card.h | 2 + + include/linux/mmc/sdio_ids.h | 3 + + include/linux/mux/consumer.h | 108 ++- + 49 files changed, 1592 insertions(+), 797 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/bst,c1200-sdhci.yaml + create mode 100644 drivers/mmc/host/sdhci-of-bst.c +$ git reset --hard HEAD^ +HEAD is now at f5315dc25d011 Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux +Merging next-20260204 version of mmc +$ git merge -m next-20260204/mmc a77252368f23f452814ae73c454a20d119c90a3b +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 2 + + .../devicetree/bindings/mmc/arm,pl18x.yaml | 2 +- + .../devicetree/bindings/mmc/brcm,iproc-sdhci.yaml | 5 + + .../devicetree/bindings/mmc/bst,c1200-sdhci.yaml | 70 ++ + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 2 - + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 3 + + .../devicetree/bindings/mmc/spacemit,sdhci.yaml | 14 +- + MAINTAINERS | 2 + + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 4 +- + arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts | 4 +- + drivers/mmc/core/card.h | 6 + + drivers/mmc/core/mmc.c | 12 + + drivers/mmc/core/quirks.h | 3 + + drivers/mmc/host/Kconfig | 14 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/atmel-mci.c | 12 +- + drivers/mmc/host/cavium-octeon.c | 5 +- + drivers/mmc/host/cavium.c | 4 +- + drivers/mmc/host/dw_mmc-bluefield.c | 2 +- + drivers/mmc/host/dw_mmc-exynos.c | 9 +- + drivers/mmc/host/dw_mmc-hi3798cv200.c | 6 +- + drivers/mmc/host/dw_mmc-hi3798mv200.c | 17 +- + drivers/mmc/host/dw_mmc-k3.c | 51 +- + drivers/mmc/host/dw_mmc-pci.c | 37 +- + drivers/mmc/host/dw_mmc-pltfm.c | 12 +- + drivers/mmc/host/dw_mmc-rockchip.c | 47 +- + drivers/mmc/host/dw_mmc-starfive.c | 5 +- + drivers/mmc/host/dw_mmc.c | 762 ++++++++------------- + drivers/mmc/host/dw_mmc.h | 146 +--- + drivers/mmc/host/jz4740_mmc.c | 2 +- + drivers/mmc/host/loongson2-mmc.c | 1 - + drivers/mmc/host/mmci_qcom_dml.c | 1 + + drivers/mmc/host/mtk-sd.c | 32 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 18 + + drivers/mmc/host/sdhci-msm.c | 77 +++ + drivers/mmc/host/sdhci-of-aspeed.c | 5 +- + drivers/mmc/host/sdhci-of-bst.c | 521 ++++++++++++++ + drivers/mmc/host/sdhci-of-k1.c | 39 +- + drivers/mmc/host/sdhci.c | 23 +- + include/linux/mmc/card.h | 1 + + include/linux/mmc/sdio_ids.h | 3 + + 41 files changed, 1261 insertions(+), 721 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/bst,c1200-sdhci.yaml + create mode 100644 drivers/mmc/host/sdhci-of-bst.c +Merging mfd/for-mfd-next (845776177cf3b dt-bindings: mfd: da9055: Fix dead link to codec binding) +$ git merge -m Merge branch 'for-mfd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging MAINTAINERS +Auto-merging drivers/clk/Kconfig +Merge made by the 'ort' strategy. + .../bindings/leds/rohm,bd71828-leds.yaml | 7 +- + .../bindings/mfd/aspeed,ast2x00-scu.yaml | 17 + + .../devicetree/bindings/mfd/atmel,hlcdc.yaml | 1 + + .../bindings/mfd/atmel,sama5d2-flexcom.yaml | 1 + + .../bindings/mfd/bitmain,bm1880-sctrl.yaml | 66 ++ + Documentation/devicetree/bindings/mfd/da9055.txt | 2 +- + .../devicetree/bindings/mfd/mediatek,mt6397.yaml | 1 + + .../bindings/mfd/mediatek,mt8195-scpsys.yaml | 1 + + .../devicetree/bindings/mfd/nxp,lpc3220-scb.yaml | 74 ++ + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 6 + + .../devicetree/bindings/mfd/qnap,ts433-mcu.yaml | 1 + + .../devicetree/bindings/mfd/rockchip,rk801.yaml | 197 ++++ + .../devicetree/bindings/mfd/rohm,bd72720-pmic.yaml | 339 +++++++ + Documentation/devicetree/bindings/mfd/syscon.yaml | 5 + + .../devicetree/bindings/power/supply/battery.yaml | 33 +- + .../bindings/regulator/rohm,bd72720-regulator.yaml | 148 +++ + MAINTAINERS | 2 + + drivers/clk/Kconfig | 4 +- + drivers/clk/clk-bd718x7.c | 10 +- + drivers/gpio/Kconfig | 9 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-bd72720.c | 281 ++++++ + drivers/mfd/Kconfig | 36 +- + drivers/mfd/arizona-core.c | 2 +- + drivers/mfd/atmel-hlcdc.c | 1 + + drivers/mfd/axp20x.c | 5 +- + drivers/mfd/cgbc-core.c | 1 + + drivers/mfd/da9052-spi.c | 2 +- + drivers/mfd/intel-lpss-pci.c | 13 + + drivers/mfd/macsmc.c | 4 + + drivers/mfd/max77759.c | 12 +- + drivers/mfd/mfd-core.c | 45 +- + drivers/mfd/omap-usb-host.c | 6 +- + drivers/mfd/qcom-pm8xxx.c | 8 +- + drivers/mfd/qnap-mcu.c | 9 + + drivers/mfd/rk8xx-core.c | 81 ++ + drivers/mfd/rk8xx-i2c.c | 33 +- + drivers/mfd/rohm-bd71828.c | 555 ++++++++++- + drivers/mfd/sec-common.c | 45 +- + drivers/mfd/sec-core.h | 2 +- + drivers/mfd/sec-irq.c | 65 +- + drivers/mfd/simple-mfd-i2c.c | 1 + + drivers/mfd/tps65219.c | 9 + + drivers/power/supply/bd71828-power.c | 160 ++- + drivers/regulator/Kconfig | 8 +- + drivers/regulator/bd71828-regulator.c | 1027 +++++++++++++++++++- + drivers/regulator/rk808-regulator.c | 243 +++++ + drivers/rtc/Kconfig | 3 +- + drivers/rtc/rtc-bd70528.c | 21 +- + drivers/rtc/rtc-s5m.c | 21 +- + include/linux/mfd/axp20x.h | 3 + + include/linux/mfd/rk808.h | 118 +++ + include/linux/mfd/rohm-bd71828.h | 2 + + include/linux/mfd/rohm-bd72720.h | 634 ++++++++++++ + include/linux/mfd/rohm-generic.h | 1 + + include/linux/mfd/samsung/core.h | 1 - + include/linux/mfd/tps6105x.h | 5 +- + include/linux/mfd/tps65219.h | 2 + + 58 files changed, 4144 insertions(+), 246 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/bitmain,bm1880-sctrl.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/nxp,lpc3220-scb.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/rockchip,rk801.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd72720-pmic.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd72720-regulator.yaml + create mode 100644 drivers/gpio/gpio-bd72720.c + create mode 100644 include/linux/mfd/rohm-bd72720.h +Merging backlight/for-backlight-next (83333aa97441b backlight: qcom-wled: Change PM8950 WLED configurations) +$ git merge -m Merge branch 'for-backlight-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Merge made by the 'ort' strategy. + .../bindings/leds/backlight/qcom-wled.yaml | 24 ++- + drivers/video/backlight/Kconfig | 11 ++ + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/aw99706.c | 2 +- + drivers/video/backlight/cgbc_bl.c | 180 +++++++++++++++++++++ + drivers/video/backlight/qcom-wled.c | 42 ++++- + 6 files changed, 255 insertions(+), 5 deletions(-) + create mode 100644 drivers/video/backlight/cgbc_bl.c +Merging battery/for-next (12bdf471e374b power: supply: bd71828: Use dev_err_probe()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/goldfish/battery.txt | 17 --------- + .../power/supply/google,goldfish-battery.yaml | 41 ++++++++++++++++++++++ + Documentation/power/charger-manager.rst | 12 +------ + MAINTAINERS | 2 +- + drivers/power/reset/nvmem-reboot-mode.c | 15 ++++++-- + drivers/power/reset/tdx-ec-poweroff.c | 19 ++++++++++ + drivers/power/supply/ab8500_chargalg.c | 15 ++++---- + drivers/power/supply/ab8500_charger.c | 40 ++++++++++----------- + drivers/power/supply/act8945a_charger.c | 16 ++++----- + drivers/power/supply/bd71828-power.c | 9 ++--- + drivers/power/supply/bd99954-charger.c | 1 - + drivers/power/supply/bq256xx_charger.c | 13 ++++--- + drivers/power/supply/bq25980_charger.c | 13 ++++--- + drivers/power/supply/bq27xxx_battery.c | 6 ++-- + drivers/power/supply/cpcap-battery.c | 8 ++--- + drivers/power/supply/cw2015_battery.c | 1 - + drivers/power/supply/goldfish_battery.c | 12 +++---- + drivers/power/supply/pf1550-charger.c | 32 ++++++++--------- + drivers/power/supply/pm8916_bms_vm.c | 18 +++++----- + drivers/power/supply/pm8916_lbc.c | 18 +++++----- + drivers/power/supply/power_supply_sysfs.c | 6 ++-- + drivers/power/supply/qcom_battmgr.c | 3 +- + drivers/power/supply/rt9455_charger.c | 17 ++++----- + drivers/power/supply/sbs-battery.c | 36 +++++++++---------- + drivers/power/supply/ucs1002_power.c | 1 - + drivers/power/supply/wm97xx_battery.c | 40 ++++++++------------- + 26 files changed, 221 insertions(+), 190 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/goldfish/battery.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/google,goldfish-battery.yaml +Merging regulator/for-next (3d54df872c8ee Merge remote-tracking branch 'regulator/for-6.20' into regulator-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/mfd/sec-irq.c +Auto-merging drivers/regulator/Kconfig +Merge made by the 'ort' strategy. + .../bindings/firmware/google,gs101-acpm-ipc.yaml | 4 +- + .../bindings/mfd/samsung,s2mpg10-pmic.yaml | 120 ++ + .../bindings/mfd/samsung,s2mpg11-pmic.yaml | 88 ++ + .../devicetree/bindings/mfd/samsung,s2mps11.yaml | 29 +- + .../bindings/regulator/adi,max77675.yaml | 184 +++ + .../regulator/mediatek,mt6331-regulator.yaml | 4 +- + ...pberrypi,7inch-touchscreen-panel-regulator.yaml | 5 + + .../devicetree/bindings/regulator/regulator.yaml | 1 + + .../bindings/regulator/richtek,rt5739.yaml | 5 + + .../regulator/samsung,s2mpg10-regulator.yaml | 158 +++ + .../regulator/samsung,s2mpg11-regulator.yaml | 136 +++ + .../devicetree/bindings/regulator/ti,tps65185.yaml | 96 ++ + MAINTAINERS | 1 + + drivers/mfd/sec-acpm.c | 171 ++- + drivers/mfd/sec-common.c | 17 +- + drivers/mfd/sec-irq.c | 86 +- + drivers/regulator/Kconfig | 29 + + drivers/regulator/Makefile | 3 + + drivers/regulator/core.c | 359 ++++-- + drivers/regulator/dummy.c | 2 +- + drivers/regulator/max77675-regulator.c | 1056 +++++++++++++++++ + drivers/regulator/rt8092.c | 313 ++++++ + drivers/regulator/s2mps11.c | 1186 ++++++++++++++++++-- + drivers/regulator/tps65185.c | 454 ++++++++ + .../regulator/samsung,s2mpg10-regulator.h | 53 + + include/linux/mfd/samsung/core.h | 1 + + include/linux/mfd/samsung/irq.h | 105 ++ + include/linux/mfd/samsung/s2mpg10.h | 44 +- + include/linux/mfd/samsung/s2mpg11.h | 434 +++++++ + include/linux/regulator/driver.h | 7 + + rust/helpers/regulator.c | 24 +- + rust/kernel/regulator.rs | 9 +- + 32 files changed, 4903 insertions(+), 281 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/samsung,s2mpg10-pmic.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/samsung,s2mpg11-pmic.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/adi,max77675.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mpg10-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/samsung,s2mpg11-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps65185.yaml + create mode 100644 drivers/regulator/max77675-regulator.c + create mode 100644 drivers/regulator/rt8092.c + create mode 100644 drivers/regulator/tps65185.c + create mode 100644 include/dt-bindings/regulator/samsung,s2mpg10-regulator.h + create mode 100644 include/linux/mfd/samsung/s2mpg11.h +Merging security/next (472711068fa95 lsm: make keys for static branch static) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging fs/nfs/nfs4proc.c +Merge made by the 'ort' strategy. + fs/nfs/nfs4proc.c | 38 +++----------------------------------- + include/linux/cred.h | 1 - + include/linux/lsm_hooks.h | 4 ++-- + kernel/cred.c | 23 ----------------------- + rust/helpers/cred.c | 4 ++-- + rust/helpers/security.c | 26 +++++++++++++++----------- + security/security.c | 2 +- + 7 files changed, 23 insertions(+), 75 deletions(-) +Merging apparmor/apparmor-next (1b51bd761599b apparmor: fix cast in format string DEBUG statement) +$ git merge -m Merge branch 'apparmor-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Merge made by the 'ort' strategy. + security/apparmor/.kunitconfig | 5 + + security/apparmor/af_unix.c | 2 +- + security/apparmor/apparmorfs.c | 23 ++- + security/apparmor/domain.c | 60 +++---- + security/apparmor/file.c | 49 ++++-- + security/apparmor/include/audit.h | 2 + + security/apparmor/include/cred.h | 104 ++++++++---- + security/apparmor/include/lib.h | 39 ++++- + security/apparmor/include/match.h | 12 +- + security/apparmor/include/policy.h | 32 +++- + security/apparmor/label.c | 55 +++--- + security/apparmor/lib.c | 29 ++-- + security/apparmor/lsm.c | 66 +++++--- + security/apparmor/match.c | 22 +-- + security/apparmor/net.c | 6 +- + security/apparmor/path.c | 13 +- + security/apparmor/policy.c | 31 +++- + security/apparmor/policy_compat.c | 10 +- + security/apparmor/policy_unpack.c | 336 ++++++++++++++++++++++++++++++++----- + security/apparmor/resource.c | 5 + + security/apparmor/task.c | 32 ++++ + 21 files changed, 690 insertions(+), 243 deletions(-) + create mode 100644 security/apparmor/.kunitconfig +Merging integrity/next-integrity (0496fc9cdc384 evm: Use ordered xattrs list to calculate HMAC in evm_init_hmac()) +$ git merge -m Merge branch 'next-integrity' of https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Auto-merging security/integrity/evm/evm_crypto.c +Merge made by the 'ort' strategy. + security/integrity/evm/evm_crypto.c | 14 ++++++++++---- + security/integrity/ima/ima.h | 6 ++++-- + security/integrity/ima/ima_appraise.c | 16 +++------------- + security/integrity/ima/ima_main.c | 22 +++++++++++++--------- + 4 files changed, 30 insertions(+), 28 deletions(-) +Merging selinux/next (ea64aa57d596c selinux: drop the BUG() in cred_has_capability()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/hooks.c | 163 ++++++++++++++++++++++++----- + security/selinux/include/classmap.h | 2 +- + security/selinux/include/objsec.h | 3 + + security/selinux/include/policycap.h | 1 + + security/selinux/include/policycap_names.h | 1 + + security/selinux/include/security.h | 6 ++ + 6 files changed, 151 insertions(+), 25 deletions(-) +Merging smack/next (33d589ed60ae4 smack: /smack/doi: accept previously used values) +$ git merge -m Merge branch 'next' of https://github.com/cschaufler/smack-next smack/next +Merge made by the 'ort' strategy. + security/smack/smack_access.c | 2 +- + security/smack/smackfs.c | 79 +++++++++++++++++++++++++++---------------- + 2 files changed, 51 insertions(+), 30 deletions(-) +Merging tomoyo/master (bc8a1ba841e1b xfrm: always flush state and policy upon NETDEV_UNREGISTER event) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Auto-merging drivers/infiniband/core/cache.c +Auto-merging drivers/infiniband/core/device.c +Auto-merging include/linux/netdevice.h +Auto-merging net/can/j1939/transport.c +Auto-merging net/core/dev.c +Merge made by the 'ort' strategy. + drivers/infiniband/core/cache.c | 112 ++++++++++++++++++- + drivers/infiniband/core/core_priv.h | 6 + + drivers/infiniband/core/device.c | 49 ++++++++- + drivers/infiniband/core/roce_gid_mgmt.c | 28 ++++- + fs/hfs/super.c | 2 +- + include/linux/netdevice.h | 15 +++ + kernel/softirq.c | 4 + + kernel/workqueue.c | 4 + + net/can/j1939/j1939-priv.h | 7 ++ + net/can/j1939/main.c | 90 +++++++++++++++ + net/can/j1939/transport.c | 3 + + net/core/dev.c | 187 ++++++++++++++++++++++++++++++++ + net/core/lock_debug.c | 1 + + net/socket.c | 32 ++++-- + net/xfrm/xfrm_device.c | 12 +- + 15 files changed, 538 insertions(+), 14 deletions(-) +Merging tpmdd/next (3e91b44c93ad2 tpm: st33zp24: Fix missing cleanup on get_burstcount() error) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + drivers/char/tpm/st33zp24/st33zp24.c | 6 ++++-- + drivers/char/tpm/tpm_i2c_infineon.c | 6 ++++-- + 2 files changed, 8 insertions(+), 4 deletions(-) +Merging watchdog/master (450517fa5aae9 dt-bindings: watchdog: qcom-wdt: Document Glymur watchdog) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Auto-merging Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/watchdog/mpc8xxx-wdt.txt | 25 --- + .../devicetree/bindings/watchdog/mpc8xxx-wdt.yaml | 64 ++++++ + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 1 + + .../devicetree/bindings/watchdog/samsung-wdt.yaml | 72 +++++-- + Documentation/watchdog/watchdog-kernel-api.rst | 2 +- + Documentation/watchdog/watchdog-parameters.rst | 7 - + drivers/watchdog/Kconfig | 8 - + drivers/watchdog/Makefile | 3 - + drivers/watchdog/iTCO_vendor.h | 14 -- + drivers/watchdog/iTCO_vendor_support.c | 216 --------------------- + drivers/watchdog/iTCO_wdt.c | 12 +- + drivers/watchdog/imx7ulp_wdt.c | 1 + + drivers/watchdog/it87_wdt.c | 12 ++ + drivers/watchdog/s3c2410_wdt.c | 22 +-- + drivers/watchdog/sbsa_gwdt.c | 4 +- + drivers/watchdog/starfive-wdt.c | 2 +- + drivers/watchdog/watchdog_core.c | 3 +- + drivers/watchdog/watchdog_dev.c | 35 ++-- + include/linux/watchdog.h | 12 +- + 19 files changed, 161 insertions(+), 354 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/watchdog/mpc8xxx-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/mpc8xxx-wdt.yaml + delete mode 100644 drivers/watchdog/iTCO_vendor.h + delete mode 100644 drivers/watchdog/iTCO_vendor_support.c +Merging iommu/next (7dddaf3320f96 Merge branches 'arm/smmu/updates', 'intel/vt-d', 'amd/amd-vi' and 'core' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/pci/pci-acpi.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/quirks.c +Auto-merging include/linux/mm.h +Auto-merging rust/kernel/lib.rs +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 9 + + MAINTAINERS | 1 + + drivers/iommu/Kconfig | 19 ++ + drivers/iommu/Makefile | 1 + + drivers/iommu/amd/Kconfig | 10 + + drivers/iommu/amd/Makefile | 1 + + drivers/iommu/amd/amd_iommu.h | 33 +++ + drivers/iommu/amd/amd_iommu_types.h | 50 +++- + drivers/iommu/amd/init.c | 12 +- + drivers/iommu/amd/iommu.c | 311 +++++++++++++-------- + drivers/iommu/amd/iommufd.c | 77 +++++ + drivers/iommu/amd/iommufd.h | 20 ++ + drivers/iommu/amd/nested.c | 294 +++++++++++++++++++ + drivers/iommu/arm/Kconfig | 1 - + .../iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 4 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c | 78 +++++- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 153 +++++++--- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 6 +- + drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 84 +----- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 28 ++ + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 8 +- + drivers/iommu/dma-iommu.c | 4 +- + drivers/iommu/dma-iommu.h | 5 +- + drivers/iommu/generic_pt/fmt/amdv1.h | 3 +- + drivers/iommu/generic_pt/fmt/x86_64.h | 3 +- + drivers/iommu/generic_pt/iommu_pt.h | 3 +- + drivers/iommu/intel/cache.c | 9 +- + drivers/iommu/intel/iommu.c | 33 +-- + drivers/iommu/intel/iommu.h | 21 +- + drivers/iommu/intel/nested.c | 9 +- + drivers/iommu/intel/pasid.c | 212 ++------------ + drivers/iommu/intel/pasid.h | 28 +- + drivers/iommu/iommu-debug-pagealloc.c | 164 +++++++++++ + drivers/iommu/iommu-priv.h | 58 ++++ + drivers/iommu/iommu.c | 234 +++++++++++++++- + drivers/pci/pci-acpi.c | 17 +- + drivers/pci/pci.c | 65 ++++- + drivers/pci/quirks.c | 19 +- + include/linux/iommu-debug-pagealloc.h | 32 +++ + include/linux/iommu.h | 14 + + include/linux/mm.h | 5 + + include/linux/page_ext.h | 6 + + include/uapi/linux/iommufd.h | 39 +++ + include/uapi/linux/vfio.h | 4 + + mm/page_ext.c | 27 ++ + rust/bindings/bindings_helper.h | 3 +- + rust/kernel/iommu/mod.rs | 5 + + rust/kernel/iommu/pgtable.rs | 279 ++++++++++++++++++ + rust/kernel/lib.rs | 1 + + 49 files changed, 2000 insertions(+), 502 deletions(-) + create mode 100644 drivers/iommu/amd/iommufd.c + create mode 100644 drivers/iommu/amd/iommufd.h + create mode 100644 drivers/iommu/amd/nested.c + create mode 100644 drivers/iommu/iommu-debug-pagealloc.c + create mode 100644 include/linux/iommu-debug-pagealloc.h + create mode 100644 rust/kernel/iommu/mod.rs + create mode 100644 rust/kernel/iommu/pgtable.rs +Merging audit/next (76489955c6d4a audit: move the compat_xxx_class[] extern declarations to audit_arch.h) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Auto-merging include/linux/audit.h +Auto-merging kernel/audit.c +Merge made by the 'ort' strategy. + include/asm-generic/audit_change_attr.h | 3 + + include/asm-generic/audit_read.h | 6 ++ + include/linux/audit.h | 14 +-- + include/linux/audit_arch.h | 7 ++ + kernel/audit.c | 159 ++++++++++++++++++++++++++++++++ + net/netfilter/nft_log.c | 58 +----------- + net/netfilter/xt_AUDIT.c | 58 +----------- + 7 files changed, 185 insertions(+), 120 deletions(-) +Merging devicetree/for-next (39451ebcf7fe1 dt-bindings: firmware: fsl,scu: Mark multi-channel MU layouts as deprecated) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging .clang-format +Auto-merging Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml +Auto-merging Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml +Auto-merging Documentation/devicetree/bindings/mfd/mediatek,mt8195-scpsys.yaml +Auto-merging Documentation/devicetree/bindings/power/mediatek,power-controller.yaml +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging drivers/of/of_reserved_mem.c +Auto-merging drivers/of/platform.c +Auto-merging drivers/of/unittest.c +Merge made by the 'ort' strategy. + .clang-format | 1 + + Documentation/devicetree/bindings/Makefile | 6 +- + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 6 + + .../bindings/arm/bcm/brcm,vulcan-soc.yaml | 24 -- + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 8 + + .../devicetree/bindings/arm/omap/prm-inst.txt | 31 -- + .../bindings/arm/ti/ti,omap-prm-inst.yaml | 55 ++++ + .../devicetree/bindings/arm/vexpress-config.yaml | 6 +- + .../bindings/bus/aspeed,ast2600-ahbc.yaml | 8 +- + .../bindings/bus/st,stm32mp25-rifsc.yaml | 2 +- + .../bindings/crypto/aspeed,ast2600-acry.yaml | 7 + + .../bindings/crypto/inside-secure,safexcel.yaml | 22 ++ + .../bindings/display/bridge/fsl,ldb.yaml | 10 + + .../bindings/display/bridge/lvds-codec.yaml | 1 + + .../bindings/display/bridge/nxp,tda998x.yaml | 3 + + .../bindings/display/bridge/toshiba,tc358767.yaml | 2 +- + .../bindings/display/google,goldfish-fb.txt | 17 -- + .../bindings/display/google,goldfish-fb.yaml | 38 +++ + .../bindings/dsp/mediatek,mt8186-dsp.yaml | 2 +- + Documentation/devicetree/bindings/eeprom/at25.yaml | 1 + + .../embedded-controller/lenovo,yoga-c630-ec.yaml | 2 +- + .../bindings/firmware/cznic,turris-mox-rwtm.txt | 19 -- + .../bindings/firmware/cznic,turris-mox-rwtm.yaml | 40 +++ + .../devicetree/bindings/firmware/fsl,scu.yaml | 20 +- + .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 21 +- + .../bindings/hwmon/iei,wt61p803-puzzle-hwmon.yaml | 59 ++++ + .../devicetree/bindings/hwmon/sensirion,shtc1.yaml | 2 +- + .../devicetree/bindings/input/syna,rmi4.yaml | 2 +- + .../interrupt-controller/loongson,eiointc.yaml | 3 + + .../interrupt-controller/loongson,liointc.yaml | 3 + + .../interrupt-controller/loongson,pch-pic.yaml | 3 + + .../bindings/leds/iei,wt61p803-puzzle-leds.yaml | 41 +++ + .../bindings/media/i2c/onnn,mt9m114.yaml | 2 +- + .../bindings/media/samsung,exynos5250-gsc.yaml | 2 +- + .../bindings/mfd/iei,wt61p803-puzzle.yaml | 80 ++++++ + .../bindings/mfd/mediatek,mt8195-scpsys.yaml | 3 +- + .../devicetree/bindings/mfd/realtek,rtd1xxx.yaml | 69 +++++ + .../devicetree/bindings/net/brcm,amac.yaml | 2 + + .../devicetree/bindings/pci/mbvl,gpex40-pcie.yaml | 2 +- + .../bindings/power/mediatek,power-controller.yaml | 2 +- + .../bindings/power/reset/syscon-poweroff.yaml | 8 +- + .../bindings/power/reset/syscon-reboot.yaml | 2 +- + .../devicetree/bindings/remoteproc/mtk,scp.yaml | 2 +- + .../devicetree/bindings/submitting-patches.rst | 4 +- + .../devicetree/bindings/trivial-devices.yaml | 8 + + .../devicetree/bindings/usb/ite,it5205.yaml | 2 +- + .../devicetree/bindings/writing-schema.rst | 12 +- + MAINTAINERS | 10 +- + Makefile | 14 +- + arch/arm/mach-at91/pm.c | 7 +- + arch/arm/mach-exynos/exynos.c | 8 +- + arch/powerpc/platforms/44x/fsp2.c | 5 +- + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 4 +- + drivers/cdx/cdx.c | 15 +- + drivers/clk/imx/clk-imx27.c | 7 +- + drivers/clk/imx/clk-imx31.c | 7 +- + drivers/cpufreq/s5pv210-cpufreq.c | 10 +- + drivers/dma/fsl_raid.c | 4 +- + drivers/of/of_reserved_mem.c | 3 +- + drivers/of/platform.c | 15 +- + drivers/of/property.c | 49 ++-- + drivers/of/unittest.c | 6 +- + include/dt-bindings/clock/oxsemi,ox810se.h | 19 -- + include/dt-bindings/clock/oxsemi,ox820.h | 29 -- + include/dt-bindings/clock/qcom,mss-sc7180.h | 12 - + include/dt-bindings/clock/xlnx-versal-clk.h | 123 -------- + include/dt-bindings/clock/xlnx-zynqmp-clk.h | 133 --------- + include/dt-bindings/dma/jz4775-dma.h | 44 --- + include/dt-bindings/dma/x2000-dma.h | 54 ---- + include/dt-bindings/gce/mt6779-gce.h | 222 --------------- + include/dt-bindings/memory/mt6779-larb-port.h | 206 -------------- + include/dt-bindings/mux/ti-serdes.h | 190 ------------- + include/dt-bindings/pinctrl/mt6397-pinfunc.h | 257 ----------------- + include/dt-bindings/reset/bcm6318-reset.h | 20 -- + include/dt-bindings/reset/imx8ulp-pcc-reset.h | 59 ---- + include/dt-bindings/reset/oxsemi,ox810se.h | 42 --- + include/dt-bindings/reset/oxsemi,ox820.h | 42 --- + include/dt-bindings/sound/audio-jack-events.h | 10 - + include/linux/of.h | 7 + + scripts/Makefile.dtbs | 1 - + scripts/dtc/checks.c | 42 +-- + scripts/dtc/dt-extract-compatibles | 1 + + scripts/dtc/dtc.c | 5 + + scripts/dtc/dtc.h | 6 + + scripts/dtc/flattree.c | 6 +- + scripts/dtc/libfdt/fdt_overlay.c | 3 +- + scripts/dtc/libfdt/fdt_ro.c | 4 +- + scripts/dtc/libfdt/libfdt.h | 214 ++++++++++++++ + scripts/dtc/libfdt/libfdt_env.h | 27 -- + scripts/dtc/libfdt/libfdt_internal.h | 14 +- + scripts/dtc/livetree.c | 311 ++++++++++++++++++--- + scripts/dtc/srcpos.c | 22 +- + scripts/dtc/treesource.c | 114 ++++++-- + scripts/dtc/version_gen.h | 2 +- + 94 files changed, 1236 insertions(+), 1834 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/omap/prm-inst.txt + create mode 100644 Documentation/devicetree/bindings/arm/ti/ti,omap-prm-inst.yaml + delete mode 100644 Documentation/devicetree/bindings/display/google,goldfish-fb.txt + create mode 100644 Documentation/devicetree/bindings/display/google,goldfish-fb.yaml + delete mode 100644 Documentation/devicetree/bindings/firmware/cznic,turris-mox-rwtm.txt + create mode 100644 Documentation/devicetree/bindings/firmware/cznic,turris-mox-rwtm.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/iei,wt61p803-puzzle-hwmon.yaml + create mode 100644 Documentation/devicetree/bindings/leds/iei,wt61p803-puzzle-leds.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/iei,wt61p803-puzzle.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/realtek,rtd1xxx.yaml + delete mode 100644 include/dt-bindings/clock/oxsemi,ox810se.h + delete mode 100644 include/dt-bindings/clock/oxsemi,ox820.h + delete mode 100644 include/dt-bindings/clock/qcom,mss-sc7180.h + delete mode 100644 include/dt-bindings/clock/xlnx-versal-clk.h + delete mode 100644 include/dt-bindings/clock/xlnx-zynqmp-clk.h + delete mode 100644 include/dt-bindings/dma/jz4775-dma.h + delete mode 100644 include/dt-bindings/dma/x2000-dma.h + delete mode 100644 include/dt-bindings/gce/mt6779-gce.h + delete mode 100644 include/dt-bindings/memory/mt6779-larb-port.h + delete mode 100644 include/dt-bindings/mux/ti-serdes.h + delete mode 100644 include/dt-bindings/pinctrl/mt6397-pinfunc.h + delete mode 100644 include/dt-bindings/reset/bcm6318-reset.h + delete mode 100644 include/dt-bindings/reset/imx8ulp-pcc-reset.h + delete mode 100644 include/dt-bindings/reset/oxsemi,ox810se.h + delete mode 100644 include/dt-bindings/reset/oxsemi,ox820.h + delete mode 100644 include/dt-bindings/sound/audio-jack-events.h +Merging dt-krzk/for-next (5cd532f7f0174 arm64: dts: apm: Drop "dma" device_type) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/for-next (75df94d05fc03 mailbox: sprd: mask interrupts that are not handled) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Auto-merging Documentation/devicetree/bindings/mailbox/qcom,cpucp-mbox.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mailbox/qcom,cpucp-mbox.yaml +Auto-merging drivers/mailbox/mtk-cmdq-mailbox.c +Resolved 'Documentation/devicetree/bindings/mailbox/qcom,cpucp-mbox.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 16b6bbb08f3c4] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/mailbox/mediatek,mt8196-vcp-mbox.yaml | 49 ++++++ + .../bindings/mailbox/microchip,mpfs-mailbox.yaml | 6 +- + .../devicetree/bindings/mailbox/sprd-mailbox.yaml | 1 + + .../bindings/mailbox/xlnx,zynqmp-ipi-mailbox.yaml | 11 ++ + drivers/mailbox/Kconfig | 17 ++- + drivers/mailbox/Makefile | 2 + + drivers/mailbox/arm_mhuv3.c | 2 +- + drivers/mailbox/bcm-flexrm-mailbox.c | 15 +- + drivers/mailbox/cix-mailbox.c | 2 +- + drivers/mailbox/cv1800-mailbox.c | 1 - + drivers/mailbox/exynos-mailbox.c | 9 +- + drivers/mailbox/imx-mailbox.c | 8 +- + drivers/mailbox/mailbox-mchp-ipc-sbi.c | 41 +++-- + drivers/mailbox/mailbox.c | 6 +- + drivers/mailbox/mtk-cmdq-mailbox.c | 12 +- + drivers/mailbox/mtk-vcp-mailbox.c | 170 +++++++++++++++++++++ + drivers/mailbox/omap-mailbox.c | 1 - + drivers/mailbox/pcc.c | 120 +++------------ + drivers/mailbox/sprd-mailbox.c | 117 ++++++++++---- + drivers/mailbox/zynqmp-ipi-mailbox.c | 5 +- + include/acpi/pcc.h | 29 ---- + include/linux/mailbox/mtk-vcp-mailbox.h | 32 ++++ + 22 files changed, 436 insertions(+), 220 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/mediatek,mt8196-vcp-mbox.yaml + create mode 100644 drivers/mailbox/mtk-vcp-mailbox.c + create mode 100644 include/linux/mailbox/mtk-vcp-mailbox.h +Merging spi/for-next (f0b0677d8a1eb Merge remote-tracking branch 'spi/for-6.20' into spi-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging Documentation/spi/index.rst +Auto-merging MAINTAINERS +Auto-merging drivers/spi/spi.c +Auto-merging include/linux/spi/spi.h +Merge made by the 'ort' strategy. + .../bindings/display/panel/sitronix,st7789v.yaml | 5 +- + .../devicetree/bindings/iio/adc/adi,ad4030.yaml | 42 +- + .../devicetree/bindings/iio/adc/adi,ad4695.yaml | 5 +- + .../bindings/spi/adi,axi-spi-engine.yaml | 15 + + .../bindings/spi/allwinner,sun4i-a10-spi.yaml | 6 +- + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 6 +- + .../bindings/spi/andestech,ae350-spi.yaml | 87 ++ + .../bindings/spi/atmel,at91rm9200-spi.yaml | 1 + + .../devicetree/bindings/spi/axiado,ax3000-spi.yaml | 73 ++ + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 2 +- + .../devicetree/bindings/spi/faraday,ftssp010.yaml | 43 + + .../bindings/spi/nvidia,tegra210-quad.yaml | 6 +- + .../devicetree/bindings/spi/nxp,imx94-xspi.yaml | 92 ++ + .../devicetree/bindings/spi/nxp,lpc3220-spi.yaml | 8 + + .../bindings/spi/renesas,rzv2h-rspi.yaml | 8 + + .../bindings/spi/spi-peripheral-props.yaml | 40 +- + .../devicetree/bindings/spi/spi-xilinx.yaml | 1 - + .../devicetree/bindings/spi/st,stm32-spi.yaml | 3 + + Documentation/spi/index.rst | 1 + + Documentation/spi/multiple-data-lanes.rst | 217 +++ + MAINTAINERS | 26 + + drivers/spi/Kconfig | 57 +- + drivers/spi/Makefile | 4 +- + drivers/spi/atmel-quadspi.c | 1 - + drivers/spi/spi-airoha-snfi.c | 1 - + drivers/spi/spi-altera-platform.c | 2 - + drivers/spi/spi-amlogic-spifc-a1.c | 1 - + drivers/spi/spi-amlogic-spisg.c | 1 - + drivers/spi/spi-apple.c | 1 - + drivers/spi/spi-ar934x.c | 1 - + drivers/spi/spi-armada-3700.c | 4 +- + drivers/spi/spi-aspeed-smc.c | 135 +- + drivers/spi/spi-atcspi200.c | 679 ++++++++++ + drivers/spi/spi-ath79.c | 1 - + drivers/spi/spi-atmel.c | 1 - + drivers/spi/spi-axi-spi-engine.c | 146 ++- + drivers/spi/spi-axiado.c | 1007 ++++++++++++++ + drivers/spi/spi-axiado.h | 133 ++ + drivers/spi/spi-bcm-qspi.c | 1 - + drivers/spi/spi-bcm2835.c | 1 - + drivers/spi/spi-bcm2835aux.c | 1 - + drivers/spi/spi-bcm63xx-hsspi.c | 65 +- + drivers/spi/spi-bcm63xx.c | 1 - + drivers/spi/spi-bcmbca-hsspi.c | 1 - + drivers/spi/spi-cadence-quadspi.c | 146 ++- + drivers/spi/spi-cadence-xspi.c | 77 +- + drivers/spi/spi-cadence.c | 1 - + drivers/spi/spi-cavium-octeon.c | 1 - + drivers/spi/spi-cavium-thunderx.c | 1 - + drivers/spi/spi-clps711x.c | 1 - + drivers/spi/spi-cs42l43.c | 8 + + drivers/spi/spi-davinci.c | 1 - + drivers/spi/spi-dln2.c | 3 - + drivers/spi/spi-dw-bt1.c | 331 ----- + drivers/spi/spi-dw-core.c | 2 - + drivers/spi/spi-dw-mmio.c | 37 +- + drivers/spi/spi-ep93xx.c | 1 - + drivers/spi/spi-falcon.c | 1 - + drivers/spi/spi-fsi.c | 7 +- + drivers/spi/spi-fsl-dspi.c | 1 - + drivers/spi/spi-fsl-espi.c | 1 - + drivers/spi/spi-fsl-lib.c | 1 - + drivers/spi/spi-fsl-lpspi.c | 65 +- + drivers/spi/spi-geni-qcom.c | 186 +-- + drivers/spi/spi-gpio.c | 1 - + drivers/spi/spi-gxp.c | 1 - + drivers/spi/spi-hisi-kunpeng.c | 1 - + drivers/spi/spi-img-spfi.c | 1 - + drivers/spi/spi-imx.c | 648 +++++++-- + drivers/spi/spi-ingenic.c | 1 - + drivers/spi/spi-lantiq-ssc.c | 1 - + drivers/spi/spi-ljca.c | 1 - + drivers/spi/spi-loongson-core.c | 1 - + drivers/spi/spi-lp8841-rtc.c | 1 - + drivers/spi/spi-mem.c | 11 +- + drivers/spi/spi-meson-spicc.c | 1 - + drivers/spi/spi-meson-spifc.c | 1 - + drivers/spi/spi-microchip-core-spi.c | 3 +- + drivers/spi/spi-mpc512x-psc.c | 2 - + drivers/spi/spi-mpc52xx-psc.c | 2 - + drivers/spi/spi-mpc52xx.c | 1 - + drivers/spi/spi-mpfs.c | 1 - + drivers/spi/spi-mt65xx.c | 1 - + drivers/spi/spi-mt7621.c | 1 - + drivers/spi/spi-mtk-nor.c | 1 - + drivers/spi/spi-mtk-snfi.c | 1 - + drivers/spi/spi-mux.c | 1 - + drivers/spi/spi-mxic.c | 1 - + drivers/spi/spi-npcm-fiu.c | 1 - + drivers/spi/spi-npcm-pspi.c | 1 - + drivers/spi/spi-nxp-fspi.c | 2 - + drivers/spi/spi-nxp-xspi.c | 1384 ++++++++++++++++++++ + drivers/spi/spi-oc-tiny.c | 1 - + drivers/spi/spi-orion.c | 1 - + drivers/spi/spi-pl022.c | 1 - + drivers/spi/spi-pxa2xx.c | 2 - + drivers/spi/spi-qcom-qspi.c | 1 - + drivers/spi/spi-qpic-snand.c | 5 - + drivers/spi/spi-qup.c | 1 - + drivers/spi/spi-rb4xx.c | 1 - + drivers/spi/spi-realtek-rtl-snand.c | 1 - + drivers/spi/spi-realtek-rtl.c | 1 - + drivers/spi/spi-rockchip-sfc.c | 1 - + drivers/spi/spi-rockchip.c | 5 +- + drivers/spi/spi-rspi.c | 1 - + drivers/spi/spi-rzv2h-rspi.c | 279 +++- + drivers/spi/spi-rzv2m-csi.c | 2 - + drivers/spi/spi-s3c64xx.c | 1 - + drivers/spi/spi-sc18is602.c | 2 - + drivers/spi/spi-sg2044-nor.c | 1 - + drivers/spi/spi-sh-hspi.c | 1 - + drivers/spi/spi-sh-msiof.c | 1 - + drivers/spi/spi-sifive.c | 1 - + drivers/spi/spi-slave-mt27xx.c | 1 - + drivers/spi/spi-sn-f-ospi.c | 1 - + drivers/spi/spi-sprd-adi.c | 1 - + drivers/spi/spi-sprd.c | 1 - + drivers/spi/spi-st-ssc4.c | 4 +- + drivers/spi/spi-stm32-ospi.c | 123 +- + drivers/spi/spi-stm32-qspi.c | 127 +- + drivers/spi/spi-stm32.c | 122 +- + drivers/spi/spi-sun4i.c | 1 - + drivers/spi/spi-sun6i.c | 1 - + drivers/spi/spi-sunplus-sp7021.c | 1 - + drivers/spi/spi-synquacer.c | 3 - + drivers/spi/spi-tegra114.c | 1 - + drivers/spi/spi-tegra20-sflash.c | 1 - + drivers/spi/spi-tegra20-slink.c | 1 - + drivers/spi/spi-tegra210-quad.c | 1 - + drivers/spi/spi-ti-qspi.c | 1 - + drivers/spi/spi-uniphier.c | 1 - + drivers/spi/spi-virtio.c | 6 +- + drivers/spi/spi-wpcm-fiu.c | 1 - + drivers/spi/spi-xcomm.c | 1 - + drivers/spi/spi-xilinx.c | 13 +- + drivers/spi/spi-xlp.c | 1 - + drivers/spi/spi-xtensa-xtfpga.c | 1 - + drivers/spi/spi.c | 194 ++- + include/linux/spi/spi.h | 30 + + 139 files changed, 5709 insertions(+), 1117 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/andestech,ae350-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/axiado,ax3000-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/faraday,ftssp010.yaml + create mode 100644 Documentation/devicetree/bindings/spi/nxp,imx94-xspi.yaml + create mode 100644 Documentation/spi/multiple-data-lanes.rst + create mode 100644 drivers/spi/spi-atcspi200.c + create mode 100644 drivers/spi/spi-axiado.c + create mode 100644 drivers/spi/spi-axiado.h + delete mode 100644 drivers/spi/spi-dw-bt1.c + create mode 100644 drivers/spi/spi-nxp-xspi.c +Merging tip/master (847c9647bbd55 Merge branch into tip/master: 'x86/sev') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/dev-tools/index.rst +Auto-merging Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml +Auto-merging Documentation/filesystems/resctrl.rst +Auto-merging Documentation/userspace-api/index.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/boot/dts/renesas/r9a09g077.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/renesas/r9a09g077.dtsi +Auto-merging arch/arm64/boot/dts/renesas/r9a09g087.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/renesas/r9a09g087.dtsi +Auto-merging arch/arm64/kernel/probes/uprobes.c +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/kernel/paravirt.c +Auto-merging arch/powerpc/platforms/pseries/msi.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/paravirt.h +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/mm/init.c +Auto-merging arch/x86/xen/enlighten_pv.c +Auto-merging arch/x86/xen/mmu_pv.c +Auto-merging crypto/Makefile +Auto-merging crypto/acompress.c +Auto-merging crypto/algapi.c +Auto-merging crypto/crypto_engine.c +Auto-merging crypto/drbg.c +CONFLICT (content): Merge conflict in crypto/drbg.c +Auto-merging crypto/scompress.c +Auto-merging drivers/android/binder/thread.rs +Auto-merging drivers/bluetooth/btintel_pcie.c +Auto-merging drivers/iommu/amd/amd_iommu.h +Auto-merging drivers/iommu/amd/init.c +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/irqchip/irq-gic-v5-its.c +Auto-merging drivers/mailbox/bcm-flexrm-mailbox.c +Auto-merging drivers/pci/controller/dwc/pcie-designware-host.c +Auto-merging drivers/pci/controller/dwc/pcie-designware.h +Auto-merging drivers/pci/probe.c +Auto-merging drivers/soc/renesas/Kconfig +Auto-merging drivers/thermal/qcom/lmh.c +CONFLICT (content): Merge conflict in drivers/thermal/qcom/lmh.c +Auto-merging fs/dlm/lock.c +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/console.h +Auto-merging include/linux/irq.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/msi.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/ww_mutex.h +Auto-merging include/uapi/linux/prctl.h +CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h +Auto-merging init/Kconfig +Auto-merging kernel/irq/chip.c +Auto-merging kernel/irq/irqdomain.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/sched/ext.c +Auto-merging kernel/sys.c +CONFLICT (content): Merge conflict in kernel/sys.c +Auto-merging kernel/time/hrtimer.c +Auto-merging kernel/time/tick-sched.c +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging mm/kfence/core.c +Auto-merging mm/memory.c +Auto-merging scripts/Makefile.lib +Auto-merging scripts/checkpatch.pl +Auto-merging sound/hda/controllers/intel.c +Auto-merging tools/perf/util/pmu.c +Resolved 'arch/arm64/boot/dts/renesas/r9a09g077.dtsi' using previous resolution. +Resolved 'arch/arm64/boot/dts/renesas/r9a09g087.dtsi' using previous resolution. +Resolved 'crypto/drbg.c' using previous resolution. +Resolved 'drivers/thermal/qcom/lmh.c' using previous resolution. +Resolved 'include/uapi/linux/prctl.h' using previous resolution. +Resolved 'kernel/sys.c' using previous resolution. +Resolved 'lib/Kconfig.debug' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c638c1f16f559] Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + .../testing/sysfs-bus-event_source-devices-rdpmc | 44 + + Documentation/admin-guide/kernel-parameters.txt | 14 +- + Documentation/arch/x86/iommu.rst | 7 +- + Documentation/dev-tools/context-analysis.rst | 169 ++++ + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/sparse.rst | 19 - + .../renesas,r9a09g077-icu.yaml | 236 +++++ + .../interrupt-controller/renesas,rzv2h-icu.yaml | 1 + + .../interrupt-controller/sifive,plic-1.0.0.yaml | 4 +- + .../bindings/interrupt-controller/ti,sci-intr.yaml | 38 +- + Documentation/filesystems/resctrl.rst | 66 +- + Documentation/mm/process_addrs.rst | 6 +- + Documentation/userspace-api/index.rst | 1 + + Documentation/userspace-api/rseq.rst | 140 +++ + Documentation/userspace-api/spec_ctrl.rst | 12 +- + MAINTAINERS | 13 +- + Makefile | 9 + + arch/Kconfig | 3 + + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/Kconfig | 1 + + arch/arm/include/asm/paravirt.h | 22 - + arch/arm/include/asm/paravirt_api_clock.h | 1 - + arch/arm/kernel/Makefile | 1 - + arch/arm/kernel/paravirt.c | 23 - + arch/arm/kernel/vdso.c | 2 + + arch/arm/mach-versatile/spc.c | 4 +- + arch/arm/probes/uprobes/core.c | 4 +- + arch/arm/tools/syscall.tbl | 1 + + arch/arm/vdso/vdso.lds.S | 1 + + arch/arm/vdso/vgettimeofday.c | 5 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/paravirt.h | 14 - + arch/arm64/include/asm/paravirt_api_clock.h | 1 - + arch/arm64/kernel/paravirt.c | 11 +- + arch/arm64/kernel/probes/uprobes.c | 4 +- + arch/arm64/kernel/vdso32/vdso.lds.S | 1 + + arch/arm64/kernel/vdso32/vgettimeofday.c | 5 + + arch/arm64/tools/syscall_32.tbl | 1 + + arch/loongarch/Kconfig | 1 + + arch/loongarch/include/asm/paravirt.h | 13 - + arch/loongarch/include/asm/paravirt_api_clock.h | 1 - + arch/loongarch/kernel/paravirt.c | 10 +- + arch/loongarch/vdso/vgetcpu.c | 5 +- + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/include/asm/cevt-r4k.h | 1 - + arch/mips/kernel/cevt-r4k.c | 11 - + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/mips/kernel/uprobes.c | 4 +- + arch/mips/sgi-ip27/ip27-timer.c | 10 +- + arch/mips/sgi-ip30/ip30-timer.c | 5 +- + arch/mips/vdso/vdso.lds.S | 1 + + arch/mips/vdso/vgettimeofday.c | 5 + + arch/parisc/boot/compressed/misc.c | 15 +- + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/include/asm/paravirt.h | 3 - + arch/powerpc/include/asm/paravirt_api_clock.h | 2 - + arch/powerpc/include/asm/vdso/gettimeofday.h | 2 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/vdso/gettimeofday.S | 12 + + arch/powerpc/kernel/vdso/vdso32.lds.S | 1 + + arch/powerpc/kernel/vdso/vgettimeofday.c | 6 + + arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- + arch/powerpc/platforms/pseries/msi.c | 4 +- + arch/powerpc/platforms/pseries/setup.c | 4 +- + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/paravirt.h | 14 - + arch/riscv/include/asm/paravirt_api_clock.h | 1 - + arch/riscv/kernel/paravirt.c | 11 +- + arch/riscv/kernel/probes/uprobes.c | 4 +- + arch/s390/include/asm/Kbuild | 1 - + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/vdso/getcpu.c | 3 +- + arch/s390/kernel/vdso/vdso.h | 4 +- + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/um/include/shared/skas/mm_id.h | 5 +- + arch/um/kernel/skas/mmu.c | 13 +- + arch/x86/Kconfig | 31 +- + arch/x86/Kconfig.cpufeatures | 10 +- + arch/x86/Makefile | 8 +- + arch/x86/Makefile_32.cpu | 6 - + arch/x86/boot/startup/sev-startup.c | 3 +- + arch/x86/coco/sev/Makefile | 2 +- + arch/x86/coco/sev/core.c | 387 +-------- + .../asm/sev-internal.h => coco/sev/internal.h} | 34 +- + arch/x86/coco/sev/noinstr.c | 3 +- + arch/x86/coco/sev/svsm.c | 362 ++++++++ + arch/x86/coco/sev/vc-handle.c | 7 +- + arch/x86/entry/entry_64.S | 1 - + arch/x86/entry/entry_fred.c | 1 + + arch/x86/entry/syscall_32.c | 2 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/entry/vdso/.gitignore | 11 +- + arch/x86/entry/vdso/Makefile | 162 +--- + arch/x86/entry/vdso/common/Makefile.include | 89 ++ + arch/x86/entry/vdso/{vdso-note.S => common/note.S} | 5 +- + arch/x86/entry/vdso/{ => common}/vclock_gettime.c | 8 + + arch/x86/entry/vdso/{ => common}/vdso-layout.lds.S | 38 +- + arch/x86/entry/vdso/{ => common}/vgetcpu.c | 5 +- + arch/x86/entry/vdso/vdso32/Makefile | 24 + + arch/x86/entry/vdso/vdso32/note.S | 19 +- + arch/x86/entry/vdso/vdso32/sigreturn.S | 160 +--- + arch/x86/entry/vdso/vdso32/system_call.S | 22 +- + arch/x86/entry/vdso/vdso32/vclock_gettime.c | 5 +- + arch/x86/entry/vdso/vdso32/vdso32.lds.S | 3 +- + arch/x86/entry/vdso/vdso32/vgetcpu.c | 4 +- + arch/x86/entry/vdso/vdso64/Makefile | 46 + + arch/x86/entry/vdso/vdso64/note.S | 1 + + arch/x86/entry/vdso/vdso64/vclock_gettime.c | 1 + + .../entry/vdso/{vdso.lds.S => vdso64/vdso64.lds.S} | 2 +- + arch/x86/entry/vdso/{ => vdso64}/vdsox32.lds.S | 2 +- + arch/x86/entry/vdso/vdso64/vgetcpu.c | 1 + + .../entry/vdso/{ => vdso64}/vgetrandom-chacha.S | 0 + arch/x86/entry/vdso/{ => vdso64}/vgetrandom.c | 2 +- + arch/x86/entry/vdso/{ => vdso64}/vsgx.S | 0 + arch/x86/entry/vdso/vma.c | 22 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 1 - + arch/x86/events/amd/core.c | 2 + + arch/x86/events/core.c | 66 +- + arch/x86/events/intel/core.c | 370 +++++++- + arch/x86/events/intel/cstate.c | 33 +- + arch/x86/events/intel/ds.c | 261 ++++++ + arch/x86/events/intel/p6.c | 2 +- + arch/x86/events/intel/uncore.c | 139 +-- + arch/x86/events/intel/uncore.h | 26 + + arch/x86/events/intel/uncore_discovery.c | 84 +- + arch/x86/events/intel/uncore_discovery.h | 8 +- + arch/x86/events/intel/uncore_snb.c | 85 ++ + arch/x86/events/intel/uncore_snbep.c | 690 ++++++++++----- + arch/x86/events/msr.c | 1 + + arch/x86/events/perf_event.h | 26 + + arch/x86/hyperv/hv_crash.c | 2 + + arch/x86/hyperv/hv_spinlock.c | 11 +- + arch/x86/include/asm/amd/ibs.h | 2 +- + arch/x86/include/asm/apic.h | 4 - + arch/x86/include/asm/checksum_64.h | 47 +- + arch/x86/include/asm/cpufeatures.h | 2 +- + arch/x86/include/asm/dwarf2.h | 1 + + arch/x86/include/asm/e820/api.h | 3 +- + arch/x86/include/asm/e820/types.h | 2 +- + arch/x86/include/asm/elf.h | 2 +- + arch/x86/include/asm/hardirq.h | 3 + + arch/x86/include/asm/highmem.h | 1 - + arch/x86/include/asm/idtentry.h | 6 + + arch/x86/include/asm/irq_remapping.h | 5 +- + arch/x86/include/asm/irq_vectors.h | 4 +- + arch/x86/include/asm/mmu_context.h | 2 - + arch/x86/include/asm/mshyperv.h | 1 - + arch/x86/include/asm/msr-index.h | 9 +- + arch/x86/include/asm/paravirt-base.h | 35 + + arch/x86/include/asm/paravirt-spinlock.h | 145 ++++ + arch/x86/include/asm/paravirt.h | 341 ++------ + arch/x86/include/asm/paravirt_api_clock.h | 1 - + arch/x86/include/asm/paravirt_types.h | 257 +++--- + arch/x86/include/asm/percpu.h | 8 +- + arch/x86/include/asm/perf_event.h | 14 +- + arch/x86/include/asm/pgtable_32.h | 1 - + arch/x86/include/asm/ptrace.h | 2 +- + arch/x86/include/asm/qspinlock.h | 87 +- + arch/x86/include/asm/segment.h | 2 +- + arch/x86/include/asm/set_memory.h | 1 - + arch/x86/include/asm/spinlock.h | 1 - + arch/x86/include/asm/timer.h | 1 + + arch/x86/include/asm/tlbflush.h | 7 +- + arch/x86/include/asm/unwind_user.h | 27 +- + arch/x86/include/asm/vdso.h | 6 +- + arch/x86/include/asm/vdso/gettimeofday.h | 108 +-- + arch/x86/include/asm/vdso/processor.h | 4 +- + arch/x86/include/asm/vdso/sys_call.h | 105 +++ + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/acpi/boot.c | 23 +- + arch/x86/kernel/alternative.c | 147 ++-- + arch/x86/kernel/apic/local.h | 10 +- + arch/x86/kernel/apic/x2apic_phys.c | 6 - + arch/x86/kernel/apm_32.c | 1 - + arch/x86/kernel/asm-offsets.c | 6 + + arch/x86/kernel/callthunks.c | 1 - + arch/x86/kernel/cpu/amd.c | 50 +- + arch/x86/kernel/cpu/bugs.c | 1 - + arch/x86/kernel/cpu/bus_lock.c | 9 +- + arch/x86/kernel/cpu/centaur.c | 9 - + arch/x86/kernel/cpu/common.c | 8 + + arch/x86/kernel/cpu/cyrix.c | 6 - + arch/x86/kernel/cpu/hygon.c | 6 - + arch/x86/kernel/cpu/intel.c | 4 +- + arch/x86/kernel/cpu/microcode/amd.c | 4 +- + arch/x86/kernel/cpu/microcode/core.c | 16 +- + arch/x86/kernel/cpu/microcode/internal.h | 1 + + arch/x86/kernel/cpu/resctrl/Makefile | 1 + + arch/x86/kernel/cpu/resctrl/core.c | 244 ++++-- + arch/x86/kernel/cpu/resctrl/intel_aet.c | 409 +++++++++ + arch/x86/kernel/cpu/resctrl/internal.h | 46 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 50 +- + arch/x86/kernel/cpu/topology.c | 15 - + arch/x86/kernel/cpu/vmware.c | 1 + + arch/x86/kernel/cpu/zhaoxin.c | 4 +- + arch/x86/kernel/e820.c | 477 +++++----- + arch/x86/kernel/fred.c | 2 +- + arch/x86/kernel/idt.c | 3 + + arch/x86/kernel/irq.c | 50 +- + arch/x86/kernel/kvm.c | 13 +- + arch/x86/kernel/kvmclock.c | 1 + + arch/x86/kernel/machine_kexec_64.c | 5 +- + arch/x86/kernel/paravirt-spinlocks.c | 26 +- + arch/x86/kernel/paravirt.c | 42 +- + arch/x86/kernel/process_64.c | 6 +- + arch/x86/kernel/setup.c | 10 +- + arch/x86/kernel/signal_32.c | 4 +- + arch/x86/kernel/traps.c | 2 +- + arch/x86/kernel/tsc.c | 12 +- + arch/x86/kernel/uprobes.c | 24 + + arch/x86/kernel/vmlinux.lds.S | 21 +- + arch/x86/kernel/vsmp_64.c | 1 - + arch/x86/kvm/Kconfig | 1 + + arch/x86/lib/cache-smp.c | 1 - + arch/x86/lib/csum-wrappers_64.c | 22 - + arch/x86/mm/init.c | 1 - + arch/x86/mm/pat/set_memory.c | 13 - + arch/x86/mm/tlb.c | 4 +- + arch/x86/platform/efi/efi.c | 3 +- + arch/x86/platform/olpc/olpc-xo15-sci.c | 5 +- + arch/x86/tools/.gitignore | 1 + + arch/x86/tools/Makefile | 15 +- + arch/x86/{entry/vdso => tools}/vdso2c.c | 0 + arch/x86/{entry/vdso => tools}/vdso2c.h | 0 + arch/x86/um/Kconfig | 1 + + arch/x86/xen/enlighten_pv.c | 82 +- + arch/x86/xen/irq.c | 20 +- + arch/x86/xen/mmu_pv.c | 100 +-- + arch/x86/xen/setup.c | 28 +- + arch/x86/xen/smp_pv.c | 5 +- + arch/x86/xen/spinlock.c | 11 +- + arch/x86/xen/time.c | 2 + + arch/x86/xen/xen-ops.h | 1 - + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + crypto/Makefile | 2 + + crypto/acompress.c | 6 +- + crypto/algapi.c | 2 + + crypto/api.c | 1 + + crypto/crypto_engine.c | 2 +- + crypto/drbg.c | 7 +- + crypto/internal.h | 2 +- + crypto/proc.c | 3 + + crypto/scompress.c | 24 +- + drivers/android/binder/rust_binder_main.rs | 20 +- + drivers/android/binder/stats.rs | 8 +- + drivers/android/binder/thread.rs | 24 +- + drivers/android/binder/transaction.rs | 16 +- + drivers/bluetooth/btintel_pcie.c | 9 +- + drivers/bus/fsl-mc/dprc-driver.c | 13 +- + drivers/char/tpm/tpm_tis_i2c_cr50.c | 3 +- + drivers/char/tpm/tpm_tis_spi_cr50.c | 2 +- + drivers/clocksource/Kconfig | 1 + + drivers/clocksource/hyperv_timer.c | 2 + + drivers/clocksource/mips-gic-timer.c | 10 +- + drivers/clocksource/sh_tmu.c | 18 - + drivers/clocksource/timer-armada-370-xp.c | 2 +- + drivers/clocksource/timer-sp804.c | 14 +- + drivers/edac/altera_edac.c | 11 +- + drivers/gpu/drm/radeon/radeon_device.c | 1 + + drivers/gpu/drm/radeon/radeon_irq_kms.c | 10 - + drivers/iommu/amd/amd_iommu.h | 1 - + drivers/iommu/amd/init.c | 12 +- + drivers/iommu/amd/iommu.c | 5 - + drivers/iommu/intel/irq_remapping.c | 4 +- + drivers/irqchip/Kconfig | 19 +- + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-aclint-sswi.c | 8 +- + drivers/irqchip/irq-aspeed-scu-ic.c | 3 +- + drivers/irqchip/irq-gic-v5-its.c | 2 +- + drivers/irqchip/irq-loongarch-avec.c | 14 +- + drivers/irqchip/irq-loongson-eiointc.c | 36 +- + drivers/irqchip/irq-loongson-htvec.c | 14 +- + drivers/irqchip/irq-loongson-liointc.c | 8 +- + drivers/irqchip/irq-loongson-pch-msi.c | 9 +- + drivers/irqchip/irq-loongson-pch-pic.c | 14 +- + drivers/irqchip/irq-renesas-rzt2h.c | 280 ++++++ + drivers/irqchip/irq-renesas-rzv2h.c | 61 +- + drivers/irqchip/irq-riscv-aplic-direct.c | 10 + + drivers/irqchip/irq-riscv-aplic-main.c | 170 +++- + drivers/irqchip/irq-riscv-aplic-main.h | 19 + + drivers/irqchip/irq-riscv-imsic-early.c | 39 +- + drivers/irqchip/irq-sifive-plic.c | 82 +- + drivers/irqchip/irq-ti-sci-intr.c | 54 +- + drivers/media/pci/mgb4/mgb4_trigger.c | 2 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 6 +- + .../wireless/intel/iwlwifi/pcie/gen1_2/internal.h | 5 +- + .../net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c | 4 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 127 ++- + drivers/pci/controller/dwc/pcie-designware.h | 7 +- + drivers/pci/msi/msi.c | 14 +- + drivers/pci/msi/pcidev_msi.c | 2 +- + drivers/pci/probe.c | 7 + + drivers/platform/x86/intel/int0002_vgpio.c | 4 +- + drivers/rtc/rtc-amlogic-a4.c | 2 +- + drivers/scsi/elx/efct/efct_driver.c | 8 +- + drivers/soc/renesas/Kconfig | 1 + + drivers/usb/typec/tcpm/fusb302.c | 3 +- + drivers/xen/time.c | 2 +- + fs/dlm/lock.c | 2 +- + fs/resctrl/ctrlmondata.c | 113 ++- + fs/resctrl/internal.h | 68 +- + fs/resctrl/monitor.c | 364 +++++--- + fs/resctrl/rdtgroup.c | 267 ++++-- + include/asm-generic/Kbuild | 1 + + include/crypto/internal/acompress.h | 7 +- + include/crypto/internal/engine.h | 2 +- + include/linux/atomic/atomic-arch-fallback.h | 18 +- + include/linux/atomic/atomic-instrumented.h | 26 +- + include/linux/atomic/atomic-long.h | 10 +- + include/linux/bit_spinlock.h | 24 +- + include/linux/cleanup.h | 58 +- + include/linux/compiler-context-analysis.h | 436 ++++++++++ + include/linux/compiler.h | 12 +- + include/linux/compiler_types.h | 50 +- + include/linux/console.h | 4 +- + include/linux/debugfs.h | 12 +- + include/linux/entry-common.h | 167 +++- + include/linux/getcpu.h | 19 - + include/linux/hrtimer.h | 15 - + include/linux/hrtimer_defs.h | 20 - + include/linux/interrupt.h | 26 +- + include/linux/irq.h | 13 +- + include/linux/irqchip/irq-renesas-rzt2h.h | 23 + + include/linux/irqdesc.h | 17 +- + include/linux/kref.h | 2 + + include/linux/list_bl.h | 2 + + include/linux/local_lock.h | 55 +- + include/linux/local_lock_internal.h | 72 +- + include/linux/lockdep.h | 12 +- + include/linux/lockref.h | 4 +- + include/linux/mfd/wm8350/core.h | 2 +- + include/linux/mm.h | 33 +- + include/linux/msi.h | 13 +- + include/linux/mutex.h | 40 +- + include/linux/mutex_types.h | 4 +- + include/linux/pci.h | 8 +- + include/linux/perf_event.h | 35 +- + include/linux/rcupdate.h | 90 +- + include/linux/refcount.h | 6 +- + include/linux/resctrl.h | 57 +- + include/linux/resctrl_types.h | 11 + + include/linux/rhashtable.h | 16 +- + include/linux/rseq.h | 11 + + include/linux/rseq_entry.h | 192 ++++- + include/linux/rseq_types.h | 32 +- + include/linux/rwlock.h | 19 +- + include/linux/rwlock_api_smp.h | 43 +- + include/linux/rwlock_rt.h | 43 +- + include/linux/rwlock_types.h | 10 +- + include/linux/rwsem.h | 74 +- + include/linux/sched.h | 20 +- + include/linux/sched/cputime.h | 18 + + include/linux/sched/signal.h | 16 +- + include/linux/sched/task.h | 6 +- + include/linux/sched/wake_q.h | 3 + + include/linux/seqlock.h | 57 +- + include/linux/seqlock_types.h | 5 +- + include/linux/spinlock.h | 119 ++- + include/linux/spinlock_api_smp.h | 34 +- + include/linux/spinlock_api_up.h | 112 ++- + include/linux/spinlock_rt.h | 36 +- + include/linux/spinlock_types.h | 10 +- + include/linux/spinlock_types_raw.h | 5 +- + include/linux/srcu.h | 73 +- + include/linux/srcutiny.h | 6 + + include/linux/srcutree.h | 10 +- + include/linux/syscalls.h | 4 +- + include/linux/thread_info.h | 16 +- + include/linux/timecounter.h | 31 +- + include/linux/unwind_user.h | 18 +- + include/linux/uprobes.h | 1 + + include/linux/ww_mutex.h | 21 +- + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/perf_event.h | 27 +- + include/uapi/linux/prctl.h | 10 + + include/uapi/linux/rseq.h | 41 +- + include/vdso/gettime.h | 1 + + include/vdso/unaligned.h | 41 +- + init/Kconfig | 16 + + init/init_task.c | 1 - + kernel/Kconfig.preempt | 3 + + kernel/Makefile | 2 + + kernel/entry/common.c | 27 +- + kernel/entry/common.h | 7 - + kernel/entry/syscall-common.c | 99 +-- + kernel/entry/syscall_user_dispatch.c | 4 +- + kernel/events/core.c | 546 +++++++++--- + kernel/events/uprobes.c | 24 +- + kernel/irq/Kconfig | 3 - + kernel/irq/Makefile | 4 - + kernel/irq/chip.c | 24 +- + kernel/irq/cpuhotplug.c | 6 +- + kernel/irq/handle.c | 2 - + kernel/irq/internals.h | 112 +-- + kernel/irq/irqdesc.c | 95 +- + kernel/irq/irqdomain.c | 2 +- + kernel/irq/manage.c | 96 +-- + kernel/irq/proc.c | 3 +- + kernel/irq/timings.c | 959 --------------------- + kernel/kcov.c | 36 +- + kernel/kcsan/Makefile | 2 + + kernel/kcsan/report.c | 11 +- + kernel/locking/test-ww_mutex.c | 195 +++-- + kernel/printk/printk.c | 2 + + kernel/rseq.c | 365 +++++++- + kernel/sched/Makefile | 3 + + kernel/sched/clock.c | 3 + + kernel/sched/core.c | 180 ++-- + kernel/sched/cpufreq_schedutil.c | 2 +- + kernel/sched/cputime.c | 22 +- + kernel/sched/deadline.c | 105 ++- + kernel/sched/debug.c | 187 +++- + kernel/sched/ext.c | 42 +- + kernel/sched/fair.c | 418 ++++----- + kernel/sched/idle.c | 7 +- + kernel/sched/rt.c | 14 +- + kernel/sched/sched.h | 271 +++--- + kernel/sched/stop_task.c | 3 - + kernel/sched/topology.c | 5 + + kernel/signal.c | 4 +- + kernel/sys.c | 10 +- + kernel/sys_ni.c | 1 + + kernel/time/hrtimer.c | 16 +- + kernel/time/posix-timers.c | 13 +- + kernel/time/sched_clock.c | 2 +- + kernel/time/tick-sched.c | 3 + + kernel/time/time_test.c | 4 +- + kernel/time/timecounter.c | 35 - + kernel/unwind/user.c | 12 +- + lib/Kconfig.debug | 52 +- + lib/Makefile | 6 + + lib/dec_and_lock.c | 8 +- + lib/lockref.c | 1 - + lib/rhashtable.c | 5 +- + lib/stackdepot.c | 20 +- + lib/test_context-analysis.c | 598 +++++++++++++ + lib/vdso/gettimeofday.c | 2 +- + mm/kfence/Makefile | 2 + + mm/kfence/core.c | 20 +- + mm/kfence/kfence.h | 14 +- + mm/kfence/report.c | 4 +- + mm/memory.c | 4 +- + mm/pgtable-generic.c | 19 +- + net/ipv4/tcp_sigpool.c | 2 +- + rust/helpers/atomic.c | 7 +- + rust/helpers/atomic_ext.c | 139 +++ + rust/helpers/barrier.c | 6 +- + rust/helpers/blk.c | 4 +- + rust/helpers/completion.c | 2 +- + rust/helpers/cpu.c | 2 +- + rust/helpers/helpers.c | 3 + + rust/helpers/mutex.c | 13 +- + rust/helpers/processor.c | 2 +- + rust/helpers/rcu.c | 4 +- + rust/helpers/refcount.c | 10 +- + rust/helpers/signal.c | 2 +- + rust/helpers/spinlock.c | 13 +- + rust/helpers/sync.c | 4 +- + rust/helpers/task.c | 24 +- + rust/helpers/time.c | 14 +- + rust/helpers/wait.c | 2 +- + rust/kernel/list/arc.rs | 14 +- + rust/kernel/sync.rs | 73 +- + rust/kernel/sync/aref.rs | 3 + + rust/kernel/sync/atomic/internal.rs | 114 ++- + rust/kernel/sync/atomic/predefine.rs | 55 +- + rust/kernel/sync/lock.rs | 7 + + rust/kernel/sync/lock/global.rs | 2 + + rust/kernel/sync/lock/mutex.rs | 5 + + rust/kernel/sync/lock/spinlock.rs | 5 + + rust/kernel/sync/set_once.rs | 8 + + scripts/Makefile.context-analysis | 11 + + scripts/Makefile.lib | 10 + + scripts/atomic/gen-rust-atomic-helpers.sh | 5 - + scripts/atomic/kerneldoc/try_cmpxchg | 2 +- + scripts/checker-valid.sh | 19 + + scripts/checkpatch.pl | 7 + + scripts/context-analysis-suppression.txt | 33 + + scripts/syscall.tbl | 1 + + scripts/tags.sh | 1 + + security/tomoyo/Makefile | 2 + + security/tomoyo/common.c | 54 +- + security/tomoyo/common.h | 77 +- + security/tomoyo/domain.c | 1 + + security/tomoyo/environ.c | 1 + + security/tomoyo/file.c | 5 + + security/tomoyo/gc.c | 28 +- + security/tomoyo/mount.c | 2 + + security/tomoyo/network.c | 3 + + sound/hda/controllers/intel.c | 10 +- + tools/arch/x86/include/asm/msr-index.h | 4 +- + tools/include/linux/compiler-context-analysis.h | 42 + + tools/include/linux/compiler_types.h | 40 +- + tools/include/linux/unaligned.h | 4 - + tools/include/uapi/linux/perf_event.h | 27 +- + tools/include/vdso/unaligned.h | 41 +- + tools/objtool/arch/x86/decode.c | 8 +- + tools/objtool/check.c | 78 +- + tools/objtool/include/objtool/check.h | 1 + + .../beauty/arch/x86/include/asm/irq_vectors.h | 3 +- + tools/perf/util/pmu.c | 14 +- + .../selftests/futex/functional/futex_requeue.c | 49 +- + tools/testing/selftests/rseq/.gitignore | 1 + + tools/testing/selftests/rseq/Makefile | 5 +- + tools/testing/selftests/rseq/rseq-abi.h | 27 + + tools/testing/selftests/rseq/rseq-slice-hist.py | 132 +++ + tools/testing/selftests/rseq/slice_test.c | 219 +++++ + tools/testing/selftests/sched_ext/Makefile | 2 + + tools/testing/selftests/sched_ext/rt_stall.bpf.c | 23 + + tools/testing/selftests/sched_ext/rt_stall.c | 240 ++++++ + tools/testing/selftests/sched_ext/total_bw.c | 281 ++++++ + tools/testing/selftests/vDSO/vdso_config.h | 4 +- + tools/testing/selftests/vDSO/vdso_test_abi.c | 55 +- + tools/testing/selftests/vDSO/vdso_test_getcpu.c | 4 +- + tools/testing/selftests/vDSO/vgetrandom-chacha.S | 2 +- + tools/testing/selftests/x86/sysret_rip.c | 12 +- + tools/testing/shared/linux/kernel.h | 4 - + virt/kvm/kvm_main.c | 3 + + 525 files changed, 13022 insertions(+), 6274 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-rdpmc + create mode 100644 Documentation/dev-tools/context-analysis.rst + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,r9a09g077-icu.yaml + create mode 100644 Documentation/userspace-api/rseq.rst + delete mode 100644 arch/arm/include/asm/paravirt.h + delete mode 100644 arch/arm/include/asm/paravirt_api_clock.h + delete mode 100644 arch/arm/kernel/paravirt.c + delete mode 100644 arch/arm64/include/asm/paravirt_api_clock.h + delete mode 100644 arch/loongarch/include/asm/paravirt_api_clock.h + delete mode 100644 arch/powerpc/include/asm/paravirt_api_clock.h + delete mode 100644 arch/riscv/include/asm/paravirt_api_clock.h + rename arch/x86/{include/asm/sev-internal.h => coco/sev/internal.h} (72%) + create mode 100644 arch/x86/coco/sev/svsm.c + create mode 100644 arch/x86/entry/vdso/common/Makefile.include + rename arch/x86/entry/vdso/{vdso-note.S => common/note.S} (62%) + rename arch/x86/entry/vdso/{ => common}/vclock_gettime.c (89%) + rename arch/x86/entry/vdso/{ => common}/vdso-layout.lds.S (77%) + rename arch/x86/entry/vdso/{ => common}/vgetcpu.c (65%) + create mode 100644 arch/x86/entry/vdso/vdso32/Makefile + create mode 100644 arch/x86/entry/vdso/vdso64/Makefile + create mode 100644 arch/x86/entry/vdso/vdso64/note.S + create mode 100644 arch/x86/entry/vdso/vdso64/vclock_gettime.c + rename arch/x86/entry/vdso/{vdso.lds.S => vdso64/vdso64.lds.S} (94%) + rename arch/x86/entry/vdso/{ => vdso64}/vdsox32.lds.S (92%) + create mode 100644 arch/x86/entry/vdso/vdso64/vgetcpu.c + rename arch/x86/entry/vdso/{ => vdso64}/vgetrandom-chacha.S (100%) + rename arch/x86/entry/vdso/{ => vdso64}/vgetrandom.c (91%) + rename arch/x86/entry/vdso/{ => vdso64}/vsgx.S (100%) + create mode 100644 arch/x86/include/asm/paravirt-base.h + create mode 100644 arch/x86/include/asm/paravirt-spinlock.h + delete mode 100644 arch/x86/include/asm/paravirt_api_clock.h + create mode 100644 arch/x86/include/asm/vdso/sys_call.h + create mode 100644 arch/x86/kernel/cpu/resctrl/intel_aet.c + rename arch/x86/{entry/vdso => tools}/vdso2c.c (100%) + rename arch/x86/{entry/vdso => tools}/vdso2c.h (100%) + create mode 100644 drivers/irqchip/irq-renesas-rzt2h.c + create mode 100644 include/linux/compiler-context-analysis.h + delete mode 100644 include/linux/getcpu.h + create mode 100644 include/linux/irqchip/irq-renesas-rzt2h.h + delete mode 100644 kernel/entry/common.h + delete mode 100644 kernel/irq/timings.c + create mode 100644 lib/test_context-analysis.c + create mode 100644 rust/helpers/atomic_ext.c + create mode 100644 scripts/Makefile.context-analysis + create mode 100755 scripts/checker-valid.sh + create mode 100644 scripts/context-analysis-suppression.txt + create mode 100644 tools/include/linux/compiler-context-analysis.h + create mode 100644 tools/testing/selftests/rseq/rseq-slice-hist.py + create mode 100644 tools/testing/selftests/rseq/slice_test.c + create mode 100644 tools/testing/selftests/sched_ext/rt_stall.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/rt_stall.c + create mode 100644 tools/testing/selftests/sched_ext/total_bw.c +Merging clockevents/timers/drivers/next (a83f9c04be4e8 clocksource/drivers/mips-gic-timer: Move GIC timer to request_percpu_irq()) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (148f30165b4bd Merge ras/edac-drivers into for-next) +$ git merge -m Merge branch 'edac-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging CREDITS +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + CREDITS | 5 + + MAINTAINERS | 12 - + drivers/edac/Kconfig | 15 -- + drivers/edac/Makefile | 2 - + drivers/edac/amd64_edac.c | 2 +- + drivers/edac/i5000_edac.c | 1 + + drivers/edac/i5400_edac.c | 2 +- + drivers/edac/i82443bxgx_edac.c | 462 -------------------------------------- + drivers/edac/igen6_edac.c | 89 +++++++- + drivers/edac/r82600_edac.c | 426 ----------------------------------- + drivers/ras/amd/atl/denormalize.c | 2 +- + 11 files changed, 86 insertions(+), 932 deletions(-) + delete mode 100644 drivers/edac/i82443bxgx_edac.c + delete mode 100644 drivers/edac/r82600_edac.c +Merging ftrace/for-next (2ad0b4fafa91a Merge tools/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging MAINTAINERS +Auto-merging kernel/trace/bpf_trace.c +CONFLICT (content): Merge conflict in kernel/trace/bpf_trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace.h +Resolved 'kernel/trace/bpf_trace.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1f71717f6fc5b] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + .../tools/rtla/common_timerlat_options.txt | 20 +- + Documentation/trace/ftrace.rst | 25 + + Documentation/trace/rv/monitor_synthesis.rst | 44 +- + MAINTAINERS | 15 + + include/linux/rv.h | 4 + + include/linux/trace_events.h | 8 +- + include/linux/trace_seq.h | 12 +- + include/linux/tracepoint.h | 9 +- + include/rv/automata.h | 134 ++-- + include/rv/da_monitor.h | 893 ++++++++++----------- + include/trace/perf.h | 4 +- + include/trace/stages/stage3_trace_output.h | 4 +- + include/trace/trace_events.h | 4 +- + kernel/kprobes.c | 124 ++- + kernel/rcu/srcutree.c | 3 +- + kernel/trace/bpf_trace.c | 5 +- + kernel/trace/ftrace.c | 7 +- + kernel/trace/ring_buffer.c | 24 +- + kernel/trace/rv/monitors/nrp/nrp.c | 30 +- + kernel/trace/rv/monitors/nrp/nrp.h | 22 +- + kernel/trace/rv/monitors/opid/opid.c | 40 +- + kernel/trace/rv/monitors/opid/opid.h | 24 +- + kernel/trace/rv/monitors/rtapp/rtapp.c | 2 - + kernel/trace/rv/monitors/sched/sched.c | 2 - + kernel/trace/rv/monitors/sco/sco.c | 26 +- + kernel/trace/rv/monitors/sco/sco.h | 14 +- + kernel/trace/rv/monitors/scpd/scpd.c | 28 +- + kernel/trace/rv/monitors/scpd/scpd.h | 14 +- + kernel/trace/rv/monitors/snep/snep.c | 28 +- + kernel/trace/rv/monitors/snep/snep.h | 18 +- + kernel/trace/rv/monitors/snroc/snroc.c | 26 +- + kernel/trace/rv/monitors/snroc/snroc.h | 14 +- + kernel/trace/rv/monitors/sssw/sssw.c | 38 +- + kernel/trace/rv/monitors/sssw/sssw.h | 22 +- + kernel/trace/rv/monitors/sts/sts.c | 34 +- + kernel/trace/rv/monitors/sts/sts.h | 28 +- + kernel/trace/rv/monitors/wip/wip.c | 26 +- + kernel/trace/rv/monitors/wip/wip.h | 14 +- + kernel/trace/rv/monitors/wwnr/wwnr.c | 28 +- + kernel/trace/rv/monitors/wwnr/wwnr.h | 14 +- + kernel/trace/trace.c | 16 +- + kernel/trace/trace.h | 3 +- + kernel/trace/trace_events.c | 145 +++- + kernel/trace/trace_events_filter.c | 2 +- + kernel/trace/trace_events_hist.c | 81 +- + kernel/trace/trace_events_synth.c | 6 +- + kernel/trace/trace_kprobe.c | 4 + + kernel/trace/trace_output.c | 30 +- + kernel/trace/trace_seq.c | 29 +- + kernel/tracepoint.c | 18 +- + tools/tracing/rtla/.gitignore | 4 + + tools/tracing/rtla/Makefile | 19 +- + tools/tracing/rtla/example/timerlat_bpf_action.c | 16 + + .../rtla/{sample => example}/timerlat_load.py | 0 + tools/tracing/rtla/src/actions.c | 17 +- + tools/tracing/rtla/src/actions.h | 5 + + tools/tracing/rtla/src/common.c | 140 +++- + tools/tracing/rtla/src/common.h | 10 +- + tools/tracing/rtla/src/osnoise.c | 17 +- + tools/tracing/rtla/src/osnoise.h | 8 - + tools/tracing/rtla/src/osnoise_hist.c | 76 +- + tools/tracing/rtla/src/osnoise_top.c | 90 +-- + tools/tracing/rtla/src/timerlat.bpf.c | 25 +- + tools/tracing/rtla/src/timerlat.c | 29 +- + tools/tracing/rtla/src/timerlat.h | 2 +- + tools/tracing/rtla/src/timerlat_bpf.c | 66 ++ + tools/tracing/rtla/src/timerlat_bpf.h | 7 +- + tools/tracing/rtla/src/timerlat_hist.c | 80 +- + tools/tracing/rtla/src/timerlat_top.c | 80 +- + tools/tracing/rtla/src/trace.c | 1 - + tools/tracing/rtla/src/utils.c | 100 ++- + tools/tracing/rtla/src/utils.h | 10 +- + tools/tracing/rtla/tests/bpf/bpf_action_map.c | 25 + + tools/tracing/rtla/tests/engine.sh | 1 - + tools/tracing/rtla/tests/timerlat.t | 15 + + tools/verification/rvgen/rvgen/automata.py | 20 +- + tools/verification/rvgen/rvgen/dot2c.py | 111 +-- + tools/verification/rvgen/rvgen/dot2k.py | 26 +- + .../rvgen/rvgen/templates/container/main.c | 2 - + .../rvgen/rvgen/templates/dot2k/main.c | 25 +- + 80 files changed, 1817 insertions(+), 1375 deletions(-) + create mode 100644 tools/tracing/rtla/example/timerlat_bpf_action.c + rename tools/tracing/rtla/{sample => example}/timerlat_load.py (100%) + create mode 100644 tools/tracing/rtla/tests/bpf/bpf_action_map.c +Merging rcu/next (ed062c41dfda2 Merge branch 'rcu-nocb.20260123a') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/sched.h +Auto-merging init/init_task.c +Auto-merging kernel/fork.c +Auto-merging kernel/rcu/srcutree.c +Auto-merging scripts/checkpatch.pl +Merge made by the 'ort' strategy. + .../RCU/Design/Requirements/Requirements.rst | 12 +- + Documentation/admin-guide/kernel-parameters.txt | 15 - + include/linux/rcupdate.h | 31 +- + include/linux/rcupdate_trace.h | 166 ++++- + include/linux/sched.h | 6 +- + init/init_task.c | 3 - + kernel/context_tracking.c | 20 - + kernel/fork.c | 3 - + kernel/rcu/Kconfig | 43 +- + kernel/rcu/rcu.h | 9 - + kernel/rcu/rcuscale.c | 7 - + kernel/rcu/rcutorture.c | 10 +- + kernel/rcu/srcutree.c | 2 +- + kernel/rcu/tasks.h | 708 +-------------------- + kernel/rcu/tree.c | 14 +- + kernel/rcu/tree.h | 5 +- + kernel/rcu/tree_exp.h | 7 +- + kernel/rcu/tree_nocb.h | 80 +-- + kernel/rcu/tree_plugin.h | 15 +- + scripts/checkpatch.pl | 4 +- + tools/testing/selftests/rcutorture/.gitignore | 1 + + .../testing/selftests/rcutorture/bin/config2csv.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-series.sh | 184 +++++- + tools/testing/selftests/rcutorture/bin/kvm.sh | 40 ++ + tools/testing/selftests/rcutorture/bin/mktestid.sh | 2 +- + .../selftests/rcutorture/configs/rcu/TRACE01 | 1 - + .../selftests/rcutorture/configs/rcu/TRACE02 | 1 - + 27 files changed, 459 insertions(+), 932 deletions(-) +Merging paulmck/non-rcu/next (7f8fcc6f09fb7 memory-barriers.txt: Sort wait_event* and wait_on_bit* list alphabetically) +$ git merge -m Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Already up to date. +Merging kvm/next (0499add8efd72 Merge tag 'kvm-x86-fixes-6.19-rc1' of https://github.com/kvm-x86/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (6316366129d28 Merge branch kvm-arm64/misc-6.20 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging drivers/irqchip/irq-gic-v5-irs.c +Auto-merging drivers/irqchip/irq-gic-v5.c +Auto-merging include/linux/irqchip/arm-gic-v5.h +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Merge made by the 'ort' strategy. + arch/arm64/include/asm/el2_setup.h | 1 - + arch/arm64/include/asm/kvm_arm.h | 56 +-- + arch/arm64/include/asm/kvm_asm.h | 2 - + arch/arm64/include/asm/kvm_emulate.h | 1 + + arch/arm64/include/asm/kvm_host.h | 58 ++- + arch/arm64/include/asm/kvm_mmu.h | 3 +- + arch/arm64/include/asm/kvm_pgtable.h | 19 +- + arch/arm64/include/asm/kvm_pkvm.h | 32 +- + arch/arm64/include/asm/memory.h | 11 +- + arch/arm64/include/asm/pgtable-prot.h | 4 +- + arch/arm64/include/asm/sysreg.h | 29 -- + arch/arm64/kernel/cpufeature.c | 8 +- + arch/arm64/kernel/head.S | 2 +- + arch/arm64/kernel/image-vars.h | 1 - + arch/arm64/kvm/arch_timer.c | 18 +- + arch/arm64/kvm/arm.c | 63 ++- + arch/arm64/kvm/config.c | 511 +++++++++++++-------- + arch/arm64/kvm/emulate-nested.c | 103 +++-- + arch/arm64/kvm/hyp/include/hyp/switch.h | 6 +- + arch/arm64/kvm/hyp/nvhe/ffa.c | 4 +- + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 5 - + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 67 +++ + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 4 +- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 20 +- + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 39 +- + arch/arm64/kvm/hyp/pgtable.c | 58 ++- + arch/arm64/kvm/hyp/vgic-v2-cpuif-proxy.c | 2 +- + arch/arm64/kvm/hyp/vgic-v3-sr.c | 69 +-- + arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 2 +- + arch/arm64/kvm/inject_fault.c | 12 +- + arch/arm64/kvm/mmu.c | 32 +- + arch/arm64/kvm/nested.c | 172 +++---- + arch/arm64/kvm/sys_regs.c | 122 +++-- + arch/arm64/kvm/sys_regs.h | 10 + + arch/arm64/kvm/va_layout.c | 61 ++- + arch/arm64/kvm/vgic/vgic-debug.c | 108 ++--- + arch/arm64/kvm/vgic/vgic-init.c | 8 +- + arch/arm64/kvm/vgic/vgic-v3-nested.c | 10 +- + arch/arm64/kvm/vgic/vgic-v3.c | 73 +-- + arch/arm64/kvm/vgic/vgic-v5.c | 2 + + arch/arm64/kvm/vgic/vgic.h | 1 + + arch/arm64/tools/sysreg | 154 ++++++- + drivers/irqchip/irq-gic-v5-irs.c | 2 + + drivers/irqchip/irq-gic-v5.c | 10 + + include/kvm/arm_vgic.h | 4 - + include/linux/irqchip/arm-gic-v5.h | 4 + + tools/arch/arm64/include/asm/sysreg.h | 6 - + tools/perf/Documentation/perf-arm-spe.txt | 1 - + tools/testing/selftests/kvm/Makefile.kvm | 1 + + tools/testing/selftests/kvm/arm64/idreg-idst.c | 117 +++++ + tools/testing/selftests/kvm/arm64/set_id_regs.c | 1 - + .../selftests/kvm/include/arm64/processor.h | 4 + + tools/testing/selftests/kvm/include/kvm_util.h | 9 +- + tools/testing/selftests/kvm/lib/arm64/processor.c | 9 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 2 +- + tools/testing/selftests/kvm/lib/riscv/processor.c | 7 +- + 56 files changed, 1319 insertions(+), 821 deletions(-) + create mode 100644 tools/testing/selftests/kvm/arm64/idreg-idst.c +Merging kvms390/next (52940a34a85bc KVM: s390: selftests: Add selftest for the KVM_S390_KEYOP ioctl) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging MAINTAINERS +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/include/asm/page.h +Auto-merging arch/s390/include/asm/tlb.h +Auto-merging arch/s390/mm/gmap_helpers.c +Auto-merging arch/s390/mm/hugetlbpage.c +Auto-merging arch/s390/mm/pgtable.c +CONFLICT (content): Merge conflict in arch/s390/mm/pgtable.c +Auto-merging include/uapi/linux/kvm.h +Auto-merging mm/khugepaged.c +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Resolved 'arch/s390/mm/pgtable.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6fdba1c383b8f] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 42 + + MAINTAINERS | 2 - + arch/s390/Kconfig | 3 - + arch/s390/include/asm/dat-bits.h | 32 +- + arch/s390/include/asm/gmap.h | 174 --- + arch/s390/include/asm/gmap_helpers.h | 1 + + arch/s390/include/asm/hugetlb.h | 6 - + arch/s390/include/asm/kvm_host.h | 7 + + arch/s390/include/asm/mmu.h | 13 - + arch/s390/include/asm/mmu_context.h | 6 +- + arch/s390/include/asm/page.h | 4 - + arch/s390/include/asm/pgalloc.h | 4 - + arch/s390/include/asm/pgtable.h | 171 +-- + arch/s390/include/asm/tlb.h | 3 - + arch/s390/include/asm/uaccess.h | 70 +- + arch/s390/include/asm/uv.h | 3 +- + arch/s390/kernel/uv.c | 142 +- + arch/s390/kvm/Kconfig | 2 + + arch/s390/kvm/Makefile | 3 +- + arch/s390/kvm/dat.c | 1391 +++++++++++++++++ + arch/s390/kvm/dat.h | 970 ++++++++++++ + arch/s390/kvm/diag.c | 2 +- + arch/s390/kvm/faultin.c | 148 ++ + arch/s390/kvm/faultin.h | 92 ++ + arch/s390/kvm/gaccess.c | 970 +++++++----- + arch/s390/kvm/gaccess.h | 20 +- + arch/s390/kvm/gmap-vsie.c | 141 -- + arch/s390/kvm/gmap.c | 1235 +++++++++++++++ + arch/s390/kvm/gmap.h | 244 +++ + arch/s390/kvm/intercept.c | 15 +- + arch/s390/kvm/interrupt.c | 6 +- + arch/s390/kvm/kvm-s390.c | 962 +++++------- + arch/s390/kvm/kvm-s390.h | 27 +- + arch/s390/kvm/priv.c | 213 +-- + arch/s390/kvm/pv.c | 177 ++- + arch/s390/kvm/vsie.c | 198 +-- + arch/s390/lib/uaccess.c | 184 +-- + arch/s390/mm/Makefile | 1 - + arch/s390/mm/fault.c | 4 +- + arch/s390/mm/gmap.c | 2436 ------------------------------ + arch/s390/mm/gmap_helpers.c | 96 +- + arch/s390/mm/hugetlbpage.c | 24 - + arch/s390/mm/page-states.c | 1 + + arch/s390/mm/pageattr.c | 7 - + arch/s390/mm/pgalloc.c | 24 - + arch/s390/mm/pgtable.c | 814 +--------- + include/uapi/linux/kvm.h | 11 + + mm/khugepaged.c | 9 - + tools/testing/selftests/kvm/Makefile.kvm | 1 + + tools/testing/selftests/kvm/s390/keyop.c | 299 ++++ + 50 files changed, 5903 insertions(+), 5507 deletions(-) + delete mode 100644 arch/s390/include/asm/gmap.h + create mode 100644 arch/s390/kvm/dat.c + create mode 100644 arch/s390/kvm/dat.h + create mode 100644 arch/s390/kvm/faultin.c + create mode 100644 arch/s390/kvm/faultin.h + delete mode 100644 arch/s390/kvm/gmap-vsie.c + create mode 100644 arch/s390/kvm/gmap.c + create mode 100644 arch/s390/kvm/gmap.h + delete mode 100644 arch/s390/mm/gmap.c + create mode 100644 tools/testing/selftests/kvm/s390/keyop.c +Merging kvm-ppc/topic/ppc-kvm (9448598b22c50 Linux 6.19-rc2) +$ git merge -m Merge branch 'topic/ppc-kvm' of https://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 (0ebad18dcacc6 irqchip/riscv-imsic: Adjust the number of available guest irq files) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Auto-merging arch/riscv/mm/pgtable.c +Auto-merging tools/testing/selftests/kvm/include/kvm_util.h +Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c +Auto-merging tools/testing/selftests/kvm/lib/riscv/processor.c +Merge made by the 'ort' strategy. + arch/riscv/include/uapi/asm/kvm.h | 3 + + arch/riscv/kvm/aia.c | 2 +- + arch/riscv/kvm/aia_imsic.c | 13 +- + arch/riscv/kvm/mmu.c | 140 +++++++++++++++++++++ + arch/riscv/kvm/vcpu_onereg.c | 4 + + arch/riscv/kvm/vcpu_pmu.c | 5 +- + arch/riscv/mm/pgtable.c | 2 + + drivers/irqchip/irq-riscv-imsic-state.c | 12 +- + include/linux/irqchip/riscv-imsic.h | 3 + + tools/testing/selftests/kvm/include/kvm_util.h | 17 ++- + .../selftests/kvm/include/riscv/processor.h | 2 + + tools/testing/selftests/kvm/lib/guest_modes.c | 41 ++++-- + tools/testing/selftests/kvm/lib/kvm_util.c | 33 +++++ + tools/testing/selftests/kvm/lib/riscv/processor.c | 63 +++++++++- + tools/testing/selftests/kvm/riscv/get-reg-list.c | 12 ++ + 15 files changed, 330 insertions(+), 22 deletions(-) +Merging kvm-x86/next (e944fe2c09f40 Merge branch 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/loongarch/kvm/main.c +Auto-merging arch/loongarch/kvm/vcpu.c +Auto-merging arch/loongarch/kvm/vm.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/include/asm/msr-index.h +Auto-merging include/uapi/linux/kvm.h +CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Auto-merging tools/testing/selftests/kvm/include/kvm_util.h +Auto-merging tools/testing/selftests/kvm/lib/arm64/processor.c +Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c +Auto-merging tools/testing/selftests/kvm/lib/riscv/processor.c +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/lib/riscv/processor.c +Resolved 'include/uapi/linux/kvm.h' using previous resolution. +Resolved 'tools/testing/selftests/kvm/lib/riscv/processor.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f530f1f2aa142] Merge branch 'next' of https://github.com/kvm-x86/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 49 +++ + Documentation/virt/kvm/api.rst | 72 +++- + Documentation/virt/kvm/locking.rst | 2 + + .../virt/kvm/x86/amd-memory-encryption.rst | 54 ++- + Documentation/virt/kvm/x86/intel-tdx.rst | 2 +- + arch/arm64/kvm/arm.c | 2 +- + arch/arm64/kvm/guest.c | 4 +- + arch/loongarch/kvm/main.c | 2 +- + arch/loongarch/kvm/vcpu.c | 2 +- + arch/loongarch/kvm/vm.c | 2 +- + arch/mips/kvm/mips.c | 4 +- + arch/powerpc/kvm/book3s.c | 4 +- + arch/powerpc/kvm/booke.c | 4 +- + arch/riscv/kvm/main.c | 2 +- + arch/riscv/kvm/vcpu.c | 2 +- + arch/riscv/kvm/vm.c | 2 +- + arch/s390/kvm/kvm-s390.c | 4 +- + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/kvm-x86-pmu-ops.h | 4 + + arch/x86/include/asm/kvm_host.h | 22 ++ + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/include/asm/svm.h | 9 +- + arch/x86/include/asm/vmx.h | 1 + + arch/x86/include/uapi/asm/kvm.h | 8 +- + arch/x86/include/uapi/asm/svm.h | 32 +- + arch/x86/kvm/Makefile | 49 +++ + arch/x86/kvm/cpuid.c | 84 ++++- + arch/x86/kvm/cpuid.h | 12 +- + arch/x86/kvm/hyperv.c | 2 +- + arch/x86/kvm/ioapic.c | 45 +-- + arch/x86/kvm/ioapic.h | 38 +- + arch/x86/kvm/irq.c | 4 +- + arch/x86/kvm/lapic.c | 174 +++++---- + arch/x86/kvm/lapic.h | 23 +- + arch/x86/kvm/mmu/mmu.c | 11 +- + arch/x86/kvm/pmu.c | 271 +++++++++++++- + arch/x86/kvm/pmu.h | 37 +- + arch/x86/kvm/reverse_cpuid.h | 19 + + arch/x86/kvm/svm/avic.c | 4 +- + arch/x86/kvm/svm/hyperv.c | 7 +- + arch/x86/kvm/svm/nested.c | 100 +++-- + arch/x86/kvm/svm/pmu.c | 44 +++ + arch/x86/kvm/svm/sev.c | 243 ++++++------ + arch/x86/kvm/svm/svm.c | 171 +++++++-- + arch/x86/kvm/svm/svm.h | 49 ++- + arch/x86/kvm/trace.h | 6 +- + arch/x86/kvm/vmx/capabilities.h | 9 +- + arch/x86/kvm/vmx/hyperv_evmcs.c | 2 +- + arch/x86/kvm/vmx/hyperv_evmcs.h | 2 +- + arch/x86/kvm/vmx/nested.c | 229 +++++------- + arch/x86/kvm/vmx/nested.h | 1 - + arch/x86/kvm/vmx/pmu_intel.c | 92 ++++- + arch/x86/kvm/vmx/pmu_intel.h | 15 + + arch/x86/kvm/vmx/tdx.c | 16 +- + arch/x86/kvm/vmx/vmcs.h | 9 + + arch/x86/kvm/vmx/vmcs12.c | 74 +++- + arch/x86/kvm/vmx/vmcs12.h | 8 +- + arch/x86/kvm/vmx/vmx.c | 410 +++++++++++++++------ + arch/x86/kvm/vmx/vmx.h | 18 +- + arch/x86/kvm/x86.c | 162 +++++--- + arch/x86/kvm/x86.h | 16 +- + arch/x86/kvm/xen.c | 2 +- + include/hyperv/hvgdk.h | 2 +- + include/linux/kvm_host.h | 107 +++--- + include/uapi/linux/kvm.h | 17 + + tools/testing/selftests/kvm/Makefile.kvm | 7 +- + .../selftests/kvm/include/arm64/kvm_util_arch.h | 2 + + tools/testing/selftests/kvm/include/kvm_util.h | 18 +- + .../kvm/include/loongarch/kvm_util_arch.h | 1 + + .../selftests/kvm/include/riscv/kvm_util_arch.h | 1 + + .../selftests/kvm/include/s390/kvm_util_arch.h | 1 + + tools/testing/selftests/kvm/include/x86/apic.h | 7 + + .../selftests/kvm/include/x86/kvm_util_arch.h | 22 ++ + .../testing/selftests/kvm/include/x86/processor.h | 65 +++- + tools/testing/selftests/kvm/include/x86/svm.h | 3 +- + tools/testing/selftests/kvm/include/x86/svm_util.h | 9 + + tools/testing/selftests/kvm/include/x86/vmx.h | 16 +- + tools/testing/selftests/kvm/lib/arm64/processor.c | 38 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 28 +- + .../selftests/kvm/lib/loongarch/processor.c | 28 +- + tools/testing/selftests/kvm/lib/riscv/processor.c | 31 +- + tools/testing/selftests/kvm/lib/s390/processor.c | 16 +- + tools/testing/selftests/kvm/lib/x86/memstress.c | 65 ++-- + tools/testing/selftests/kvm/lib/x86/processor.c | 233 +++++++++--- + tools/testing/selftests/kvm/lib/x86/svm.c | 27 ++ + tools/testing/selftests/kvm/lib/x86/vmx.c | 251 +++---------- + tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c | 2 +- + .../selftests/kvm/x86/nested_dirty_log_test.c | 293 +++++++++++++++ + ...nested_state_test.c => nested_set_state_test.c} | 128 ++++++- + .../selftests/kvm/x86/nested_vmsave_vmload_test.c | 197 ++++++++++ + .../kvm/x86/smaller_maxphyaddr_emulation_test.c | 4 +- + .../kvm/x86/svm_nested_soft_inject_test.c | 4 +- + .../selftests/kvm/x86/vmx_apicv_updates_test.c | 155 ++++++++ + .../testing/selftests/kvm/x86/vmx_dirty_log_test.c | 179 --------- + .../selftests/kvm/x86/vmx_nested_la57_state_test.c | 2 +- + tools/testing/selftests/kvm/x86/xapic_tpr_test.c | 276 ++++++++++++++ + virt/kvm/binary_stats.c | 2 +- + virt/kvm/guest_memfd.c | 141 +++---- + virt/kvm/kvm_main.c | 27 +- + 99 files changed, 3717 insertions(+), 1438 deletions(-) + create mode 100644 tools/testing/selftests/kvm/x86/nested_dirty_log_test.c + rename tools/testing/selftests/kvm/x86/{vmx_set_nested_state_test.c => nested_set_state_test.c} (70%) + create mode 100644 tools/testing/selftests/kvm/x86/nested_vmsave_vmload_test.c + create mode 100644 tools/testing/selftests/kvm/x86/vmx_apicv_updates_test.c + delete mode 100644 tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c + create mode 100644 tools/testing/selftests/kvm/x86/xapic_tpr_test.c +$ git am -3 ../patches/0001-KVM-selftests-Fix-up-semantic-changes.patch +Applying: KVM: selftests: Fix up semantic changes +$ git reset HEAD^ +Unstaged changes after reset: +M tools/testing/selftests/kvm/lib/kvm_util.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 0f78b9414752f] Merge branch 'next' of https://github.com/kvm-x86/linux.git + Date: Thu Feb 5 13:34:34 2026 +0000 +Merging xen-tip/linux-next (c307b6dc9c4f6 xenbus: Rename helpers to freeze/thaw/restore) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 +++++ + arch/x86/platform/pvh/head.S | 2 ++ + arch/x86/xen/enlighten.c | 2 +- + drivers/tty/hvc/hvc_xen.c | 29 ++++++++++++++++++++----- + drivers/xen/balloon.c | 26 ++++++++++++++++++---- + drivers/xen/events/events_base.c | 6 ++--- + drivers/xen/grant-dma-ops.c | 3 ++- + drivers/xen/mcelog.c | 4 +--- + drivers/xen/privcmd.c | 3 ++- + drivers/xen/unpopulated-alloc.c | 3 +++ + drivers/xen/xenbus/xenbus.h | 6 ++--- + drivers/xen/xenbus/xenbus_probe.c | 22 +++++++++---------- + drivers/xen/xenbus/xenbus_probe_frontend.c | 18 +++++++-------- + include/xen/xen.h | 2 ++ + 14 files changed, 89 insertions(+), 42 deletions(-) +Merging percpu/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (32d572e390319 workqueue: add CONFIG_BOOTPARAM_WQ_STALL_PANIC option) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging kernel/workqueue.c +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 3 +- + kernel/workqueue.c | 123 ++++++++++++++++++------ + lib/Kconfig.debug | 23 +++++ + 3 files changed, 118 insertions(+), 31 deletions(-) +Merging sched-ext/for-next (3445c57d73330 Merge branch 'for-6.19-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Auto-merging kernel/sched/ext.c +Merge made by the 'ort' strategy. + kernel/sched/ext.c | 4 +- + tools/sched_ext/Makefile | 2 +- + tools/sched_ext/scx_central.bpf.c | 4 +- + tools/sched_ext/scx_cpu0.bpf.c | 10 +- + tools/sched_ext/scx_flatcg.bpf.c | 14 +- + tools/sched_ext/scx_pair.bpf.c | 610 ++++++++++++++++++ + tools/sched_ext/scx_pair.c | 180 ++++++ + tools/sched_ext/scx_pair.h | 9 + + tools/sched_ext/scx_qmap.bpf.c | 8 +- + tools/sched_ext/scx_sdt.bpf.c | 716 +++++++++++++++++++++ + tools/sched_ext/scx_sdt.c | 101 +++ + tools/sched_ext/scx_sdt.h | 113 ++++ + tools/sched_ext/scx_simple.bpf.c | 10 +- + tools/sched_ext/scx_userland.bpf.c | 344 ++++++++++ + tools/sched_ext/scx_userland.c | 437 +++++++++++++ + tools/sched_ext/scx_userland.h | 17 + + .../selftests/sched_ext/init_enable_count.c | 34 +- + 17 files changed, 2592 insertions(+), 21 deletions(-) + create mode 100644 tools/sched_ext/scx_pair.bpf.c + create mode 100644 tools/sched_ext/scx_pair.c + create mode 100644 tools/sched_ext/scx_pair.h + create mode 100644 tools/sched_ext/scx_sdt.bpf.c + create mode 100644 tools/sched_ext/scx_sdt.c + create mode 100644 tools/sched_ext/scx_sdt.h + create mode 100644 tools/sched_ext/scx_userland.bpf.c + create mode 100644 tools/sched_ext/scx_userland.c + create mode 100644 tools/sched_ext/scx_userland.h +Merging drivers-x86/for-next (eeeb4c9874bb7 platform/x86: hp-wmi: Add EC offsets to read Victus S thermal profile) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging drivers/hid/hid-asus.c +CONFLICT (content): Merge conflict in drivers/hid/hid-asus.c +Auto-merging drivers/platform/x86/intel/wmi/thunderbolt.c +Auto-merging include/linux/platform_data/x86/asus-wmi.h +Resolved 'drivers/hid/hid-asus.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6a4f6a2a6b097] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git +$ git diff -M --stat --summary HEAD^.. + .../admin-guide/laptops/thinkpad-acpi.rst | 37 + + Documentation/driver-api/wmi.rst | 3 + + Documentation/wmi/acpi-interface.rst | 68 ++ + Documentation/wmi/devices/lenovo-wmi-other.rst | 46 +- + Documentation/wmi/driver-development-guide.rst | 76 +- + drivers/crypto/ccp/psp-dev.c | 11 + + drivers/crypto/ccp/sp-dev.c | 12 + + drivers/crypto/ccp/sp-dev.h | 3 + + drivers/crypto/ccp/sp-pci.c | 16 +- + drivers/crypto/ccp/tee-dev.c | 56 +- + drivers/crypto/ccp/tee-dev.h | 1 + + drivers/hid/hid-asus.c | 232 +++--- + drivers/platform/mellanox/mlx-platform.c | 484 ++++++++++++ + .../platform/surface/surface_aggregator_registry.c | 18 + + drivers/platform/surface/surfacepro3_button.c | 11 +- + drivers/platform/wmi/Kconfig | 3 + + drivers/platform/wmi/Makefile | 5 +- + drivers/platform/wmi/core.c | 160 +++- + drivers/platform/wmi/internal.h | 17 + + drivers/platform/wmi/marshalling.c | 247 ++++++ + drivers/platform/wmi/string.c | 92 +++ + drivers/platform/wmi/tests/Kconfig | 27 + + drivers/platform/wmi/tests/Makefile | 11 + + drivers/platform/wmi/tests/marshalling_kunit.c | 452 +++++++++++ + drivers/platform/wmi/tests/string_kunit.c | 296 ++++++++ + drivers/platform/x86/amd/pmf/acpi.c | 40 + + drivers/platform/x86/amd/pmf/core.c | 161 +++- + drivers/platform/x86/amd/pmf/pmf.h | 33 + + drivers/platform/x86/amd/pmf/spc.c | 33 +- + drivers/platform/x86/amd/pmf/tee-if.c | 14 +- + drivers/platform/x86/amd/wbrf.c | 25 +- + drivers/platform/x86/asus-wmi.c | 223 +++++- + drivers/platform/x86/hp/hp-wmi.c | 603 ++++++++++++--- + drivers/platform/x86/intel/pmc/core.c | 85 ++- + drivers/platform/x86/intel/pmc/core.h | 15 +- + drivers/platform/x86/intel/pmt/class.c | 6 +- + .../x86/intel/speed_select_if/isst_tpmi_core.c | 79 +- + .../uncore-frequency/uncore-frequency-common.c | 13 +- + drivers/platform/x86/intel/wmi/sbl-fw-update.c | 43 +- + drivers/platform/x86/intel/wmi/thunderbolt.c | 26 +- + drivers/platform/x86/lenovo/Kconfig | 5 +- + drivers/platform/x86/lenovo/Makefile | 2 +- + drivers/platform/x86/lenovo/ideapad-laptop.c | 39 +- + drivers/platform/x86/lenovo/thinkpad_acpi.c | 206 +++++ + drivers/platform/x86/lenovo/wmi-capdata.c | 829 +++++++++++++++++++++ + drivers/platform/x86/lenovo/wmi-capdata.h | 65 ++ + drivers/platform/x86/lenovo/wmi-capdata01.c | 302 -------- + drivers/platform/x86/lenovo/wmi-capdata01.h | 25 - + drivers/platform/x86/lenovo/wmi-helpers.c | 21 +- + drivers/platform/x86/lenovo/wmi-other.c | 528 ++++++++++++- + drivers/platform/x86/lenovo/yogabook.c | 12 +- + drivers/platform/x86/uniwill/uniwill-acpi.c | 302 +++++++- + drivers/platform/x86/wmi-bmof.c | 34 +- + drivers/platform/x86/xiaomi-wmi.c | 5 +- + include/linux/amd-pmf-io.h | 21 + + .../linux/platform_data/x86/asus-wmi-leds-ids.h | 50 -- + include/linux/platform_data/x86/asus-wmi.h | 28 + + include/linux/psp.h | 1 + + include/linux/wmi.h | 45 +- + tools/power/x86/intel-speed-select/Makefile | 8 +- + tools/power/x86/intel-speed-select/isst-config.c | 43 +- + 61 files changed, 5389 insertions(+), 965 deletions(-) + create mode 100644 drivers/platform/wmi/internal.h + create mode 100644 drivers/platform/wmi/marshalling.c + create mode 100644 drivers/platform/wmi/string.c + create mode 100644 drivers/platform/wmi/tests/Kconfig + create mode 100644 drivers/platform/wmi/tests/Makefile + create mode 100644 drivers/platform/wmi/tests/marshalling_kunit.c + create mode 100644 drivers/platform/wmi/tests/string_kunit.c + create mode 100644 drivers/platform/x86/lenovo/wmi-capdata.c + create mode 100644 drivers/platform/x86/lenovo/wmi-capdata.h + delete mode 100644 drivers/platform/x86/lenovo/wmi-capdata01.c + delete mode 100644 drivers/platform/x86/lenovo/wmi-capdata01.h + delete mode 100644 include/linux/platform_data/x86/asus-wmi-leds-ids.h +$ git am -3 ../patches/0001-hid-Fix-up-mismerge.patch +Applying: hid: Fix up mismerge +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hid/hid-asus.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 003714acf7251] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git + Date: Thu Feb 5 13:34:44 2026 +0000 +Merging chrome-platform/for-next (520e345dfdab8 platform/chrome: lightbar: Use flexible array member) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec_lightbar.c | 133 +++++++++++++++++++------ + drivers/platform/chrome/cros_typec_switch.c | 19 +--- + include/linux/platform_data/cros_ec_commands.h | 24 +++++ + 3 files changed, 134 insertions(+), 42 deletions(-) +Merging chrome-platform-firmware/for-firmware-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-firmware-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://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 (b2c87f5e98cd8 dt-bindings: leds: Convert ti,lm3697 to DT schema) +$ git merge -m Merge branch 'for-leds-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/leds/ams,as3668.yaml | 74 +++ + .../bindings/leds/leds-class-multicolor.yaml | 2 +- + .../devicetree/bindings/leds/leds-is31fl32xx.txt | 1 + + .../devicetree/bindings/leds/leds-lm3697.txt | 73 --- + .../devicetree/bindings/leds/leds-lp5860.yaml | 111 ++++ + .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 1 + + .../bindings/leds/qcom,spmi-flash-led.yaml | 1 + + .../devicetree/bindings/leds/ti,lm3697.yaml | 125 ++++ + .../devicetree/bindings/leds/ti,lp5812.yaml | 246 ++++++++ + Documentation/leds/index.rst | 1 + + Documentation/leds/leds-lp5812.rst | 50 ++ + MAINTAINERS | 18 + + drivers/leds/Kconfig | 13 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-as3668.c | 202 +++++++ + drivers/leds/leds-expresswire.c | 24 +- + drivers/leds/leds-is31fl32xx.c | 266 ++++++--- + drivers/leds/leds-lm3692x.c | 3 + + drivers/leds/leds-lp55xx-common.c | 7 +- + drivers/leds/rgb/Kconfig | 13 + + drivers/leds/rgb/Makefile | 1 + + drivers/leds/rgb/leds-lp5812.c | 642 +++++++++++++++++++++ + drivers/leds/rgb/leds-lp5812.h | 172 ++++++ + drivers/leds/rgb/leds-qcom-lpg.c | 8 +- + include/linux/leds-expresswire.h | 3 - + 25 files changed, 1892 insertions(+), 166 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/ams,as3668.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/leds-lm3697.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-lp5860.yaml + create mode 100644 Documentation/devicetree/bindings/leds/ti,lm3697.yaml + create mode 100644 Documentation/devicetree/bindings/leds/ti,lp5812.yaml + create mode 100644 Documentation/leds/leds-lp5812.rst + create mode 100644 drivers/leds/leds-as3668.c + create mode 100644 drivers/leds/rgb/leds-lp5812.c + create mode 100644 drivers/leds/rgb/leds-lp5812.h +Merging ipmi/for-next (6b157b408d0c7 ipmi:ls2k: Make ipmi_ls2k_platform_driver static) +$ git merge -m Merge branch 'for-next' of https://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmi_ipmb.c | 5 +++++ + drivers/char/ipmi/ipmi_msghandler.c | 41 ++++++++++++++++++++++++------------- + drivers/char/ipmi/ipmi_si_ls2k.c | 2 +- + 3 files changed, 33 insertions(+), 15 deletions(-) +Merging driver-core/driver-core-next (c5048ddee936c driver core: disable revocable code from build) +$ git merge -m Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core/driver-core-next +Auto-merging Documentation/driver-api/driver-model/index.rst +CONFLICT (content): Merge conflict in Documentation/driver-api/driver-model/index.rst +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/tyr/driver.rs +Auto-merging drivers/gpu/drm/tyr/gpu.rs +Auto-merging drivers/gpu/nova-core/gsp/sequencer.rs +Auto-merging drivers/gpu/nova-core/vbios.rs +Auto-merging drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +Auto-merging rust/bindings/bindings_helper.h +Auto-merging rust/kernel/debugfs/entry.rs +Auto-merging rust/kernel/lib.rs +Auto-merging rust/kernel/pci/id.rs +Auto-merging samples/rust/rust_driver_auxiliary.rs +Resolved 'Documentation/driver-api/driver-model/index.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b29b81130ebc9] Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git +$ git diff -M --stat --summary HEAD^.. + Documentation/driver-api/driver-model/index.rst | 1 + + .../driver-api/driver-model/revocable.rst | 149 +++++++ + MAINTAINERS | 24 +- + drivers/base/Kconfig | 8 + + drivers/base/Makefile | 3 + + drivers/base/attribute_container.c | 4 +- + drivers/base/base.h | 15 +- + drivers/base/dd.c | 2 +- + drivers/base/devtmpfs.c | 5 +- + drivers/base/faux.c | 18 +- + drivers/base/revocable.c | 225 ++++++++++ + drivers/base/revocable_test.c | 284 ++++++++++++ + drivers/base/transport_class.c | 8 +- + drivers/gpu/drm/tyr/driver.rs | 2 +- + drivers/gpu/drm/tyr/gpu.rs | 6 +- + drivers/gpu/drm/tyr/regs.rs | 1 + + drivers/gpu/nova-core/gsp/sequencer.rs | 5 +- + drivers/gpu/nova-core/regs/macros.rs | 90 ++-- + drivers/gpu/nova-core/vbios.rs | 1 + + drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 14 + + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 14 +- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 24 +- + drivers/iommu/arm/arm-smmu/arm-smmu.h | 5 + + drivers/pwm/pwm_th1520.rs | 5 +- + drivers/scsi/scsi_transport_spi.c | 2 +- + include/linux/attribute_container.h | 2 +- + include/linux/device/bus.h | 4 +- + include/linux/device/devres.h | 4 - + include/linux/revocable.h | 89 ++++ + include/linux/transport_class.h | 6 +- + rust/bindings/bindings_helper.h | 1 + + rust/helpers/auxiliary.c | 6 +- + rust/helpers/device.c | 16 +- + rust/helpers/dma.c | 21 +- + rust/helpers/io.c | 64 +-- + rust/helpers/irq.c | 6 +- + rust/helpers/pci.c | 23 +- + rust/helpers/platform.c | 2 +- + rust/helpers/property.c | 2 +- + rust/helpers/scatterlist.c | 12 +- + rust/kernel/auxiliary.rs | 30 +- + rust/kernel/debugfs.rs | 86 ++-- + rust/kernel/debugfs/callback_adapters.rs | 21 +- + rust/kernel/debugfs/entry.rs | 14 +- + rust/kernel/debugfs/file_ops.rs | 43 +- + rust/kernel/debugfs/traits.rs | 43 +- + rust/kernel/device.rs | 32 +- + rust/kernel/device/property.rs | 11 +- + rust/kernel/devres.rs | 60 ++- + rust/kernel/dma.rs | 17 + + rust/kernel/driver.rs | 12 +- + rust/kernel/faux.rs | 13 +- + rust/kernel/io.rs | 493 +++++++++++++++++---- + rust/kernel/io/mem.rs | 33 +- + rust/kernel/io/poll.rs | 16 +- + rust/kernel/irq/request.rs | 6 +- + rust/kernel/lib.rs | 2 + + rust/kernel/pci.rs | 11 +- + rust/kernel/pci/id.rs | 2 +- + rust/kernel/pci/io.rs | 210 ++++++++- + rust/kernel/platform.rs | 46 +- + rust/kernel/scatterlist.rs | 3 +- + rust/kernel/soc.rs | 135 ++++++ + samples/rust/Kconfig | 11 + + samples/rust/Makefile | 1 + + samples/rust/rust_debugfs.rs | 46 +- + samples/rust/rust_debugfs_scoped.rs | 38 +- + samples/rust/rust_dma.rs | 13 +- + samples/rust/rust_driver_auxiliary.rs | 14 +- + samples/rust/rust_driver_faux.rs | 10 +- + samples/rust/rust_driver_pci.rs | 43 +- + samples/rust/rust_driver_platform.rs | 42 +- + samples/rust/rust_soc.rs | 79 ++++ + .../selftests/drivers/base/revocable/Makefile | 7 + + .../drivers/base/revocable/revocable_test.c | 136 ++++++ + .../drivers/base/revocable/test-revocable.sh | 39 ++ + .../drivers/base/revocable/test_modules/Makefile | 10 + + .../base/revocable/test_modules/revocable_test.c | 187 ++++++++ + 78 files changed, 2719 insertions(+), 469 deletions(-) + create mode 100644 Documentation/driver-api/driver-model/revocable.rst + create mode 100644 drivers/base/revocable.c + create mode 100644 drivers/base/revocable_test.c + create mode 100644 include/linux/revocable.h + create mode 100644 rust/kernel/soc.rs + create mode 100644 samples/rust/rust_soc.rs + create mode 100644 tools/testing/selftests/drivers/base/revocable/Makefile + create mode 100644 tools/testing/selftests/drivers/base/revocable/revocable_test.c + create mode 100755 tools/testing/selftests/drivers/base/revocable/test-revocable.sh + create mode 100644 tools/testing/selftests/drivers/base/revocable/test_modules/Makefile + create mode 100644 tools/testing/selftests/drivers/base/revocable/test_modules/revocable_test.c +Merging usb/usb-next (0a06917432a76 usb: dwc3: Log dwc3 address in traces) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging MAINTAINERS +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/gadget/function/u_ether.c +Auto-merging drivers/usb/gadget/function/uvc_configfs.c +Auto-merging rust/kernel/usb.rs +Merge made by the 'ort' strategy. + Documentation/ABI/testing/configfs-usb-gadget-midi | 17 +- + .../ABI/testing/sysfs-bus-pci-drivers-xhci_hcd | 42 + + Documentation/ABI/testing/sysfs-class-typec | 11 + + .../devicetree/bindings/usb/aspeed,usb-vhub.yaml | 22 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 2 + + .../devicetree/bindings/usb/generic-ohci.yaml | 2 + + .../devicetree/bindings/usb/google,lga-dwc3.yaml | 140 + + .../bindings/usb/microchip,lan9691-dwc3.yaml | 66 + + .../bindings/usb/socionext,uniphier-dwc3.yaml | 89 + + .../devicetree/bindings/usb/wch,ch334.yaml | 65 + + Documentation/usb/gadget-testing.rst | 18 +- + MAINTAINERS | 2 + + drivers/platform/chrome/cros_ec_typec.c | 1 + + drivers/usb/Makefile | 1 - + drivers/usb/chipidea/ci_hdrc_imx.c | 9 +- + drivers/usb/chipidea/udc.c | 7 + + drivers/usb/core/hcd.c | 4 - + drivers/usb/dwc3/Kconfig | 11 + + drivers/usb/dwc3/Makefile | 1 + + drivers/usb/dwc3/core.c | 196 +- + drivers/usb/dwc3/core.h | 10 +- + drivers/usb/dwc3/debugfs.c | 44 +- + drivers/usb/dwc3/drd.c | 86 +- + drivers/usb/dwc3/dwc3-google.c | 626 +++++ + drivers/usb/dwc3/dwc3-imx8mp.c | 47 +- + drivers/usb/dwc3/dwc3-xilinx.c | 67 +- + drivers/usb/dwc3/ep0.c | 22 +- + drivers/usb/dwc3/gadget.c | 164 +- + drivers/usb/dwc3/gadget.h | 4 +- + drivers/usb/dwc3/io.h | 11 +- + drivers/usb/dwc3/trace.h | 88 +- + drivers/usb/dwc3/ulpi.c | 10 +- + drivers/usb/fotg210/fotg210-hcd.c | 6 - + drivers/usb/gadget/configfs.c | 24 +- + drivers/usb/gadget/function/f_acm.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 26 +- + drivers/usb/gadget/function/f_hid.c | 2 +- + drivers/usb/gadget/function/f_loopback.c | 2 +- + drivers/usb/gadget/function/f_mass_storage.c | 6 +- + drivers/usb/gadget/function/f_midi.c | 112 +- + drivers/usb/gadget/function/f_midi2.c | 10 +- + drivers/usb/gadget/function/f_ncm.c | 130 +- + drivers/usb/gadget/function/f_obex.c | 2 +- + drivers/usb/gadget/function/f_phonet.c | 2 +- + drivers/usb/gadget/function/f_printer.c | 2 +- + drivers/usb/gadget/function/f_serial.c | 2 +- + drivers/usb/gadget/function/f_sourcesink.c | 54 +- + drivers/usb/gadget/function/f_tcm.c | 5 +- + drivers/usb/gadget/function/f_uac1.c | 2 +- + drivers/usb/gadget/function/f_uac1_legacy.c | 2 +- + drivers/usb/gadget/function/f_uac2.c | 2 +- + drivers/usb/gadget/function/g_zero.h | 1 + + drivers/usb/gadget/function/u_ether.c | 45 + + drivers/usb/gadget/function/u_ether.h | 30 + + drivers/usb/gadget/function/u_ether_configfs.h | 179 +- + drivers/usb/gadget/function/u_midi.h | 2 +- + drivers/usb/gadget/function/u_ncm.h | 4 +- + drivers/usb/gadget/function/uvc_configfs.c | 36 +- + drivers/usb/gadget/udc/aspeed-vhub/core.c | 30 + + drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 1 + + drivers/usb/gadget/udc/bdc/bdc_core.c | 4 +- + drivers/usb/gadget/udc/tegra-xudc.c | 12 +- + drivers/usb/host/Kconfig | 14 +- + drivers/usb/host/Makefile | 1 - + drivers/usb/host/ehci-hcd.c | 8 - + drivers/usb/host/isp1362-hcd.c | 2769 -------------------- + drivers/usb/host/isp1362.h | 914 ------- + drivers/usb/host/ohci-hcd.c | 3 - + drivers/usb/host/uhci-hcd.c | 5 - + drivers/usb/host/xhci-dbgcap.c | 259 +- + drivers/usb/host/xhci-dbgcap.h | 39 +- + drivers/usb/host/xhci-tegra.c | 21 +- + drivers/usb/misc/onboard_usb_dev.h | 8 + + drivers/usb/phy/phy-generic.c | 74 +- + drivers/usb/phy/phy-tegra-usb.c | 300 ++- + drivers/usb/typec/Makefile | 2 +- + drivers/usb/typec/altmodes/displayport.c | 6 +- + drivers/usb/typec/altmodes/thunderbolt.c | 2 +- + drivers/usb/typec/bus.c | 25 +- + drivers/usb/typec/bus.h | 6 - + drivers/usb/typec/class.c | 136 +- + drivers/usb/typec/class.h | 3 + + drivers/usb/typec/hd3ss3220.c | 27 +- + drivers/usb/typec/mode_selection.c | 283 ++ + drivers/usb/typec/tcpm/tcpm.c | 2 +- + drivers/usb/typec/ucsi/Kconfig | 1 - + drivers/usb/typec/ucsi/cros_ec_ucsi.c | 22 + + drivers/usb/typec/ucsi/psy.c | 54 +- + drivers/usb/typec/ucsi/ucsi.c | 12 + + drivers/usb/typec/ucsi/ucsi.h | 4 + + drivers/usb/usbip/stub_tx.c | 4 +- + include/linux/usb.h | 3 +- + include/linux/usb/gadget_configfs.h | 4 +- + include/linux/usb/hcd.h | 6 - + include/linux/usb/isp1362.h | 47 - + include/linux/usb/tegra_usb_phy.h | 7 +- + include/linux/usb/typec.h | 6 + + include/linux/usb/typec_altmode.h | 50 + + rust/helpers/usb.c | 3 +- + rust/kernel/usb.rs | 21 +- + samples/rust/rust_driver_usb.rs | 10 +- + tools/usb/usbip/README | 2 - + 102 files changed, 3205 insertions(+), 4580 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/google,lga-dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/microchip,lan9691-dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/socionext,uniphier-dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/wch,ch334.yaml + create mode 100644 drivers/usb/dwc3/dwc3-google.c + delete mode 100644 drivers/usb/host/isp1362-hcd.c + delete mode 100644 drivers/usb/host/isp1362.h + create mode 100644 drivers/usb/typec/mode_selection.c + delete mode 100644 include/linux/usb/isp1362.h +$ git am -3 ../patches/0001-fix-up-for-usb-gadget-u_ether-add-gether_opts-for-co.patch +Applying: fix up for "usb: gadget: u_ether: add gether_opts for config caching" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/usb/gadget/function/u_ether_configfs.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master ccdf4415d18b5] Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git + Date: Thu Feb 5 13:34:56 2026 +0000 +Merging thunderbolt/next (062191adfde0b thunderbolt: Log path activation failures without WARN backtraces) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + Documentation/admin-guide/thunderbolt.rst | 2 +- + drivers/thunderbolt/path.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging usb-serial/usb-next (509f403f3ccec USB: serial: option: add Telit FN920C04 RNDIS compositions) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Merge made by the 'ort' strategy. + drivers/usb/serial/option.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging tty/tty-next (0a15f43b92dda Revert "tty: tty_port: add workqueue to flip TTY buffer") +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging drivers/bluetooth/hci_qca.c +Auto-merging drivers/tty/serial/8250/8250_pci.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/goldfish/tty.txt | 17 -- + Documentation/devicetree/bindings/serial/8250.yaml | 1 + + .../bindings/serial/google,goldfish-tty.yaml | 41 +++ + .../devicetree/bindings/serial/renesas,rsci.yaml | 105 ++++++- + .../devicetree/bindings/serial/renesas,scif.yaml | 16 +- + Documentation/misc-devices/oxsemi-tornado.rst | 26 +- + drivers/bluetooth/hci_aml.c | 16 +- + drivers/bluetooth/hci_qca.c | 5 +- + drivers/platform/surface/aggregator/core.c | 6 +- + drivers/tty/hvc/hvc_iucv.c | 5 +- + drivers/tty/n_hdlc.c | 2 + + drivers/tty/serdev/core.c | 21 ++ + drivers/tty/serial/8250/8250_dw.c | 23 +- + drivers/tty/serial/8250/8250_keba.c | 27 +- + drivers/tty/serial/8250/8250_men_mcb.c | 15 +- + drivers/tty/serial/8250/8250_omap.c | 43 +-- + drivers/tty/serial/8250/8250_pci.c | 85 +++--- + drivers/tty/serial/8250/Kconfig | 95 +++---- + drivers/tty/serial/Kconfig | 34 +-- + drivers/tty/serial/men_z135_uart.c | 1 - + drivers/tty/serial/rsci.c | 309 ++++++++++++++++++--- + drivers/tty/serial/rsci.h | 3 +- + drivers/tty/serial/sh-sci-common.h | 10 +- + drivers/tty/serial/sh-sci.c | 80 +++--- + drivers/tty/vt/keyboard.c | 233 ++++++++-------- + include/linux/serdev.h | 1 + + 26 files changed, 801 insertions(+), 419 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/goldfish/tty.txt + create mode 100644 Documentation/devicetree/bindings/serial/google,goldfish-tty.yaml +Merging char-misc/char-misc-next (4df29fb5bcebe rust_binder: return p from rust_binder_transaction_target_node()) +$ git merge -m Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging Documentation/admin-guide/devices.txt +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging MAINTAINERS +Auto-merging drivers/android/binder.c +Auto-merging drivers/android/binder/rust_binder_main.rs +Auto-merging drivers/android/binder/thread.rs +Auto-merging drivers/android/binder/transaction.rs +Auto-merging drivers/android/binder_alloc.c +Auto-merging drivers/bus/fsl-mc/fsl-mc-bus.c +Auto-merging drivers/misc/kgdbts.c +Auto-merging drivers/net/wireless/ath/ath12k/mhi.c +CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/mhi.c +Auto-merging drivers/spi/spi-fsi.c +Auto-merging include/linux/platform_data/cros_ec_commands.h +Auto-merging include/linux/units.h +Auto-merging samples/rust/rust_misc_device.rs +Resolved 'drivers/net/wireless/ath/ath12k/mhi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 607b5208e5b00] Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-driver-speakup | 3 +- + .../sysfs-bus-coresight-devices-dummy-source | 4 +- + .../ABI/testing/sysfs-bus-coresight-devices-tpda | 69 + + .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 56 +- + Documentation/ABI/testing/sysfs-bus-iio-cros-ec | 9 +- + Documentation/ABI/testing/sysfs-class-spi-eeprom | 11 + + Documentation/admin-guide/devices.txt | 2 +- + .../bindings/arm/arm,coresight-dummy-sink.yaml | 2 +- + .../bindings/arm/arm,coresight-dummy-source.yaml | 2 +- + .../bindings/arm/qcom,coresight-ctcu.yaml | 15 +- + .../bindings/arm/qcom,coresight-itnoc.yaml | 90 ++ + .../bindings/arm/qcom,coresight-remote-etm.yaml | 4 +- + .../bindings/arm/qcom,coresight-tnoc.yaml | 2 +- + .../bindings/arm/qcom,coresight-tpda.yaml | 4 +- + .../bindings/arm/qcom,coresight-tpdm.yaml | 4 +- + .../devicetree/bindings/goldfish/pipe.txt | 17 - + .../devicetree/bindings/iio/adc/adi,ad4062.yaml | 120 ++ + .../devicetree/bindings/iio/adc/adi,ad4134.yaml | 191 +++ + .../devicetree/bindings/iio/adc/adi,ad7768-1.yaml | 64 +- + .../devicetree/bindings/iio/adc/adi,ad9467.yaml | 2 + + .../bindings/iio/adc/aspeed,ast2600-adc.yaml | 3 + + .../bindings/iio/adc/nxp,s32g2-sar-adc.yaml | 63 + + .../devicetree/bindings/iio/adc/ti,ads1018.yaml | 82 + + .../devicetree/bindings/iio/adc/ti,ads131m02.yaml | 208 +++ + .../bindings/iio/amplifiers/adi,adl8113.yaml | 87 ++ + .../devicetree/bindings/iio/dac/adi,max22007.yaml | 120 ++ + .../bindings/iio/dac/microchip,mcp47feb02.yaml | 302 ++++ + .../bindings/iio/frequency/adi,adf4377.yaml | 8 + + .../bindings/iio/pressure/honeywell,abp2030pa.yaml | 132 ++ + .../bindings/iio/proximity/rfdigital,rfd77402.yaml | 53 + + .../bindings/interconnect/mediatek,mt8183-emi.yaml | 1 + + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 1 + + .../bindings/interconnect/qcom,qcs615-rpmh.yaml | 2 - + .../bindings/misc/google,android-pipe.yaml | 38 + + .../devicetree/bindings/misc/qcom,fastrpc.yaml | 4 +- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 1 + + .../bindings/spmi/mediatek,mt8196-spmi.yaml | 138 ++ + .../bindings/spmi/mtk,spmi-mtk-pmif.yaml | 1 + + .../bindings/spmi/qcom,glymur-spmi-pmic-arb.yaml | 150 ++ + .../bindings/spmi/qcom,spmi-pmic-arb-common.yaml | 35 + + .../bindings/spmi/qcom,spmi-pmic-arb.yaml | 17 +- + .../bindings/spmi/qcom,x1e80100-spmi-pmic-arb.yaml | 21 +- + .../devicetree/bindings/trivial-devices.yaml | 4 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/iio/ad4062.rst | 148 ++ + Documentation/iio/index.rst | 1 + + Documentation/trace/coresight/coresight.rst | 16 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 56 +- + drivers/accel/qaic/mhi_controller.c | 44 - + drivers/android/binder.c | 2 +- + drivers/android/binder/context.rs | 86 +- + drivers/android/binder/node.rs | 8 + + drivers/android/binder/process.rs | 14 +- + drivers/android/binder/rust_binder.h | 79 + + drivers/android/binder/rust_binder_events.h | 30 + + drivers/android/binder/rust_binder_main.rs | 12 +- + drivers/android/binder/thread.rs | 4 +- + drivers/android/binder/trace.rs | 21 + + drivers/android/binder/transaction.rs | 14 + + drivers/android/binder_alloc.c | 6 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 3 +- + drivers/bus/mhi/ep/main.c | 12 +- + drivers/bus/mhi/host/boot.c | 10 + + drivers/bus/mhi/host/init.c | 22 +- + drivers/bus/mhi/host/internal.h | 3 - + drivers/bus/mhi/host/main.c | 81 +- + drivers/bus/mhi/host/pci_generic.c | 20 +- + drivers/char/Kconfig | 26 - + drivers/char/Makefile | 1 - + drivers/char/misc_minor_kunit.c | 2 +- + drivers/char/mwave/3780i.c | 536 ------- + drivers/char/mwave/3780i.h | 358 ----- + drivers/char/mwave/Makefile | 10 - + drivers/char/mwave/README | 37 - + drivers/char/mwave/mwavedd.c | 432 ------ + drivers/char/mwave/mwavedd.h | 90 -- + drivers/char/mwave/mwavepub.h | 89 -- + drivers/char/mwave/smapi.c | 404 ----- + drivers/char/mwave/smapi.h | 76 - + drivers/char/mwave/tp3780i.c | 477 ------ + drivers/char/mwave/tp3780i.h | 103 -- + drivers/char/xilinx_hwicap/fifo_icap.c | 27 +- + drivers/comedi/comedi_fops.c | 81 +- + drivers/comedi/drivers/comedi_test.c | 50 +- + drivers/fpga/dfl.c | 2 +- + drivers/fpga/dfl.h | 2 +- + drivers/fpga/of-fpga-region.c | 8 +- + drivers/fpga/xilinx-pr-decoupler.c | 2 +- + drivers/fpga/zynq-fpga.c | 2 +- + drivers/fsi/fsi-core.c | 107 +- + drivers/fsi/fsi-master-hub.c | 17 +- + drivers/fsi/fsi-sbefifo.c | 31 +- + drivers/fsi/fsi-scom.c | 30 +- + drivers/fsi/i2cr-scom.c | 15 +- + drivers/gpib/agilent_82350b/agilent_82350b.c | 5 +- + drivers/gpib/agilent_82357a/agilent_82357a.c | 2 +- + drivers/gpib/cb7210/cb7210.c | 9 +- + drivers/gpib/cec/cec_gpib.c | 11 +- + drivers/gpib/common/iblib.c | 5 +- + drivers/gpib/eastwood/fluke_gpib.c | 5 +- + drivers/gpib/fmh_gpib/fmh_gpib.c | 5 +- + drivers/gpib/gpio/gpib_bitbang.c | 9 +- + drivers/gpib/hp_82335/hp82335.c | 7 +- + drivers/gpib/hp_82341/hp_82341.c | 5 +- + drivers/gpib/ines/ines_gpib.c | 11 +- + drivers/gpib/ni_usb/ni_usb_gpib.c | 19 +- + drivers/gpib/pc2/pc2_gpib.c | 11 +- + drivers/gpib/tnt4882/tnt4882_gpib.c | 20 +- + drivers/greybus/core.c | 22 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 70 +- + drivers/hwtracing/coresight/coresight-etm-perf.h | 38 + + drivers/hwtracing/coresight/coresight-etm3x-core.c | 51 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 175 ++- + drivers/hwtracing/coresight/coresight-etm4x.h | 92 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 43 +- + drivers/hwtracing/coresight/coresight-tmc.h | 2 + + drivers/hwtracing/coresight/coresight-tnoc.c | 136 +- + drivers/hwtracing/coresight/coresight-tpda.c | 284 +++- + drivers/hwtracing/coresight/coresight-tpda.h | 76 +- + drivers/hwtracing/intel_th/pci.c | 269 +--- + drivers/hwtracing/intel_th/pci_ids.h | 60 + + drivers/hwtracing/stm/Kconfig | 4 +- + drivers/i2c/busses/i2c-fsi.c | 16 +- + drivers/iio/accel/Kconfig | 10 +- + drivers/iio/accel/adxl355_core.c | 5 +- + drivers/iio/accel/adxl372.c | 10 +- + drivers/iio/accel/adxl380.c | 138 +- + drivers/iio/accel/adxl380.h | 10 +- + drivers/iio/accel/bma180.c | 5 +- + drivers/iio/accel/mxc4005.c | 11 +- + drivers/iio/accel/sca3000.c | 8 +- + drivers/iio/accel/stk8ba50.c | 11 +- + drivers/iio/adc/Kconfig | 60 + + drivers/iio/adc/Makefile | 5 + + drivers/iio/adc/ad4062.c | 1609 ++++++++++++++++++++ + drivers/iio/adc/ad4134.c | 500 ++++++ + drivers/iio/adc/ad4170-4.c | 2 +- + drivers/iio/adc/ad7476.c | 1 - + drivers/iio/adc/ad7606_spi.c | 2 +- + drivers/iio/adc/ad7766.c | 10 +- + drivers/iio/adc/ad7768-1.c | 430 +++++- + drivers/iio/adc/ad7779.c | 2 +- + drivers/iio/adc/ad9467.c | 152 +- + drivers/iio/adc/ade9000.c | 2 +- + drivers/iio/adc/adi-axi-adc.c | 62 +- + drivers/iio/adc/aspeed_adc.c | 49 +- + drivers/iio/adc/exynos_adc.c | 57 +- + drivers/iio/adc/mcp3911.c | 2 +- + drivers/iio/adc/men_z188_adc.c | 1 - + drivers/iio/adc/nxp-sar-adc.c | 1016 ++++++++++++ + drivers/iio/adc/qcom-spmi-rradc.c | 20 +- + drivers/iio/adc/rockchip_saradc.c | 59 +- + drivers/iio/adc/sc27xx_adc.c | 49 +- + drivers/iio/adc/ti-ads1018.c | 739 +++++++++ + drivers/iio/adc/ti-ads131e08.c | 2 +- + drivers/iio/adc/ti-ads131m02.c | 968 ++++++++++++ + drivers/iio/amplifiers/Kconfig | 12 + + drivers/iio/amplifiers/Makefile | 1 + + drivers/iio/amplifiers/adl8113.c | 269 ++++ + drivers/iio/buffer/industrialio-buffer-dma.c | 188 +-- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 23 +- + drivers/iio/chemical/ens160_core.c | 9 +- + drivers/iio/chemical/scd4x.c | 3 + + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 11 +- + drivers/iio/dac/Kconfig | 33 + + drivers/iio/dac/Makefile | 2 + + drivers/iio/dac/adi-axi-dac.c | 66 +- + drivers/iio/dac/ds4424.c | 1 - + drivers/iio/dac/max22007.c | 491 ++++++ + drivers/iio/dac/mcp47feb02.c | 1250 +++++++++++++++ + drivers/iio/frequency/adf4377.c | 122 +- + drivers/iio/gyro/adxrs290.c | 2 +- + drivers/iio/gyro/itg3200_buffer.c | 8 +- + drivers/iio/gyro/itg3200_core.c | 2 + + drivers/iio/gyro/mpu3050-core.c | 6 +- + drivers/iio/health/afe4403.c | 9 +- + drivers/iio/health/afe4404.c | 9 +- + drivers/iio/health/max30100.c | 8 +- + drivers/iio/health/max30102.c | 33 +- + drivers/iio/imu/bmi270/bmi270_i2c.c | 3 + + drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c | 3 - + drivers/iio/imu/smi330/smi330_core.c | 9 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 55 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 555 ++++--- + drivers/iio/industrialio-core.c | 86 +- + drivers/iio/industrialio-sw-device.c | 2 +- + drivers/iio/industrialio-sw-trigger.c | 2 +- + drivers/iio/light/isl29018.c | 12 +- + drivers/iio/light/opt4060.c | 52 +- + drivers/iio/light/si1145.c | 2 +- + drivers/iio/light/vcnl4000.c | 49 +- + drivers/iio/magnetometer/Kconfig | 13 + + drivers/iio/magnetometer/Makefile | 1 + + drivers/iio/magnetometer/ak8975.c | 2 +- + drivers/iio/magnetometer/bmc150_magn.c | 9 +- + drivers/iio/magnetometer/mmc5633.c | 586 +++++++ + drivers/iio/pressure/Kconfig | 63 +- + drivers/iio/pressure/Makefile | 3 + + drivers/iio/pressure/abp2030pa.c | 544 +++++++ + drivers/iio/pressure/abp2030pa.h | 73 + + drivers/iio/pressure/abp2030pa_i2c.c | 90 ++ + drivers/iio/pressure/abp2030pa_spi.c | 67 + + drivers/iio/pressure/dlhl60d.c | 7 +- + drivers/iio/pressure/mprls0025pa.c | 117 +- + drivers/iio/pressure/mprls0025pa.h | 15 +- + drivers/iio/pressure/mprls0025pa_i2c.c | 13 +- + drivers/iio/pressure/mprls0025pa_spi.c | 41 +- + drivers/iio/proximity/rfd77402.c | 185 ++- + drivers/iio/temperature/tmp006.c | 10 +- + drivers/iio/test/Kconfig | 1 - + drivers/interconnect/Kconfig | 14 + + drivers/interconnect/Makefile | 2 + + drivers/interconnect/icc-kunit.c | 324 ++++ + drivers/interconnect/mediatek/Kconfig | 7 + + drivers/interconnect/mediatek/Makefile | 1 + + drivers/interconnect/mediatek/icc-emi.c | 9 +- + drivers/interconnect/mediatek/mt8196.c | 383 +++++ + drivers/interconnect/qcom/msm8974.c | 3 - + drivers/interconnect/qcom/qcs8300.c | 2 +- + drivers/interconnect/qcom/smd-rpm.c | 1 - + drivers/mcb/mcb-core.c | 9 +- + drivers/misc/bcm-vk/bcm_vk_msg.c | 12 +- + drivers/misc/eeprom/at25.c | 88 +- + drivers/misc/eeprom/eeprom_93xx46.c | 11 +- + drivers/misc/fastrpc.c | 142 +- + drivers/misc/kgdbts.c | 2 +- + drivers/misc/mei/Kconfig | 6 +- + drivers/misc/mei/gsc_proxy/Kconfig | 2 +- + drivers/misc/mei/hdcp/Kconfig | 2 +- + drivers/misc/mei/pxp/Kconfig | 2 +- + drivers/misc/ti_fpc202.c | 3 +- + drivers/most/core.c | 15 +- + drivers/net/wireless/ath/ath11k/mhi.c | 4 - + drivers/nvmem/Kconfig | 2 +- + drivers/nvmem/core.c | 7 +- + drivers/pps/generators/Kconfig | 8 - + drivers/pps/generators/Makefile | 1 - + drivers/pps/generators/pps_gen_parport.c | 238 --- + drivers/slimbus/qcom-ngd-ctrl.c | 10 +- + drivers/spi/spi-fsi.c | 7 +- + drivers/spmi/spmi-apple-controller.c | 1 + + drivers/spmi/spmi-mtk-pmif.c | 490 ++++-- + drivers/spmi/spmi-pmic-arb.c | 306 +++- + drivers/staging/iio/addac/adt7316-i2c.c | 2 +- + drivers/staging/iio/addac/adt7316-spi.c | 2 +- + drivers/staging/iio/addac/adt7316.c | 6 +- + drivers/staging/iio/addac/adt7316.h | 6 +- + drivers/staging/iio/frequency/ad9832.c | 37 - + drivers/staging/iio/frequency/ad9832.h | 33 - + include/dt-bindings/interconnect/mediatek,mt8196.h | 48 + + include/linux/comedi/comedi_8254.h | 6 +- + include/linux/coresight-pmu.h | 24 - + include/linux/eeprom_93cx6.h | 8 +- + include/linux/fsi.h | 13 +- + include/linux/iio/buffer-dma.h | 20 +- + include/linux/iio/buffer_impl.h | 8 +- + include/linux/iio/frequency/ad9523.h | 2 +- + include/linux/iio/iio.h | 139 +- + include/linux/mhi.h | 14 - + include/linux/miscdevice.h | 1 - + include/linux/platform_data/cros_ec_commands.h | 12 +- + include/linux/units.h | 19 + + include/uapi/linux/android/binder.h | 2 +- + lib/kunit/assert.c | 12 +- + lib/tests/test_list_sort.c | 4 +- + net/qrtr/mhi.c | 69 +- + rust/bindings/lib.rs | 13 + + rust/helpers/binder.c | 13 +- + rust/kernel/miscdevice.rs | 10 +- + rust/kernel/sync/arc.rs | 3 + + samples/rust/rust_misc_device.rs | 3 +- + 272 files changed, 15801 insertions(+), 5391 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-tpda + create mode 100644 Documentation/devicetree/bindings/arm/qcom,coresight-itnoc.yaml + delete mode 100644 Documentation/devicetree/bindings/goldfish/pipe.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad4062.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad4134.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/nxp,s32g2-sar-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads1018.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads131m02.yaml + create mode 100644 Documentation/devicetree/bindings/iio/amplifiers/adi,adl8113.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,max22007.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/microchip,mcp47feb02.yaml + create mode 100644 Documentation/devicetree/bindings/iio/pressure/honeywell,abp2030pa.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/rfdigital,rfd77402.yaml + create mode 100644 Documentation/devicetree/bindings/misc/google,android-pipe.yaml + create mode 100644 Documentation/devicetree/bindings/spmi/mediatek,mt8196-spmi.yaml + create mode 100644 Documentation/devicetree/bindings/spmi/qcom,glymur-spmi-pmic-arb.yaml + create mode 100644 Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb-common.yaml + create mode 100644 Documentation/iio/ad4062.rst + delete mode 100644 drivers/char/mwave/3780i.c + delete mode 100644 drivers/char/mwave/3780i.h + delete mode 100644 drivers/char/mwave/Makefile + delete mode 100644 drivers/char/mwave/README + delete mode 100644 drivers/char/mwave/mwavedd.c + delete mode 100644 drivers/char/mwave/mwavedd.h + delete mode 100644 drivers/char/mwave/mwavepub.h + delete mode 100644 drivers/char/mwave/smapi.c + delete mode 100644 drivers/char/mwave/smapi.h + delete mode 100644 drivers/char/mwave/tp3780i.c + delete mode 100644 drivers/char/mwave/tp3780i.h + create mode 100644 drivers/hwtracing/intel_th/pci_ids.h + create mode 100644 drivers/iio/adc/ad4062.c + create mode 100644 drivers/iio/adc/ad4134.c + create mode 100644 drivers/iio/adc/nxp-sar-adc.c + create mode 100644 drivers/iio/adc/ti-ads1018.c + create mode 100644 drivers/iio/adc/ti-ads131m02.c + create mode 100644 drivers/iio/amplifiers/adl8113.c + create mode 100644 drivers/iio/dac/max22007.c + create mode 100644 drivers/iio/dac/mcp47feb02.c + create mode 100644 drivers/iio/magnetometer/mmc5633.c + create mode 100644 drivers/iio/pressure/abp2030pa.c + create mode 100644 drivers/iio/pressure/abp2030pa.h + create mode 100644 drivers/iio/pressure/abp2030pa_i2c.c + create mode 100644 drivers/iio/pressure/abp2030pa_spi.c + create mode 100644 drivers/interconnect/icc-kunit.c + create mode 100644 drivers/interconnect/mediatek/mt8196.c + delete mode 100644 drivers/pps/generators/pps_gen_parport.c + delete mode 100644 drivers/staging/iio/frequency/ad9832.h + create mode 100644 include/dt-bindings/interconnect/mediatek,mt8196.h +$ git am -3 ../patches/0001-bus-mhi-Fix-up-interaction-with-net-next-tree.patch +Applying: bus: mhi: Fix up interaction with net-next tree +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/wireless/ath/ath12k/wifi7/mhi.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 068e712fd94f6] Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git + Date: Thu Feb 5 13:35:07 2026 +0000 +Merging coresight/next (eebe8dbd8630f coresight: tmc: Decouple the perf buffer allocation from sysfs mode) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fastrpc/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (ae801944cbfb7 fpga: dfl: fix typo in header file) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (0e841d1d56137 interconnect: qcom: msm8974: drop duplicated RPM_BUS_{MASTER,SLAVE}_REQ defines) +$ git merge -m Merge branch 'icc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (3674f3ca92730 iio: magn: mmc5633: Fix Kconfig for combination of I3C as module and driver builtin) +$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Merge made by the 'ort' strategy. +Merging phy-next/next (dbeea86fecef7 phy: ti: phy-j721e-wiz: convert from divider_round_rate() to divider_determine_rate()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/phy/freescale/phy-fsl-imx8mq-usb.c +Resolved 'Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9cbe23dbbafee] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/phy/apple,atcphy.yaml | 222 ++ + .../devicetree/bindings/phy/fsl,lynx-28g.yaml | 71 +- + .../bindings/phy/google,lga-usb-phy.yaml | 133 ++ + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 30 +- + .../bindings/phy/qcom,m31-eusb2-phy.yaml | 10 +- + .../bindings/phy/qcom,qcs615-qmp-usb3dp-phy.yaml | 111 + + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 6 + + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 6 + + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 18 + + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 70 +- + .../bindings/phy/qcom,snps-eusb2-repeater.yaml | 9 + + .../bindings/phy/renesas,rzg3e-usb3-phy.yaml | 9 +- + .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 15 +- + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 3 + + .../bindings/phy/samsung,usb3-drd-phy.yaml | 51 + + .../bindings/phy/spacemit,k1-combo-phy.yaml | 114 + + .../bindings/phy/spacemit,k1-pcie-phy.yaml | 71 + + .../devicetree/bindings/phy/spacemit,usb2-phy.yaml | 40 + + .../bindings/phy/ti,control-phy-otghs.yaml | 99 + + .../devicetree/bindings/phy/ti,phy-usb3.yaml | 138 ++ + .../devicetree/bindings/phy/ti,tcan104x-can.yaml | 3 + + Documentation/devicetree/bindings/phy/ti-phy.txt | 98 - + MAINTAINERS | 4 + + drivers/Makefile | 2 +- + drivers/phy/Kconfig | 25 + + drivers/phy/Makefile | 6 +- + drivers/phy/allwinner/phy-sun4i-usb.c | 14 +- + drivers/phy/apple/Kconfig | 13 + + drivers/phy/apple/Makefile | 4 + + drivers/phy/apple/atc.c | 2295 ++++++++++++++++++++ + drivers/phy/cadence/phy-cadence-torrent.c | 166 +- + drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 25 +- + drivers/phy/freescale/phy-fsl-imx8qm-hsio.c | 2 +- + drivers/phy/freescale/phy-fsl-imx8qm-lvds-phy.c | 6 +- + drivers/phy/freescale/phy-fsl-lynx-28g.c | 1146 +++++++--- + drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 13 +- + drivers/phy/marvell/phy-mvebu-cp110-utmi.c | 2 +- + drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c | 8 +- + drivers/phy/mediatek/phy-mtk-hdmi-mt8173.c | 16 +- + drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c | 10 +- + drivers/phy/mediatek/phy-mtk-mipi-dsi-mt8173.c | 10 +- + drivers/phy/mediatek/phy-mtk-mipi-dsi-mt8183.c | 10 +- + drivers/phy/mediatek/phy-mtk-xfi-tphy.c | 2 +- + drivers/phy/phy-core.c | 15 +- + drivers/phy/phy-google-usb.c | 296 +++ + drivers/phy/phy-spacemit-k1-pcie.c | 670 ++++++ + drivers/phy/qualcomm/phy-qcom-edp.c | 246 ++- + drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 40 + + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 683 +++++- + drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v2.h | 21 + + drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v8.h | 25 + + .../phy/qualcomm/phy-qcom-qmp-dp-qserdes-com-v8.h | 52 + + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 213 ++ + drivers/phy/qualcomm/phy-qcom-qmp-pcs-aon-v6.h | 12 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-aon-v8.h | 17 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-misc-v5.h | 12 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-misc-v8.h | 12 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v8.h | 34 + + drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v2.h | 106 + + drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v8.h | 11 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-dp-com-v8.h | 52 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-lalb-v8.h | 639 ++++++ + .../qualcomm/phy-qcom-qmp-qserdes-txrx-pcie-v8.h | 71 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v2.h | 68 + + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 96 + + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 190 +- + drivers/phy/qualcomm/phy-qcom-qmp-usb43-pcs-v8.h | 33 + + .../qualcomm/phy-qcom-qmp-usb43-qserdes-com-v8.h | 224 ++ + drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 1071 ++++++++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 5 + + drivers/phy/renesas/Kconfig | 2 + + drivers/phy/renesas/phy-rcar-gen2.c | 6 +- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 261 ++- + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 30 +- + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 12 +- + drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c | 4 +- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 758 +++++-- + drivers/phy/rockchip/phy-rockchip-usb.c | 7 +- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 651 ++++++ + drivers/phy/socionext/phy-uniphier-usb2.c | 28 +- + drivers/phy/spacemit/Kconfig | 13 + + drivers/phy/spacemit/Makefile | 2 + + drivers/phy/spacemit/phy-k1-usb2.c | 200 ++ + drivers/phy/tegra/xusb.h | 1 - + drivers/phy/ti/phy-j721e-wiz.c | 27 +- + drivers/soc/apple/Kconfig | 4 + + drivers/soc/apple/Makefile | 3 + + drivers/soc/apple/tunable.c | 80 + + include/dt-bindings/phy/phy.h | 1 + + include/linux/phy/phy-hdmi.h | 19 +- + include/linux/phy/phy.h | 7 +- + include/linux/soc/apple/tunable.h | 62 + + include/linux/soc/samsung/exynos-regs-pmu.h | 3 + + 93 files changed, 11325 insertions(+), 876 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/apple,atcphy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/google,lga-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,qcs615-qmp-usb3dp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/spacemit,k1-combo-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/spacemit,k1-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/spacemit,usb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/ti,control-phy-otghs.yaml + create mode 100644 Documentation/devicetree/bindings/phy/ti,phy-usb3.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/ti-phy.txt + create mode 100644 drivers/phy/apple/Kconfig + create mode 100644 drivers/phy/apple/Makefile + create mode 100644 drivers/phy/apple/atc.c + create mode 100644 drivers/phy/phy-google-usb.c + create mode 100644 drivers/phy/phy-spacemit-k1-pcie.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v2.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-qserdes-com-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-aon-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-aon-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-misc-v5.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-misc-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v2.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-dp-com-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-lalb-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-pcie-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v2.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-usb43-pcs-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-usb43-qserdes-com-v8.h + create mode 100644 drivers/phy/spacemit/Kconfig + create mode 100644 drivers/phy/spacemit/Makefile + create mode 100644 drivers/phy/spacemit/phy-k1-usb2.c + create mode 100644 drivers/soc/apple/tunable.c + create mode 100644 include/linux/soc/apple/tunable.h +Merging soundwire/next (dc3a6a942e9ee soundwire: intel_ace2x: add SND_HDA_CORE dependency) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging drivers/soundwire/bus_type.c +Auto-merging sound/soc/codecs/rt1320-sdw.c +Auto-merging sound/soc/codecs/tas2783-sdw.c +Auto-merging sound/soc/codecs/wcd939x-sdw.c +CONFLICT (content): Merge conflict in sound/soc/codecs/wcd939x-sdw.c +Resolved 'sound/soc/codecs/wcd939x-sdw.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 226615f487d02] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/soundwire/qcom,soundwire.yaml | 1 + + drivers/soundwire/Kconfig | 1 + + drivers/soundwire/bus_type.c | 31 ++++++++++------------ + drivers/soundwire/dmi-quirks.c | 11 ++++++++ + drivers/soundwire/intel_auxdevice.c | 1 + + drivers/soundwire/qcom.c | 12 ++++----- + include/linux/soundwire/sdw.h | 2 +- + sound/soc/codecs/cs35l56-sdw.c | 4 +-- + sound/soc/codecs/cs42l42-sdw.c | 4 +-- + sound/soc/codecs/max98373-sdw.c | 4 +-- + sound/soc/codecs/pm4125-sdw.c | 4 +-- + sound/soc/codecs/rt1017-sdca-sdw.c | 4 +-- + sound/soc/codecs/rt1308-sdw.c | 4 +-- + sound/soc/codecs/rt1316-sdw.c | 4 +-- + sound/soc/codecs/rt1318-sdw.c | 4 +-- + sound/soc/codecs/rt1320-sdw.c | 4 +-- + sound/soc/codecs/rt5682-sdw.c | 4 +-- + sound/soc/codecs/rt700-sdw.c | 4 +-- + sound/soc/codecs/rt711-sdca-sdw.c | 4 +-- + sound/soc/codecs/rt711-sdw.c | 4 +-- + sound/soc/codecs/rt712-sdca-dmic.c | 4 +-- + sound/soc/codecs/rt712-sdca-sdw.c | 4 +-- + sound/soc/codecs/rt715-sdca-sdw.c | 4 +-- + sound/soc/codecs/rt715-sdw.c | 4 +-- + sound/soc/codecs/rt721-sdca-sdw.c | 4 +-- + sound/soc/codecs/rt722-sdca-sdw.c | 4 +-- + sound/soc/codecs/tas2783-sdw.c | 4 +-- + sound/soc/codecs/wcd937x-sdw.c | 4 +-- + sound/soc/codecs/wcd938x-sdw.c | 4 +-- + sound/soc/codecs/wcd939x-sdw.c | 4 +-- + 30 files changed, 57 insertions(+), 94 deletions(-) +Merging extcon/extcon-next (cc59e9ce5c15e extcon: usbc-tusb320: Make typec-power-opmode optional) +$ git merge -m Merge branch 'extcon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/extcon/extcon-ptn5150.yaml | 3 ++ + drivers/extcon/Kconfig | 1 + + drivers/extcon/extcon-intel-int3496.c | 4 +- + drivers/extcon/extcon-ptn5150.c | 56 ++++++++++++++++++++++ + drivers/extcon/extcon-usbc-tusb320.c | 24 +++++----- + drivers/extcon/extcon.c | 4 +- + 6 files changed, 75 insertions(+), 17 deletions(-) +Merging gnss/gnss-next (0f61b1860cc3f Linux 6.19-rc5) +$ git merge -m Merge branch 'gnss-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (c3cbc276c2a33 hisi_acc_vfio_pci: fix the queue parameter anomaly issue) +$ git merge -m Merge branch 'next' of https://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging drivers/iommu/iommufd/pages.c +Auto-merging drivers/vfio/pci/vfio_pci_dmabuf.c +Auto-merging include/linux/dma-buf.h +Merge made by the 'ort' strategy. + drivers/dma-buf/dma-buf-mapping.c | 6 +- + drivers/iommu/iommufd/io_pagetable.h | 2 +- + drivers/iommu/iommufd/iommufd_private.h | 5 +- + drivers/iommu/iommufd/pages.c | 4 +- + drivers/iommu/iommufd/selftest.c | 2 +- + drivers/vfio/mdev/mdev_sysfs.c | 2 +- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 30 ++++- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 2 + + drivers/vfio/pci/nvgrace-gpu/main.c | 115 ++++++++++++++++- + drivers/vfio/pci/vfio_pci_core.c | 17 ++- + drivers/vfio/pci/vfio_pci_dmabuf.c | 8 +- + include/linux/dma-buf-mapping.h | 2 +- + include/linux/dma-buf.h | 10 -- + include/linux/memory-failure.h | 13 +- + include/linux/vfio_pci_core.h | 13 +- + tools/testing/selftests/vfio/Makefile | 1 + + tools/testing/selftests/vfio/lib/include/libvfio.h | 9 ++ + .../selftests/vfio/lib/include/libvfio/iommu.h | 6 + + tools/testing/selftests/vfio/lib/iommu.c | 12 +- + tools/testing/selftests/vfio/lib/libvfio.c | 25 ++++ + tools/testing/selftests/vfio/lib/vfio_pci_device.c | 24 +++- + .../selftests/vfio/vfio_dma_mapping_mmio_test.c | 143 +++++++++++++++++++++ + .../testing/selftests/vfio/vfio_dma_mapping_test.c | 8 +- + 23 files changed, 399 insertions(+), 60 deletions(-) + create mode 100644 tools/testing/selftests/vfio/vfio_dma_mapping_mmio_test.c +Merging w1/for-next (cc8f92e41eb76 w1: fix redundant counter decrement in w1_attach_slave_device()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging spmi/spmi-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'spmi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (1d264b88aea94 staging: rtl8723bs: remove unused variable RFE_Type) +$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/staging/rtl8723bs/core/rtw_ieee80211.c +Auto-merging drivers/staging/rtl8723bs/core/rtw_security.c +Merge made by the 'ort' strategy. + drivers/staging/axis-fifo/axis-fifo.c | 290 ++++++-------------- + drivers/staging/greybus/TODO | 5 - + drivers/staging/greybus/arche-apb-ctrl.c | 13 +- + drivers/staging/greybus/arche-platform.c | 27 +- + drivers/staging/greybus/gb-camera.h | 9 +- + drivers/staging/greybus/light.c | 8 +- + drivers/staging/greybus/sdio.c | 2 +- + drivers/staging/most/dim2/dim2.c | 12 +- + drivers/staging/nvec/nvec.c | 4 +- + drivers/staging/rtl8723bs/Kconfig | 2 +- + drivers/staging/rtl8723bs/core/rtw_ap.c | 36 +-- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 59 ++-- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 120 ++++----- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 315 +++++++++++----------- + drivers/staging/rtl8723bs/core/rtw_recv.c | 5 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 149 +++++----- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 96 ++++--- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 68 ++--- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.h | 21 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 26 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 27 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 14 +- + drivers/staging/rtl8723bs/hal/hal_intf.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 17 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 6 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 31 +-- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 +- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 1 + + drivers/staging/rtl8723bs/include/drv_types.h | 12 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 1 - + drivers/staging/rtl8723bs/include/osdep_service.h | 4 - + drivers/staging/rtl8723bs/include/rtw_ap.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 21 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 10 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 3 +- + drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 28 +- + drivers/staging/sm750fb/TODO | 2 - + drivers/staging/sm750fb/ddk750_chip.c | 2 +- + drivers/staging/sm750fb/sm750.c | 16 +- + drivers/staging/sm750fb/sm750.h | 2 +- + drivers/staging/sm750fb/sm750_hw.c | 4 +- + drivers/staging/vme_user/vme.c | 2 +- + drivers/staging/vme_user/vme.h | 97 +++---- + drivers/staging/vme_user/vme_bridge.h | 10 +- + drivers/staging/vme_user/vme_user.c | 2 +- + 49 files changed, 724 insertions(+), 880 deletions(-) +Merging counter-next/counter-next (ad415677b7e3b MAINTAINERS: Update Intel Quadrature Encoder Peripheral maintainer) +$ git merge -m Merge branch 'counter-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (59b723cd2adba Linux 6.12-rc6) +$ 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 (ab736ed52e340 dmaengine: add Frank Li as reviewer) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Auto-merging drivers/dma/sh/rz-dmac.c +Auto-merging drivers/dma/xilinx/xdma.c +Auto-merging drivers/dma/xilinx/xilinx_dma.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 15 ++ + .../devicetree/bindings/dma/arm-pl08x.yaml | 2 +- + .../devicetree/bindings/dma/atmel,sama5d4-dma.yaml | 4 +- + .../devicetree/bindings/dma/mediatek,uart-dma.yaml | 20 ++ + .../devicetree/bindings/dma/qcom,gpi.yaml | 4 +- + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 1 + + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 14 +- + Documentation/driver-api/dmaengine/provider.rst | 5 +- + MAINTAINERS | 1 + + drivers/dma/Kconfig | 2 +- + drivers/dma/altera-msgdma.c | 6 +- + drivers/dma/amba-pl08x.c | 4 +- + drivers/dma/at_xdmac.c | 37 +-- + drivers/dma/bcm2835-dma.c | 19 +- + drivers/dma/dma-axi-dmac.c | 53 ++-- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 6 +- + drivers/dma/dw-edma/dw-edma-pcie.c | 4 +- + drivers/dma/fsl-edma-main.c | 1 - + drivers/dma/idxd/device.c | 5 + + drivers/dma/idxd/idxd.h | 19 ++ + drivers/dma/idxd/init.c | 11 + + drivers/dma/idxd/registers.h | 28 ++- + drivers/dma/idxd/sysfs.c | 24 ++ + drivers/dma/k3dma.c | 9 +- + drivers/dma/lgm/lgm-dma.c | 9 +- + drivers/dma/mediatek/mtk-uart-apdma.c | 35 +-- + drivers/dma/pl330.c | 8 +- + drivers/dma/pxa_dma.c | 5 +- + drivers/dma/qcom/bam_dma.c | 161 ++++++------ + drivers/dma/qcom/qcom_adm.c | 9 +- + drivers/dma/sa11x0-dma.c | 6 +- + drivers/dma/sh/rz-dmac.c | 15 +- + drivers/dma/sh/shdma-base.c | 7 +- + drivers/dma/st_fdma.c | 2 +- + drivers/dma/st_fdma.h | 2 +- + drivers/dma/ste_dma40.c | 14 +- + drivers/dma/stm32/stm32-dma3.c | 165 ++++++++++--- + drivers/dma/stm32/stm32-mdma.c | 2 +- + drivers/dma/sun6i-dma.c | 36 ++- + drivers/dma/ti/Kconfig | 5 +- + drivers/dma/ti/cppi41.c | 5 - + drivers/dma/xilinx/xdma.c | 6 +- + drivers/dma/xilinx/xilinx_dma.c | 21 ++ + drivers/dma/xilinx/zynqmp_dma.c | 2 - + include/linux/dma/edma.h | 24 +- + include/linux/scatterlist.h | 2 + + include/linux/shdma-base.h | 28 +-- + include/uapi/linux/idxd.h | 270 ++++++++++----------- + lib/scatterlist.c | 26 ++ + 49 files changed, 704 insertions(+), 455 deletions(-) +Merging cgroup/for-next (cdab91959f725 Merge branch 'for-6.19-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging fs/fs-writeback.c +Auto-merging include/linux/cpuset.h +Auto-merging include/linux/memcontrol.h +Auto-merging kernel/cgroup/cpuset.c +Auto-merging mm/memcontrol.c +Auto-merging mm/page_owner.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 44 +- + fs/fs-writeback.c | 2 +- + include/linux/cgroup-defs.h | 8 +- + include/linux/cpuset.h | 2 + + include/linux/memcontrol.h | 2 +- + include/trace/events/cgroup.h | 2 +- + kernel/cgroup/cgroup-internal.h | 8 +- + kernel/cgroup/cgroup-v1.c | 12 +- + kernel/cgroup/cgroup.c | 50 +- + kernel/cgroup/cpuset-internal.h | 54 ++- + kernel/cgroup/cpuset-v1.c | 271 ++++++++++- + kernel/cgroup/cpuset.c | 503 +++++---------------- + kernel/cgroup/debug.c | 2 +- + mm/memcontrol.c | 2 +- + mm/page_owner.c | 2 +- + tools/testing/selftests/cgroup/lib/cgroup_util.c | 21 + + .../selftests/cgroup/lib/include/cgroup_util.h | 5 + + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 29 +- + tools/testing/selftests/cgroup/test_kmem.c | 33 +- + tools/testing/selftests/cgroup/test_memcontrol.c | 20 +- + 20 files changed, 595 insertions(+), 477 deletions(-) +Merging scsi/for-next (1eb218a5b49f9 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/ata/libata.h +CONFLICT (content): Merge conflict in drivers/ata/libata.h +Auto-merging drivers/base/transport_class.c +Auto-merging drivers/infiniband/ulp/srp/ib_srp.c +Auto-merging drivers/scsi/ips.c +Auto-merging drivers/scsi/libsas/sas_scsi_host.c +Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c +Auto-merging drivers/scsi/scsi_transport_fc.c +Auto-merging drivers/scsi/st.c +Auto-merging drivers/target/target_core_spc.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging include/linux/libata.h +Auto-merging include/linux/transport_class.h +Resolved 'drivers/ata/libata.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f0a3f12121685] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/ufs/qcom,sa8255p-ufshc.yaml | 56 + + Documentation/scsi/scsi_mid_low_api.rst | 3 +- + MAINTAINERS | 2 +- + drivers/ata/libata-scsi.c | 8 +- + drivers/ata/libata.h | 3 +- + drivers/base/transport_class.c | 8 + + drivers/firewire/sbp2.c | 7 +- + drivers/infiniband/ulp/srp/ib_srp.c | 3 +- + drivers/message/fusion/mptfc.c | 7 +- + drivers/message/fusion/mptsas.c | 4 +- + drivers/message/fusion/mptscsih.c | 3 +- + drivers/message/fusion/mptscsih.h | 2 +- + drivers/message/fusion/mptspi.c | 4 +- + drivers/s390/scsi/zfcp_scsi.c | 4 +- + drivers/scsi/3w-9xxx.c | 2 +- + drivers/scsi/3w-sas.c | 8 +- + drivers/scsi/3w-xxxx.c | 2 +- + drivers/scsi/53c700.c | 6 +- + drivers/scsi/BusLogic.c | 2 +- + drivers/scsi/BusLogic.h | 3 +- + drivers/scsi/NCR5380.c | 4 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/aacraid/linit.c | 4 +- + drivers/scsi/advansys.c | 5 +- + drivers/scsi/aha152x.c | 8 +- + drivers/scsi/aha1542.c | 3 +- + drivers/scsi/aha1740.c | 2 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 12 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 5 +- + drivers/scsi/arm/acornscsi.c | 2 +- + drivers/scsi/arm/fas216.c | 11 +- + drivers/scsi/arm/fas216.h | 11 +- + drivers/scsi/atp870u.c | 2 +- + drivers/scsi/bfa/bfad_im.c | 5 +- + drivers/scsi/bnx2fc/bnx2fc.h | 3 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 4 +- + drivers/scsi/ch.c | 18 +- + drivers/scsi/csiostor/csio_scsi.c | 4 +- + drivers/scsi/dc395x.c | 2 +- + drivers/scsi/esas2r/esas2r.h | 3 +- + drivers/scsi/esas2r/esas2r_main.c | 3 +- + drivers/scsi/esp_scsi.c | 2 +- + drivers/scsi/fdomain.c | 3 +- + drivers/scsi/fnic/fnic.h | 3 +- + drivers/scsi/fnic/fnic_scsi.c | 3 +- + drivers/scsi/hosts.c | 5 +- + drivers/scsi/hpsa.c | 6 +- + drivers/scsi/hptiop.c | 2 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 3 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 9 +- + drivers/scsi/imm.c | 2 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/ipr.c | 4 +- + drivers/scsi/ips.c | 4 +- + drivers/scsi/libfc/fc_fcp.c | 3 +- + drivers/scsi/libiscsi.c | 3 +- + drivers/scsi/libsas/sas_scsi_host.c | 3 +- + drivers/scsi/lpfc/lpfc_attr.c | 40 + + drivers/scsi/lpfc/lpfc_debugfs.c | 7 + + drivers/scsi/lpfc/lpfc_disc.h | 7 + + drivers/scsi/lpfc/lpfc_els.c | 57 + + drivers/scsi/lpfc/lpfc_hbadisc.c | 1 + + drivers/scsi/lpfc/lpfc_hw4.h | 11 +- + drivers/scsi/lpfc/lpfc_init.c | 5 + + drivers/scsi/lpfc/lpfc_logmsg.h | 3 +- + drivers/scsi/lpfc/lpfc_scsi.c | 8 +- + drivers/scsi/lpfc/lpfc_sli.c | 62 +- + drivers/scsi/lpfc/lpfc_sli4.h | 4 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mac53c94.c | 2 +- + drivers/scsi/megaraid.c | 17 +- + drivers/scsi/megaraid.h | 6 +- + drivers/scsi/megaraid/megaraid_mbox.c | 23 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 4 +- + drivers/scsi/mesh.c | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 92 +- + drivers/scsi/mpi3mr/mpi/mpi30_image.h | 102 +- + drivers/scsi/mpi3mr/mpi/mpi30_init.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 1 + + drivers/scsi/mpi3mr/mpi/mpi30_pci.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_sas.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_tool.h | 6 +- + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 4 +- + drivers/scsi/mpi3mr/mpi3mr.h | 18 +- + drivers/scsi/mpi3mr/mpi3mr_app.c | 28 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 136 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 106 +- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 30 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 17 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 10 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1336 +++++++++++++++++++- + drivers/scsi/mvumi.c | 4 +- + drivers/scsi/myrb.c | 12 +- + drivers/scsi/myrs.c | 4 +- + drivers/scsi/ncr53c8xx.c | 2 +- + drivers/scsi/nsp32.c | 5 +- + drivers/scsi/pcmcia/nsp_cs.c | 2 +- + drivers/scsi/pcmcia/nsp_cs.h | 3 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 2 +- + drivers/scsi/pmcraid.c | 4 +- + drivers/scsi/ppa.c | 2 +- + drivers/scsi/ps3rom.c | 2 +- + drivers/scsi/qedf/qedf.h | 4 +- + drivers/scsi/qedf/qedf_io.c | 4 +- + drivers/scsi/qla1280.c | 18 +- + drivers/scsi/qla2xxx/qla_bsg.c | 147 ++- + drivers/scsi/qla2xxx/qla_bsg.h | 12 + + drivers/scsi/qla2xxx/qla_def.h | 30 +- + drivers/scsi/qla2xxx/qla_gbl.h | 5 + + drivers/scsi/qla2xxx/qla_gs.c | 41 +- + drivers/scsi/qla2xxx/qla_init.c | 232 +++- + drivers/scsi/qla2xxx/qla_isr.c | 19 +- + drivers/scsi/qla2xxx/qla_mbx.c | 88 ++ + drivers/scsi/qla2xxx/qla_nx.h | 1 + + drivers/scsi/qla2xxx/qla_os.c | 16 +- + drivers/scsi/qla2xxx/qla_sup.c | 29 + + drivers/scsi/qla2xxx/qla_target.c | 2 +- + drivers/scsi/qla2xxx/qla_version.h | 8 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 8 +- + drivers/scsi/qlogicfas408.c | 2 +- + drivers/scsi/qlogicfas408.h | 3 +- + drivers/scsi/qlogicpti.c | 2 +- + drivers/scsi/scsi_debug.c | 127 +- + drivers/scsi/scsi_lib.c | 11 +- + drivers/scsi/scsi_priv.h | 3 +- + drivers/scsi/scsi_sysfs.c | 77 +- + drivers/scsi/scsi_transport_fc.c | 42 + + drivers/scsi/sd.c | 295 +++-- + drivers/scsi/ses.c | 15 +- + drivers/scsi/smartpqi/smartpqi_init.c | 3 +- + drivers/scsi/snic/snic.h | 3 +- + drivers/scsi/snic/snic_scsi.c | 4 +- + drivers/scsi/sr.c | 21 +- + drivers/scsi/st.c | 22 +- + drivers/scsi/stex.c | 2 +- + drivers/scsi/storvsc_drv.c | 3 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- + drivers/scsi/virtio_scsi.c | 4 +- + drivers/scsi/vmw_pvscsi.c | 2 +- + drivers/scsi/wd33c93.c | 2 +- + drivers/scsi/wd33c93.h | 3 +- + drivers/scsi/wd719x.c | 3 +- + drivers/scsi/xen-scsifront.c | 4 +- + drivers/target/loopback/tcm_loop.c | 3 +- + drivers/target/target_core_configfs.c | 68 +- + drivers/target/target_core_fabric_configfs.c | 30 +- + drivers/target/target_core_spc.c | 86 ++ + drivers/ufs/core/ufs-mcq.c | 3 +- + drivers/ufs/core/ufs-sysfs.c | 6 +- + drivers/ufs/core/ufshcd.c | 35 +- + drivers/ufs/host/ufs-exynos.c | 10 + + drivers/ufs/host/ufs-qcom.c | 156 ++- + drivers/ufs/host/ufs-qcom.h | 1 + + drivers/usb/image/microtek.c | 6 +- + drivers/usb/storage/scsiglue.c | 2 +- + drivers/usb/storage/uas.c | 2 +- + include/linux/libata.h | 3 +- + include/linux/transport_class.h | 1 + + include/scsi/libfc.h | 3 +- + include/scsi/libiscsi.h | 3 +- + include/scsi/libsas.h | 3 +- + include/scsi/scsi.h | 13 +- + include/scsi/scsi_driver.h | 7 +- + include/scsi/scsi_host.h | 12 +- + include/scsi/scsi_transport_fc.h | 12 + + include/target/target_core_base.h | 4 + + include/uapi/scsi/scsi_bsg_ufs.h | 17 +- + include/ufs/ufs.h | 5 +- + include/ufs/ufshcd.h | 2 + + include/ufs/ufshci.h | 1 + + 172 files changed, 3585 insertions(+), 736 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/qcom,sa8255p-ufshc.yaml +Merging scsi-mkp/for-next (1982257570b84 scsi: csiostor: Fix dereference of null pointer rn) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/ufs/core/ufshcd-priv.h +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging drivers/ufs/host/ufs-mediatek.c +Merge made by the 'ort' strategy. + drivers/scsi/BusLogic.c | 6 ++++-- + drivers/scsi/csiostor/csio_scsi.c | 3 ++- + drivers/scsi/mpi3mr/mpi3mr_os.c | 5 ++++- + drivers/scsi/smartpqi/smartpqi_init.c | 13 ++++++++++--- + drivers/ufs/core/ufs-mcq.c | 2 -- + drivers/ufs/core/ufshcd-priv.h | 7 +------ + drivers/ufs/core/ufshcd.c | 3 +++ + drivers/ufs/host/Kconfig | 1 + + drivers/ufs/host/ufs-mediatek-trace.h | 6 +++--- + drivers/ufs/host/ufs-mediatek.c | 12 +++--------- + include/ufs/ufshcd.h | 4 ---- + 11 files changed, 31 insertions(+), 31 deletions(-) +Merging vhost/linux-next (996b8da17999a vduse: avoid adding implicit padding) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/mm/memory-hotplug.rst +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging net/vmw_vsock/virtio_transport.c +Auto-merging scripts/checkpatch.pl +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 20 + + Documentation/admin-guide/mm/memory-hotplug.rst | 36 + + .../arch/x86/x86_64/fake-numa-for-cpusets.rst | 50 + + Documentation/core-api/dma-api-howto.rst | 52 + + Documentation/core-api/dma-attributes.rst | 9 + + Documentation/userspace-api/vduse.rst | 53 + + drivers/char/hw_random/virtio-rng.c | 3 + + drivers/gpio/gpio-virtio.c | 15 +- + drivers/scsi/virtio_scsi.c | 17 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 156 +-- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 6 - + drivers/vdpa/vdpa_user/iova_domain.c | 27 +- + drivers/vdpa/vdpa_user/iova_domain.h | 8 +- + drivers/vdpa/vdpa_user/vduse_dev.c | 524 +++++++--- + drivers/vhost/vdpa.c | 5 +- + drivers/vhost/vhost.c | 8 +- + drivers/virtio/virtio_input.c | 5 +- + drivers/virtio/virtio_ring.c | 1010 +++++++++++++++----- + include/linux/dma-mapping.h | 20 + + include/linux/vdpa.h | 4 +- + include/linux/virtio.h | 11 +- + include/uapi/linux/vduse.h | 85 +- + include/uapi/linux/virtio_ring.h | 5 +- + kernel/dma/debug.c | 28 +- + mm/numa_emulation.c | 62 ++ + net/vmw_vsock/virtio_transport.c | 19 +- + scripts/checkpatch.pl | 4 +- + 27 files changed, 1729 insertions(+), 513 deletions(-) +Merging rpmsg/for-next (85ab651885e1b Merge branches 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../bindings/remoteproc/fsl,imx-rproc.yaml | 1 + + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 5 + + .../bindings/remoteproc/qcom,sm8550-pas.yaml | 1 - + .../bindings/remoteproc/ti,hsm-m4fss.yaml | 72 ++++++ + .../bindings/remoteproc/ti,keystone-rproc.txt | 2 +- + drivers/remoteproc/Kconfig | 2 + + drivers/remoteproc/imx_dsp_rproc.c | 95 +++++--- + drivers/remoteproc/imx_rproc.c | 257 +++++++++++++++++++-- + drivers/remoteproc/imx_rproc.h | 4 + + drivers/remoteproc/mtk_scp.c | 46 ++-- + drivers/remoteproc/mtk_scp_ipi.c | 4 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 9 +- + drivers/rpmsg/rpmsg_core.c | 66 +++--- + drivers/rpmsg/virtio_rpmsg_bus.c | 101 +++----- + 14 files changed, 483 insertions(+), 182 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/ti,hsm-m4fss.yaml +Merging gpio-brgl/gpio/for-next (af9b4a56f0000 gpio: tegra186: Add support for Tegra264) +$ git merge -m Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpio/gpio-pca953x.c +Auto-merging drivers/gpio/gpio-virtuser.c +Auto-merging drivers/gpio/gpiolib-shared.c +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/gpio/aspeed,sgpio.yaml | 4 +- + .../devicetree/bindings/gpio/gpio-line-mux.yaml | 107 ++++++ + .../devicetree/bindings/gpio/gpio-mmio.yaml | 5 +- + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 2 + + .../bindings/gpio/nvidia,tegra186-gpio.yaml | 22 ++ + .../devicetree/bindings/gpio/spacemit,k1-gpio.yaml | 4 +- + Documentation/driver-api/gpio/pca953x.rst | 87 +++++ + MAINTAINERS | 6 + + drivers/gpio/Kconfig | 15 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-aggregator.c | 8 +- + drivers/gpio/gpio-aspeed-sgpio.c | 362 +++++++++++++-------- + drivers/gpio/gpio-aspeed.c | 7 +- + drivers/gpio/gpio-cadence.c | 76 ++++- + drivers/gpio/gpio-creg-snps.c | 4 +- + drivers/gpio/gpio-line-mux.c | 116 +++++++ + drivers/gpio/gpio-max77620.c | 19 ++ + drivers/gpio/gpio-max77759.c | 10 +- + drivers/gpio/gpio-menz127.c | 1 - + drivers/gpio/gpio-mmio.c | 1 + + drivers/gpio/gpio-pca953x.c | 6 + + drivers/gpio/gpio-pca9570.c | 19 +- + drivers/gpio/gpio-realtek-otto.c | 5 +- + drivers/gpio/gpio-sim.c | 16 +- + drivers/gpio/gpio-spacemit-k1.c | 168 +++++++--- + drivers/gpio/gpio-tegra186.c | 90 ++++- + drivers/gpio/gpio-virtuser.c | 8 +- + drivers/gpio/gpio-zynq.c | 12 +- + drivers/gpio/gpiolib-of.c | 4 + + drivers/gpio/gpiolib-shared.c | 7 +- + drivers/gpio/gpiolib-swnode.c | 9 +- + drivers/gpio/gpiolib.c | 30 +- + drivers/regulator/bd71815-regulator.c | 15 +- + include/dt-bindings/gpio/nvidia,tegra264-gpio.h | 61 ++++ + include/linux/gpio/consumer.h | 36 ++ + 35 files changed, 1044 insertions(+), 299 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-line-mux.yaml + create mode 100644 drivers/gpio/gpio-line-mux.c + create mode 100644 include/dt-bindings/gpio/nvidia,tegra264-gpio.h +Merging gpio-intel/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (8791fba411f56 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/base/base.h +Merge made by the 'ort' strategy. + .../pinctrl/allwinner,sun4i-a10-pinctrl.yaml | 2 +- + .../bindings/pinctrl/intel,pinctrl-keembay.yaml | 2 +- + .../pinctrl/microchip,mpfs-pinctrl-mssio.yaml | 109 +++ + .../bindings/pinctrl/microchip,sparx5-sgpio.yaml | 20 +- + .../bindings/pinctrl/mscc,ocelot-pinctrl.yaml | 6 + + .../bindings/pinctrl/qcom,glymur-tlmm.yaml | 6 +- + .../pinctrl/renesas,r9a09g077-pinctrl.yaml | 13 + + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 1 + + .../bindings/pinctrl/samsung,pinctrl.yaml | 1 + + .../bindings/pinctrl/spacemit,k1-pinctrl.yaml | 27 +- + .../microchip/microchip,mpfs-mss-top-sysreg.yaml | 4 + + Documentation/driver-api/driver-model/devres.rst | 1 - + MAINTAINERS | 6 +- + drivers/base/base.h | 9 + + drivers/base/pinctrl.c | 2 + + drivers/pinctrl/Kconfig | 26 +- + drivers/pinctrl/Makefile | 4 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 4 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 7 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 5 +- + drivers/pinctrl/core.c | 93 +-- + drivers/pinctrl/freescale/pinctrl-imx-scmi.c | 20 +- + drivers/pinctrl/intel/Kconfig | 22 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 43 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 2 +- + drivers/pinctrl/intel/pinctrl-intel.c | 2 +- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 29 +- + drivers/pinctrl/intel/pinctrl-tangier.c | 21 +- + drivers/pinctrl/mediatek/mtk-eint.c | 29 +- + drivers/pinctrl/mediatek/pinctrl-mt7981.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt7986.c | 4 +- + drivers/pinctrl/mediatek/pinctrl-mt7988.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8365.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 1 - + drivers/pinctrl/meson/Kconfig | 22 +- + drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 12 +- + drivers/pinctrl/microchip/Kconfig | 17 + + drivers/pinctrl/microchip/Makefile | 5 + + .../pinctrl/{ => microchip}/pinctrl-mpfs-iomux0.c | 8 +- + drivers/pinctrl/microchip/pinctrl-mpfs-mssio.c | 737 +++++++++++++++++++++ + .../{ => microchip}/pinctrl-pic64gx-gpio2.c | 2 +- + drivers/pinctrl/pinconf.h | 16 + + drivers/pinctrl/pinctrl-amd.c | 2 - + drivers/pinctrl/pinctrl-apple-gpio.c | 18 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 9 + + drivers/pinctrl/pinctrl-aw9523.c | 53 +- + drivers/pinctrl/pinctrl-equilibrium.c | 1 + + drivers/pinctrl/pinctrl-generic.c | 189 ++++++ + drivers/pinctrl/pinctrl-k230.c | 7 +- + drivers/pinctrl/pinctrl-microchip-sgpio.c | 6 +- + drivers/pinctrl/pinctrl-ocelot.c | 184 ++++- + drivers/pinctrl/pinctrl-rockchip.c | 19 +- + drivers/pinctrl/pinctrl-scmi.c | 3 +- + drivers/pinctrl/pinctrl-single.c | 2 + + drivers/pinctrl/pinctrl-st.c | 1 + + drivers/pinctrl/pinctrl-tb10x.c | 17 +- + drivers/pinctrl/qcom/pinctrl-glymur.c | 46 +- + drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2 +- + drivers/pinctrl/renesas/Kconfig | 2 + + drivers/pinctrl/renesas/pinctrl-rzt2h.c | 248 ++++++- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 117 ++++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + drivers/pinctrl/sophgo/pinctrl-cv18xx.h | 4 - + drivers/pinctrl/sophgo/pinctrl-sg2042.h | 6 - + drivers/pinctrl/spacemit/Kconfig | 4 +- + drivers/pinctrl/spacemit/pinctrl-k1.c | 642 ++++++++++++++++-- + .../pinctrl/starfive/pinctrl-starfive-jh7110-sys.c | 3 - + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 30 +- + include/linux/pinctrl/devinfo.h | 6 - + include/linux/pinctrl/pinctrl.h | 3 - + 71 files changed, 2575 insertions(+), 397 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/microchip,mpfs-pinctrl-mssio.yaml + create mode 100644 drivers/pinctrl/microchip/Kconfig + create mode 100644 drivers/pinctrl/microchip/Makefile + rename drivers/pinctrl/{ => microchip}/pinctrl-mpfs-iomux0.c (98%) + create mode 100644 drivers/pinctrl/microchip/pinctrl-mpfs-mssio.c + rename drivers/pinctrl/{ => microchip}/pinctrl-pic64gx-gpio2.c (99%) + create mode 100644 drivers/pinctrl/pinctrl-generic.c +Merging pinctrl-intel/for-next (8e03e6ecc2353 pinctrl: tangier: Join tng_pinctrl_probe() into its wrapper) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (829dde3369a91 pinctrl: renesas: rzt2h: Add GPIO IRQ chip to handle interrupts) +$ git merge -m Merge branch 'renesas-pinctrl' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (8c483209a6fc7 pinctrl: samsung: Add Exynos9610 pinctrl configuration) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/pwm/for-next (9321f9d27fbaf pwm: Remove redundant check in pwm_ops_check()) +$ git merge -m Merge branch 'pwm/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/pwm/pwm_th1520.rs +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/nxp,lpc3220-pwm.yaml | 4 + + MAINTAINERS | 6 +- + drivers/pwm/core.c | 30 +++-- + drivers/pwm/pwm-dwc.c | 3 +- + drivers/pwm/pwm-tiehrpwm.c | 6 +- + drivers/pwm/pwm_th1520.rs | 5 +- + rust/helpers/pwm.c | 6 +- + rust/kernel/pwm.rs | 124 +++++++++++---------- + 8 files changed, 103 insertions(+), 81 deletions(-) +Merging ktest/for-next (d3042cbe84a06 ktest.pl: Fix uninitialized var in config-bisect.pl) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (6d6ad32e22f02 selftests/pidfd: fix typo in comment) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging tools/testing/selftests/ublk/kublk.h +CONFLICT (content): Merge conflict in tools/testing/selftests/ublk/kublk.h +Resolved 'tools/testing/selftests/ublk/kublk.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e8a73f785fb1e] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git +$ git diff -M --stat --summary HEAD^.. + .../selftests/coredump/coredump_test_helpers.c | 2 +- + .../selftests/filesystems/anon_inode_test.c | 5 +++- + tools/testing/selftests/pidfd/pidfd_info_test.c | 2 +- + tools/testing/selftests/resctrl/cat_test.c | 6 +++-- + tools/testing/selftests/resctrl/resctrl.h | 8 ++++--- + tools/testing/selftests/resctrl/resctrl_tests.c | 28 +++++++++++++++------- + tools/testing/selftests/resctrl/resctrlfs.c | 10 ++++++++ + tools/testing/selftests/run_kselftest.sh | 11 +++++++++ + tools/testing/selftests/ublk/kublk.h | 2 +- + 9 files changed, 57 insertions(+), 17 deletions(-) +Merging kunit/test (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'test' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (db0c35ca36526 kunit: add bash completion) +$ git merge -m Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + Documentation/dev-tools/kunit/run_wrapper.rst | 9 ++ + include/kunit/test.h | 3 +- + rust/helpers/kunit.c | 2 +- + tools/testing/kunit/kunit-completion.sh | 34 +++++++ + tools/testing/kunit/kunit.py | 37 ++++++- + tools/testing/kunit/kunit_parser.py | 3 + + tools/testing/kunit/kunit_tool_test.py | 110 +++++++++++++++------ + tools/testing/kunit/qemu_configs/armeb.py | 16 +++ + .../test_is_test_passed-failure-nested.log | 10 ++ + 9 files changed, 192 insertions(+), 32 deletions(-) + create mode 100644 tools/testing/kunit/kunit-completion.sh + create mode 100644 tools/testing/kunit/qemu_configs/armeb.py + create mode 100644 tools/testing/kunit/test_data/test_is_test_passed-failure-nested.log +Merging livepatching/for-next (51ab33fc0a8be Merge tag 'livepatching-for-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git livepatching/for-next +Already up to date. +Merging rtc/rtc-next (8eeb611b3d162 rtc: s35390a: implement nvmem support) +$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging drivers/rtc/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/rtc/cpcap-rtc.txt | 18 ------ + .../devicetree/bindings/rtc/loongson,rtc.yaml | 13 ++++ + .../bindings/rtc/motorola,cpcap-rtc.yaml | 32 +++++++++ + .../devicetree/bindings/rtc/renesas,rz-rtca3.yaml | 5 +- + drivers/rtc/Kconfig | 1 + + drivers/rtc/rtc-loongson.c | 71 +++++++++++++------- + drivers/rtc/rtc-max31335.c | 6 +- + drivers/rtc/rtc-pcf8563.c | 2 +- + drivers/rtc/rtc-s35390a.c | 32 +++++++++ + drivers/rtc/rtc-zynqmp.c | 75 ++++++++++++---------- + 10 files changed, 174 insertions(+), 81 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/rtc/cpcap-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/motorola,cpcap-rtc.yaml +Merging nvdimm/libnvdimm-for-next (a9ba6733c7f10 nvdimm: virtio_pmem: serialize flush requests) +$ git merge -m Merge branch 'libnvdimm-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Merge made by the 'ort' strategy. + drivers/nvdimm/btt.c | 12 ++++++------ + drivers/nvdimm/nd_virtio.c | 3 ++- + drivers/nvdimm/pmem.c | 8 ++++---- + drivers/nvdimm/virtio_pmem.c | 1 + + drivers/nvdimm/virtio_pmem.h | 4 ++++ + 5 files changed, 17 insertions(+), 11 deletions(-) +Merging at24/at24/for-next (de284988c270c dt-bindings: eeprom: at24: Add compatible for Puya P24C128F) +$ git merge -m Merge branch 'at24/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (68113d2606740 NTB/msi: Remove unused functions) +$ 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/mscc/ntb_hw_switchtec.c | 14 ++++++-- + drivers/ntb/msi.c | 64 ---------------------------------- + include/linux/ntb.h | 14 -------- + 3 files changed, 11 insertions(+), 81 deletions(-) +Merging seccomp/for-next/seccomp (7d0a66e4bb908 Linux 6.18) +$ git merge -m Merge branch 'for-next/seccomp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging slimbus/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (bfab89e362066 Merge branches 'nvmem-fixes' and 'nvmem-for-6.20' into nvmem-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'ort' strategy. + drivers/nvmem/zynqmp_nvmem.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging xarray/main (863810caeb3cf XArray: Add CONFIG_DEBUG_XARRAY) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Auto-merging lib/Kconfig.debug +Auto-merging lib/idr.c +Merge made by the 'ort' strategy. + include/linux/xarray.h | 63 ++++++++++++++++++++---------------- + lib/Kconfig.debug | 8 +++++ + lib/idr.c | 1 - + lib/test_xarray.c | 10 ++++-- + lib/xarray.c | 11 ++++--- + tools/testing/radix-tree/xarray.c | 2 +- + tools/testing/shared/xarray-shared.h | 2 +- + 7 files changed, 59 insertions(+), 38 deletions(-) +Merging hyperv/hyperv-next (afefdb2bc9457 x86/hyperv: Update comment in hyperv_cleanup()) +$ git merge -m Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging arch/x86/hyperv/hv_crash.c +Merge made by the 'ort' strategy. + arch/x86/hyperv/hv_crash.c | 3 +- + arch/x86/hyperv/hv_init.c | 20 +- + drivers/hv/Makefile | 1 + + drivers/hv/hv.c | 12 +- + drivers/hv/mshv_debugfs.c | 726 +++++++++++++++++++++++++++++++ + drivers/hv/mshv_debugfs_counters.c | 490 +++++++++++++++++++++ + drivers/hv/mshv_eventfd.c | 13 +- + drivers/hv/mshv_eventfd.h | 1 - + drivers/hv/mshv_root.h | 49 ++- + drivers/hv/mshv_root_hv_call.c | 64 ++- + drivers/hv/mshv_root_main.c | 138 +++--- + drivers/hv/mshv_vtl_main.c | 5 +- + drivers/pci/controller/pci-hyperv-intf.c | 12 - + drivers/pci/controller/pci-hyperv.c | 1 - + include/hyperv/hvhdk.h | 7 + + 15 files changed, 1440 insertions(+), 102 deletions(-) + create mode 100644 drivers/hv/mshv_debugfs.c + create mode 100644 drivers/hv/mshv_debugfs_counters.c +Merging auxdisplay/for-next (693142d4d761d auxdisplay: max6959: Replace slab.h with device/devres.h) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Merge made by the 'ort' strategy. + drivers/auxdisplay/arm-charlcd.c | 96 ++++++++++++---------------------------- + drivers/auxdisplay/max6959.c | 2 +- + 2 files changed, 29 insertions(+), 69 deletions(-) +Merging kgdb/kgdb/for-next (fdbdd0ccb30af kdb: remove redundant check for scancode 0xe0) +$ git merge -m Merge branch 'kgdb/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'hmm' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'cfi/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (91a0b0dce3507 bus: mhi: ep: Use bus callbacks for .probe() and .remove()) +$ git merge -m Merge branch 'mhi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +$ git am -3 ../patches/0001-fix-up-for-net-qrtr-Drop-the-MHI-auto_queue-feature-.patch +Applying: fix up for "net: qrtr: Drop the MHI auto_queue feature for IPCR DL channels" +Using index info to reconstruct a base tree... +M drivers/net/wireless/ath/ath12k/wifi7/mhi.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging memblock/for-next (f56ccc32468ee mm/memtest: add underflow detection for size calculation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging mm/internal.h +Auto-merging mm/memblock.c +Auto-merging mm/mm_init.c +Merge made by the 'ort' strategy. + mm/internal.h | 3 +-- + mm/memblock.c | 4 ++-- + mm/memtest.c | 2 ++ + mm/mm_init.c | 5 +++-- + tools/testing/memblock/internal.h | 3 +-- + 5 files changed, 9 insertions(+), 8 deletions(-) +Merging cxl/next (63fbf275fa9f1 Merge branch 'for-7.0/cxl-prm-translation' into cxl-for-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging Documentation/driver-api/cxl/index.rst +Auto-merging arch/x86/kernel/e820.c +CONFLICT (content): Merge conflict in arch/x86/kernel/e820.c +Auto-merging drivers/cxl/acpi.c +Auto-merging drivers/cxl/core/hdm.c +Auto-merging drivers/cxl/core/port.c +Auto-merging drivers/cxl/core/ras.c +Auto-merging drivers/cxl/core/region.c +CONFLICT (content): Merge conflict in drivers/cxl/core/region.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pcie/aer.c +Auto-merging drivers/pci/probe.c +Auto-merging include/linux/ioport.h +Auto-merging include/linux/pci.h +Auto-merging include/uapi/linux/pci_regs.h +Auto-merging kernel/resource.c +Resolved 'arch/x86/kernel/e820.c' using previous resolution. +Resolved 'drivers/cxl/core/region.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 234068f3ced5d] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git +$ git diff -M --stat --summary HEAD^.. + Documentation/driver-api/cxl/conventions.rst | 178 +------- + .../driver-api/cxl/conventions/cxl-atl.rst | 304 ++++++++++++++ + .../driver-api/cxl/conventions/cxl-lmh.rst | 135 ++++++ + .../driver-api/cxl/conventions/template.rst | 37 ++ + Documentation/driver-api/cxl/index.rst | 1 + + .../driver-api/cxl/platform/bios-and-efi.rst | 23 + + .../driver-api/cxl/platform/device-hotplug.rst | 130 ++++++ + arch/x86/kernel/e820.c | 19 +- + drivers/cxl/Kconfig | 11 +- + drivers/cxl/acpi.c | 46 +- + drivers/cxl/core/Makefile | 4 +- + drivers/cxl/core/atl.c | 211 ++++++++++ + drivers/cxl/core/cdat.c | 8 +- + drivers/cxl/core/core.h | 40 ++ + drivers/cxl/core/edac.c | 64 +-- + drivers/cxl/core/hdm.c | 13 +- + drivers/cxl/core/memdev.c | 111 +++-- + drivers/cxl/core/pci.c | 384 ++--------------- + drivers/cxl/core/pmem.c | 13 +- + drivers/cxl/core/port.c | 183 ++++---- + drivers/cxl/core/ras.c | 198 +++++++++ + drivers/cxl/core/ras_rch.c | 121 ++++++ + drivers/cxl/core/region.c | 462 ++++++++++++++++----- + drivers/cxl/core/regs.c | 14 +- + drivers/cxl/cxl.h | 80 ++-- + drivers/cxl/cxlmem.h | 21 +- + drivers/cxl/cxlpci.h | 75 +--- + drivers/cxl/mem.c | 77 ++-- + drivers/cxl/pci.c | 67 +-- + drivers/cxl/port.c | 162 ++++++++ + drivers/dax/hmem/device.c | 3 +- + drivers/dax/hmem/hmem.c | 5 +- + drivers/pci/pci.h | 39 +- + drivers/pci/pcie/Kconfig | 9 - + drivers/pci/pcie/Makefile | 1 + + drivers/pci/pcie/aer.c | 135 +----- + drivers/pci/pcie/aer_cxl_rch.c | 104 +++++ + drivers/pci/pcie/portdrv.h | 12 + + drivers/pci/probe.c | 31 ++ + include/linux/aer.h | 2 + + include/linux/ioport.h | 5 + + include/linux/pci.h | 6 + + include/ras/ras_event.h | 12 +- + include/uapi/linux/pci_regs.h | 64 ++- + kernel/resource.c | 71 +++- + tools/testing/cxl/Kbuild | 7 +- + tools/testing/cxl/cxl_core_exports.c | 22 - + tools/testing/cxl/exports.h | 13 - + tools/testing/cxl/test/mem.c | 2 +- + tools/testing/cxl/test/mock.c | 36 +- + 50 files changed, 2525 insertions(+), 1246 deletions(-) + create mode 100644 Documentation/driver-api/cxl/conventions/cxl-atl.rst + create mode 100644 Documentation/driver-api/cxl/conventions/cxl-lmh.rst + create mode 100644 Documentation/driver-api/cxl/conventions/template.rst + create mode 100644 Documentation/driver-api/cxl/platform/device-hotplug.rst + create mode 100644 drivers/cxl/core/atl.c + create mode 100644 drivers/cxl/core/ras_rch.c + create mode 100644 drivers/pci/pcie/aer_cxl_rch.c + delete mode 100644 tools/testing/cxl/exports.h +Merging zstd/zstd-next (65d1f5507ed2c zstd: Import upstream v1.5.7) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (c5a8f13f1e476 efi: Support EDID information) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging arch/x86/kernel/setup.c +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/pci/vgaarb.c +Merge made by the 'ort' strategy. + arch/arm64/kernel/image-vars.h | 2 +- + arch/loongarch/kernel/efi.c | 31 +++--- + arch/loongarch/kernel/image-vars.h | 2 +- + arch/riscv/kernel/image-vars.h | 2 +- + arch/x86/kernel/kexec-bzimage64.c | 4 +- + arch/x86/kernel/setup.c | 16 ++- + arch/x86/video/video-common.c | 4 +- + drivers/firmware/efi/earlycon.c | 42 ++++---- + drivers/firmware/efi/efi-init.c | 38 +++---- + drivers/firmware/efi/efi.c | 4 +- + drivers/firmware/efi/libstub/Makefile | 2 +- + drivers/firmware/efi/libstub/efi-stub-entry.c | 17 +-- + drivers/firmware/efi/libstub/efi-stub.c | 43 +++++--- + drivers/firmware/efi/libstub/efistub.h | 7 +- + drivers/firmware/efi/libstub/primary_display.c | 56 ++++++++++ + drivers/firmware/efi/libstub/screen_info.c | 53 --------- + drivers/firmware/efi/libstub/zboot.c | 4 +- + drivers/firmware/efi/sysfb_efi.c | 144 ++++++++++++++++++------- + drivers/firmware/sysfb.c | 13 +-- + drivers/firmware/sysfb_simplefb.c | 2 +- + drivers/gpu/drm/sysfb/efidrm.c | 14 +-- + drivers/gpu/drm/sysfb/vesadrm.c | 14 +-- + drivers/hv/vmbus_drv.c | 6 +- + drivers/pci/vgaarb.c | 4 +- + drivers/video/Kconfig | 8 +- + drivers/video/fbdev/core/fbmon.c | 8 +- + drivers/video/fbdev/efifb.c | 10 +- + drivers/video/fbdev/vesafb.c | 10 +- + drivers/video/fbdev/vga16fb.c | 8 +- + drivers/video/screen_info_pci.c | 5 +- + include/linux/efi.h | 9 +- + include/linux/screen_info.h | 2 - + include/linux/sysfb.h | 23 +++- + include/video/edid.h | 4 - + 34 files changed, 359 insertions(+), 252 deletions(-) + create mode 100644 drivers/firmware/efi/libstub/primary_display.c + delete mode 100644 drivers/firmware/efi/libstub/screen_info.c +Merging unicode/for-next (bcfee135d5847 utf8: Remove unused utf8_normalize) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/utf8-core.c | 22 ---------------------- + include/linux/unicode.h | 3 --- + 2 files changed, 25 deletions(-) +Merging slab/slab/for-next (bc33906024eb5 Merge branch 'slab/for-7.0/sheaves' into slab/for-next) +$ git merge -m Merge branch 'slab/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging fs/ext4/super.c +Auto-merging mm/Kconfig +Auto-merging mm/internal.h +Auto-merging mm/memcontrol.c +Auto-merging mm/page_alloc.c +Auto-merging mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Recorded preimage for 'mm/slub.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'mm/slub.c'. +[master 6fcd9fe1e3fae] Merge branch 'slab/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git +$ git diff -M --stat --summary HEAD^.. + fs/ext4/super.c | 19 +- + include/linux/slab.h | 40 +- + mm/Kconfig | 11 - + mm/internal.h | 1 + + mm/memcontrol.c | 31 +- + mm/page_alloc.c | 5 + + mm/slab.h | 213 ++-- + mm/slab_common.c | 153 +-- + mm/slub.c | 3376 ++++++++++++++++++++++---------------------------- + 9 files changed, 1770 insertions(+), 2079 deletions(-) +Merging random/master (bb9ff576fdff4 virt: vmgenid: remap memory as decrypted) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Merge made by the 'ort' strategy. + drivers/virt/vmgenid.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging landlock/next (039b06ca8a1d6 landlock: Add documentation for UDP support) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Merge made by the 'ort' strategy. + Documentation/userspace-api/landlock.rst | 138 +++- + include/uapi/linux/landlock.h | 67 +- + samples/landlock/sandboxer.c | 79 +- + security/landlock/Makefile | 2 +- + security/landlock/access.h | 16 +- + security/landlock/audit.c | 91 +-- + security/landlock/audit.h | 4 +- + security/landlock/cred.h | 12 + + security/landlock/domain.c | 45 +- + security/landlock/domain.h | 4 +- + security/landlock/fs.c | 354 ++++---- + security/landlock/limits.h | 6 +- + security/landlock/net.c | 128 ++- + security/landlock/ruleset.c | 88 +- + security/landlock/ruleset.h | 21 +- + security/landlock/syscalls.c | 66 +- + security/landlock/task.c | 119 +-- + security/landlock/tsync.c | 555 +++++++++++++ + security/landlock/tsync.h | 16 + + tools/testing/selftests/landlock/.gitignore | 1 + + tools/testing/selftests/landlock/Makefile | 1 + + tools/testing/selftests/landlock/base_test.c | 8 +- + tools/testing/selftests/landlock/common.h | 33 +- + tools/testing/selftests/landlock/fs_bench.c | 161 ++++ + tools/testing/selftests/landlock/net_test.c | 695 +++++++++++++--- + .../selftests/landlock/scoped_signal_test.c | 2 +- + tools/testing/selftests/landlock/scoped_test.c | 2 +- + ...ped_abstract_unix_test.c => scoped_unix_test.c} | 908 +++++++++++++++------ + tools/testing/selftests/landlock/tsync_test.c | 161 ++++ + 29 files changed, 2914 insertions(+), 869 deletions(-) + create mode 100644 security/landlock/tsync.c + create mode 100644 security/landlock/tsync.h + create mode 100644 tools/testing/selftests/landlock/fs_bench.c + rename tools/testing/selftests/landlock/{scoped_abstract_unix_test.c => scoped_unix_test.c} (51%) + create mode 100644 tools/testing/selftests/landlock/tsync_test.c +Merging sysctl/sysctl-next (d174174c6776a sysctl: replace SYSCTL_INT_CONV_CUSTOM macro with functions) +$ git merge -m Merge branch 'sysctl-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Auto-merging include/linux/fs.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/net/ax25.h +Auto-merging lib/alloc_tag.c +Auto-merging security/loadpin/loadpin.c +Merge made by the 'ort' strategy. + fs/pipe.c | 22 +++- + include/linux/fs.h | 1 - + include/linux/hugetlb.h | 2 - + include/linux/printk.h | 1 - + include/linux/sysctl.h | 120 +++--------------- + include/net/ax25.h | 2 - + kernel/printk/internal.h | 2 +- + kernel/printk/sysctl.c | 1 - + kernel/sysctl.c | 298 +++++++++++++++++++++++++++++++++++++++++---- + kernel/time/jiffies.c | 130 +++++++++++++++++--- + security/loadpin/loadpin.c | 37 +++--- + 11 files changed, 438 insertions(+), 178 deletions(-) +Merging execve/for-next/execve (46a03ea50b5f3 fs/tests: exec: drop duplicate bprm_stack_limits test vectors) +$ git merge -m Merge branch 'for-next/execve' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Merge made by the 'ort' strategy. + fs/tests/exec_kunit.c | 6 ------ + 1 file changed, 6 deletions(-) +Merging bitmap/bitmap-for-next (e5134a74f7162 lib/tests: extend KUnit test for bitops with more cases) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging MAINTAINERS +Auto-merging lib/Kconfig.debug +Auto-merging lib/tests/Makefile +Auto-merging rust/helpers/bitops.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + include/linux/bitfield.h | 5 +- + lib/Kconfig.debug | 13 +++ + lib/find_bit.c | 2 +- + lib/tests/Makefile | 1 + + lib/tests/bitops_kunit.c | 205 +++++++++++++++++++++++++++++++++++++++++++++++ + rust/helpers/bitmap.c | 1 + + rust/helpers/bitops.c | 4 + + rust/helpers/cpumask.c | 13 +++ + 9 files changed, 243 insertions(+), 3 deletions(-) + create mode 100644 lib/tests/bitops_kunit.c +Merging hte/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (a41e7fab5cdc0 Merge branches 'for-next/kmalloc_obj' and 'for-next/hardening' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging fs/coredump.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/overflow.h +Auto-merging include/linux/slab.h +Auto-merging init/Kconfig +Auto-merging scripts/checkpatch.pl +Merge made by the 'ort' strategy. + Documentation/process/deprecated.rst | 31 +++++++ + MAINTAINERS | 1 - + Makefile | 6 ++ + drivers/gpu/drm/nouveau/nvif/fifo.c | 5 +- + drivers/misc/lkdtm/bugs.c | 90 +++++++++++++++++-- + drivers/net/ethernet/netronome/nfp/crypto/fw.h | 24 ++++-- + drivers/net/ethernet/netronome/nfp/crypto/tls.c | 8 +- + drivers/net/wireless/ath/carl9170/carl9170.h | 12 +-- + fs/coredump.c | 8 +- + include/linux/compiler_types.h | 49 ++++++++++- + include/linux/fortify-string.h | 8 +- + include/linux/overflow.h | 42 +++++++++ + include/linux/slab.h | 106 +++++++++++++++++++++++ + include/linux/xattr.h | 2 +- + include/uapi/linux/if_alg.h | 2 +- + include/uapi/linux/stddef.h | 4 + + init/Kconfig | 7 ++ + lib/Kconfig.ubsan | 2 +- + lib/test_fortify/test_fortify.sh | 4 +- + scripts/checkpatch.pl | 39 +++++++-- + scripts/coccinelle/api/kmalloc_objs.cocci | 109 ++++++++++++++++++++++++ + tools/testing/selftests/lkdtm/tests.txt | 2 + + 22 files changed, 512 insertions(+), 49 deletions(-) + create mode 100644 scripts/coccinelle/api/kmalloc_objs.cocci +Merging nolibc/for-next (a5f00be9b3b07 tools/nolibc: Add a simple test for writing to a FILE and reading it back) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Merge made by the 'ort' strategy. + tools/include/nolibc/Makefile | 6 +- + tools/include/nolibc/arch-s390.h | 11 +++ + tools/include/nolibc/compiler.h | 24 ++++++ + tools/include/nolibc/nolibc.h | 1 + + tools/include/nolibc/poll.h | 18 ++--- + tools/include/nolibc/std.h | 2 +- + tools/include/nolibc/stdio.h | 53 ++++++++++++- + tools/include/nolibc/sys.h | 18 ++--- + tools/include/nolibc/sys/ptrace.h | 33 ++++++++ + tools/include/nolibc/sys/select.h | 31 +++----- + tools/include/nolibc/sys/time.h | 6 +- + tools/include/nolibc/sys/timerfd.h | 32 +++----- + tools/include/nolibc/time.h | 102 +++++++++---------------- + tools/include/nolibc/types.h | 17 ++++- + tools/testing/selftests/nolibc/Makefile | 14 ++-- + tools/testing/selftests/nolibc/Makefile.nolibc | 8 +- + tools/testing/selftests/nolibc/nolibc-test.c | 86 ++++++++++++++++++++- + 17 files changed, 304 insertions(+), 158 deletions(-) + create mode 100644 tools/include/nolibc/sys/ptrace.h +Merging iommufd/for-next (f8f9c1f4d0c7a Linux 6.19-rc3) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. +Merging turbostat/next (deee7e8ad5bd2 tools/power turbostat: Add L2 cache statistics) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Merge made by the 'ort' strategy. + tools/power/x86/turbostat/turbostat.8 | 18 +- + tools/power/x86/turbostat/turbostat.c | 624 +++++++++++++++++++++++++++------- + 2 files changed, 519 insertions(+), 123 deletions(-) +Merging pwrseq/pwrseq/for-next (e1dccb485c287 power: sequencing: fix missing state_lock in pwrseq_power_on() error path) +$ git merge -m Merge branch 'pwrseq/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/connector/pcie-m2-m-connector.yaml | 145 ++++++++++++++++++ + .../bindings/regulator/qcom,wcn3990-pmu.yaml | 100 ++++++++++++ + MAINTAINERS | 7 + + drivers/power/sequencing/Kconfig | 8 + + drivers/power/sequencing/Makefile | 1 + + drivers/power/sequencing/core.c | 6 +- + drivers/power/sequencing/pwrseq-pcie-m2.c | 168 +++++++++++++++++++++ + drivers/power/sequencing/pwrseq-qcom-wcn.c | 133 +++++++++++++++- + 8 files changed, 560 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/bindings/connector/pcie-m2-m-connector.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/qcom,wcn3990-pmu.yaml + create mode 100644 drivers/power/sequencing/pwrseq-pcie-m2.c +Merging capabilities-next/caps-next (0715881360074 ipc: don't audit capability check in ipc_permissions()) +$ git merge -m Merge branch 'caps-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + security/Kconfig | 17 +++ + security/commoncap.c | 4 + + security/commoncap_test.c | 288 ++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 310 insertions(+) + create mode 100644 security/commoncap_test.c +Merging ipe/next (7d0a66e4bb908 Linux 6.18) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next +Already up to date. +Merging kcsan/next (dcb6fa37fd7bc Linux 6.18-rc3) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next +Already up to date. +Merging crc/crc-next (dcb6fa37fd7bc Linux 6.18-rc3) +$ git merge -m Merge branch 'crc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next +Already up to date. +Merging keys-next/keys-next (91db696adea4d pkcs7: Allow authenticatedAttributes for ML-DSA) +$ git merge -m Merge branch 'keys-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys-next/keys-next +Auto-merging crypto/Kconfig +Auto-merging crypto/Makefile +Auto-merging crypto/asymmetric_keys/asymmetric_type.c +Auto-merging crypto/asymmetric_keys/x509_public_key.c +Auto-merging scripts/sign-file.c +CONFLICT (content): Merge conflict in scripts/sign-file.c +Resolved 'scripts/sign-file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0f92923d29618] Merge branch 'keys-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/module-signing.rst | 16 ++- + certs/Kconfig | 40 ++++++ + certs/Makefile | 3 + + crypto/Kconfig | 9 ++ + crypto/Makefile | 2 + + crypto/asymmetric_keys/Kconfig | 11 ++ + crypto/asymmetric_keys/asymmetric_type.c | 4 +- + crypto/asymmetric_keys/pkcs7_parser.c | 36 ++++- + crypto/asymmetric_keys/pkcs7_parser.h | 3 + + crypto/asymmetric_keys/pkcs7_verify.c | 76 ++++++---- + crypto/asymmetric_keys/public_key.c | 13 +- + crypto/asymmetric_keys/signature.c | 3 +- + crypto/asymmetric_keys/x509_cert_parser.c | 27 +++- + crypto/asymmetric_keys/x509_parser.h | 2 + + crypto/asymmetric_keys/x509_public_key.c | 42 ++++-- + crypto/mldsa.c | 201 +++++++++++++++++++++++++++ + include/crypto/public_key.h | 6 +- + include/linux/oid_registry.h | 5 + + scripts/sign-file.c | 38 +++-- + security/integrity/digsig_asymmetric.c | 4 +- + 20 files changed, 471 insertions(+), 70 deletions(-) + create mode 100644 crypto/mldsa.c +$ git am -3 ../patches/0001-keys-Merge-fixup.patch +Applying: keys: Merge fixup +$ git reset HEAD^ +Unstaged changes after reset: +M scripts/sign-file.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master ce98c65a26f79] Merge branch 'keys-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git + Date: Thu Feb 5 13:55:17 2026 +0000 +Merging fwctl/for-next (f8f9c1f4d0c7a Linux 6.19-rc3) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl/for-next +Already up to date. +Merging devsec-tsm/next (7dfbe9a675197 crypto/ccp: Fix CONFIG_PCI=n build) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next +Already up to date. +Merging hisilicon/for-next (6c177775dcc5e Merge branch 'next/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/hisilicon/linux-hisi.git hisilicon/for-next +Merge made by the 'ort' strategy. +Merging kthread/for-next (fa39ec4f89f26 doc: Add housekeeping documentation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next +Auto-merging Documentation/core-api/index.rst +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging block/blk-mq.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging include/linux/cpuset.h +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/vmstat.h +Auto-merging init/Kconfig +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/cpu.c +Auto-merging kernel/kthread.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/workqueue.c +Auto-merging mm/memcontrol.c +Auto-merging mm/vmstat.c +Merge made by the 'ort' strategy. + Documentation/arch/arm64/asymmetric-32bit.rst | 12 +- + Documentation/core-api/housekeeping.rst | 111 +++++++++++++++ + Documentation/core-api/index.rst | 1 + + arch/arm64/kernel/cpufeature.c | 6 +- + block/blk-mq.c | 6 +- + drivers/base/cpu.c | 2 +- + drivers/pci/pci-driver.c | 73 +++++++--- + include/linux/cpuhplock.h | 1 + + include/linux/cpuset.h | 8 +- + include/linux/kthread.h | 1 + + include/linux/memcontrol.h | 4 + + include/linux/mmu_context.h | 2 +- + include/linux/pci.h | 3 + + include/linux/percpu-rwsem.h | 1 + + include/linux/sched/isolation.h | 16 ++- + include/linux/vmstat.h | 2 + + include/linux/workqueue.h | 2 +- + init/Kconfig | 1 + + kernel/cgroup/cpuset.c | 53 +++---- + kernel/cpu.c | 42 +++--- + kernel/kthread.c | 190 ++++++++++++++++---------- + kernel/sched/isolation.c | 145 ++++++++++++++++---- + kernel/sched/sched.h | 4 + + kernel/time/timer_migration.c | 25 ++-- + kernel/workqueue.c | 17 ++- + mm/memcontrol.c | 31 ++++- + mm/vmstat.c | 15 +- + net/core/net-sysfs.c | 2 +- + 28 files changed, 554 insertions(+), 222 deletions(-) + create mode 100644 Documentation/core-api/housekeeping.rst +Merging drm-rust/drm-rust-next (cea7b66a80412 Documentation: nova: update pending tasks) +$ git merge -m Merge branch 'drm-rust-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/drm-rust-next +Already up to date. +Merging drm-nova/nova-next (93296e9d9528f gpu: nova-core: vbios: store reference to Device where relevant) +$ git merge -m Merge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git drm-nova/nova-next +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 00000000000000..f70b2f393b74b6 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20260205 |