Add linux-next specific files for 20261029 Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 0000000..2c20dcc --- /dev/null +++ b/Next/SHA1s
@@ -0,0 +1,436 @@ +Name SHA1 +---- ---- +origin c339f4010dea8b0d754f84ace70cd1b089878ef8 +ext4-fixes 3e78d7b063230d39ffc42e80ee665b6c32a6adeb +vfs-brauner-fixes b14fcabd34e02c40f72d3cd1e9bd4fd18df40ff1 +fscrypt-current cee9395acd8043be0644b25c34bfa86623f2b935 +fsverity-current c349b233d6ab0fc3517401a1e2d36f5f90eb8c9b +btrfs-fixes 24a19b953e2a3d0ea5a8c4951a0ab8f32720c907 +vfs-fixes 49c5d168a3a8f4eb27d44a2a22b7e8a856ca601f +erofs-fixes 135d84c66f85426299db01a09d93a79a87af18ba +nfsd-fixes f76017a7663c4ce5e379f8a8d39f032bdb1fd865 +v9fs-fixes 028ef9c96e96197026887c0f092424679298aae8 +overlayfs-fixes 4549871118cf616eecdd2d939f78e3b9e1dddc48 +fscrypt a5e894bc87b76fd980075892ba77e6bdeeb5e4d0 +btrfs 2789b2c034d7c0c8687355921a38c5ac41a565fa +ceph 823d21c78453fcdf58dbd8ecefbb41f4f3eb6540 +cifs ddc7a7e1eeb116ccaf010a6f1fb6ab927f3f888d +configfs e6f2f0945f5e85f516d8df7d95afdeda927cc259 +configfs-rust e84c9b64df615e658e47561b835c1364dc48f0c0 +ecryptfs 8f6626bd6594a78f454d02b27b74a580c890cab9 +dlm 82bcb7b05ad90de126e9c09a7b46a81be799620e +erofs 209108a5456171ab430e25b54b2dfe083455bfb6 +exfat f9eed3f40ad19698a1624dac26abffd486ec4da5 +ext3 a344542d9f26d44a5ebf597220ccac84c536467e +ext4 8c4f6e3376348fc3162eed86a05b933921c8f9ed +f2fs 83f32c773255720a661aa45d83e36278135f23f5 +fsverity f9e450420da2624c93ce9585deebfabb87932774 +fuse 416fd13cb4b789b78304ef1b8579125106ba3ffc +gfs2 7e90f0c69e2fe8d762c55787f6190966305a37f1 +jfs dad98c5b2a05ef744af4c884c97066a3c8cdad61 +ksmbd af8c72f6550744fe948ef2dbc7ab8739c149aab2 +nfs 18a80121193c6d19519e218434c9acf90e8d0e5c +nfs-anna ef30b3efb7e8bae94d790a6503a595e1051323e7 +nfsd 9090ec5ecd6828b609d1c97433798907a5b78e5d +ntfs 564c7753647731d19170914c1c637d3b33d88d3b +ntfs3 ee1cb3443cff5a800948b662756f75b17ca63fe2 +orangefs 2bc09cb0e9e44c7e622b956332ebfb9b638fd5f7 +overlayfs 1f6ee9be92f8df85a8c9a5a78c20fd39c0c21a95 +ubifs a5e0055eac837a1168c781653943d4a0d9920af3 +v9fs 35ecd40c0d7e4f772d00dfec9f7077315ba5ca82 +v9fs-ericvh 028ef9c96e96197026887c0f092424679298aae8 +xfs ec8f62cc109a3f596b3c65dc0f1011c209239051 +zonefs 3a8389d42bdf4213730f4067f8bfa78bae6564ef +vfs-brauner 2c3ba1f1cb416b81d617b92a24a4bcaa48d574e3 +vfs 4dda01b67c8662c5d0c53034974cb8280c575a5d +mm-fixes 9e91d5d31a46eba0c2b38c4f52c6b02955cfbb13 +fs-current 2eff421eb89cf23c6682fa7f39efac36dfa379dd +kbuild-current 83deedcf85af511dc120b3cd8ee597d211cdf2fb +clang-fixes-current df2908090cda368b01ff43709f51890076c56157 +arc-current c03c1a14507dfaf8b856c2608f9ac216021fc222 +arm-current 1eb87d8f77379d4e4b279487b8c859fb64bd1afb +arm64-fixes a9cd14bfb0c113f1cd77be4349784663bec71bb4 +arm-soc-fixes 59f522f5a0ece96ce051a27d15533667a1d0dee8 +davinci-current cee9395acd8043be0644b25c34bfa86623f2b935 +realtek-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drivers-memory-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current af32c3cb72529b14bfb2685bbdaa2b1514496b58 +powerpc-fixes 93f51579e7df248780214094418f205253383cc5 +s390-fixes 375d5d57545f53d2bc3e15ada0e9da360fc68bea +net d2bfe74a8fe219a86b86c1f126e1d722a5001790 +bpf c8a8a68d3ab4a06c8f5a13a8c00275351c8239b4 +ipsec 835912998ca54a76b5c57f8c8459a86b1b45de40 +netfilter 734bef548a96e8774d6eef5dfa2026c6edc4e80b +ipvs ab699d296e066eb64f51d2a8a1d42237a3b186c8 +bluetooth-fixes 24a4c2f1f7cea608a3f8a94c023bb798093d1755 +wireless af32da41b0327b9c6a37856ba82b6760d6c8d10e +ath 045958acaa75205b31578cb22c4345e28dd2e4bf +iwlwifi 1e7e30fb650b8327534f65b2213a794c04975fa4 +wpan 2b4707a149a55e8fa75c9ef32b359d60f470a566 +rdma-fixes 72d3fcf802c45d00b300f25b848a93c3a2bd7c7e +sound-current a4311e9447bbb219044db38897f95be112f46a8a +sound-asoc-fixes bbe41586cdfa9aeb95d24b5682ce3a0f528e9648 +regmap-fixes 1ea2927c1bc3c66d2ff69f131268e6be4d38a87c +regulator-fixes ec255de3ff6676cdb23b9a5204999e69ad96d0e5 +spi-fixes 7da2aca123754c0e06092bbe179d58078b58d8d4 +pci-current 810c9fc7e7fd1f97ce38bc8dbc2c059cf31b94bf +driver-core.current 1f69e515c54802b1854dc579f8b830fcf2b95102 +tty.current c339f4010dea8b0d754f84ace70cd1b089878ef8 +usb.current 78585f90feb3bbaf3b1c642294c8c47e451dc3cf +usb-serial-fixes a90ee4305c4a5df72c11b31dacfdc76e00fcf78a +phy 93f51579e7df248780214094418f205253383cc5 +staging.current 24934cb6b8cd925b7c86ad818929c272a360ec53 +iio-fixes 09f742b49cb2728086d78be2b0b35e4d1d71fc85 +watchdog-fixes 2686e13649a9e846f6c08cf4ada0256ca19c3475 +counter-current fd73f4a6659897191fa0d40695fe370925dd3780 +char-misc.current c339f4010dea8b0d754f84ace70cd1b089878ef8 +soundwire-fixes 93f51579e7df248780214094418f205253383cc5 +thunderbolt-fixes 96a8479804e3f7af43e639e9df39f562f1a75fd5 +input-current f57202d55333f750a18e21c3b3f35f48ef14a61e +crypto-current 178aff4cf425b3fc51ff09c571fa1bfbc1eb8ea4 +libcrypto-fixes dd2a4edb26e1c78823c50ba10c42f2d3de2e5ec4 +vfio-fixes e242e974e812e7a47e3088860c80d9492fac314f +kselftest-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +dmaengine-fixes 93f51579e7df248780214094418f205253383cc5 +backlight-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mtd-fixes 1c1a342aceec79528b3ba51f376eca2be5928fe7 +mfd-fixes d5d2d7a8d8be18681a0864f58e3875f1c639e11c +v4l-dvb-fixes c03c1a14507dfaf8b856c2608f9ac216021fc222 +reset-fixes 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 +mips-fixes 93f51579e7df248780214094418f205253383cc5 +at91-fixes afb1ecfeda3fc31d6300a176f4854cc62e289bf3 +omap-fixes 2fabd2f406d0cf787be47b3bbeea99b30004033d +tegra-fixes 6c143432a14dbf5e455f5bf08bfa90fb69f39b90 +kvm-fixes 65ba8f34ec886ec72b2c07ddc8cf3d815c32869d +kvms390-fixes f47190b08b71e8482072978373ee88cb2dfbdaf4 +kvm-arm-fixes 79f3724ca89134f87f8e0e3f04cd330dc98d1654 +hwmon-fixes fb2c3f44a7e14627b9dca8e6b568e6cdc234b40b +nvdimm-fixes a8aec14230322ed8f1e8042b6d656c1631d41163 +cxl-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +dma-mapping-fixes 911655ab1dfb9d526978a75df3b210132620d30a +drivers-x86-fixes d144a494d81fcf2d1c5cf58b01c655bb8bafc701 +samsung-krzk-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +pinctrl-samsung-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +pinctrl-qcom-fixes 1df7f369075d7e8f7794981995a5103f1963bab7 +devicetree-fixes 30724547b221e0e670ddfef140fc7d816b2aaec6 +dt-krzk-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +scsi-fixes ec6b083915e8146e147314a5f4f1285d07b57bfc +drm-fixes c03c1a14507dfaf8b856c2608f9ac216021fc222 +drm-intel-fixes c03c1a14507dfaf8b856c2608f9ac216021fc222 +mmc-fixes b61dc6283bdf5e0b6f964922a31986ed12b07280 +rtc-fixes 055ef5ce9f67a6a3a1363fa663007f8196cc0fb8 +gnss-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +hyperv-fixes dbc393f6f009a2bf7e4a22ef2d70b53f533f20f4 +risc-v-fixes d4f25b097e46d82718bb737d4540c99b7ab0a408 +riscv-dt-fixes 0f70fd6f4c1d6c1f2ea298d8dd07c4a4d5dff9af +riscv-soc-fixes 3a25c1c77dc3769cb83c236ab33f7aa1fa17726c +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx 21a7f44fd0765fcc5194130b28767786eba1d1e7 +gpio-brgl-fixes baa14758afb3e2828de1f76511edc1de50216f39 +gpio-intel-fixes 3fd4bf93d586cb07304cdcb5e8b3c51ac1d8284f +pinctrl-intel-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +auxdisplay-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +kunit-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +renesas-fixes 8dc2615d5702059b2b71fca6f93c0d7d10ae54cb +perf-current aadea57f532882d8bab444646863c7ef8a778ff1 +efi-fixes d8809f6931065cbbf3554647a50a65a471ab5983 +battery-fixes 5b4bd13e0552926648a46c2c9a12a24dfaee3715 +iommufd-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +rust-fixes 7d109178cd644268326cd31702ed46c7ac8bb300 +w1-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +pmdomain-fixes 4c66c423593e26273ea0d644906ed007630c6f6d +i2c-andi-fixes 25e7ab89f4774b0f842cee0e8a20c11f755924d5 +i2c-rust-fixes 4eb422482ca5d924d7212ad2ca1cb7ea6f5b524d +sparc-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +clk-fixes 81493c1dd1b1ebecb2843a7815973a5bd9a37e5a +thead-clk-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +tenstorrent-clk-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +fustini-config-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +pwrseq-fixes c03c1a14507dfaf8b856c2608f9ac216021fc222 +thead-dt-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +ftrace-fixes 1650a1b6cb1ae6cb99bb4fce21b30ebdf9fc238e +ring-buffer-fixes 057caace5214da3b457bbd295e1a2ad34d3685ea +trace-fixes c47a7b11bcb3d45e29723afcf6336866476b1d08 +tracefs-fixes 07004a8c4b572171934390148ee48c4175c77eed +spacemit-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +tip-fixes 7dda0bcb08bf15dae6590d5fb827d798281383bf +kexec-fixes a901b0778ae82d46084b55237e65d3a7bb5f0c86 +liveupdate-fixes 3a0b8fa2eb36afc88b62a95f33f0c77c71fa5ded +drm-msm-fixes a15fac810c76397ec9f62a6fc26c4d7ab6e238a7 +uml-fixes af421e9aed3920c7ac88c24daa48606c7112feca +fwctl-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +devsec-tsm-fixes c3fd16c3b98ed726294feab2f94f876290bf7b61 +drm-rust-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +tenstorrent-dt-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +nfc-fixes b61732f47316d45f27706db7812950145d3327b5 +mm-nonmm-hotfixes-stable 65ba8f34ec886ec72b2c07ddc8cf3d815c32869d +mm-nonmm-hotfixes-unstable a58447d3a24b644ef955b123a3e3ff410ae5948c +drm-misc-fixes 6ce0c151d52f6741b6c04569e1886bc7837faa5d +rust 65ba8f34ec886ec72b2c07ddc8cf3d815c32869d +rust-interop 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b +rust-alloc 6e8339118040f24ebcc21db22c9c1b7398b7e39e +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init b7218f1996f8491dbe28632b70f444cb73f554df +rust-timekeeping 2ea0119f72dba597aa8a98cbdb72c564bfc5cb38 +rust-xarray c455f19bbe6104debd980bb15515faf716bd81b8 +rust-analyzer 0024f3311f6f54f10dc778802da3fea0522ade66 +mm 2afb5d8fc19c08c506c21494fdb92fbd64c55209 +mm-nonmm-stable 65ba8f34ec886ec72b2c07ddc8cf3d815c32869d +mm-nonmm-unstable ce0c944d8c6f081d03aa2508d5b691598077de43 +kbuild 2a5a1c2fab91358d44198eb16bf83e4989f73333 +clang-fixes 0bb666d5f5a2339a5692afb312c2161df9620503 +clang-format 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +perf 4626d370ae89b8af4d46a45372b269f926ec662d +compiler-attributes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +dma-mapping 4733f2966433b7f926f70c9dc461c33cd5c10835 +asm-generic adbbd9714f8058730f93c8df5c5bf1679456424b +alpha d58041d2c63e09a1c9083e0e9f4151e487c4e16a +arm 01330dac0fa7c16ef0f3da39757e9509653a2e3f +arm64 643b64025650d0ac5d57bd522d2eb0996a278081 +arm-perf 652ab8ee0d27f21a5f402a0b6ac227c8bbfdd64c +arm-soc a32ef3f1c49fd8128b5fe1e79b9738a54cd15127 +amlogic 8610d31587e139380db9cb8708f4263833b482d0 +asahi-soc 9378cd5ddcebc06fdd803373487ed1a376532391 +at91 bd49a1c72abbdddbc7b3d691d926623e33a7c1a0 +bmc ba3f2c447203166c640e40dc8e9b4b91fc613aa5 +broadcom c0f2033a9ce4b843ca3e947536a0607ecf982be1 +cix a0cffbd8878c55b12dc4555f883adf3372cecd91 +davinci cee9395acd8043be0644b25c34bfa86623f2b935 +drivers-memory a22355280361d2a376a2020059a2bae11e6cea10 +fsl a7831c657c90e8f9165f6bbe0cc56262fee075e8 +imx-mxs 31f9ec9f38735f42e1f0ba57347c420e56b99824 +mediatek 4bfec57314396c8c816ee78f4803987882b668a7 +mvebu 43cb5b5bd349a2b5f5ad2abd3abedaa5d69ca7a9 +omap 7cdd46c9d6c5a7f4800195af82bb718081e7c84d +qcom f5672a3dff0291d6a45eb0c258b9d2baeb4dc577 +realtek 3c778f0c9fa36b6b9a26bd2146df24ed4e830ba4 +renesas fb050251fd4fe3b4d0231495651901626c2a1464 +reset d373605cd514837d8a6de3d00c786d4bae6dbaf8 +rockchip d2abcbb905b0e4b2e06b257fa1e5bcf4faa6dbda +samsung-krzk 993e1bec85faedf90c5d27480793084e54357c09 +nomadik ff1501cbb825de117267124ecb8898112b4051c5 +integrator 5bf1bb010712bba28eda926ed453db3cab91381a +scmi c64a20a250d5eb8bb43ceffadb24aa852a7158b5 +sophgo 60e4cafd30908e7d8cdfdb4fa1a74dabed9f47b5 +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit d5eefaf546eb83f98206137a5784b6b8510e4fe5 +stm32 f831584128ac2a36fb4fa62fe106793d08c2dbf1 +sunxi 5243bd55dfe63a5f806622878f6fbdd78172fac9 +tee b0adf8e5e1ebf416abfe055475f08ae6a72fc2f7 +tegra 016e9c7ec4d13322c2544ad17a02fbbabeec4d68 +tenstorrent-dt cee9395acd8043be0644b25c34bfa86623f2b935 +fustini-config cee9395acd8043be0644b25c34bfa86623f2b935 +thead-dt 2414ca8f5a0cafdfdb2b5899fd173adc09b5adf1 +ti 9e2716807275dd86dbbc86d1b0a2ca957d9a37c1 +xilinx ac01278339e890bd1edf777c186506d2de8481fc +socfpga bb3f9d4267bad8948a10e12b15aeeb0daaff8fa8 +clk 0d9678b125d8315d62de1261bee67c7e6f21457e +clk-imx 52d4d1b26a5bc64de95099d0a3dd8b90dba1f3a3 +clk-renesas 21cbd7ec29930f8e7e156e18b81736f099f03849 +thead-clk cee9395acd8043be0644b25c34bfa86623f2b935 +tenstorrent-clk c64b54ddb692c30b8fb139a2ead32eb4db7faef5 +csky abb81e5ce7d995baa41556b8125fa59e28ba3be8 +loongarch 6f8d12bb1a1231dbba579932772701880745a21d +m68k af32c3cb72529b14bfb2685bbdaa2b1514496b58 +m68knommu cffad6e71539bc00d5a76c0c1057dc067d42715c +microblaze 2c455ddca7827ad8fa3a64fdbf5a60efb928b46a +mips bfe97f12a0a64c3682be21a02404238e3b91e945 +openrisc 6620f5e8c11c4f7e41222a86f5c97150cc5f84a5 +parisc-hd c03c1a14507dfaf8b856c2608f9ac216021fc222 +powerpc 129f5d395fd66b6587a5ac156b232cca060d6512 +risc-v a5ae1bf65cee84bcc121d659e7e22a767853f5f5 +riscv-dt 2186ec5f59c23fcf0bf896ca0543b6a1135d7bb5 +riscv-soc 3160b4a8aeea997f9b494db8c9e14a4d287a7381 +s390 c98d9be7a0bea1f43b62f2c738acd4866f62b9c8 +sh f45711b39e03ff5e80b60dcc1fd34b3fc7d3d36c +sparc d957b367d560c4a74637d400ca4e0e63bbdfbcd1 +uml 7cd80b8168c9269e4b11788ce815c0f446ab5b34 +xtensa 28722ed2527aa63ac1454013defe718c56032886 +fs-next 90a1931c2e8ee08d38dce466e3ef3d51a2e6cf3b +printk 647ef123d19695b5d8c79e03c86fb17c558e30b7 +pci 17bb0e2f6c8043f70a693a5f3797471cbed354c8 +pstore 7c756181175d50200be487affa905e973f6cbaf5 +hid 720806515cb6921ab05caaa6f470f7054b56385e +i2c 8cd9520d35a6c38db6567e97dd93b1f11f185dc6 +i2c-andi 00fb8097ca5a4fcf0e0cc1550075aa7313bbd32a +i2c-rust e7755b5f29ccbfd1222dd52dc2d6eebf39d02289 +i3c fc5eb1b0631aa3b34c530ae962d01699ed22a0ae +dmi 1afafbaf749d8e8ec53f8e38efdc731131902b5b +hwmon-staging e1b3c2630d5b8bc755fe4ba86d20d08c734eb504 +jc_docs 151235bf3d5d4de1a077a83c54ee651e074816ae +v4l-dvb 27285b099fbc5cb2ae3aef20f3bbd7b3c88b3005 +v4l-dvb-next adc218676eef25575469234709c2d87185ca223a +pm 4785d7fc44de81f850101df9f8627775a6010c5a +cpufreq-arm 81792daacfb41ca07b04bd3956ea9e672080cc98 +cpupower cee9395acd8043be0644b25c34bfa86623f2b935 +devfreq 9a222650d9e70d0027126e4df5b00b1b5b678a97 +pmdomain 6d318db9ffcb611f9b3b6b3201c963690541a943 +opp 706081c6b9327dd611dd72b20130a77f0f059b6e +thermal 2dc1f296b5754dd2441fc8b6613a362a47f6b98f +rdma c3e8e9451e6f1b69f685b75e0fbf14f3d0fb2539 +net-next 734bef548a96e8774d6eef5dfa2026c6edc4e80b +bpf-next 65ba8f34ec886ec72b2c07ddc8cf3d815c32869d +ipsec-next 014d795c73837ea2339a4ea8e8f82c6e959b845d +mlx5-next 41de84543574f2923776790f608c56389aed972e +netfilter-next 734bef548a96e8774d6eef5dfa2026c6edc4e80b +ipvs-next a5e7d8e446af9803e37a3b6a4d416fb41178348f +bluetooth 1081a6ef8f1e0661fd52eb3f878691b0b96cdff9 +wireless-next 9b0be45d4d52fd223994e151f169743a97abd290 +ath-next cd026e68fdbf88b9cc522b76c7a9d92c9a41f709 +iwlwifi-next 3627924ed81fd7783394fb2555ea179c6606a231 +wpan-next a6bfdfcc6711d1d5a92e98644359dedc67c0c858 +wpan-staging a6bfdfcc6711d1d5a92e98644359dedc67c0c858 +mtd 0ef71adafaa9b36a06dd5b823aebcd2fa9b9b9c2 +nand 30daaf3e7897b4a8d9b72e5b0c86dd6e2a4d7d85 +spi-nor d7040c620d8b22f839af7750860b96e39cc58b7c +crypto 178aff4cf425b3fc51ff09c571fa1bfbc1eb8ea4 +libcrypto 20ec6916d8712e84d58e8c688a25cd368ddeb82b +drm f94ed3d7cba3c83eef50b1a96d630d63cf54f69c +drm-exynos 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc 9a96e169c9267af918d28fb291df948d83112807 +amdgpu a24121023a434cb9b2b4db964d3fbbb4547d5e4c +drm-intel 1b15fa434b4b49cdf276fc0bc88264605661fdf6 +drm-msm d024361c631b3f020a26c07d683e5103404b0fbf +drm-msm-lumag 6b93e8b453fa27a1b6a1d472f3ff8663e6811fae +drm-xe d9b01b2d88eb92dc79acc3777189f8f7d0508bac +drm-rust d511064b2e732b7152a542d589d07a4814c1b674 +drm-nova 93296e9d9528f0d87f2cf3fee494599060a0f14a +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev f93dd31db3e23e61aa7a8a00bc02d2ccf675efd8 +regmap 1ea2927c1bc3c66d2ff69f131268e6be4d38a87c +sound a4311e9447bbb219044db38897f95be112f46a8a +ieee1394 32906613748b3a42bb29472ff406f8ba2538cb31 +sound-asoc bbe41586cdfa9aeb95d24b5682ce3a0f528e9648 +modules 08abfa5a161e1b6e6244cb2090b0530bc0920798 +input 97a889cad5dd8ff83f40514f2d67c565c0dc54b1 +block c3442b2bab8502c6fc8214e4d4dab7772cbb4d08 +device-mapper 334714e4bdf8868c17a7650a7502ba1c90a8721f +libata 69be770908ae57354a41d7e1cc99ab46278d2e86 +pcmcia b3c26ea81ccc522e77ed0b1707add61fc9206216 +mmc fd9af27f6c2319713bb23832066585f8a59a1771 +mfd c8132247fe4df52e9982d74c986bb199d792b85b +backlight eacfbe6f9716d00536edc229a58895405e73c2e4 +battery f0f400459bf6a037e70768de623fff3f8920b8bb +regulator ec255de3ff6676cdb23b9a5204999e69ad96d0e5 +security 436485132d2367a50aa22dcc8a89faeee24a4cc9 +apparmor cee9395acd8043be0644b25c34bfa86623f2b935 +integrity 52beb95621c04f4beab56858f9328b1a18f53583 +selinux 12802add29de8a556006f144f4000fc1fcffd5a2 +smack fedc88e38ce979a720cd2de042578cb5df3dc8de +tomoyo 72d3fcf802c45d00b300f25b848a93c3a2bd7c7e +tpmdd-tpm 94d78ae4bcb5a38a4a7f54a579c55d2f77370697 +tpmdd-keys 9a2a4c51dccc3168c3dc949fcbaa360a478fa228 +watchdog 6276c8195e598361942082423114877265c17692 +iommu 20bfd25757659ff8229eeed6f048c76f9a11a4a3 +audit b9e002df320f19b3425ebbfd1edd2f673c16e551 +devicetree e8ff9af18e80279b80cf7063244db91b12f5e27e +dt-krzk dfcea1641506d7ba096a9e6ead5d15f5573206ec +mailbox 01a40ad5a9687ea5a837857d4b21ddd764be7aa3 +spi 7da2aca123754c0e06092bbe179d58078b58d8d4 +tip 304878ac70de5652709e3d10b589d67be7eccd5f +kexec 833d2b79ed9520e77c5d83eb11644e5239b2c5bb +liveupdate 27be83a12b246b6b3783e7d3ac5c378ff7520f25 +clockevents c40b76c8cf580466d9e56223f7f74beecc165480 +edac 0489f2176209b710890096699c4b869f1db91df4 +ftrace d7ff48d92a0f28bc0612da47c054efbc28c19562 +rcu d9011419496a3dc6b455b5308846684c63c18de5 +paulmck 0bd14c956dd2e4c8deed369ee3e3939b83bdb31c +kvm 1689c80fca308978ea1c9f03d15a500f4e44e2e1 +kvm-arm dd0bc00e3e9201fd49b62ff9cc07890c89003afe +kvms390 e93fb70b748982fda5e6d97721df35194cacfc4a +kvm-ppc 93f51579e7df248780214094418f205253383cc5 +kvm-riscv 633b3931a87438282d6454646ff40c669a6896cb +kvm-x86 dea4f6380f4ec96e8f3b0aaf2343764bd0d25ef4 +xen-tip 61b6d1df1d6234c38a6ea7e4f58e7da035ef6ab4 +percpu 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +workqueues 4b0f96d92b0b57b31d2d46f5fc03bf425bc587dc +sched-ext a96c41fea8dae7f0cb89b432007c9d38420cd55e +drivers-x86 9d3475065167197742b0882aff21cf8e78393277 +chrome-platform 2d3ee0bdb321ad84d9cf18d4bfd2b839293a695d +chrome-platform-firmware f2e05ce9763feb1dd7da15afd2cc61df227ee85a +hsi e81250ec6b69248b00d38c523dc6a13efaf38aab +leds-lj 59cf91cf87abb67a49b1bb7b9d3b06486abde8cf +ipmi 3cdd6cc1e9d8532055f8cfa41c58eb6990e539e1 +driver-core 0cc3ad8f4d2e2009c2005278c754caf7c07fe0a4 +usb c339f4010dea8b0d754f84ace70cd1b089878ef8 +thunderbolt a93a8e3200002f0c345fec4c340390e9a60aabc7 +usb-serial d446199711161e35c7f97f1556753c81546fe0e2 +tty c339f4010dea8b0d754f84ace70cd1b089878ef8 +char-misc c339f4010dea8b0d754f84ace70cd1b089878ef8 +coresight 343cfcbb3ecfdb80aa576a428cfa3b65ad783842 +fastrpc ef071c4906eb45d16b60f09154cf0bc6ec8f5435 +fpga 093da48782df3d50953c520626b345ca70af8cbd +icc 3fd56a2833c22f62eb84297d0dbd47739632f1a0 +iio a3b3580713f3ac5a32dc2874ee546828977a1d68 +nfc fd73f4a6659897191fa0d40695fe370925dd3780 +phy-next 8f56fdf3d8cb9f1dbdc93bf9ac816698aa6f70b7 +soundwire 2e9eff8847a46530ab937696f340b9d5bea2e4ef +extcon 8d3ae59288f1e7d58d76558a6ee96d533bc5019f +gnss cee9395acd8043be0644b25c34bfa86623f2b935 +vfio 076d7e989cb69f6ded7d60f2a080eb909930061b +w1 813a5b9a3c9f6cee830b1e23343fbd2359683557 +spmi 8f70c729e68c3e02ccca6d13c733175489fdc069 +staging d135ab453a7400a34930bdda1ef4bdc8acfac80e +counter-next edac5cf35699492027fb54e348dc6234b2661617 +mux ac7bde3c53166656d80e3aacc7d274d3c60a6de4 +dmaengine aff5e6a77fc69a7c490246465940d18422d7c631 +cgroup 94b1632f651013f1f343bff4742f21a42076d9bc +scsi 6a53f401e671b75c129245e371ca6e9d47fc3c9a +scsi-mkp 503e6172fa74da6b4944ece458f5534681e51d21 +vhost c69023b5e16e5ffe9368603dca76d85bd544ee57 +rpmsg 23d0516587f896f5f16a47c97ddb41d28e6289ff +gpio-brgl 963ed0d562cf29c7ff1f430d163392dc44e338be +gpio-intel 0fc424b6a8ef447450f6087db42abce3a6feb328 +pinctrl 6e648fe0b51f9cc15dbc63391bb723ac037d686c +pinctrl-intel c016587866e573fa8dff50c3bdae9734c4418099 +pinctrl-renesas 0cd4a7b3a4883970df3ae8814d9aabdecf65a81e +pinctrl-samsung cee9395acd8043be0644b25c34bfa86623f2b935 +pinctrl-qcom 30d9a180c86e3cbd53efb7152e05cb059112f6eb +pwm 00e917df050d79ac26ec700717680ad6421d2808 +ktest 5b598ba5f3bf367944956cee59c6d078c53ca694 +kselftest 368e5d4d12a802ee3708800319cd13904721286f +kunit cee9395acd8043be0644b25c34bfa86623f2b935 +kunit-next e38f53f0482468efd04397f66bda4648b70ac9fa +livepatching f1e818b239dd11397f9a379b84a7a4985e8afdfe +rtc 45efb584a1c0bcd6d75a239dd8ce3ca554a66cf5 +nvdimm 9b036546a02c6c9a5133f9c1e93503896595c6ba +at24 dc59e4fea9d83f03bad6bddf3fa2e52491777482 +ntb dc59e4fea9d83f03bad6bddf3fa2e52491777482 +seccomp e32008340585a12783045c4426fbb963cfa11b7e +slimbus 4350d705466992dce4a21c382985553bfb568f65 +nvmem 41f42ff4ae134eba8dbe3424cf2ca1824c652edd +hyperv 33b28f3b313353f11fc939e9a268605e66290d0b +auxdisplay f63dc0eea92d07c5bb799a406571b555cd2bbd97 +kgdb 9ca9e8c857b55a081d5a1f8039b27cbb4d646b49 +hmm 47193113641e5e1f9b5758b73d7b7a0273acb836 +cfi dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mhi 0b1883ca75c0005ab5ca52c7bc1a26329bc39746 +cxl cf15f9f2361dd4002203716b7b878393c0eee4bf +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi 2c493ac8c347167eec9e4e985d2b58d5fa6fd420 +unicode a511442085c140da9cdbe60e3f0fab1c71480801 +random eb13a1ff271b0d180687eebb30611b0b276d5193 +landlock 3e271a27c46fd591d1011c7de5a644a41e2010f1 +sysctl 4991c8b72b564cd16cb48124f880617fd49f1013 +execve b36b990c50b1f581b9a7f35ae256f5542415fa69 +bitmap 4c9c30534d06fea3070e57b868f8b7755950824c +hte 30167fadbf87fa901a2fee49c30a5c5a506a43e8 +kspp 56a1b1018838ce281eb47c74e0a118a210a804cf +nolibc 700ce4da6f6f172435349b687d2d916e791c6330 +iommufd 04bcf84613346b973a8cc0c59238b6b5bc902688 +turbostat f31adc690d6834db65d8683b6b835497606f5e6c +pwrseq f1f9cc4aadd9e1cb47626df5ce1cfb12c455f390 +capabilities-next 507adb6448378155ec89495fed8c3c09d8c83920 +ipe c03c1a14507dfaf8b856c2608f9ac216021fc222 +kcsan bd3cc16d1d7d584911f856adc458f242b1c7e85f +crc cee9395acd8043be0644b25c34bfa86623f2b935 +keys-next 965e9a2cf23b066d8bdeb690dff9cd7089c5f667 +fwctl bc6f2a284c63313e789d8cd294531e1cc2dc8c99 +devsec-tsm 3177779ae17db4c66c851f799505fb95c7530c03 +hisilicon a5db65458a911daa6f8927264366dab501715dc0 +device-id 995832b2cebe6969d1b42635db698803ee31294d +kthread fa39ec4f89f2637ed1cdbcde3656825951787668 +kapi ef777ef05ebcc5ea5393b4bd5af6fc3ad1b3aec9 +pagemap-headers e02cb91d4644dfff593146f89e70d2008cc6ac16
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 0000000..4514ed3 --- /dev/null +++ b/Next/Trees
@@ -0,0 +1,436 @@ +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 +overlayfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes +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 https://git.manguebit.org/linux.git#cifs-next +configfs https://git.kernel.org/pub/scm/linux/kernel/git/leitao/linux.git#configfs-next +configfs-rust 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://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/smb.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 +ntfs https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git#ntfs-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-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mm/linux.git#for-next-fixes +kbuild-current https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-fixes-for-next +clang-fixes-current https://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux.git#clang-fixes-for-current +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 +realtek-fixes https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git#fixes +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 +bluetooth-fixes https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git#master +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 +watchdog-fixes https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#watchdog +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.kernel.org/pub/scm/linux/kernel/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 +tegra-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.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 +kvm-arm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#fixes +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 +pinctrl-qcom-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pinctrl-qcom/for-current +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 +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-andi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-fixes +i2c-rust-fixes https://github.com/ikrtn/rust-for-linux#rust-i2c-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 +tenstorrent-clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-clk-fixes +fustini-config-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#riscv-config-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://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux#fixes +tip-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#tip/urgent +kexec-fixes https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#kexec-fixes +liveupdate-fixes https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#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#for-linux-next-fixes +tenstorrent-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-dt-fixes +nfc-fixes https://codeberg.org/linux-nfc/linux.git#for-linus +mm-nonmm-hotfixes-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-hotfixes-stable +mm-nonmm-hotfixes-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-hotfixes-unstable +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-interop https://github.com/Rust-for-Linux/linux.git#interop-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 https://git.kernel.org/pub/scm/linux/kernel/git/mm/linux.git#for-next +mm-nonmm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +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-fixes https://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux.git#clang-fixes-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/frank.li/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 +realtek https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git#for-next +renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset https://git.kernel.org/pub/scm/linux/kernel/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 +nomadik https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git#for-next +integrator https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.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://git.kernel.org/pub/scm/linux/kernel/git/spacemit/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://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-dt-for-next +fustini-config https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#riscv-config-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 +socfpga https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.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 +tenstorrent-clk https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-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-andi https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-next +i2c-rust https://github.com/ikrtn/rust-for-linux#rust-i2c-next +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 +drm-rust https://gitlab.freedesktop.org/drm/rust/kernel.git#for-linux-next +drm-nova https://gitlab.freedesktop.org/drm/nova.git#nova-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-tpm https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#for-next-tpm +tpmdd-keys https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#for-next-keys +watchdog https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#watchdog-next +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 +kexec https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#kexec-next +liveupdate https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#next +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 +nfc https://codeberg.org/linux-nfc/linux.git#for-next +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 +pinctrl-qcom https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pinctrl-qcom/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 +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 +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 +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 +device-id https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#device-id-rework +kthread https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#for-next +kapi https://git.kernel.org/pub/scm/linux/kernel/git/sashal/kapi.git#spec +pagemap-headers git://git.infradead.org/users/willy/pagecache.git#headers
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 0000000..e9f4ad3 --- /dev/null +++ b/Next/merge.log
@@ -0,0 +1,6307 @@ +$ date -R +Thu, 29 Oct 2026 11:10:19 +0000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 65ba8f34ec886 Merge tag 'xtensa-20261027' of https://github.com/jcmvbkbc/linux-xtensa +Merging origin/master (c339f4010dea8 Merge tag 'platform-drivers-x86-v7.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 65ba8f34ec886..c339f4010dea8 +Fast-forward (no commit created; -m option ignored) + .../ABI/removed/sysfs-driver-uniwill-laptop | 10 + + Documentation/ABI/testing/debugfs-tpmi | 8 +- + Documentation/ABI/testing/sysfs-class-power | 49 +- + .../ABI/testing/sysfs-class-power-ltc4162l | 2 + + Documentation/ABI/testing/sysfs-class-power-mp2629 | 2 +- + Documentation/ABI/testing/sysfs-class-power-rt9467 | 2 + + Documentation/ABI/testing/sysfs-class-power-rt9471 | 2 + + .../sysfs-driver-lenovo-yoga-slim7x-gen11-ec | 22 + + .../ABI/testing/sysfs-driver-uniwill-laptop | 15 +- + .../admin-guide/laptops/thinkpad-acpi.rst | 26 +- + .../admin-guide/laptops/uniwill-laptop.rst | 9 +- + Documentation/arch/x86/amd_hsmp.rst | 24 +- + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 2 + + .../devicetree/bindings/dma/amlogic,a9-dma.yaml | 68 ++ + .../devicetree/bindings/dma/apple,admac.yaml | 10 +- + .../bindings/dma/hisilicon,k3-dma-1.0.yaml | 87 ++ + Documentation/devicetree/bindings/dma/k3dma.txt | 47 - + .../devicetree/bindings/dma/mediatek,uart-dma.yaml | 1 + + .../devicetree/bindings/dma/qcom,gpi.yaml | 2 + + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 6 + + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 22 + + .../devicetree/bindings/dma/stericsson,dma40.yaml | 14 + + .../bindings/dma/ti,dra7-dma-crossbar.yaml | 94 ++ + .../devicetree/bindings/dma/ti-dma-crossbar.txt | 68 -- + .../devicetree/bindings/i3c/nxp,p3h2840.yaml | 330 +++++++ + .../bindings/i3c/snps,dw-i3c-master.yaml | 16 +- + .../bindings/phy/aspeed,ast2700-usb3-phy.yaml | 48 + + .../bindings/phy/mediatek,mt8195-dp-phy.yaml | 77 ++ + .../bindings/phy/mediatek,mt8196-pcie-sphy.yaml | 93 ++ + .../devicetree/bindings/phy/mediatek,tphy.yaml | 1 + + .../devicetree/bindings/phy/mediatek,xsphy.yaml | 5 + + .../bindings/phy/nvidia,tegra194-xusb-padctl.yaml | 39 + + .../bindings/phy/nvidia,tegra264-mphy.yaml | 108 +++ + .../bindings/phy/phy-rockchip-usbdp.yaml | 24 + + .../bindings/phy/qcom,m31-eusb2-phy.yaml | 1 + + .../phy/qcom,nord-qmp-gen5x16-pcie-phy.yaml | 267 ++++++ + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 93 +- + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 4 + + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 61 +- + .../bindings/phy/qcom,snps-eusb2-phy.yaml | 13 +- + .../bindings/phy/rockchip-inno-csi-dphy.yaml | 2 + + .../devicetree/bindings/phy/ti,tcan104x-can.yaml | 10 +- + .../devicetree/bindings/power/supply/battery.yaml | 3 +- + .../devicetree/bindings/power/supply/bq27xxx.yaml | 4 +- + .../power/supply/stericsson,ab8500-charger.yaml | 76 +- + .../devicetree/bindings/remoteproc/mtk,scp.yaml | 22 +- + .../bindings/remoteproc/qcom,pas-common.yaml | 9 + + .../bindings/remoteproc/qcom,sm8550-pas.yaml | 31 +- + .../bindings/remoteproc/ti,am3352-wkup-m3.yaml | 1 - + .../bindings/soundwire/qcom,soundwire.yaml | 1 + + Documentation/driver-api/dmaengine/provider.rst | 15 +- + Documentation/power/power_supply_class.rst | 23 +- + Documentation/staging/rpmsg.rst | 17 + + Documentation/wmi/devices/acer-wmi-battery.rst | 70 ++ + Documentation/wmi/devices/bitland-mifs-wmi.rst | 64 +- + MAINTAINERS | 45 +- + arch/arm64/boot/dts/qcom/sdx75.dtsi | 3 +- + arch/x86/include/uapi/asm/amd_hsmp.h | 420 +++++++++ + drivers/acpi/Kconfig | 2 +- + drivers/acpi/video_detect.c | 8 - + drivers/dma/Kconfig | 10 + + drivers/dma/Makefile | 1 + + drivers/dma/altera-msgdma.c | 10 +- + drivers/dma/amba-pl08x.c | 4 +- + drivers/dma/amlogic-dma.c | 737 ++++++++++++++++ + drivers/dma/apple-admac.c | 24 + + drivers/dma/arm-dma350.c | 2 +- + drivers/dma/at_hdmac.c | 139 ++- + drivers/dma/at_xdmac.c | 159 ++-- + drivers/dma/bestcomm/Kconfig | 2 +- + drivers/dma/bestcomm/ata.c | 2 - + drivers/dma/bestcomm/bestcomm.c | 46 +- + drivers/dma/bestcomm/gen_bd.c | 23 +- + drivers/dma/dma-jz4780.c | 10 +- + drivers/dma/dmaengine.c | 47 +- + drivers/dma/dmaengine.h | 32 + + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 151 ++-- + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 57 +- + drivers/dma/dw-edma/dw-edma-core.c | 512 +++++++---- + drivers/dma/dw-edma/dw-edma-core.h | 67 +- + drivers/dma/dw-edma/dw-edma-pcie.c | 18 + + drivers/dma/dw-edma/dw-edma-v0-core.c | 59 +- + drivers/dma/dw-edma/dw-hdma-v0-core.c | 82 +- + drivers/dma/dw-edma/dw-hdma-v0-debugfs.c | 17 +- + drivers/dma/dw-edma/dw-hdma-v0-regs.h | 10 - + drivers/dma/dw/core.c | 47 +- + drivers/dma/dw/dw.c | 1 + + drivers/dma/dw/platform.c | 12 +- + drivers/dma/ep93xx_dma.c | 37 +- + drivers/dma/fsl-edma-common.c | 255 +++++- + drivers/dma/fsl-edma-common.h | 15 +- + drivers/dma/fsl-edma-main.c | 7 +- + drivers/dma/fsl-edma-trace.h | 5 + + drivers/dma/fsl_raid.c | 38 +- + drivers/dma/fsldma.c | 22 +- + drivers/dma/idma64.c | 10 +- + drivers/dma/img-mdc-dma.c | 2 +- + drivers/dma/ioat/init.c | 18 +- + drivers/dma/ioat/sysfs.c | 22 +- + drivers/dma/loongson/loongson1-apb-dma.c | 23 +- + drivers/dma/loongson/loongson2-apb-cmc-dma.c | 27 +- + drivers/dma/loongson/loongson2-apb-dma.c | 9 +- + drivers/dma/mediatek/mtk-hsdma.c | 26 +- + drivers/dma/mmp_pdma.c | 3 +- + drivers/dma/moxart-dma.c | 23 +- + drivers/dma/mv_xor.c | 8 +- + drivers/dma/nbpfaxi.c | 2 +- + drivers/dma/owl-dma.c | 21 +- + drivers/dma/pch_dma.c | 41 +- + drivers/dma/pl330.c | 4 +- + drivers/dma/plx_dma.c | 10 +- + drivers/dma/ppc4xx/adma.c | 12 +- + drivers/dma/ppc4xx/xor.h | 2 +- + drivers/dma/pxa_dma.c | 52 +- + drivers/dma/qcom/bam_dma.c | 10 +- + drivers/dma/qcom/gpi.c | 9 +- + drivers/dma/qcom/hidma.c | 8 +- + drivers/dma/sh/rcar-dmac.c | 26 +- + drivers/dma/sh/rz-dmac.c | 6 +- + drivers/dma/sprd-dma.c | 45 +- + drivers/dma/st_fdma.c | 2 +- + drivers/dma/ste_dma40.c | 607 +++++++++---- + drivers/dma/ste_dma40_ll.c | 8 +- + drivers/dma/ste_dma40_ll.h | 4 +- + drivers/dma/stm32/stm32-dma.c | 69 +- + drivers/dma/stm32/stm32-dma3.c | 99 +-- + drivers/dma/stm32/stm32-mdma.c | 96 +- + drivers/dma/sun4i-dma.c | 17 +- + drivers/dma/sun6i-dma.c | 215 +++-- + drivers/dma/switchtec_dma.c | 94 +- + drivers/dma/tegra186-gpc-dma.c | 4 +- + drivers/dma/tegra20-apb-dma.c | 2 +- + drivers/dma/ti/k3-udma.c | 6 +- + drivers/dma/timb_dma.c | 63 +- + drivers/dma/txx9dmac.c | 89 +- + drivers/dma/virt-dma.h | 16 + + drivers/dma/xgene-dma.c | 4 +- + drivers/dma/xilinx/xilinx_dma.c | 85 +- + drivers/dma/xilinx/zynqmp_dma.c | 74 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 4 +- + drivers/gpu/drm/gma500/Kconfig | 1 - + drivers/gpu/drm/i915/Kconfig | 1 - + drivers/gpu/drm/radeon/Kconfig | 4 +- + drivers/gpu/drm/xe/Kconfig | 5 +- + drivers/i3c/Kconfig | 14 + + drivers/i3c/Makefile | 1 + + drivers/i3c/device.c | 15 +- + drivers/i3c/hub.c | 832 ++++++++++++++++++ + drivers/i3c/internals.h | 16 + + drivers/i3c/master.c | 476 ++++++++-- + drivers/i3c/master/adi-i3c-master.c | 4 + + drivers/i3c/master/amd-i3c-master.c | 4 +- + drivers/i3c/master/dw-i3c-master.c | 28 +- + drivers/i3c/master/dw-i3c-master.h | 2 +- + drivers/i3c/master/mipi-i3c-hci/cmd.h | 4 +- + drivers/i3c/master/mipi-i3c-hci/cmd_v1.c | 28 +- + drivers/i3c/master/mipi-i3c-hci/cmd_v2.c | 4 +- + drivers/i3c/master/mipi-i3c-hci/core.c | 112 ++- + drivers/i3c/master/mipi-i3c-hci/dat.h | 2 + + drivers/i3c/master/mipi-i3c-hci/dat_v1.c | 13 +- + drivers/i3c/master/mipi-i3c-hci/dma.c | 136 ++- + drivers/i3c/master/mipi-i3c-hci/hci.h | 9 +- + drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c | 5 +- + drivers/media/i2c/Kconfig | 11 +- + drivers/media/spi/Kconfig | 4 + + drivers/pci/controller/dwc/pcie-designware.c | 1 + + drivers/phy/Kconfig | 3 +- + drivers/phy/Makefile | 1 + + drivers/phy/apple/atc.c | 93 +- + drivers/phy/aspeed/Kconfig | 15 + + drivers/phy/aspeed/Makefile | 2 + + drivers/phy/aspeed/phy-aspeed-usb3.c | 236 +++++ + drivers/phy/broadcom/phy-brcm-sata.c | 2 +- + drivers/phy/broadcom/phy-brcm-usb.c | 29 +- + drivers/phy/cadence/phy-cadence-sierra.c | 11 +- + drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 61 +- + drivers/phy/hisilicon/phy-hi3670-pcie.c | 4 +- + drivers/phy/mediatek/Kconfig | 12 + + drivers/phy/mediatek/Makefile | 1 + + drivers/phy/mediatek/phy-mtk-dp.c | 826 ++++++++++++++++-- + drivers/phy/mediatek/phy-mtk-pcie-sphy.c | 561 ++++++++++++ + drivers/phy/mediatek/phy-mtk-xsphy.c | 39 +- + drivers/phy/phy-google-usb.c | 449 +++++++++- + drivers/phy/phy-xgene.c | 2 +- + drivers/phy/qualcomm/Kconfig | 1 + + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 506 +++++++++-- + drivers/phy/qualcomm/phy-qcom-qmp-common.h | 32 + + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 24 - + drivers/phy/qualcomm/phy-qcom-qmp-pcie-multiphy.c | 963 +++++++++++++++++++-- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 105 ++- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_40.h | 55 ++ + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_40.h | 14 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v8_50.h | 4 +- + .../qualcomm/phy-qcom-qmp-qserdes-com-pcie-v6_40.h | 94 ++ + .../phy-qcom-qmp-qserdes-txrxz-pcie-v6_40.h | 194 +++++ + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 24 - + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 24 - + drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 24 - + drivers/phy/realtek/phy-rtk-usb2.c | 3 +- + drivers/phy/realtek/phy-rtk-usb3.c | 3 +- + drivers/phy/rockchip/Kconfig | 2 + + drivers/phy/rockchip/phy-rockchip-inno-csidphy.c | 15 + + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 2 +- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 2 +- + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 19 + + drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c | 8 +- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 80 +- + drivers/phy/rockchip/phy-rockchip-usb.c | 2 +- + drivers/phy/rockchip/phy-rockchip-usbdp.c | 443 +++++----- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 78 +- + drivers/phy/socionext/phy-uniphier-usb3hs.c | 3 +- + drivers/phy/spacemit/Kconfig | 3 + + drivers/phy/starfive/phy-jh7110-dphy-tx.c | 16 +- + drivers/phy/tegra/Kconfig | 11 + + drivers/phy/tegra/Makefile | 3 + + drivers/phy/tegra/phy-tegra-mphy.c | 459 ++++++++++ + drivers/phy/tegra/xusb-tegra186.c | 56 +- + drivers/phy/tegra/xusb.c | 20 +- + drivers/phy/tegra/xusb.h | 6 + + drivers/platform/arm64/Kconfig | 40 + + drivers/platform/arm64/Makefile | 2 + + drivers/platform/arm64/acer-aspire1-ec.c | 2 +- + drivers/platform/arm64/asus-glymur-ec.c | 617 +++++++++++++ + drivers/platform/arm64/huawei-gaokun-ec.c | 2 +- + drivers/platform/arm64/lenovo-thinkpad-t14s.c | 10 +- + drivers/platform/arm64/lenovo-yoga-c630.c | 2 +- + .../platform/arm64/lenovo-yoga-slim7x-gen11-ec.c | 530 ++++++++++++ + drivers/platform/arm64/qcom-hamoa-ec.c | 19 +- + drivers/platform/loongarch/Kconfig | 1 + + drivers/platform/mellanox/mlxbf-tmfifo.c | 1 - + drivers/platform/mellanox/mlxreg-hotplug.c | 4 +- + drivers/platform/olpc/olpc-ec.c | 2 +- + .../platform/surface/surface_aggregator_registry.c | 7 +- + drivers/platform/wmi/Kconfig | 14 +- + drivers/platform/wmi/Makefile | 4 + + drivers/platform/{x86/wmi-bmof.c => wmi/bmof.c} | 0 + drivers/platform/wmi/core.c | 33 +- + drivers/platform/x86/Kconfig | 24 +- + drivers/platform/x86/Makefile | 4 +- + drivers/platform/x86/acer-wmi-battery.c | 450 ++++++++++ + drivers/platform/x86/acer-wmi.c | 94 +- + drivers/platform/x86/amd/hfi/hfi.c | 34 +- + drivers/platform/x86/amd/hsmp/acpi.c | 31 +- + drivers/platform/x86/amd/hsmp/hsmp.c | 246 ++++-- + drivers/platform/x86/amd/hsmp/hsmp.h | 24 + + drivers/platform/x86/amd/pmc/pmc-quirks.c | 26 + + drivers/platform/x86/amd/pmc/pmc.c | 26 +- + drivers/platform/x86/amd/pmc/pmc.h | 1 + + drivers/platform/x86/amd/pmf/acpi.c | 76 +- + drivers/platform/x86/amd/pmf/core.c | 23 +- + drivers/platform/x86/amd/pmf/pmf.h | 150 +++- + drivers/platform/x86/amd/pmf/spc.c | 23 +- + drivers/platform/x86/amd/pmf/sps.c | 15 +- + drivers/platform/x86/amd/pmf/util.c | 1 + + drivers/platform/x86/asus-armoury.c | 309 +++---- + drivers/platform/x86/asus-armoury.h | 408 ++++++++- + drivers/platform/x86/asus-laptop.c | 2 +- + drivers/platform/x86/asus-nb-wmi.c | 25 +- + drivers/platform/x86/asus-tf103c-dock.c | 2 +- + drivers/platform/x86/asus-wmi.c | 233 +++-- + drivers/platform/x86/asus-wmi.h | 1 - + drivers/platform/x86/ayaneo-ec.c | 7 + + drivers/platform/x86/bitland-mifs-wmi.c | 146 ++-- + drivers/platform/x86/dell/alienware-wmi-wmax.c | 8 + + drivers/platform/x86/dell/dell-dw5826e-reset.c | 30 +- + drivers/platform/x86/dell/dell-wmi-aio.c | 225 ++--- + drivers/platform/x86/gpd-pocket-fan.c | 9 +- + drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 179 ++-- + drivers/platform/x86/hp/hp-bioscfg/bioscfg.h | 3 + + .../platform/x86/hp/hp-bioscfg/enum-attributes.c | 57 +- + .../platform/x86/hp/hp-bioscfg/int-attributes.c | 64 +- + .../x86/hp/hp-bioscfg/order-list-attributes.c | 69 +- + .../x86/hp/hp-bioscfg/passwdobj-attributes.c | 75 +- + .../platform/x86/hp/hp-bioscfg/spmobj-attributes.c | 12 +- + .../platform/x86/hp/hp-bioscfg/string-attributes.c | 69 +- + .../x86/hp/hp-bioscfg/surestart-attributes.c | 18 +- + drivers/platform/x86/hp/hp-wmi.c | 323 ++++++- + drivers/platform/x86/hp/hp_accel.c | 2 +- + drivers/platform/x86/huawei-wmi.c | 1 + + drivers/platform/x86/ibm_rtl.c | 8 +- + drivers/platform/x86/intel/Kconfig | 4 + + drivers/platform/x86/intel/Makefile | 1 + + drivers/platform/x86/intel/bxtwc_tmu.c | 5 +- + drivers/platform/x86/intel/bytcrc_pwrsrc.c | 2 +- + drivers/platform/x86/intel/crystal_cove_charger.c | 2 +- + drivers/platform/x86/intel/hid.c | 7 + + drivers/platform/x86/intel/int0002_vgpio.c | 4 +- + drivers/platform/x86/intel/pmc/core.c | 1 + + drivers/platform/x86/intel/pmc/core.h | 2 +- + drivers/platform/x86/intel/pmc/nvl.c | 2 +- + drivers/platform/x86/intel/pmt/class.c | 35 +- + drivers/platform/x86/intel/pmt/class.h | 5 +- + drivers/platform/x86/intel/pmt/crashlog.c | 235 +++-- + drivers/platform/x86/intel/pmt/discovery.c | 2 +- + drivers/platform/x86/intel/pmt/telemetry.c | 3 + + drivers/platform/x86/intel/punit_ipc.c | 4 +- + .../x86/intel/speed_select_if/isst_if_common.c | 57 +- + drivers/platform/x86/intel/telemetry/core.c | 4 + + drivers/platform/x86/intel/tpmi_common.c | 822 ++++++++++++++++++ + drivers/platform/x86/intel/tpmi_common.h | 52 ++ + drivers/platform/x86/intel/tpmi_power_domains.c | 18 + + .../x86/intel/uncore-frequency/uncore-frequency.c | 3 +- + drivers/platform/x86/intel/vsec.c | 28 +- + drivers/platform/x86/intel/vsec_tpmi.c | 822 +----------------- + drivers/platform/x86/intel/wmi/sbl-fw-update.c | 16 +- + drivers/platform/x86/lenovo/ideapad-laptop.c | 16 + + drivers/platform/x86/lenovo/think-lmi.c | 14 +- + drivers/platform/x86/lenovo/thinkpad_acpi.c | 499 ++++++----- + drivers/platform/x86/lenovo/wmi-capdata.c | 458 +++++++--- + drivers/platform/x86/lenovo/wmi-helpers.c | 53 +- + drivers/platform/x86/lenovo/wmi-other.c | 24 +- + drivers/platform/x86/lenovo/yogabook.c | 11 +- + drivers/platform/x86/msi-ec.c | 12 + + drivers/platform/x86/msi-laptop.c | 2 +- + drivers/platform/x86/msi-wmi.c | 41 +- + drivers/platform/x86/oxpec.c | 75 +- + drivers/platform/x86/panasonic-laptop.c | 14 +- + drivers/platform/x86/samsung-laptop.c | 2 +- + drivers/platform/x86/siemens/simatic-ipc.c | 21 +- + drivers/platform/x86/topstar-laptop.c | 6 +- + drivers/platform/x86/toshiba_haps.c | 11 +- + drivers/platform/x86/tuxedo/nb04/wmi_ab.c | 122 +-- + drivers/platform/x86/uniwill/Kconfig | 1 + + drivers/platform/x86/uniwill/uniwill-acpi.c | 579 +++++++++---- + drivers/platform/x86/uniwill/uniwill-wmi.h | 3 + + drivers/power/reset/keystone-reset.c | 3 +- + drivers/power/reset/macsmc-reboot.c | 4 +- + drivers/power/supply/Kconfig | 1 + + drivers/power/supply/ab8500-bm.h | 8 +- + drivers/power/supply/ab8500_bmdata.c | 3 +- + drivers/power/supply/ab8500_btemp.c | 30 +- + drivers/power/supply/ab8500_chargalg.c | 9 +- + drivers/power/supply/ab8500_charger.c | 406 +++++++-- + drivers/power/supply/ab8500_fg.c | 181 ++-- + drivers/power/supply/axp20x_ac_power.c | 3 - + drivers/power/supply/axp20x_battery.c | 3 - + drivers/power/supply/axp20x_usb_power.c | 50 +- + drivers/power/supply/bq24190_charger.c | 101 ++- + drivers/power/supply/bq24257_charger.c | 43 +- + drivers/power/supply/bq2515x_charger.c | 15 +- + drivers/power/supply/bq25630_charger.c | 84 ++ + drivers/power/supply/bq256xx_charger.c | 96 +- + drivers/power/supply/bq257xx_charger.c | 125 ++- + drivers/power/supply/bq25890_charger.c | 2 +- + drivers/power/supply/bq27xxx_battery.c | 24 +- + drivers/power/supply/bq27xxx_battery_i2c.c | 4 + + drivers/power/supply/charger-manager.c | 2 +- + drivers/power/supply/cpcap-charger.c | 4 +- + drivers/power/supply/cros_charge-control.c | 186 +++- + drivers/power/supply/da9030_battery.c | 2 +- + drivers/power/supply/generic-adc-battery.c | 5 +- + drivers/power/supply/gpio-charger.c | 5 +- + drivers/power/supply/intel_dc_ti_battery.c | 2 +- + drivers/power/supply/ltc2941-battery-gauge.c | 6 +- + drivers/power/supply/ltc4162-l-charger.c | 56 +- + drivers/power/supply/max17042_battery.c | 28 +- + drivers/power/supply/mm8013.c | 1 + + drivers/power/supply/pf1550-charger.c | 32 +- + drivers/power/supply/power_supply_core.c | 110 ++- + drivers/power/supply/power_supply_sysfs.c | 20 +- + drivers/power/supply/qcom_battmgr.c | 53 +- + drivers/power/supply/qcom_smbx.c | 113 ++- + drivers/power/supply/rt9467-charger.c | 54 +- + drivers/power/supply/rt9471.c | 54 +- + drivers/power/supply/s2mu005-battery.c | 4 +- + drivers/power/supply/sbs-battery.c | 11 + + drivers/power/supply/sbs-charger.c | 4 +- + drivers/power/supply/smb347-charger.c | 4 +- + drivers/remoteproc/Kconfig | 11 +- + drivers/remoteproc/imx_dsp_rproc.c | 7 +- + drivers/remoteproc/imx_rproc.c | 51 +- + drivers/remoteproc/omap_remoteproc.c | 12 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 2 +- + drivers/remoteproc/qcom_q6v5_pas.c | 172 +++- + drivers/remoteproc/remoteproc_core.c | 67 +- + drivers/remoteproc/remoteproc_debugfs.c | 6 +- + drivers/remoteproc/remoteproc_elf_loader.c | 23 +- + drivers/remoteproc/remoteproc_sysfs.c | 7 +- + drivers/remoteproc/remoteproc_virtio.c | 61 +- + drivers/remoteproc/stm32_rproc.c | 2 +- + drivers/remoteproc/ti_k3_common.c | 10 +- + drivers/remoteproc/ti_k3_common.h | 4 + + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 7 +- + drivers/remoteproc/ti_k3_m4_remoteproc.c | 4 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 9 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 23 +- + drivers/rpmsg/mtk_rpmsg.c | 1 + + drivers/rpmsg/virtio_rpmsg_bus.c | 161 +++- + drivers/soc/qcom/Kconfig | 12 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/qmi_tmd.c | 595 +++++++++++++ + drivers/soundwire/bus.c | 54 +- + drivers/soundwire/bus_type.c | 16 +- + drivers/soundwire/dmi-quirks.c | 65 ++ + drivers/soundwire/intel.h | 6 +- + drivers/soundwire/intel_auxdevice.c | 14 +- + drivers/soundwire/intel_bus_common.c | 8 +- + drivers/soundwire/qcom.c | 123 ++- + drivers/soundwire/slave.c | 28 +- + drivers/soundwire/stream.c | 8 +- + include/dt-bindings/dma/amlogic,a9-dma.h | 8 + + include/dt-bindings/phy/nvidia,tegra264-mphy.h | 12 + + include/dt-bindings/phy/phy-qcom-qmp.h | 1 + + include/dt-bindings/thermal/qcom,pas.h | 20 + + include/linux/dma/edma.h | 24 +- + include/linux/dma/imx-dma.h | 11 +- + include/linux/dmaengine.h | 402 ++++++++- + include/linux/fsl/bestcomm/gen_bd.h | 8 - + include/linux/i3c/device.h | 4 + + include/linux/i3c/hub.h | 92 ++ + include/linux/i3c/master.h | 20 + + include/linux/intel_vsec.h | 19 +- + include/linux/omap-mailbox.h | 5 +- + include/linux/phy/omap_control_phy.h | 2 +- + include/linux/phy/phy-hdmi.h | 6 + + include/linux/phy/phy-thunderbolt.h | 14 + + include/linux/phy/phy.h | 2 + + include/linux/platform_data/mipi-i3c-hci.h | 4 + + include/linux/platform_data/x86/asus-wmi.h | 9 +- + include/linux/power/bq27xxx_battery.h | 2 + + include/linux/power_supply.h | 18 +- + include/linux/remoteproc.h | 4 +- + include/linux/rpmsg/virtio_rpmsg.h | 41 + + include/linux/soc/qcom/qmi.h | 1 + + include/linux/soc/qcom/qmi_tmd.h | 36 + + include/linux/soundwire/sdw.h | 4 + + include/linux/soundwire/sdw_intel.h | 2 +- + include/linux/string_choices.h | 6 + + include/linux/wmi.h | 3 + + include/trace/events/tegra_apb_dma.h | 6 +- + include/uapi/linux/amd-pmf.h | 3 + + include/uapi/linux/rpmsg.h | 15 +- + samples/rpmsg/rpmsg_client_sample.c | 20 +- + tools/power/x86/intel-speed-select/Makefile | 4 +- + tools/power/x86/intel-speed-select/isst-config.c | 4 +- + .../power/x86/intel-speed-select/isst-core-mbox.c | 2 +- + tools/power/x86/intel-speed-select/isst.h | 2 +- + 437 files changed, 21524 insertions(+), 6368 deletions(-) + create mode 100644 Documentation/ABI/removed/sysfs-driver-uniwill-laptop + create mode 100644 Documentation/ABI/testing/sysfs-driver-lenovo-yoga-slim7x-gen11-ec + create mode 100644 Documentation/devicetree/bindings/dma/amlogic,a9-dma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/hisilicon,k3-dma-1.0.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/k3dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/ti,dra7-dma-crossbar.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt + create mode 100644 Documentation/devicetree/bindings/i3c/nxp,p3h2840.yaml + create mode 100644 Documentation/devicetree/bindings/phy/aspeed,ast2700-usb3-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,mt8195-dp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,mt8196-pcie-sphy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra264-mphy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,nord-qmp-gen5x16-pcie-phy.yaml + create mode 100644 Documentation/wmi/devices/acer-wmi-battery.rst + create mode 100644 drivers/dma/amlogic-dma.c + create mode 100644 drivers/i3c/hub.c + create mode 100644 drivers/phy/aspeed/Kconfig + create mode 100644 drivers/phy/aspeed/Makefile + create mode 100644 drivers/phy/aspeed/phy-aspeed-usb3.c + create mode 100644 drivers/phy/mediatek/phy-mtk-pcie-sphy.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_40.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_40.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-pcie-v6_40.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrxz-pcie-v6_40.h + create mode 100644 drivers/phy/tegra/phy-tegra-mphy.c + create mode 100644 drivers/platform/arm64/asus-glymur-ec.c + create mode 100644 drivers/platform/arm64/lenovo-yoga-slim7x-gen11-ec.c + rename drivers/platform/{x86/wmi-bmof.c => wmi/bmof.c} (100%) + create mode 100644 drivers/platform/x86/acer-wmi-battery.c + create mode 100644 drivers/platform/x86/intel/tpmi_common.c + create mode 100644 drivers/platform/x86/intel/tpmi_common.h + create mode 100644 drivers/soc/qcom/qmi_tmd.c + create mode 100644 include/dt-bindings/dma/amlogic,a9-dma.h + create mode 100644 include/dt-bindings/phy/nvidia,tegra264-mphy.h + create mode 100644 include/dt-bindings/thermal/qcom,pas.h + create mode 100644 include/linux/i3c/hub.h + create mode 100644 include/linux/phy/phy-thunderbolt.h + create mode 100644 include/linux/rpmsg/virtio_rpmsg.h + create mode 100644 include/linux/soc/qcom/qmi_tmd.h +Merging ext4-fixes/fixes (3e78d7b063230 ext4: mark data=journal as deprecated and will be removed in January 2028.) +$ 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 (b14fcabd34e02 ucount: take the rlimit reference before checking the limit) +$ 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 +Auto-merging block/bdev.c +Auto-merging fs/coredump.c +Auto-merging include/linux/fs.h +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + block/bdev.c | 2 +- + fs/coredump.c | 6 +- + fs/eventpoll.c | 18 +- + fs/exportfs/expfs.c | 6 +- + fs/fs-writeback.c | 15 +- + fs/inode.c | 15 +- + fs/internal.h | 1 - + fs/minix/bitmap.c | 26 +- + fs/namespace.c | 7 +- + fs/netfs/internal.h | 32 +- + fs/nsfs.c | 4 +- + fs/proc/kcore.c | 8 +- + fs/read_write.c | 38 +- + fs/super.c | 346 ++++++--------- + include/linux/fs.h | 4 +- + include/linux/fs/super_types.h | 11 +- + init/do_mounts.c | 10 +- + kernel/nsproxy.c | 2 +- + kernel/nstree.c | 29 +- + kernel/signal.c | 5 +- + kernel/ucount.c | 21 +- + tools/testing/selftests/Makefile | 1 + + .../selftests/filesystems/freeze/.gitignore | 2 + + .../testing/selftests/filesystems/freeze/Makefile | 7 + + tools/testing/selftests/filesystems/freeze/config | 4 + + .../selftests/filesystems/freeze/loop_util.h | 64 +++ + .../filesystems/freeze/shared_bdev_test.c | 479 +++++++++++++++++++++ + .../filesystems/statmount/listmount_test.c | 11 + + .../filesystems/statmount/statmount_test.c | 61 ++- + tools/testing/selftests/namespaces/listns_test.c | 34 ++ + 30 files changed, 981 insertions(+), 288 deletions(-) + create mode 100644 tools/testing/selftests/filesystems/freeze/.gitignore + create mode 100644 tools/testing/selftests/filesystems/freeze/Makefile + create mode 100644 tools/testing/selftests/filesystems/freeze/config + create mode 100644 tools/testing/selftests/filesystems/freeze/loop_util.h + create mode 100644 tools/testing/selftests/filesystems/freeze/shared_bdev_test.c +Merging fscrypt-current/for-current (cee9395acd804 Linux 7.3-rc1) +$ 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 (c349b233d6ab0 fsverity: Set S_VERITY only after rollback is no longer possible) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Merge made by the 'ort' strategy. + Documentation/filesystems/fsverity.rst | 3 ++ + fs/btrfs/verity.c | 7 +++-- + fs/ext4/verity.c | 4 ++- + fs/verity/enable.c | 20 ++++++++----- + fs/verity/fsverity_private.h | 8 +++++ + fs/verity/measure.c | 10 +++++++ + fs/verity/open.c | 47 +++++++++++++++++------------ + fs/verity/read_metadata.c | 14 ++++++--- + fs/verity/signature.c | 55 ++++++++++++++++++++++++---------- + include/linux/fsverity.h | 12 ++++---- + 10 files changed, 126 insertions(+), 54 deletions(-) +Merging btrfs-fixes/next-fixes (24a19b953e2a3 Linux 7.3-rc7) +$ git merge -m Merge branch 'next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Already up to date. +Merging vfs-fixes/fixes (49c5d168a3a8f udf: fix nls leak on udf_fill_super() failure) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging fs/udf/super.c +Merge made by the 'ort' strategy. +Merging erofs-fixes/fixes (135d84c66f854 erofs: add missing buf->off in erofs_bread()) +$ 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 (f76017a7663c4 nfsd: fix handling of NFSEXP_PNFS in the netlink codepath) +$ 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 (028ef9c96e961 Linux 7.0) +$ 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 overlayfs-fixes/ovl-fixes (4549871118cf6 Linux 7.1-rc7) +$ git merge -m Merge branch 'ovl-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging fscrypt/for-next (a5e894bc87b76 ext4: reject encrypted inodes when block size > page size) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Auto-merging fs/ext4/inode.c +Merge made by the 'ort' strategy. + fs/crypto/keyring.c | 4 +++- + fs/crypto/keysetup.c | 8 +++++++- + fs/ext4/crypto.c | 9 +++++++++ + fs/ext4/inode.c | 6 ++++++ + 4 files changed, 25 insertions(+), 2 deletions(-) +Merging btrfs/for-next (2789b2c034d7c Merge branch 'for-next-next-v7.3-20261016' into for-next-20261016) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/btrfs_inode.h +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/verity.c +Merge made by the 'ort' strategy. + fs/btrfs/Kconfig | 1 + + fs/btrfs/backref.c | 6 ++++-- + fs/btrfs/backref.h | 3 ++- + fs/btrfs/defrag.c | 11 ++++++++++- + fs/btrfs/disk-io.c | 20 ++++++++++++++++++++ + fs/btrfs/extent_io.c | 2 +- + fs/btrfs/fiemap.c | 3 ++- + fs/btrfs/ioctl.c | 22 ++++++++++++++++++++-- + fs/btrfs/qgroup.c | 12 +++++++----- + fs/btrfs/scrub.c | 2 +- + fs/btrfs/sysfs.c | 4 ++++ + fs/btrfs/verity.c | 2 +- + fs/btrfs/volumes.c | 7 ++++++- + include/uapi/linux/btrfs.h | 10 ++++++++++ + 14 files changed, 89 insertions(+), 16 deletions(-) +Merging ceph/master (823d21c78453f ceph: fix uninitialized err in ceph_netfs_issue_read()) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Auto-merging MAINTAINERS +Auto-merging fs/ceph/Kconfig +Auto-merging fs/ceph/acl.c +Auto-merging fs/ceph/addr.c +CONFLICT (content): Merge conflict in fs/ceph/addr.c +Auto-merging fs/ceph/dir.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/mds_client.h +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/xattr.c +Resolved 'fs/ceph/addr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next ecbefc996935f] Merge branch 'master' of https://github.com/ceph/ceph-client.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 +- + fs/ceph/Kconfig | 13 ++ + fs/ceph/acl.c | 2 +- + fs/ceph/addr.c | 427 ++++++++++++++++++++++++++----------- + fs/ceph/cache.c | 4 +- + fs/ceph/caps.c | 377 ++++++++++++++++++++++++++++---- + fs/ceph/crypto.c | 11 + + fs/ceph/crypto.h | 12 +- + fs/ceph/dir.c | 58 ++--- + fs/ceph/export.c | 8 +- + fs/ceph/file.c | 160 +++++++------- + fs/ceph/inode.c | 119 +++++++++-- + fs/ceph/mds_client.c | 124 ++++++++--- + fs/ceph/mds_client.h | 5 +- + fs/ceph/mdsmap.c | 12 +- + fs/ceph/quota.c | 6 +- + fs/ceph/snap.c | 17 +- + fs/ceph/super.c | 35 ++- + fs/ceph/super.h | 153 ++++++++++--- + fs/ceph/util.c | 4 - + fs/ceph/xattr.c | 18 +- + include/linux/ceph/ceph_features.h | 14 +- + include/linux/ceph/ceph_fs.h | 6 + + net/ceph/messenger_v1.c | 8 +- + net/ceph/mon_client.c | 5 +- + net/ceph/osd_client.c | 13 +- + net/ceph/osdmap.c | 18 +- + net/ceph/pagevec.c | 2 +- + 28 files changed, 1247 insertions(+), 390 deletions(-) +Merging cifs/cifs-next (ddc7a7e1eeb11 smb: client: validate SMB1 EA list bounds before parsing) +$ git merge -m Merge branch 'cifs-next' of https://git.manguebit.org/linux.git cifs/cifs-next +Merge made by the 'ort' strategy. + fs/smb/client/cached_dir.c | 30 ++++++++++++++------- + fs/smb/client/cifsacl.c | 9 ++++--- + fs/smb/client/cifsfs.c | 20 +++++++------- + fs/smb/client/cifsglob.h | 2 ++ + fs/smb/client/cifssmb.c | 66 ++++++++++++++++++++++++++++++++-------------- + fs/smb/client/connect.c | 33 ++++++++++++++--------- + fs/smb/client/smb2misc.c | 16 +++++++++++ + fs/smb/client/smb2ops.c | 30 ++++++++++++++++++--- + fs/smb/client/smb2pdu.c | 46 +++++++++++++++++++++++++++----- + fs/smb/client/trace.h | 1 + + fs/smb/client/transport.c | 2 ++ + 11 files changed, 191 insertions(+), 64 deletions(-) +Merging configfs/configfs-next (e6f2f0945f5e8 configfs: give the root inode its own lockdep class) +$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/leitao/linux.git configfs/configfs-next +Merge made by the 'ort' strategy. + fs/configfs/dir.c | 9 ++++++++- + fs/configfs/file.c | 2 +- + fs/configfs/mount.c | 9 +++++++++ + 3 files changed, 18 insertions(+), 2 deletions(-) +Merging configfs-rust/configfs-next (e84c9b64df615 rust: configfs: fix data offset calculation for subsystem callbacks) +$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git configfs-rust/configfs-next +Already up to date. +Merging ecryptfs/next (8f6626bd6594a ecryptfs: bound session_key_encryption_key_bytes in auth tok) +$ 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/ecryptfs_kernel.h | 6 ++++++ + fs/ecryptfs/keystore.c | 7 +++++++ + 2 files changed, 13 insertions(+) +Merging dlm/next (82bcb7b05ad90 dlm: fix typos in comments) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging erofs/dev (209108a545617 erofs: drop unnecessary .read_folio() checks for file-backed mounts) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (f9eed3f40ad19 exfat: fix parent link count when replacing a sibling directory) +$ 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/file.c | 3 +++ + fs/exfat/inode.c | 3 --- + fs/exfat/iomap.c | 7 ++++++- + fs/exfat/namei.c | 4 +--- + 4 files changed, 10 insertions(+), 7 deletions(-) +Merging ext3/for_next (a344542d9f26d Pull fsnotify range truncation fix.) +$ 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. + fs/dcache.c | 2 ++ + fs/ext2/inode.c | 4 ++-- + fs/ext2/super.c | 9 +++++---- + fs/notify/fanotify/fanotify.h | 2 +- + fs/notify/fsnotify.c | 2 +- + fs/quota/dquot.c | 10 ++++++---- + fs/udf/inode.c | 5 +++++ + fs/udf/super.c | 14 ++++++++++++-- + include/linux/fsnotify.h | 4 ++-- + include/linux/fsnotify_backend.h | 6 +++--- + include/linux/quotaops.h | 5 +++++ + 11 files changed, 44 insertions(+), 19 deletions(-) +Merging ext4/dev (8c4f6e3376348 ext4: introduce a mount option for iomap buffered I/O path) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (83f32c7732557 Merge tag 'erofs-for-7.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/for-next (f9e450420da26 fsverity: hoist statx reporting of fs-verity flag) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (416fd13cb4b78 fuse: Use d_alloc_trylock() in fuse_direntplus_link()) +$ 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/readdir.c +Merge made by the 'ort' strategy. + fs/fuse/readdir.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) +Merging gfs2/for-next (7e90f0c69e2fe gfs2: Fix freeze sysfs interface) +$ 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/super.c | 8 ++++---- + fs/gfs2/super.h | 4 ++++ + fs/gfs2/sys.c | 6 ++++-- + 3 files changed, 12 insertions(+), 6 deletions(-) +Merging jfs/jfs-next (dad98c5b2a05e jfs: avoid -Wtautological-constant-out-of-range-compare warning again) +$ git merge -m Merge branch 'jfs-next' of https://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (af8c72f655074 ksmbd: revert fsids on durable reconnect and replay failure) +$ git merge -m Merge branch 'ksmbd-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/smb.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/smb/server/mgmt/user_session.c | 134 ++++++--- + fs/smb/server/mgmt/user_session.h | 18 ++ + fs/smb/server/misc.c | 8 +- + fs/smb/server/smb2misc.c | 8 + + fs/smb/server/smb2pdu.c | 568 ++++++++++++++++++++++++++------------ + fs/smb/server/transport_ipc.c | 45 ++- + fs/smb/server/transport_ipc.h | 14 +- + fs/smb/server/transport_tcp.c | 11 +- + fs/smb/server/vfs.c | 9 +- + fs/smb/server/vfs_cache.c | 60 +++- + fs/smb/server/vfs_cache.h | 2 + + fs/smb/smbdirect/rw.c | 1 - + 12 files changed, 607 insertions(+), 271 deletions(-) +$ git am -3 ../patches/0001-ntfs3-Fix-up-merge-with-Linus.patch +Applying: ntfs3: Fix up merge with Linus +Using index info to reconstruct a base tree... +M fs/ntfs3/file.c +Falling back to patching base and 3-way merge... +Auto-merging fs/ntfs3/file.c +No changes -- Patch already applied. +Merging nfs/linux-next (18a80121193c6 XFS: Remove unused variables) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging fs/xfs/scrub/stats.c +Merge made by the 'ort' strategy. + fs/xfs/scrub/stats.c | 3 +-- + fs/xfs/scrub/tempfile.c | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging nfs-anna/linux-next (ef30b3efb7e8b Merge commit '211cda4fdf33011cee39f8970c4625b207142d6b' of git://git.linux-nfs.org/projects/trondmy/linux-nfs.git into anna/linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (9090ec5ecd682 sunrpc: assign RQ_LOCAL from the transport on every receive) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/configs/defconfig +Merge made by the 'ort' strategy. + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + fs/lockd/svc.c | 50 +- + fs/nfs_common/nfsacl.c | 6 +- + fs/nfs_common/nfslocalio.c | 11 +- + fs/nfsd/Kconfig | 17 - + fs/nfsd/export.c | 22 +- + fs/nfsd/filecache.c | 26 +- + fs/nfsd/netns.h | 17 +- + fs/nfsd/nfs4callback.c | 10 +- + fs/nfsd/nfs4ctl.h | 8 +- + fs/nfsd/nfs4layouts.c | 113 ++- + fs/nfsd/nfs4proc.c | 16 +- + fs/nfsd/nfs4recover.c | 1021 +------------------- + fs/nfsd/nfs4state.c | 63 +- + fs/nfsd/nfs4xdr.c | 23 +- + fs/nfsd/nfsctl.c | 205 ++-- + fs/nfsd/nfsd.h | 4 +- + fs/nfsd/nfssvc.c | 147 ++- + fs/nfsd/pnfs.h | 5 + + fs/nfsd/state.h | 11 +- + fs/nfsd/trace.h | 19 - + fs/nfsd/vfs.c | 67 +- + fs/nfsd/vfs.h | 3 +- + include/linux/nfsacl.h | 5 +- + include/linux/sunrpc/svc.h | 3 + + include/linux/sunrpc/svc_rdma.h | 4 + + net/sunrpc/auth_gss/svcauth_gss.c | 3 + + net/sunrpc/svc_xprt.c | 16 +- + net/sunrpc/svcauth_unix.c | 8 +- + net/sunrpc/svcsock.c | 2 - + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 10 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 18 + + net/sunrpc/xprtrdma/svc_rdma_rw.c | 32 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 48 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 + + tools/testing/selftests/nfsd/.gitignore | 3 + + tools/testing/selftests/nfsd/Makefile | 3 + + tools/testing/selftests/nfsd/config | 6 + + tools/testing/selftests/nfsd/nfsd_lockd_netlink.c | 268 +++++ + tools/testing/selftests/nfsd/nfsd_netlink.h | 379 ++++++++ + .../testing/selftests/nfsd/nfsd_netlink_listener.c | 303 +----- + .../testing/selftests/nfsd/nfsd_netns_isolation.c | 468 +++++++++ + tools/testing/selftests/nfsd/nfsd_netns_stress.c | 572 +++++++++++ + tools/testing/selftests/nfsd/settings | 2 +- + 45 files changed, 2294 insertions(+), 1729 deletions(-) + create mode 100644 tools/testing/selftests/nfsd/nfsd_lockd_netlink.c + create mode 100644 tools/testing/selftests/nfsd/nfsd_netlink.h + create mode 100644 tools/testing/selftests/nfsd/nfsd_netns_isolation.c + create mode 100644 tools/testing/selftests/nfsd/nfsd_netns_stress.c +Merging ntfs/ntfs-next (564c775364773 ntfs: fix a self-deadlock on writes to non-resident named streams) +$ git merge -m Merge branch 'ntfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git ntfs/ntfs-next +Merge made by the 'ort' strategy. + fs/ntfs/index.c | 41 +++++++++++++++++++++++++++++++++++++++-- + fs/ntfs/index.h | 1 + + fs/ntfs/inode.c | 38 +++++++++++++++++++++++++++++--------- + fs/ntfs/namei.c | 6 ++++-- + 4 files changed, 73 insertions(+), 13 deletions(-) +Merging ntfs3/master (ee1cb3443cff5 ntfs3: add file I/O tracepoints) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging MAINTAINERS +Auto-merging fs/ntfs3/dir.c +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/namei.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/super.c +Auto-merging fs/ntfs3/xattr.c +Merge made by the 'ort' strategy. + Documentation/filesystems/ntfs3.rst | 23 +++ + MAINTAINERS | 1 + + fs/ntfs3/attrib.c | 191 +++++++++++------- + fs/ntfs3/dir.c | 68 ++++--- + fs/ntfs3/file.c | 8 + + fs/ntfs3/frecord.c | 16 +- + fs/ntfs3/fslog.c | 35 +++- + fs/ntfs3/fsntfs.c | 3 + + fs/ntfs3/index.c | 40 +++- + fs/ntfs3/inode.c | 37 +++- + fs/ntfs3/namei.c | 11 +- + fs/ntfs3/ntfs_fs.h | 5 +- + fs/ntfs3/record.c | 16 +- + fs/ntfs3/super.c | 44 +++- + fs/ntfs3/xattr.c | 44 ++-- + include/trace/events/ntfs3.h | 389 ++++++++++++++++++++++++++++++++++++ + 16 files changed, 785 insertions(+), 146 deletions(-) + create mode 100644 include/trace/events/ntfs3.h +Merging orangefs/for-next (2bc09cb0e9e44 orangefs: don't continue on to gpf if client dies on write.) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (1f6ee9be92f8d ovl: make fsync after metadata copy-up opt-in mount option) +$ 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 (a5e0055eac837 UBI: support per-device wear-leveling threshold) +$ 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 (35ecd40c0d7e4 9p: optimize p9_fcall struct) +$ git merge -m Merge branch '9p-next' of https://github.com/martinetd/linux v9fs/9p-next +Auto-merging fs/9p/acl.h +Auto-merging fs/9p/v9fs.h +Auto-merging fs/9p/vfs_addr.c +Auto-merging fs/9p/vfs_inode.c +Auto-merging fs/9p/vfs_inode_dotl.c +Auto-merging fs/9p/vfs_super.c +Merge made by the 'ort' strategy. + Documentation/filesystems/9p.rst | 12 ++++- + fs/9p/acl.h | 2 +- + fs/9p/cache.c | 7 +-- + fs/9p/fid.c | 2 +- + fs/9p/v9fs.c | 18 +++---- + fs/9p/v9fs.h | 26 +++++++--- + fs/9p/vfs_addr.c | 10 +++- + fs/9p/vfs_dentry.c | 2 +- + fs/9p/vfs_dir.c | 32 +++++++++--- + fs/9p/vfs_file.c | 2 +- + fs/9p/vfs_inode.c | 26 ++++++++-- + fs/9p/vfs_inode_dotl.c | 36 ++++++++++--- + fs/9p/vfs_super.c | 2 +- + include/net/9p/9p.h | 4 +- + include/net/9p/client.h | 14 +++-- + net/9p/Kconfig | 10 ++++ + net/9p/client.c | 3 ++ + net/9p/protocol.c | 12 +---- + net/9p/trans_fd.c | 109 ++++++++++++++++++++++++++++++++++++--- + net/9p/trans_rdma.c | 2 +- + net/9p/trans_usbg.c | 101 ++++++++++++++++++++++++++---------- + net/9p/trans_virtio.c | 5 ++ + net/9p/trans_xen.c | 79 ++++++++++++++-------------- + 23 files changed, 372 insertions(+), 144 deletions(-) +Merging v9fs-ericvh/ericvh/for-next (028ef9c96e961 Linux 7.0) +$ 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 (ec8f62cc109a3 xfs: don't limit software atomic writes by the group alignment) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (3a8389d42bdf4 zonefs: handle integer overflow in zonefs_fname_to_fno) +$ 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 (2c3ba1f1cb416 bfs: remove leftover dir.c) +$ 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 fs/coredump.c +Auto-merging fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/nullfs.c +CONFLICT (content): Merge conflict in fs/nullfs.c +Auto-merging fs/smb/server/smbacl.c +Auto-merging kernel/fork.c +Auto-merging tools/testing/selftests/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/Makefile +Resolved 'fs/nullfs.c' using previous resolution. +Recorded preimage for 'tools/testing/selftests/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'tools/testing/selftests/Makefile'. +[fs-next 631655bfd66da] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + +Merging vfs/for-next (4dda01b67c866 Merge branches 'work.dcache', 'work.dcache-d_add' and 'work.configfs' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Merge made by the 'ort' strategy. +Merging mm-fixes/for-next-fixes (9e91d5d31a46e Merge https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-hotfixes-unstable into for-next-fixes) +$ git merge -m Merge branch 'for-next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mm/linux.git mm-fixes/for-next-fixes +Merge made by the 'ort' strategy. + lib/assoc_array.c | 36 +++++++++++++--------- + lib/base64.c | 3 ++ + lib/iov_iter.c | 9 ++++-- + lib/test_xarray.c | 70 +++++++++++++++++++++++++++++++++++++++++++ + lib/xarray.c | 8 +++-- + mm/hugetlb.c | 25 +++++++++++----- + mm/internal.h | 10 ++++--- + mm/khugepaged.c | 10 +++++-- + mm/memory.c | 89 ++++++++++++++++++++++++++++++++++++------------------- + mm/userfaultfd.c | 1 + + mm/vmalloc.c | 86 ++++++++++++++++++++++++++++++++++++----------------- + 11 files changed, 255 insertions(+), 92 deletions(-) +Merging fs-current (2eff421eb89cf 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. + Documentation/filesystems/fsverity.rst | 3 + + block/bdev.c | 2 +- + fs/btrfs/verity.c | 7 +- + fs/coredump.c | 6 +- + fs/eventpoll.c | 18 +- + fs/exportfs/expfs.c | 6 +- + fs/ext4/verity.c | 4 +- + fs/fs-writeback.c | 15 +- + fs/inode.c | 15 +- + fs/internal.h | 1 - + fs/minix/bitmap.c | 26 +- + fs/namespace.c | 7 +- + fs/netfs/internal.h | 32 +- + fs/nsfs.c | 4 +- + fs/proc/kcore.c | 8 +- + fs/read_write.c | 38 +- + fs/super.c | 346 ++++++--------- + fs/verity/enable.c | 20 +- + fs/verity/fsverity_private.h | 8 + + fs/verity/measure.c | 10 + + fs/verity/open.c | 47 +- + fs/verity/read_metadata.c | 14 +- + fs/verity/signature.c | 55 ++- + include/linux/fs.h | 4 +- + include/linux/fs/super_types.h | 11 +- + include/linux/fsverity.h | 12 +- + init/do_mounts.c | 10 +- + kernel/nsproxy.c | 2 +- + kernel/nstree.c | 29 +- + kernel/signal.c | 5 +- + kernel/ucount.c | 21 +- + tools/testing/selftests/Makefile | 1 + + .../selftests/filesystems/freeze/.gitignore | 2 + + .../testing/selftests/filesystems/freeze/Makefile | 7 + + tools/testing/selftests/filesystems/freeze/config | 4 + + .../selftests/filesystems/freeze/loop_util.h | 64 +++ + .../filesystems/freeze/shared_bdev_test.c | 479 +++++++++++++++++++++ + .../filesystems/statmount/listmount_test.c | 11 + + .../filesystems/statmount/statmount_test.c | 61 ++- + tools/testing/selftests/namespaces/listns_test.c | 34 ++ + 40 files changed, 1107 insertions(+), 342 deletions(-) + create mode 100644 tools/testing/selftests/filesystems/freeze/.gitignore + create mode 100644 tools/testing/selftests/filesystems/freeze/Makefile + create mode 100644 tools/testing/selftests/filesystems/freeze/config + create mode 100644 tools/testing/selftests/filesystems/freeze/loop_util.h + create mode 100644 tools/testing/selftests/filesystems/freeze/shared_bdev_test.c +Merging kbuild-current/kbuild-fixes-for-next (83deedcf85af5 Merge branch 'kbuild-fixes-unstable' into kbuild-fixes-for-next) +$ 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 +Auto-merging Makefile +Auto-merging init/Kconfig +Auto-merging scripts/Kconfig.toolchain +Merge made by the 'ort' strategy. + Makefile | 3 ++- + scripts/Kconfig.toolchain | 23 +++++++++++++++++++---- + 2 files changed, 21 insertions(+), 5 deletions(-) +Merging clang-fixes-current/clang-fixes-for-current (df2908090cda3 Linux 7.3-rc2) +$ git merge -m Merge branch 'clang-fixes-for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux.git clang-fixes-current/clang-fixes-for-current +Already up to date. +Merging arc-current/for-curr (c03c1a14507df Linux 7.3) +$ 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 (1eb87d8f77379 ARM: 9524/1: mm: align hugetlb mappings to the huge page size) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (a9cd14bfb0c11 arm64: irq: exclude the softirq stack switch from KCOV) +$ 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 (59f522f5a0ece Merge tag 'at91-fixes-7.3' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/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 (cee9395acd804 Linux 7.3-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 realtek-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git realtek-fixes/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (cee9395acd804 Linux 7.3-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 (af32c3cb72529 m68k: defconfig: Enable ATARI_SVETHLANA and ETHOC) +$ 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 (93f51579e7df2 Linux 7.3-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 (375d5d57545f5 Merge tag 's390-7.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ 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 (d2bfe74a8fe21 net: mctp: free reassembly head skb when key_add fails on SOM) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Auto-merging MAINTAINERS +Auto-merging net/ipv4/tcp.c +Merge made by the 'ort' strategy. + Documentation/networking/ip-sysctl.rst | 2 + + Documentation/networking/tls-offload.rst | 16 +- + MAINTAINERS | 2 + + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/dsa/motorcomm/chip.c | 4 +- + drivers/net/dsa/mt7530.c | 7 +- + drivers/net/dsa/mv88e6xxx/chip.c | 10 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 +- + drivers/net/ethernet/broadcom/bnge/bnge_resc.c | 6 +- + drivers/net/ethernet/broadcom/bnge/bnge_resc.h | 9 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 102 ++++++++---- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 + + drivers/net/ethernet/google/gve/gve_flow_rule.c | 1 + + drivers/net/ethernet/hisilicon/hisi_femac.c | 1 + + drivers/net/ethernet/i825xx/82596.c | 25 +-- + drivers/net/ethernet/intel/ice/ice_adapter.c | 17 +- + drivers/net/ethernet/intel/ice/ice_adapter.h | 17 +- + drivers/net/ethernet/intel/ice/ice_ptp.c | 174 +++++++++++++++------ + drivers/net/ethernet/intel/ice/ice_ptp.h | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 40 +++-- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/intf.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 6 + + .../mellanox/mlx5/core/en_accel/en_accel.h | 6 + + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 3 + + .../mellanox/mlx5/core/en_accel/psp_rxtx.h | 13 ++ + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 6 +- + drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 2 +- + drivers/net/ethernet/microchip/fdma/fdma_api.c | 30 +++- + .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 8 +- + .../net/ethernet/microchip/lan966x/lan966x_mac.c | 4 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 19 ++- + .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 10 +- + .../net/ethernet/microchip/sparx5/sparx5_fdma.c | 3 +- + .../net/ethernet/microchip/sparx5/sparx5_packet.c | 15 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 2 + + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 24 ++- + drivers/net/ethernet/stmicro/stmmac/descs.h | 6 +- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 25 ++- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 6 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 19 ++- + drivers/net/ethernet/ti/am65-cpts.c | 1 + + drivers/net/gtp.c | 44 ++++-- + drivers/net/macvlan.c | 3 +- + drivers/net/mctp/mctp-usblib-test.c | 4 +- + drivers/net/pcs/pcs-xpcs-plat.c | 62 ++++++-- + drivers/net/pcs/pcs-xpcs-rk.c | 2 +- + drivers/net/ppp/ppp_generic.c | 96 +++++++++++- + drivers/net/ppp/pppoe.c | 8 + + drivers/net/pse-pd/si3474.c | 23 ++- + drivers/net/tun.c | 4 + + drivers/net/usb/aqc111.c | 8 +- + drivers/net/usb/cdc_mbim.c | 5 +- + drivers/net/usb/cdc_ncm.c | 13 +- + drivers/net/usb/lan78xx.c | 9 ++ + drivers/net/usb/pegasus.c | 16 +- + drivers/net/usb/usbnet.c | 24 ++- + drivers/net/veth.c | 5 +- + drivers/net/vxlan/vxlan_core.c | 2 +- + include/linux/ppp_channel.h | 1 + + include/net/inet_frag.h | 1 + + include/net/ip.h | 25 --- + include/net/ip6_route.h | 37 ----- + include/net/xfrm.h | 17 ++ + net/bridge/br_netlink.c | 2 +- + net/core/dev.c | 24 ++- + net/core/net-sysfs.c | 7 + + net/core/skbuff.c | 11 +- + net/dcb/dcbnl.c | 2 + + net/devlink/region.c | 5 + + net/ipv4/inet_connection_sock.c | 3 +- + net/ipv4/inet_fragment.c | 5 + + net/ipv4/ip_fragment.c | 3 +- + net/ipv4/ipmr.c | 27 +++- + net/ipv4/metrics.c | 5 + + net/ipv4/route.c | 4 +- + net/ipv4/sysctl_net_ipv4.c | 2 + + net/ipv4/tcp.c | 12 +- + net/ipv6/ip6_fib.c | 4 - + net/ipv6/ip6mr.c | 5 +- + net/ipv6/reassembly.c | 3 +- + net/ipv6/route.c | 19 ++- + net/mctp/route.c | 10 +- + net/netlink/af_netlink.c | 6 +- + net/rds/af_rds.c | 29 +++- + net/rds/bind.c | 4 +- + net/rds/ib_sysctl.c | 2 +- + net/rds/rdma_transport.c | 3 + + net/rds/rds.h | 3 + + net/rds/recv.c | 11 +- + net/rds/send.c | 9 +- + net/rds/sysctl.c | 2 +- + net/rds/tcp.c | 5 +- + net/sched/act_api.c | 3 + + net/sched/em_ipt.c | 3 + + net/sched/sch_etf.c | 1 + + net/sched/sch_generic.c | 14 +- + net/sched/sch_gred.c | 16 +- + net/sched/sch_taprio.c | 6 +- + net/sctp/ipv6.c | 6 +- + net/sctp/sm_make_chunk.c | 24 +-- + net/sctp/sm_statefuns.c | 2 +- + net/tipc/bearer.c | 4 + + net/tls/tls_device.c | 24 +++ + net/tls/tls_main.c | 26 ++- + net/tls/tls_sw.c | 9 +- + net/xdp/xsk_buff_pool.c | 2 + + .../selftests/net/forwarding/bridge_vlan_mcast.sh | 3 +- + .../selftests/net/forwarding/vxlan_reserved.sh | 15 ++ + tools/testing/selftests/net/lib/gro.c | 2 - + .../net/packetdrill/tcp_advmss_pmtu_ipv4.pkt | 67 -------- + .../net/packetdrill/tcp_advmss_pmtu_ipv6.pkt | 67 -------- + tools/testing/selftests/net/tcp_mmap.c | 6 +- + tools/testing/selftests/net/tls.c | 31 ++++ + .../tc-testing/tc-tests/filters/matchall.json | 71 +++++++++ + 115 files changed, 1193 insertions(+), 524 deletions(-) + delete mode 100644 tools/testing/selftests/net/packetdrill/tcp_advmss_pmtu_ipv4.pkt + delete mode 100644 tools/testing/selftests/net/packetdrill/tcp_advmss_pmtu_ipv6.pkt +Merging bpf/master (c8a8a68d3ab4a bpf: Don't re-sort subprog_info[] for every new subprogram) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master +Merge made by the 'ort' strategy. + Documentation/bpf/bpf_iterators.rst | 10 + + arch/arm64/net/bpf_jit_comp.c | 5 - + arch/arm64/net/bpf_timed_may_goto.S | 10 +- + arch/riscv/net/bpf_timed_may_goto.S | 27 +- + arch/x86/net/bpf_jit_comp.c | 176 +-- + arch/x86/net/bpf_timed_may_goto.S | 3 + + include/linux/bpf.h | 10 +- + include/linux/bpf_verifier.h | 9 +- + include/linux/btf.h | 1 + + include/linux/filter.h | 1 - + include/uapi/linux/bpf.h | 6 - + kernel/bpf/bpf_struct_ops.c | 29 +- + kernel/bpf/btf.c | 26 +- + kernel/bpf/core.c | 12 +- + kernel/bpf/fixups.c | 39 - + kernel/bpf/helpers.c | 11 +- + kernel/bpf/log.c | 8 + + kernel/bpf/scev.c | 65 +- + kernel/bpf/states.c | 36 +- + kernel/bpf/syscall.c | 4 - + kernel/bpf/verifier.c | 205 ++-- + kernel/trace/bpf_trace.c | 9 +- + net/core/filter.c | 6 +- + tools/include/uapi/linux/bpf.h | 6 - + tools/lib/bpf/bpf_helpers.h | 18 +- + tools/lib/bpf/libbpf.c | 433 +------- + tools/testing/selftests/bpf/Makefile | 12 +- + tools/testing/selftests/bpf/Makefile.buildvars | 25 - + tools/testing/selftests/bpf/Makefile.skel | 18 +- + .../bpf/prog_tests/arena_scalar_blinded.c | 21 - + .../selftests/bpf/prog_tests/data_in_arena.c | 216 ---- + tools/testing/selftests/bpf/prog_tests/jit_insns.c | 59 + + tools/testing/selftests/bpf/prog_tests/map_kptr.c | 5 + + .../testing/selftests/bpf/prog_tests/rcu_reentry.c | 19 +- + .../testing/selftests/bpf/prog_tests/send_signal.c | 106 ++ + .../bpf/prog_tests/test_struct_ops_assoc.c | 37 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 - + tools/testing/selftests/bpf/progs/arena_noarena.c | 15 - + .../bpf/progs/btf__verifier_stack_arg_order.c | 10 + + tools/testing/selftests/bpf/progs/data_in_arena.c | 112 -- + .../selftests/bpf/progs/data_in_arena_decl.c | 37 - + .../selftests/bpf/progs/data_in_arena_extern.c | 20 - + .../selftests/bpf/progs/data_in_arena_fail.c | 20 - + .../selftests/bpf/progs/data_in_arena_nomap.c | 20 - + .../selftests/bpf/progs/data_in_arena_rust.rs | 73 -- + tools/testing/selftests/bpf/progs/iters_testmod.c | 370 +++++++ + .../bpf/progs/struct_ops_assoc_in_timer.c | 16 + + .../selftests/bpf/progs/test_send_signal_kern.c | 29 + + tools/testing/selftests/bpf/progs/verifier_arena.c | 15 + + .../selftests/bpf/progs/verifier_arena_scalar.c | 1155 -------------------- + .../testing/selftests/bpf/progs/verifier_bounds.c | 41 + + tools/testing/selftests/bpf/progs/verifier_scev.c | 504 ++++++++- + .../selftests/bpf/progs/verifier_stack_arg.c | 119 ++ + .../selftests/bpf/progs/verifier_stack_arg_order.c | 121 +- + .../selftests/bpf/progs/verifier_stack_ptr.c | 30 +- + .../selftests/bpf/progs/verifier_vfs_accept.c | 17 + + .../selftests/bpf/progs/verifier_vfs_reject.c | 19 + + .../testing/selftests/bpf/test_kmods/bpf_testmod.c | 25 + + .../testing/selftests/bpf/test_kmods/bpf_testmod.h | 4 + + .../selftests/bpf/test_kmods/bpf_testmod_kfunc.h | 5 + + tools/testing/selftests/bpf/test_loader.c | 2 - + 61 files changed, 1884 insertions(+), 2580 deletions(-) + delete mode 100644 tools/testing/selftests/bpf/prog_tests/arena_scalar_blinded.c + delete mode 100644 tools/testing/selftests/bpf/prog_tests/data_in_arena.c + delete mode 100644 tools/testing/selftests/bpf/progs/data_in_arena.c + delete mode 100644 tools/testing/selftests/bpf/progs/data_in_arena_decl.c + delete mode 100644 tools/testing/selftests/bpf/progs/data_in_arena_extern.c + delete mode 100644 tools/testing/selftests/bpf/progs/data_in_arena_fail.c + delete mode 100644 tools/testing/selftests/bpf/progs/data_in_arena_nomap.c + delete mode 100644 tools/testing/selftests/bpf/progs/data_in_arena_rust.rs + delete mode 100644 tools/testing/selftests/bpf/progs/verifier_arena_scalar.c +Merging ipsec/master (835912998ca54 Merge branch 'xfrm: state: exact mark/mask match for control-plane SA lookups') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Auto-merging include/net/xfrm.h +Auto-merging net/xfrm/xfrm_policy.c +Merge made by the 'ort' strategy. + .../networking/xfrm/xfrm_migrate_state.rst | 25 +++-- + include/net/espintcp.h | 5 +- + include/net/xfrm.h | 7 ++ + net/xfrm/espintcp.c | 43 +++++---- + net/xfrm/xfrm_interface_core.c | 8 ++ + net/xfrm/xfrm_policy.c | 14 ++- + net/xfrm/xfrm_replay.c | 6 +- + net/xfrm/xfrm_state.c | 101 +++++++++++++++++---- + net/xfrm/xfrm_user.c | 79 +++++++++++----- + 9 files changed, 214 insertions(+), 74 deletions(-) +Merging netfilter/main (734bef548a96e Merge tag 'net-next-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ 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 (ab699d296e066 Merge branch 'net-always-dissect-gso-packets-in-__virtio_net_hdr_to_skb') +$ 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 bluetooth-fixes/master (24a4c2f1f7cea Bluetooth: qca: Fix the WCN3950 NVM baud rate offset) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git bluetooth-fixes/master +Merge made by the 'ort' strategy. + drivers/bluetooth/Makefile | 2 +- + drivers/bluetooth/btintel.c | 24 +- + drivers/bluetooth/btintel_pcie.c | 591 +++++++++++++++++++++++++++++---- + drivers/bluetooth/btintel_pcie.h | 46 ++- + drivers/bluetooth/btintel_pcie_debug.c | 331 ++++++++++++++++++ + drivers/bluetooth/btintel_pcie_debug.h | 171 ++++++++++ + drivers/bluetooth/btmtk.c | 44 ++- + drivers/bluetooth/btqca.c | 3 +- + drivers/bluetooth/hci_nokia.c | 9 +- + include/net/bluetooth/hci.h | 3 + + include/net/bluetooth/hci_core.h | 106 +++--- + net/bluetooth/hci_conn.c | 92 ++--- + net/bluetooth/hci_core.c | 136 +++++++- + net/bluetooth/hci_event.c | 197 ++++++----- + net/bluetooth/hci_sync.c | 186 ++++++++--- + net/bluetooth/iso.c | 20 +- + net/bluetooth/l2cap_core.c | 18 +- + net/bluetooth/mgmt.c | 22 +- + net/bluetooth/smp.c | 24 +- + 19 files changed, 1672 insertions(+), 353 deletions(-) + create mode 100644 drivers/bluetooth/btintel_pcie_debug.c + create mode 100644 drivers/bluetooth/btintel_pcie_debug.h +Merging wireless/for-next (af32da41b0327 Merge tag 'net-7.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (045958acaa752 Merge tag 'net-7.3-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 (1e7e30fb650b8 wifi: iwlwifi: mvm: fix VHT NSS reporting on pre-MQ devices) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-trans.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rx.c +Resolved 'drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 63613ee160253] Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git +$ git diff -M --stat --summary HEAD^.. + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 6 +++--- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 7 +++++-- + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 1 - + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 3 +++ + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 4 ++-- + .../net/wireless/intel/iwlwifi/tests/nvm_parse.c | 24 ++++++++++++++++++---- + 7 files changed, 34 insertions(+), 13 deletions(-) +Merging wpan/master (2b4707a149a55 net: mctp: i3c: serialize probe with bus removal) +$ 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 (72d3fcf802c45 Linux 7.3-rc5) +$ 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 (a4311e9447bbb ALSA: hda: Reject codec reset on ASoC (ext_ops) buses) +$ 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. + include/sound/info.h | 2 ++ + include/sound/ump.h | 5 +++ + sound/core/info.c | 23 +++++++++++--- + sound/core/pcm.c | 54 +++++++++++++++++++------------- + sound/core/seq/seq_ump_client.c | 5 +-- + sound/core/ump.c | 63 +++++++++++++++++++++++++++++++------ + sound/drivers/opl3/opl3_midi.c | 15 +++++++++ + sound/drivers/opl3/opl3_oss.c | 1 + + sound/drivers/opl3/opl3_seq.c | 13 +++++--- + sound/drivers/opl3/opl3_voice.h | 1 + + sound/drivers/pcmtest.c | 24 ++++++++++++++- + sound/hda/codecs/realtek/alc269.c | 12 ++++++++ + sound/hda/common/codec.c | 6 ++++ + sound/hda/common/sysfs.c | 4 +++ + sound/hda/controllers/intel.c | 2 ++ + sound/pci/ac97/ac97_codec.c | 29 +++++++++-------- + sound/pci/emu10k1/emufx.c | 18 ++++++----- + sound/sh/aica.c | 2 +- + sound/usb/endpoint.c | 6 ++-- + sound/usb/misc/ua101.c | 29 +++++++++++++++-- + sound/usb/pcm.c | 20 +++++++++++- + sound/usb/quirks-table.h | 65 +++++++++++++++++++++++++++++++++++++++ + sound/usb/quirks.c | 6 +++- + 23 files changed, 332 insertions(+), 73 deletions(-) +Merging sound-asoc-fixes/for-linus (bbe41586cdfa9 ASoC: imx-pcm-rpmsg: Flush pending work in hw_free) +$ 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 +Auto-merging sound/soc/sof/intel/hda-codec.c +Merge made by the 'ort' strategy. + include/sound/cs35l56.h | 4 + + sound/soc/amd/raven/acp3x-pcm-dma.c | 2 + + sound/soc/amd/yc/acp6x-mach.c | 7 + + sound/soc/codecs/cs35l56-sdw.c | 27 +++- + sound/soc/codecs/cs35l56-shared.c | 38 ++++++ + sound/soc/codecs/cs35l56.c | 17 +++ + sound/soc/codecs/cs35l56.h | 1 + + sound/soc/codecs/cs42l56.c | 1 - + sound/soc/codecs/es8326.c | 2 +- + sound/soc/codecs/es8375.c | 136 +++++++++---------- + sound/soc/codecs/es8375.h | 5 +- + sound/soc/codecs/es9356.c | 106 +++++++++++---- + sound/soc/codecs/es9356.h | 5 + + sound/soc/codecs/hdac_hda.c | 41 +++++- + sound/soc/codecs/rt721-sdca-sdw.c | 2 - + sound/soc/codecs/rt721-sdca-sdw.h | 4 - + sound/soc/codecs/rt722-sdca.c | 18 +++ + sound/soc/codecs/rt722-sdca.h | 2 + + sound/soc/codecs/tlv320aic32x4-clk.c | 8 +- + sound/soc/codecs/wm8994.c | 153 ++++++++++++---------- + sound/soc/codecs/wm8994.h | 2 + + sound/soc/codecs/wsa881x.c | 18 ++- + sound/soc/codecs/wsa883x.c | 21 +-- + sound/soc/codecs/wsa884x.c | 19 +-- + sound/soc/fsl/fsl_utils.c | 25 +++- + sound/soc/fsl/imx-pcm-rpmsg.c | 14 +- + sound/soc/intel/common/soc-acpi-intel-arl-match.c | 84 ++++++++++++ + sound/soc/qcom/qdsp6/q6afe.c | 10 +- + sound/soc/qcom/qdsp6/q6apm.c | 49 +++++-- + sound/soc/qcom/qdsp6/topology.c | 31 ++++- + sound/soc/qcom/sm8250.c | 10 ++ + sound/soc/samsung/midas_wm1811.c | 14 +- + sound/soc/sdca/sdca_class.c | 10 +- + sound/soc/sof/amd/Kconfig | 1 + + sound/soc/sof/intel/hda-codec.c | 23 +--- + sound/soc/xilinx/xlnx_formatter_pcm.c | 18 +-- + 36 files changed, 680 insertions(+), 248 deletions(-) +Merging regmap-fixes/for-linus (1ea2927c1bc3c regmap: irq: fix incorrect index calculation for read_sub_irq_data()) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap-irq.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging regulator-fixes/for-linus (ec255de3ff667 Merge regulator/for-7.3 into regulator-linus) +$ 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/irq_helpers.c | 38 ++++++++++++++++++++++---------------- + 1 file changed, 22 insertions(+), 16 deletions(-) +Merging spi-fixes/for-linus (7da2aca123754 spi: cs42l43: Add speaker ID quirk for Dell XPS 13 DX13260 SKU 0E54) +$ 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-cs42l43.c | 8 ++++++++ + drivers/spi/spi-zynq-qspi.c | 13 +++++++------ + 2 files changed, 15 insertions(+), 6 deletions(-) +Merging pci-current/for-linus (810c9fc7e7fd1 PCI: Ignore Immediate Readiness on Samsung PM9D3a NVMe) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Auto-merging drivers/pci/quirks.c +Merge made by the 'ort' strategy. + drivers/pci/quirks.c | 1 + + 1 file changed, 1 insertion(+) +Merging driver-core.current/driver-core-linus (1f69e515c5480 Revert "driver core: add TAINT_FORCED_BIND for when userspace manually messes with devices and drivers") +$ 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 +Auto-merging include/linux/panic.h +Auto-merging kernel/panic.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/tainted-kernels.rst | 52 +++++++++++++-------------- + drivers/base/bus.c | 3 -- + drivers/base/core.c | 4 ++- + include/linux/panic.h | 3 +- + include/trace/events/module.h | 3 +- + kernel/panic.c | 5 ++- + lib/kobject_uevent.c | 6 ++-- + tools/debugging/kernel-chktaint | 8 ----- + 8 files changed, 34 insertions(+), 50 deletions(-) +Merging tty.current/tty-linus (c339f4010dea8 Merge tag 'platform-drivers-x86-v7.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) +$ 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 (78585f90feb3b usb: gadget: f_ncm: restart the TX timer if the TX freelist is empty) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +- + drivers/thunderbolt/stream.c | 6 + + drivers/usb/class/cdc-acm.c | 18 ++- + drivers/usb/dwc3/core.h | 4 +- + drivers/usb/dwc3/dwc3-xilinx.c | 123 +++++++++++++++---- + drivers/usb/dwc3/ep0.c | 2 +- + drivers/usb/dwc3/gadget.c | 160 ++++++++++++++++--------- + drivers/usb/dwc3/trace.h | 1 + + drivers/usb/gadget/function/f_mass_storage.c | 8 +- + drivers/usb/gadget/function/f_midi.c | 4 + + drivers/usb/gadget/function/f_ncm.c | 7 +- + drivers/usb/gadget/function/storage_common.c | 7 +- + drivers/usb/gadget/function/storage_common.h | 3 +- + drivers/usb/gadget/function/u_serial.c | 170 +++++++++++++++++++++------ + drivers/usb/misc/usbtest.c | 3 + + drivers/usb/storage/uas-detect.h | 8 +- + drivers/usb/typec/mux/fsa4480.c | 9 +- + drivers/usb/typec/mux/nb7vpq904m.c | 1 + + drivers/usb/typec/ucsi/debugfs.c | 3 +- + drivers/usb/typec/ucsi/ucsi.c | 10 +- + drivers/usb/typec/ucsi/ucsi_acpi.c | 35 ++++++ + 21 files changed, 447 insertions(+), 138 deletions(-) +Merging usb-serial-fixes/usb-linus (a90ee4305c4a5 Linux 7.3-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 (93f51579e7df2 Linux 7.3-rc4) +$ 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 (24934cb6b8cd9 staging: vme_user: delete driver) +$ git merge -m Merge branch 'staging-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/driver-api/index.rst | 1 - + Documentation/driver-api/vme.rst | 297 ---- + MAINTAINERS | 7 - + arch/powerpc/configs/86xx-hw.config | 2 - + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/vme_user/Kconfig | 53 - + drivers/staging/vme_user/Makefile | 9 - + drivers/staging/vme_user/vme.c | 1977 ------------------------ + drivers/staging/vme_user/vme.h | 190 --- + drivers/staging/vme_user/vme_bridge.h | 190 --- + drivers/staging/vme_user/vme_fake.c | 1308 ---------------- + drivers/staging/vme_user/vme_tsi148.c | 2643 --------------------------------- + drivers/staging/vme_user/vme_tsi148.h | 1392 ----------------- + drivers/staging/vme_user/vme_user.c | 812 ---------- + drivers/staging/vme_user/vme_user.h | 47 - + 16 files changed, 8931 deletions(-) + delete mode 100644 Documentation/driver-api/vme.rst + delete mode 100644 drivers/staging/vme_user/Kconfig + delete mode 100644 drivers/staging/vme_user/Makefile + delete mode 100644 drivers/staging/vme_user/vme.c + delete mode 100644 drivers/staging/vme_user/vme.h + delete mode 100644 drivers/staging/vme_user/vme_bridge.h + delete mode 100644 drivers/staging/vme_user/vme_fake.c + delete mode 100644 drivers/staging/vme_user/vme_tsi148.c + delete mode 100644 drivers/staging/vme_user/vme_tsi148.h + delete mode 100644 drivers/staging/vme_user/vme_user.c + delete mode 100644 drivers/staging/vme_user/vme_user.h +Merging iio-fixes/fixes-togreg (09f742b49cb27 iio: proximity: sx9500: ignore event config writes that don't change state) +$ git merge -m Merge branch 'fixes-togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + .../bindings/iio/adc/aspeed,ast2600-adc.yaml | 17 ++++ + .../devicetree/bindings/iio/dac/adi,ad5758.yaml | 4 +- + drivers/iio/accel/Kconfig | 4 + + drivers/iio/adc/aspeed_adc.c | 25 ++++-- + drivers/iio/adc/mcp3564.c | 3 + + drivers/iio/adc/qcom-spmi-adc5-gen3.c | 21 ++++- + drivers/iio/chemical/atlas-ezo-sensor.c | 3 - + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 5 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 27 +++--- + drivers/iio/dac/ad5758.c | 4 +- + drivers/iio/dac/mcp4725.c | 2 + + drivers/iio/dac/mcp47feb02-core.c | 3 + + drivers/iio/gyro/bmg160_core.c | 2 +- + drivers/iio/humidity/am2315.c | 12 ++- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 97 +++++++++++++++++----- + drivers/iio/imu/kmx61.c | 2 +- + drivers/iio/industrialio-acpi.c | 9 ++ + drivers/iio/industrialio-trigger.c | 1 + + drivers/iio/light/tsl2591.c | 32 ++++--- + drivers/iio/light/vcnl4035.c | 4 +- + drivers/iio/magnetometer/mmc35240.c | 3 +- + drivers/iio/magnetometer/mmc5633.c | 3 +- + drivers/iio/magnetometer/tlv493d.c | 6 +- + drivers/iio/proximity/hx9023s.c | 16 ++-- + drivers/iio/proximity/sx9324.c | 13 ++- + drivers/iio/proximity/sx9360.c | 29 +++++-- + drivers/iio/proximity/sx9500.c | 6 ++ + drivers/iio/temperature/mlx90614.c | 2 +- + 28 files changed, 262 insertions(+), 93 deletions(-) +Merging watchdog-fixes/watchdog (2686e13649a9e watchdog: mediatek: Apply the driver's mode to a watchdog left running) +$ git merge -m Merge branch 'watchdog' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-fixes/watchdog +Auto-merging drivers/watchdog/mtk_wdt.c +Merge made by the 'ort' strategy. +Merging counter-current/counter-current (fd73f4a665989 Linux 7.3-rc3) +$ 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 (c339f4010dea8 Merge tag 'platform-drivers-x86-v7.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) +$ 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 +Already up to date. +Merging soundwire-fixes/fixes (93f51579e7df2 Linux 7.3-rc4) +$ 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 (96a8479804e3f thunderbolt: Do not RPM complete unrelated subtrees on unplug) +$ 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 (f57202d55333f Merge branch 'next' into for-linus) +$ 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 (178aff4cf425b crypto: atmel-tdes - consolidate error paths in atmel_tdes_dma_init()) +$ 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 (dd2a4edb26e1c lib/crypto: mips: Disable Octeon SHA code on little-endian kernels) +$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Merge made by the 'ort' strategy. + lib/crypto/Kconfig | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging vfio-fixes/for-linus (e242e974e812e vfio: selftests: Add luuid to libvfio.mk's list of libraries, not to the Makefile) +$ 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 (cee9395acd804 Linux 7.3-rc1) +$ 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 (93f51579e7df2 Linux 7.3-rc4) +$ 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 (dc59e4fea9d83 Linux 7.2-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 (1c1a342aceec7 mtd: spinand: Do not update the QE bit on devices without one) +$ 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 (d5d2d7a8d8be1 MAINTAINERS: Add a mailing list entry to MFD) +$ 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 +Already up to date. +Merging v4l-dvb-fixes/fixes (c03c1a14507df Linux 7.3) +$ 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 (71827776667f4 reset: imx7: Correct polarity of MIPI CSI resets on i.MX8MQ) +$ git merge -m Merge branch 'reset/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (93f51579e7df2 Linux 7.3-rc4) +$ 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 (afb1ecfeda3fc ARM: configs: sama5: enable current Microchip KSZ DSA symbols) +$ 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 (2fabd2f406d0c ARM: dts: ti/omap: dra7: fix PCIe PHY clock divider definition) +$ 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 tegra-fixes/fixes (6c143432a14db Merge branch for-7.3/arm64/dt-fixes into fixes) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-fixes/fixes +Merge made by the 'ort' strategy. +Merging kvm-fixes/master (65ba8f34ec886 Merge tag 'xtensa-20261027' of https://github.com/jcmvbkbc/linux-xtensa) +$ 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 (f47190b08b71e s390/uv: Prevent potential out-of-bounds read) +$ 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 kvm-arm-fixes/fixes (79f3724ca8913 Merge branch kvm-arm64/vgic-fixes-7.4-1 into kvmarm-master/fixes) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm-fixes/fixes +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/kernel/head.S +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/config.c +Auto-merging arch/arm64/kvm/emulate-nested.c +Auto-merging arch/arm64/kvm/mmu.c +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging kernel/trace/Kconfig +Merge made by the 'ort' strategy. + arch/arm64/include/asm/el2_setup.h | 4 +- + arch/arm64/include/asm/hardirq.h | 6 +- + arch/arm64/include/asm/kvm_arm.h | 79 ++-------------- + arch/arm64/include/asm/kvm_asm.h | 22 ++--- + arch/arm64/include/asm/kvm_emulate.h | 18 ++-- + arch/arm64/include/asm/kvm_host.h | 10 +- + arch/arm64/include/asm/kvm_mte.h | 4 +- + arch/arm64/include/asm/kvm_pkvm.h | 1 - + arch/arm64/include/asm/kvm_ptrauth.h | 4 +- + arch/arm64/kernel/head.S | 4 +- + arch/arm64/kvm/Kconfig | 2 +- + arch/arm64/kvm/arm.c | 100 ++++++++++++-------- + arch/arm64/kvm/at.c | 18 ++-- + arch/arm64/kvm/config.c | 78 ++++++++++++++++ + arch/arm64/kvm/emulate-nested.c | 116 ++++++++++++------------ + arch/arm64/kvm/guest.c | 2 +- + arch/arm64/kvm/handle_exit.c | 2 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 14 +-- + arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 13 +-- + arch/arm64/kvm/hyp/nvhe/host.S | 2 +- + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 2 +- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 15 +-- + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 6 +- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 41 +++++---- + arch/arm64/kvm/hyp/nvhe/switch.c | 4 +- + arch/arm64/kvm/hyp/vgic-v3-sr.c | 4 +- + arch/arm64/kvm/hyp/vhe/switch.c | 12 +-- + arch/arm64/kvm/hyp/vhe/tlb.c | 2 +- + arch/arm64/kvm/hypercalls.c | 4 +- + arch/arm64/kvm/inject_fault.c | 6 +- + arch/arm64/kvm/mmu.c | 9 +- + arch/arm64/kvm/nested.c | 16 +++- + arch/arm64/kvm/pkvm.c | 4 +- + arch/arm64/kvm/sys_regs.c | 26 +++--- + arch/arm64/kvm/vgic/vgic-init.c | 38 ++++++-- + arch/arm64/kvm/vgic/vgic-irs-v5.c | 3 +- + arch/arm64/kvm/vgic/vgic-its.c | 85 +++++++++++++++-- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 15 ++- + arch/arm64/kvm/vgic/vgic-v3-nested.c | 4 +- + arch/arm64/kvm/vgic/vgic-v4.c | 3 + + arch/arm64/kvm/vgic/vgic.c | 15 +-- + drivers/irqchip/irq-gic-v4.c | 34 +++++-- + include/kvm/arm_vgic.h | 6 +- + kernel/trace/Kconfig | 1 + + tools/testing/selftests/kvm/arm64/set_id_regs.c | 13 ++- + tools/testing/selftests/kvm/arm64/vgic_v5.c | 32 +++++++ + 46 files changed, 562 insertions(+), 337 deletions(-) +Merging hwmon-fixes/hwmon (fb2c3f44a7e14 Merge tag 'ata-7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (a8aec14230322 nvdimm/bus: Fix potential use after free in asynchronous initialization) +$ 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 (cee9395acd804 Linux 7.3-rc1) +$ 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 (911655ab1dfb9 swiotlb: fix default_swiotlb_limit() for non-growable default pool) +$ 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 +Already up to date. +Merging drivers-x86-fixes/fixes (d144a494d81fc MAINTAINERS: fix sysfs-platform-ayaneo-ec documentation path) +$ 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 (cee9395acd804 Linux 7.3-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 (cee9395acd804 Linux 7.3-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 pinctrl-qcom-fixes/pinctrl-qcom/for-current (1df7f369075d7 pinctrl: qcom: kaanapali: add the I2C strong pull-up bit) +$ git merge -m Merge branch 'pinctrl-qcom/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pinctrl-qcom-fixes/pinctrl-qcom/for-current +Merge made by the 'ort' strategy. + drivers/pinctrl/qcom/pinctrl-kaanapali.c | 1 + + 1 file changed, 1 insertion(+) +Merging devicetree-fixes/dt/linus (30724547b221e of/irq: Fix remaining refcount leaks in of_irq_init()) +$ 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 (cee9395acd804 Linux 7.3-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 (ec6b083915e81 scsi: bsg: Pass reply_len to bsg_setup_queue() to fit UFS ARPMB replies) +$ 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 (c03c1a14507df Linux 7.3) +$ 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 (c03c1a14507df Linux 7.3) +$ 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 (b61dc6283bdf5 memstick: core: don't clear dev->driver in memstick_device_remove()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/memstick/core/memstick.c | 1 - + drivers/mmc/host/omap.c | 4 ++-- + drivers/mmc/host/sdhci-esdhc-imx.c | 17 +++++++++++++++++ + 3 files changed, 19 insertions(+), 3 deletions(-) +Merging rtc-fixes/rtc-fixes (055ef5ce9f67a rtc: spear: initialize IRQ state before requesting alarm IRQ) +$ git merge -m Merge branch 'rtc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (cee9395acd804 Linux 7.3-rc1) +$ 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 (dbc393f6f009a MAINTAINERS: drop KY from Hyper-V maintainers list) +$ 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 (d4f25b097e46d riscv: fix load_unaligned_zeropad() fixup for RV32) +$ 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 (0f70fd6f4c1d6 riscv: dts: microchip: beaglev-fire: remove double definition of gpio interrupts) +$ 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 +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (3a25c1c77dc37 soc: mpfs: use kref cleanup on probe failure) +$ 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 +Merge made by the 'ort' strategy. +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 (21a7f44fd0765 Merge tag 'devicetree-for-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux) +$ git merge -m Merge branch 'spdx-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (baa14758afb3e gpio: brcmstb: fix UAF after IRQ domain setup failure) +$ 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/gpio-brcmstb.c | 1 + + drivers/gpio/gpio-rockchip.c | 15 ++++++++++----- + 2 files changed, 11 insertions(+), 5 deletions(-) +Merging gpio-intel-fixes/fixes (3fd4bf93d586c gpiolib: acpi: Fix GPIO lookup using relative path) +$ 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 (cee9395acd804 Linux 7.3-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 (cee9395acd804 Linux 7.3-rc1) +$ 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 (cee9395acd804 Linux 7.3-rc1) +$ 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 renesas-fixes/fixes (8dc2615d57020 arm64: dts: renesas: r8a779f0: Set UFS lane count) +$ 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 (aadea57f53288 perf powerpc-vpadtl: Fix raw_size of DTL samples) +$ 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 (d8809f6931065 efi: sysfb_efi: Extend quirk to cover IdeaPad Duet 3 10IGL5-LTE) +$ 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 (5b4bd13e05529 power: supply: core: prevent unregistering a power supply while a callback runs) +$ 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 (cee9395acd804 Linux 7.3-rc1) +$ 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 (7d109178cd644 rust: dma: declare cfi_encoding for dma_data_direction) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Auto-merging drivers/android/binder/process.rs +Auto-merging rust/bindgen_parameters +CONFLICT (content): Merge conflict in rust/bindgen_parameters +Auto-merging rust/kernel/dma.rs +Auto-merging rust/kernel/sync/lock/spinlock.rs +Auto-merging rust/kernel/time/hrtimer.rs +Resolved 'rust/bindgen_parameters' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7e75a461141f4] Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/rust/testing.rst | 2 +- + Documentation/translations/zh_CN/rust/testing.rst | 2 +- + drivers/android/binder/process.rs | 4 +- + rust/bindgen_parameters | 6 +++ + rust/kernel/dma.rs | 21 ++++----- + rust/kernel/irq/request.rs | 28 +++++++----- + rust/kernel/sync/completion.rs | 2 +- + rust/kernel/sync/lock/spinlock.rs | 2 +- + rust/kernel/time/hrtimer.rs | 6 +-- + rust/kernel/workqueue.rs | 52 ++++++++++++----------- + tools/objtool/check.c | 1 + + 11 files changed, 71 insertions(+), 55 deletions(-) +Merging w1-fixes/fixes (cee9395acd804 Linux 7.3-rc1) +$ 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 (4c66c423593e2 pmdomain: rockchip: don't ignore clock lookup errors on attach) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging i2c-andi-fixes/i2c/i2c-fixes (25e7ab89f4774 Merge tag 'i2c-7.4-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux) +$ git merge -m Merge branch 'i2c/i2c-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-andi-fixes/i2c/i2c-fixes +Already up to date. +Merging i2c-rust-fixes/rust-i2c-fixes (4eb422482ca5d rust: i2c: fix I2cAdapter refcounts double increment) +$ git merge -m Merge branch 'rust-i2c-fixes' of https://github.com/ikrtn/rust-for-linux i2c-rust-fixes/rust-i2c-fixes +Already up to date. +Merging sparc-fixes/for-linus (cee9395acd804 Linux 7.3-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 (81493c1dd1b1e Merge tag 'tags/spacemit-clk-fixes-for-7.3-1' into clk-fixes) +$ 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 (cee9395acd804 Linux 7.3-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 tenstorrent-clk-fixes/tenstorrent-clk-fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'tenstorrent-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-clk-fixes/tenstorrent-clk-fixes +Already up to date. +Merging fustini-config-fixes/riscv-config-fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'riscv-config-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git fustini-config-fixes/riscv-config-fixes +Already up to date. +Merging pwrseq-fixes/pwrseq/for-current (c03c1a14507df Linux 7.3) +$ 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 (cee9395acd804 Linux 7.3-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 (057caace5214d tracing: Create output file from cmd_check_undefined) +$ 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 (c47a7b11bcb3d tracing: Check operator stack capacity before pushing) +$ 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 (07004a8c4b572 eventfs: Hold eventfs_mutex and SRCU when remount walks events) +$ 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 (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux spacemit-fixes/fixes +Already up to date. +Merging tip-fixes/tip/urgent (7dda0bcb08bf1 Merge branch into tip/master: 'timers/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. + drivers/irqchip/irq-msi-lib.c | 1 + + drivers/irqchip/irq-riscv-imsic-platform.c | 2 +- + include/linux/hrtimer.h | 24 +++++++++++++++ + kernel/sched/idle.c | 16 ++++++---- + kernel/time/clocksource.c | 2 +- + kernel/time/hrtimer.c | 8 +++-- + kernel/time/itimer.c | 2 +- + kernel/time/namespace.c | 2 +- + kernel/time/posix-stubs.c | 4 +-- + kernel/time/posix-timers.c | 25 ++++++++-------- + kernel/time/tick-sched.c | 14 ++++++++- + lib/vdso/gettimeofday.c | 4 +-- + tools/testing/selftests/timers/posix_timers.c | 43 ++++++++++++++++++++++++++- + 13 files changed, 116 insertions(+), 31 deletions(-) +Merging kexec-fixes/kexec-fixes (a901b0778ae82 Merge patch series "kexec: fix probe error codes and error propagation") +$ git merge -m Merge branch 'kexec-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git kexec-fixes/kexec-fixes +Already up to date. +Merging liveupdate-fixes/fixes (3a0b8fa2eb36a kho: fix size calculation in kho_preserved_memory_reserve()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git liveupdate-fixes/fixes +Already up to date. +Merging drm-msm-fixes/msm-fixes (a15fac810c763 dt-bindings: display/msm: Use consistent indentation in the example) +$ 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 (af421e9aed392 um: vector: fix use-after-free in vector_mmsg_rx()) +$ 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 (cee9395acd804 Linux 7.3-rc1) +$ 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 (c3fd16c3b98ed virt: tdx-guest: Fix handling of host controlled 'quote' buffer length) +$ 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/for-linux-next-fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-fixes/for-linux-next-fixes +Already up to date. +Merging tenstorrent-dt-fixes/tenstorrent-dt-fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'tenstorrent-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-dt-fixes/tenstorrent-dt-fixes +Already up to date. +Merging nfc-fixes/for-linus (b61732f47316d nfc: pn533: fix OOB read in pn533_acr122_is_rx_frame_valid()) +$ git merge -m Merge branch 'for-linus' of https://codeberg.org/linux-nfc/linux.git nfc-fixes/for-linus +Already up to date. +Merging mm-nonmm-hotfixes-stable/mm-nonmm-hotfixes-stable (65ba8f34ec886 Merge tag 'xtensa-20261027' of https://github.com/jcmvbkbc/linux-xtensa) +$ git merge -m Merge branch 'mm-nonmm-hotfixes-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-hotfixes-stable/mm-nonmm-hotfixes-stable +Already up to date. +Merging mm-nonmm-hotfixes-unstable/mm-nonmm-hotfixes-unstable (a58447d3a24b6 MAINTAINERS: add an IPC entry) +$ git merge -m Merge branch 'mm-nonmm-hotfixes-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-hotfixes-unstable/mm-nonmm-hotfixes-unstable +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 10 +++ + fs/fat/file.c | 70 +++++++++++++++------ + fs/fat/inode.c | 2 + + fs/ocfs2/cluster/heartbeat.c | 40 ++++++++++-- + fs/ocfs2/move_extents.c | 70 ++++++++++++--------- + fs/ocfs2/xattr.c | 146 ++++++++++++++++++++++++++++++++++++------- + 6 files changed, 259 insertions(+), 79 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (6ce0c151d52f6 dma-buf: validate the attachment before asserting its reservation lock) +$ 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 +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/gpu/drm/drm_panic.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_panic.c +Auto-merging drivers/gpu/drm/vc4/vc4_gem.c +Resolved 'drivers/gpu/drm/drm_panic.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7ae0c7fad5144] Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 2 ++ + MAINTAINERS | 6 +++--- + drivers/dma-buf/dma-buf-mapping.c | 8 +++++--- + drivers/dma-buf/dma-buf.c | 4 ++++ + drivers/gpu/drm/drm_crtc.c | 18 ++++++++++++------ + drivers/gpu/drm/drm_panic.c | 2 +- + drivers/gpu/drm/vc4/vc4_gem.c | 14 +++++++++++--- + 7 files changed, 38 insertions(+), 16 deletions(-) +Merging rust/rust-next (65ba8f34ec886 Merge tag 'xtensa-20261027' of https://github.com/jcmvbkbc/linux-xtensa) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging rust-interop/interop-next (05f7e89ab9731 Linux 6.19) +$ git merge -m Merge branch 'interop-next' of https://github.com/Rust-for-Linux/linux.git rust-interop/interop-next +Already up to date. +Merging rust-alloc/alloc-next (6e8339118040f rust: alloc: add `NumaNode::id()` accessor) +$ 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 (b7218f1996f84 rust: pin-init: internal: suppress `explicit_outlives_requirements`) +$ 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 (2ea0119f72dba rust: hrtimer: document handle based design rationale) +$ 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 (0024f3311f6f5 scripts: generate_rust_analyzer.py: pass cfg to macros crate) +$ git merge -m Merge branch 'rust-analyzer-next' of https://github.com/Rust-for-Linux/linux.git rust-analyzer/rust-analyzer-next +Merge made by the 'ort' strategy. + scripts/generate_rust_analyzer.py | 1 + + 1 file changed, 1 insertion(+) +Merging mm/for-next (2afb5d8fc19c0 Merge https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-unstable into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mm/linux.git mm/for-next +Merge made by the 'ort' strategy. + arch/arm64/mm/mmu.c | 3 +- + crypto/acompress.c | 18 +-- + fs/proc/internal.h | 1 + + fs/proc/task_mmu.c | 22 ++- + include/linux/damon.h | 10 ++ + include/linux/hugetlb.h | 15 +- + include/linux/mm.h | 209 ++++++++++++++------------- + include/linux/mmap_lock.h | 22 ++- + include/linux/userfaultfd_k.h | 16 +- + lib/xarray.c | 3 +- + mm/damon/core.c | 10 +- + mm/damon/sysfs-schemes.c | 3 + + mm/hugetlb.c | 55 +++++-- + mm/khugepaged.c | 44 ++++-- + mm/ksm.c | 10 ++ + mm/madvise.c | 10 +- + mm/memcontrol.c | 5 + + mm/memory.c | 14 +- + mm/migrate.c | 5 +- + mm/mlock.c | 6 +- + mm/mm_init.c | 2 - + mm/mmap_lock.c | 61 ++++++-- + mm/mprotect.c | 2 +- + mm/nommu.c | 1 + + mm/page-writeback.c | 8 +- + mm/page_alloc.c | 5 +- + mm/shmem.c | 4 + + mm/swapfile.c | 4 +- + mm/vma.c | 104 ++++++++----- + mm/vma_init.c | 3 + + mm/vmalloc.c | 18 ++- + mm/zswap.c | 172 ++++++++++++++-------- + tools/testing/selftests/mm/khugepaged_race.c | 1 + + tools/testing/selftests/mm/merge.c | 33 +++-- + tools/testing/vma/include/dup.h | 85 ++++++----- + tools/testing/vma/include/stubs.h | 2 +- + tools/testing/vma/shared.h | 16 +- + 37 files changed, 633 insertions(+), 369 deletions(-) +Merging mm-nonmm-stable/mm-nonmm-stable (65ba8f34ec886 Merge tag 'xtensa-20261027' of https://github.com/jcmvbkbc/linux-xtensa) +$ 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 +Already up to date. +Merging mm-nonmm-unstable/mm-nonmm-unstable (ce0c944d8c6f0 squashfs: make the fragment index table bounds check overflow-safe) +$ 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 .mailmap +Auto-merging MAINTAINERS +Auto-merging kernel/panic.c +Auto-merging lib/iov_iter.c +Merge made by the 'ort' strategy. + .mailmap | 1 + + MAINTAINERS | 2 +- + drivers/media/v4l2-core/v4l2-vp9.c | 30 ++++---- + fs/fat/fat.h | 1 + + fs/fat/fatent.c | 88 ++++++++++++++++------- + fs/fat/misc.c | 14 +++- + fs/ocfs2/dcache.h | 5 +- + fs/ocfs2/dlmglue.c | 16 ++--- + fs/ocfs2/filecheck.c | 2 + + fs/squashfs/fragment.c | 6 +- + fs/squashfs/squashfs_fs.h | 2 +- + include/linux/uio.h | 8 +-- + ipc/msg.c | 12 ++-- + kernel/panic.c | 2 +- + kernel/profile.c | 58 ++++++++++----- + lib/dynamic_debug.c | 15 ++-- + lib/iov_iter.c | 6 +- + tools/testing/selftests/uevent/uevent_filtering.c | 8 --- + 18 files changed, 169 insertions(+), 107 deletions(-) +Merging kbuild/kbuild-for-next (2a5a1c2fab913 Merge branch 'kbuild-next' into kbuild-for-next) +$ 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 init/Kconfig +Auto-merging scripts/Kconfig.toolchain +Merge made by the 'ort' strategy. +Merging clang-fixes/clang-fixes-for-next (0bb666d5f5a23 once_lite: Simplify condition handling and fix context analysis) +$ git merge -m Merge branch 'clang-fixes-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux.git clang-fixes/clang-fixes-for-next +Already up to date. +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 (4626d370ae89b perf machine: Fix NULL deref in thread__resolve_callchain_sample()) +$ 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 +Auto-merging MAINTAINERS +Auto-merging tools/arch/arm64/include/uapi/asm/kvm.h +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + tools/arch/arm64/include/uapi/asm/kvm.h | 1 + + tools/arch/powerpc/include/uapi/asm/kvm.h | 18 + + tools/arch/x86/include/asm/cpufeatures.h | 15 + + tools/arch/x86/include/asm/msr-index.h | 7 + + tools/arch/x86/include/uapi/asm/perf_regs.h | 53 + + tools/build/Makefile.feature | 9 +- + tools/build/feature/Makefile | 46 +- + tools/build/feature/test-all.c | 11 +- + tools/build/feature/test-gettid.c | 1 + + tools/build/feature/test-gtk2-infobar.c | 12 - + tools/build/feature/{test-gtk2.c => test-gtk4.c} | 4 +- + tools/build/feature/test-libdw.c | 10 +- + tools/build/feature/test-libperl.c | 10 - + tools/build/feature/test-libpython.c | 10 - + tools/build/feature/test-pthread-mutex-robust.c | 18 + + tools/build/feature/test-python-module.c | 13 + + tools/build/feature/test-timerfd.c | 2 +- + tools/include/tools/dis-asm-compat.h | 1 + + tools/include/uapi/linux/if_addr.h | 1 + + tools/include/uapi/linux/kvm.h | 4 + + tools/include/uapi/linux/perf_event.h | 49 +- + tools/include/uapi/linux/rtnetlink.h | 25 + + tools/lib/api/fd/array.c | 4 + + tools/lib/perf/evlist.c | 5 +- + tools/lib/perf/include/internal/evsel.h | 2 + + tools/lib/perf/mmap.c | 2 +- + tools/perf/.clang-format | 1 + + tools/perf/Build | 17 +- + tools/perf/Documentation/build-docdep.perl | 2 +- + tools/perf/Documentation/db-export.txt | 20 +- + tools/perf/Documentation/perf-annotate.txt | 3 + + tools/perf/Documentation/perf-bench.txt | 38 + + tools/perf/Documentation/perf-c2c.txt | 14 +- + tools/perf/Documentation/perf-check.txt | 3 +- + tools/perf/Documentation/perf-config.txt | 10 + + tools/perf/Documentation/perf-list.txt | 10 + + tools/perf/Documentation/perf-mem.txt | 4 + + tools/perf/Documentation/perf-record.txt | 27 +- + tools/perf/Documentation/perf-report.txt | 32 +- + tools/perf/Documentation/perf-sched.txt | 6 +- + tools/perf/Documentation/perf-script-perl.txt | 216 - + tools/perf/Documentation/perf-script-python.txt | 752 +-- + tools/perf/Documentation/perf-script.txt | 82 +- + tools/perf/Documentation/perf-stat.txt | 12 +- + tools/perf/Documentation/perf-test.txt | 36 +- + tools/perf/Documentation/perf-timechart.txt | 8 + + tools/perf/Documentation/perf-top.txt | 11 + + tools/perf/Documentation/perf-trace.txt | 6 + + tools/perf/Documentation/perf.data-file-format.txt | 13 + + tools/perf/Documentation/tips.txt | 3 +- + tools/perf/Makefile | 54 +- + tools/perf/Makefile.config | 110 +- + tools/perf/Makefile.perf | 200 +- + tools/perf/arch/arm/tests/dwarf-unwind.c | 1 + + tools/perf/arch/arm64/tests/dwarf-unwind.c | 1 + + tools/perf/arch/loongarch/util/header.c | 2 +- + tools/perf/arch/powerpc/tests/dwarf-unwind.c | 1 + + tools/perf/arch/powerpc/util/skip-callchain-idx.c | 4 +- + tools/perf/arch/riscv/Build | 1 + + tools/perf/arch/riscv/include/arch-tests.h | 9 + + tools/perf/arch/riscv/include/perf_regs.h | 2 + + tools/perf/arch/riscv/tests/Build | 4 + + tools/perf/arch/riscv/tests/arch-tests.c | 10 + + tools/perf/arch/riscv/tests/dwarf-unwind.c | 64 + + tools/perf/arch/riscv/tests/regs_load.S | 58 + + tools/perf/arch/x86/tests/dwarf-unwind.c | 4 + + tools/perf/arch/x86/tests/topdown.c | 30 + + tools/perf/arch/x86/util/mem-events.c | 17 + + tools/perf/arch/x86/util/mem-events.h | 2 + + tools/perf/arch/x86/util/pmu.c | 226 +- + tools/perf/arch/x86/util/topdown.c | 3 +- + tools/perf/bench/Build | 1 + + tools/perf/bench/atomic.c | 299 ++ + tools/perf/bench/bench.h | 2 + + tools/perf/bench/futex.h | 11 + + tools/perf/bench/numa.c | 2 + + tools/perf/bench/sched-messaging.c | 4 +- + tools/perf/builtin-annotate.c | 96 +- + tools/perf/builtin-bench.c | 9 + + tools/perf/builtin-buildid-list.c | 17 +- + tools/perf/builtin-c2c.c | 245 +- + tools/perf/builtin-check.c | 3 +- + tools/perf/builtin-config.c | 88 +- + tools/perf/builtin-ftrace.c | 28 +- + tools/perf/builtin-help.c | 30 +- + tools/perf/builtin-inject.c | 4 + + tools/perf/builtin-kmem.c | 3 +- + tools/perf/builtin-kvm.c | 3 +- + tools/perf/builtin-list.c | 36 +- + tools/perf/builtin-lock.c | 61 +- + tools/perf/builtin-mem.c | 7 +- + tools/perf/builtin-record.c | 15 + + tools/perf/builtin-report.c | 52 +- + tools/perf/builtin-sched.c | 202 +- + tools/perf/builtin-script.c | 1124 +++-- + tools/perf/builtin-stat.c | 4 +- + tools/perf/builtin-timechart.c | 49 +- + tools/perf/builtin-top.c | 38 +- + tools/perf/builtin-trace.c | 712 +-- + tools/perf/builtin.h | 3 + + tools/perf/perf.c | 120 +- + tools/perf/pmu-events/Build | 72 +- + tools/perf/pmu-events/amd_metrics.py | 16 +- + .../perf/pmu-events/arch/x86/alderlake/cache.json | 4 +- + .../perf/pmu-events/arch/x86/alderlake/memory.json | 13 + + .../perf/pmu-events/arch/x86/alderlake/other.json | 10 + + .../pmu-events/arch/x86/alderlake/pipeline.json | 6 +- + .../perf/pmu-events/arch/x86/alderlaken/cache.json | 4 +- + .../perf/pmu-events/arch/x86/arrowlake/cache.json | 1 + + .../perf/pmu-events/arch/x86/arrowlake/other.json | 19 + + .../pmu-events/arch/x86/arrowlake/pipeline.json | 10 +- + .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 51 +- + .../arch/x86/broadwell/metricgroups.json | 3 +- + .../arch/x86/broadwellde/bdwde-metrics.json | 49 +- + .../arch/x86/broadwellde/metricgroups.json | 3 +- + .../arch/x86/broadwellx/bdx-metrics.json | 63 +- + .../arch/x86/broadwellx/metricgroups.json | 3 +- + .../arch/x86/cascadelakex/clx-metrics.json | 94 +- + .../arch/x86/cascadelakex/metricgroups.json | 3 +- + .../arch/x86/cascadelakex/uncore-interconnect.json | 6 + + .../arch/x86/clearwaterforest/pipeline.json | 3 +- + .../arch/x86/clearwaterforest/uncore-cache.json | 5 + + .../x86/clearwaterforest/uncore-interconnect.json | 2 + + .../pmu-events/arch/x86/emeraldrapids/cache.json | 2 +- + .../pmu-events/arch/x86/emeraldrapids/memory.json | 35 + + .../pmu-events/arch/x86/emeraldrapids/other.json | 9 + + .../arch/x86/emeraldrapids/pipeline.json | 10 +- + .../arch/x86/emeraldrapids/uncore-cache.json | 42 + + .../x86/emeraldrapids/uncore-interconnect.json | 12 + + .../arch/x86/emeraldrapids/uncore-io.json | 54 +- + .../arch/x86/emeraldrapids/uncore-memory.json | 10 + + .../pmu-events/arch/x86/graniterapids/other.json | 9 + + .../arch/x86/graniterapids/pipeline.json | 6 +- + .../arch/x86/graniterapids/uncore-cache.json | 15 + + .../x86/graniterapids/uncore-interconnect.json | 2 + + .../arch/x86/graniterapids/uncore-io.json | 12 + + .../pmu-events/arch/x86/haswell/hsw-metrics.json | 49 +- + .../pmu-events/arch/x86/haswell/metricgroups.json | 3 +- + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 61 +- + .../pmu-events/arch/x86/haswellx/metricgroups.json | 3 +- + .../pmu-events/arch/x86/icelake/icl-metrics.json | 84 +- + tools/perf/pmu-events/arch/x86/icelake/memory.json | 24 + + .../pmu-events/arch/x86/icelake/metricgroups.json | 2 +- + tools/perf/pmu-events/arch/x86/icelake/other.json | 9 + + .../perf/pmu-events/arch/x86/icelake/pipeline.json | 9 +- + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 101 +- + .../perf/pmu-events/arch/x86/icelakex/memory.json | 24 + + .../pmu-events/arch/x86/icelakex/metricgroups.json | 2 +- + tools/perf/pmu-events/arch/x86/icelakex/other.json | 9 + + .../pmu-events/arch/x86/icelakex/pipeline.json | 7 +- + .../pmu-events/arch/x86/icelakex/uncore-cache.json | 79 + + .../arch/x86/icelakex/uncore-interconnect.json | 22 + + .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 51 +- + .../arch/x86/ivybridge/metricgroups.json | 3 +- + .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 63 +- + .../pmu-events/arch/x86/ivytown/metricgroups.json | 3 +- + .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 41 +- + .../pmu-events/arch/x86/jaketown/metricgroups.json | 3 +- + .../perf/pmu-events/arch/x86/lunarlake/cache.json | 3 + + .../pmu-events/arch/x86/lunarlake/pipeline.json | 2 + + tools/perf/pmu-events/arch/x86/mapfile.csv | 26 +- + .../perf/pmu-events/arch/x86/meteorlake/other.json | 10 + + .../pmu-events/arch/x86/meteorlake/pipeline.json | 6 +- + tools/perf/pmu-events/arch/x86/novalake/cache.json | 500 +- + .../arch/x86/novalake/floating-point.json | 423 ++ + .../pmu-events/arch/x86/novalake/frontend.json | 147 +- + .../perf/pmu-events/arch/x86/novalake/memory.json | 24 + + tools/perf/pmu-events/arch/x86/novalake/other.json | 213 + + .../pmu-events/arch/x86/novalake/pipeline.json | 508 +- + .../arch/x86/novalake/virtual-memory.json | 173 + + .../pmu-events/arch/x86/pantherlake/cache.json | 3 + + .../pmu-events/arch/x86/pantherlake/other.json | 10 + + .../pmu-events/arch/x86/pantherlake/pipeline.json | 10 +- + .../pmu-events/arch/x86/rocketlake/memory.json | 24 + + .../arch/x86/rocketlake/metricgroups.json | 2 +- + .../perf/pmu-events/arch/x86/rocketlake/other.json | 9 + + .../pmu-events/arch/x86/rocketlake/pipeline.json | 9 +- + .../arch/x86/rocketlake/rkl-metrics.json | 84 +- + .../arch/x86/sandybridge/metricgroups.json | 3 +- + .../arch/x86/sandybridge/snb-metrics.json | 35 +- + .../pmu-events/arch/x86/sapphirerapids/cache.json | 2 +- + .../pmu-events/arch/x86/sapphirerapids/memory.json | 35 + + .../arch/x86/sapphirerapids/metricgroups.json | 2 +- + .../pmu-events/arch/x86/sapphirerapids/other.json | 9 + + .../arch/x86/sapphirerapids/pipeline.json | 10 +- + .../arch/x86/sapphirerapids/spr-metrics.json | 93 +- + .../arch/x86/sapphirerapids/uncore-cache.json | 42 + + .../x86/sapphirerapids/uncore-interconnect.json | 12 + + .../arch/x86/sapphirerapids/uncore-io.json | 54 +- + .../arch/x86/sapphirerapids/uncore-memory.json | 10 + + .../arch/x86/sierraforest/uncore-cache.json | 5 + + .../arch/x86/sierraforest/uncore-interconnect.json | 2 + + .../pmu-events/arch/x86/skylake/metricgroups.json | 3 +- + .../pmu-events/arch/x86/skylake/skl-metrics.json | 59 +- + .../pmu-events/arch/x86/skylakex/metricgroups.json | 3 +- + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 94 +- + .../arch/x86/skylakex/uncore-interconnect.json | 6 + + .../arch/x86/snowridgex/uncore-cache.json | 68 + + .../arch/x86/snowridgex/uncore-interconnect.json | 10 + + .../arch/x86/tigerlake/metricgroups.json | 2 +- + .../perf/pmu-events/arch/x86/tigerlake/other.json | 9 + + .../pmu-events/arch/x86/tigerlake/pipeline.json | 7 +- + .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 82 +- + tools/perf/pmu-events/intel_metrics.py | 268 +- + tools/perf/pmu-events/jevents.py | 116 +- + tools/perf/pmu-events/make_legacy_cache.py | 34 +- + tools/perf/pmu-events/metric.py | 60 +- + tools/perf/python/SchedGui.py | 246 + + tools/perf/python/arm-cs-trace-disasm.py | 440 ++ + tools/perf/python/check-perf-trace.py | 223 + + tools/perf/python/compaction-times.py | 362 ++ + tools/perf/python/counting.py | 1 + + tools/perf/python/event_analyzing_sample.py | 317 ++ + tools/perf/python/export-to-postgresql.py | 1328 +++++ + tools/perf/python/export-to-sqlite.py | 946 ++++ + tools/perf/python/exported-sql-viewer.py | 5103 ++++++++++++++++++++ + tools/perf/python/failed-syscalls-by-pid.py | 161 + + tools/perf/python/failed-syscalls.py | 94 + + tools/perf/python/flamegraph.py | 283 ++ + tools/perf/python/futex-contention.py | 107 + + tools/perf/python/gecko.py | 411 ++ + tools/perf/python/ilist.py | 86 +- + tools/perf/python/intel-pt-events.py | 632 +++ + tools/perf/python/libxed.py | 123 + + tools/perf/python/mem-phys-addr.py | 136 + + tools/perf/python/net_dropmonitor.py | 173 + + tools/perf/python/netdev-times.py | 494 ++ + tools/perf/python/parallel-perf.py | 1250 +++++ + tools/perf/python/perf.pyi | 122 +- + tools/perf/python/perf_live.py | 10 +- + tools/perf/{scripts => }/python/powerpc-hcalls.py | 213 +- + tools/perf/python/rw-by-file.py | 113 + + tools/perf/python/rw-by-pid.py | 205 + + tools/perf/python/rwtop.py | 256 + + tools/perf/python/sched-migration.py | 496 ++ + tools/perf/python/sctop.py | 253 + + tools/perf/python/stackcollapse.py | 145 + + tools/perf/python/stat-cpi.py | 231 + + tools/perf/python/syscall-counts-by-pid.py | 112 + + tools/perf/python/syscall-counts.py | 95 + + tools/perf/python/task-analyzer.py | 908 ++++ + tools/perf/python/tracepoint.py | 5 +- + tools/perf/python/treport.py | 807 ++++ + tools/perf/python/ttimechart.py | 1806 +++++++ + tools/perf/python/twatch.py | 77 +- + tools/perf/python/wakeup-latency.py | 103 + + tools/perf/scripts/Build | 30 - + tools/perf/scripts/install-build-deps.sh | 8 +- + tools/perf/scripts/perl/Perf-Trace-Util/Build | 9 - + tools/perf/scripts/perl/Perf-Trace-Util/Context.c | 122 - + tools/perf/scripts/perl/Perf-Trace-Util/Context.xs | 42 - + .../perf/scripts/perl/Perf-Trace-Util/Makefile.PL | 18 - + tools/perf/scripts/perl/Perf-Trace-Util/README | 59 - + .../perl/Perf-Trace-Util/lib/Perf/Trace/Context.pm | 55 - + .../perl/Perf-Trace-Util/lib/Perf/Trace/Core.pm | 192 - + .../perl/Perf-Trace-Util/lib/Perf/Trace/Util.pm | 94 - + tools/perf/scripts/perl/Perf-Trace-Util/typemap | 1 - + .../perf/scripts/perl/bin/check-perf-trace-record | 2 - + tools/perf/scripts/perl/bin/failed-syscalls-record | 3 - + tools/perf/scripts/perl/bin/failed-syscalls-report | 10 - + tools/perf/scripts/perl/bin/rw-by-file-record | 3 - + tools/perf/scripts/perl/bin/rw-by-file-report | 10 - + tools/perf/scripts/perl/bin/rw-by-pid-record | 2 - + tools/perf/scripts/perl/bin/rw-by-pid-report | 3 - + tools/perf/scripts/perl/bin/rwtop-record | 2 - + tools/perf/scripts/perl/bin/rwtop-report | 20 - + tools/perf/scripts/perl/bin/wakeup-latency-record | 6 - + tools/perf/scripts/perl/bin/wakeup-latency-report | 3 - + tools/perf/scripts/perl/check-perf-trace.pl | 106 - + tools/perf/scripts/perl/failed-syscalls.pl | 47 - + tools/perf/scripts/perl/rw-by-file.pl | 106 - + tools/perf/scripts/perl/rw-by-pid.pl | 184 - + tools/perf/scripts/perl/rwtop.pl | 203 - + tools/perf/scripts/perl/wakeup-latency.pl | 107 - + tools/perf/scripts/python/Perf-Trace-Util/Build | 4 - + .../perf/scripts/python/Perf-Trace-Util/Context.c | 225 - + .../python/Perf-Trace-Util/lib/Perf/Trace/Core.py | 116 - + .../Perf-Trace-Util/lib/Perf/Trace/EventClass.py | 97 - + .../Perf-Trace-Util/lib/Perf/Trace/SchedGui.py | 184 - + .../python/Perf-Trace-Util/lib/Perf/Trace/Util.py | 92 - + tools/perf/scripts/python/arm-cs-trace-disasm.py | 356 -- + .../scripts/python/bin/compaction-times-record | 2 - + .../scripts/python/bin/compaction-times-report | 4 - + .../python/bin/event_analyzing_sample-record | 8 - + .../python/bin/event_analyzing_sample-report | 3 - + .../scripts/python/bin/export-to-postgresql-record | 8 - + .../scripts/python/bin/export-to-postgresql-report | 29 - + .../scripts/python/bin/export-to-sqlite-record | 8 - + .../scripts/python/bin/export-to-sqlite-report | 29 - + .../python/bin/failed-syscalls-by-pid-record | 3 - + .../python/bin/failed-syscalls-by-pid-report | 10 - + tools/perf/scripts/python/bin/flamegraph-record | 2 - + tools/perf/scripts/python/bin/flamegraph-report | 3 - + .../scripts/python/bin/futex-contention-record | 2 - + .../scripts/python/bin/futex-contention-report | 4 - + tools/perf/scripts/python/bin/gecko-record | 2 - + tools/perf/scripts/python/bin/gecko-report | 7 - + .../perf/scripts/python/bin/intel-pt-events-record | 13 - + .../perf/scripts/python/bin/intel-pt-events-report | 3 - + tools/perf/scripts/python/bin/mem-phys-addr-record | 19 - + tools/perf/scripts/python/bin/mem-phys-addr-report | 3 - + .../perf/scripts/python/bin/net_dropmonitor-record | 2 - + .../perf/scripts/python/bin/net_dropmonitor-report | 4 - + tools/perf/scripts/python/bin/netdev-times-record | 8 - + tools/perf/scripts/python/bin/netdev-times-report | 5 - + .../perf/scripts/python/bin/powerpc-hcalls-record | 2 - + .../perf/scripts/python/bin/powerpc-hcalls-report | 2 - + .../perf/scripts/python/bin/sched-migration-record | 2 - + .../perf/scripts/python/bin/sched-migration-report | 3 - + tools/perf/scripts/python/bin/sctop-record | 3 - + tools/perf/scripts/python/bin/sctop-report | 24 - + tools/perf/scripts/python/bin/stackcollapse-record | 8 - + tools/perf/scripts/python/bin/stackcollapse-report | 3 - + .../python/bin/syscall-counts-by-pid-record | 3 - + .../python/bin/syscall-counts-by-pid-report | 10 - + .../perf/scripts/python/bin/syscall-counts-record | 3 - + .../perf/scripts/python/bin/syscall-counts-report | 10 - + tools/perf/scripts/python/bin/task-analyzer-record | 2 - + tools/perf/scripts/python/bin/task-analyzer-report | 3 - + tools/perf/scripts/python/check-perf-trace.py | 84 - + tools/perf/scripts/python/compaction-times.py | 311 -- + .../perf/scripts/python/event_analyzing_sample.py | 192 - + tools/perf/scripts/python/export-to-postgresql.py | 1114 ----- + tools/perf/scripts/python/export-to-sqlite.py | 799 --- + tools/perf/scripts/python/exported-sql-viewer.py | 5030 ------------------- + .../perf/scripts/python/failed-syscalls-by-pid.py | 79 - + tools/perf/scripts/python/flamegraph.py | 267 - + tools/perf/scripts/python/futex-contention.py | 57 - + tools/perf/scripts/python/gecko.py | 395 -- + tools/perf/scripts/python/intel-pt-events.py | 494 -- + tools/perf/scripts/python/libxed.py | 107 - + tools/perf/scripts/python/mem-phys-addr.py | 127 - + tools/perf/scripts/python/net_dropmonitor.py | 78 - + tools/perf/scripts/python/netdev-times.py | 473 -- + tools/perf/scripts/python/parallel-perf.py | 989 ---- + tools/perf/scripts/python/sched-migration.py | 462 -- + tools/perf/scripts/python/sctop.py | 89 - + tools/perf/scripts/python/stackcollapse.py | 127 - + tools/perf/scripts/python/stat-cpi.py | 79 - + tools/perf/scripts/python/syscall-counts-by-pid.py | 75 - + tools/perf/scripts/python/syscall-counts.py | 65 - + tools/perf/scripts/python/task-analyzer.py | 934 ---- + tools/perf/scripts/sync-headers.sh | 1676 +++++++ + tools/perf/tests/Build | 20 +- + tools/perf/tests/backward-ring-buffer.c | 2 +- + tools/perf/tests/builtin-test.c | 330 +- + tools/perf/tests/code-reading.c | 14 +- + tools/perf/tests/demangle-java-test.c | 1 + + tools/perf/tests/demangle-rust-v0-test.c | 1 + + tools/perf/tests/dso-data.c | 7 + + tools/perf/tests/event_refresh.c | 162 + + tools/perf/tests/fdarray.c | 32 + + tools/perf/tests/hists_cumulate.c | 2 +- + tools/perf/tests/hists_filter.c | 2 +- + tools/perf/tests/hists_link.c | 2 +- + tools/perf/tests/hists_output.c | 2 +- + tools/perf/tests/hybrid-merge.c | 206 + + tools/perf/tests/keep-tracking.c | 2 +- + tools/perf/tests/make | 114 +- + tools/perf/tests/mmap-basic.c | 191 +- + tools/perf/tests/openat-syscall-tp-fields.c | 1 + + tools/perf/tests/pe-file-parsing.c | 22 +- + tools/perf/tests/perf-record.c | 1 + + tools/perf/tests/perf-time-to-tsc.c | 1 + + tools/perf/tests/pmu-events.c | 5 +- + tools/perf/tests/sample-parsing.c | 109 + + tools/perf/tests/shell/annotate.sh | 1 - + tools/perf/tests/shell/annotate_weight.sh | 63 + + tools/perf/tests/shell/attr.sh | 7 +- + tools/perf/tests/shell/attr/README | 10 +- + tools/perf/tests/shell/attr/base-record | 2 +- + tools/perf/tests/shell/attr/base-stat | 2 +- + tools/perf/tests/shell/attr/base-stat-group | 45 + + tools/perf/tests/shell/attr/system-wide-dummy | 2 +- + tools/perf/tests/shell/attr/test-record-dummy-C0 | 2 +- + .../perf/tests/shell/attr/test-record-graph-dwarf | 2 +- + .../tests/shell/attr/test-record-group-sampling | 5 +- + .../tests/shell/attr/test-record-group-sampling1 | 5 +- + .../tests/shell/attr/test-record-group-sampling2 | 5 +- + tools/perf/tests/shell/attr/test-record-group1 | 3 +- + tools/perf/tests/shell/attr/test-record-group2 | 3 +- + tools/perf/tests/shell/attr/test-record-group3 | 3 +- + tools/perf/tests/shell/attr/test-stat-C0 | 1 + + tools/perf/tests/shell/attr/test-stat-basic | 1 + + tools/perf/tests/shell/attr/test-stat-default | 91 +- + tools/perf/tests/shell/attr/test-stat-detailed-1 | 99 +- + tools/perf/tests/shell/attr/test-stat-detailed-2 | 111 +- + tools/perf/tests/shell/attr/test-stat-detailed-3 | 115 +- + tools/perf/tests/shell/attr/test-stat-group1 | 3 +- + tools/perf/tests/shell/attr/test-stat-no-inherit | 1 + + .../tests/shell/base_probe/test_adding_kernel.sh | 1 - + tools/perf/tests/shell/c2c.sh | 114 + + tools/perf/tests/shell/common/init.sh | 21 +- + tools/perf/tests/shell/coresight/callchain.sh | 7 +- + .../shell/coresight/test_arm_coresight_disasm.sh | 15 +- + tools/perf/tests/shell/data_type_profiling.sh | 55 +- + tools/perf/tests/shell/diff.sh | 1 - + tools/perf/tests/shell/drm_pmu.sh | 2 +- + tools/perf/tests/shell/ftrace.sh | 2 +- + tools/perf/tests/shell/inject_aslr.sh | 1 - + tools/perf/tests/shell/jitdump-python.sh | 1 - + tools/perf/tests/shell/kallsyms.sh | 2 +- + tools/perf/tests/shell/lib/attr.py | 572 ++- + tools/perf/tests/shell/lib/perf_brstack_max.py | 40 + + .../perf/tests/shell/lib/perf_json_output_lint.py | 36 +- + .../perf/tests/shell/lib/perf_metric_validation.py | 53 +- + tools/perf/tests/shell/lib/perf_record.sh | 2 +- + tools/perf/tests/shell/lib/probe_vfs_getname.sh | 33 +- + tools/perf/tests/shell/lib/setup_python.sh | 29 +- + tools/perf/tests/shell/lib/waiting.sh | 34 +- + tools/perf/tests/shell/list.sh | 3 +- + tools/perf/tests/shell/perf_sched_stats.sh | 2 +- + tools/perf/tests/shell/pipe_test.sh | 1 - + tools/perf/tests/shell/probe_vfs_getname.sh | 5 +- + tools/perf/tests/shell/python-use.sh | 3 +- + .../tests/shell/record+probe_libc_inet_pton.sh | 87 +- + .../tests/shell/record+script_probe_vfs_getname.sh | 18 +- + tools/perf/tests/shell/record.sh | 278 +- + tools/perf/tests/shell/record_weak_term.sh | 1 - + tools/perf/tests/shell/report_hybrid_merge.sh | 121 + + tools/perf/tests/shell/schedstat_snapshots.sh | 155 + + tools/perf/tests/shell/script.sh | 46 +- + tools/perf/tests/shell/script_dlfilter.sh | 1 - + tools/perf/tests/shell/script_perl.sh | 102 - + tools/perf/tests/shell/script_python.sh | 113 - + tools/perf/tests/shell/stat+csv_output.sh | 3 +- + tools/perf/tests/shell/stat+csv_summary.sh | 2 +- + tools/perf/tests/shell/stat+event_uniquifying.sh | 2 +- + tools/perf/tests/shell/stat+json_output.sh | 3 +- + tools/perf/tests/shell/stat+shadow_stat.sh | 2 +- + tools/perf/tests/shell/stat+std_output.sh | 3 +- + tools/perf/tests/shell/stat.sh | 7 +- + tools/perf/tests/shell/stat_all_metricgroups.sh | 2 +- + tools/perf/tests/shell/stat_all_metrics.sh | 2 +- + tools/perf/tests/shell/stat_all_pfm.sh | 2 +- + tools/perf/tests/shell/stat_bpf_counters_cgrp.sh | 2 +- + tools/perf/tests/shell/stat_metrics_cgrp.sh | 9 +- + tools/perf/tests/shell/stat_metrics_values.sh | 3 +- + tools/perf/tests/shell/test_arm_callgraph_fp.sh | 1 - + tools/perf/tests/shell/test_brstack.sh | 1 - + .../tests/shell/test_check_perf_trace_python.sh | 87 + + .../tests/shell/test_compaction_times_python.sh | 129 + + tools/perf/tests/shell/test_data_symbol.sh | 7 +- + .../shell/test_event_analyzing_sample_python.sh | 70 + + tools/perf/tests/shell/test_event_open_fallback.sh | 2 - + .../shell/test_export_to_postgresql_python.sh | 129 + + .../tests/shell/test_export_to_sqlite_python.sh | 115 + + .../shell/test_failed_syscalls_by_pid_python.sh | 106 + + .../tests/shell/test_failed_syscalls_python.sh | 90 + + tools/perf/tests/shell/test_flamegraph_python.sh | 123 + + .../tests/shell/test_futex_contention_python.sh | 116 + + tools/perf/tests/shell/test_gecko_python.sh | 96 + + tools/perf/tests/shell/test_ilist_python.sh | 181 + + tools/perf/tests/shell/test_intel_pt.sh | 46 +- + .../tests/shell/test_intel_pt_events_python.sh | 74 + + .../perf/tests/shell/test_mem_phys_addr_python.sh | 105 + + .../tests/shell/test_net_dropmonitor_python.sh | 103 + + tools/perf/tests/shell/test_netdev_times_python.sh | 104 + + .../tests/shell/test_perf_data_converter_json.sh | 1 - + .../perf/tests/shell/test_powerpc_hcalls_python.sh | 95 + + tools/perf/tests/shell/test_rw_by_file_python.sh | 69 + + tools/perf/tests/shell/test_rw_by_pid_python.sh | 75 + + tools/perf/tests/shell/test_rwtop_python.sh | 74 + + .../tests/shell/test_sched_migration_python.sh | 72 + + tools/perf/tests/shell/test_sctop_python.sh | 78 + + .../perf/tests/shell/test_stackcollapse_python.sh | 78 + + tools/perf/tests/shell/test_stat_cpi_python.sh | 121 + + .../shell/test_syscall_counts_by_pid_python.sh | 93 + + .../perf/tests/shell/test_syscall_counts_python.sh | 82 + + tools/perf/tests/shell/test_task_analyzer.sh | 93 +- + tools/perf/tests/shell/test_test_junit_output.sh | 6 +- + tools/perf/tests/shell/test_treport_python.sh | 247 + + tools/perf/tests/shell/test_ttimechart_python.sh | 237 + + .../tests/shell/test_uprobe_from_different_cu.sh | 10 +- + .../perf/tests/shell/test_wakeup_latency_python.sh | 83 + + tools/perf/tests/shell/top.sh | 73 +- + tools/perf/tests/shell/trace+probe_vfs_getname.sh | 6 +- + tools/perf/tests/shell/trace_btf_enum.sh | 1 - + tools/perf/tests/shell/trace_btf_general.sh | 9 +- + tools/perf/tests/shell/trace_exit_race.sh | 1 - + tools/perf/tests/shell/trace_ksym_beautifier.sh | 38 + + tools/perf/tests/shell/trace_record_replay.sh | 2 - + tools/perf/tests/shell/trace_summary.sh | 16 +- + tools/perf/tests/sw-clock.c | 2 +- + tools/perf/tests/symbols.c | 96 +- + tools/perf/tests/task-exit.c | 1 + + tools/perf/tests/tests-scripts.c | 85 +- + tools/perf/tests/tests.h | 20 + + tools/perf/tests/thread-maps-share.c | 3 +- + tools/perf/tests/tool_pmu.c | 79 + + tools/perf/tests/workloads/Build | 2 + + tools/perf/tests/workloads/code_with_type.c | 2 +- + tools/perf/tests/workloads/false_sharing.c | 251 + + tools/perf/trace/beauty/arch_errno_names.sh | 4 +- + tools/perf/trace/beauty/beauty.h | 20 + + tools/perf/trace/beauty/include/linux/socket.h | 11 +- + tools/perf/trace/beauty/include/uapi/linux/fcntl.h | 1 + + tools/perf/trace/beauty/include/uapi/linux/fs.h | 3 +- + tools/perf/trace/beauty/include/uapi/linux/mount.h | 1 + + .../perf/trace/beauty/include/uapi/sound/asound.h | 200 +- + tools/perf/trace/beauty/perf_event_open.c | 31 +- + tools/perf/trace/beauty/sockaddr.c | 49 +- + tools/perf/trace/beauty/syscalltbl.sh | 2 +- + tools/perf/trace/beauty/timespec.c | 2 +- + tools/perf/ui/Build | 1 + + tools/perf/ui/browsers/annotate-data.c | 12 +- + tools/perf/ui/browsers/annotate.c | 21 +- + tools/perf/ui/browsers/hists.c | 8 +- + tools/perf/ui/browsers/scripts.c | 218 +- + tools/perf/ui/gtk/annotate.c | 36 +- + tools/perf/ui/gtk/browser.c | 96 +- + tools/perf/ui/gtk/gtk.h | 16 +- + tools/perf/ui/gtk/hists.c | 72 +- + tools/perf/ui/gtk/progress.c | 40 +- + tools/perf/ui/gtk/setup.c | 5 +- + tools/perf/ui/gtk/util.c | 97 +- + tools/perf/ui/hist.c | 248 +- + tools/perf/ui/libslang.h | 2 + + tools/perf/ui/progress.c | 6 + + tools/perf/ui/progress.h | 4 + + tools/perf/ui/setup.c | 2 +- + tools/perf/ui/stdio/progress.c | 170 + + tools/perf/util/Build | 18 +- + tools/perf/util/addr2line.c | 68 +- + tools/perf/util/annotate-arch/Build | 1 + + tools/perf/util/annotate-arch/annotate-alpha.c | 185 + + tools/perf/util/annotate-arch/annotate-arm64.c | 1209 ++++- + tools/perf/util/annotate-arch/annotate-loongarch.c | 4 + + tools/perf/util/annotate-arch/annotate-powerpc.c | 9 + + tools/perf/util/annotate-arch/annotate-x86.c | 117 +- + tools/perf/util/annotate-data.c | 512 +- + tools/perf/util/annotate-data.h | 31 +- + tools/perf/util/annotate.c | 240 +- + tools/perf/util/annotate.h | 121 +- + tools/perf/util/arm-spe.c | 17 +- + tools/perf/util/aslr.c | 41 +- + tools/perf/util/aslr.h | 2 + + tools/perf/util/auxtrace.c | 21 +- + tools/perf/util/auxtrace.h | 8 +- + tools/perf/util/bpf-filter.c | 29 +- + tools/perf/util/bpf-filter.l | 1 + + .../util/bpf_skel/augmented_raw_syscalls.bpf.c | 220 +- + tools/perf/util/bpf_skel/perf_trace_u.h | 14 + + tools/perf/util/bpf_skel/vmlinux/vmlinux.h | 9 + + tools/perf/util/bpf_trace_augment.c | 91 +- + tools/perf/util/build-id.c | 12 +- + tools/perf/util/c2c-function.c | 9 +- + tools/perf/util/c2c.h | 2 + + tools/perf/util/cache.h | 31 - + tools/perf/util/capstone.c | 186 +- + tools/perf/util/config.c | 220 +- + tools/perf/util/config.h | 2 + + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 12 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.h | 2 +- + tools/perf/util/cs-etm.c | 186 +- + tools/perf/util/debug.c | 2 +- + tools/perf/util/debug.h | 5 +- + tools/perf/util/debuginfo.c | 51 +- + tools/perf/util/debuginfo.h | 13 +- + tools/perf/util/disasm.c | 140 +- + tools/perf/util/disasm.h | 6 + + tools/perf/util/dso.c | 339 +- + tools/perf/util/dso.h | 72 +- + tools/perf/util/dwarf-aux.c | 247 +- + tools/perf/util/dwarf-aux.h | 16 + + tools/perf/util/dwarf-regs-arch/dwarf-regs-arm64.c | 25 + + tools/perf/util/dwarf-regs-arch/dwarf-regs-csky.c | 2 +- + .../perf/util/dwarf-regs-arch/dwarf-regs-powerpc.c | 2 +- + tools/perf/util/dwarf-regs-arch/dwarf-regs-s390.c | 2 +- + tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c | 140 +- + tools/perf/util/dwarf-regs.c | 11 +- + tools/perf/util/env.c | 1 + + tools/perf/util/env.h | 10 + + tools/perf/util/evlist.c | 236 +- + tools/perf/util/evlist.h | 3 + + tools/perf/util/evsel.c | 317 +- + tools/perf/util/evsel.h | 10 + + tools/perf/util/expr.c | 5 +- + tools/perf/util/genelf_debug.c | 28 +- + tools/perf/util/header.c | 336 +- + tools/perf/util/header.h | 1 + + tools/perf/util/help-unknown-cmd.c | 19 +- + tools/perf/util/help-unknown-cmd.h | 0 + tools/perf/util/hist.c | 6 +- + tools/perf/util/hist.h | 21 +- + tools/perf/util/hwmon_pmu.c | 2 +- + tools/perf/util/include/dwarf-regs.h | 8 +- + tools/perf/util/intel-bts.c | 2 +- + tools/perf/util/intel-pt.c | 3 +- + tools/perf/util/jitdump.c | 204 +- + tools/perf/util/libbfd.c | 96 +- + tools/perf/util/libbfd.h | 9 + + tools/perf/util/libdw.c | 54 +- + tools/perf/util/libdw.h | 5 +- + tools/perf/util/llvm-c-helpers.cpp | 66 +- + tools/perf/util/llvm.c | 68 +- + tools/perf/util/machine.c | 6 +- + tools/perf/util/machine.h | 10 +- + tools/perf/util/mem-events.c | 94 +- + tools/perf/util/mem-events.h | 5 +- + tools/perf/util/metricgroup.c | 37 +- + tools/perf/util/mmap.c | 3 +- + tools/perf/util/mutex.c | 101 +- + tools/perf/util/mutex.h | 42 + + tools/perf/util/ordered-events.c | 16 +- + tools/perf/util/parse-events.c | 7 +- + tools/perf/util/parse-regs-options.c | 211 +- + tools/perf/util/path.c | 10 +- + tools/perf/util/path.h | 6 +- + tools/perf/util/perf-regs-arch/perf_regs_x86.c | 438 +- + tools/perf/util/perf_event_attr_fprintf.c | 13 + + tools/perf/util/perf_regs.c | 84 +- + tools/perf/util/perf_regs.h | 21 +- + tools/perf/util/pfm.c | 1 + + tools/perf/util/pmu.c | 48 +- + tools/perf/util/pmu.h | 3 + + tools/perf/util/pmus.c | 21 +- + tools/perf/util/powerpc-vpadtl.c | 2 +- + tools/perf/util/print-events.c | 1 + + tools/perf/util/print_insn.h | 1 + + tools/perf/util/probe-event.c | 4 +- + tools/perf/util/python.c | 2013 ++++++-- + tools/perf/util/record.h | 7 + + tools/perf/util/sample.h | 5 + + tools/perf/util/scripting-engines/Build | 9 - + .../perf/util/scripting-engines/trace-event-perl.c | 770 --- + .../util/scripting-engines/trace-event-python.c | 2224 --------- + tools/perf/util/session.c | 139 +- + tools/perf/util/setup.py | 1 + + tools/perf/util/srcline.c | 83 +- + tools/perf/util/strbuf.c | 14 +- + tools/perf/util/symbol-elf.c | 3 +- + tools/perf/util/symbol.c | 92 +- + tools/perf/util/symbol_conf.h | 16 +- + tools/perf/util/synthetic-events.c | 56 +- + tools/perf/util/thread.c | 18 +- + tools/perf/util/thread_map.c | 26 + + tools/perf/util/thread_map.h | 1 + + tools/perf/util/tool_pmu.c | 2 +- + tools/perf/util/tp_pmu.c | 8 +- + tools/perf/util/trace-event-parse.c | 65 - + tools/perf/util/trace-event-scripting.c | 407 -- + tools/perf/util/trace-event.c | 90 +- + tools/perf/util/trace-event.h | 73 +- + tools/perf/util/trace_augment.h | 35 +- + tools/perf/util/unwind-libdw.c | 59 +- + tools/perf/util/unwind-libunwind.c | 62 +- + tools/perf/util/usage.c | 34 - + tools/perf/util/util.h | 4 - + 650 files changed, 43377 insertions(+), 25530 deletions(-) + delete mode 100644 tools/build/feature/test-gtk2-infobar.c + rename tools/build/feature/{test-gtk2.c => test-gtk4.c} (76%) + delete mode 100644 tools/build/feature/test-libperl.c + delete mode 100644 tools/build/feature/test-libpython.c + create mode 100644 tools/build/feature/test-pthread-mutex-robust.c + create mode 100644 tools/build/feature/test-python-module.c + delete mode 100644 tools/perf/Documentation/perf-script-perl.txt + create mode 100644 tools/perf/arch/riscv/include/arch-tests.h + create mode 100644 tools/perf/arch/riscv/tests/Build + create mode 100644 tools/perf/arch/riscv/tests/arch-tests.c + create mode 100644 tools/perf/arch/riscv/tests/dwarf-unwind.c + create mode 100644 tools/perf/arch/riscv/tests/regs_load.S + create mode 100644 tools/perf/bench/atomic.c + create mode 100755 tools/perf/python/SchedGui.py + create mode 100755 tools/perf/python/arm-cs-trace-disasm.py + create mode 100755 tools/perf/python/check-perf-trace.py + create mode 100755 tools/perf/python/compaction-times.py + create mode 100755 tools/perf/python/event_analyzing_sample.py + create mode 100755 tools/perf/python/export-to-postgresql.py + create mode 100755 tools/perf/python/export-to-sqlite.py + create mode 100755 tools/perf/python/exported-sql-viewer.py + create mode 100755 tools/perf/python/failed-syscalls-by-pid.py + create mode 100755 tools/perf/python/failed-syscalls.py + create mode 100755 tools/perf/python/flamegraph.py + create mode 100755 tools/perf/python/futex-contention.py + create mode 100755 tools/perf/python/gecko.py + create mode 100755 tools/perf/python/intel-pt-events.py + create mode 100755 tools/perf/python/libxed.py + create mode 100755 tools/perf/python/mem-phys-addr.py + create mode 100755 tools/perf/python/net_dropmonitor.py + create mode 100755 tools/perf/python/netdev-times.py + create mode 100755 tools/perf/python/parallel-perf.py + rename tools/perf/{scripts => }/python/powerpc-hcalls.py (54%) + mode change 100644 => 100755 + create mode 100755 tools/perf/python/rw-by-file.py + create mode 100755 tools/perf/python/rw-by-pid.py + create mode 100755 tools/perf/python/rwtop.py + create mode 100755 tools/perf/python/sched-migration.py + create mode 100755 tools/perf/python/sctop.py + create mode 100755 tools/perf/python/stackcollapse.py + create mode 100755 tools/perf/python/stat-cpi.py + create mode 100755 tools/perf/python/syscall-counts-by-pid.py + create mode 100755 tools/perf/python/syscall-counts.py + create mode 100755 tools/perf/python/task-analyzer.py + create mode 100755 tools/perf/python/treport.py + create mode 100755 tools/perf/python/ttimechart.py + create mode 100755 tools/perf/python/wakeup-latency.py + delete mode 100644 tools/perf/scripts/Build + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Build + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Context.c + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Context.xs + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Makefile.PL + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/README + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Context.pm + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Core.pm + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Util.pm + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/typemap + delete mode 100644 tools/perf/scripts/perl/bin/check-perf-trace-record + delete mode 100644 tools/perf/scripts/perl/bin/failed-syscalls-record + delete mode 100644 tools/perf/scripts/perl/bin/failed-syscalls-report + delete mode 100644 tools/perf/scripts/perl/bin/rw-by-file-record + delete mode 100644 tools/perf/scripts/perl/bin/rw-by-file-report + delete mode 100644 tools/perf/scripts/perl/bin/rw-by-pid-record + delete mode 100644 tools/perf/scripts/perl/bin/rw-by-pid-report + delete mode 100644 tools/perf/scripts/perl/bin/rwtop-record + delete mode 100644 tools/perf/scripts/perl/bin/rwtop-report + delete mode 100644 tools/perf/scripts/perl/bin/wakeup-latency-record + delete mode 100644 tools/perf/scripts/perl/bin/wakeup-latency-report + delete mode 100644 tools/perf/scripts/perl/check-perf-trace.pl + delete mode 100644 tools/perf/scripts/perl/failed-syscalls.pl + delete mode 100644 tools/perf/scripts/perl/rw-by-file.pl + delete mode 100644 tools/perf/scripts/perl/rw-by-pid.pl + delete mode 100644 tools/perf/scripts/perl/rwtop.pl + delete mode 100644 tools/perf/scripts/perl/wakeup-latency.pl + delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/Build + delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/Context.c + delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py + delete mode 100755 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py + delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/SchedGui.py + delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py + delete mode 100755 tools/perf/scripts/python/arm-cs-trace-disasm.py + delete mode 100644 tools/perf/scripts/python/bin/compaction-times-record + delete mode 100644 tools/perf/scripts/python/bin/compaction-times-report + delete mode 100644 tools/perf/scripts/python/bin/event_analyzing_sample-record + delete mode 100644 tools/perf/scripts/python/bin/event_analyzing_sample-report + delete mode 100644 tools/perf/scripts/python/bin/export-to-postgresql-record + delete mode 100644 tools/perf/scripts/python/bin/export-to-postgresql-report + delete mode 100644 tools/perf/scripts/python/bin/export-to-sqlite-record + delete mode 100644 tools/perf/scripts/python/bin/export-to-sqlite-report + delete mode 100644 tools/perf/scripts/python/bin/failed-syscalls-by-pid-record + delete mode 100644 tools/perf/scripts/python/bin/failed-syscalls-by-pid-report + delete mode 100755 tools/perf/scripts/python/bin/flamegraph-record + delete mode 100755 tools/perf/scripts/python/bin/flamegraph-report + delete mode 100644 tools/perf/scripts/python/bin/futex-contention-record + delete mode 100644 tools/perf/scripts/python/bin/futex-contention-report + delete mode 100644 tools/perf/scripts/python/bin/gecko-record + delete mode 100755 tools/perf/scripts/python/bin/gecko-report + delete mode 100644 tools/perf/scripts/python/bin/intel-pt-events-record + delete mode 100644 tools/perf/scripts/python/bin/intel-pt-events-report + delete mode 100644 tools/perf/scripts/python/bin/mem-phys-addr-record + delete mode 100644 tools/perf/scripts/python/bin/mem-phys-addr-report + delete mode 100755 tools/perf/scripts/python/bin/net_dropmonitor-record + delete mode 100755 tools/perf/scripts/python/bin/net_dropmonitor-report + delete mode 100644 tools/perf/scripts/python/bin/netdev-times-record + delete mode 100644 tools/perf/scripts/python/bin/netdev-times-report + delete mode 100644 tools/perf/scripts/python/bin/powerpc-hcalls-record + delete mode 100644 tools/perf/scripts/python/bin/powerpc-hcalls-report + delete mode 100644 tools/perf/scripts/python/bin/sched-migration-record + delete mode 100644 tools/perf/scripts/python/bin/sched-migration-report + delete mode 100644 tools/perf/scripts/python/bin/sctop-record + delete mode 100644 tools/perf/scripts/python/bin/sctop-report + delete mode 100755 tools/perf/scripts/python/bin/stackcollapse-record + delete mode 100755 tools/perf/scripts/python/bin/stackcollapse-report + delete mode 100644 tools/perf/scripts/python/bin/syscall-counts-by-pid-record + delete mode 100644 tools/perf/scripts/python/bin/syscall-counts-by-pid-report + delete mode 100644 tools/perf/scripts/python/bin/syscall-counts-record + delete mode 100644 tools/perf/scripts/python/bin/syscall-counts-report + delete mode 100755 tools/perf/scripts/python/bin/task-analyzer-record + delete mode 100755 tools/perf/scripts/python/bin/task-analyzer-report + delete mode 100644 tools/perf/scripts/python/check-perf-trace.py + delete mode 100644 tools/perf/scripts/python/compaction-times.py + delete mode 100644 tools/perf/scripts/python/event_analyzing_sample.py + delete mode 100644 tools/perf/scripts/python/export-to-postgresql.py + delete mode 100644 tools/perf/scripts/python/export-to-sqlite.py + delete mode 100755 tools/perf/scripts/python/exported-sql-viewer.py + delete mode 100644 tools/perf/scripts/python/failed-syscalls-by-pid.py + delete mode 100755 tools/perf/scripts/python/flamegraph.py + delete mode 100644 tools/perf/scripts/python/futex-contention.py + delete mode 100644 tools/perf/scripts/python/gecko.py + delete mode 100644 tools/perf/scripts/python/intel-pt-events.py + delete mode 100644 tools/perf/scripts/python/libxed.py + delete mode 100644 tools/perf/scripts/python/mem-phys-addr.py + delete mode 100755 tools/perf/scripts/python/net_dropmonitor.py + delete mode 100644 tools/perf/scripts/python/netdev-times.py + delete mode 100755 tools/perf/scripts/python/parallel-perf.py + delete mode 100644 tools/perf/scripts/python/sched-migration.py + delete mode 100644 tools/perf/scripts/python/sctop.py + delete mode 100755 tools/perf/scripts/python/stackcollapse.py + delete mode 100644 tools/perf/scripts/python/stat-cpi.py + delete mode 100644 tools/perf/scripts/python/syscall-counts-by-pid.py + delete mode 100644 tools/perf/scripts/python/syscall-counts.py + delete mode 100755 tools/perf/scripts/python/task-analyzer.py + create mode 100755 tools/perf/scripts/sync-headers.sh + create mode 100644 tools/perf/tests/event_refresh.c + create mode 100644 tools/perf/tests/hybrid-merge.c + create mode 100755 tools/perf/tests/shell/annotate_weight.sh + create mode 100644 tools/perf/tests/shell/attr/base-stat-group + create mode 100644 tools/perf/tests/shell/lib/perf_brstack_max.py + create mode 100755 tools/perf/tests/shell/report_hybrid_merge.sh + create mode 100755 tools/perf/tests/shell/schedstat_snapshots.sh + delete mode 100755 tools/perf/tests/shell/script_perl.sh + delete mode 100755 tools/perf/tests/shell/script_python.sh + create mode 100755 tools/perf/tests/shell/test_check_perf_trace_python.sh + create mode 100755 tools/perf/tests/shell/test_compaction_times_python.sh + create mode 100755 tools/perf/tests/shell/test_event_analyzing_sample_python.sh + create mode 100755 tools/perf/tests/shell/test_export_to_postgresql_python.sh + create mode 100755 tools/perf/tests/shell/test_export_to_sqlite_python.sh + create mode 100755 tools/perf/tests/shell/test_failed_syscalls_by_pid_python.sh + create mode 100755 tools/perf/tests/shell/test_failed_syscalls_python.sh + create mode 100755 tools/perf/tests/shell/test_flamegraph_python.sh + create mode 100755 tools/perf/tests/shell/test_futex_contention_python.sh + create mode 100755 tools/perf/tests/shell/test_gecko_python.sh + create mode 100755 tools/perf/tests/shell/test_ilist_python.sh + create mode 100755 tools/perf/tests/shell/test_intel_pt_events_python.sh + create mode 100755 tools/perf/tests/shell/test_mem_phys_addr_python.sh + create mode 100755 tools/perf/tests/shell/test_net_dropmonitor_python.sh + create mode 100755 tools/perf/tests/shell/test_netdev_times_python.sh + create mode 100755 tools/perf/tests/shell/test_powerpc_hcalls_python.sh + create mode 100755 tools/perf/tests/shell/test_rw_by_file_python.sh + create mode 100755 tools/perf/tests/shell/test_rw_by_pid_python.sh + create mode 100755 tools/perf/tests/shell/test_rwtop_python.sh + create mode 100755 tools/perf/tests/shell/test_sched_migration_python.sh + create mode 100755 tools/perf/tests/shell/test_sctop_python.sh + create mode 100755 tools/perf/tests/shell/test_stackcollapse_python.sh + create mode 100755 tools/perf/tests/shell/test_stat_cpi_python.sh + create mode 100755 tools/perf/tests/shell/test_syscall_counts_by_pid_python.sh + create mode 100755 tools/perf/tests/shell/test_syscall_counts_python.sh + create mode 100755 tools/perf/tests/shell/test_treport_python.sh + create mode 100755 tools/perf/tests/shell/test_ttimechart_python.sh + create mode 100755 tools/perf/tests/shell/test_wakeup_latency_python.sh + create mode 100755 tools/perf/tests/shell/trace_ksym_beautifier.sh + create mode 100644 tools/perf/tests/workloads/false_sharing.c + create mode 100644 tools/perf/ui/stdio/progress.c + create mode 100644 tools/perf/util/annotate-arch/annotate-alpha.c + create mode 100644 tools/perf/util/bpf_skel/perf_trace_u.h + delete mode 100644 tools/perf/util/cache.h + delete mode 100644 tools/perf/util/help-unknown-cmd.h + delete mode 100644 tools/perf/util/scripting-engines/Build + delete mode 100644 tools/perf/util/scripting-engines/trace-event-perl.c + delete mode 100644 tools/perf/util/scripting-engines/trace-event-python.c + delete mode 100644 tools/perf/util/trace-event-scripting.c + delete mode 100644 tools/perf/util/usage.c +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 (4733f2966433b dma-debug: Skip cacheline tracking for MMIO mappings) +$ 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 +Already up to date. +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 +Already up to date. +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 (01330dac0fa7c 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 +Already up to date. +Merging arm64/for-next/core (643b64025650d arm_mpam: Release the mon_sel lock on mpam_save_mbwu_state() errors) +$ git merge -m Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Merge made by the 'ort' strategy. + drivers/resctrl/mpam_devices.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) +$ git am -3 ../patches/0001-arm64-fixup-merge-with-dropped-copy-of-code-getting-.patch +Applying: arm64: fixup merge with dropped copy of code getting kept +Using index info to reconstruct a base tree... +M arch/arm64/mm/pageattr.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging arm-perf/for-next/perf (652ab8ee0d27f drivers/perf: apple_m1: Add macOS 27 M2 Event) +$ 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 (a32ef3f1c49fd 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 drivers/soc/Kconfig +CONFLICT (content): Merge conflict in drivers/soc/Kconfig +Auto-merging drivers/soc/Makefile +CONFLICT (content): Merge conflict in drivers/soc/Makefile +Resolved 'drivers/soc/Kconfig' using previous resolution. +Resolved 'drivers/soc/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 71dd048fb1dfe] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/arm-soc-for-next-contents.txt | 193 +++++++++++++++++++++++++++++++++ + 1 file changed, 193 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (8610d31587e13 Merge branch 'v7.4/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 (9378cd5ddcebc Merge branch 'apple-soc/drivers-7.4' 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 (bd49a1c72abbd Merge branch 'microchip-dt64' 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. + drivers/clk/at91/clk-main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging bmc/for-next (ba3f2c4472031 Merge branch 'aspeed/arm/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. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 1 + + arch/arm/boot/dts/aspeed/Makefile | 1 + + .../dts/aspeed/aspeed-bmc-facebook-ventura2.dts | 2888 ++++++++++++++++++++ + 3 files changed, 2890 insertions(+) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-ventura2.dts +Merging broadcom/next (c0f2033a9ce4b Merge branch 'devicetree-arm64/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 13 +++++ + .../dts/broadcom/bcm4708-linksys-ea6300-v1.dts | 4 ++ + .../boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts | 18 +++++++ + .../boot/dts/broadcom/bcm4709-linksys-ea9200.dts | 62 ++++++++++++++++++++++ + .../boot/dts/broadcom/bcm4709-netgear-r8000.dts | 12 +++++ + .../boot/dts/broadcom/bcm47094-dlink-dir-890l.dts | 6 ++- + .../dts/broadcom/bcm47094-linksys-panamera.dts | 2 +- + arch/arm/boot/dts/broadcom/bcm47189-tenda-ac9.dts | 20 +++++++ + arch/arm/boot/dts/broadcom/bcm53573.dtsi | 9 +++- + arch/arm/boot/dts/broadcom/bcm7445.dtsi | 2 +- + 10 files changed, 144 insertions(+), 4 deletions(-) +Merging cix/for-next (a0cffbd8878c5 Merge remote-tracking branch 'cix/dt' 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 (cee9395acd804 Linux 7.3-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 (a22355280361d memory: stm32_omm: fix child clock leak on set_amcr() error path) +$ 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 (a7831c657c90e soc: fsl: dpio: Free the IRQ before releasing the I/O object) +$ git merge -m Merge branch 'soc_fsl' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git fsl/soc_fsl +Already up to date. +Merging imx-mxs/for-next (31f9ec9f38735 Merge branches 'imx/dt' and 'imx/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/se-cdev | 45 + + .../devicetree/bindings/firmware/fsl,imx-se.yaml | 91 + + .../driver-api/firmware/other_interfaces.rst | 238 ++ + arch/arm/mach-imx/mach-imx6q.c | 2 - + arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 3 +- + .../arm64/boot/dts/freescale/imx8ulp-firmware.dtsi | 31 + + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 12 +- + drivers/firmware/imx/Kconfig | 12 + + drivers/firmware/imx/Makefile | 2 + + drivers/firmware/imx/ele_base_msg.c | 395 ++++ + drivers/firmware/imx/ele_base_msg.h | 119 + + drivers/firmware/imx/ele_common.c | 1012 ++++++++ + drivers/firmware/imx/ele_common.h | 147 ++ + drivers/firmware/imx/ele_fw_api.c | 406 ++++ + drivers/firmware/imx/ele_fw_api.h | 104 + + drivers/firmware/imx/ele_msg_addr_field.c | 619 +++++ + drivers/firmware/imx/se_ctrl.c | 2434 ++++++++++++++++++++ + drivers/firmware/imx/se_ctrl.h | 309 +++ + include/linux/firmware/imx/se_api.h | 14 + + include/uapi/linux/se_ioctl.h | 97 + + 20 files changed, 6087 insertions(+), 5 deletions(-) + create mode 100644 Documentation/ABI/testing/se-cdev + create mode 100644 Documentation/devicetree/bindings/firmware/fsl,imx-se.yaml + create mode 100644 arch/arm64/boot/dts/freescale/imx8ulp-firmware.dtsi + create mode 100644 drivers/firmware/imx/ele_base_msg.c + create mode 100644 drivers/firmware/imx/ele_base_msg.h + create mode 100644 drivers/firmware/imx/ele_common.c + create mode 100644 drivers/firmware/imx/ele_common.h + create mode 100644 drivers/firmware/imx/ele_fw_api.c + create mode 100644 drivers/firmware/imx/ele_fw_api.h + create mode 100644 drivers/firmware/imx/ele_msg_addr_field.c + create mode 100644 drivers/firmware/imx/se_ctrl.c + create mode 100644 drivers/firmware/imx/se_ctrl.h + create mode 100644 include/linux/firmware/imx/se_api.h + create mode 100644 include/uapi/linux/se_ioctl.h +Merging mediatek/for-next (4bfec57314396 Merge branches 'v7.3-next/dts32', 'v7.3-next/dts64' and 'v7.3-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 (43cb5b5bd349a 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 (7cdd46c9d6c5a Merge branch 'omap-for-v7.4/soc' into tmp/omap-next-20260921.091322) +$ 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 (f5672a3dff029 Merge branches 'arm32-for-7.4', 'arm64-defconfig-for-7.4', 'arm64-fixes-for-7.3', 'arm64-for-7.4', 'clk-fixes-for-7.3', 'clk-for-7.4', 'drivers-fixes-for-7.3' and 'drivers-for-7.4' 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/clock/qcom,gcc-msm8952.yaml | 65 + + .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 6 +- + .../devicetree/bindings/clock/qcom,gcc-sm6350.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sm8450.yaml | 7 + + .../bindings/clock/qcom,ipq9574-cmn-pll.yaml | 1 + + .../devicetree/bindings/clock/qcom,kuno-gcc.yaml | 52 + + .../devicetree/bindings/clock/qcom,qcs615-gcc.yaml | 7 + + .../bindings/clock/qcom,qcs8300-gcc.yaml | 7 + + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 5 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 + + .../devicetree/bindings/clock/qcom,sdx75-gcc.yaml | 7 + + .../devicetree/bindings/clock/qcom,sm4450-gcc.yaml | 7 + + .../devicetree/bindings/clock/qcom,sm6375-gcc.yaml | 9 +- + .../devicetree/bindings/clock/qcom,sm7150-gcc.yaml | 53 - + .../devicetree/bindings/clock/qcom,sm8550-gcc.yaml | 7 + + .../bindings/clock/qcom,sm8550-tcsr.yaml | 1 - + .../devicetree/bindings/clock/qcom,sm8650-gcc.yaml | 7 + + .../devicetree/bindings/clock/qcom,sm8750-gcc.yaml | 7 + + .../bindings/clock/qcom,x1e80100-tcsr.yaml | 114 + + MAINTAINERS | 1 + + drivers/clk/qcom/Kconfig | 167 +- + drivers/clk/qcom/Makefile | 9 + + drivers/clk/qcom/cambistmclkcc-eliza.c | 464 +++ + drivers/clk/qcom/cambistmclkcc-kaanapali.c | 7 + + drivers/clk/qcom/cambistmclkcc-sm8750.c | 7 + + drivers/clk/qcom/camcc-eliza.c | 2803 ++++++++++++++++ + drivers/clk/qcom/camcc-glymur.c | 7 + + drivers/clk/qcom/camcc-hawi.c | 3152 +++++++++++++++++ + drivers/clk/qcom/camcc-nord.c | 2941 ++++++++++++++++ + drivers/clk/qcom/camcc-sa8775p.c | 36 +- + drivers/clk/qcom/camcc-sc8280xp.c | 13 +- + drivers/clk/qcom/camcc-sm7150.c | 13 +- + drivers/clk/qcom/camcc-sm8150.c | 13 +- + drivers/clk/qcom/clk-alpha-pll.c | 9 + + drivers/clk/qcom/clk-rcg2.c | 35 +- + drivers/clk/qcom/clk-regmap-divider.c | 16 +- + drivers/clk/qcom/clk-regmap-divider.h | 1 + + drivers/clk/qcom/clk-rpmh.c | 44 + + drivers/clk/qcom/dispcc-sc7280.c | 13 +- + drivers/clk/qcom/dispcc-sc8280xp.c | 18 +- + drivers/clk/qcom/dispcc-sm4450.c | 15 +- + drivers/clk/qcom/dispcc-sm6115.c | 13 +- + drivers/clk/qcom/dispcc-sm7150.c | 13 +- + drivers/clk/qcom/dispcc-sm8250.c | 13 +- + drivers/clk/qcom/dispcc-sm8450.c | 40 +- + drivers/clk/qcom/dispcc-sm8550.c | 13 +- + drivers/clk/qcom/dispcc-sm8750.c | 19 +- + drivers/clk/qcom/dispcc-x1e80100.c | 27 +- + drivers/clk/qcom/dispcc0-sa8775p.c | 15 +- + drivers/clk/qcom/dispcc1-sa8775p.c | 15 +- + drivers/clk/qcom/gcc-eliza.c | 13 +- + drivers/clk/qcom/gcc-glymur.c | 81 +- + drivers/clk/qcom/gcc-hawi.c | 12 +- + drivers/clk/qcom/gcc-ipq5018.c | 10 + + drivers/clk/qcom/gcc-ipq5210.c | 1 + + drivers/clk/qcom/gcc-ipq5332.c | 1 + + drivers/clk/qcom/gcc-ipq5424.c | 4 +- + drivers/clk/qcom/gcc-ipq9650.c | 22 + + drivers/clk/qcom/gcc-kaanapali.c | 13 +- + drivers/clk/qcom/gcc-kuno.c | 1473 ++++++++ + drivers/clk/qcom/gcc-milos.c | 12 +- + drivers/clk/qcom/gcc-msm8939.c | 4 + + drivers/clk/qcom/gcc-msm8952.c | 3548 ++++++++++++++++++++ + drivers/clk/qcom/gcc-nord.c | 12 +- + drivers/clk/qcom/gcc-qcm2290.c | 12 +- + drivers/clk/qcom/gcc-qcs615.c | 69 +- + drivers/clk/qcom/gcc-qcs8300.c | 167 +- + drivers/clk/qcom/gcc-qdu1000.c | 12 +- + drivers/clk/qcom/gcc-sa8775p.c | 56 +- + drivers/clk/qcom/gcc-sar2130p.c | 58 +- + drivers/clk/qcom/gcc-sc7180.c | 60 +- + drivers/clk/qcom/gcc-sc7280.c | 67 +- + drivers/clk/qcom/gcc-sc8280xp.c | 47 +- + drivers/clk/qcom/gcc-sdx55.c | 43 +- + drivers/clk/qcom/gcc-sdx65.c | 43 +- + drivers/clk/qcom/gcc-sdx75.c | 44 +- + drivers/clk/qcom/gcc-shikra.c | 12 +- + drivers/clk/qcom/gcc-sm4450.c | 77 +- + drivers/clk/qcom/gcc-sm6115.c | 12 +- + drivers/clk/qcom/gcc-sm6125.c | 12 +- + drivers/clk/qcom/gcc-sm6375.c | 12 +- + drivers/clk/qcom/gcc-sm7150.c | 72 +- + drivers/clk/qcom/gcc-sm8150.c | 12 +- + drivers/clk/qcom/gcc-sm8250.c | 69 +- + drivers/clk/qcom/gcc-sm8350.c | 65 +- + drivers/clk/qcom/gcc-sm8450.c | 64 +- + drivers/clk/qcom/gcc-sm8550.c | 70 +- + drivers/clk/qcom/gcc-sm8650.c | 72 +- + drivers/clk/qcom/gcc-sm8750.c | 89 +- + drivers/clk/qcom/gcc-x1e80100.c | 80 +- + drivers/clk/qcom/gpucc-eliza.c | 606 ++++ + drivers/clk/qcom/gpucc-hawi.c | 477 +++ + drivers/clk/qcom/gpucc-sar2130p.c | 13 +- + drivers/clk/qcom/gpucc-sc7280.c | 22 +- + drivers/clk/qcom/gpucc-sc8280xp.c | 15 +- + drivers/clk/qcom/gpucc-sm4450.c | 17 +- + drivers/clk/qcom/gpucc-sm8550.c | 15 +- + drivers/clk/qcom/gpucc-x1e80100.c | 13 +- + drivers/clk/qcom/gpucc-x1p42100.c | 17 +- + drivers/clk/qcom/ipq-cmn-pll.c | 538 ++- + drivers/clk/qcom/lpasscc-sc7280.c | 12 +- + drivers/clk/qcom/lpasscc-sdm845.c | 12 +- + drivers/clk/qcom/lpasscc-sm6115.c | 4 +- + drivers/clk/qcom/lpasscorecc-sc7180.c | 31 +- + drivers/clk/qcom/mmcc-msm8960.c | 3 +- + drivers/clk/qcom/mmcc-msm8996.c | 4 +- + drivers/clk/qcom/mmcc-sdm660.c | 2 +- + drivers/clk/qcom/negcc-nord.c | 5 +- + drivers/clk/qcom/nwgcc-nord.c | 5 +- + drivers/clk/qcom/segcc-nord.c | 40 +- + drivers/clk/qcom/tcsrcc-eliza.c | 12 +- + drivers/clk/qcom/tcsrcc-glymur.c | 12 +- + drivers/clk/qcom/tcsrcc-kaanapali.c | 12 +- + drivers/clk/qcom/tcsrcc-sm8550.c | 12 +- + drivers/clk/qcom/tcsrcc-sm8650.c | 12 +- + drivers/clk/qcom/tcsrcc-sm8750.c | 12 +- + drivers/clk/qcom/tcsrcc-x1e80100.c | 349 +- + drivers/clk/qcom/videocc-eliza.c | 404 +++ + drivers/clk/qcom/videocc-glymur.c | 38 + + drivers/clk/qcom/videocc-sa8775p.c | 17 +- + drivers/clk/qcom/videocc-sm6350.c | 13 +- + drivers/clk/qcom/videocc-sm7150.c | 13 +- + drivers/clk/qcom/videocc-sm8250.c | 15 +- + drivers/clk/qcom/videocc-sm8350.c | 31 +- + drivers/clk/qcom/videocc-sm8750.c | 12 +- + drivers/clk/renesas/r9a06g032-clocks.c | 8 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 7 +- + drivers/clk/renesas/rzg2l-cpg.c | 7 +- + drivers/clk/renesas/rzv2h-cpg.c | 7 +- + drivers/soc/qcom/rpmh-rsc.c | 14 +- + include/dt-bindings/clock/qcom,gcc-msm8952.h | 215 ++ + include/dt-bindings/clock/qcom,ipq5210-cmn-pll.h | 30 + + include/dt-bindings/clock/qcom,kuno-gcc.h | 100 + + include/dt-bindings/clock/qcom,nord-negcc.h | 1 + + include/dt-bindings/clock/qcom,nord-segcc.h | 2 + + include/dt-bindings/clock/qcom,qcs8300-gcc.h | 6 + + include/linux/device/driver.h | 31 + + include/linux/platform_device.h | 30 + + 141 files changed, 18683 insertions(+), 1536 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8952.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,kuno-gcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,sm7150-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,x1e80100-tcsr.yaml + create mode 100644 drivers/clk/qcom/cambistmclkcc-eliza.c + create mode 100644 drivers/clk/qcom/camcc-eliza.c + create mode 100644 drivers/clk/qcom/camcc-hawi.c + create mode 100644 drivers/clk/qcom/camcc-nord.c + create mode 100644 drivers/clk/qcom/gcc-kuno.c + create mode 100644 drivers/clk/qcom/gcc-msm8952.c + create mode 100644 drivers/clk/qcom/gpucc-eliza.c + create mode 100644 drivers/clk/qcom/gpucc-hawi.c + create mode 100644 drivers/clk/qcom/videocc-eliza.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8952.h + create mode 100644 include/dt-bindings/clock/qcom,ipq5210-cmn-pll.h + create mode 100644 include/dt-bindings/clock/qcom,kuno-gcc.h +Merging realtek/for-next (3c778f0c9fa36 arm64: dts: realtek: Add GPIO support for RTD1625) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git realtek/for-next +Already up to date. +Merging renesas/next (fb050251fd4fe Merge branches 'renesas-arm-defconfig-for-v7.4', 'renesas-drivers-for-v7.4' and 'renesas-dts-for-v7.4' 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 (d373605cd5148 Merge tag 'reset-fixes-for-v7.0-2' into reset/next) +$ git merge -m Merge branch 'reset/next' of https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (d2abcbb905b0e Merge branch 'v7.4-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. + arch/arm/boot/dts/rockchip/rk3066a.dtsi | 2 +- + arch/arm/boot/dts/rockchip/rk3229-xms6.dts | 4 ++-- + arch/arm/boot/dts/rockchip/rk3288-miqi.dts | 2 +- + arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 2 +- + arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi | 1 - + 5 files changed, 5 insertions(+), 6 deletions(-) +Merging samsung-krzk/for-next (993e1bec85fae Merge branch 'next/drivers' 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/samsung,exynos5515-cmu.yaml | 145 ++ + drivers/clk/samsung/Makefile | 1 + + drivers/clk/samsung/clk-acpm.c | 61 +- + drivers/clk/samsung/clk-exynos5515.c | 1484 ++++++++++++++++++++ + drivers/clk/samsung/clk-pll.c | 1 + + drivers/clk/samsung/clk-pll.h | 1 + + include/dt-bindings/clock/samsung,exynos5515-cmu.h | 191 +++ + 7 files changed, 1878 insertions(+), 6 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos5515-cmu.yaml + create mode 100644 drivers/clk/samsung/clk-exynos5515.c + create mode 100644 include/dt-bindings/clock/samsung,exynos5515-cmu.h +Merging nomadik/for-next (ff1501cbb825d ARM: dts: ux500: Use AB8505 charger compatible) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git nomadik/for-next +Already up to date. +Merging integrator/for-next (5bf1bb010712b ARM: dts: gemini: Use a level-high interrupt for TVE200) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git integrator/for-next +Already up to date. +Merging scmi/for-linux-next (c64a20a250d5e Merge branches 'for-next/smccc/fixes', 'for-next/scmi/fixes', 'for-next/ffa/fixes' and 'for-next/juno/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux) +$ 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. + arch/arm64/boot/dts/arm/corstone1000-a320.dtsi | 2 +- + drivers/firmware/arm_ffa/driver.c | 11 ++- + drivers/firmware/arm_scmi/Kconfig | 2 +- + drivers/firmware/arm_scmi/bus.c | 110 ++++++++++++--------- + drivers/firmware/arm_scmi/driver.c | 4 - + drivers/firmware/arm_scmi/notify.c | 4 +- + drivers/firmware/arm_scmi/transports/Kconfig | 2 +- + drivers/firmware/arm_scmi/transports/mailbox.c | 7 +- + .../firmware/arm_scmi/vendors/imx/imx-sm-misc.c | 18 +++- + drivers/irqchip/Kconfig | 2 +- + drivers/pinctrl/freescale/pinctrl-imx-scmi.c | 2 +- + include/linux/arm-smccc.h | 7 ++ + include/linux/firmware/imx/sm.h | 6 ++ + 13 files changed, 113 insertions(+), 64 deletions(-) +Merging sophgo/for-next (60e4cafd30908 riscv: dts: sophgo: sg2002-milkv-duo256m: drop reserved memory node) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Already up to date. +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 (d5eefaf546eb8 Merge branch 'spacemit-misc-for-next' into spacemit-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux spacemit/for-next +Already up to date. +Merging stm32/stm32-next (f831584128ac2 soc: st: Add STM32MP2 SYSCFG driver) +$ git merge -m Merge branch 'stm32-next' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (5243bd55dfe63 Merge branch 'sunxi/dt-for-7.4' into sunxi/for-next) +$ 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 +Merge made by the 'ort' strategy. + drivers/clk/sunxi-ng/ccu-sun55i-a523-r.c | 37 ++++----- + drivers/clk/sunxi-ng/ccu-sun55i-a523.c | 128 ++++++++++++++----------------- + drivers/clk/sunxi-ng/ccu_common.c | 2 +- + drivers/clk/sunxi-ng/ccu_div.h | 18 ++++- + 4 files changed, 89 insertions(+), 96 deletions(-) +Merging tee/next (b0adf8e5e1ebf Merge branches 'optee_fixes_for_v7.3', 'tee_fix_for_v7.3', 'qcomtee_fix_for_v7.3', 'qcomtee_for_v7.4', 'tee_for_v7.4' and 'optee_for_v7.4' 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. + drivers/tee/optee/Kconfig | 1 + + drivers/tee/optee/Makefile | 4 ++-- + drivers/tee/optee/ffa_abi.c | 8 ++------ + drivers/tee/optee/notif.c | 1 - + drivers/tee/optee/optee_private.h | 39 ++++++++++++++++++++++++++++++++++++++- + 5 files changed, 43 insertions(+), 10 deletions(-) +Merging tegra/for-next (016e9c7ec4d13 Merge branch for-7.4/arm64/defconfig 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. + .../ABI/testing/sysfs-platform-tegra-bpmp | 48 +++ + drivers/firmware/tegra/Makefile | 1 + + drivers/firmware/tegra/bpmp-debugfs.c | 9 + + drivers/firmware/tegra/bpmp-private.h | 39 ++ + drivers/firmware/tegra/bpmp-sysfs.c | 207 ++++++++++ + drivers/firmware/tegra/bpmp-tegra186.c | 14 + + drivers/firmware/tegra/bpmp-tegra210.c | 17 +- + drivers/firmware/tegra/bpmp.c | 458 ++++++++++++++++++--- + include/soc/tegra/bpmp-abi.h | 165 +++++++- + include/soc/tegra/bpmp.h | 2 + + 10 files changed, 892 insertions(+), 68 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-tegra-bpmp + create mode 100644 drivers/firmware/tegra/bpmp-sysfs.c +Merging tenstorrent-dt/tenstorrent-dt-for-next (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'tenstorrent-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-dt/tenstorrent-dt-for-next +Already up to date. +Merging fustini-config/riscv-config-for-next (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'riscv-config-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git fustini-config/riscv-config-for-next +Already up to date. +Merging thead-dt/thead-dt-for-next (2414ca8f5a0ca MAINTAINERS: Move RISC-V T-Head SoC tree to kernel.org) +$ 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 +Already up to date. +Merging ti/ti-next (9e2716807275d Merge branch 'ti-k3-dts-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 (ac01278339e89 Merge branch '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 socfpga/for-next (bb3f9d4267bad arm: dts: altera: add Draeger M48 CPU Module) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git socfpga/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/altera.yaml | 3 + + .../bindings/firmware/intel,stratix10-svc.yaml | 10 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/intel/socfpga/Makefile | 1 + + .../intel/socfpga/socfpga_cyclone5_draeger_m48.dts | 102 ++++++++++++++ + arch/arm64/boot/dts/altera/Makefile | 14 +- + .../boot/dts/{intel => altera}/socfpga_agilex.dtsi | 2 + + .../{intel => altera}/socfpga_agilex3_socdk.dts | 0 + .../dts/{intel => altera}/socfpga_agilex5.dtsi | 61 +++++++++ + .../boot/dts/altera/socfpga_agilex5_socdk.dts | 146 +++++++++++++++++++++ + .../socfpga_agilex5_socdk_013b.dts | 0 + .../dts/altera/socfpga_agilex5_socdk_debug.dts | 121 +++++++++++++++++ + .../boot/dts/altera/socfpga_agilex5_socdk_emmc.dts | 123 +++++++++++++++++ + .../socfpga_agilex5_socdk_modular.dts | 0 + .../socfpga_agilex5_socdk_nand.dts | 0 + .../socfpga_agilex5_socdk_tsn_cfg2.dts} | 40 ++++-- + .../dts/{intel => altera}/socfpga_agilex72.dtsi | 0 + .../{intel => altera}/socfpga_agilex72_socdk.dts | 0 + .../{intel => altera}/socfpga_agilex7m_socdk.dts | 0 + .../dts/{intel => altera}/socfpga_agilex_n6000.dts | 0 + .../dts/{intel => altera}/socfpga_agilex_socdk.dts | 0 + .../socfpga_agilex_socdk_emmc.dts | 0 + .../socfpga_agilex_socdk_nand.dts | 0 + .../dts/{intel => altera}/socfpga_n5x_socdk.dts | 0 + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 4 + + arch/arm64/boot/dts/intel/Makefile | 12 -- + 26 files changed, 616 insertions(+), 25 deletions(-) + create mode 100644 arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_draeger_m48.dts + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex.dtsi (99%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex3_socdk.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex5.dtsi (93%) + create mode 100644 arch/arm64/boot/dts/altera/socfpga_agilex5_socdk.dts + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex5_socdk_013b.dts (100%) + create mode 100644 arch/arm64/boot/dts/altera/socfpga_agilex5_socdk_debug.dts + create mode 100644 arch/arm64/boot/dts/altera/socfpga_agilex5_socdk_emmc.dts + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex5_socdk_modular.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex5_socdk_nand.dts (100%) + rename arch/arm64/boot/dts/{intel/socfpga_agilex5_socdk.dts => altera/socfpga_agilex5_socdk_tsn_cfg2.dts} (73%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex72.dtsi (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex72_socdk.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex7m_socdk.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex_n6000.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex_socdk.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex_socdk_emmc.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex_socdk_nand.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_n5x_socdk.dts (100%) +Merging clk/clk-next (0d9678b125d83 Merge branches 'clk-renesas', 'clk-samsung', 'clk-starfive', 'clk-tenstorrent' and 'clk-pile' 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 +Auto-merging drivers/clk/at91/clk-main.c +Auto-merging drivers/clk/clk-scpi.c +Merge made by the 'ort' strategy. + .../bindings/clock/airoha,en7523-scu.yaml | 24 +- + .../bindings/clock/anlogic,dr1v90-cru.yaml | 62 + + .../bindings/clock/clk-palmas-clk32kg-clocks.txt | 35 - + .../bindings/clock/clock-nexus-node.yaml | 30 + + .../devicetree/bindings/clock/hi3660-clock.txt | 47 - + .../devicetree/bindings/clock/hi3670-clock.txt | 43 - + .../devicetree/bindings/clock/hi6220-clock.txt | 52 - + .../bindings/clock/hisilicon,clocks.yaml | 51 + + .../bindings/clock/hisilicon,hi6220-stub-clk.yaml | 49 + + .../bindings/clock/nuvoton,ma35d1-clk.yaml | 16 +- + .../bindings/clock/ti,palmas-clk32kg.yaml | 56 + + .../devicetree/bindings/clock/ti/adpll.txt | 39 - + .../devicetree/bindings/clock/ti/davinci/pll.txt | 96 -- + .../bindings/clock/ti/davinci/ti,da850-pll.yaml | 164 ++ + .../devicetree/bindings/clock/ti/dra7-atl.txt | 94 -- + .../devicetree/bindings/clock/ti/fapll.txt | 31 - + .../bindings/clock/ti/ti,dm814-adpll-clock.yaml | 88 ++ + .../bindings/clock/ti/ti,dm816-fapll-clock.yaml | 71 + + .../bindings/clock/ti/ti,dra7-atl-clock.yaml | 38 + + .../devicetree/bindings/clock/ti/ti,dra7-atl.yaml | 100 ++ + .../bindings/clock/zte,zx297520v3-lspcrm.yaml | 101 ++ + .../bindings/clock/zte,zx297520v3-matrixcrm.yaml | 98 ++ + .../bindings/clock/zte,zx297520v3-topcrm.yaml | 122 ++ + MAINTAINERS | 34 +- + drivers/clk/Kconfig | 15 +- + drivers/clk/Makefile | 9 +- + drivers/clk/actions/owl-composite.h | 1 - + drivers/clk/actions/owl-fixed-factor.h | 2 - + drivers/clk/actions/owl-pll.c | 2 +- + drivers/clk/anlogic/Kconfig | 21 + + drivers/clk/anlogic/Makefile | 7 + + drivers/clk/anlogic/cru-dr1v90.c | 192 +++ + drivers/clk/anlogic/cru_dr1.c | 226 +++ + drivers/clk/anlogic/cru_dr1.h | 117 ++ + drivers/clk/aspeed/Kconfig | 1 + + drivers/clk/aspeed/clk-aspeed.c | 2 +- + drivers/clk/aspeed/clk-ast2600.c | 2 +- + drivers/clk/aspeed/clk-ast2700.c | 2 +- + drivers/clk/at91/clk-audio-pll.c | 4 +- + drivers/clk/at91/clk-h32mx.c | 2 +- + drivers/clk/at91/clk-main.c | 2 +- + drivers/clk/at91/clk-pll.c | 2 +- + drivers/clk/at91/clk-plldiv.c | 2 +- + drivers/clk/at91/clk-slow.c | 2 +- + drivers/clk/at91/clk-smd.c | 2 +- + drivers/clk/at91/clk-usb.c | 6 +- + drivers/clk/at91/sckc.c | 2 +- + drivers/clk/bcm/clk-iproc-armpll.c | 2 +- + drivers/clk/bcm/clk-iproc-asiu.c | 2 +- + drivers/clk/bcm/clk-iproc-pll.c | 2 +- + drivers/clk/bcm/clk-raspberrypi.c | 2 + + drivers/clk/berlin/berlin2-avpll.c | 4 +- + drivers/clk/berlin/berlin2-pll.c | 2 +- + drivers/clk/clk-axi-clkgen.c | 2 +- + drivers/clk/clk-cdce925.c | 11 +- + drivers/clk/clk-conf.c | 12 +- + drivers/clk/clk-cs2000-cp.c | 2 +- + drivers/clk/clk-en7523.c | 218 ++- + drivers/clk/clk-eyeq.c | 31 +- + drivers/clk/clk-fractional-divider.c | 2 +- + drivers/clk/clk-gemini.c | 2 +- + drivers/clk/clk-gpio.c | 2 +- + drivers/clk/clk-highbank.c | 2 +- + drivers/clk/clk-lmk04832.c | 9 +- + drivers/clk/clk-milbeaut.c | 14 +- + drivers/clk/clk-nomadik.c | 4 +- + drivers/clk/clk-npcm7xx.c | 2 +- + drivers/clk/clk-pwm.c | 2 +- + drivers/clk/clk-renesas-pcie.c | 43 +- + drivers/clk/clk-s2mps11.c | 12 +- + drivers/clk/clk-scpi.c | 2 +- + drivers/clk/clk-si514.c | 2 +- + drivers/clk/clk-si521xx.c | 43 +- + drivers/clk/clk-si5341.c | 2 +- + drivers/clk/clk-si5351.c | 20 +- + drivers/clk/clk-si544.c | 2 +- + drivers/clk/clk-si570.c | 2 +- + drivers/clk/clk-stm32f4.c | 4 +- + drivers/clk/clk-stm32h7.c | 2 +- + drivers/clk/clk-versaclock5.c | 12 +- + drivers/clk/clk-vt8500.c | 4 +- + drivers/clk/clk-xgene.c | 6 +- + drivers/clk/clk.c | 75 +- + drivers/clk/clk.h | 5 +- + drivers/clk/clk_kunit_helpers.c | 31 + + drivers/clk/clk_test.c | 151 +- + drivers/clk/clkdev.c | 4 +- + drivers/clk/davinci/Kconfig | 10 + + drivers/clk/davinci/Makefile | 8 +- + drivers/clk/davinci/da8xx-cfgchip.c | 4 +- + drivers/clk/davinci/pll.c | 2 +- + drivers/clk/davinci/psc.c | 2 +- + drivers/clk/hisilicon/clk-hi3559a.c | 2 +- + drivers/clk/hisilicon/clk-hi3620.c | 2 +- + drivers/clk/hisilicon/clk-hi6220-stub.c | 2 +- + drivers/clk/hisilicon/clk-hisi-phase.c | 2 +- + drivers/clk/hisilicon/clk-hix5hd2.c | 2 +- + drivers/clk/hisilicon/clkdivider-hi6220.c | 2 +- + drivers/clk/hisilicon/clkgate-separated.c | 2 +- + drivers/clk/imx/clk-busy.c | 4 +- + drivers/clk/imx/clk-composite-93.c | 11 +- + drivers/clk/imx/clk-cpu.c | 2 +- + drivers/clk/imx/clk-divider-gate.c | 2 +- + drivers/clk/imx/clk-fixup-div.c | 2 +- + drivers/clk/imx/clk-fixup-mux.c | 2 +- + drivers/clk/imx/clk-frac-pll.c | 2 +- + drivers/clk/imx/clk-fracn-gppll.c | 3 +- + drivers/clk/imx/clk-gate-93.c | 2 +- + drivers/clk/imx/clk-gate-exclusive.c | 2 +- + drivers/clk/imx/clk-gate2.c | 2 +- + drivers/clk/imx/clk-lpcg-scu.c | 2 +- + drivers/clk/imx/clk-pfd.c | 2 +- + drivers/clk/imx/clk-pfdv2.c | 2 +- + drivers/clk/imx/clk-pll14xx.c | 105 +- + drivers/clk/imx/clk-pllv1.c | 2 +- + drivers/clk/imx/clk-pllv2.c | 2 +- + drivers/clk/imx/clk-pllv3.c | 2 +- + drivers/clk/imx/clk-pllv4.c | 2 +- + drivers/clk/imx/clk-scu.c | 4 +- + drivers/clk/imx/clk-sscg-pll.c | 2 +- + drivers/clk/imx/clk.c | 15 +- + drivers/clk/ingenic/cgu.c | 2 +- + drivers/clk/keystone/gate.c | 2 +- + drivers/clk/keystone/pll.c | 2 +- + drivers/clk/keystone/syscon-clk.c | 2 +- + drivers/clk/kunit_clk_assigned_rates.h | 4 +- + drivers/clk/kunit_clk_parse_clkspec.dtso | 31 + + drivers/clk/mediatek/Kconfig | 1 + + drivers/clk/mediatek/clk-cpumux.c | 2 +- + drivers/clk/mediatek/reset.h | 6 +- + drivers/clk/meson/t7-peripherals.c | 11 +- + drivers/clk/mmp/Kconfig | 5 + + drivers/clk/mmp/clk-apbc.c | 2 +- + drivers/clk/mmp/clk-apmu.c | 2 +- + drivers/clk/mmp/clk-frac.c | 2 +- + drivers/clk/mmp/clk-gate.c | 2 +- + drivers/clk/mmp/clk-mix.c | 2 +- + drivers/clk/mmp/clk-pll.c | 2 +- + drivers/clk/mstar/clk-msc313-mpll.c | 2 +- + drivers/clk/mvebu/ap-cpu-clk.c | 6 +- + drivers/clk/mvebu/clk-corediv.c | 2 +- + drivers/clk/mvebu/clk-cpu.c | 2 +- + drivers/clk/mxs/clk-div.c | 2 +- + drivers/clk/mxs/clk-frac.c | 2 +- + drivers/clk/mxs/clk-pll.c | 2 +- + drivers/clk/mxs/clk-ref.c | 2 +- + drivers/clk/nuvoton/clk-ma35d1.c | 7 +- + drivers/clk/nxp/clk-lpc18xx-creg.c | 2 +- + drivers/clk/pistachio/clk-pll.c | 2 +- + drivers/clk/pistachio/clk.c | 15 +- + drivers/clk/pistachio/clk.h | 1 + + drivers/clk/renesas/Kconfig | 7 + + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a774a3-cpg-mssr.c | 168 ++ + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 6 +- + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 4 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 4 +- + drivers/clk/renesas/r8a779h0-cpg-mssr.c | 8 +- + drivers/clk/renesas/r8a78000-cpg.c | 3 + + drivers/clk/renesas/r9a06g032-clocks.c | 2 +- + drivers/clk/renesas/r9a07g043-cpg.c | 12 +- + drivers/clk/renesas/r9a07g044-cpg.c | 12 +- + drivers/clk/renesas/r9a08g045-cpg.c | 6 +- + drivers/clk/renesas/r9a08g046-cpg.c | 117 +- + drivers/clk/renesas/r9a09g077-cpg.c | 142 ++ + drivers/clk/renesas/rcar-gen3-cpg.c | 15 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 3 +- + drivers/clk/renesas/rcar-gen4-cpg.c | 25 +- + drivers/clk/renesas/rcar-gen4-cpg.h | 14 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 9 + + drivers/clk/renesas/renesas-cpg-mssr.h | 2 + + drivers/clk/renesas/rzg2l-cpg.c | 554 ++++++- + drivers/clk/renesas/rzg2l-cpg.h | 51 +- + drivers/clk/renesas/rzv2h-cpg.c | 164 +- + drivers/clk/rockchip/clk-cpu.c | 2 +- + drivers/clk/rockchip/clk-ddr.c | 2 +- + drivers/clk/rockchip/clk-gate-grf.c | 2 +- + drivers/clk/rockchip/clk-inverter.c | 2 +- + drivers/clk/rockchip/clk-mmc-phase.c | 2 +- + drivers/clk/rockchip/clk-muxgrf.c | 2 +- + drivers/clk/rockchip/clk-pll.c | 2 +- + drivers/clk/rockchip/clk.c | 2 +- + drivers/clk/samsung/clk-cpu.c | 2 +- + drivers/clk/samsung/clk-exynos-clkout.c | 8 +- + drivers/clk/samsung/clk-pll.c | 2 +- + drivers/clk/socfpga/clk-gate-a10.c | 2 +- + drivers/clk/socfpga/clk-gate-s10.c | 6 +- + drivers/clk/socfpga/clk-gate.c | 2 +- + drivers/clk/socfpga/clk-periph-a10.c | 2 +- + drivers/clk/socfpga/clk-periph-s10.c | 8 +- + drivers/clk/socfpga/clk-periph.c | 2 +- + drivers/clk/socfpga/clk-pll-a10.c | 2 +- + drivers/clk/socfpga/clk-pll-s10.c | 8 +- + drivers/clk/socfpga/clk-pll.c | 2 +- + drivers/clk/spear/clk-aux-synth.c | 2 +- + drivers/clk/spear/clk-frac-synth.c | 2 +- + drivers/clk/spear/clk-gpt-synth.c | 2 +- + drivers/clk/spear/clk-vco-pll.c | 2 +- + drivers/clk/st/clk-flexgen.c | 2 +- + drivers/clk/st/clkgen-fsyn.c | 4 +- + drivers/clk/st/clkgen-pll.c | 2 +- + drivers/clk/starfive/clk-starfive-jh7110-isp.c | 2 +- + drivers/clk/starfive/clk-starfive-jh7110-sys.c | 3 + + drivers/clk/starfive/clk-starfive-jh7110-vout.c | 6 +- + drivers/clk/stm32/clk-stm32mp1.c | 4 +- + drivers/clk/stm32/clk-stm32mp21.c | 4 +- + drivers/clk/sunxi/clk-sun4i-tcon-ch1.c | 2 +- + drivers/clk/tegra/clk-audio-sync.c | 2 +- + drivers/clk/tegra/clk-bpmp.c | 12 +- + drivers/clk/tegra/clk-divider.c | 2 +- + drivers/clk/tegra/clk-periph-fixed.c | 2 +- + drivers/clk/tegra/clk-periph-gate.c | 2 +- + drivers/clk/tegra/clk-periph.c | 2 +- + drivers/clk/tegra/clk-pll-out.c | 2 +- + drivers/clk/tegra/clk-pll.c | 2 +- + drivers/clk/tegra/clk-sdmmc-mux.c | 2 +- + drivers/clk/tegra/clk-super.c | 4 +- + drivers/clk/tegra/clk-tegra-super-cclk.c | 2 +- + drivers/clk/tegra/clk-tegra124-emc.c | 2 +- + drivers/clk/tegra/clk-tegra20-emc.c | 2 +- + drivers/clk/tegra/clk-tegra210-emc.c | 2 +- + drivers/clk/tegra/clk.h | 2 +- + drivers/clk/tenstorrent/atlantis-prcm.c | 35 +- + drivers/clk/ti/adpll.c | 1 + + drivers/clk/ti/clockdomain.c | 2 +- + drivers/clk/uniphier/clk-uniphier-cpugear.c | 2 +- + drivers/clk/uniphier/clk-uniphier-fixed-factor.c | 2 +- + drivers/clk/uniphier/clk-uniphier-fixed-rate.c | 2 +- + drivers/clk/uniphier/clk-uniphier-gate.c | 2 +- + drivers/clk/uniphier/clk-uniphier-mux.c | 2 +- + drivers/clk/ux500/clk-prcc.c | 2 +- + drivers/clk/ux500/clk-prcmu.c | 4 +- + drivers/clk/ux500/clk-sysctrl.c | 2 +- + drivers/clk/versatile/clk-icst.c | 6 +- + drivers/clk/versatile/clk-sp810.c | 2 +- + drivers/clk/versatile/clk-vexpress-osc.c | 2 +- + drivers/clk/x86/clk-pmc-atom.c | 2 +- + drivers/clk/xilinx/clk-xlnx-clock-wizard.c | 18 +- + drivers/clk/xilinx/xlnx_vcu.c | 2 +- + drivers/clk/zte/Kconfig | 28 + + drivers/clk/zte/Makefile | 6 + + drivers/clk/zte/clk-regmap.c | 237 +++ + drivers/clk/zte/clk-zx.c | 192 +++ + drivers/clk/zte/clk-zx.h | 137 ++ + drivers/clk/zte/clk-zx297520v3.c | 1657 ++++++++++++++++++++ + drivers/clk/zte/pll-zx.c | 576 +++++++ + drivers/clk/zynqmp/clk-gate-zynqmp.c | 2 +- + drivers/clk/zynqmp/clk-mux-zynqmp.c | 2 +- + drivers/clk/zynqmp/divider.c | 2 +- + drivers/clk/zynqmp/pll.c | 2 +- + drivers/reset/Kconfig | 10 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-dr1v90.c | 140 ++ + include/dt-bindings/clock/amlogic,a9-scmi-clkc.h | 51 + + include/dt-bindings/clock/anlogic,dr1v90-cru.h | 46 + + include/dt-bindings/clock/nuvoton,ma35d1-clk.h | 3 +- + include/dt-bindings/clock/zte,zx297520v3-clk.h | 154 ++ + include/dt-bindings/phy/zte,zx297520v3-topcrm.h | 12 + + include/dt-bindings/reset/anlogic,dr1v90-cru.h | 41 + + include/dt-bindings/reset/zte,zx297520v3-reset.h | 62 + + include/dt-bindings/soc/airoha,scu-ssr.h | 11 + + include/kunit/clk.h | 2 + + include/linux/clk-provider.h | 25 +- + include/linux/clk/tegra.h | 2 +- + include/linux/clk/ti.h | 2 +- + rust/kernel/clk.rs | 15 + + 266 files changed, 7221 insertions(+), 1011 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/anlogic,dr1v90-cru.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/clk-palmas-clk32kg-clocks.txt + create mode 100644 Documentation/devicetree/bindings/clock/clock-nexus-node.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/hi3660-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/hi3670-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/hi6220-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/hisilicon,clocks.yaml + create mode 100644 Documentation/devicetree/bindings/clock/hisilicon,hi6220-stub-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/ti,palmas-clk32kg.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/ti/adpll.txt + delete mode 100644 Documentation/devicetree/bindings/clock/ti/davinci/pll.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/davinci/ti,da850-pll.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/ti/dra7-atl.txt + delete mode 100644 Documentation/devicetree/bindings/clock/ti/fapll.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,dm814-adpll-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,dm816-fapll-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,dra7-atl-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,dra7-atl.yaml + create mode 100644 Documentation/devicetree/bindings/clock/zte,zx297520v3-lspcrm.yaml + create mode 100644 Documentation/devicetree/bindings/clock/zte,zx297520v3-matrixcrm.yaml + create mode 100644 Documentation/devicetree/bindings/clock/zte,zx297520v3-topcrm.yaml + create mode 100644 drivers/clk/anlogic/Kconfig + create mode 100644 drivers/clk/anlogic/Makefile + create mode 100644 drivers/clk/anlogic/cru-dr1v90.c + create mode 100644 drivers/clk/anlogic/cru_dr1.c + create mode 100644 drivers/clk/anlogic/cru_dr1.h + create mode 100644 drivers/clk/davinci/Kconfig + create mode 100644 drivers/clk/kunit_clk_parse_clkspec.dtso + create mode 100644 drivers/clk/renesas/r8a774a3-cpg-mssr.c + create mode 100644 drivers/clk/zte/Kconfig + create mode 100644 drivers/clk/zte/Makefile + create mode 100644 drivers/clk/zte/clk-regmap.c + create mode 100644 drivers/clk/zte/clk-zx.c + create mode 100644 drivers/clk/zte/clk-zx.h + create mode 100644 drivers/clk/zte/clk-zx297520v3.c + create mode 100644 drivers/clk/zte/pll-zx.c + create mode 100644 drivers/reset/reset-dr1v90.c + create mode 100644 include/dt-bindings/clock/amlogic,a9-scmi-clkc.h + create mode 100644 include/dt-bindings/clock/anlogic,dr1v90-cru.h + create mode 100644 include/dt-bindings/clock/zte,zx297520v3-clk.h + create mode 100644 include/dt-bindings/phy/zte,zx297520v3-topcrm.h + create mode 100644 include/dt-bindings/reset/anlogic,dr1v90-cru.h + create mode 100644 include/dt-bindings/reset/zte,zx297520v3-reset.h + create mode 100644 include/dt-bindings/soc/airoha,scu-ssr.h +Merging clk-imx/for-next (52d4d1b26a5bc clk: imx: Fix clock reference leak in imx_obtain_fixed_clock_hw()) +$ 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 (21cbd7ec29930 clk: renesas: r8a78000: Add SGASYNCD8_PERW_BUS) +$ 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 (cee9395acd804 Linux 7.3-rc1) +$ 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 tenstorrent-clk/tenstorrent-clk-for-next (c64b54ddb692c MAINTAINERS: Update RISC-V Tenstorrent SoC entry) +$ git merge -m Merge branch 'tenstorrent-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-clk/tenstorrent-clk-for-next +Already up to date. +Merging csky/linux-next (abb81e5ce7d99 csky: Fix a4/a5 restoration in syscall trace path) +$ 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 (6f8d12bb1a123 soc: loongson: loongson2_guts: Use of_root instead of own reference) +$ 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/kdump/vmcoreinfo.rst +Auto-merging MAINTAINERS +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/include/asm/loongarch.h +Auto-merging arch/loongarch/kernel/cpu-probe.c +Auto-merging arch/loongarch/net/bpf_jit.c +Auto-merging drivers/acpi/Kconfig +Auto-merging drivers/acpi/scan.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kdump/vmcoreinfo.rst | 36 +++ + MAINTAINERS | 9 + + arch/loongarch/Kconfig | 1 + + arch/loongarch/boot/dts/loongson-2k0500-ref.dts | 2 - + arch/loongarch/include/asm/barrier.h | 3 - + arch/loongarch/include/asm/cpu-features.h | 2 + + arch/loongarch/include/asm/cpu.h | 66 ++-- + arch/loongarch/include/asm/hw_breakpoint.h | 8 +- + arch/loongarch/include/asm/inst.h | 6 + + arch/loongarch/include/asm/loongarch.h | 7 +- + arch/loongarch/include/asm/numa.h | 2 +- + arch/loongarch/include/asm/processor.h | 1 + + arch/loongarch/include/asm/switch_to.h | 2 +- + arch/loongarch/include/uapi/asm/hwcap.h | 2 + + arch/loongarch/kernel/Makefile | 1 + + arch/loongarch/kernel/cpu-probe.c | 10 +- + arch/loongarch/kernel/efi-header.S | 2 +- + arch/loongarch/kernel/env.c | 5 +- + arch/loongarch/kernel/hw_breakpoint.c | 66 +++- + arch/loongarch/kernel/irq.c | 3 +- + arch/loongarch/kernel/numa.c | 8 +- + arch/loongarch/kernel/proc.c | 4 + + arch/loongarch/kernel/traps.c | 13 +- + arch/loongarch/kernel/vmcore_info.c | 22 ++ + arch/loongarch/net/bpf_jit.c | 399 +++++++++++++----------- + arch/loongarch/net/bpf_jit.h | 25 +- + arch/loongarch/pci/pci.c | 3 +- + drivers/acpi/Kconfig | 4 + + drivers/acpi/Makefile | 2 +- + drivers/acpi/bus.c | 2 + + drivers/acpi/loongarch/Kconfig | 7 + + drivers/acpi/loongarch/Makefile | 3 + + drivers/acpi/loongarch/init.c | 16 + + drivers/acpi/loongarch/init.h | 5 + + drivers/acpi/loongarch/iovt.c | 258 +++++++++++++++ + drivers/acpi/scan.c | 3 + + drivers/soc/loongson/loongson2_guts.c | 9 +- + drivers/soc/loongson/loongson2_pm.c | 2 +- + include/linux/acpi.h | 1 + + include/linux/acpi_iovt.h | 13 + + 40 files changed, 757 insertions(+), 276 deletions(-) + create mode 100644 arch/loongarch/kernel/vmcore_info.c + create mode 100644 drivers/acpi/loongarch/Kconfig + create mode 100644 drivers/acpi/loongarch/Makefile + create mode 100644 drivers/acpi/loongarch/init.c + create mode 100644 drivers/acpi/loongarch/init.h + create mode 100644 drivers/acpi/loongarch/iovt.c + create mode 100644 include/linux/acpi_iovt.h +Merging m68k/for-next (af32c3cb72529 m68k: defconfig: Enable ATARI_SVETHLANA and ETHOC) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (cffad6e71539b m68k: coldfire: Add RNG support for MCF54418) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (2c455ddca7827 smb client: fix mis-merge with fileattr_set taking a const idmap) +$ 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 (bfe97f12a0a64 MIPS: octeon: Add detection of UBNT Edgeroute Lite devices) +$ git merge -m Merge branch 'mips-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (6620f5e8c11c4 openrisc: drop unneeded semicolon) +$ git merge -m Merge branch 'for-next' of https://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (c03c1a14507df Linux 7.3) +$ 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 +Already up to date. +Merging powerpc/next (129f5d395fd66 powerpc/numa: Support coregroup on PowerNV) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging risc-v/for-next (a5ae1bf65cee8 riscv: mm: unexport _pgtable_l4_enabled and _pgtable_l5_enabled) +$ 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 arch/riscv/Kconfig +Auto-merging arch/riscv/Kconfig.errata +Auto-merging arch/riscv/boot/dts/spacemit/k3.dtsi +Auto-merging arch/riscv/include/asm/pgtable-64.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/kernel/paravirt.c +Auto-merging arch/riscv/kernel/smp.c +Auto-merging arch/riscv/kernel/sys_hwprobe.c +Auto-merging arch/riscv/mm/init.c +Auto-merging drivers/acpi/riscv/cppc.c +Merge made by the 'ort' strategy. + Documentation/arch/riscv/hwprobe.rst | 8 + + .../devicetree/bindings/riscv/extensions.yaml | 54 +++++ + arch/riscv/Kconfig | 51 ++--- + arch/riscv/Kconfig.errata | 18 +- + arch/riscv/boot/dts/sophgo/sg2044-cpus.dtsi | 128 ++++++------ + arch/riscv/boot/dts/spacemit/k1.dtsi | 80 ++++---- + arch/riscv/boot/dts/spacemit/k3.dtsi | 48 ++--- + arch/riscv/errata/mips/Makefile | 6 + + arch/riscv/errata/mips/errata.c | 55 +++-- + arch/riscv/include/asm/alternative-macros.h | 24 --- + arch/riscv/include/asm/alternative.h | 12 +- + arch/riscv/include/asm/cpufeature-macros.h | 10 +- + arch/riscv/include/asm/cpufeature.h | 8 +- + arch/riscv/include/asm/errata_list.h | 37 ++++ + arch/riscv/include/asm/errata_list_vendors.h | 5 +- + arch/riscv/include/asm/hwcap.h | 4 + + arch/riscv/include/asm/insn.h | 2 +- + arch/riscv/include/asm/jump_label.h | 26 +++ + arch/riscv/include/asm/kexec.h | 13 ++ + arch/riscv/include/asm/kvm_nacl.h | 4 +- + arch/riscv/include/asm/pci.h | 5 + + arch/riscv/include/asm/pgalloc.h | 14 +- + arch/riscv/include/asm/pgtable-32.h | 4 +- + arch/riscv/include/asm/pgtable-64.h | 74 +++++-- + arch/riscv/include/asm/pgtable.h | 4 +- + arch/riscv/include/asm/processor.h | 7 +- + arch/riscv/include/asm/sbi.h | 81 +++++++- + arch/riscv/include/asm/vector.h | 8 +- + arch/riscv/include/asm/vendor_extensions.h | 18 +- + arch/riscv/include/asm/vmalloc.h | 5 +- + arch/riscv/include/uapi/asm/hwcap.h | 1 + + arch/riscv/include/uapi/asm/hwprobe.h | 2 + + arch/riscv/kernel/Makefile | 3 +- + arch/riscv/kernel/alternative.c | 24 ++- + arch/riscv/kernel/cpu.c | 4 +- + arch/riscv/kernel/cpu_ops_sbi.c | 6 +- + arch/riscv/kernel/cpufeature.c | 91 ++++++++- + arch/riscv/kernel/crash.c | 113 +++++++++++ + arch/riscv/kernel/head.S | 4 +- + arch/riscv/kernel/kernel_mode_vector.c | 9 +- + arch/riscv/kernel/paravirt.c | 2 +- + arch/riscv/kernel/process.c | 12 ++ + arch/riscv/kernel/sbi.c | 57 +++--- + arch/riscv/kernel/sbi_ecall.c | 40 ++-- + arch/riscv/kernel/smp.c | 1 - + arch/riscv/kernel/suspend.c | 4 +- + arch/riscv/kernel/sys_hwprobe.c | 2 + + arch/riscv/kernel/usercfi.c | 20 +- + arch/riscv/kvm/nacl.c | 7 +- + arch/riscv/lib/uaccess.S | 61 +++--- + arch/riscv/mm/init.c | 79 +++++--- + arch/riscv/mm/kasan_init.c | 20 +- + arch/riscv/mm/pgtable.c | 4 +- + arch/riscv/mm/ptdump.c | 4 +- + drivers/acpi/riscv/cppc.c | 4 +- + drivers/perf/riscv_pmu_sbi.c | 43 ++-- + tools/testing/selftests/riscv/vector/Makefile | 6 +- + .../selftests/riscv/vector/v_uaccess_stress.c | 221 +++++++++++++++++++++ + 58 files changed, 1171 insertions(+), 486 deletions(-) + create mode 100644 arch/riscv/kernel/crash.c + create mode 100644 tools/testing/selftests/riscv/vector/v_uaccess_stress.c +Merging riscv-dt/riscv-dt-for-next (2186ec5f59c23 riscv: dts: starfive: Correct pwm nodes) +$ 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 (3160b4a8aeea9 Merge branches 'riscv-soc-drivers-for-next' and 'cache-for-next' 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 +Merge made by the 'ort' strategy. +Merging s390/for-next (c98d9be7a0bea s390: Use static call trampolines when kCFI is enabled) +$ 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/Kconfig +Auto-merging arch/s390/kernel/ptrace.c +Auto-merging arch/s390/kernel/vdso.c +Auto-merging arch/s390/kernel/vdso/vdso.lds.S +Auto-merging arch/s390/net/bpf_jit_comp.c +Merge made by the 'ort' strategy. + arch/s390/Kconfig | 2 ++ + arch/s390/appldata/appldata_base.c | 12 ++++++---- + arch/s390/include/asm/futex_robust.h | 25 ++++++++++++++++++++ + arch/s390/include/asm/ptrace.h | 4 ++-- + arch/s390/include/asm/runtime-const.h | 4 +++- + arch/s390/include/asm/static_call.h | 39 +++++++++++++++++++++++++++++++ + arch/s390/include/asm/syscall.h | 1 - + arch/s390/include/asm/text-patching.h | 14 +++++++++++ + arch/s390/include/asm/uaccess.h | 9 ------- + arch/s390/kernel/Makefile | 1 + + arch/s390/kernel/alternative.c | 6 ++++- + arch/s390/kernel/ftrace.c | 11 +++++++++ + arch/s390/kernel/jump_label.c | 3 ++- + arch/s390/kernel/kprobes.c | 4 +++- + arch/s390/kernel/module.c | 2 ++ + arch/s390/kernel/nospec-branch.c | 4 ++++ + arch/s390/kernel/ptrace.c | 28 ++++++++++++++++++---- + arch/s390/kernel/stackprotector.c | 6 ++++- + arch/s390/kernel/static_call.c | 24 +++++++++++++++++++ + arch/s390/kernel/syscall.c | 20 +++++++--------- + arch/s390/kernel/vdso.c | 19 +++++++++++++++ + arch/s390/kernel/vdso/Makefile | 7 +++--- + arch/s390/kernel/vdso/gen_vdso_offsets.sh | 3 ++- + arch/s390/kernel/vdso/vdso.lds.S | 3 +++ + arch/s390/kernel/vdso/vfutex.S | 22 +++++++++++++++++ + arch/s390/kernel/vmlinux.lds.S | 1 + + arch/s390/mm/maccess.c | 9 ++++--- + arch/s390/net/bpf_jit_comp.c | 21 +++++++++++++---- + drivers/s390/block/dcssblk.c | 3 +-- + 29 files changed, 255 insertions(+), 52 deletions(-) + create mode 100644 arch/s390/include/asm/futex_robust.h + create mode 100644 arch/s390/include/asm/static_call.h + create mode 100644 arch/s390/kernel/static_call.c + create mode 100644 arch/s390/kernel/vdso/vfutex.S +Merging sh/for-next (f45711b39e03f sh: Select BINFMT_FLAT_NO_DATA_START_OFFSET for !MMU) +$ 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 (d957b367d560c sparc64: flush vmalloc ranges from the D-cache on map and unmap) +$ 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 +Auto-merging arch/sparc/include/asm/pgtable_32.h +Auto-merging arch/sparc/include/asm/pgtable_64.h +Auto-merging arch/sparc/mm/init_64.c +Auto-merging arch/sparc/mm/srmmu.c +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Merge made by the 'ort' strategy. + arch/sparc/Kconfig | 2 +- + arch/sparc/include/asm/cacheflush_64.h | 9 +- + arch/sparc/include/asm/highmem.h | 3 - + arch/sparc/include/asm/leon.h | 2 +- + arch/sparc/include/asm/page_32.h | 16 --- + arch/sparc/include/asm/pgtable_32.h | 3 +- + arch/sparc/include/asm/pgtable_64.h | 8 +- + arch/sparc/include/asm/pgtsrmmu.h | 1 - + arch/sparc/include/asm/seccomp.h | 15 +++ + arch/sparc/include/asm/syscall.h | 11 +- + arch/sparc/include/asm/thread_info_32.h | 2 + + arch/sparc/include/asm/thread_info_64.h | 15 +-- + arch/sparc/kernel/entry.S | 42 ++++--- + arch/sparc/kernel/entry.h | 2 +- + arch/sparc/kernel/head_32.S | 2 +- + arch/sparc/kernel/kernel.h | 3 +- + arch/sparc/kernel/nmi.c | 2 +- + arch/sparc/kernel/ptrace_32.c | 26 ++-- + arch/sparc/kernel/ptrace_64.c | 28 +++-- + arch/sparc/kernel/setup_32.c | 91 +++++++++++--- + arch/sparc/kernel/smp_64.c | 51 ++++++-- + arch/sparc/kernel/syscalls.S | 28 ++++- + arch/sparc/kernel/time_64.c | 6 +- + arch/sparc/kernel/tsb.S | 24 +++- + arch/sparc/kernel/urtt_fill.S | 10 ++ + arch/sparc/mm/fault_32.c | 34 +++--- + arch/sparc/mm/fault_64.c | 9 ++ + arch/sparc/mm/init_32.c | 167 +------------------------- + arch/sparc/mm/init_64.c | 65 ++++++++++ + arch/sparc/mm/leon_mm.c | 1 + + arch/sparc/mm/srmmu.c | 70 ++++------- + arch/sparc/mm/tlb.c | 2 +- + arch/sparc/mm/ultra.S | 25 ++++ + arch/sparc/mm/viking.S | 6 + + arch/sparc/prom/memory.c | 51 ++------ + tools/testing/selftests/seccomp/seccomp_bpf.c | 52 ++++++++ + 36 files changed, 482 insertions(+), 402 deletions(-) +Merging uml/next (7cd80b8168c92 Merge tag 'uml-for-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (28722ed2527aa xtensa: time: Fix clk reference leak in calibrate_ccount()) +$ git merge -m Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging fs-next (90a1931c2e8ee 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 MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/filesystems/9p.rst | 12 +- + Documentation/filesystems/ntfs3.rst | 23 + + MAINTAINERS | 7 +- + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + fs/9p/acl.h | 2 +- + fs/9p/cache.c | 7 +- + fs/9p/fid.c | 2 +- + fs/9p/v9fs.c | 18 +- + fs/9p/v9fs.h | 26 +- + fs/9p/vfs_addr.c | 10 +- + fs/9p/vfs_dentry.c | 2 +- + fs/9p/vfs_dir.c | 32 +- + fs/9p/vfs_file.c | 2 +- + fs/9p/vfs_inode.c | 26 +- + fs/9p/vfs_inode_dotl.c | 36 +- + fs/9p/vfs_super.c | 2 +- + fs/btrfs/Kconfig | 1 + + fs/btrfs/backref.c | 6 +- + fs/btrfs/backref.h | 3 +- + fs/btrfs/defrag.c | 11 +- + fs/btrfs/disk-io.c | 20 + + fs/btrfs/extent_io.c | 2 +- + fs/btrfs/fiemap.c | 3 +- + fs/btrfs/ioctl.c | 22 +- + fs/btrfs/qgroup.c | 12 +- + fs/btrfs/scrub.c | 2 +- + fs/btrfs/sysfs.c | 4 + + fs/btrfs/verity.c | 2 +- + fs/btrfs/volumes.c | 7 +- + fs/ceph/Kconfig | 13 + + fs/ceph/acl.c | 2 +- + fs/ceph/addr.c | 427 +++++--- + fs/ceph/cache.c | 4 +- + fs/ceph/caps.c | 377 +++++++- + fs/ceph/crypto.c | 11 + + fs/ceph/crypto.h | 12 +- + fs/ceph/dir.c | 58 +- + fs/ceph/export.c | 8 +- + fs/ceph/file.c | 160 +-- + fs/ceph/inode.c | 119 ++- + fs/ceph/mds_client.c | 124 ++- + fs/ceph/mds_client.h | 5 +- + fs/ceph/mdsmap.c | 12 +- + fs/ceph/quota.c | 6 +- + fs/ceph/snap.c | 17 +- + fs/ceph/super.c | 35 +- + fs/ceph/super.h | 153 ++- + fs/ceph/util.c | 4 - + fs/ceph/xattr.c | 18 +- + fs/configfs/dir.c | 9 +- + fs/configfs/file.c | 2 +- + fs/configfs/mount.c | 9 + + fs/crypto/keyring.c | 4 +- + fs/crypto/keysetup.c | 8 +- + fs/dcache.c | 2 + + fs/ecryptfs/ecryptfs_kernel.h | 6 + + fs/ecryptfs/keystore.c | 7 + + fs/exfat/file.c | 3 + + fs/exfat/inode.c | 3 - + fs/exfat/iomap.c | 7 +- + fs/exfat/namei.c | 4 +- + fs/ext2/inode.c | 4 +- + fs/ext2/super.c | 9 +- + fs/ext4/crypto.c | 9 + + fs/ext4/inode.c | 6 + + fs/fuse/readdir.c | 12 +- + fs/gfs2/super.c | 8 +- + fs/gfs2/super.h | 4 + + fs/gfs2/sys.c | 6 +- + fs/lockd/svc.c | 50 +- + fs/nfs_common/nfsacl.c | 6 +- + fs/nfs_common/nfslocalio.c | 11 +- + fs/nfsd/Kconfig | 17 - + fs/nfsd/export.c | 22 +- + fs/nfsd/filecache.c | 26 +- + fs/nfsd/netns.h | 17 +- + fs/nfsd/nfs4callback.c | 10 +- + fs/nfsd/nfs4ctl.h | 8 +- + fs/nfsd/nfs4layouts.c | 113 ++- + fs/nfsd/nfs4proc.c | 16 +- + fs/nfsd/nfs4recover.c | 1021 +------------------- + fs/nfsd/nfs4state.c | 63 +- + fs/nfsd/nfs4xdr.c | 23 +- + fs/nfsd/nfsctl.c | 205 ++-- + fs/nfsd/nfsd.h | 4 +- + fs/nfsd/nfssvc.c | 147 ++- + fs/nfsd/pnfs.h | 5 + + fs/nfsd/state.h | 11 +- + fs/nfsd/trace.h | 19 - + fs/nfsd/vfs.c | 67 +- + fs/nfsd/vfs.h | 3 +- + fs/notify/fanotify/fanotify.h | 2 +- + fs/notify/fsnotify.c | 2 +- + fs/ntfs/index.c | 41 +- + fs/ntfs/index.h | 1 + + fs/ntfs/inode.c | 38 +- + fs/ntfs/namei.c | 6 +- + fs/ntfs3/attrib.c | 191 ++-- + fs/ntfs3/dir.c | 68 +- + fs/ntfs3/file.c | 8 + + fs/ntfs3/frecord.c | 16 +- + fs/ntfs3/fslog.c | 35 +- + fs/ntfs3/fsntfs.c | 3 + + fs/ntfs3/index.c | 40 +- + fs/ntfs3/inode.c | 37 +- + fs/ntfs3/namei.c | 11 +- + fs/ntfs3/ntfs_fs.h | 5 +- + fs/ntfs3/record.c | 16 +- + fs/ntfs3/super.c | 44 +- + fs/ntfs3/xattr.c | 44 +- + fs/quota/dquot.c | 10 +- + fs/smb/client/cached_dir.c | 30 +- + fs/smb/client/cifsacl.c | 9 +- + fs/smb/client/cifsfs.c | 20 +- + fs/smb/client/cifsglob.h | 2 + + fs/smb/client/cifssmb.c | 66 +- + fs/smb/client/connect.c | 33 +- + fs/smb/client/smb2misc.c | 16 + + fs/smb/client/smb2ops.c | 30 +- + fs/smb/client/smb2pdu.c | 46 +- + fs/smb/client/trace.h | 1 + + fs/smb/client/transport.c | 2 + + fs/smb/server/mgmt/user_session.c | 134 ++- + fs/smb/server/mgmt/user_session.h | 18 + + fs/smb/server/misc.c | 8 +- + fs/smb/server/smb2misc.c | 8 + + fs/smb/server/smb2pdu.c | 568 +++++++---- + fs/smb/server/transport_ipc.c | 45 +- + fs/smb/server/transport_ipc.h | 14 +- + fs/smb/server/transport_tcp.c | 11 +- + fs/smb/server/vfs.c | 9 +- + fs/smb/server/vfs_cache.c | 60 +- + fs/smb/server/vfs_cache.h | 2 + + fs/smb/smbdirect/rw.c | 1 - + fs/udf/inode.c | 5 + + fs/udf/super.c | 14 +- + fs/xfs/scrub/stats.c | 3 +- + fs/xfs/scrub/tempfile.c | 3 +- + include/linux/ceph/ceph_features.h | 14 +- + include/linux/ceph/ceph_fs.h | 6 + + include/linux/fsnotify.h | 4 +- + include/linux/fsnotify_backend.h | 6 +- + include/linux/nfsacl.h | 5 +- + include/linux/quotaops.h | 5 + + include/linux/sunrpc/svc.h | 3 + + include/linux/sunrpc/svc_rdma.h | 4 + + include/net/9p/9p.h | 4 +- + include/net/9p/client.h | 14 +- + include/trace/events/ntfs3.h | 389 ++++++++ + include/uapi/linux/btrfs.h | 10 + + net/9p/Kconfig | 10 + + net/9p/client.c | 3 + + net/9p/protocol.c | 12 +- + net/9p/trans_fd.c | 109 ++- + net/9p/trans_rdma.c | 2 +- + net/9p/trans_usbg.c | 101 +- + net/9p/trans_virtio.c | 5 + + net/9p/trans_xen.c | 79 +- + net/ceph/messenger_v1.c | 8 +- + net/ceph/mon_client.c | 5 +- + net/ceph/osd_client.c | 13 +- + net/ceph/osdmap.c | 18 +- + net/ceph/pagevec.c | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 3 + + net/sunrpc/svc_xprt.c | 16 +- + net/sunrpc/svcauth_unix.c | 8 +- + net/sunrpc/svcsock.c | 2 - + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 10 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 18 + + net/sunrpc/xprtrdma/svc_rdma_rw.c | 32 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 48 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 + + tools/testing/selftests/nfsd/.gitignore | 3 + + tools/testing/selftests/nfsd/Makefile | 3 + + tools/testing/selftests/nfsd/config | 6 + + tools/testing/selftests/nfsd/nfsd_lockd_netlink.c | 268 +++++ + tools/testing/selftests/nfsd/nfsd_netlink.h | 379 ++++++++ + .../testing/selftests/nfsd/nfsd_netlink_listener.c | 303 +----- + .../testing/selftests/nfsd/nfsd_netns_isolation.c | 468 +++++++++ + tools/testing/selftests/nfsd/nfsd_netns_stress.c | 572 +++++++++++ + tools/testing/selftests/nfsd/settings | 2 +- + 182 files changed, 5787 insertions(+), 2820 deletions(-) + create mode 100644 include/trace/events/ntfs3.h + create mode 100644 tools/testing/selftests/nfsd/nfsd_lockd_netlink.c + create mode 100644 tools/testing/selftests/nfsd/nfsd_netlink.h + create mode 100644 tools/testing/selftests/nfsd/nfsd_netns_isolation.c + create mode 100644 tools/testing/selftests/nfsd/nfsd_netns_stress.c +Merging printk/for-next (647ef123d1969 Merge branch 'for-7.5-trivial' 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +++ + kernel/printk/printk_ringbuffer.c | 16 +++++++--------- + 2 files changed, 10 insertions(+), 9 deletions(-) +Merging pci/next (17bb0e2f6c804 Merge tag 'pci-v7.4-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (7c756181175d5 pstore: publish big_oops_buf after max_compressed_size) +$ 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 (720806515cb69 HID: vivaldi: avoid redundant feature report reads per usage) +$ 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. + drivers/hid/hid-roccat.c | 59 +++++++++++++++++--------- + drivers/hid/hid-vivaldi-common.c | 91 +++++++++++++++++----------------------- + 2 files changed, 79 insertions(+), 71 deletions(-) +Merging i2c/i2c/for-next (8cd9520d35a6c Linux 7.1) +$ 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 +Already up to date. +$ git am -3 ../patches/0001-i2c-Fix-up-the-rest-of-the-merge.patch +Applying: i2c: Fix up the rest of the merge +Using index info to reconstruct a base tree... +M drivers/i2c/i2c-core-base.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/i2c/i2c-core-base.c +No changes -- Patch already applied. +Merging i2c-andi/i2c/i2c-next (00fb8097ca5a4 Merge branch 'i2c/i2c' into i2c/i2c-next) +$ git merge -m Merge branch 'i2c/i2c-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-andi/i2c/i2c-next +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-hix5hd2.c | 6 +++++- + drivers/i2c/busses/i2c-mv64xxx.c | 13 +++++++++++-- + drivers/i2c/busses/i2c-omap.c | 2 +- + 3 files changed, 17 insertions(+), 4 deletions(-) +Merging i2c-rust/rust-i2c-next (e7755b5f29ccb rust: i2c: remove TryFrom<&Device> implementation for &I2cClient) +$ git merge -m Merge branch 'rust-i2c-next' of https://github.com/ikrtn/rust-for-linux i2c-rust/rust-i2c-next +Already up to date. +Merging i3c/i3c/next (fc5eb1b0631aa dt-bindings: i3c: Add Synaptics sl2610 i3c) +$ git merge -m Merge branch 'i3c/next' of https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (1afafbaf749d8 firmware/dmi: Include product_family info to modalias) +$ 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 (e1b3c2630d5b8 hwmon: (npcm750-pwm-fan) serialize PWM register updates) +$ 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 +Already up to date. +Merging jc_docs/docs-next (151235bf3d5d4 uaccess: fix some erroneous kerneldoc comments) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/core-api/mm-api.rst +Auto-merging tools/lib/python/kdoc/xforms_lists.py +CONFLICT (content): Merge conflict in tools/lib/python/kdoc/xforms_lists.py +Resolved 'tools/lib/python/kdoc/xforms_lists.py' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a033c6a99f424] Merge branch 'docs-next' of git://git.lwn.net/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/core-api/mm-api.rst | 3 + + Documentation/sphinx/kerneldoc.py | 3 +- + .../translations/pt_BR/admin-guide/LSM/index.rst | 53 +++ + .../translations/pt_BR/admin-guide/bootconfig.rst | 425 +++++++++++++++++++++ + .../translations/pt_BR/admin-guide/cputopology.rst | 105 +++++ + .../translations/pt_BR/admin-guide/efi-stub.rst | 102 +++++ + .../translations/pt_BR/admin-guide/features.rst | 3 + + .../pt_BR/admin-guide/hw-vuln/index.rst | 30 ++ + .../translations/pt_BR/admin-guide/index.rst | 34 +- + .../pt_BR/admin-guide/kernel-parameters.rst | 134 +++++++ + .../pt_BR/admin-guide/perf-security.rst | 328 ++++++++++++++++ + .../pt_BR/admin-guide/sysctl/index.rst | 108 ++++++ + .../translations/pt_BR/admin-guide/sysfs-rules.rst | 195 ++++++++++ + .../translations/pt_BR/process/debugging/index.rst | 10 +- + .../debugging/userspace_debugging_guide.rst | 297 ++++++++++++++ + include/linux/uaccess.h | 10 +- + tools/docs/test_doc_build.py | 120 ++++-- + tools/lib/python/kdoc/xforms_lists.py | 1 + + 19 files changed, 1900 insertions(+), 63 deletions(-) + create mode 100644 Documentation/translations/pt_BR/admin-guide/LSM/index.rst + create mode 100644 Documentation/translations/pt_BR/admin-guide/bootconfig.rst + create mode 100644 Documentation/translations/pt_BR/admin-guide/cputopology.rst + create mode 100644 Documentation/translations/pt_BR/admin-guide/efi-stub.rst + create mode 100644 Documentation/translations/pt_BR/admin-guide/features.rst + create mode 100644 Documentation/translations/pt_BR/admin-guide/hw-vuln/index.rst + create mode 100644 Documentation/translations/pt_BR/admin-guide/kernel-parameters.rst + create mode 100644 Documentation/translations/pt_BR/admin-guide/perf-security.rst + create mode 100644 Documentation/translations/pt_BR/admin-guide/sysctl/index.rst + create mode 100644 Documentation/translations/pt_BR/admin-guide/sysfs-rules.rst + create mode 100644 Documentation/translations/pt_BR/process/debugging/userspace_debugging_guide.rst +Merging v4l-dvb/next (27285b099fbc5 Revert "media: Don't hide I²C or SPI drivers by default") +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Already up to date. +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 (4785d7fc44de8 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 drivers/platform/x86/lenovo/ideapad-laptop.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/pm/intel_idle.rst | 12 ++-- + Documentation/power/runtime_pm.rst | 10 +-- + drivers/acpi/acpica/nsxfname.c | 1 + + drivers/acpi/battery.c | 12 ++-- + drivers/acpi/platform_profile.c | 82 +++++++++++++--------- + drivers/acpi/sysfs.c | 20 +++--- + drivers/acpi/utils.c | 41 +++++++++++ + drivers/cpufreq/cpufreq_stats.c | 4 ++ + drivers/cpufreq/intel_pstate.c | 2 + + drivers/idle/intel_idle.c | 9 ++- + drivers/platform/x86/lenovo/ideapad-laptop.c | 12 ++-- + .../intel/int340x_thermal/int3403_thermal.c | 3 +- + .../intel/int340x_thermal/int340x_thermal_zone.c | 6 +- + .../int340x_thermal/processor_thermal_device.c | 2 +- + drivers/thermal/thermal_sysfs.c | 8 +-- + drivers/thermal/thermal_trace.h | 4 +- + include/acpi/acpi_bus.h | 7 ++ + include/linux/pm_runtime.h | 6 +- + kernel/power/energy_model.c | 4 +- + kernel/power/suspend.c | 20 +++--- + .../selftests/thermal/intel/power_floor/Makefile | 12 ++-- + .../selftests/thermal/intel/workload_hint/Makefile | 12 ++-- + 22 files changed, 188 insertions(+), 101 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (81792daacfb41 cpufreq: loongson3: Replace IOCSR read/write with MMIO ones) +$ 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 (cee9395acd804 Linux 7.3-rc1) +$ 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 (9a222650d9e70 PM / devfreq: Fix governor_store() failing when device has no current governor) +$ git merge -m Merge branch 'devfreq-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Auto-merging drivers/devfreq/event/rockchip-dfi.c +Merge made by the 'ort' strategy. + drivers/devfreq/devfreq.c | 50 +++++++----------------------------- + drivers/devfreq/event/rockchip-dfi.c | 4 ++- + 2 files changed, 12 insertions(+), 42 deletions(-) +Merging pmdomain/next (6d318db9ffcb6 pmdomain: Merge branch dt into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Already up to date. +Merging opp/opp/linux-next (706081c6b9327 OPP: Fix the return value in dev_pm_opp_get_of_node() kernel-doc) +$ 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 +Already up to date. +Merging thermal/thermal/linux-next (2dc1f296b5754 thermal/drivers/rzg3e: Propagate reset assertion failure from suspend) +$ 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 (c3e8e9451e6f1 RDMA/irdma: Bound in-flight CQP ops across deferred completions) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/main (734bef548a96e Merge tag 'net-next-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (65ba8f34ec886 Merge tag 'xtensa-20261027' of https://github.com/jcmvbkbc/linux-xtensa) +$ 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 +Already up to date. +$ git am -3 ../patches/0001-perf-Fixup-for-btf_vlan-API-change.patch +Applying: perf: Fixup for btf_vlan() API change +Using index info to reconstruct a base tree... +M tools/perf/builtin-trace.c +M tools/perf/util/btf.c +Falling back to patching base and 3-way merge... +Auto-merging tools/perf/builtin-trace.c +No changes -- Patch already applied. +Merging ipsec-next/master (014d795c73837 idpf: fix kernel-doc parameter descriptions) +$ 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 (41de84543574f net/mlx5: IFC, Add capability bits for virtual LAG) +$ 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 (734bef548a96e Merge tag 'net-next-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-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 (a5e7d8e446af9 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) +$ 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 (1081a6ef8f1e0 Bluetooth: btintel: check FIPS status before firmware download) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging drivers/bluetooth/Kconfig +Merge made by the 'ort' strategy. + drivers/bluetooth/Kconfig | 2 +- + drivers/bluetooth/btintel.c | 66 ++++++++++++++++++++++++++++++++++++++-- + drivers/bluetooth/btintel.h | 10 ++++++ + drivers/bluetooth/btintel_pcie.c | 26 ++++++++++++++-- + drivers/bluetooth/btmtk.c | 8 +---- + drivers/bluetooth/btmtksdio.c | 8 ++--- + drivers/bluetooth/btmtkuart.c | 8 ++--- + 7 files changed, 104 insertions(+), 24 deletions(-) +Merging wireless-next/for-next (9b0be45d4d52f Merge tag 'wireless-next-2026-10-15' 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 (cd026e68fdbf8 Merge tag 'ath-next-20261012' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath) +$ 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 (3627924ed81fd wifi: iwlwifi: mld: include VI packets in low latency detection) +$ 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 (a6bfdfcc6711d ieee802154: allow legacy LLSEC ADD/DEL ops to pass strict validation) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Already up to date. +Merging wpan-staging/staging (a6bfdfcc6711d ieee802154: allow legacy LLSEC ADD/DEL ops to pass strict validation) +$ 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 (0ef71adafaa9b Merge tag 'spi-nor/for-7.4' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (30daaf3e7897b mtd: spinand: heyangtek: Reserve both bad block marker bytes) +$ git merge -m Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (d7040c620d8b2 mtd: spi-nor: sfdp: reduce stack usage in spi_nor_parse_sfdp()) +$ 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 (178aff4cf425b crypto: atmel-tdes - consolidate error paths in atmel_tdes_dma_init()) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging libcrypto/libcrypto-next (20ec6916d8712 lib/crypto: md5: remove unused header) +$ git merge -m Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Already up to date. +Merging drm/drm-next (f94ed3d7cba3c Merge tag 'amd-drm-next-fixes-7.4-2026-10-28' of https://gitlab.freedesktop.org/drm/amdgpu/kernel into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/display/dc/link/link_dpms.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f8991d61fac7d] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 19 ++ + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12_1.c | 44 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 105 ++++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 24 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 28 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 33 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 12 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 10 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/si.c | 10 + + drivers/gpu/drm/amd/amdgpu/vi.c | 10 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 48 +++-- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 35 +++- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 9 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 9 + + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 23 ++- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 9 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 30 ++- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 23 ++- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 60 +++--- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 36 +++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 +- + .../amd/display/amdgpu_dm/amdgpu_dm_connector.c | 9 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 24 ++- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 17 +- + drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h | 4 +- + .../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 2 +- + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 2 + + .../amd/display/dc/link/hwss/link_hwss_hpo_frl.c | 3 + + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 2 + + .../amd/display/dc/link/protocols/link_hdmi_frl.c | 129 +++++++++--- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 3 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 103 +++++++++ + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 33 ++- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 2 + + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 33 ++- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 101 ++++++++- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 8 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v15_0_8_pmfw.h | 12 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v15_0_8_ppsmc.h | 5 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 4 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v15_0.h | 1 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 200 +++++++++++++----- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 199 +++++++++++++----- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 229 ++++++++++++++++----- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c | 157 +++++++++++++- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.h | 4 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 26 +++ + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 2 + + drivers/gpu/drm/panthor/panthor_mmu.c | 45 ++-- + 68 files changed, 1611 insertions(+), 467 deletions(-) +$ git am -3 ../patches/0001-drm-Fix-sanitizers.patch +Applying: drm: Fix sanitizers +Using index info to reconstruct a base tree... +M drivers/gpu/drm/amd/display/dc/dml/Makefile +M drivers/gpu/drm/amd/display/dc/dml2_0/Makefile +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +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 (9a96e169c9267 drm/panthor: Move cache-flush after UPDATE(UNMAPPED)) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (a24121023a434 drm/radeon: retry UVD v1 init on failure after resume) + 06ff8ce77726b ("drm/amdkfd: wait for a GPU reset before freeing a BO") + 0f862d8774161 ("drm/amdkfd: Fix svm_bo use after free in svm_range_clone") + 138cfb165ae6a ("drm/amdgpu/gmc9: add extra type-2 TLB flush for gfx942/gfx950") + 1903c3389c81b ("drm/amd/display: Fix HDMI FRL FFE compliance test") + 1a039805354a4 ("drm/amdgpu: require _PR3 for BOCO") + 1b63bb397db20 ("drm/amd/pm:restate all customized OD features on every table upload for smu 13.0.0/smu 14.0.2") + 1ddc4bc97a62f ("drm/amd/display: Fix swap in median3() for DSC rate control") + 1ee4f4a88e9c0 ("drm/amd/pm: Update smu_v15_0_8 PMFW headers") + 266fab8313960 ("drm/amdkfd: stop restore retries on device unplug") + 26b68a5702421 ("drm/amdgpu: fix the error path in amdgpu_vm_pt_alloc()") + 378e096423269 ("drm/amd/display: Adjust HDMI FRL LT timeout") + 3ad55d18f468f ("drm/amdgpu: guard VCE/UVD sched entity teardown on failed probe") + 4d79c9e3c32c6 ("drm/amdkfd: evict the queues only once for CRIU PROCESS_INFO") + 4e27ba5ad5f76 ("drm/amdkfd: fix doorbell allocation race creating duplicate allocations") + 59ef9a4354997 ("drm/amd/display: take a runtime PM reference only when a CRTC turns on") + 5ee0ab19c2c0e ("drm/amdgpu: wake the GPU for INFO queries that access the hardware") + 60dd16ae10f28 ("drm/amdgpu: reset SI ASIC on MacBookPros with VRAM at 0") + 65d4256d3cf01 ("drm/amd/pm: Add set_npm_limit function") + 6bb4b79d6a6c4 ("drm/amdgpu: reset CIK ASIC on Apple boards with VRAM at 0") + 732a165000944 ("drm/amd/display: refresh cached HDMI FreeSync state") + 75d753ed4704d ("drm/amdgpu: reject ANONONLY userptrs that span multiple VMAs") + 77f5f4eae104a ("drm/amdkfd: send SMI process and VM fault events only to allowed clients") + 7ca6f3359b557 ("drm/amdkfd: split vram_pages of SVM ranges prefetched without a GPU mapping") + 8297e1c724733 ("drm/amd/display: Poll passive DVI sinks for EDID readiness") + 836f44ba87ed7 ("drm/amdkfd: tear down KFD processes before early fini_sw on disconnect") + 88a27f624dc0e ("drm/amd/display: don't WARN when removing an unallocated MST payload") + 894cbb31c50e3 ("drm/amdkfd: correct vram_available calculation") + 8b810d7825aa9 ("drm/amd/pm: Notify node unload during driver unload") + 8d4ce79aff1cd ("drm/amd/pm: preserve committed OD features for SMU 14.0.2") + 92249023caee1 ("drm/amdkfd: Validate the control stack of a restored queue") + 94b2c5b06d37a ("drm/amdkfd: fix NULL deref in SDMA HQD debugfs dump on GC 12.1") + 9a08122e6361e ("drm/amdkfd: don't drop an SVM CWSR reference that was never taken") + 9bee41d32a36f ("drm/amd/pm: Add store npm limit function") + 9ec91b35baba4 ("drm/amdgpu: wait for pending page table updates before switching a VM to CPU updates") + a925a168ba7e8 ("drm/amdgpu: Reject UALink source-identification address mode") + ad8d216e7d9fc ("drm/amd/display: Initialize missing TD-LUT programming inputs") + adf63026e1fa7 ("drm/amd/pm: preserve committed OD features for SMU 13.0.0/13.0.7") + b8257bdb26ca5 ("amdkfd: Fix memory availability double accounting of kfd pinned objects") + c2335b685b1e1 ("drm/amdgpu: reset VI ASIC on Apple boards with VRAM at 0") + d76b655c98e8c ("drm/amdkfd: validate SRAT subtables before parsing") + dab5f52804060 ("drm/amdgpu: reject CS chunks too large for kvmalloc()") + df4d6d404d44b ("drm/amdgpu: drop the gang leader reference when freeing gang jobs") + e2bd5d908a892 ("drm/amd/display: Cap DSC bpp for USB4 DP tunnels") + e419e52cad769 ("drm/amdgpu: skip the PASID TLB fence for the UALink NPA VM") + f1be774d6d012 ("drm/amdgpu: Enable remote TLB shootdown") + f6d97ecb68b86 ("drm/amdgpu: re-enable GFXOFF for compute on GFX12") + f918ad983d61e ("drm/amd/pm: Add NPM metrics reads and SetNpmLimit") + fd0699fc9f426 ("drm/amd/pm: reapply umd profile state after recovery") +$ 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.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12_1.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging 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/display/amdgpu_dm/amdgpu_dm_connector.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn4_calcs.c +Auto-merging drivers/gpu/drm/amd/display/dc/link/link_dpms.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +Recorded preimage for 'drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c'. +[master 0575e86c31a9b] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 12 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c | 12 - + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12_1.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 24 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 180 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 201 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 150 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 88 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 17 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_seq64.c | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 16 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 98 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 143 +-- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 43 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 3 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 42 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 7 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 12 + + drivers/gpu/drm/amd/amdgpu/mes_v12_1.c | 8 + + drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 359 +++---- + drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 253 +++-- + drivers/gpu/drm/amd/amdgpu/nbio_v6_3_2.c | 316 +++--- + drivers/gpu/drm/amd/amdgpu/nbio_v7_11_4.c | 452 +++++++++ + drivers/gpu/drm/amd/amdgpu/nbio_v7_11_4.h | 32 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_11_5.c | 250 +++-- + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 373 +++---- + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 39 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 16 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v12_1.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 78 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 7 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 7 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c | 47 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 47 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 +- + drivers/gpu/drm/amd/amdkfd/soc15_int.h | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 122 ++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 22 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 4 + + .../amd/display/amdgpu_dm/amdgpu_dm_connector.c | 54 +- + .../amd/display/amdgpu_dm/amdgpu_dm_connector.h | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 12 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 70 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c | 5 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c | 43 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 7 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 6 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 5 +- + .../display/amdgpu_dm/tests/amdgpu_dm_audio_test.c | 84 +- + .../amdgpu_dm/tests/amdgpu_dm_backlight_test.c | 48 +- + .../display/amdgpu_dm/tests/amdgpu_dm_color_test.c | 8 +- + .../amdgpu_dm/tests/amdgpu_dm_colorop_test.c | 2 +- + .../amdgpu_dm/tests/amdgpu_dm_connector_test.c | 80 +- + .../display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c | 248 +++-- + .../display/amdgpu_dm/tests/amdgpu_dm_dmub_test.c | 168 +-- + .../amdgpu_dm/tests/amdgpu_dm_freesync_test.c | 79 +- + .../display/amdgpu_dm/tests/amdgpu_dm_hdcp_test.c | 4 +- + .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 20 +- + .../display/amdgpu_dm/tests/amdgpu_dm_irq_test.c | 373 ++++--- + .../amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c | 2 +- + .../amdgpu_dm/tests/amdgpu_dm_mst_types_test.c | 12 +- + .../amdgpu_dm/tests/amdgpu_dm_quirks_test.c | 6 +- + .../amd/display/amdgpu_dm/tests/amdgpu_dm_test.c | 30 +- + drivers/gpu/drm/amd/display/dc/Makefile | 8 + + .../drm/amd/display/dc/bls_builder/bls_builder.c | 21 + + .../drm/amd/display/dc/bls_builder/bls_builder.h | 98 ++ + .../display/dc/bls_builder/bls_builder_internal.h | 11 + + .../dc/bls_builder/bls_builder_legacy_init.h | 128 +++ + .../display/dc/bls_builder/dcn401_init_builder.c | 413 ++++++++ + .../display/dc/bls_builder/dcn401_init_builder.h | 42 + + .../dc/bls_builder/dcn401_init_builder_legacy.c | 1071 ++++++++++++++++++++ + .../dc/bls_builder/dcn401_init_builder_legacy.h | 18 + + .../gpu/drm/amd/display/dc/bls_builder/dmub_abi.h | 13 + + .../drm/amd/display/dc/bls_executor/bls_executor.c | 703 +++++++++++++ + .../drm/amd/display/dc/bls_executor/bls_executor.h | 21 + + .../amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c | 2 - + drivers/gpu/drm/amd/display/dc/core/dc.c | 216 +++- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 105 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 19 - + .../drm/amd/display/dc/core/dc_resource_helper.c | 46 + + .../gpu/drm/amd/display/dc/core2/dc_core2_init.c | 78 +- + .../amd/display/dc/core2/dc_core2_legacy_init.c | 236 +++++ + .../amd/display/dc/core2/dc_core2_legacy_init.h | 17 + + drivers/gpu/drm/amd/display/dc/dc.h | 35 +- + .../drm/amd/display/dc/dc_api_dispatch/api_shim.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 17 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 11 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_fused_io.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 - + drivers/gpu/drm/amd/display/dc/dc_memory_pool.c | 1 + + drivers/gpu/drm/amd/display/dc/dc_memory_pool.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 22 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 + + .../drm/amd/display/dc/dccg/dcn314/dcn314_dccg.c | 4 +- + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c | 21 +- + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h | 3 +- + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c | 2 +- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 173 ++++ + .../dc/dio/dcn401/dcn401_dio_link_encoder.c | 22 +- + .../dc/dio/dcn401/dcn401_dio_link_encoder.h | 8 + + .../dml2_0/dml21/inc/bounding_boxes/dcn42_soc_bb.h | 8 +- + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 7 +- + .../src/dml2_core/dml2_core_dcn5_calcs_dchub.c | 5 +- + .../src/dml2_core/dml2_core_dcn6_calcs_dchub.c | 17 +- + .../dml2_core_dcn6_funcs_mode_programming.c | 4 +- + .../dml2_core/dml2_core_dcn6_funcs_mode_support.c | 3 +- + .../dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 20 +- + .../dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_dcn5.c | 13 +- + .../dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn6.c | 2 +- + .../dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn6.h | 1 + + .../src/dml2_pmo/dml2_pmo_dcn6_stage_optimizers.c | 99 +- + .../alternate_pstate_shared_lib.c | 11 +- + .../dml21/src/inc/dml2_internal_shared_types.h | 2 +- + .../dml21_wrapper/dml21_translation_helper.c | 11 +- + .../amd/display/dc/dmub_messenger/dmub_messenger.c | 81 ++ + .../amd/display/dc/dmub_messenger/dmub_messenger.h | 55 + + .../gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp.c | 4 +- + .../gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp.h | 3 +- + .../gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.c | 4 +- + .../gpu/drm/amd/display/dc/dpp/dcn201/dcn201_dpp.c | 4 +- + .../gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c | 76 +- + .../gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.h | 9 +- + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.c | 4 +- + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h | 11 +- + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 48 +- + .../gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.c | 4 +- + .../gpu/drm/amd/display/dc/dpp/dcn50/dcn50_dpp.c | 4 +- + .../gpu/drm/amd/display/dc/dpp/dcn50/dcn50_dpp.h | 3 +- + .../gpu/drm/amd/display/dc/dpp/dcn60/dcn60_dpp.c | 55 +- + .../gpu/drm/amd/display/dc/dpp/dcn60/dcn60_dpp.h | 16 +- + .../drm/amd/display/dc/dpp/dcn60/dcn60_dpp_dscl.c | 20 +- + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 19 + + .../drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c | 9 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 68 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 28 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 30 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 21 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 20 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.h | 2 + + .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 7 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 24 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 2 + + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 50 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 5 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 4 + + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 6 +- + .../gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn50/dcn50_hwseq.c | 3 +- + .../drm/amd/display/dc/hwss/dcn60/dcn60_hwseq.c | 4 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 236 ++++- + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 13 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 7 + + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 3 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 1 + + .../amd/display/dc/link/accessories/link_dp_cts.c | 19 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 6 +- + .../gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c | 2 + + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 2 +- + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h | 5 + + .../gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c | 10 +- + .../gpu/drm/amd/display/dc/mpc/dcn60/dcn60_mpc.c | 2 +- + drivers/gpu/drm/amd/display/dc/os_types.h | 1 - + .../display/dc/resource/dcn401/dcn401_resource.c | 10 +- + .../amd/display/dc/resource/dcn42/dcn42_resource.c | 9 +- + .../display/dc/resource/dcn42/dcn42_resource_fpu.c | 22 - + .../display/dc/resource/dcn42/dcn42_resource_fpu.h | 1 - + .../amd/display/dc/resource/dcn60/dcn60_resource.h | 6 + + drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c | 59 +- + .../dc/workaround_manager/workaround_manager.c | 74 ++ + .../dc/workaround_manager/workaround_manager.h | 46 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 45 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.c | 7 + + .../amd/display/include/gpio_service_interface.h | 6 + + .../drm/amd/display/modules/inc/mod_info_packet.h | 5 + + .../amd/display/modules/info_packet/info_packet.c | 38 +- + .../drm/amd/include/asic_reg/gc/gc_11_0_0_offset.h | 4 + + .../amd/include/asic_reg/gc/gc_11_0_0_sh_mask.h | 54 + + .../amd/include/asic_reg/nbif/nbif_4_10_0_offset.h | 103 ++ + .../include/asic_reg/nbif/nbif_4_10_0_sh_mask.h | 573 +++++++++++ + drivers/gpu/drm/amd/include/cgs_common.h | 74 +- + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 10 + + drivers/gpu/drm/amd/include/mes_v12_api_def.h | 3 + + drivers/gpu/drm/amd/include/v12_structs.h | 133 +++ + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 6 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 6 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 95 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 11 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 35 +- + drivers/gpu/drm/amd/ras/core/aca_v1_0.c | 7 + + drivers/gpu/drm/amd/ras/core/eeprom.c | 2 +- + drivers/gpu/drm/amd/ras/core/ras.h | 3 +- + drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.c | 48 +- + drivers/gpu/drm/amd/ras/core/ras_psp.c | 40 +- + drivers/gpu/drm/amd/ras/core/ras_psp.h | 3 + + drivers/gpu/drm/amd/ras/core/ras_psp_v13_0.c | 14 +- + drivers/gpu/drm/amd/ras/core/ras_umc.c | 9 +- + drivers/gpu/drm/amd/ras/core/ta_if.h | 1 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c | 3 + + drivers/gpu/drm/amd/ras/ras_mgr/ras_sys.h | 6 + + drivers/gpu/drm/radeon/evergreen.c | 14 + + drivers/gpu/drm/radeon/si.c | 14 + + drivers/gpu/drm/radeon/sid.h | 2 + + drivers/gpu/drm/radeon/uvd_v1_0.c | 52 +- + drivers/gpu/drm/radeon/vce_v1_0.c | 9 + + include/uapi/linux/kfd_ioctl.h | 3 +- + 264 files changed, 9225 insertions(+), 2682 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11_4.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11_4.h + create mode 100644 drivers/gpu/drm/amd/display/dc/bls_builder/bls_builder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/bls_builder/bls_builder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/bls_builder/bls_builder_internal.h + create mode 100644 drivers/gpu/drm/amd/display/dc/bls_builder/bls_builder_legacy_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_init_builder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_init_builder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_init_builder_legacy.c + create mode 100644 drivers/gpu/drm/amd/display/dc/bls_builder/dcn401_init_builder_legacy.h + create mode 100644 drivers/gpu/drm/amd/display/dc/bls_builder/dmub_abi.h + create mode 100644 drivers/gpu/drm/amd/display/dc/bls_executor/bls_executor.c + create mode 100644 drivers/gpu/drm/amd/display/dc/bls_executor/bls_executor.h + create mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_resource_helper.c + create mode 100644 drivers/gpu/drm/amd/display/dc/core2/dc_core2_legacy_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/core2/dc_core2_legacy_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dmub_messenger/dmub_messenger.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dmub_messenger/dmub_messenger.h + create mode 100644 drivers/gpu/drm/amd/display/dc/workaround_manager/workaround_manager.c + create mode 100644 drivers/gpu/drm/amd/display/dc/workaround_manager/workaround_manager.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbif/nbif_4_10_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbif/nbif_4_10_0_sh_mask.h +$ git am -3 ../patches/0001-amdgpu-Yet-more-cherry-picking-fun.patch +Applying: amdgpu: Yet more cherry picking fun +Using index info to reconstruct a base tree... +M drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging drm-intel/for-linux-next (1b15fa434b4b4 Merge tag 'drm-misc-next-2026-10-02' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Already up to date. +Merging drm-msm/msm-next (d024361c631b3 drm/msm/a6xx: Split out a7xx/a8xx device tables) +$ 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 (6b93e8b453fa2 drm/msm/dpu: round up the compressed INTF width) +$ 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 (d9b01b2d88eb9 drm/xe/cri: Add new PCI ID) +$ 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/xe/Kconfig +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/display/xe_fb_pin.c +Auto-merging drivers/gpu/drm/xe/xe_amc.c +Auto-merging drivers/gpu/drm/xe/xe_bo.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_device_types.h +Auto-merging drivers/gpu/drm/xe/xe_ggtt.c +Auto-merging drivers/gpu/drm/xe/xe_guc.c +Auto-merging drivers/gpu/drm/xe/xe_guc_ct.c +Auto-merging drivers/gpu/drm/xe/xe_guc_log.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_log.c +Auto-merging drivers/gpu/drm/xe/xe_lrc.c +Auto-merging drivers/gpu/drm/xe/xe_mmio.c +Auto-merging drivers/gpu/drm/xe/xe_oa.c +Auto-merging drivers/gpu/drm/xe/xe_pci.c +Auto-merging drivers/gpu/drm/xe/xe_pt.c +Auto-merging drivers/gpu/drm/xe/xe_sysctrl_mailbox.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_sysctrl_mailbox.c +Auto-merging drivers/gpu/drm/xe/xe_tuning.c +Auto-merging drivers/gpu/drm/xe/xe_uc_fw.c +Auto-merging drivers/gpu/drm/xe/xe_vm.c +Auto-merging drivers/mtd/devices/mtd_intel_dg.c +Resolved 'drivers/gpu/drm/xe/xe_guc_log.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_sysctrl_mailbox.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 809a6f6cb3632] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/xe/xe_device.rst | 2 +- + drivers/gpu/drm/xe/Kconfig | 15 + + drivers/gpu/drm/xe/Kconfig.profile | 12 + + drivers/gpu/drm/xe/Makefile | 2 + + drivers/gpu/drm/xe/abi/xe_log_abi.h | 3 + + drivers/gpu/drm/xe/abi/xe_sigid_abi.h | 16 +- + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 7 +- + drivers/gpu/drm/xe/regs/xe_lrc_layout.h | 3 + + drivers/gpu/drm/xe/regs/xe_pcode_regs.h | 4 + + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 89 +++ + .../gpu/drm/xe/tests/xe_gt_sriov_pf_config_kunit.c | 5 + + drivers/gpu/drm/xe/tests/xe_guc_id_mgr_test.c | 689 +++++++++++++++++++-- + drivers/gpu/drm/xe/tests/xe_kunit_helpers.c | 3 +- + drivers/gpu/drm/xe/tests/xe_migrate.c | 302 +++++++++ + drivers/gpu/drm/xe/xe_amc.c | 11 +- + drivers/gpu/drm/xe/xe_bo.c | 152 ++++- + drivers/gpu/drm/xe/xe_bo_types.h | 8 +- + drivers/gpu/drm/xe/xe_configfs.h | 2 +- + drivers/gpu/drm/xe/xe_debugfs.c | 70 +-- + drivers/gpu/drm/xe/xe_devcoredump.c | 4 +- + drivers/gpu/drm/xe/xe_device.c | 255 ++------ + drivers/gpu/drm/xe/xe_device.h | 16 +- + drivers/gpu/drm/xe/xe_device_sysfs.c | 50 ++ + drivers/gpu/drm/xe/xe_device_types.h | 43 +- + drivers/gpu/drm/xe/xe_device_wa_oob.rules | 1 - + drivers/gpu/drm/xe/xe_drm_ras.c | 33 +- + drivers/gpu/drm/xe/xe_drm_ras_types.h | 3 - + drivers/gpu/drm/xe/xe_execlist.c | 6 +- + drivers/gpu/drm/xe/xe_ggtt.c | 9 +- + drivers/gpu/drm/xe/xe_gpu_scheduler_types.h | 5 +- + drivers/gpu/drm/xe/xe_gsc.c | 4 +- + drivers/gpu/drm/xe/xe_gt.c | 108 ++-- + drivers/gpu/drm/xe/xe_gt.h | 2 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 21 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 1 + + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 3 +- + drivers/gpu/drm/xe/xe_gt_types.h | 9 + + drivers/gpu/drm/xe/xe_guc.c | 49 +- + drivers/gpu/drm/xe/xe_guc.h | 2 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 355 +++++++---- + drivers/gpu/drm/xe/xe_guc_ct.h | 4 +- + drivers/gpu/drm/xe/xe_guc_ct_types.h | 3 + + drivers/gpu/drm/xe/xe_guc_exec_queue_types.h | 5 +- + drivers/gpu/drm/xe/xe_guc_id_mgr.c | 469 +++++++++++--- + drivers/gpu/drm/xe/xe_guc_id_mgr.h | 31 +- + drivers/gpu/drm/xe/xe_guc_log.c | 222 ++++++- + drivers/gpu/drm/xe/xe_guc_log.h | 11 +- + drivers/gpu/drm/xe/xe_guc_log_types.h | 20 + + drivers/gpu/drm/xe/xe_guc_pc.c | 11 +- + drivers/gpu/drm/xe/xe_guc_rc.c | 5 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 155 +++-- + drivers/gpu/drm/xe/xe_guc_submit.h | 2 +- + drivers/gpu/drm/xe/xe_guc_tlb_inval.c | 3 +- + drivers/gpu/drm/xe/xe_guc_types.h | 8 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 54 +- + drivers/gpu/drm/xe/xe_hw_error.c | 8 +- + drivers/gpu/drm/xe/xe_hwmon.c | 617 +++++++++++++----- + drivers/gpu/drm/xe/xe_irq.c | 3 + + drivers/gpu/drm/xe/xe_lmtt.c | 10 +- + drivers/gpu/drm/xe/xe_lrc.c | 12 +- + drivers/gpu/drm/xe/xe_memirq.c | 10 +- + drivers/gpu/drm/xe/xe_mert.c | 5 +- + drivers/gpu/drm/xe/xe_migrate.c | 173 +++++- + drivers/gpu/drm/xe/xe_mmio.c | 12 +- + drivers/gpu/drm/xe/xe_module.c | 24 +- + drivers/gpu/drm/xe/xe_nvm.c | 13 +- + drivers/gpu/drm/xe/xe_oa.c | 24 +- + drivers/gpu/drm/xe/xe_pat.c | 131 +++- + drivers/gpu/drm/xe/xe_pat.h | 29 +- + drivers/gpu/drm/xe/xe_pci.c | 14 +- + drivers/gpu/drm/xe/xe_pci_error.c | 13 +- + drivers/gpu/drm/xe/xe_pci_types.h | 2 + + drivers/gpu/drm/xe/xe_pcode_api.h | 2 - + drivers/gpu/drm/xe/xe_pt.c | 2 - + drivers/gpu/drm/xe/xe_ras.c | 323 +++++++++- + drivers/gpu/drm/xe/xe_ras.h | 5 +- + drivers/gpu/drm/xe/xe_ras_types.h | 85 +++ + drivers/gpu/drm/xe/xe_reg_sr.c | 11 +- + drivers/gpu/drm/xe/xe_shrinker.c | 218 +++++-- + drivers/gpu/drm/xe/xe_shrinker.h | 7 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 3 +- + drivers/gpu/drm/xe/xe_survivability_mode.c | 4 +- + drivers/gpu/drm/xe/xe_sysctrl_debugfs.c | 500 +++++++++++++++ + drivers/gpu/drm/xe/xe_sysctrl_debugfs.h | 14 + + drivers/gpu/drm/xe/xe_sysctrl_event.c | 14 +- + drivers/gpu/drm/xe/xe_sysctrl_mailbox.c | 140 +++-- + drivers/gpu/drm/xe/xe_sysctrl_mailbox.h | 6 +- + drivers/gpu/drm/xe/xe_sysctrl_mailbox_types.h | 43 ++ + drivers/gpu/drm/xe/xe_sysctrl_types.h | 47 ++ + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 68 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h | 6 +- + drivers/gpu/drm/xe/xe_tuning.c | 4 +- + drivers/gpu/drm/xe/xe_uc.c | 6 +- + drivers/gpu/drm/xe/xe_uc.h | 2 +- + drivers/gpu/drm/xe/xe_uc_fw.c | 16 +- + drivers/gpu/drm/xe/xe_validation.h | 2 + + drivers/gpu/drm/xe/xe_vm.c | 38 +- + drivers/gpu/drm/xe/xe_vm_madvise.c | 17 +- + drivers/gpu/drm/xe/xe_vram.c | 38 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 3 +- + drivers/gpu/drm/xe/xe_wedge.c | 262 ++++++++ + drivers/gpu/drm/xe/xe_wedge.h | 24 + + drivers/gpu/drm/xe/xe_wedge_types.h | 44 ++ + drivers/mtd/devices/mtd_intel_dg.c | 65 +- + include/drm/intel/pciids.h | 4 +- + include/linux/intel_dg_nvm_aux.h | 1 + + 106 files changed, 5228 insertions(+), 1273 deletions(-) + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_debugfs.c + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_debugfs.h + create mode 100644 drivers/gpu/drm/xe/xe_wedge.c + create mode 100644 drivers/gpu/drm/xe/xe_wedge.h + create mode 100644 drivers/gpu/drm/xe/xe_wedge_types.h +$ git am -3 ../patches/0001-drm-xe-Fix-up-merge-issue.patch +Applying: drm: xe: Fix up merge issue +Using index info to reconstruct a base tree... +M drivers/gpu/drm/xe/xe_ttm_vram_mgr.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/xe/xe_ttm_vram_mgr.c +No changes -- Patch already applied. +$ git am -3 ../patches/0001-drm-Fix-up-issue-with-duplicated-functions-coming-in.patch +Applying: drm: Fix up issue with duplicated functions coming in in my merge +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/xe/xe_bo.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 2d48c3017a480] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git + Date: Thu Oct 29 12:41:43 2026 +0000 +Merging drm-rust/for-linux-next (d511064b2e732 rust: drm: Remove unused flags argument from Registration::new()) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/for-linux-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. +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 (f93dd31db3e23 fbdev: vfb: Validate framebuffer geometry and memory size) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/tty/vt/vt.c | 11 +++---- + drivers/video/console/dummycon.c | 12 ++++++++ + drivers/video/console/newport_con.c | 24 +++++++++------- + drivers/video/console/sticon.c | 24 +++++++++------- + drivers/video/console/vgacon.c | 46 +++++++++++++++++------------- + drivers/video/fbdev/atmel_lcdfb.c | 13 +++++++-- + drivers/video/fbdev/core/fbcon.c | 57 +++++++++++++++++++++++++------------ + drivers/video/fbdev/vfb.c | 15 +++++++++- + include/linux/console.h | 10 +++++-- + 9 files changed, 141 insertions(+), 71 deletions(-) +$ 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 551145ee8c282] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git + Date: Thu Oct 29 12:41:47 2026 +0000 +Merging regmap/for-next (1ea2927c1bc3c regmap: irq: fix incorrect index calculation for read_sub_irq_data()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +$ git am -3 ../patches/0001-regmap-Fixup-mismerge.patch +Applying: regmap: Fixup mismerge +Using index info to reconstruct a base tree... +M drivers/base/regmap/regcache.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/base/regmap/regcache.c +No changes -- Patch already applied. +Merging sound/for-next (a4311e9447bbb ALSA: hda: Reject codec reset on ASoC (ext_ops) buses) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging ieee1394/for-next (32906613748b3 firewire: core: replace drain_workqueue() with flush_workqueue()) +$ 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. +Merging sound-asoc/for-next (bbe41586cdfa9 ASoC: imx-pcm-rpmsg: Flush pending work in hw_free) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (08abfa5a161e1 drivers: Replace __MODULE_STRING() with __stringify()) +$ git merge -m Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Already up to date. +Merging input/next (97a889cad5dd8 Input: synaptics - add LEN2072 to smbus_pnp_ids for ThinkPad P14s Gen 2i) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'ort' strategy. + drivers/input/evdev.c | 5 +- + drivers/input/keyboard/ep93xx_keypad.c | 8 +-- + drivers/input/keyboard/omap4-keypad.c | 8 +-- + drivers/input/misc/drv260x.c | 2 +- + drivers/input/misc/nxp-bbnsm-pwrkey.c | 15 ++--- + drivers/input/mouse/synaptics.c | 1 + + drivers/input/rmi4/rmi_f12.c | 20 ++++++- + drivers/input/touchscreen/s6sy761.c | 59 ++++++++++++++------ + drivers/input/touchscreen/ti_am335x_tsc.c | 93 +++++++++++++------------------ + 9 files changed, 112 insertions(+), 99 deletions(-) +Merging block/for-next (c3442b2bab850 Merge branch 'block-7.4' 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 block/fops.c +Merge made by the 'ort' strategy. + block/blk-cgroup.c | 39 +++++++++++---- + block/blk-cgroup.h | 6 +-- + block/blk-iocost.c | 8 ++-- + block/blk-iolatency.c | 6 ++- + block/blk-map.c | 1 + + block/blk-throttle.c | 28 +++++++++-- + block/fops.c | 5 +- + drivers/block/loop.c | 6 ++- + drivers/md/md.c | 72 +++++++++++++++++++--------- + drivers/md/md.h | 7 +++ + drivers/md/raid0.c | 16 +++++-- + drivers/md/raid1-10.c | 27 +++++++++++ + drivers/md/raid1.c | 42 +++------------- + drivers/md/raid10.c | 59 +++++------------------ + drivers/md/raid5-cache.c | 54 ++++++++++++++++----- + drivers/md/raid5-ppl.c | 12 ++++- + drivers/md/raid5.c | 106 ++++++++++++++++++++++++++++++----------- + drivers/md/raid5.h | 1 + + include/linux/cdrom.h | 1 - + include/linux/io_uring_types.h | 3 ++ + io_uring/bpf-ops.c | 16 ++++++- + io_uring/cancel.c | 20 ++++++++ + io_uring/io-wq.c | 14 ++++-- + io_uring/io_uring.c | 50 +++++++++++++++---- + io_uring/kbuf.c | 4 +- + io_uring/net.c | 16 ++++++- + io_uring/register.c | 7 +++ + io_uring/rsrc.c | 7 +-- + io_uring/sqpoll.c | 28 +++++++++-- + io_uring/sqpoll.h | 3 +- + io_uring/tctx.c | 9 ++-- + 31 files changed, 465 insertions(+), 208 deletions(-) +$ 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 746ad07915d30] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Thu Oct 29 12:41:59 2026 +0000 +Merging device-mapper/for-next (334714e4bdf88 dm-verity: clear LSM integrity state on suspend) +$ 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 +Already up to date. +Merging libata/for-next (69be770908ae5 ata: libata-sff: fix race between IRQ deferral and ata_sff_flush_pio_task()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Already up to date. +Merging pcmcia/pcmcia-next (b3c26ea81ccc5 pcmcia: remove obsolete host controller drivers) +$ 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 (fd9af27f6c231 dt-bindings: mmc: sun4i-a10-mmc: add Allwinner B288) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (c8132247fe4df dt-bindings: mfd: db8500-prcmu: Deprecate EPOD regulators) +$ 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 +Already up to date. +Merging backlight/for-backlight-next (eacfbe6f9716d backlight: qcom-wled: Read back the programmed brightness at probe) +$ 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 +Already up to date. +Merging battery/for-next (f0f400459bf6a power: supply: gpio-charger: Report discharging without input power) +$ 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 +Already up to date. +Merging regulator/for-next (ec255de3ff667 Merge regulator/for-7.3 into regulator-linus) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Already up to date. +Merging security/next (436485132d236 Automated merge of 'lsm/dev' into 'stable-7.4') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'apparmor-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (52beb95621c04 kexec: Select ima_get/free_kexec_buffer() with CONFIG_HAVE_IMA_KEXEC(_OF)) +$ 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 arch/arm64/Kconfig +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/x86/kernel/setup.c +Auto-merging drivers/of/kexec.c +Auto-merging kernel/Kconfig.kexec +Merge made by the 'ort' strategy. + arch/arm64/Kconfig | 2 +- + arch/loongarch/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/riscv/Kconfig | 2 +- + arch/x86/kernel/setup.c | 2 +- + drivers/of/kexec.c | 4 ++-- + kernel/Kconfig.kexec | 4 ++++ + 7 files changed, 11 insertions(+), 7 deletions(-) +Merging selinux/next (12802add29de8 Automated merge of 'dev' into 'next') +$ 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. +Merging smack/next (fedc88e38ce97 smack: fix cred UAF in smack_file_send_sigiotask()) +$ git merge -m Merge branch 'next' of https://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (72d3fcf802c45 Linux 7.3-rc5) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Already up to date. +Merging tpmdd-tpm/for-next-tpm (94d78ae4bcb5a tpm: Check return value of crypto_kpp_set_secret()) +$ git merge -m Merge branch 'for-next-tpm' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd-tpm/for-next-tpm +Merge made by the 'ort' strategy. + drivers/char/tpm/tpm2-sessions.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging tpmdd-keys/for-next-keys (9a2a4c51dccc3 KEYS: Verify the key identity in __key_unlink_begin) +$ git merge -m Merge branch 'for-next-keys' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd-keys/for-next-keys +Auto-merging fs/smb/client/cifsacl.c +Auto-merging include/linux/key.h +Merge made by the 'ort' strategy. + fs/smb/client/cifsacl.c | 6 +++--- + include/linux/key.h | 7 +++++-- + security/keys/key.c | 10 +++++++++- + security/keys/keyctl.c | 2 -- + security/keys/keyring.c | 13 ++++++++++++- + security/keys/request_key.c | 14 ++++++++++++-- + 6 files changed, 41 insertions(+), 11 deletions(-) +Merging watchdog/watchdog-next (6276c8195e598 watchdog: mediatek: Apply the driver's mode to a watchdog left running) +$ git merge -m Merge branch 'watchdog-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog/watchdog-next +Already up to date. +Merging iommu/next (20bfd25757659 Merge branches 'apple/dart', 'arm/smmu/updates', 'arm/smmu/bindings', 'hyper-v', 'samsung/exynos', 'riscv', 'broadcom', '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 +Already up to date. +Merging audit/next (b9e002df320f1 Automated merge of 'audit/dev' into 'stable-7.4') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (e8ff9af18e802 dt-bindings: usb: dwc3: Document ST STM32MP2 DWC3 xHCI USB controller) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging dt-krzk/for-next (dfcea1641506d Merge branches 'next/dt' 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-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. +Merging mailbox/for-next (01a40ad5a9687 mailbox: Use named initializers for acpi_device_id) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Already up to date. +Merging spi/for-next (7da2aca123754 spi: cs42l43: Add speaker ID quirk for Dell XPS 13 DX13260 SKU 0E54) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/master (304878ac70de5 Merge branch into tip/master: 'x86/misc') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/x86/kernel/setup.c +Merge made by the 'ort' strategy. + arch/x86/include/asm/apic.h | 11 ++++------- + arch/x86/kernel/apic/apic.c | 33 ++++++++++++++++++++++++++------- + arch/x86/kernel/apic/init.c | 32 ++++++++++++++++++++------------ + arch/x86/kernel/apic/local.h | 4 ++++ + arch/x86/kernel/apic/x2apic_phys.c | 9 ++------- + arch/x86/kernel/setup.c | 12 ++---------- + 6 files changed, 58 insertions(+), 43 deletions(-) +Merging kexec/kexec-next (833d2b79ed952 Merge branch 'kexec-7.4' into kexec-next) +$ git merge -m Merge branch 'kexec-next' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git kexec/kexec-next +Already up to date. +Merging liveupdate/next (27be83a12b246 Merge branch 'lu-pci-preservation' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git liveupdate/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/quirks.c +Auto-merging include/linux/pci.h +Merge made by the 'ort' strategy. + Documentation/PCI/index.rst | 1 + + Documentation/PCI/liveupdate.rst | 35 + + Documentation/admin-guide/kernel-parameters.txt | 7 +- + Documentation/core-api/liveupdate.rst | 5 + + MAINTAINERS | 15 + + drivers/pci/Kconfig | 15 + + drivers/pci/Makefile | 1 + + drivers/pci/liveupdate.c | 1015 +++++++++++++++++++++++ + drivers/pci/liveupdate.h | 62 ++ + drivers/pci/pci-driver.c | 9 +- + drivers/pci/pci.c | 79 +- + drivers/pci/pci.h | 5 + + drivers/pci/probe.c | 16 +- + drivers/pci/quirks.c | 58 +- + include/linux/kho/abi/pci.h | 66 ++ + include/linux/liveupdate.h | 22 + + include/linux/pci.h | 7 + + include/linux/pci_liveupdate.h | 72 ++ + kernel/liveupdate/luo_file.c | 84 ++ + kernel/liveupdate/luo_internal.h | 17 + + 20 files changed, 1552 insertions(+), 39 deletions(-) + create mode 100644 Documentation/PCI/liveupdate.rst + create mode 100644 drivers/pci/liveupdate.c + create mode 100644 drivers/pci/liveupdate.h + create mode 100644 include/linux/kho/abi/pci.h + create mode 100644 include/linux/pci_liveupdate.h +Merging clockevents/timers/drivers/next (c40b76c8cf580 clocksource/drivers/timer-ti-dm: Handle runtime resume failure) +$ 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 (0489f2176209b Merge ras/edac-urgent 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 +Merge made by the 'ort' strategy. +Merging ftrace/for-next (d7ff48d92a0f2 Merge trace/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 kernel/trace/trace_btf.h +CONFLICT (content): Merge conflict in kernel/trace/trace_btf.h +Resolved 'kernel/trace/trace_btf.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3654b49b82a25] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + +$ git am -3 ../patches/0001-ftrace-Fix-semantic-conflict-with-mm-tree.patch +Applying: ftrace: Fix semantic conflict with mm tree +Using index info to reconstruct a base tree... +M kernel/trace/trace_printk.c +Falling back to patching base and 3-way merge... +Auto-merging kernel/trace/trace_printk.c +No changes -- Patch already applied. +Merging rcu/next (d9011419496a3 Merge branches 'misc.2026.10.06a' and 'torture.2026.10.12a' into HEAD) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux rcu/next +Already up to date. +Merging paulmck/non-rcu/next (0bd14c956dd2e Merge branches 'cmpxchg-emu.2026.10.12a', 'csd-lock.2026.09.03a' and 'nmi.2026.10.14a' into HEAD) +$ 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 +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 ++++++ + arch/x86/kernel/nmi.c | 21 +++++++++++++++++++-- + 2 files changed, 25 insertions(+), 2 deletions(-) +Merging kvm/next (1689c80fca308 Merge tag 'kvmarm-fixes-7.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging MAINTAINERS +Auto-merging arch/riscv/kvm/mmu.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + arch/riscv/include/asm/kvm_vcpu_vector.h | 6 +- + arch/riscv/include/uapi/asm/kvm.h | 4 + + arch/riscv/kvm/Kconfig | 1 + + arch/riscv/kvm/aia_imsic.c | 149 +++++---------------- + arch/riscv/kvm/gstage.c | 6 +- + arch/riscv/kvm/isa.c | 8 ++ + arch/riscv/kvm/mmu.c | 47 +++++++ + arch/riscv/kvm/vcpu.c | 3 + + arch/riscv/kvm/vcpu_insn.c | 2 +- + arch/riscv/kvm/vcpu_sbi_replace.c | 12 +- + arch/riscv/kvm/vcpu_timer.c | 6 +- + arch/riscv/kvm/vm.c | 1 + + tools/testing/selftests/kvm/Makefile.kvm | 1 + + .../selftests/kvm/include/riscv/processor.h | 19 +++ + tools/testing/selftests/kvm/lib/riscv/processor.c | 109 +++++++++++++-- + tools/testing/selftests/kvm/riscv/get-reg-list.c | 16 +++ + 17 files changed, 251 insertions(+), 141 deletions(-) +$ git am -3 ../patches/kvm-x86-static-cpu-has +Applying: Signed-off-by: Mark Brown <broonie@kernel.org> +Using index info to reconstruct a base tree... +M arch/x86/kvm/msrs.c +Falling back to patching base and 3-way merge... +Auto-merging arch/x86/kvm/msrs.c +No changes -- Patch already applied. +Merging kvm-arm/next (dd0bc00e3e920 Merge branch kvm-arm64/cca-7.4 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 +Already up to date. +Merging kvms390/next (e93fb70b74898 arm64: Use proper include variant) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-ppc/topic/ppc-kvm (93f51579e7df2 Linux 7.3-rc4) +$ 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 (633b3931a8743 KVM: riscv: selftest: add Zicclsm, Ziccamoa, Ziccif, Za64rs) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Already up to date. +Merging kvm-x86/next (dea4f6380f4ec Merge branch 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging arch/x86/kvm/vmx/tdx.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. +$ git am -3 ../patches/0001-KVM-selftests-Fix-up-phy_pages_alloc-API-rework-inte.patch +Applying: KVM: selftests: Fix up phy_pages_alloc() API rework interaction +Using index info to reconstruct a base tree... +M tools/testing/selftests/kvm/arm64/vgic_its_save.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging xen-tip/linux-next (61b6d1df1d623 xen-blkfront: Fix IO race during unplug) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +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 (4b0f96d92b0b5 Merge branch 'for-7.5' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. + tools/workqueue/wq_dump.py | 84 ++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 81 insertions(+), 3 deletions(-) +Merging sched-ext/for-next (a96c41fea8dae Merge branch 'for-7.4-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/sched.h +Auto-merging tools/sched_ext/include/scx/common.bpf.h +Merge made by the 'ort' strategy. + include/linux/sched/ext.h | 22 +- + kernel/sched/ext/cid.c | 6 + + kernel/sched/ext/ext.c | 926 +++++++++++++++------ + kernel/sched/ext/inlines.h | 15 +- + kernel/sched/ext/internal.h | 90 +- + kernel/sched/ext/sub.c | 738 +++++++++++----- + kernel/sched/ext/sub.h | 26 +- + kernel/sched/sched.h | 24 +- + tools/sched_ext/include/scx/bpf_arena_common.bpf.h | 23 +- + tools/sched_ext/include/scx/common.bpf.h | 9 + + tools/sched_ext/include/scx/compat.bpf.h | 16 +- + tools/sched_ext/include/scx/compat.h | 10 +- + tools/sched_ext/include/scx/enum_defs.autogen.h | 12 + + tools/sched_ext/include/scx/enums.autogen.bpf.h | 21 +- + tools/sched_ext/include/scx/enums.autogen.h | 7 +- + tools/sched_ext/include/scx/enums_abi.autogen.h | 50 +- + tools/sched_ext/scx_flatcg.bpf.c | 5 - + tools/sched_ext/scx_qmap.bpf.c | 65 +- + tools/sched_ext/scx_qmap.c | 16 +- + tools/testing/selftests/sched_ext/Makefile | 1 + + .../selftests/sched_ext/class_switch_stall.bpf.c | 120 +++ + .../selftests/sched_ext/class_switch_stall.c | 245 ++++++ + 22 files changed, 1872 insertions(+), 575 deletions(-) + create mode 100644 tools/testing/selftests/sched_ext/class_switch_stall.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/class_switch_stall.c +Merging drivers-x86/for-next (9d34750651671 platform/x86: asus-wmi: name the TUF keyboard RGB state and speed codes) +$ 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 +Already up to date. +Merging chrome-platform/for-next (2d3ee0bdb321a platform/chrome: cros_ec_typec: Poll for role swap completion) +$ 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 +Already up to date. +Merging chrome-platform-firmware/for-firmware-next (f2e05ce9763fe firmware: coreboot: Add CFR firmware attributes driver) +$ 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 (e81250ec6b692 hsi: omap_ssi_core: fix missing DMA mask setup for SSI controller device) +$ 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 (59cf91cf87abb dt-bindings: leds: lacie,netxbig-leds: Convert 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 +Already up to date. +Merging ipmi/for-next (3cdd6cc1e9d85 ipmi: ssif: use 4-argument i2c_smbus_read_block_data()) +$ 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_ssif.c | 39 +++++++++++++++++++++------------------ + drivers/char/ipmi/ipmi_watchdog.c | 12 ++++++------ + 2 files changed, 27 insertions(+), 24 deletions(-) +Merging driver-core/driver-core-next (0cc3ad8f4d2e2 Merge tag 'driver-core-7.4-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core) +$ 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 +Already up to date. +Merging usb/usb-next (c339f4010dea8 Merge tag 'platform-drivers-x86-v7.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (a93a8e3200002 thunderbolt: stream: Make read return framing error to the userspace) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (d446199711161 USB: serial: mxuport: support RS485 mode configuration) +$ 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 +Already up to date. +Merging tty/tty-next (c339f4010dea8 Merge tag 'platform-drivers-x86-v7.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (c339f4010dea8 Merge tag 'platform-drivers-x86-v7.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) +$ 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 +Already up to date. +Merging coresight/next (343cfcbb3ecfd coresight: tnoc: Constify amba_id table) +$ 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 (ef071c4906eb4 Merge branches 'fastrpc-fixes' and 'fastrpc-for-7.4' into fastrpc-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Auto-merging drivers/misc/fastrpc.c +Merge made by the 'ort' strategy. +Merging fpga/for-next (093da48782df3 fpga: altera-cvp: Retry teardown and reset CVP state on failure) +$ 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 (3fd56a2833c22 Merge branch 'icc-misc' into icc-next) +$ 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 (a3b3580713f3a iio: dac: ad5758: Fix the offset calculation) +$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging nfc/for-next (fd73f4a665989 Linux 7.3-rc3) +$ git merge -m Merge branch 'for-next' of https://codeberg.org/linux-nfc/linux.git nfc/for-next +Already up to date. +Merging phy-next/next (8f56fdf3d8cb9 phy: tegra: Add support for Tegra238 XUSB pad controller) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (2e9eff8847a46 soundwire: intel_auxdevice: add rt766/rt767 codec to wake_capable_list) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (8d3ae59288f1e Linux 7.2) +$ git merge -m Merge branch 'extcon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (cee9395acd804 Linux 7.3-rc1) +$ 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 (076d7e989cb69 vfio/nvgrace-gpu: Drop the usemem length check in open_device) +$ git merge -m Merge branch 'next' of https://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (813a5b9a3c9f6 w1: fix spelling mistakes in comments across the subsystem) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Merge made by the 'ort' strategy. + drivers/w1/masters/ds2482.c | 2 +- + drivers/w1/masters/ds2490.c | 4 ++-- + drivers/w1/masters/omap_hdq.c | 2 +- + drivers/w1/slaves/w1_ds28e17.c | 2 +- + drivers/w1/slaves/w1_therm.c | 2 +- + drivers/w1/w1.c | 2 +- + drivers/w1/w1_family.c | 2 +- + drivers/w1/w1_netlink.h | 2 +- + 8 files changed, 9 insertions(+), 9 deletions(-) +Merging spmi/spmi-next (8f70c729e68c3 MAINTAINERS: Add Abel as SPMI co-maintainer) +$ 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 (d135ab453a740 Merge tag 'backlight-next-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight) +$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging counter-next/counter-next (edac5cf356994 MAINTAINERS: Mark ftm-quaddec driver as orphaned) +$ git merge -m Merge branch 'counter-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging mux/for-next (ac7bde3c53166 mux: Add driver for Renesas RZ/V2H VBENCTL VBUS_SEL mux) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Merge made by the 'ort' strategy. + drivers/mux/Kconfig | 13 ++++++++ + drivers/mux/Makefile | 2 ++ + drivers/mux/rzv2h-vbenctl.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 96 insertions(+) + create mode 100644 drivers/mux/rzv2h-vbenctl.c +Merging dmaengine/next (aff5e6a77fc69 dmaengine: amlogic: Fix regmap error check issue) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (94b1632f65101 Merge branch 'for-7.5' 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 +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 4 +- + kernel/cgroup/cgroup.c | 30 +- + kernel/cgroup/cpuset-internal.h | 6 + + kernel/cgroup/cpuset.c | 680 +++++++++++++--------- + tools/testing/selftests/cgroup/test_core.c | 36 +- + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 284 +++++++-- + tools/testing/selftests/cgroup/test_kill.c | 158 +++++ + 7 files changed, 863 insertions(+), 335 deletions(-) +Merging scsi/for-next (6a53f401e671b 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/infiniband/ulp/iser/iser_initiator.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/scsi/sg.c +Auto-merging include/linux/pci.h +Merge made by the 'ort' strategy. + Documentation/scsi/ufs.rst | 38 +++ + MAINTAINERS | 2 + + drivers/infiniband/ulp/iser/iser_initiator.c | 3 +- + drivers/scsi/Makefile | 25 +- + drivers/scsi/NCR5380.c | 19 +- + drivers/scsi/NCR5380.h | 5 +- + drivers/scsi/aacraid/Makefile | 2 + + drivers/scsi/aacraid/commctrl.c | 1 + + drivers/scsi/aacraid/commsup.c | 3 + + drivers/scsi/aha152x.c | 4 +- + drivers/scsi/aic7xxx/Makefile | 2 + + drivers/scsi/aic7xxx/aic79xx_osm.h | 2 + + drivers/scsi/aic7xxx/aic7xxx_osm.h | 2 + + drivers/scsi/aic94xx/Makefile | 2 + + drivers/scsi/arcmsr/Makefile | 2 + + drivers/scsi/be2iscsi/Makefile | 2 + + drivers/scsi/be2iscsi/be_main.c | 18 +- + drivers/scsi/bfa/Makefile | 3 + + drivers/scsi/bnx2fc/Makefile | 3 + + drivers/scsi/bnx2fc/bnx2fc.h | 9 +- + drivers/scsi/bnx2fc/bnx2fc_els.c | 27 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 15 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 +- + drivers/scsi/bnx2i/Makefile | 3 + + drivers/scsi/bnx2i/bnx2i_hwi.c | 45 +-- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 1 + + drivers/scsi/csiostor/Makefile | 2 + + drivers/scsi/csiostor/csio_attr.c | 4 +- + drivers/scsi/csiostor/csio_hw.c | 20 +- + drivers/scsi/csiostor/csio_lnode.c | 3 + + drivers/scsi/csiostor/csio_rnode.c | 9 +- + drivers/scsi/csiostor/csio_scsi.c | 42 +-- + drivers/scsi/csiostor/csio_scsi.h | 7 +- + drivers/scsi/cxgbi/Makefile | 3 + + drivers/scsi/cxgbi/libcxgbi.c | 13 +- + drivers/scsi/elx/Makefile | 1 + + drivers/scsi/esas2r/Makefile | 3 + + drivers/scsi/fcoe/Makefile | 3 + + drivers/scsi/fcoe/fcoe_ctlr.c | 50 ++- + drivers/scsi/fnic/Makefile | 3 + + drivers/scsi/fnic/fdls_disc.c | 57 +++- + drivers/scsi/fnic/fip.c | 2 + + drivers/scsi/fnic/fnic_fcs.c | 21 +- + drivers/scsi/fnic/fnic_fdls.h | 7 +- + drivers/scsi/fnic/fnic_scsi.c | 4 + + drivers/scsi/hisi_sas/Makefile | 3 + + drivers/scsi/hisi_sas/hisi_sas.h | 3 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 43 +++ + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 4 + + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 4 + + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 51 ++- + drivers/scsi/hpsa.c | 2 +- + drivers/scsi/ibmvscsi/Makefile | 3 + + drivers/scsi/ibmvscsi_tgt/Makefile | 3 + + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 34 +- + drivers/scsi/ipr.c | 46 +-- + drivers/scsi/ips.c | 1 + + drivers/scsi/isci/Makefile | 3 + + drivers/scsi/libfc/Makefile | 2 + + drivers/scsi/libfc/fc_disc.c | 7 +- + drivers/scsi/libfc/fc_exch.c | 6 + + drivers/scsi/libfc/fc_fcp.c | 17 +- + drivers/scsi/libiscsi.c | 258 ++++++++------- + drivers/scsi/libiscsi_tcp.c | 17 +- + drivers/scsi/libsas/Makefile | 2 + + drivers/scsi/libsas/sas_ata.c | 2 +- + drivers/scsi/libsas/sas_task.c | 2 +- + drivers/scsi/lpfc/lpfc_ct.c | 2 - + drivers/scsi/lpfc/lpfc_els.c | 82 +++-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 7 + + drivers/scsi/lpfc/lpfc_init.c | 16 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 31 +- + drivers/scsi/lpfc/lpfc_scsi.c | 1 + + drivers/scsi/lpfc/lpfc_sli.c | 10 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpt3sas/Makefile | 3 + + drivers/scsi/mvsas/Makefile | 2 + + drivers/scsi/mvsas/mv_sas.c | 7 + + drivers/scsi/pcmcia/Makefile | 2 + + drivers/scsi/pm8001/Makefile | 1 + + drivers/scsi/pm8001/pm80xx_hwi.c | 2 + + drivers/scsi/qedf/Makefile | 3 + + drivers/scsi/qedi/Makefile | 3 + + drivers/scsi/qedi/qedi_fw.c | 35 ++- + drivers/scsi/qla1280.c | 57 ++-- + drivers/scsi/qla2xxx/Makefile | 3 + + drivers/scsi/qla2xxx/qla_nx.c | 2 + + drivers/scsi/qla2xxx/qla_target.c | 29 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 1 + + drivers/scsi/qla4xxx/Makefile | 3 + + drivers/scsi/qla4xxx/ql4_isr.c | 8 +- + drivers/scsi/qla4xxx/ql4_nx.c | 2 + + drivers/scsi/scsi_debug.c | 448 +++++++++++++++++---------- + drivers/scsi/scsi_transport_iscsi.c | 1 + + drivers/scsi/sg.c | 1 + + drivers/scsi/smartpqi/Makefile | 3 + + drivers/scsi/smartpqi/smartpqi_init.c | 67 +++- + drivers/scsi/snic/Makefile | 3 + + drivers/scsi/st.c | 1 + + drivers/scsi/sym53c8xx_2/Makefile | 2 + + drivers/target/iscsi/Kconfig | 7 +- + drivers/target/iscsi/iscsi_target_auth.c | 192 +++++------- + drivers/target/iscsi/iscsi_target_auth.h | 8 +- + drivers/ufs/host/ufs-qcom.c | 4 +- + include/linux/pci.h | 5 +- + include/scsi/libiscsi.h | 23 +- + 107 files changed, 1376 insertions(+), 712 deletions(-) +Merging scsi-mkp/for-next (503e6172fa74d scsi: libsas: Add __printf attribute to sas_ata_printk()) +$ 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 Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 3 + + .../devicetree/bindings/ufs/qcom,sm8650-ufshc.yaml | 3 + + MAINTAINERS | 21 ++-- + block/bsg.c | 5 +- + drivers/scsi/BusLogic.c | 99 +++++++++++-------- + drivers/scsi/BusLogic.h | 3 +- + drivers/scsi/aha1542.c | 2 - + drivers/scsi/aic7xxx/aic79xx_core.c | 4 +- + drivers/scsi/aic7xxx/aic79xx_osm.h | 26 ++++- + drivers/scsi/aic7xxx/aic7xxx_core.c | 10 +- + drivers/scsi/aic7xxx/aic7xxx_pci.c | 20 +++- + drivers/scsi/elx/libefc/efclib.c | 2 + + drivers/scsi/fnic/fnic.h | 2 +- + drivers/scsi/fnic/fnic_main.c | 7 +- + drivers/scsi/fnic/fnic_nvme.c | 4 + + drivers/scsi/ipr.c | 4 +- + drivers/scsi/libiscsi_tcp.c | 3 +- + drivers/scsi/libsas/sas_ata.c | 1 + + drivers/scsi/scsi_debug.c | 1 + + drivers/scsi/scsi_ioctl.c | 11 ++- + drivers/scsi/scsi_lib.c | 14 +++ + drivers/scsi/scsi_scan.c | 5 +- + drivers/scsi/sd.c | 10 +- + drivers/target/target_core_device.c | 18 +++- + drivers/target/target_core_tpg.c | 10 +- + drivers/ufs/core/ufs-mcq.c | 4 +- + drivers/ufs/core/ufs_bsg.c | 23 +++-- + drivers/ufs/core/ufshcd.c | 109 +++++++++++++-------- + drivers/ufs/host/ufs-qcom.c | 5 + + include/scsi/scsi.h | 2 +- + 30 files changed, 301 insertions(+), 130 deletions(-) +Merging vhost/linux-next (c69023b5e16e5 tools/virtio: add missing device-id/virtio.h wrapper header) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (23d0516587f89 Merge branches 'rproc-next', 'rproc-fixes' and 'rpmsg-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. +Merging gpio-brgl/gpio/for-next (963ed0d562cf2 gpio: rcar: Convert to gpiochip_generic_{request,free}()) +$ 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 drivers/gpio/gpio-sim.c +Auto-merging drivers/gpio/gpiolib-cdev.c +Auto-merging drivers/gpio/gpiolib-kunit.c +CONFLICT (content): Merge conflict in drivers/gpio/gpiolib-kunit.c +Auto-merging drivers/gpio/gpiolib-of.c +Resolved 'drivers/gpio/gpiolib-kunit.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8dac8ced2d959] Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/snps,dw-apb-gpio.yaml | 10 + + Documentation/driver-api/gpio/consumer.rst | 2 +- + arch/arm/mach-pxa/spitz_pm.c | 3 +- + arch/mips/bcm47xx/workarounds.c | 8 +- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 10 +- + .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 3 - + drivers/gpio/.kunitconfig | 3 + + drivers/gpio/gpio-cgbc.c | 26 +++ + drivers/gpio/gpio-dwapb.c | 49 ++++- + drivers/gpio/gpio-octeon.c | 2 +- + drivers/gpio/gpio-rcar.c | 5 +- + drivers/gpio/gpio-sim.c | 32 +-- + drivers/gpio/gpio-virtio.c | 41 ++-- + drivers/gpio/gpiolib-cdev.c | 7 - + drivers/gpio/gpiolib-kunit.c | 235 ++++++++++++++------- + drivers/gpio/gpiolib-legacy.c | 31 --- + drivers/gpio/gpiolib-of.c | 101 +++++---- + drivers/gpio/gpiolib-sysfs.c | 37 ++-- + drivers/media/usb/em28xx/em28xx-dvb.c | 57 +++-- + include/linux/gpio/legacy.h | 8 - + 20 files changed, 402 insertions(+), 268 deletions(-) + create mode 100644 drivers/gpio/.kunitconfig +Merging gpio-intel/for-next (0fc424b6a8ef4 gpio: wcove: use regmap_assign_bits() for conditional set/clear) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpio/gpio-wcove.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging pinctrl/for-next (6e648fe0b51f9 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 +Merge made by the 'ort' strategy. +Merging pinctrl-intel/for-next (c016587866e57 pinctrl: intel: Try to retrieve driver data for pure platform drivers) +$ 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 (0cd4a7b3a4883 pinctrl: renesas: rzt2h: Add a helper for reading PFC) +$ 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 (cee9395acd804 Linux 7.3-rc1) +$ 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 pinctrl-qcom/pinctrl-qcom/for-next (30d9a180c86e3 pinctrl: qcom: Restore the pin configuration after hibernation) +$ git merge -m Merge branch 'pinctrl-qcom/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pinctrl-qcom/pinctrl-qcom/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 16 +++- + drivers/pinctrl/qcom/pinctrl-msm.c | 150 ++++++++++++++++++++++++++++++- + drivers/pinctrl/qcom/pinctrl-x1e80100.c | 1 + + 3 files changed, 161 insertions(+), 6 deletions(-) +Merging pwm/pwm/for-next (00e917df050d7 dt-bindings: pwm: Add IPQ5210 binding) +$ 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 +Already up to date. +Merging ktest/for-next (5b598ba5f3bf3 ktest: Accept quoted bad term in git bisect output) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Merge made by the 'ort' strategy. + tools/testing/ktest/ktest.pl | 27 +++++++++++++++++++++------ + 1 file changed, 21 insertions(+), 6 deletions(-) +Merging kselftest/next (368e5d4d12a80 selftests: breakpoints: Skip step_after_suspend_test on systems without a wakeup capable RTC) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (cee9395acd804 Linux 7.3-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 (e38f53f048246 kunit: Return void from kunit_run_all_tests()) +$ git merge -m Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging livepatching/for-next (f1e818b239dd1 Merge tag 'livepatching-for-7.4' 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 (45efb584a1c0b rtc: pcf85063: add 1 Hz update interrupt (UIE) 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 Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml +Auto-merging drivers/platform/x86/amd/pmc/pmc.c +Auto-merging drivers/rtc/rtc-ac100.c +Auto-merging drivers/rtc/rtc-bd70528.c +Auto-merging drivers/rtc/rtc-mpfs.c +Merge made by the 'ort' strategy. + .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 6 + + .../devicetree/bindings/rtc/abracon,abx80x.yaml | 18 +- + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 3 + + .../devicetree/bindings/rtc/renesas,rzn1-rtc.yaml | 37 +- + .../devicetree/bindings/rtc/ricoh,r2223x.yaml | 58 ++ + Documentation/devicetree/bindings/rtc/rtc.yaml | 1 + + .../devicetree/bindings/rtc/sii,s35390a.yaml | 118 +++ + .../devicetree/bindings/rtc/trivial-rtc.yaml | 2 - + drivers/firmware/raspberrypi.c | 24 + + drivers/platform/x86/amd/pmc/pmc.c | 5 +- + drivers/rtc/Kconfig | 60 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/class.c | 8 +- + drivers/rtc/rtc-abx80x.c | 821 +++++++++++++-------- + drivers/rtc/rtc-ac100.c | 10 +- + drivers/rtc/rtc-asm9260.c | 4 +- + drivers/rtc/rtc-atcrtc100.c | 3 +- + drivers/rtc/rtc-bd70528.c | 5 + + drivers/rtc/rtc-cmos.c | 32 +- + drivers/rtc/rtc-ds1305.c | 4 +- + drivers/rtc/rtc-ds1307.c | 14 +- + drivers/rtc/rtc-ds1343.c | 6 +- + drivers/rtc/rtc-ds1685.c | 3 +- + drivers/rtc/rtc-ds3232.c | 50 +- + drivers/rtc/rtc-ftrtc010.c | 73 +- + drivers/rtc/rtc-hym8563.c | 6 +- + drivers/rtc/rtc-m41t80.c | 12 +- + drivers/rtc/rtc-mcp795.c | 3 +- + drivers/rtc/rtc-mpfs.c | 4 +- + drivers/rtc/rtc-mt6397.c | 91 ++- + drivers/rtc/rtc-nct3018y.c | 94 +++ + drivers/rtc/rtc-nct6694.c | 8 +- + drivers/rtc/rtc-nvidia-vrs10.c | 5 +- + drivers/rtc/rtc-omap.c | 5 +- + drivers/rtc/rtc-pcf2123.c | 5 +- + drivers/rtc/rtc-pcf85063.c | 141 +++- + drivers/rtc/rtc-pcf8563.c | 5 +- + drivers/rtc/rtc-raspberrypi.c | 278 +++++++ + drivers/rtc/rtc-rs5c372.c | 52 +- + drivers/rtc/rtc-rv3029c2.c | 5 +- + drivers/rtc/rtc-rx8010.c | 4 +- + drivers/rtc/rtc-rx8025.c | 10 +- + drivers/rtc/rtc-rzn1.c | 52 +- + drivers/rtc/rtc-s35390a.c | 483 +++++++++--- + drivers/rtc/rtc-stm32.c | 4 +- + drivers/rtc/rtc-sun6i.c | 23 +- + drivers/soc/ti/pm33xx.c | 2 +- + include/linux/mfd/mt6397/rtc.h | 7 + + include/linux/rtc.h | 5 + + include/linux/rtc/rtc-omap.h | 2 +- + include/soc/bcm2835/raspberrypi-firmware.h | 2 + + tools/testing/selftests/rtc/rtctest.c | 60 +- + 52 files changed, 2037 insertions(+), 697 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/ricoh,r2223x.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/sii,s35390a.yaml + create mode 100644 drivers/rtc/rtc-raspberrypi.c +Merging nvdimm/libnvdimm-for-next (9b036546a02c6 dax: fix wrong error code returned from dax_dedupe_file_range_compare()) +$ 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 +Already up to date. +Merging at24/at24/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (e32008340585a selftests/seccomp: Split fork_and_close into clone and close tests) +$ 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 (4350d70546699 Merge branch 'slimbus-for-v7.4' into slimbus-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. +Merging nvmem/for-next (41f42ff4ae134 Merge branches 'nvmem-fixes' and 'nvmem-for-v7.4' 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 +Auto-merging Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/nvmem/Kconfig +Merge made by the 'ort' strategy. +Merging hyperv/hyperv-next (33b28f3b31335 Drivers: hv: Remove leftover support for old Hyper-V versions) +$ 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 Documentation/networking/device_drivers/ethernet/microsoft/netvsc.rst +Auto-merging drivers/hv/hv_common.c +Auto-merging include/asm-generic/mshyperv.h +Auto-merging include/linux/hyperv.h +Auto-merging include/linux/kexec.h +Auto-merging kernel/kexec_core.c +Merge made by the 'ort' strategy. + .../device_drivers/ethernet/microsoft/netvsc.rst | 14 +- + Documentation/virt/hyperv/clocks.rst | 8 +- + Documentation/virt/hyperv/coco.rst | 5 +- + Documentation/virt/hyperv/overview.rst | 28 +-- + Documentation/virt/hyperv/vmbus.rst | 17 +- + arch/x86/kernel/cpu/mshyperv.c | 27 +-- + drivers/hv/hv_common.c | 10 - + drivers/hv/hv_proc.c | 260 ++++++++++++--------- + drivers/hv/mshv_root_hv_call.c | 10 +- + drivers/hv/mshv_vtl_main.c | 55 ++++- + drivers/hv/ring_buffer.c | 126 ++++------ + drivers/hv/vmbus_drv.c | 30 ++- + include/asm-generic/mshyperv.h | 7 - + include/linux/hyperv.h | 58 +++-- + include/linux/kexec.h | 2 + + kernel/kexec_core.c | 7 + + 16 files changed, 363 insertions(+), 301 deletions(-) +Merging auxdisplay/for-next (f63dc0eea92d0 docs: ABI: auxdisplay: use literal blocks for commands) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Already up to date. +Merging kgdb/kgdb/for-next (9ca9e8c857b55 kgdb: Fix buffer overflow in the qRcmd packet handler) +$ 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 +Merge made by the 'ort' strategy. + kernel/debug/debug_core.c | 2 -- + kernel/debug/gdbstub.c | 55 ++++++++++++++++++++++++++++++++++++------ + kernel/debug/kdb/kdb_io.c | 1 - + kernel/debug/kdb/kdb_main.c | 7 +++--- + kernel/debug/kdb/kdb_private.h | 3 ++- + 5 files changed, 52 insertions(+), 16 deletions(-) +Merging hmm/hmm (47193113641e5 coco/tsm: Update maintainership) +$ 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 (dc59e4fea9d83 Linux 7.2-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 (0b1883ca75c00 bus: mhi: ep: clients: Add loopback driver for data path testing) +$ 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 cxl/next (cf15f9f2361dd Merge branch 'for-7.4/cxl-fixes' 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 +Already up to date. +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 (2c493ac8c3471 lkdtm: Add more EFI runtime tests) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (a511442085c14 unicode: Properly reject invalid encoding version strings) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Already up to date. +Merging random/master (eb13a1ff271b0 random: vDSO: avoid call to memset() when zeroing reserved parameter) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (3e271a27c46fd landlock: Fix superblock use-after-free in release_inode()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging sysctl/sysctl-next (4991c8b72b564 time/jiffies: Saturate in mult_hz() instead of wrapping) +$ 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 kernel/time/jiffies.c +Merge made by the 'ort' strategy. +Merging execve/for-next/execve (b36b990c50b1f selftests/exec: report the skipped binfmt_misc_bpf test on stderr) +$ 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 +Already up to date. +Merging bitmap/bitmap-for-next (4c9c30534d06f cpumask: Preserve short reads in cpumap printing helpers) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Merge made by the 'ort' strategy. + arch/csky/include/asm/bitops.h | 9 +-------- + include/linux/cpumask.h | 20 ++++++++++++++++---- + 2 files changed, 17 insertions(+), 12 deletions(-) +Merging hte/for-next (30167fadbf87f hte: tegra194-test: shut down timer before GPIO release) +$ 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 (56a1b1018838c seq_file: Require explicit initialization of struct seq_operations) +$ 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 scripts/checkpatch.pl +Auto-merging tools/lib/python/kdoc/xforms_lists.py +Merge made by the 'ort' strategy. + Documentation/conf.py | 1 + + include/linux/compiler_attributes.h | 12 ++++++++++++ + include/linux/seq_file.h | 13 +++++++++---- + scripts/checkpatch.pl | 1 + + tools/lib/python/kdoc/xforms_lists.py | 1 + + 5 files changed, 24 insertions(+), 4 deletions(-) +Merging nolibc/for-next (700ce4da6f6f1 selftests/nolibc: explicitly disable position independent executables) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Already up to date. +Merging iommufd/for-next (04bcf84613346 iommupt: Do not allow PTEs to be split when dirty logging) +$ 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 (f31adc690d683 Merge branch 'x86_energy_perf_policy' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 9 + + tools/power/x86/turbostat/turbostat.8 | 6 +- + tools/power/x86/turbostat/turbostat.c | 669 +++++++++++---------- + .../x86_energy_perf_policy.c | 194 +++--- + 4 files changed, 490 insertions(+), 388 deletions(-) +Merging pwrseq/pwrseq/for-next (f1f9cc4aadd9e power: sequencing: add .kunitconfig) +$ 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 +Merge made by the 'ort' strategy. + drivers/power/sequencing/.kunitconfig | 3 +++ + 1 file changed, 3 insertions(+) + create mode 100644 drivers/power/sequencing/.kunitconfig +Merging capabilities-next/caps-next (507adb6448378 security: commoncap: clarify CAP_FS_SET comment in cap_task_fix_setuid()) +$ 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 security/commoncap.c +Merge made by the 'ort' strategy. + security/commoncap.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +$ git am -3 ../patches/0001-sign-file-Fix-up-merge-issue.patch +Applying: sign-file: Fix up merge issue +Using index info to reconstruct a base tree... +M scripts/sign-file.c +Falling back to patching base and 3-way merge... +Auto-merging scripts/sign-file.c +No changes -- Patch already applied. +Merging ipe/next (c03c1a14507df Linux 7.3) +$ 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 (bd3cc16d1d7d5 kcsan: test: Do not count report printing time against test duration) +$ 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 (cee9395acd804 Linux 7.3-rc1) +$ 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 (965e9a2cf23b0 pkcs7: Change a pr_warn() to pr_warn_once()) +$ 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 +Already up to date. +Merging fwctl/for-next (bc6f2a284c633 rust: fwctl: declare cfi_encoding for fwctl_rpc_scope) +$ 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 (3177779ae17db virt: coco: change tsm_class to a const struct) +$ 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 (a5db65458a911 Merge branch 'next/dt64' 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 device-id/device-id-rework (995832b2cebe6 Replace <linux/mod_devicetable.h> by more specific <linux/device-id/*.h> (c files)) +$ git merge -m Merge branch 'device-id-rework' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git device-id/device-id-rework +Already up to date. +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 +Already up to date. +Merging kapi/spec (ef777ef05ebcc kernel/api: add syscall enter/exit tracepoints) +$ git merge -m Merge branch 'spec' of https://git.kernel.org/pub/scm/linux/kernel/git/sashal/kapi.git kapi/spec +Auto-merging .gitignore +Auto-merging MAINTAINERS +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging fs/open.c +CONFLICT (content): Merge conflict in fs/open.c +Auto-merging fs/read_write.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/syscalls.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging mm/madvise.c +Auto-merging scripts/Makefile.build +Auto-merging tools/lib/python/kdoc/kdoc_parser.py +Auto-merging tools/testing/selftests/Makefile +Resolved 'Makefile' using previous resolution. +Resolved 'fs/open.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d4a8dd94efa3b] Merge branch 'spec' of https://git.kernel.org/pub/scm/linux/kernel/git/sashal/kapi.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 1 + + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kernel-api-spec.rst | 648 +++++ + MAINTAINERS | 13 + + Makefile | 1 + + arch/x86/include/asm/syscall_wrapper.h | 3 +- + fs/open.c | 557 ++++ + fs/read_write.c | 710 +++++ + include/asm-generic/vmlinux.lds.h | 14 + + include/linux/kapi_syscall.h | 35 + + include/linux/kernel_api_spec.h | 1226 ++++++++ + include/linux/syscalls.h | 42 +- + include/trace/events/kapi.h | 74 + + init/Kconfig | 2 + + kernel/Makefile | 1 + + kernel/api/Kconfig | 74 + + kernel/api/Makefile | 13 + + kernel/api/internal.h | 25 + + kernel/api/kapi_debugfs.c | 553 ++++ + kernel/api/kapi_kunit.c | 720 +++++ + kernel/api/kernel_api_spec.c | 1470 ++++++++++ + mm/madvise.c | 549 ++++ + scripts/Makefile.build | 26 + + tools/docs/kernel-doc | 12 +- + tools/kapi/.gitignore | 3 + + tools/kapi/Cargo.lock | 679 +++++ + tools/kapi/Cargo.toml | 20 + + tools/kapi/Makefile | 33 + + tools/kapi/README.md | 33 + + tools/kapi/src/extractor/debugfs.rs | 1704 +++++++++++ + tools/kapi/src/extractor/kerneldoc_parser.rs | 3335 ++++++++++++++++++++++ + tools/kapi/src/extractor/mod.rs | 442 +++ + tools/kapi/src/extractor/source_parser.rs | 531 ++++ + tools/kapi/src/extractor/vmlinux/binary_utils.rs | 461 +++ + tools/kapi/src/extractor/vmlinux/mod.rs | 1160 ++++++++ + tools/kapi/src/formatter/json.rs | 659 +++++ + tools/kapi/src/formatter/mod.rs | 220 ++ + tools/kapi/src/formatter/plain.rs | 679 +++++ + tools/kapi/src/formatter/rst.rs | 802 ++++++ + tools/kapi/src/main.rs | 123 + + tools/lib/python/kdoc/kdoc_apispec.py | 1391 +++++++++ + tools/lib/python/kdoc/kdoc_files.py | 12 +- + tools/lib/python/kdoc/kdoc_parser.py | 101 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/kapi/.gitignore | 2 + + tools/testing/selftests/kapi/Makefile | 7 + + tools/testing/selftests/kapi/kapi_test_util.h | 31 + + tools/testing/selftests/kapi/test_kapi.c | 1163 ++++++++ + 48 files changed, 20350 insertions(+), 12 deletions(-) + create mode 100644 Documentation/dev-tools/kernel-api-spec.rst + create mode 100644 include/linux/kapi_syscall.h + create mode 100644 include/linux/kernel_api_spec.h + create mode 100644 include/trace/events/kapi.h + create mode 100644 kernel/api/Kconfig + create mode 100644 kernel/api/Makefile + create mode 100644 kernel/api/internal.h + create mode 100644 kernel/api/kapi_debugfs.c + create mode 100644 kernel/api/kapi_kunit.c + create mode 100644 kernel/api/kernel_api_spec.c + create mode 100644 tools/kapi/.gitignore + create mode 100644 tools/kapi/Cargo.lock + create mode 100644 tools/kapi/Cargo.toml + create mode 100644 tools/kapi/Makefile + create mode 100644 tools/kapi/README.md + create mode 100644 tools/kapi/src/extractor/debugfs.rs + create mode 100644 tools/kapi/src/extractor/kerneldoc_parser.rs + create mode 100644 tools/kapi/src/extractor/mod.rs + create mode 100644 tools/kapi/src/extractor/source_parser.rs + create mode 100644 tools/kapi/src/extractor/vmlinux/binary_utils.rs + create mode 100644 tools/kapi/src/extractor/vmlinux/mod.rs + create mode 100644 tools/kapi/src/formatter/json.rs + create mode 100644 tools/kapi/src/formatter/mod.rs + create mode 100644 tools/kapi/src/formatter/plain.rs + create mode 100644 tools/kapi/src/formatter/rst.rs + create mode 100644 tools/kapi/src/main.rs + create mode 100644 tools/lib/python/kdoc/kdoc_apispec.py + create mode 100644 tools/testing/selftests/kapi/.gitignore + create mode 100644 tools/testing/selftests/kapi/Makefile + create mode 100644 tools/testing/selftests/kapi/kapi_test_util.h + create mode 100644 tools/testing/selftests/kapi/test_kapi.c +Merging pagemap-headers/headers (e02cb91d4644d ksm: Remove pagemap.h include) +$ git merge -m Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git pagemap-headers/headers +Auto-merging arch/alpha/include/asm/pgtable.h +Auto-merging arch/arc/include/asm/pgtable-levels.h +Auto-merging arch/microblaze/include/asm/pgtable.h +Auto-merging arch/sparc/include/asm/pgtable_64.h +Auto-merging arch/sparc/include/asm/tlb_64.h +Auto-merging arch/x86/virt/vmx/tdx/tdx.c +Auto-merging block/fops.c +Auto-merging drivers/dma/ste_dma40.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/msm/msm_fb.c +Auto-merging drivers/gpu/drm/msm/msm_gem_shrinker.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_dmem.c +Auto-merging drivers/gpu/drm/omapdrm/dss/hdmi4.c +Auto-merging drivers/gpu/drm/omapdrm/dss/hdmi5.c +Auto-merging drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_gem.c +Auto-merging drivers/gpu/drm/panthor/panthor_gem.c +Auto-merging drivers/hwmon/pmbus/pmbus_core.c +Auto-merging drivers/i2c/busses/i2c-amd-asf-plat.c +Auto-merging drivers/i2c/busses/i2c-gxp.c +Auto-merging drivers/i2c/busses/i2c-k1.c +Auto-merging drivers/iio/accel/fxls8962af-core.c +Auto-merging drivers/iio/adc/ti-ads1298.c +Auto-merging drivers/iio/light/rohm-bu27034.c +Auto-merging drivers/iio/pressure/bmp280-core.c +Auto-merging drivers/leds/leds-turris-omnia.c +Auto-merging drivers/media/platform/st/stm32/stm32-csi.c +Auto-merging drivers/media/platform/ti/omap3isp/ispvideo.c +Auto-merging drivers/media/usb/go7007/go7007-v4l2.c +Auto-merging drivers/media/usb/gspca/gspca.c +Auto-merging drivers/mfd/88pm886.c +Auto-merging drivers/mfd/cs42l43.c +Auto-merging drivers/mfd/twl-core.c +Auto-merging drivers/mmc/core/core.c +Auto-merging drivers/mmc/core/host.c +Auto-merging drivers/mmc/host/sh_mmcif.c +Auto-merging drivers/net/ethernet/atheros/atl1e/atl1e.h +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/pinctrl/pinctrl-sx150x.c +Auto-merging drivers/platform/arm64/huawei-gaokun-ec.c +Auto-merging drivers/platform/arm64/lenovo-yoga-c630.c +Auto-merging drivers/power/supply/bq25630_charger.c +Auto-merging drivers/regulator/fixed.c +Auto-merging drivers/regulator/tps65185.c +Auto-merging drivers/regulator/tps6594-regulator.c +Auto-merging drivers/ufs/host/ufs-mediatek.c +Auto-merging drivers/ufs/host/ufs-qcom.c +Auto-merging drivers/usb/typec/mux/it5205.c +Auto-merging fs/aio.c +Auto-merging fs/buffer.c +Auto-merging fs/file_table.c +Auto-merging fs/inode.c +Auto-merging fs/nfs/blocklayout/blocklayout.c +Auto-merging fs/nfs/nfstrace.h +Auto-merging fs/nfs/pnfs.c +Auto-merging fs/nfsd/nfs4proc.c +Auto-merging include/drm/drm_print.h +Auto-merging include/linux/ceph/libceph.h +Auto-merging include/linux/i3c/master.h +Auto-merging include/linux/nfs_fs.h +Auto-merging include/linux/nfs_page.h +Auto-merging include/linux/suspend.h +Auto-merging include/linux/swap.h +Auto-merging kernel/power/snapshot.c +Auto-merging net/ceph/osd_client.c +CONFLICT (content): Merge conflict in net/ceph/osd_client.c +Auto-merging net/ceph/pagevec.c +Auto-merging net/core/datagram.c +Auto-merging net/sunrpc/auth_gss/gss_krb5_crypto.c +Auto-merging net/sunrpc/auth_gss/svcauth_gss.c +Auto-merging net/sunrpc/xdr.c +Auto-merging net/sunrpc/xprtsock.c +Auto-merging security/commoncap.c +Auto-merging security/selinux/hooks.c +Auto-merging security/selinux/selinuxfs.c +Auto-merging security/smack/smack_lsm.c +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_migrate.c' using previous resolution. +Resolved 'net/ceph/osd_client.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b6ec1cf3698b1] Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/pgtable.h | 2 +- + arch/arc/include/asm/Kbuild | 1 + + arch/arc/include/asm/pgtable-levels.h | 2 ++ + arch/arc/include/asm/tlb.h | 12 ---------- + arch/arm/include/asm/pgalloc.h | 2 -- + arch/arm/include/asm/tlb.h | 2 -- + arch/arm/mach-pxa/pxa3xx.c | 1 + + arch/arm64/include/asm/tlb.h | 3 --- + arch/hexagon/include/asm/tlb.h | 1 - + arch/microblaze/include/asm/pgtable.h | 2 +- + arch/nios2/include/asm/tlb.h | 1 - + arch/openrisc/include/asm/Kbuild | 1 + + arch/openrisc/include/asm/tlb.h | 26 ---------------------- + arch/powerpc/include/asm/tlb.h | 2 -- + arch/sh/include/asm/pgtable.h | 2 +- + arch/sh/include/asm/tlb.h | 1 - + arch/sparc/include/asm/pgtable_64.h | 2 +- + arch/sparc/include/asm/tlb_64.h | 1 - + arch/x86/include/asm/pgalloc.h | 1 - + arch/x86/virt/vmx/tdx/tdx.c | 1 + + arch/xtensa/kernel/hibernate.c | 1 + + block/fops.c | 1 + + drivers/char/agp/backend.c | 1 - + drivers/char/agp/generic.c | 1 - + drivers/char/agp/intel-agp.c | 1 - + drivers/char/agp/intel-gtt.c | 1 - + drivers/char/agp/uninorth-agp.c | 3 ++- + drivers/dma/ste_dma40.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +-- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 - + drivers/gpu/drm/display/drm_dp_cec.c | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 1 + + drivers/gpu/drm/i915/display/intel_display_power.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 1 + + drivers/gpu/drm/msm/msm_fb.c | 2 ++ + drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 ++ + drivers/gpu/drm/nouveau/nouveau_dmem.c | 1 + + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 1 + + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 1 + + drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.c | 1 + + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 ++ + drivers/gpu/drm/panthor/panthor_gem.c | 3 +++ + drivers/hwmon/pmbus/pmbus_core.c | 1 + + drivers/i2c/busses/i2c-amd-asf-plat.c | 1 + + drivers/i2c/busses/i2c-gxp.c | 1 + + drivers/i2c/busses/i2c-k1.c | 1 + + drivers/i2c/busses/i2c-pasemi-platform.c | 1 + + drivers/iio/accel/fxls8962af-core.c | 1 + + drivers/iio/adc/nct7201.c | 1 + + drivers/iio/adc/ti-ads1298.c | 1 + + drivers/iio/light/rohm-bu27034.c | 1 + + drivers/iio/pressure/bmp280-core.c | 1 + + drivers/iio/pressure/bmp280.h | 1 + + drivers/input/misc/aw86927.c | 1 + + drivers/input/touchscreen/goodix_berlin_core.c | 1 + + drivers/input/touchscreen/hynitron_cstxxx.c | 1 + + drivers/input/touchscreen/imagis.c | 1 + + drivers/leds/leds-turris-omnia.c | 1 + + drivers/media/common/videobuf2/frame_vector.c | 1 - + drivers/media/pci/cx18/cx18-driver.h | 1 - + drivers/media/pci/ivtv/ivtv-driver.h | 2 +- + drivers/media/platform/st/stm32/stm32-csi.c | 1 + + drivers/media/platform/ti/omap3isp/ispvideo.c | 1 - + drivers/media/usb/go7007/go7007-v4l2.c | 1 - + drivers/media/usb/gspca/gspca.c | 1 - + drivers/mfd/88pm886.c | 1 + + drivers/mfd/abx500-core.c | 1 + + drivers/mfd/adp5585.c | 1 + + drivers/mfd/cs40l50-core.c | 1 + + drivers/mfd/cs42l43.c | 1 + + drivers/mfd/rt5120.c | 1 + + drivers/mfd/tps65219.c | 1 + + drivers/mfd/twl-core.c | 2 +- + drivers/mmc/core/core.c | 1 - + drivers/mmc/core/host.c | 1 - + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 - + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 1 - + drivers/mmc/host/sh_mmcif.c | 1 - + drivers/mmc/host/tmio_mmc.h | 1 - + drivers/mmc/host/tmio_mmc_core.c | 1 - + drivers/mmc/host/usdhi6rol0.c | 1 - + drivers/net/ethernet/atheros/atl1c/atl1c.h | 1 - + drivers/net/ethernet/atheros/atl1e/atl1e.h | 1 - + drivers/net/ethernet/intel/e1000/e1000.h | 1 - + drivers/net/ethernet/intel/e1000e/netdev.c | 1 - + drivers/net/ethernet/intel/igb/igb_main.c | 1 - + drivers/net/ethernet/intel/igbvf/netdev.c | 1 - + drivers/phy/st/phy-stm32-combophy.c | 1 + + drivers/pinctrl/pinctrl-sx150x.c | 1 + + drivers/platform/arm64/huawei-gaokun-ec.c | 1 + + drivers/platform/arm64/lenovo-yoga-c630.c | 2 +- + .../platform/x86/intel/int3472/clk_and_regulator.c | 1 + + drivers/power/supply/bq25630_charger.c | 1 + + drivers/power/supply/rk817_charger.c | 2 +- + drivers/regulator/fixed.c | 1 + + drivers/regulator/fp9931.c | 1 + + drivers/regulator/mt6360-regulator.c | 1 + + drivers/regulator/qcom-labibb-regulator.c | 1 + + drivers/regulator/rtq2208-regulator.c | 1 + + drivers/regulator/tps65185.c | 1 + + drivers/regulator/tps65219-regulator.c | 1 + + drivers/regulator/tps6594-regulator.c | 1 + + drivers/soc/xilinx/zynqmp_power.c | 1 + + drivers/ufs/host/ufs-mediatek.c | 1 + + drivers/ufs/host/ufs-qcom.c | 1 + + drivers/usb/core/hcd.c | 1 + + drivers/usb/typec/mux/it5205.c | 1 + + drivers/usb/typec/wusb3801.c | 1 + + drivers/video/fbdev/core/fb_procfs.c | 1 + + drivers/xen/balloon.c | 1 + + fs/aio.c | 1 + + fs/buffer.c | 1 + + fs/file_table.c | 1 + + fs/inode.c | 1 + + fs/nfs/blocklayout/blocklayout.c | 1 + + fs/nfs/nfs42proc.c | 1 + + fs/nfs/nfstrace.h | 1 + + fs/nfs/pnfs.c | 1 + + fs/nfsd/nfs4proc.c | 1 + + include/drm/drm_print.h | 1 + + include/drm/ttm/ttm_tt.h | 1 - + include/linux/balloon.h | 1 - + include/linux/ceph/libceph.h | 1 - + include/linux/i3c/master.h | 1 + + include/linux/ksm.h | 1 - + include/linux/mempolicy.h | 1 - + include/linux/nfs_fs.h | 1 - + include/linux/nfs_page.h | 1 - + include/linux/suspend.h | 1 - + include/linux/swap.h | 1 - + include/sound/cs35l41.h | 1 + + kernel/power/snapshot.c | 1 + + net/ceph/osd_client.c | 1 - + net/ceph/pagevec.c | 1 + + net/core/datagram.c | 1 - + net/rds/rdma.c | 1 - + net/sunrpc/auth_gss/auth_gss.c | 1 - + net/sunrpc/auth_gss/gss_krb5_crypto.c | 1 - + net/sunrpc/auth_gss/gss_krb5_wrap.c | 1 - + net/sunrpc/auth_gss/svcauth_gss.c | 1 - + net/sunrpc/cache.c | 1 - + net/sunrpc/rpc_pipe.c | 1 - + net/sunrpc/socklib.c | 1 - + net/sunrpc/xdr.c | 1 - + net/sunrpc/xprtsock.c | 1 - + security/commoncap.c | 3 --- + security/inode.c | 1 - + security/selinux/hooks.c | 1 - + security/selinux/selinuxfs.c | 1 - + security/smack/smack_lsm.c | 1 - + sound/soc/codecs/cs35l41-lib.c | 1 + + 155 files changed, 98 insertions(+), 118 deletions(-) + delete mode 100644 arch/arc/include/asm/tlb.h + delete mode 100644 arch/openrisc/include/asm/tlb.h
diff --git a/localversion-next b/localversion-next new file mode 100644 index 0000000..b2ff686 --- /dev/null +++ b/localversion-next
@@ -0,0 +1 @@ +-next-20261029