diff options
Diffstat (limited to 'Next')
| -rw-r--r-- | Next/SHA1s | 437 | ||||
| -rw-r--r-- | Next/Trees | 438 | ||||
| -rw-r--r-- | Next/merge.log | 4872 |
3 files changed, 5747 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..a96edb590423 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,437 @@ +Name SHA1 +---- ---- +origin 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +ext4-fixes 8c4f6e3376348fc3162eed86a05b933921c8f9ed +vfs-brauner-fixes a522dd871024a0f065bfa7638afdb929607f58fc +fscrypt-current 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +fsverity-current 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +btrfs-fixes 93ac825f8f7eebaeb4318c21812269bfc056662b +vfs-fixes 49c5d168a3a8f4eb27d44a2a22b7e8a856ca601f +erofs-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +nfsd-fixes f76017a7663c4ce5e379f8a8d39f032bdb1fd865 +v9fs-fixes 028ef9c96e96197026887c0f092424679298aae8 +overlayfs-fixes 1d27da7de3f74405b1de85ad26c5ea90f826114b +fscrypt 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +btrfs d1dca33127efacd86ac550aa86352f8ea9f29a5a +ceph 66ba287b7797aa239f4e1c6f4211cc85f63e56c3 +cifs 51b4bf5fe7c90ebf08599b9a3c7620b4a3fd4b22 +configfs e6f2f0945f5e85f516d8df7d95afdeda927cc259 +configfs-rust e84c9b64df615e658e47561b835c1364dc48f0c0 +ecryptfs 8f6626bd6594a78f454d02b27b74a580c890cab9 +dlm 82bcb7b05ad90de126e9c09a7b46a81be799620e +erofs 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +exfat 79130348ec29b74950e925e06c26f1a4eecea5ae +ext3 a344542d9f26d44a5ebf597220ccac84c536467e +ext4 8c4f6e3376348fc3162eed86a05b933921c8f9ed +f2fs 9b12299b437e0cc3ebf402e7b36a89cc69151238 +fsverity 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +fuse aa0c00a516faac6683c7fb0a4f1032f471f910f7 +gfs2 9aa0082cf969a9973ec6554586753c53211ab799 +jfs dad98c5b2a05ef744af4c884c97066a3c8cdad61 +ksmbd e49296d51ccbf2ad0ed0484db1382f1d7217bd6e +nfs 18a80121193c6d19519e218434c9acf90e8d0e5c +nfs-anna ef30b3efb7e8bae94d790a6503a595e1051323e7 +nfsd 4fdfaf7cc3a666ec829b1827f883849ba656f56e +ntfs c77ab4eeeb3ed471bcc99a94673f0e0142c4b84a +ntfs3 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +orangefs 2bc09cb0e9e44c7e622b956332ebfb9b638fd5f7 +overlayfs 1f6ee9be92f8df85a8c9a5a78c20fd39c0c21a95 +ubifs a5e0055eac837a1168c781653943d4a0d9920af3 +v9fs 35ecd40c0d7e4f772d00dfec9f7077315ba5ca82 +v9fs-ericvh 028ef9c96e96197026887c0f092424679298aae8 +xfs 9dde020e19681ffffc0c5d446ea7b01cc51fb98d +zonefs 3a8389d42bdf4213730f4067f8bfa78bae6564ef +vfs-brauner 2c3ba1f1cb416b81d617b92a24a4bcaa48d574e3 +vfs 4dda01b67c8662c5d0c53034974cb8280c575a5d +mm-fixes dbead60545f433dfb21e7065c6211c96024effc7 +fs-current f5aa16d06d1797d7acfe0f59921077a568dd4296 +kbuild-current 83deedcf85af511dc120b3cd8ee597d211cdf2fb +clang-fixes-current df2908090cda368b01ff43709f51890076c56157 +arc-current c03c1a14507dfaf8b856c2608f9ac216021fc222 +arm-current 1eb87d8f77379d4e4b279487b8c859fb64bd1afb +arm64-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +arm-soc-fixes 59f522f5a0ece96ce051a27d15533667a1d0dee8 +davinci-current 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +realtek-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drivers-memory-fixes a78ee2e05f7c7dd09e58ea615960105f78dc3c75 +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current af32c3cb72529b14bfb2685bbdaa2b1514496b58 +powerpc-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +s390-fixes 375d5d57545f53d2bc3e15ada0e9da360fc68bea +net b3427f41f831adecc8ffd89afc9d30c279115658 +bpf 9abe2c42ecab6c86b54838d2d645ca2e10204606 +ipsec 5def91015ba7b59de62a81384572da7281b8a033 +netfilter 734bef548a96e8774d6eef5dfa2026c6edc4e80b +ipvs 734bef548a96e8774d6eef5dfa2026c6edc4e80b +bluetooth-fixes 60b10121db602a43ada3dbc39792bbf93d25991b +wireless af32da41b0327b9c6a37856ba82b6760d6c8d10e +ath 045958acaa75205b31578cb22c4345e28dd2e4bf +iwlwifi 1e7e30fb650b8327534f65b2213a794c04975fa4 +wpan 2b4707a149a55e8fa75c9ef32b359d60f470a566 +rdma-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +sound-current d73cab4a427f924efd5b5d8769c80e0ca5bdcadf +sound-asoc-fixes ef7062864c0511bba52775d0eb3aa72d886b5f3a +regmap-fixes 1ea2927c1bc3c66d2ff69f131268e6be4d38a87c +regulator-fixes 7904338c38426d72c5f7cd9402cb9a20232a7af5 +spi-fixes 2d0953ab69d316589624b0517fdce01f8e630bf0 +pci-current 996a59519af2ef3d8f47479685616bb2278c6cfa +driver-core.current a42ae51fe3c36cef82dc687ea594ca232a785fd4 +tty.current eedf2cf3505c1562a2fb24f8b997056f023d242b +usb.current e971f4f365bad51d01bc90db55b56fdb3124f963 +usb-serial-fixes ab89a9dab02d9553eb0cc27fd3e4a4998acbc8e9 +phy 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +staging.current 24934cb6b8cd925b7c86ad818929c272a360ec53 +iio-fixes 340d44bdf9db0f095f99845b5ad8628781d79b6f +watchdog-fixes f4d9e02966d4fc4b6e1014fe3ae46278561fc3f7 +counter-current fd73f4a6659897191fa0d40695fe370925dd3780 +char-misc.current 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +soundwire-fixes 6c067677192f054bbfa815caf04f536bb8dcdee2 +thunderbolt-fixes f1ae606eb404bca2498b9ad69b923073655556e4 +input-current d1eb0afa9140c740ff29985f9b89b1926b1b502d +crypto-current 178aff4cf425b3fc51ff09c571fa1bfbc1eb8ea4 +libcrypto-fixes 01ad209f122b7c173477bd60c7997564f9c65961 +vfio-fixes e242e974e812e7a47e3088860c80d9492fac314f +kselftest-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +dmaengine-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +backlight-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mtd-fixes 1c1a342aceec79528b3ba51f376eca2be5928fe7 +mfd-fixes d5d2d7a8d8be18681a0864f58e3875f1c639e11c +v4l-dvb-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +reset-fixes 168cae7e87463c34758db2b51537937a29b753f1 +mips-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +at91-fixes afb1ecfeda3fc31d6300a176f4854cc62e289bf3 +omap-fixes 2fabd2f406d0cf787be47b3bbeea99b30004033d +tegra-fixes 6c143432a14dbf5e455f5bf08bfa90fb69f39b90 +kvm-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +kvms390-fixes f47190b08b71e8482072978373ee88cb2dfbdaf4 +kvm-arm-fixes 8ba47800a3c3baec69b78323aec0ff327973fc6c +hwmon-fixes c221091f7e30c64280e4cbfa27dc4c05edc96d0c +nvdimm-fixes a8aec14230322ed8f1e8042b6d656c1631d41163 +cxl-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +dma-mapping-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +drivers-x86-fixes 086aeca907789bd2604f16f07bfc073b19015015 +samsung-krzk-fixes a6b33da67ef16a4bdf359d4e76870b1ba1a1360a +pinctrl-samsung-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +pinctrl-qcom-fixes 87dc4bfebcc0a15237a6ddd8cdd408647e93aecd +devicetree-fixes 9c1075791172d936935ca20d7f0c1da601c4f408 +dt-krzk-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +scsi-fixes ca14cc05808f9c0115c38bec53573bf93e030435 +drm-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +drm-intel-fixes 01aa63eade529680cb28fce40f2357bf392a249f +mmc-fixes c56e67d7743247fffbbfe7c21fb03ad73bb69165 +rtc-fixes 055ef5ce9f67a6a3a1363fa663007f8196cc0fb8 +gnss-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +hyperv-fixes b6d5e944b4eeeba6149af7fd696e8164e6f8a76f +risc-v-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +riscv-dt-fixes 0f70fd6f4c1d6c1f2ea298d8dd07c4a4d5dff9af +riscv-soc-fixes 3a25c1c77dc3769cb83c236ab33f7aa1fa17726c +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +gpio-brgl-fixes 9e4b35c95fede87bad36f68b7ff1eae94ea6b910 +gpio-intel-fixes 3fd4bf93d586cb07304cdcb5e8b3c51ac1d8284f +pinctrl-intel-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +auxdisplay-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +kunit-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +renesas-fixes 8ca80811c3ba01691b424f4fef4db8960955df4f +perf-current aadea57f532882d8bab444646863c7ef8a778ff1 +efi-fixes 56e8ad28ebd79702b40efbef17b8895c68b84bd9 +battery-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +iommufd-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +rust-fixes 57d916a3eb765ee0577d269bb2ac1bdf3a7a7f40 +w1-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +pmdomain-fixes 4c66c423593e26273ea0d644906ed007630c6f6d +i2c-andi-fixes 25e7ab89f4774b0f842cee0e8a20c11f755924d5 +i2c-rust-fixes 4eb422482ca5d924d7212ad2ca1cb7ea6f5b524d +sparc-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +clk-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +thead-clk-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +tenstorrent-clk-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +fustini-config-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +pwrseq-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +thead-dt-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +ftrace-fixes 1650a1b6cb1ae6cb99bb4fce21b30ebdf9fc238e +ring-buffer-fixes 057caace5214da3b457bbd295e1a2ad34d3685ea +trace-fixes c47a7b11bcb3d45e29723afcf6336866476b1d08 +tracefs-fixes 07004a8c4b572171934390148ee48c4175c77eed +spacemit-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +tip-fixes 494c6a4cd3ef4ea63a5111f84814bd8e781dd7dc +kexec-fixes a901b0778ae82d46084b55237e65d3a7bb5f0c86 +liveupdate-fixes 3a0b8fa2eb36afc88b62a95f33f0c77c71fa5ded +drm-msm-fixes d024361c631b3f020a26c07d683e5103404b0fbf +uml-fixes b2010b3a0dbe7da9a1bccce1a78440f8083c69b7 +fwctl-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +devsec-tsm-fixes c3fd16c3b98ed726294feab2f94f876290bf7b61 +drm-rust-fixes 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +tenstorrent-dt-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +nfc-fixes b61732f47316d45f27706db7812950145d3327b5 +mm-nonmm-hotfixes-stable 5b4696e0bfc358619adaeab25ad35b4979af8331 +mm-nonmm-hotfixes-unstable 5b4696e0bfc358619adaeab25ad35b4979af8331 +drm-misc-fixes 54a88d9afcca66221d14f438d0960472984968ec +rust d89e1d186ec9271bf78e62771779e9fc03bf0fc3 +rust-interop 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b +rust-alloc 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init b7218f1996f8491dbe28632b70f444cb73f554df +rust-timekeeping 2ea0119f72dba597aa8a98cbdb72c564bfc5cb38 +rust-xarray c455f19bbe6104debd980bb15515faf716bd81b8 +rxarray 4ce73d98a0a6e5bba46ed1fc9a61511bdccea776 +rust-analyzer 0024f3311f6f54f10dc778802da3fea0522ade66 +mm 82059c664b1e3535e3b72729f383879158cbe829 +mm-nonmm-stable 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +mm-nonmm-unstable 4fab3abf085638e7fd2ebabf0aab8aa299486207 +kbuild 2a5a1c2fab91358d44198eb16bf83e4989f73333 +clang-fixes 0bb666d5f5a2339a5692afb312c2161df9620503 +clang-format 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +perf 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +compiler-attributes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +dma-mapping 0d584f9143d8de202bb297e8e65c2db927281695 +asm-generic adbbd9714f8058730f93c8df5c5bf1679456424b +alpha d58041d2c63e09a1c9083e0e9f4151e487c4e16a +arm 01330dac0fa7c16ef0f3da39757e9509653a2e3f +arm64 f46be4da2cbb17574b5369517a9a1e1b414063b4 +arm-perf 652ab8ee0d27f21a5f402a0b6ac227c8bbfdd64c +arm-soc a32ef3f1c49fd8128b5fe1e79b9738a54cd15127 +amlogic 120880c7d4ac733fc0aed2afa0565e96636a3251 +asahi-soc ea39426f7048c16acdc560dd181d0689053b7c09 +at91 bd49a1c72abbdddbc7b3d691d926623e33a7c1a0 +bmc 52532c11f746be0181c7969c003b9fbdb942429f +broadcom c0f2033a9ce4b843ca3e947536a0607ecf982be1 +cix a0cffbd8878c55b12dc4555f883adf3372cecd91 +davinci 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +drivers-memory 1e88944ecbe9def8aeef898a2e9ce29cf509a9de +fsl a7831c657c90e8f9165f6bbe0cc56262fee075e8 +imx-mxs e20daa6eb46fdb339be122a37211aa408488a3e3 +mediatek 4bfec57314396c8c816ee78f4803987882b668a7 +mvebu 43cb5b5bd349a2b5f5ad2abd3abedaa5d69ca7a9 +omap 7cdd46c9d6c5a7f4800195af82bb718081e7c84d +qcom f5672a3dff0291d6a45eb0c258b9d2baeb4dc577 +realtek 3c778f0c9fa36b6b9a26bd2146df24ed4e830ba4 +renesas a968c0b12aee284d6eabcb73fba6cedf79720707 +reset e7915fe110d8c7f1563d6b1d9bbc104ff7b32a4f +rockchip 2974b78ee4302390eceb5f5983c00b3d66fc3c78 +samsung-krzk 2c222a46655e0191e70ca92258ad3b3ead32787c +nomadik 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +integrator 5bf1bb010712bba28eda926ed453db3cab91381a +scmi 09fd63fe687ffa2d6594cd31d6fcf5fa7740a63c +sophgo 60e4cafd30908e7d8cdfdb4fa1a74dabed9f47b5 +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit d5eefaf546eb83f98206137a5784b6b8510e4fe5 +stm32 f831584128ac2a36fb4fa62fe106793d08c2dbf1 +sunxi 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +tee b0adf8e5e1ebf416abfe055475f08ae6a72fc2f7 +tegra 016e9c7ec4d13322c2544ad17a02fbbabeec4d68 +tenstorrent-dt cee9395acd8043be0644b25c34bfa86623f2b935 +fustini-config cee9395acd8043be0644b25c34bfa86623f2b935 +thead-dt 2414ca8f5a0cafdfdb2b5899fd173adc09b5adf1 +ti 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +xilinx 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +socfpga eacf108de5664898d658882c8ece2745ef557b04 +clk fc1f8f0ceb3b949b58c2f7819976644f5cf84249 +clk-imx 52d4d1b26a5bc64de95099d0a3dd8b90dba1f3a3 +clk-renesas 21cbd7ec29930f8e7e156e18b81736f099f03849 +thead-clk cee9395acd8043be0644b25c34bfa86623f2b935 +tenstorrent-clk c64b54ddb692c30b8fb139a2ead32eb4db7faef5 +csky abb81e5ce7d995baa41556b8125fa59e28ba3be8 +loongarch 6f8d12bb1a1231dbba579932772701880745a21d +m68k af32c3cb72529b14bfb2685bbdaa2b1514496b58 +m68knommu cffad6e71539bc00d5a76c0c1057dc067d42715c +microblaze 2c455ddca7827ad8fa3a64fdbf5a60efb928b46a +mips 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +openrisc 6620f5e8c11c4f7e41222a86f5c97150cc5f84a5 +parisc-hd c03c1a14507dfaf8b856c2608f9ac216021fc222 +powerpc 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +risc-v 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +riscv-dt 2186ec5f59c23fcf0bf896ca0543b6a1135d7bb5 +riscv-soc 3160b4a8aeea997f9b494db8c9e14a4d287a7381 +s390 375d5d57545f53d2bc3e15ada0e9da360fc68bea +sh 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +sparc c95443b98771a74c6689f5e7bbc56794fe95f550 +uml d12b1cc8b5e961a732e587d16b814b9baa0c80c6 +xtensa 28722ed2527aa63ac1454013defe718c56032886 +fs-next 70881a269b28a6f4431f3bbb60dfe86e664a78f8 +printk 647ef123d19695b5d8c79e03c86fb17c558e30b7 +pci 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +pstore 7c756181175d50200be487affa905e973f6cbaf5 +hid 720806515cb6921ab05caaa6f470f7054b56385e +i2c 8cd9520d35a6c38db6567e97dd93b1f11f185dc6 +i2c-andi 00fb8097ca5a4fcf0e0cc1550075aa7313bbd32a +i2c-rust e7755b5f29ccbfd1222dd52dc2d6eebf39d02289 +i3c fc5eb1b0631aa3b34c530ae962d01699ed22a0ae +dmi 1afafbaf749d8e8ec53f8e38efdc731131902b5b +hwmon-staging 0dd96d0d34d183866ca6daf5af41341abdfc982a +jc_docs 2649344d20dfb13e30b560f06138229d8e40350a +v4l-dvb 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +v4l-dvb-next adc218676eef25575469234709c2d87185ca223a +pm 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +cpufreq-arm 81792daacfb41ca07b04bd3956ea9e672080cc98 +cpupower 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +devfreq 9a222650d9e70d0027126e4df5b00b1b5b678a97 +pmdomain 6d318db9ffcb611f9b3b6b3201c963690541a943 +opp 706081c6b9327dd611dd72b20130a77f0f059b6e +thermal 2dc1f296b5754dd2441fc8b6613a362a47f6b98f +rdma 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +net-next 7b6ab4dbc156e2f96419715130b3d5738a306c93 +bpf-next cd5bc55288d4fd999595c8f2af6a5408cbe92a52 +ipsec-next 7b6ab4dbc156e2f96419715130b3d5738a306c93 +mlx5-next 41de84543574f2923776790f608c56389aed972e +netfilter-next 734bef548a96e8774d6eef5dfa2026c6edc4e80b +ipvs-next 734bef548a96e8774d6eef5dfa2026c6edc4e80b +bluetooth 3f425f95ba3923d605f6a8b382e8fcdc59d479db +wireless-next 9b0be45d4d52fd223994e151f169743a97abd290 +ath-next cd026e68fdbf88b9cc522b76c7a9d92c9a41f709 +iwlwifi-next 3627924ed81fd7783394fb2555ea179c6606a231 +wpan-next a6bfdfcc6711d1d5a92e98644359dedc67c0c858 +wpan-staging a6bfdfcc6711d1d5a92e98644359dedc67c0c858 +mtd 0ef71adafaa9b36a06dd5b823aebcd2fa9b9b9c2 +nand 30daaf3e7897b4a8d9b72e5b0c86dd6e2a4d7d85 +spi-nor 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +crypto 178aff4cf425b3fc51ff09c571fa1bfbc1eb8ea4 +libcrypto 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +drm 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +drm-exynos 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc 9a96e169c9267af918d28fb291df948d83112807 +amdgpu a24121023a434cb9b2b4db964d3fbbb4547d5e4c +drm-intel 20e3d954f70486bf14000fc1a6dac7c34e6e4f07 +drm-msm d024361c631b3f020a26c07d683e5103404b0fbf +drm-msm-lumag 6b93e8b453fa27a1b6a1d472f3ff8663e6811fae +drm-xe 8159948f64242edb93fb27df62de2a2b02d6ec6a +drm-rust 1c221646e5e5f8a1d2f29cc8250b5785433bda37 +drm-nova 93296e9d9528f0d87f2cf3fee494599060a0f14a +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev 3e13b8b8516caf4e0be428ca34dc3fe9401d0d50 +regmap 506367f9d2f51de9461a7e2097561f0af5ee0e75 +sound 3f2882212c558336d0bf3b1c03b8e1a6b348a6e0 +ieee1394 3110316fb834e17670ba2690ee75fb05d92b3ef1 +sound-asoc aae83f3931bc3a5497bcc8351b5f954ad7ac895c +modules 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +input 18519af74db061213de2b4b0d01616cafe25c8ee +block 81cb9aa432468444e8c883eb45028133a7a27bd6 +device-mapper 334714e4bdf8868c17a7650a7502ba1c90a8721f +libata 6ba53556f93f79e5273d9a5fcd39c3ba3b0ea391 +pcmcia b3c26ea81ccc522e77ed0b1707add61fc9206216 +mmc fd9af27f6c2319713bb23832066585f8a59a1771 +mfd aac882d8b77e79a855b11ff6749d927006c61c64 +backlight 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +battery 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +regulator 5436a50a0b44b448f965e928507b5159059dee57 +security 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +apparmor 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +integrity 52beb95621c04f4beab56858f9328b1a18f53583 +selinux 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +smack fedc88e38ce979a720cd2de042578cb5df3dc8de +tomoyo 72d3fcf802c45d00b300f25b848a93c3a2bd7c7e +tpmdd-tpm 36aad21d50d1af3f6954bb0c988257a908202477 +tpmdd-keys aef3a8a4f988bd2056de48ec0840ff47f7757087 +watchdog 6276c8195e598361942082423114877265c17692 +iommu 20bfd25757659ff8229eeed6f048c76f9a11a4a3 +audit 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +devicetree bb95b7759d509dd41cf9605dd3edd0969393955a +dt-krzk 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +mailbox 01a40ad5a9687ea5a837857d4b21ddd764be7aa3 +spi 264d1cf96262971c6595efef4ce519882e944b09 +tip b4e7e462d76cebd4368292d0cb32c47466de7017 +kexec 833d2b79ed9520e77c5d83eb11644e5239b2c5bb +liveupdate 27be83a12b246b6b3783e7d3ac5c378ff7520f25 +clockevents c40b76c8cf580466d9e56223f7f74beecc165480 +edac 0489f2176209b710890096699c4b869f1db91df4 +ftrace d7ff48d92a0f28bc0612da47c054efbc28c19562 +rcu d9011419496a3dc6b455b5308846684c63c18de5 +paulmck 0bd14c956dd2e4c8deed369ee3e3939b83bdb31c +kvm d21eef2084a9af87ac2a783bc7c2b175ba114e4e +kvm-arm dd0bc00e3e9201fd49b62ff9cc07890c89003afe +kvms390 e93fb70b748982fda5e6d97721df35194cacfc4a +kvm-ppc 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +kvm-riscv 633b3931a87438282d6454646ff40c669a6896cb +kvm-x86 dea4f6380f4ec96e8f3b0aaf2343764bd0d25ef4 +xen-tip 61b6d1df1d6234c38a6ea7e4f58e7da035ef6ab4 +percpu 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +workqueues 5df47699c277199601abb6bc2d97479f230cda6a +sched-ext f7008fb94ee033c8de9f42ae2bf2911db73c17f9 +drivers-x86 c339f4010dea8b0d754f84ace70cd1b089878ef8 +chrome-platform f19a0c420750d232fdd4b91848f0e12a2911fa53 +chrome-platform-firmware 676506be3e9140619540641be02a0d33636e29e1 +hsi 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +leds-lj fb511964723311e9a7223e424d725c58dde8307a +ipmi dcaeaa4ae71b10bc23d63271980063be10595284 +driver-core 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +usb 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +thunderbolt 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +usb-serial 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +tty 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +char-misc 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +coresight 343cfcbb3ecfdb80aa576a428cfa3b65ad783842 +fastrpc ef071c4906eb45d16b60f09154cf0bc6ec8f5435 +fpga 093da48782df3d50953c520626b345ca70af8cbd +icc 3fd56a2833c22f62eb84297d0dbd47739632f1a0 +iio 1390ca4953a7400ca932cb49635f02c727f885a6 +nfc fd73f4a6659897191fa0d40695fe370925dd3780 +phy-next 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +soundwire afd88e7ad78170040612f608203734156b8a9eb1 +extcon 8d3ae59288f1e7d58d76558a6ee96d533bc5019f +gnss 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +vfio 076d7e989cb69f6ded7d60f2a080eb909930061b +w1 e8bb5d130f2592632897aaa8e4e05a908a4847d6 +spmi 8f70c729e68c3e02ccca6d13c733175489fdc069 +staging 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +counter-next d722f879730c766ed9347352f4b5855a4841125d +mux ac7bde3c53166656d80e3aacc7d274d3c60a6de4 +dmaengine 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +cgroup c132dc07771f94b0de4fba28a0adbdff66f41d72 +scsi 2e37faaadcc3858729ca96189e51019223ea76ce +scsi-mkp 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +vhost 1a577f9402c1780cc1e663f48d5dd54c02051b09 +rpmsg 9d65b35ec38ff97c6f7d4a4d1ac32752fe43f8f3 +gpio-brgl d66b6b86d5a6278ca930112c634d03725beb7d9a +gpio-intel 0fc424b6a8ef447450f6087db42abce3a6feb328 +pinctrl 6e648fe0b51f9cc15dbc63391bb723ac037d686c +pinctrl-intel 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +pinctrl-renesas f9edef88c5e138689a59b6d4150999ac8e94bf1f +pinctrl-samsung 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +pinctrl-qcom 17a9fde355fd07b87885d93110588870bfddfe27 +pwm 9ad5602d4943635ea2b3b73d1a720161f88da1a1 +ktest 5b598ba5f3bf367944956cee59c6d078c53ca694 +kselftest 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +kunit 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +kunit-next 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +livepatching f1e818b239dd11397f9a379b84a7a4985e8afdfe +rtc 7485659ecb81d5fce3a3edf2cae9fcb29c17b1cd +nvdimm 9b036546a02c6c9a5133f9c1e93503896595c6ba +at24 dc59e4fea9d83f03bad6bddf3fa2e52491777482 +ntb dc59e4fea9d83f03bad6bddf3fa2e52491777482 +seccomp e32008340585a12783045c4426fbb963cfa11b7e +slimbus 4350d705466992dce4a21c382985553bfb568f65 +nvmem 41f42ff4ae134eba8dbe3424cf2ca1824c652edd +hyperv eab80895d447ec164a1d91a1ab377bd3a9dc9044 +auxdisplay f63dc0eea92d07c5bb799a406571b555cd2bbd97 +kgdb 9ca9e8c857b55a081d5a1f8039b27cbb4d646b49 +hmm 47193113641e5e1f9b5758b73d7b7a0273acb836 +cfi 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +mhi 0b1883ca75c0005ab5ca52c7bc1a26329bc39746 +cxl 8550ed0ea86ef4772be509f8fda14f350695ed7c +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi 2c493ac8c347167eec9e4e985d2b58d5fa6fd420 +unicode a511442085c140da9cdbe60e3f0fab1c71480801 +random eb13a1ff271b0d180687eebb30611b0b276d5193 +landlock 3e271a27c46fd591d1011c7de5a644a41e2010f1 +sysctl 4991c8b72b564cd16cb48124f880617fd49f1013 +execve b36b990c50b1f581b9a7f35ae256f5542415fa69 +bitmap 4c9c30534d06fea3070e57b868f8b7755950824c +hte 30167fadbf87fa901a2fee49c30a5c5a506a43e8 +kspp 56a1b1018838ce281eb47c74e0a118a210a804cf +nolibc 70c0be5b80661b6ba4348872850e6a0ae6ae2a9a +iommufd 04bcf84613346b973a8cc0c59238b6b5bc902688 +turbostat f31adc690d6834db65d8683b6b835497606f5e6c +pwrseq a88a76c3f5297991dc0c1673e7268a9b2a790d94 +capabilities-next 507adb6448378155ec89495fed8c3c09d8c83920 +ipe c03c1a14507dfaf8b856c2608f9ac216021fc222 +kcsan bd3cc16d1d7d584911f856adc458f242b1c7e85f +crc 6628e7d4c6b25c8d18f1345e3a20d21829aae7e4 +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 000000000000..53bc0910d926 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,438 @@ +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 +rxarray https://git.kernel.org/pub/scm/linux/kernel/git/da.gomez/linux.git#rxarray-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 +alpha-magnus https://git.kernel.org/pub/scm/linux/kernel/git/lindholm/alpha.git#for-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 000000000000..50f241a9e85a --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4872 @@ +$ date -R +Tue, 03 Nov 2026 12:20:35 +0000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 6628e7d4c6b25 Linux 7.4-rc1 +Merging origin/master (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Already up to date. +Merging ext4-fixes/fixes (8c4f6e3376348 ext4: introduce a mount option for iomap buffered I/O path) +$ 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 (a522dd871024a fs: don't fail __d_obtain_alias() for unlinked inodes) +$ git merge -m Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Already up to date. +Merging fscrypt-current/for-current (6628e7d4c6b25 Linux 7.4-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 (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging btrfs-fixes/next-fixes (93ac825f8f7ee Merge branch 'misc-7.4' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/verity.c +Auto-merging fs/btrfs/zoned.c +Merge made by the 'ort' strategy. + 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 | 24 ++++++++++++++++++++++++ + fs/btrfs/qgroup.c | 12 +++++++----- + fs/btrfs/scrub.c | 22 +++++++++++++++++----- + fs/btrfs/sysfs.c | 4 ++++ + fs/btrfs/verity.c | 2 +- + fs/btrfs/volumes.c | 7 ++++++- + fs/btrfs/zoned.c | 5 +++++ + 11 files changed, 97 insertions(+), 15 deletions(-) +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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (1d27da7de3f74 ovl: check the casefold flag of directories only) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging btrfs/for-next (d1dca33127efa Merge branch 'for-next-next-v7.4-20261030' into for-next-20261030) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. + fs/btrfs/Kconfig | 1 + + fs/btrfs/backref.c | 6 +- + fs/btrfs/backref.h | 3 +- + fs/btrfs/block-group.c | 21 ++-- + fs/btrfs/compression.c | 3 + + fs/btrfs/dev-replace.c | 3 +- + fs/btrfs/disk-io.h | 3 +- + fs/btrfs/ioctl.c | 11 +- + fs/btrfs/lzo.c | 16 +-- + fs/btrfs/raid56.c | 247 ++++++++++++++---------------------- + fs/btrfs/raid56.h | 7 +- + fs/btrfs/scrub.c | 135 ++++++++++++-------- + fs/btrfs/send.c | 71 ++++++++++- + fs/btrfs/space-info.c | 5 +- + fs/btrfs/space-info.h | 3 +- + fs/btrfs/tests/extent-map-tests.c | 2 +- + fs/btrfs/tree-checker.c | 29 +++-- + fs/btrfs/tree-log.c | 31 +++++ + fs/btrfs/volumes.c | 255 +++++++++++++++++++++++--------------- + fs/btrfs/volumes.h | 24 ++-- + fs/btrfs/zlib.c | 6 +- + fs/btrfs/zoned.c | 136 +++++++++++++------- + fs/btrfs/zstd.c | 5 +- + include/uapi/linux/btrfs.h | 10 ++ + 24 files changed, 615 insertions(+), 418 deletions(-) +Merging ceph/master (66ba287b7797a ceph: remove i_truncate_mutex, use i_fragtree_mutex for both) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + fs/ceph/inode.c | 9 ++++++--- + fs/ceph/super.h | 38 +++++++++++++++++++++++++++++--------- + 2 files changed, 35 insertions(+), 12 deletions(-) +Merging cifs/cifs-next (51b4bf5fe7c90 Merge tag 'cifs-fixes-7.4-rc1' of https://git.manguebit.org/linux) +$ git merge -m Merge branch 'cifs-next' of https://git.manguebit.org/linux.git cifs/cifs-next +Already up to date. +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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (79130348ec29b exfat: preserve the 64-bit FITRIM minimum length) +$ 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 | 7 +++++-- + fs/exfat/inode.c | 3 --- + fs/exfat/iomap.c | 7 ++++++- + fs/exfat/namei.c | 4 +--- + fs/exfat/nls.c | 38 +++++++++++++++++++------------------- + 5 files changed, 31 insertions(+), 28 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 +Auto-merging fs/dcache.c +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 (9b12299b437e0 f2fs: report sub-block project quotas in statfs) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + Documentation/filesystems/f2fs.rst | 10 + + fs/f2fs/checkpoint.c | 40 +- + fs/f2fs/compress.c | 7 +- + fs/f2fs/data.c | 1552 ++++++++++++++++++++++++++++++++---- + fs/f2fs/dir.c | 2 +- + fs/f2fs/f2fs.h | 184 ++++- + fs/f2fs/file.c | 289 +++++-- + fs/f2fs/gc.c | 51 +- + fs/f2fs/inline.c | 3 +- + fs/f2fs/inode.c | 4 +- + fs/f2fs/namei.c | 9 +- + fs/f2fs/node.c | 2 +- + fs/f2fs/segment.c | 13 +- + fs/f2fs/super.c | 39 +- + 14 files changed, 1905 insertions(+), 300 deletions(-) +Merging fsverity/for-next (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (aa0c00a516faa 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 +Merge made by the 'ort' strategy. + fs/fuse/readdir.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) +Merging gfs2/for-next (9aa0082cf969a gfs2: Minor error message improvement) +$ 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/glock.c | 40 +++++++++++++++++++++------------------- + fs/gfs2/log.c | 7 +++++-- + fs/gfs2/lops.c | 3 ++- + fs/gfs2/super.c | 8 ++++---- + fs/gfs2/super.h | 4 ++++ + fs/gfs2/sys.c | 6 ++++-- + 6 files changed, 40 insertions(+), 28 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 (e49296d51ccbf ksmbd: require NUL-terminated EA names) +$ 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 | 4 ++++ + fs/smb/server/smb2pdu.c | 34 ++++++++++++++++++++++++++++--- + fs/smb/server/smbacl.c | 43 ++++++++++++++++++++++++++++++++------- + 3 files changed, 71 insertions(+), 10 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 (4fdfaf7cc3a66 NFSD: Take a file unhashed during construction back off the LRU) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Merge made by the 'ort' strategy. + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + fs/lockd/lockd.h | 2 +- + fs/lockd/svc.c | 50 +- + fs/lockd/svclock.c | 2 +- + fs/lockd/svcsubs.c | 18 +- + fs/nfs_common/nfsacl.c | 6 +- + fs/nfs_common/nfslocalio.c | 11 +- + fs/nfsd/Kconfig | 17 - + fs/nfsd/blocklayout.c | 28 +- + fs/nfsd/export.c | 22 +- + fs/nfsd/filecache.c | 32 +- + fs/nfsd/netns.h | 17 +- + fs/nfsd/nfs4callback.c | 10 +- + fs/nfsd/nfs4ctl.h | 8 +- + fs/nfsd/nfs4layouts.c | 113 ++- + fs/nfsd/nfs4proc.c | 23 +- + fs/nfsd/nfs4recover.c | 1021 +------------------- + fs/nfsd/nfs4state.c | 191 ++-- + fs/nfsd/nfs4xdr.c | 38 +- + 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/exportfs_block.h | 2 + + 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 | 11 +- + net/sunrpc/svc_xprt.c | 20 +- + 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 +- + 50 files changed, 2432 insertions(+), 1811 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 (c77ab4eeeb3ed ntfs: don't allow compression on volumes with clusters larger than 4K) +$ 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/attrib.c | 9 ++++++--- + fs/ntfs/ea.c | 5 +++++ + fs/ntfs/index.c | 41 +++++++++++++++++++++++++++++++++++++++-- + fs/ntfs/index.h | 1 + + fs/ntfs/inode.c | 38 +++++++++++++++++++++++++++++--------- + fs/ntfs/namei.c | 6 ++++-- + 6 files changed, 84 insertions(+), 16 deletions(-) +Merging ntfs3/master (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Already up to date. +Merging orangefs/for-next (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 (9dde020e19681 Merge branch 'xfs-7.5-merge' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_alloc.c | 92 +++++++------------------- + fs/xfs/libxfs/xfs_bmap.c | 153 +++++++++++-------------------------------- + fs/xfs/libxfs/xfs_bmap.h | 10 ++- + fs/xfs/libxfs/xfs_btree.c | 18 ++--- + fs/xfs/libxfs/xfs_btree.h | 4 +- + fs/xfs/libxfs/xfs_ialloc.c | 51 +++------------ + fs/xfs/libxfs/xfs_ialloc.h | 3 +- + fs/xfs/libxfs/xfs_refcount.c | 97 +++++---------------------- + fs/xfs/libxfs/xfs_refcount.h | 2 +- + fs/xfs/libxfs/xfs_rmap.c | 96 ++++----------------------- + fs/xfs/scrub/rcbag.c | 12 +--- + fs/xfs/scrub/rcbag_btree.c | 5 +- + fs/xfs/scrub/rcbag_btree.h | 3 +- + fs/xfs/xfs_discard.c | 26 +++++--- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_file.c | 55 ++-------------- + fs/xfs/xfs_healthmon.c | 2 +- + fs/xfs/xfs_inode.c | 47 +++++++++++-- + fs/xfs/xfs_inode.h | 3 +- + fs/xfs/xfs_ioend.c | 2 +- + fs/xfs/xfs_iomap.c | 28 +++++++- + fs/xfs/xfs_iomap.h | 3 +- + fs/xfs/xfs_message.h | 1 + + fs/xfs/xfs_pnfs.c | 90 +++++++++++++++++-------- + fs/xfs/xfs_sysfs.c | 2 +- + fs/xfs/xfs_zone_gc.c | 2 +- + 26 files changed, 296 insertions(+), 513 deletions(-) +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. +Resolved 'tools/testing/selftests/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 1b072c9e11a7d] 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 (dbead60545f43 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 +Updating 6628e7d4c6b25..dbead60545f43 +Fast-forward (no commit created; -m option ignored) + Documentation/mm/vmemmap_dedup.rst | 15 +- + MAINTAINERS | 762 ++++++++++++++------------- + arch/arm64/mm/mmu.c | 3 +- + arch/openrisc/kernel/or32_ksyms.c | 1 + + arch/riscv/mm/init.c | 32 +- + fs/hugetlbfs/inode.c | 14 +- + fs/proc/internal.h | 1 + + fs/proc/task_mmu.c | 21 +- + include/asm-generic/tlb.h | 3 +- + include/linux/damon.h | 10 + + include/linux/huge_mm.h | 5 +- + include/linux/hugetlb.h | 15 +- + include/linux/kasan.h | 15 +- + include/linux/ksm.h | 6 +- + include/linux/memfd.h | 9 + + include/linux/memremap.h | 6 + + include/linux/mm.h | 209 ++++---- + include/linux/mmap_lock.h | 22 +- + include/linux/mmu_notifier.h | 3 +- + include/linux/mmzone.h | 9 +- + include/linux/page-flags.h | 1 + + include/linux/shmem_fs.h | 15 +- + include/linux/userfaultfd_k.h | 23 +- + include/trace/events/hugetlbfs.h | 2 +- + include/trace/events/oom.h | 8 +- + kernel/fork.c | 20 +- + lib/assoc_array.c | 36 +- + lib/base64.c | 3 + + lib/iov_iter.c | 9 +- + lib/test_xarray.c | 70 +++ + lib/xarray.c | 11 +- + mm/cma.c | 14 +- + mm/damon/core.c | 10 +- + mm/damon/sysfs-schemes.c | 3 + + mm/filemap.c | 88 ++-- + mm/gup.c | 68 ++- + mm/huge_memory.c | 162 ++++-- + mm/hugetlb.c | 82 ++- + mm/hugetlb_vmemmap.c | 8 +- + mm/internal.h | 40 +- + mm/kasan/common.c | 13 +- + mm/kasan/generic.c | 17 +- + mm/kasan/kasan.h | 34 +- + mm/kasan/kasan_test_c.c | 139 +++++ + mm/khugepaged.c | 133 +++-- + mm/ksm.c | 66 ++- + mm/madvise.c | 19 +- + mm/memcontrol.c | 5 + + mm/memfd.c | 2 + + mm/memory-failure.c | 69 +-- + mm/memory-tiers.c | 29 +- + mm/memory.c | 133 +++-- + mm/memory_hotplug.c | 13 +- + mm/mempolicy.c | 109 ++-- + mm/mempool.c | 4 +- + mm/memremap.c | 13 + + mm/migrate.c | 15 +- + mm/mlock.c | 6 +- + mm/mm_init.c | 2 - + mm/mmap.c | 8 +- + mm/mmap_lock.c | 61 ++- + mm/mmu_notifier.c | 24 +- + mm/mmzone.c | 11 +- + mm/mprotect.c | 2 +- + mm/mremap.c | 103 ++-- + mm/nommu.c | 2 +- + mm/page-writeback.c | 8 +- + mm/page_alloc.c | 157 ++++-- + mm/page_alloc.h | 33 +- + mm/rmap.c | 23 +- + mm/shmem.c | 193 +++++-- + mm/shmem_quota.c | 28 +- + mm/slub.c | 13 +- + mm/swapfile.c | 12 +- + mm/truncate.c | 13 +- + mm/userfaultfd.c | 142 +++-- + mm/util.c | 13 + + mm/vma.c | 156 ++++-- + mm/vma_init.c | 3 + + mm/vmalloc.c | 94 +++- + mm/vmscan.c | 4 +- + 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 | 6 +- + tools/testing/vma/shared.h | 16 +- + 86 files changed, 2530 insertions(+), 1369 deletions(-) +Merging fs-current (f5aa16d06d179 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. + 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 | 24 ++++++++++++++++++++++++ + fs/btrfs/qgroup.c | 12 +++++++----- + fs/btrfs/scrub.c | 22 +++++++++++++++++----- + fs/btrfs/sysfs.c | 4 ++++ + fs/btrfs/verity.c | 2 +- + fs/btrfs/volumes.c | 7 ++++++- + fs/btrfs/zoned.c | 5 +++++ + 11 files changed, 97 insertions(+), 15 deletions(-) +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 init/Kconfig +Auto-merging scripts/Kconfig.toolchain +Merge made by the 'ort' strategy. +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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-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 (a78ee2e05f7c7 memory: fsl_ifc: Clear fsl_ifc_ctrl_dev on probe failure and removal) +$ 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 +Merge made by the 'ort' strategy. + drivers/memory/atmel-ebi.c | 27 +++++++++--- + drivers/memory/fsl_ifc.c | 75 +++++++++++++++++--------------- + drivers/memory/tegra/tegra186.c | 1 + + drivers/memory/tegra/tegra210-emc-core.c | 16 ++++--- + 4 files changed, 71 insertions(+), 48 deletions(-) +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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (b3427f41f831a Merge tag 'ipsec-2026-11-02' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + .../networking/xfrm/xfrm_migrate_state.rst | 25 ++- + Documentation/process/maintainer-netdev.rst | 4 + + drivers/bluetooth/btintel.c | 24 ++- + drivers/bluetooth/btmtk.c | 49 ++++- + drivers/bluetooth/btqca.c | 3 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 33 +++ + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 34 +++- + drivers/net/ethernet/jme.c | 37 +++- + drivers/net/ethernet/jme.h | 1 + + drivers/net/ethernet/mediatek/mtk_wed.c | 27 ++- + .../ethernet/mellanox/mlx5/core/lib/macsec_fs.c | 3 +- + drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 6 + + drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 10 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 92 ++++++++- + drivers/net/ethernet/microsoft/mana/hw_channel.c | 9 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 22 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 19 +- + drivers/net/ethernet/sfc/ptp.c | 108 ++++++---- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_est.c | 61 +++++- + drivers/net/ethernet/stmicro/stmmac/stmmac_est.h | 8 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 207 +++++++++++-------- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 46 +---- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 96 +++++---- + drivers/net/ipa/ipa_interrupt.c | 12 +- + drivers/net/macvlan.c | 10 + + drivers/net/mctp/mctp-i3c.c | 3 +- + drivers/net/phy/phy_device.c | 8 +- + drivers/net/veth.c | 5 +- + drivers/net/vxlan/vxlan_core.c | 14 +- + drivers/net/wwan/mhi_wwan_ctrl.c | 11 + + drivers/ptp/ptp_clock.c | 5 + + drivers/ptp/ptp_private.h | 7 +- + drivers/ptp/ptp_sysfs.c | 24 ++- + drivers/ptp/ptp_vclock.c | 123 ++++++++---- + include/linux/netdevice.h | 2 + + include/linux/ptp_clock_kernel.h | 2 +- + include/net/bluetooth/hci_core.h | 104 +++++----- + include/net/espintcp.h | 5 +- + include/net/inet_frag.h | 9 + + include/net/mana/gdma.h | 19 +- + include/net/mana/mana.h | 1 + + include/net/xfrm.h | 7 + + net/batman-adv/bat_iv_ogm.c | 7 +- + net/batman-adv/distributed-arp-table.c | 1 + + net/batman-adv/main.c | 12 +- + net/batman-adv/multicast_forw.c | 5 +- + net/batman-adv/tp_meter.c | 2 +- + net/batman-adv/translation-table.c | 215 +++++++++++++------- + net/batman-adv/types.h | 8 +- + net/bluetooth/hci_conn.c | 92 ++++----- + net/bluetooth/hci_core.c | 66 ++++-- + net/bluetooth/hci_event.c | 212 ++++++++++++-------- + net/bluetooth/hci_sync.c | 223 ++++++++++++++++----- + net/bluetooth/iso.c | 20 +- + net/bluetooth/l2cap_core.c | 26 ++- + net/bluetooth/mgmt.c | 51 +++-- + net/bluetooth/smp.c | 53 +++-- + net/core/dev.c | 15 +- + net/core/sock_reuseport.c | 17 +- + net/ipv4/cipso_ipv4.c | 9 +- + net/ipv4/inet_fragment.c | 5 + + net/ipv4/tcp_input.c | 4 + + net/ipv4/xfrm4_output.c | 7 +- + net/ipv6/addrconf.c | 3 +- + net/ipv6/ip6_fib.c | 50 +++-- + net/ipv6/raw.c | 3 + + net/ipv6/seg6_local.c | 69 +++++-- + net/iucv/af_iucv.c | 9 + + net/qrtr/af_qrtr.c | 53 ++++- + net/sched/sch_qfq.c | 3 + + net/sctp/sm_make_chunk.c | 9 +- + net/smc/smc_sysctl.c | 6 +- + net/tipc/bearer.c | 33 +++ + net/xfrm/espintcp.c | 43 ++-- + net/xfrm/xfrm_interface_core.c | 8 + + net/xfrm/xfrm_iptfs.c | 3 +- + net/xfrm/xfrm_policy.c | 14 +- + net/xfrm/xfrm_replay.c | 6 +- + net/xfrm/xfrm_state.c | 101 ++++++++-- + net/xfrm/xfrm_user.c | 79 ++++++-- + tools/testing/selftests/net/fib_nexthops.sh | 40 ++-- + tools/testing/selftests/net/veth.sh | 81 +++++++- + 87 files changed, 2136 insertions(+), 831 deletions(-) +Merging bpf/master (9abe2c42ecab6 libbpf: Fix use-after-free in btf__add_type) +$ 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/kfuncs.rst | 7 + + arch/arm64/net/bpf_timed_may_goto.S | 12 +- + arch/loongarch/net/bpf_timed_may_goto.S | 10 +- + arch/powerpc/net/bpf_timed_may_goto.S | 9 +- + arch/riscv/net/bpf_timed_may_goto.S | 10 +- + arch/s390/net/bpf_jit_comp.c | 24 +- + arch/s390/net/bpf_timed_may_goto.S | 8 +- + arch/x86/kernel/ftrace_64.S | 6 +- + arch/x86/net/bpf_jit_comp.c | 19 +- + arch/x86/net/bpf_timed_may_goto.S | 5 +- + include/linux/bpf.h | 14 + + include/linux/bpf_verifier.h | 30 +- + include/linux/btf.h | 1 + + include/linux/filter.h | 8 + + include/linux/ftrace.h | 8 +- + kernel/bpf/arena.c | 29 +- + kernel/bpf/backtrack.c | 11 + + kernel/bpf/btf.c | 19 +- + kernel/bpf/cgroup.c | 26 +- + kernel/bpf/core.c | 41 +- + kernel/bpf/diagnostics.c | 6 +- + kernel/bpf/diagnostics.h | 1 + + kernel/bpf/fixups.c | 147 +++- + kernel/bpf/hashtab.c | 64 +- + kernel/bpf/helpers.c | 45 +- + kernel/bpf/liveness.c | 83 +- + kernel/bpf/log.c | 2 + + kernel/bpf/scev.c | 13 +- + kernel/bpf/stackmap.c | 33 +- + kernel/bpf/states.c | 14 + + kernel/bpf/verifier.c | 151 +++- + net/bpf/test_run.c | 3 +- + net/core/filter.c | 154 +++- + net/core/lwt_bpf.c | 57 +- + net/core/sock_map.c | 22 +- + tools/lib/bpf/btf.c | 14 + + .../libarena/selftests/test_parallel_bitmap.bpf.c | 10 + + .../testing/selftests/bpf/prog_tests/arena_mmap.c | 53 ++ + tools/testing/selftests/bpf/prog_tests/dynptr.c | 4 + + .../bpf/prog_tests/fentry_kprobe_shared.c | 65 ++ + .../selftests/bpf/prog_tests/freplace_args.c | 92 +++ + .../selftests/bpf/prog_tests/may_goto_far.c | 24 +- + .../selftests/bpf/prog_tests/timed_may_goto.c | 195 +++++ + tools/testing/selftests/bpf/progs/arena_htab.c | 2 - + tools/testing/selftests/bpf/progs/dynptr_fail.c | 264 ++++++ + tools/testing/selftests/bpf/progs/dynptr_success.c | 124 +++ + .../selftests/bpf/progs/fentry_kprobe_shared.c | 49 ++ + tools/testing/selftests/bpf/progs/freplace_args.c | 53 ++ + .../selftests/bpf/progs/freplace_args_tgt.c | 70 ++ + tools/testing/selftests/bpf/progs/timed_may_goto.c | 898 +++++++++++++++++++++ + .../selftests/bpf/progs/timed_may_goto_ext.c | 23 + + .../selftests/bpf/progs/timed_may_goto_user.c | 311 +++++++ + .../selftests/bpf/progs/verifier_bpf_fastcall.c | 72 +- + tools/testing/selftests/bpf/progs/verifier_callx.c | 20 + + .../selftests/bpf/progs/verifier_global_subprogs.c | 7 +- + .../bpf/progs/verifier_iterating_callbacks.c | 6 +- + .../selftests/bpf/progs/verifier_live_stack.c | 195 ++++- + .../selftests/bpf/progs/verifier_may_goto_1.c | 32 +- + .../selftests/bpf/progs/verifier_private_stack.c | 99 +++ + tools/testing/selftests/bpf/progs/verifier_scev.c | 182 +++++ + .../selftests/bpf/progs/verifier_stack_arg.c | 115 +++ + 61 files changed, 3748 insertions(+), 323 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/arena_mmap.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/fentry_kprobe_shared.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/freplace_args.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/timed_may_goto.c + create mode 100644 tools/testing/selftests/bpf/progs/fentry_kprobe_shared.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_args.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_args_tgt.c + create mode 100644 tools/testing/selftests/bpf/progs/timed_may_goto.c + create mode 100644 tools/testing/selftests/bpf/progs/timed_may_goto_ext.c + create mode 100644 tools/testing/selftests/bpf/progs/timed_may_goto_user.c +Merging ipsec/master (5def91015ba7b xfrm4: use a full socket for local errors) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +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 (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/horms/ipvs.git ipvs/main +Already up to date. +Merging bluetooth-fixes/master (60b10121db602 Bluetooth: MGMT: Fix discovery stuck after a failed Stop Discovery) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git bluetooth-fixes/master +Already up to date. +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 33082b537801e] 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (d73cab4a427f9 ALSA: usb-audio: qcom: Check the return value of qmi_handle_init()) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Auto-merging sound/hda/codecs/side-codecs/aw88399_hda.c +Auto-merging sound/hda/codecs/side-codecs/cs35l41_hda.c +Auto-merging sound/usb/usx2y/us122l.c +Merge made by the 'ort' strategy. + include/sound/cs35l41.h | 2 + + include/sound/hwdep.h | 1 + + sound/core/hwdep.c | 2 + + sound/core/memalloc.c | 2 +- + sound/core/ump_convert.c | 2 +- + sound/firewire/tascam/tascam-stream.c | 4 +- + sound/hda/codecs/conexant.c | 1 + + sound/hda/codecs/realtek/alc269.c | 19 ++++++-- + sound/hda/codecs/side-codecs/aw88399_hda.c | 5 +- + sound/hda/codecs/side-codecs/aw88399_hda_i2c.c | 2 + + sound/hda/codecs/side-codecs/cs35l41_hda.c | 33 +------------ + sound/hda/core/controller.c | 5 +- + sound/pci/cs46xx/dsp_spos.c | 2 + + sound/pci/cs46xx/dsp_spos_scb_lib.c | 3 +- + sound/soc/codecs/aw88399-lib.c | 30 ++++++------ + sound/soc/codecs/aw88399.c | 1 + + sound/soc/codecs/cs35l41-lib.c | 67 ++++++++++++++++++++++++++ + sound/soc/codecs/cs35l41.c | 18 ++----- + sound/usb/bcd2000/bcd2000.c | 20 ++++++-- + sound/usb/midi.c | 3 +- + sound/usb/qcom/qc_audio_offload.c | 7 +++ + sound/usb/quirks-table.h | 42 ++++++++++++++++ + sound/usb/quirks.c | 2 + + sound/usb/usx2y/us122l.c | 27 ++++++++--- + sound/usb/usx2y/usX2Yhwdep.c | 5 ++ + sound/usb/usx2y/usb_stream.c | 14 ++---- + 26 files changed, 225 insertions(+), 94 deletions(-) +Merging sound-asoc-fixes/for-linus (ef7062864c051 ASoC: qcom: q6apm: Guard callbacks until probe data is ready) +$ 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 +Merge made by the 'ort' strategy. + sound/soc/amd/yc/acp6x-mach.c | 21 +++++++++++++++++++++ + sound/soc/codecs/es8389.c | 17 +++++++---------- + sound/soc/codecs/lpass-rx-macro.c | 2 +- + sound/soc/codecs/tas2770.c | 23 ++++++++++++++++------- + sound/soc/codecs/tas2770.h | 4 +++- + sound/soc/meson/axg-fifo.c | 30 +++++++++++++++--------------- + sound/soc/qcom/qdsp6/q6apm.c | 6 ++++-- + sound/soc/qcom/qdsp6/q6prm.c | 3 +++ + sound/soc/sof/intel/hda-sdw-bpt.c | 6 ++++++ + 9 files changed, 76 insertions(+), 36 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 +Already up to date. +Merging regulator-fixes/for-linus (7904338c38426 regulator: mt6363: Fix register access and VEMC voltage handling) +$ 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/Kconfig | 1 + + drivers/regulator/mt6363-regulator.c | 156 ++++++++++------------------- + drivers/regulator/qcom_spmi-regulator.c | 35 +++++-- + include/linux/regulator/mt6363-regulator.h | 1 + + 4 files changed, 81 insertions(+), 112 deletions(-) +Merging spi-fixes/for-linus (2d0953ab69d31 spi: acpi: only look up the IRQ of confirmed SPI devices) +$ 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-amd.c | 24 ++++++++----------- + drivers/spi/spi-pic32-sqi.c | 3 ++- + drivers/spi/spi-rtk-nor.c | 13 +++++++++++ + drivers/spi/spi.c | 56 +++++++++++++++++++++++++++++++++++++-------- + 4 files changed, 71 insertions(+), 25 deletions(-) +Merging pci-current/for-linus (996a59519af2e 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 +Merge made by the 'ort' strategy. + drivers/pci/quirks.c | 1 + + 1 file changed, 1 insertion(+) +Merging driver-core.current/driver-core-linus (a42ae51fe3c36 MAINTAINERS: update auxiliary bus entry) +$ 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 MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + fs/kernfs/dir.c | 2 +- + rust/kernel/io/resource.rs | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging tty.current/tty-linus (eedf2cf3505c1 serial: samsung: put the previous baud clock) +$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/serial/8250/8250_exar.c | 2 +- + drivers/tty/serial/8250/8250_hp300.c | 62 +++++++++++++++-------------------- + drivers/tty/serial/8250/8250_lpss.c | 3 ++ + drivers/tty/serial/8250/8250_mxpcie.c | 13 +++++--- + drivers/tty/serial/fsl_lpuart.c | 10 ++++-- + drivers/tty/serial/imx.c | 10 ++++-- + drivers/tty/serial/rda-uart.c | 2 ++ + drivers/tty/serial/samsung_tty.c | 8 +++-- + drivers/tty/serial/serial_core.c | 25 ++++++++------ + drivers/tty/serial/serial_port.c | 4 +-- + drivers/tty/tty_io.c | 3 +- + drivers/tty/vt/keyboard.c | 6 ++++ + drivers/tty/vt/vt.c | 2 ++ + 13 files changed, 88 insertions(+), 62 deletions(-) +Merging usb.current/usb-linus (e971f4f365bad Merge tag 'usb-serial-7.4-rc1-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) +$ 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/host/xhci-ring.c | 73 ++++++++++-- + drivers/usb/host/xhci.c | 13 +- + drivers/usb/misc/usbtest.c | 3 + + drivers/usb/serial/garmin_gps.c | 31 +++-- + drivers/usb/serial/io_edgeport.c | 141 ++++++++++------------ + drivers/usb/serial/oti6858.c | 16 ++- + drivers/usb/serial/sierra.c | 18 ++- + drivers/usb/serial/upd78f0730.c | 13 +- + 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 ++++++ + 28 files changed, 630 insertions(+), 260 deletions(-) +Merging usb-serial-fixes/usb-linus (ab89a9dab02d9 USB: serial: garmin_gps: fix deadlock on reset request) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 77f6d45c5b6a9] Merge branch 'staging-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git +$ git diff -M --stat --summary HEAD^.. + 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 (340d44bdf9db0 iio: humidity: hid-sensor-humidity: Use per-instance callbacks) +$ 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/hid/hid-sensor-hub.c | 12 ++- + drivers/iio/accel/Kconfig | 4 + + drivers/iio/accel/adxl380.c | 11 ++- + drivers/iio/accel/kxsd9.c | 2 +- + drivers/iio/adc/ad7780.c | 4 +- + drivers/iio/adc/ad7791.c | 4 +- + drivers/iio/adc/ad7793.c | 4 +- + drivers/iio/adc/ad7923.c | 1 + + drivers/iio/adc/aspeed_adc.c | 25 ++++-- + drivers/iio/adc/max11205.c | 4 +- + drivers/iio/adc/mcp3564.c | 3 + + drivers/iio/adc/qcom-spmi-adc5-gen3.c | 5 +- + drivers/iio/addac/ad74413r.c | 2 +- + drivers/iio/afe/iio-rescale.c | 3 +- + drivers/iio/chemical/atlas-ezo-sensor.c | 3 - + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 5 +- + .../iio/common/hid-sensors/hid-sensor-attributes.c | 2 + + .../iio/common/inv_sensors/inv_sensors_timestamp.c | 24 ++++-- + 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/humidity/hid-sensor-humidity.c | 14 ++-- + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 24 +++--- + 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/hid-sensor-als.c | 16 +++- + 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/sx9310.c | 2 +- + drivers/iio/proximity/sx9324.c | 13 ++- + drivers/iio/proximity/sx9360.c | 29 +++++-- + drivers/iio/proximity/sx9500.c | 6 ++ + drivers/iio/temperature/hid-sensor-temperature.c | 14 ++-- + drivers/iio/temperature/mlx90614.c | 2 +- + include/linux/iio/common/inv_sensors_timestamp.h | 3 +- + 46 files changed, 347 insertions(+), 138 deletions(-) +Merging watchdog-fixes/watchdog (f4d9e02966d4f watchdog: meson_gxbb_wdt: fix suspend/resume handling of HW_RUNNING watchdog) +$ git merge -m Merge branch 'watchdog' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-fixes/watchdog +Merge made by the 'ort' strategy. + drivers/watchdog/meson_gxbb_wdt.c | 6 ++++-- + drivers/watchdog/mtk_wdt.c | 6 ++++-- + drivers/watchdog/orion_wdt.c | 3 +++ + drivers/watchdog/sc1200wdt.c | 1 + + 4 files changed, 12 insertions(+), 4 deletions(-) +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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6c067677192f0 soundwire: qcom: disable the interrupt before gating the clock) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Merge made by the 'ort' strategy. + drivers/soundwire/qcom.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging thunderbolt-fixes/fixes (f1ae606eb404b thunderbolt: Send header-only XDomain properties changed response) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Merge made by the 'ort' strategy. + drivers/thunderbolt/xdomain.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging input-current/for-linus (d1eb0afa9140c Input: xpad - add GameSir G7 Pro support) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/joystick/xpad.c | 1 + + 1 file changed, 1 insertion(+) +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 (01ad209f122b7 lib/crypto: mldsa: Add __must_check to mldsa_verify()) +$ 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. + include/crypto/mldsa.h | 6 +- + lib/crypto/Kconfig | 12 +- + lib/crypto/Makefile | 2 - + lib/crypto/mldsa.c | 15 +- + lib/crypto/powerpc/poly1305-p10le_64.S | 1076 -------------------------------- + lib/crypto/powerpc/poly1305.h | 76 --- + lib/crypto/tests/mldsa_kunit.c | 9 + + 7 files changed, 28 insertions(+), 1168 deletions(-) + delete mode 100644 lib/crypto/powerpc/poly1305-p10le_64.S + delete mode 100644 lib/crypto/powerpc/poly1305.h +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 (6628e7d4c6b25 Linux 7.4-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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (168cae7e87463 reset: spacemit: Fix the RCPU2 PWM reset registers) +$ git merge -m Merge branch 'reset/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux reset-fixes/reset/fixes +Merge made by the 'ort' strategy. + drivers/reset/reset-scmi.c | 1 + + drivers/reset/spacemit/reset-spacemit-k1.c | 18 +++++++++--------- + 2 files changed, 10 insertions(+), 9 deletions(-) +Merging mips-fixes/mips-fixes (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (8ba47800a3c3b Merge branch kvm-arm64/ls64-accdata 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 MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/process/maintainer-kvm-arm64.rst | 181 +++++++++++++++ + MAINTAINERS | 2 + + arch/arm64/include/asm/kvm_arm.h | 13 -- + arch/arm64/include/asm/kvm_asm.h | 2 +- + arch/arm64/include/asm/kvm_emulate.h | 3 + + arch/arm64/include/asm/kvm_host.h | 5 +- + arch/arm64/include/asm/kvm_nested.h | 38 ++- + arch/arm64/include/asm/mte.h | 4 + + arch/arm64/include/asm/sysreg.h | 1 - + arch/arm64/include/asm/virt.h | 2 +- + arch/arm64/kernel/cpufeature.c | 7 + + arch/arm64/kernel/mte.c | 15 +- + arch/arm64/kernel/pi/idreg-override.c | 2 + + arch/arm64/kvm/arm.c | 60 +++-- + arch/arm64/kvm/config.c | 112 +++++++++ + arch/arm64/kvm/guest.c | 11 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 16 +- + arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 23 ++ + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 16 +- + arch/arm64/kvm/hyp/nvhe/mm.c | 1 + + arch/arm64/kvm/hyp/nvhe/pkvm.c | 22 +- + arch/arm64/kvm/hyp/nvhe/psci-relay.c | 4 + + arch/arm64/kvm/hyp/nvhe/switch.c | 24 ++ + arch/arm64/kvm/mmu.c | 21 +- + arch/arm64/kvm/nested.c | 15 ++ + arch/arm64/kvm/pkvm.c | 6 + + arch/arm64/kvm/sys_regs.c | 22 +- + arch/arm64/kvm/vgic/vgic-init.c | 21 +- + arch/arm64/kvm/vgic/vgic-its.c | 68 +++--- + arch/arm64/kvm/vgic/vgic-kvm-device.c | 2 + + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 40 ++-- + arch/arm64/kvm/vgic/vgic-v3.c | 3 +- + arch/arm64/kvm/vgic/vgic-v4.c | 5 +- + arch/arm64/kvm/vgic/vgic.c | 12 +- + arch/arm64/kvm/vgic/vgic.h | 1 + + arch/arm64/tools/cpucaps | 1 + + arch/arm64/tools/sysreg | 125 ++++++++++ + drivers/irqchip/irq-gic-v4.c | 39 +++- + tools/testing/selftests/kvm/arm64/get-reg-list.c | 2 + + .../testing/selftests/kvm/arm64/vgic_lpi_stress.c | 258 +++++++++++++++++++-- + .../selftests/kvm/include/arm64/gic_v3_its.h | 2 + + tools/testing/selftests/kvm/lib/arm64/gic_v3_its.c | 28 +++ + 43 files changed, 1071 insertions(+), 167 deletions(-) + create mode 100644 Documentation/process/maintainer-kvm-arm64.rst +Merging hwmon-fixes/hwmon (c221091f7e30c hwmon: (aquacomputer_d5next) Avoid truncating scaled sensor readings) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + Documentation/hwmon/asus_rog_ryujin.rst | 6 + + drivers/hwmon/aquacomputer_d5next.c | 58 ++++++++-- + drivers/hwmon/asus_rog_ryujin.c | 54 ++++++++- + drivers/hwmon/asus_wmi_sensors.c | 13 +-- + drivers/hwmon/chipcap2.c | 196 +++++++++++++++++++++----------- + drivers/hwmon/coretemp.c | 26 +++-- + drivers/hwmon/corsair-cpro.c | 3 +- + drivers/hwmon/gpd-fan.c | 1 + + drivers/hwmon/gpio-fan.c | 7 +- + drivers/hwmon/hp-wmi-sensors.c | 29 ++--- + drivers/hwmon/lm75.c | 9 +- + drivers/hwmon/lm87.c | 7 +- + drivers/hwmon/nct6683.c | 4 +- + drivers/hwmon/peci/dimmtemp.c | 21 ++-- + drivers/hwmon/pmbus/pmbus_core.c | 58 ++++++---- + drivers/hwmon/pmbus/q54sj108a2.c | 2 + + drivers/hwmon/sht15.c | 22 ++-- + drivers/hwmon/sht4x.c | 4 +- + drivers/hwmon/tmp108.c | 26 ++--- + 19 files changed, 367 insertions(+), 179 deletions(-) +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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (086aeca907789 platform/x86: uniwill-laptop: Implement .hw_offloaded trigger callback) +$ 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 +Merge made by the 'ort' strategy. + drivers/platform/arm64/Kconfig | 1 - + drivers/platform/x86/uniwill/uniwill-acpi.c | 6 ++++++ + 2 files changed, 6 insertions(+), 1 deletion(-) +Merging samsung-krzk-fixes/fixes (a6b33da67ef16 ARM: dts: samsung: exynos4210-trats: fix BCM4330 Bluetooth GPIOs) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/samsung/exynos4210-trats.dts | 11 +++++++++-- + arch/arm/boot/dts/samsung/exynos4210-universal_c210.dts | 13 ++++++++++--- + arch/arm/boot/dts/samsung/exynos4412-p4note.dtsi | 1 + + 3 files changed, 20 insertions(+), 5 deletions(-) +Merging pinctrl-samsung-fixes/fixes (6628e7d4c6b25 Linux 7.4-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 (87dc4bfebcc0a Merge tag 'v7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into pinctrl-qcom/for-current) +$ 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 (9c1075791172d dt-bindings: usb: add Altera Agilex5 DWC3 controller) +$ git merge -m Merge branch 'dt/linus' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Merge made by the 'ort' strategy. + .../bindings/pwm/raspberrypi,rp1-pwm.yaml | 66 ++++++++++++ + .../devicetree/bindings/usb/altr,agilex5-dwc3.yaml | 112 +++++++++++++++++++++ + .../devicetree/bindings/usb/cypress,hx3.yaml | 1 - + 3 files changed, 178 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/pwm/raspberrypi,rp1-pwm.yaml + create mode 100644 Documentation/devicetree/bindings/usb/altr,agilex5-dwc3.yaml +Merging dt-krzk-fixes/fixes (6628e7d4c6b25 Linux 7.4-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 (ca14cc05808f9 Merge branch '7.4/scsi-queue' into 7.4/scsi-fixes) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + 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/libsas/sas_ata.c | 1 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +- + drivers/scsi/scsi_bsg.c | 8 ++- + drivers/scsi/scsi_debug.c | 1 + + drivers/scsi/scsi_scan.c | 5 +- + drivers/target/target_core_device.c | 18 +++++- + drivers/target/target_core_fabric_lib.c | 10 ++++ + drivers/target/target_core_pr.c | 9 +-- + drivers/target/target_core_tpg.c | 10 +++- + drivers/target/target_core_user.c | 5 ++ + drivers/ufs/core/ufshcd.c | 18 ++++-- + 18 files changed, 180 insertions(+), 73 deletions(-) +Merging drm-fixes/drm-fixes (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (01aa63eade529 drm/i915/vrr: Fix intel_vrr_dcb_vmin_vblank_start()) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- + drivers/gpu/drm/i915/display/intel_display.c | 19 +++-- + .../gpu/drm/i915/display/intel_display_device.c | 5 +- + drivers/gpu/drm/i915/display/intel_dp.c | 4 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 22 ++++- + drivers/gpu/drm/i915/display/intel_plane.c | 11 +++ + drivers/gpu/drm/i915/display/intel_psr.c | 96 ++++++++++------------ + drivers/gpu/drm/i915/display/intel_psr_regs.h | 4 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 24 ++++++ + drivers/gpu/drm/i915/display/intel_quirks.h | 1 + + drivers/gpu/drm/i915/display/intel_vrr.c | 12 ++- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- + 12 files changed, 131 insertions(+), 71 deletions(-) +Merging mmc-fixes/fixes (c56e67d774324 mmc: jz4740: Remove the host before resetting the controller) +$ 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/jz4740_mmc.c | 5 +++-- + drivers/mmc/host/meson-gx-mmc.c | 26 ++++++++++++++++++++++---- + drivers/mmc/host/mmci.c | 4 +++- + drivers/mmc/host/omap.c | 4 ++-- + drivers/mmc/host/sdhci-brcmstb.c | 11 ++++++++--- + drivers/mmc/host/sdhci-esdhc-imx.c | 17 +++++++++++++++++ + drivers/mmc/host/sunxi-mmc.c | 24 ++++++++++++++++++------ + 8 files changed, 73 insertions(+), 19 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 (6628e7d4c6b25 Linux 7.4-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 (b6d5e944b4eee x86/hyperv: use pointed-to type size for page table offsets) +$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + arch/x86/hyperv/hv_crash.c | 8 ++++---- + arch/x86/kernel/apic/io_apic.c | 2 -- + arch/x86/kernel/apic/msi.c | 4 +--- + arch/x86/kernel/hpet.c | 1 - + arch/x86/kernel/irq.c | 18 ++++++++---------- + drivers/hv/mshv_root_hv_call.c | 28 ++++++++++++++++++++++++---- + drivers/iommu/amd/init.c | 1 - + drivers/pci/controller/pci-hyperv.c | 1 - + 8 files changed, 37 insertions(+), 26 deletions(-) +Merging risc-v-fixes/fixes (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (9e4b35c95fede gpio: mpc8xxx: Fix potential use-after-free of IRQ domain) +$ 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-mpc8xxx.c | 22 ++++++--- + drivers/gpio/gpio-omap.c | 13 +++++- + drivers/gpio/gpio-rockchip.c | 15 ++++-- + drivers/gpio/gpio-sa1100.c | 32 +++++++++++-- + drivers/gpio/gpio-shared-proxy.c | 98 +++++++++++++++++++++++++++++++++++----- + drivers/gpio/gpiolib-shared.h | 1 + + 7 files changed, 151 insertions(+), 31 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 (6628e7d4c6b25 Linux 7.4-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 (6628e7d4c6b25 Linux 7.4-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 (8ca80811c3ba0 perf/renesas: Remove remaining RISCV_ALTERNATIVE references) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Merge made by the 'ort' strategy. + drivers/perf/Kconfig | 2 +- + drivers/soc/renesas/Kconfig | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) +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 (56e8ad28ebd79 efi/libstub: zboot: Round up image size to section alignment) +$ git merge -m Merge branch 'urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + drivers/firmware/efi/libstub/zboot.lds | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging battery-fixes/fixes (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (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 (57d916a3eb765 rust: bindings: derive Zeroable for bindgen's opaque array wrappers) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Merge made by the 'ort' strategy. + rust/Makefile | 9 ++++++++- + rust/kernel/cpufreq.rs | 4 ++-- + 2 files changed, 10 insertions(+), 3 deletions(-) +Merging w1-fixes/fixes (6628e7d4c6b25 Linux 7.4-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 (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Already up to date. +Merging thead-clk-fixes/thead-clk-fixes (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 (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'pwrseq/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current +Already up to date. +Merging thead-dt-fixes/thead-dt-fixes (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 (494c6a4cd3ef4 Merge branch into tip/master: 'x86/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. + Documentation/filesystems/resctrl.rst | 87 ++++++++++++++++++++-------------- + arch/x86/include/asm/checksum_32.h | 2 +- + arch/x86/include/asm/vmware.h | 24 ++++++---- + arch/x86/kernel/cpu/bugs.c | 12 ++--- + arch/x86/kernel/cpu/resctrl/internal.h | 4 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 4 +- + arch/x86/kernel/x86_init.c | 2 +- + 7 files changed, 76 insertions(+), 59 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 (d024361c631b3 drm/msm/a6xx: Split out a7xx/a8xx device tables) +$ 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 (b2010b3a0dbe7 rust: arch/um: Fix loading Rust modules) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Merge made by the 'ort' strategy. + arch/um/Makefile | 2 -- + 1 file changed, 2 deletions(-) +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 (6628e7d4c6b25 Linux 7.4-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 (5b4696e0bfc35 ocfs2: cache the mount context for dentry lock callbacks) + 3af83c11cf599 ("lib/base64: silence clang-24 -Wconstant-conversion with diag pragmas") + 8ff981aa283a0 ("openrisc: export __mulsi3 for modules") +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 4 ++ + MAINTAINERS | 14 ++++- + fs/fat/dir.c | 10 +++ + fs/fat/fat.h | 1 + + fs/fat/file.c | 70 +++++++++++++++------ + fs/fat/inode.c | 2 + + fs/fat/namei_msdos.c | 9 +-- + fs/fat/namei_vfat.c | 9 +-- + fs/ocfs2/cluster/heartbeat.c | 40 ++++++++++-- + fs/ocfs2/cluster/tcp.c | 5 +- + fs/ocfs2/dcache.h | 5 +- + fs/ocfs2/dlm/dlmmaster.c | 70 ++++++++++++++++++--- + fs/ocfs2/dlmglue.c | 34 +++++----- + fs/ocfs2/filecheck.c | 2 + + fs/ocfs2/journal.c | 15 ++++- + fs/ocfs2/journal.h | 1 + + fs/ocfs2/move_extents.c | 70 ++++++++++++--------- + fs/ocfs2/super.c | 3 + + fs/ocfs2/xattr.c | 146 ++++++++++++++++++++++++++++++++++++------- + kernel/panic.c | 2 +- + 20 files changed, 384 insertions(+), 128 deletions(-) +Merging mm-nonmm-hotfixes-unstable/mm-nonmm-hotfixes-unstable (5b4696e0bfc35 ocfs2: cache the mount context for dentry lock callbacks) +$ 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 +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (54a88d9afcca6 drm/bridge: nwl-dsi: Limit LCDIF specific sync override) +$ 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/loongson/lsdc_plane.c +Auto-merging drivers/gpu/drm/panel/panel-visionox-r66451.c +Auto-merging drivers/gpu/drm/v3d/v3d_gem.c +Auto-merging drivers/gpu/drm/v3d/v3d_sched.c +Auto-merging drivers/gpu/drm/vc4/vc4_gem.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.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 f6f3ea34e2437] 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/bridge/nwl-dsi.c | 17 +++++++++++------ + drivers/gpu/drm/drm_crtc.c | 18 ++++++++++++------ + drivers/gpu/drm/drm_panic.c | 2 +- + drivers/gpu/drm/imagination/pvr_rogue_fwif.h | 2 +- + drivers/gpu/drm/loongson/lsdc_gem.c | 14 +++++++++----- + drivers/gpu/drm/loongson/lsdc_plane.c | 2 +- + drivers/gpu/drm/loongson/lsdc_ttm.c | 14 +++++++++----- + drivers/gpu/drm/loongson/lsdc_ttm.h | 2 +- + drivers/gpu/drm/panel/panel-visionox-r66451.c | 4 ++-- + drivers/gpu/drm/v3d/v3d_gem.c | 5 ++--- + drivers/gpu/drm/v3d/v3d_sched.c | 2 ++ + drivers/gpu/drm/vc4/vc4_gem.c | 14 +++++++++++--- + drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +++++----- + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 5 +++++ + 18 files changed, 86 insertions(+), 45 deletions(-) +Merging rust/rust-next (d89e1d186ec92 Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 rxarray/rxarray-next (4ce73d98a0a6e rust: rxarray: add rust xarray support) +$ git merge -m Merge branch 'rxarray-next' of https://git.kernel.org/pub/scm/linux/kernel/git/da.gomez/linux.git rxarray/rxarray-next +Auto-merging MAINTAINERS +Auto-merging lib/Kconfig +Auto-merging rust/kernel/lib.rs +Merge made by the 'ort' strategy. + MAINTAINERS | 12 + + lib/Kconfig | 11 + + rust/kernel/lib.rs | 2 + + rust/kernel/rxarray.rs | 1407 ++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 1432 insertions(+) + create mode 100644 rust/kernel/rxarray.rs +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 (82059c664b1e3 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. + crypto/acompress.c | 18 +++--- + fs/proc/task_mmu.c | 7 ++- + mm/arch_numa.c | 26 +------- + mm/nommu.c | 1 + + mm/numa_memblks.c | 5 +- + mm/zswap.c | 172 +++++++++++++++++++++++++++++++++++------------------ + 6 files changed, 133 insertions(+), 96 deletions(-) +Merging mm-nonmm-stable/mm-nonmm-stable (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (4fab3abf08563 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 lib/iov_iter.c +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + .mailmap | 2 + + Documentation/accounting/delay-accounting.rst | 87 +++- + MAINTAINERS | 3 +- + drivers/block/zram/backend_842.c | 6 +- + drivers/block/zram/backend_deflate.c | 110 +++-- + drivers/block/zram/backend_lz4.c | 89 +--- + drivers/block/zram/backend_lz4hc.c | 107 ++--- + drivers/block/zram/backend_lzo.c | 6 +- + drivers/block/zram/backend_lzorle.c | 6 +- + drivers/block/zram/backend_zstd.c | 141 +++--- + drivers/block/zram/zcomp.c | 298 +++++++++++-- + drivers/block/zram/zcomp.h | 53 ++- + drivers/block/zram/zram_drv.c | 88 ++-- + drivers/block/zram/zram_drv.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- + drivers/leds/leds-pwm.c | 2 +- + drivers/media/v4l2-core/v4l2-vp9.c | 30 +- + drivers/soc/aspeed/aspeed-lpc-snoop.c | 4 +- + fs/fat/fat.h | 1 + + fs/fat/fatent.c | 88 ++-- + fs/fat/misc.c | 14 +- + fs/ocfs2/file.c | 26 +- + fs/ocfs2/file.h | 4 +- + fs/ocfs2/inode.c | 24 +- + fs/ocfs2/ioctl.c | 27 +- + fs/ocfs2/ocfs2_fs.h | 27 -- + fs/ocfs2/ocfs2_ioctl.h | 26 -- + fs/proc/base.c | 2 +- + fs/squashfs/fragment.c | 6 +- + fs/squashfs/squashfs_fs.h | 2 +- + include/drm/drm_gem.h | 2 +- + include/linux/jhash.h | 2 +- + include/linux/kfence.h | 29 ++ + include/linux/list_sort.h | 4 +- + include/linux/sort.h | 11 - + include/linux/string.h | 2 +- + include/linux/suspend.h | 6 - + include/linux/uio.h | 8 +- + include/linux/xarray.h | 4 +- + ipc/mq_sysctl.c | 3 +- + ipc/msg.c | 12 +- + ipc/sem.c | 25 +- + ipc/util.c | 3 +- + ipc/util.h | 3 +- + kernel/async.c | 10 +- + kernel/delayacct.c | 23 +- + kernel/params.c | 14 + + kernel/power/hibernate.c | 6 + + kernel/power/snapshot.c | 137 +++--- + kernel/profile.c | 58 ++- + kernel/taskstats.c | 14 +- + kernel/trace/bpf_trace.c | 2 +- + lib/Kconfig.debug | 13 + + lib/dynamic_debug.c | 15 +- + lib/errseq.c | 29 +- + lib/iov_iter.c | 6 +- + lib/list_sort.c | 6 +- + lib/plist.c | 21 + + lib/raid/raid6/Makefile | 4 - + lib/raid/raid6/x86/mmx.c | 118 ----- + lib/raid/raid6/x86/pq_arch.h | 69 +-- + lib/raid/raid6/x86/sse1.c | 136 ------ + lib/raid/xor/Makefile | 2 +- + lib/raid/xor/x86/xor-mmx.c | 515 ---------------------- + lib/raid/xor/x86/xor_arch.h | 5 - + lib/sort.c | 110 ++--- + lib/tests/Makefile | 1 + + lib/tests/errseq_kunit.c | 110 ++++- + lib/tests/sbitmap_kunit.c | 308 +++++++++++++ + mm/kfence/core.c | 52 ++- + mm/shmem.c | 2 +- + scripts/checkpatch.pl | 19 +- + scripts/get_maintainer.pl | 6 +- + tools/accounting/delaytop.c | 287 ++++++++++-- + tools/accounting/getdelays.c | 8 + + tools/include/linux/compiler.h | 4 + + tools/lib/python/kdoc/xforms_lists.py | 1 + + tools/testing/selftests/ipc/Makefile | 2 +- + tools/testing/selftests/ipc/msgctl_qbytes.c | 84 ++++ + tools/testing/selftests/proc/proc-empty-vm.c | 24 +- + tools/testing/selftests/uevent/uevent_filtering.c | 32 +- + 81 files changed, 2000 insertions(+), 1649 deletions(-) + delete mode 100644 lib/raid/raid6/x86/mmx.c + delete mode 100644 lib/raid/raid6/x86/sse1.c + delete mode 100644 lib/raid/xor/x86/xor-mmx.c + create mode 100644 lib/tests/sbitmap_kunit.c + create mode 100644 tools/testing/selftests/ipc/msgctl_qbytes.c +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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 +Already up to date. +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 (0d584f9143d8d dma/pool: eliminate CMA alloc warning in atomic_pool_expand) +$ git merge -m Merge branch 'dma-mapping-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next +Merge made by the 'ort' strategy. + kernel/dma/pool.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (f46be4da2cbb1 selftests/arm64: GCS must not leak on a failed clone3) +$ git merge -m Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +$ 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 4d03746e25865] 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 (120880c7d4ac7 Merge branch 'v7.5/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. + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + arch/arm/boot/dts/amlogic/meson8m2.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + .../dts/amlogic/amlogic-a9-a311y3-khadas-vim-5.dts | 42 ++++ + .../dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts | 102 +++++++++ + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 253 +++++++++++++++++++++ + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 11 +- + .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 15 ++ + drivers/soc/amlogic/meson-clk-measure.c | 2 +- + 9 files changed, 426 insertions(+), 3 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a9-a311y3-khadas-vim-5.dts +Merging asahi-soc/asahi-soc/for-next (ea39426f7048c Merge branch 'apple-soc/dt-7.5' 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. + Documentation/devicetree/bindings/arm/apple.yaml | 27 + + .../devicetree/bindings/arm/apple/apple,pmgr.yaml | 1 + + Documentation/devicetree/bindings/arm/cpus.yaml | 2 + + .../devicetree/bindings/i2c/apple,i2c.yaml | 1 + + .../bindings/interrupt-controller/apple,aic2.yaml | 2 + + .../devicetree/bindings/iommu/apple,sart.yaml | 4 + + .../devicetree/bindings/mailbox/apple,mailbox.yaml | 3 + + .../devicetree/bindings/nvme/apple,nvme-ans.yaml | 7 +- + .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 1 + + .../bindings/power/apple,pmgr-pwrstate.yaml | 1 + + .../devicetree/bindings/pwm/apple,s5l-fpwm.yaml | 1 + + arch/arm64/boot/dts/apple/Makefile | 6 + + arch/arm64/boot/dts/apple/t6030.dtsi | 42 + + arch/arm64/boot/dts/apple/t6031-nvme.dtsi | 46 + + arch/arm64/boot/dts/apple/t6031.dtsi | 1 + + arch/arm64/boot/dts/apple/t6032.dtsi | 1 + + arch/arm64/boot/dts/apple/t6040-j614s.dts | 24 + + arch/arm64/boot/dts/apple/t6040-j616s.dts | 24 + + arch/arm64/boot/dts/apple/t6040-j773s.dts | 28 + + arch/arm64/boot/dts/apple/t6040.dtsi | 65 + + arch/arm64/boot/dts/apple/t6041-j575c.dts | 22 + + arch/arm64/boot/dts/apple/t6041-j614c.dts | 18 + + arch/arm64/boot/dts/apple/t6041-j616c.dts | 18 + + arch/arm64/boot/dts/apple/t6041-pmgr.dtsi | 2297 ++++++++++++++++++++ + arch/arm64/boot/dts/apple/t6041.dtsi | 713 ++++++ + arch/arm64/boot/dts/apple/t604x-j575-j773.dtsi | 47 + + arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi | 65 + + arch/arm64/boot/dts/apple/t8122.dtsi | 40 + + drivers/soc/apple/sart.c | 45 + + 29 files changed, 3551 insertions(+), 1 deletion(-) + create mode 100644 arch/arm64/boot/dts/apple/t6031-nvme.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t6040-j614s.dts + create mode 100644 arch/arm64/boot/dts/apple/t6040-j616s.dts + create mode 100644 arch/arm64/boot/dts/apple/t6040-j773s.dts + create mode 100644 arch/arm64/boot/dts/apple/t6040.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t6041-j575c.dts + create mode 100644 arch/arm64/boot/dts/apple/t6041-j614c.dts + create mode 100644 arch/arm64/boot/dts/apple/t6041-j616c.dts + create mode 100644 arch/arm64/boot/dts/apple/t6041-pmgr.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t6041.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t604x-j575-j773.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t604x-j614-j616.dtsi +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 +Auto-merging drivers/clk/at91/clk-main.c +Merge made by the 'ort' strategy. +Merging bmc/for-next (52532c11f746b Merge branches 'aspeed/arm/dt' and 'aspeed/arm64/dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 1 + + arch/arm/boot/dts/aspeed/Makefile | 1 + + .../dts/aspeed/aspeed-bmc-facebook-ventura2.dts | 2888 ++++++++++++++++++++ + arch/arm64/boot/dts/aspeed/ast2700-evb.dts | 36 + + 4 files changed, 2926 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 (6628e7d4c6b25 Linux 7.4-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 (1e88944ecbe9d Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + drivers/memory/atmel-ebi.c | 6 +++--- + drivers/memory/mtk-smi.c | 27 ++++++++++++++++++++++++++- + drivers/memory/pl353-smc.c | 8 ++++---- + 3 files changed, 33 insertions(+), 8 deletions(-) +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 (e20daa6eb46fd Merge branches 'imx/drivers', 'imx/dt', 'imx/dt-binding', 'imx/dt64' and 'imx/soc' 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. + .../nxp/imx/imx27-eukrea-mbimxsd27-baseboard.dts | 1 - + arch/arm/boot/dts/nxp/imx/imx6q-apalis-eval.dtsi | 10 +++ + .../boot/dts/nxp/imx/imx6q-apalis-ixora-v1.2.dts | 10 +++ + arch/arm/boot/dts/nxp/imx/imx6q-apalis-ixora.dts | 10 +++ + arch/arm/boot/dts/nxp/imx/imx6qdl-apf6.dtsi | 1 + + arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira.dtsi | 6 +- + .../arm/boot/dts/nxp/imx/imx6ull-colibri-iris.dtsi | 5 ++ + .../boot/dts/nxp/imx/imx6ull-tarragon-common.dtsi | 36 +++++----- + arch/arm/mach-imx/mach-imx6q.c | 2 - + arch/arm/mach-imx/suspend-imx6.S | 2 +- + .../boot/dts/freescale/imx8mm-kontron-bl-osm-s.dts | 2 +- + .../boot/dts/freescale/imx8mm-kontron-osm-s.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8mm-var-dart.dtsi | 2 + + .../boot/dts/freescale/imx8mm-var-som-symphony.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 4 +- + .../boot/dts/freescale/imx8mp-kontron-bl-osm-s.dts | 43 ++++++----- + .../boot/dts/freescale/imx8mp-kontron-dl.dtso | 25 +++---- + .../boot/dts/freescale/imx8mp-kontron-osm-s.dtsi | 84 +++++++++------------- + .../boot/dts/freescale/imx8mp-kontron-smarc.dtsi | 75 ++++++++++--------- + .../boot/dts/freescale/imx8x-colibri-aster.dtsi | 5 ++ + .../dts/freescale/imx91-tqma9131-mba91xxca.dts | 8 +-- + .../dts/freescale/imx91-tqma9131-mba93xxca.dts | 16 ++--- + .../boot/dts/freescale/imx91-var-som-symphony.dts | 4 +- + arch/arm64/boot/dts/freescale/imx91-var-som.dtsi | 4 +- + .../imx93-imx91-toradex-osm-dev-common.dtsi | 8 +-- + .../boot/dts/freescale/imx93-kontron-osm-s.dtsi | 41 ++++++----- + .../dts/freescale/imx93-tqma9352-mba91xxca.dts | 8 +-- + .../dts/freescale/imx93-tqma9352-mba93xxca.dts | 16 ++--- + .../freescale/imx93-tqma9352-mba93xxla-mini.dts | 16 ++--- + .../dts/freescale/imx93-tqma9352-mba93xxla.dts | 16 ++--- + .../boot/dts/freescale/imx93-var-som-symphony.dts | 8 +-- + arch/arm64/boot/dts/freescale/imx93-var-som.dtsi | 4 +- + .../boot/dts/freescale/imx95-19x19-frdm-pro.dts | 13 ++++ + arch/arm64/boot/dts/freescale/imx95-aquila.dtsi | 6 +- + .../boot/dts/freescale/imx95-toradex-osm-dev.dts | 11 +-- + .../boot/dts/freescale/imx95-toradex-smarc.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx95-verdin.dtsi | 6 +- + drivers/firmware/imx/imx-scu-irq.c | 18 ++++- + drivers/firmware/imx/imx-scu.c | 14 +++- + drivers/firmware/imx/sm-cpu.c | 24 +++++-- + drivers/firmware/imx/sm-lmm.c | 24 +++++-- + drivers/firmware/imx/sm-misc.c | 24 +++++-- + drivers/soc/imx/soc-imx8m.c | 4 +- + 44 files changed, 369 insertions(+), 265 deletions(-) +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 +Merge made by the 'ort' strategy. + drivers/soc/qcom/rpmh-rsc.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) +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 (a968c0b12aee2 Merge branch 'renesas-dts-for-v7.5' 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. + arch/arm/boot/dts/renesas/r9a06g032.dtsi | 34 ++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) +Merging reset/reset/next (e7915fe110d8c reset: rzv2h-usb2phy: Add suspend/resume support) +$ git merge -m Merge branch 'reset/next' of https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux reset/reset/next +Auto-merging Documentation/devicetree/bindings/arm/apple/apple,pmgr.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/apple/apple,pmgr.yaml | 12 + + .../bindings/reset/apple,t8103-cio-reset.yaml | 61 ++++++ + .../bindings/reset/renesas,rzg2l-usbphy-ctrl.yaml | 41 +++- + MAINTAINERS | 2 + + drivers/regulator/renesas-usb-vbus-regulator.c | 75 ++++++- + drivers/reset/Kconfig | 12 +- + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 241 +++++++++++++-------- + drivers/reset/reset-apple-cio.c | 200 +++++++++++++++++ + drivers/reset/reset-gpio.c | 1 + + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 92 ++++++-- + drivers/reset/reset-rzv2h-usb2phy.c | 61 +++++- + include/linux/reset-controller.h | 4 + + 13 files changed, 686 insertions(+), 117 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/apple,t8103-cio-reset.yaml + create mode 100644 drivers/reset/reset-apple-cio.c +Merging rockchip/for-next (2974b78ee4302 Merge branch 'v7.5-clk/next' 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. + .../devicetree/bindings/arm/rockchip.yaml | 6 + + 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 - + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 2 +- + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 204 ++++++++++++++++++++- + arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 11 ++ + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 34 ++++ + arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts | 6 +- + .../dts/rockchip/rk3576-anbernic-rg-vita-pro.dts | 12 +- + .../boot/dts/rockchip/rk3576-armsom-cm5-io.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts | 61 ++++++ + .../arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts | 14 ++ + .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 4 +- + .../boot/dts/rockchip/rk3588s-armsom-sige7s.dts | 16 ++ + .../arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts | 35 +++- + .../arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi | 14 +- + .../arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 14 ++ + arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi | 45 +++-- + .../boot/dts/rockchip/rk3588s-orangepi-5-5b.dtsi | 31 +++- + .../boot/dts/rockchip/rk3588s-orangepi-5-pro.dts | 21 ++- + .../boot/dts/rockchip/rk3588s-orangepi-5.dtsi | 23 +-- + drivers/clk/rockchip/clk-cpu.c | 4 +- + drivers/clk/rockchip/clk-px30.c | 3 +- + drivers/clk/rockchip/clk-rk3036.c | 3 +- + drivers/clk/rockchip/clk-rk3128.c | 3 +- + drivers/clk/rockchip/clk-rk3188.c | 3 +- + drivers/clk/rockchip/clk-rk3228.c | 3 +- + drivers/clk/rockchip/clk-rk3288.c | 3 +- + drivers/clk/rockchip/clk-rk3308.c | 3 +- + drivers/clk/rockchip/clk-rk3328.c | 3 +- + drivers/clk/rockchip/clk-rk3368.c | 3 +- + drivers/clk/rockchip/clk-rk3399.c | 6 +- + drivers/clk/rockchip/clk-rk3562.c | 2 +- + drivers/clk/rockchip/clk-rk3568.c | 6 +- + drivers/clk/rockchip/clk-rv1103b.c | 4 +- + drivers/clk/rockchip/clk-rv1108.c | 3 +- + drivers/clk/rockchip/clk-rv1126.c | 6 +- + drivers/clk/rockchip/clk.h | 10 +- + drivers/clk/rockchip/rst-rk3506.c | 3 +- + drivers/clk/rockchip/rst-rk3528.c | 3 +- + drivers/clk/rockchip/rst-rk3562.c | 3 +- + drivers/clk/rockchip/rst-rk3576.c | 3 +- + drivers/clk/rockchip/rst-rk3588.c | 3 +- + drivers/clk/rockchip/rst-rv1126b.c | 4 +- + drivers/clk/rockchip/softrst.c | 54 +----- + 50 files changed, 546 insertions(+), 163 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-armsom-sige7s.dts +Merging samsung-krzk/for-next (2c222a46655e0 Merge branches 'fixes', '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.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/samsung/exynos4-cpu-thermal.dtsi | 72 ++++---- + arch/arm/boot/dts/samsung/exynos4.dtsi | 187 ++++++++++++++------- + arch/arm/boot/dts/samsung/exynos4210-i9100.dts | 125 +++++++------- + arch/arm/boot/dts/samsung/exynos4210-origen.dts | 30 ++-- + arch/arm/boot/dts/samsung/exynos4210-pinctrl.dtsi | 42 ++--- + arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts | 61 ++++--- + arch/arm/boot/dts/samsung/exynos4210-trats.dts | 60 ++++--- + .../boot/dts/samsung/exynos4210-universal_c210.dts | 118 +++++++------ + arch/arm/boot/dts/samsung/exynos4210.dtsi | 179 +++++++++++++------- + arch/arm64/boot/dts/exynos/exynos850.dtsi | 1 - + .../boot/dts/exynos/google/gs101-pixel-common.dtsi | 4 + + drivers/clk/samsung/clk-exynos-audss.c | 33 +++- + drivers/clk/samsung/clk-exynos5-subcmu.c | 27 ++- + 13 files changed, 574 insertions(+), 365 deletions(-) +Merging nomadik/for-next (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (09fd63fe687ff 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'sunxi/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Already up to date. +Merging tee/next (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 (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'ti-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Already up to date. +Merging socfpga/for-next (eacf108de5664 arm64: dts: stratix10: define the i2c1 pins for pinctrl) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git socfpga/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/altera.yaml | 4 + + .../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 | 15 +- + .../boot/dts/{intel => altera}/socfpga_agilex.dtsi | 2 + + .../{intel => altera}/socfpga_agilex3_socdk.dts | 0 + .../dts/{intel => altera}/socfpga_agilex5.dtsi | 69 +++++++ + .../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 | 20 ++ + .../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 + .../dts/altera/socfpga_agilex_socdk_multiqspi.dts | 213 +++++++++++++++++++++ + .../socfpga_agilex_socdk_nand.dts | 0 + .../dts/{intel => altera}/socfpga_n5x_socdk.dts | 0 + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 4 + + .../dts/altera/socfpga_stratix10_socdk_emmc.dts | 22 ++- + .../dts/altera/socfpga_stratix10_socdk_nand.dts | 22 ++- + arch/arm64/boot/dts/intel/Makefile | 12 -- + 29 files changed, 901 insertions(+), 27 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 (77%) + 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%) + create mode 100644 arch/arm64/boot/dts/altera/socfpga_agilex_socdk_multiqspi.dts + 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 (fc1f8f0ceb3b9 clk: tegra: dfll: Get the voltage step of range-based regulators) +$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + drivers/clk/bcm/clk-bcm2835.c | 16 ++++++++++++++++ + drivers/clk/clk-devres.c | 4 ++-- + drivers/clk/clk.c | 11 ++--------- + drivers/clk/rockchip/clk-pll.c | 24 ++++++++++++------------ + drivers/clk/stm32/clk-stm32mp25.c | 3 ++- + drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 26 ++++++++++++++++++++++++++ + drivers/clk/ultrarisc/clk-dp1000.c | 8 +++++++- + include/dt-bindings/clock/bcm2835.h | 1 + + 8 files changed, 68 insertions(+), 25 deletions(-) +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 +Already up to date. +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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging riscv-dt/riscv-dt-for-next (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 (375d5d57545f5 Merge tag 's390-7.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Already up to date. +Merging sh/for-next (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (c95443b98771a 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 +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 (d12b1cc8b5e96 um: vector: use kmalloc_objs() for the message vector) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Merge made by the 'ort' strategy. + arch/um/drivers/vector_kern.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +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 (70881a269b28a 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 +Merge made by the 'ort' strategy. + Documentation/filesystems/9p.rst | 12 +- + Documentation/filesystems/f2fs.rst | 10 + + 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/block-group.c | 21 +- + fs/btrfs/compression.c | 3 + + fs/btrfs/dev-replace.c | 3 +- + fs/btrfs/disk-io.h | 3 +- + fs/btrfs/ioctl.c | 11 +- + fs/btrfs/lzo.c | 16 +- + fs/btrfs/raid56.c | 247 ++-- + fs/btrfs/raid56.h | 7 +- + fs/btrfs/scrub.c | 135 +- + fs/btrfs/send.c | 71 +- + fs/btrfs/space-info.c | 5 +- + fs/btrfs/space-info.h | 3 +- + fs/btrfs/tests/extent-map-tests.c | 2 +- + fs/btrfs/tree-checker.c | 29 +- + fs/btrfs/tree-log.c | 31 + + fs/btrfs/volumes.c | 255 ++-- + fs/btrfs/volumes.h | 24 +- + fs/btrfs/zlib.c | 6 +- + fs/btrfs/zoned.c | 136 +- + fs/btrfs/zstd.c | 5 +- + fs/ceph/inode.c | 9 +- + fs/ceph/super.h | 38 +- + fs/configfs/dir.c | 9 +- + fs/configfs/file.c | 2 +- + fs/configfs/mount.c | 9 + + fs/dcache.c | 2 + + fs/ecryptfs/ecryptfs_kernel.h | 6 + + fs/ecryptfs/keystore.c | 7 + + fs/exfat/file.c | 7 +- + fs/exfat/inode.c | 3 - + fs/exfat/iomap.c | 7 +- + fs/exfat/namei.c | 4 +- + fs/exfat/nls.c | 38 +- + fs/ext2/inode.c | 4 +- + fs/ext2/super.c | 9 +- + fs/f2fs/checkpoint.c | 40 +- + fs/f2fs/compress.c | 7 +- + fs/f2fs/data.c | 1552 ++++++++++++++++++-- + fs/f2fs/dir.c | 2 +- + fs/f2fs/f2fs.h | 184 ++- + fs/f2fs/file.c | 289 +++- + fs/f2fs/gc.c | 51 +- + fs/f2fs/inline.c | 3 +- + fs/f2fs/inode.c | 4 +- + fs/f2fs/namei.c | 9 +- + fs/f2fs/node.c | 2 +- + fs/f2fs/segment.c | 13 +- + fs/f2fs/super.c | 39 +- + fs/fuse/readdir.c | 12 +- + fs/gfs2/glock.c | 40 +- + fs/gfs2/log.c | 7 +- + fs/gfs2/lops.c | 3 +- + fs/gfs2/super.c | 8 +- + fs/gfs2/super.h | 4 + + fs/gfs2/sys.c | 6 +- + fs/lockd/lockd.h | 2 +- + fs/lockd/svc.c | 50 +- + fs/lockd/svclock.c | 2 +- + fs/lockd/svcsubs.c | 18 +- + fs/nfs_common/nfsacl.c | 6 +- + fs/nfs_common/nfslocalio.c | 11 +- + fs/nfsd/Kconfig | 17 - + fs/nfsd/blocklayout.c | 28 +- + fs/nfsd/export.c | 22 +- + fs/nfsd/filecache.c | 32 +- + fs/nfsd/netns.h | 17 +- + fs/nfsd/nfs4callback.c | 10 +- + fs/nfsd/nfs4ctl.h | 8 +- + fs/nfsd/nfs4layouts.c | 113 +- + fs/nfsd/nfs4proc.c | 23 +- + fs/nfsd/nfs4recover.c | 1021 +------------ + fs/nfsd/nfs4state.c | 191 +-- + fs/nfsd/nfs4xdr.c | 38 +- + 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/attrib.c | 9 +- + fs/ntfs/ea.c | 5 + + fs/ntfs/index.c | 41 +- + fs/ntfs/index.h | 1 + + fs/ntfs/inode.c | 38 +- + fs/ntfs/namei.c | 6 +- + fs/quota/dquot.c | 10 +- + fs/smb/server/mgmt/user_session.c | 4 + + fs/smb/server/smb2pdu.c | 34 +- + fs/smb/server/smbacl.c | 43 +- + fs/udf/inode.c | 5 + + fs/udf/super.c | 14 +- + fs/xfs/libxfs/xfs_alloc.c | 92 +- + fs/xfs/libxfs/xfs_bmap.c | 153 +- + fs/xfs/libxfs/xfs_bmap.h | 10 +- + fs/xfs/libxfs/xfs_btree.c | 18 +- + fs/xfs/libxfs/xfs_btree.h | 4 +- + fs/xfs/libxfs/xfs_ialloc.c | 51 +- + fs/xfs/libxfs/xfs_ialloc.h | 3 +- + fs/xfs/libxfs/xfs_refcount.c | 97 +- + fs/xfs/libxfs/xfs_refcount.h | 2 +- + fs/xfs/libxfs/xfs_rmap.c | 96 +- + fs/xfs/scrub/rcbag.c | 12 +- + fs/xfs/scrub/rcbag_btree.c | 5 +- + fs/xfs/scrub/rcbag_btree.h | 3 +- + fs/xfs/scrub/stats.c | 3 +- + fs/xfs/scrub/tempfile.c | 3 +- + fs/xfs/xfs_discard.c | 26 +- + fs/xfs/xfs_export.c | 2 +- + fs/xfs/xfs_file.c | 55 +- + fs/xfs/xfs_healthmon.c | 2 +- + fs/xfs/xfs_inode.c | 47 +- + fs/xfs/xfs_inode.h | 3 +- + fs/xfs/xfs_ioend.c | 2 +- + fs/xfs/xfs_iomap.c | 28 +- + fs/xfs/xfs_iomap.h | 3 +- + fs/xfs/xfs_message.h | 1 + + fs/xfs/xfs_pnfs.c | 90 +- + fs/xfs/xfs_sysfs.c | 2 +- + fs/xfs/xfs_zone_gc.c | 2 +- + include/linux/exportfs_block.h | 2 + + 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/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/sunrpc/auth_gss/svcauth_gss.c | 11 +- + net/sunrpc/svc_xprt.c | 20 +- + 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 +- + 178 files changed, 5963 insertions(+), 3312 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 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (0dd96d0d34d18 hwmon: (gigabyte_waterforce) Protect status report data with spinlock) +$ git merge -m Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/hwmon/jedec,jc42.yaml | 3 + + Documentation/devicetree/bindings/hwmon/lm75.yaml | 3 + + .../bindings/hwmon/pmbus/mps,mpq8785.yaml | 3 + + .../devicetree/bindings/hwmon/pwm-fan.yaml | 22 +- + .../bindings/hwmon/starfive,jhb100-pwm-fan.yaml | 87 +++ + .../devicetree/bindings/trivial-devices.yaml | 4 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/hwmon/acer-aspire14-ec.rst | 38 + + Documentation/hwmon/aquacomputer_d5next.rst | 13 + + Documentation/hwmon/asus_ec_sensors.rst | 1 + + Documentation/hwmon/asus_rog_ryujin.rst | 8 +- + Documentation/hwmon/fs1412.rst | 124 +++ + Documentation/hwmon/index.rst | 3 + + Documentation/hwmon/it87.rst | 16 +- + Documentation/hwmon/lm75.rst | 12 +- + Documentation/hwmon/max34440.rst | 26 +- + Documentation/hwmon/nct6683.rst | 17 + + Documentation/hwmon/starfive-pwm-fan.rst | 45 ++ + MAINTAINERS | 23 + + drivers/hwmon/Kconfig | 45 +- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/acer-aspire14-ec.c | 255 +++++++ + drivers/hwmon/acpi_power_meter.c | 100 ++- + drivers/hwmon/aquacomputer_d5next.c | 90 ++- + drivers/hwmon/asus-ec-sensors.c | 92 ++- + drivers/hwmon/asus_rog_ryujin.c | 112 ++- + drivers/hwmon/dell-smm-hwmon.c | 8 + + drivers/hwmon/gigabyte_waterforce.c | 27 +- + drivers/hwmon/it87.c | 19 +- + drivers/hwmon/kb9002.c | 6 +- + drivers/hwmon/lineage-pem.c | 17 +- + drivers/hwmon/lm75.c | 50 +- + drivers/hwmon/lm93.c | 12 +- + drivers/hwmon/macsmc-hwmon.c | 2 +- + drivers/hwmon/nct6683.c | 233 +++++- + drivers/hwmon/nct6775-platform.c | 1 + + drivers/hwmon/peci/cputemp.c | 21 + + drivers/hwmon/peci/dimmtemp.c | 33 +- + drivers/hwmon/pmbus/Kconfig | 11 +- + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/acbel-fsg032.c | 16 +- + drivers/hwmon/pmbus/adm1266.c | 25 +- + drivers/hwmon/pmbus/aps-379.c | 3 +- + drivers/hwmon/pmbus/bpa-rs600.c | 5 +- + drivers/hwmon/pmbus/crps.c | 5 +- + drivers/hwmon/pmbus/d1u74t.c | 8 +- + drivers/hwmon/pmbus/dps920ab.c | 6 +- + drivers/hwmon/pmbus/fs1412.c | 171 +++++ + drivers/hwmon/pmbus/fsp-3y.c | 3 +- + drivers/hwmon/pmbus/ibm-cffps.c | 5 +- + drivers/hwmon/pmbus/inspur-ipsps.c | 4 +- + drivers/hwmon/pmbus/ir35221.c | 6 +- + drivers/hwmon/pmbus/lt7182s.c | 6 +- + drivers/hwmon/pmbus/ltc4286.c | 8 +- + drivers/hwmon/pmbus/lx1308.c | 9 +- + drivers/hwmon/pmbus/max15301.c | 4 +- + drivers/hwmon/pmbus/max16601.c | 7 +- + drivers/hwmon/pmbus/max20730.c | 9 +- + drivers/hwmon/pmbus/max34440.c | 51 +- + drivers/hwmon/pmbus/mp2985.c | 10 +- + drivers/hwmon/pmbus/mp5920.c | 3 +- + drivers/hwmon/pmbus/pim4328.c | 4 +- + drivers/hwmon/pmbus/pmbus.c | 2 +- + drivers/hwmon/pmbus/pmbus_core.c | 144 +++- + drivers/hwmon/pmbus/pxe1610.c | 2 +- + drivers/hwmon/pmbus/q54sj108a2.c | 27 +- + drivers/hwmon/pmbus/stpddc60.c | 4 +- + drivers/hwmon/pmbus/tps53679.c | 9 +- + drivers/hwmon/pmbus/ucd9000.c | 22 +- + drivers/hwmon/pmbus/ucd9200.c | 4 +- + drivers/hwmon/pmbus/zl6100.c | 2 +- + drivers/hwmon/pt5161l.c | 5 +- + drivers/hwmon/starfive-pwm-fan.c | 834 +++++++++++++++++++++ + 73 files changed, 2783 insertions(+), 227 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/starfive,jhb100-pwm-fan.yaml + create mode 100644 Documentation/hwmon/acer-aspire14-ec.rst + create mode 100644 Documentation/hwmon/fs1412.rst + create mode 100644 Documentation/hwmon/starfive-pwm-fan.rst + create mode 100644 drivers/hwmon/acer-aspire14-ec.c + create mode 100644 drivers/hwmon/pmbus/fs1412.c + create mode 100644 drivers/hwmon/starfive-pwm-fan.c +Merging jc_docs/docs-next (2649344d20dfb docs: kdoc_output: don't add a man page tail for filtered-out symbols) +$ 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 MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/binfmt-misc.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/core-api/printk-formats.rst | 20 -- + Documentation/power/power_supply_class.rst | 8 +- + Documentation/process/changes.rst | 2 +- + Documentation/process/stable-kernel-rules.rst | 6 +- + Documentation/process/submitting-patches.rst | 8 + + .../translations/it_IT/process/changes.rst | 8 +- + .../translations/pt_BR/process/1.Intro.rst | 358 +++++++++++---------- + .../translations/pt_BR/process/2.Process.rst | 48 +-- + .../translations/pt_BR/process/3.Early-stage.rst | 2 + + .../translations/pt_BR/process/4.Coding.rst | 8 +- + .../translations/pt_BR/process/5.Posting.rst | 24 +- + .../translations/pt_BR/process/6.Followthrough.rst | 2 + + .../pt_BR/process/7.AdvancedTopics.rst | 4 + + .../translations/pt_BR/process/8.Conclusion.rst | 9 +- + .../translations/pt_BR/process/backporting.rst | 6 +- + .../translations/pt_BR/process/changes.rst | 63 ++-- + .../pt_BR/process/coding-assistants.rst | 45 ++- + .../translations/pt_BR/process/coding-style.rst | 14 +- + .../translations/pt_BR/process/email-clients.rst | 12 +- + .../pt_BR/process/embargoed-hardware-issues.rst | 2 +- + Documentation/translations/pt_BR/process/howto.rst | 4 +- + Documentation/translations/pt_BR/process/index.rst | 1 + + .../translations/pt_BR/process/kernel-docs.rst | 16 +- + .../pt_BR/process/kernel-enforcement-statement.rst | 1 + + .../translations/pt_BR/process/license-rules.rst | 18 +- + .../pt_BR/process/maintainer-kvm-x86.rst | 2 +- + .../pt_BR/process/maintainer-netdev.rst | 76 +++-- + .../translations/pt_BR/process/maintainer-soc.rst | 20 +- + .../pt_BR/process/management-style.rst | 6 +- + .../pt_BR/process/programming-language.rst | 64 ++++ + .../translations/pt_BR/process/security-bugs.rst | 53 ++- + .../pt_BR/process/stable-api-nonsense.rst | 2 + + .../pt_BR/process/submit-checklist.rst | 4 +- + .../translations/zh_CN/core-api/printk-formats.rst | 15 - + .../userspace-api/ioctl/ioctl-decoding.rst | 8 +- + MAINTAINERS | 1 - + tools/lib/python/kdoc/kdoc_output.py | 5 +- + tools/unittests/test_kdoc_parser.py | 52 +++ + 40 files changed, 613 insertions(+), 388 deletions(-) + create mode 100644 Documentation/translations/pt_BR/process/programming-language.rst +Merging v4l-dvb/next (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Already up to date. +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 (6628e7d4c6b25 Linux 7.4-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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (7b6ab4dbc156e Merge branch 'net-devmem-fix-rx-and-tx-binding-teardown-on-device-unregistration') +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging net/core/dev.c +Merge made by the 'ort' strategy. + drivers/net/netdevsim/bus.c | 9 ++ + drivers/net/netdevsim/netdev.c | 33 +++++- + drivers/net/netdevsim/netdevsim.h | 1 + + include/net/page_pool/memory_provider.h | 4 +- + net/core/dev.c | 4 +- + net/core/devmem.c | 181 ++++++++++++++++++++++++++----- + net/core/devmem.h | 37 ++++++- + net/core/netdev-genl.c | 16 +-- + net/core/netdev_rx_queue.c | 26 +++-- + tools/testing/selftests/net/config | 4 + + tools/testing/selftests/net/nl_netdev.py | 125 ++++++++++++++++++++- + 11 files changed, 373 insertions(+), 67 deletions(-) +Merging bpf-next/for-next (cd5bc55288d4f 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 +Merge made by the 'ort' strategy. +$ 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 (7b6ab4dbc156e Merge branch 'net-devmem-fix-rx-and-tx-binding-teardown-on-device-unregistration') +$ 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 (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/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (3f425f95ba392 Bluetooth: btintel_pcie: Gate mailbox logging behind LOG_MASK) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/Kconfig | 2 +- + drivers/bluetooth/Makefile | 2 +- + drivers/bluetooth/btintel.c | 66 ++- + drivers/bluetooth/btintel.h | 10 + + drivers/bluetooth/btintel_pcie.c | 905 ++++++++++++++++++++++++++++----- + drivers/bluetooth/btintel_pcie.h | 49 +- + drivers/bluetooth/btintel_pcie_debug.c | 331 ++++++++++++ + drivers/bluetooth/btintel_pcie_debug.h | 171 +++++++ + drivers/bluetooth/btmtk.c | 8 +- + drivers/bluetooth/btmtksdio.c | 8 +- + drivers/bluetooth/btmtkuart.c | 8 +- + drivers/bluetooth/hci_nokia.c | 9 +- + include/net/bluetooth/hci.h | 3 + + include/net/bluetooth/hci_core.h | 4 + + net/bluetooth/hci_core.c | 110 +++- + net/bluetooth/hci_event.c | 33 ++ + 16 files changed, 1553 insertions(+), 166 deletions(-) + create mode 100644 drivers/bluetooth/btintel_pcie_debug.c + create mode 100644 drivers/bluetooth/btintel_pcie_debug.h +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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Already up to date. +$ 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) +$ 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_ttm.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 +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +Merge made by the 'ort' strategy. + 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 | 7 +- + 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(+), 2678 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... +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 +Recorded preimage for 'drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c' +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +hint: When you have resolved this problem, run "git am --continue". +hint: If you prefer to skip this patch, run "git am --skip" instead. +hint: To restore the original branch and stop patching, run "git am --abort". +hint: Disable this message with "git config advice.mergeConflict false" +Patch failed at 0001 amdgpu: Yet more cherry picking fun +$ git am -3 ../patches/0001-drm-amd-pm-fix-up-the-amdgpu-merge-of-the-smu-14.0.2.patch +Applying: drm/amd/pm: fix up the amdgpu merge of the smu 14.0.2 zero fan restore +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 (20e3d954f7048 drm/i915/ptl+: Fix TypeC detection for eDP on port B) + 9defa95510abc ("drm/i915/vrr: Fix intel_vrr_dcb_vmin_vblank_start()") +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/display/drm_dp_helper.c +Auto-merging drivers/gpu/drm/i915/display/i9xx_plane.c +Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_driver.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/i915/display/skl_universal_plane.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/xe/Makefile +Resolved 'drivers/gpu/drm/i915/display/intel_dp.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/display/intel_psr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 045ef94619256] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/display/drm_dp_helper.c | 39 ++- + drivers/gpu/drm/i915/display/i9xx_plane.c | 23 +- + drivers/gpu/drm/i915/display/i9xx_wm.c | 2 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 3 +- + drivers/gpu/drm/i915/display/intel_casf.c | 30 +- + drivers/gpu/drm/i915/display/intel_color.c | 7 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 22 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 20 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 20 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 6 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 12 +- + drivers/gpu/drm/i915/display/intel_de.h | 57 ++-- + drivers/gpu/drm/i915/display/intel_display.c | 311 ++++++++++++----- + drivers/gpu/drm/i915/display/intel_display.h | 4 + + .../drm/i915/display/intel_display_clock_gating.c | 24 ++ + .../gpu/drm/i915/display/intel_display_debugfs.c | 259 +++++++-------- + .../gpu/drm/i915/display/intel_display_driver.c | 14 + + drivers/gpu/drm/i915/display/intel_display_irq.c | 84 ++--- + drivers/gpu/drm/i915/display/intel_display_power.c | 4 +- + .../drm/i915/display/intel_display_power_well.c | 17 +- + drivers/gpu/drm/i915/display/intel_display_regs.h | 26 +- + drivers/gpu/drm/i915/display/intel_display_reset.c | 4 +- + drivers/gpu/drm/i915/display/intel_display_trace.h | 111 +++++++ + drivers/gpu/drm/i915/display/intel_display_types.h | 23 +- + drivers/gpu/drm/i915/display/intel_display_utils.c | 6 + + drivers/gpu/drm/i915/display/intel_display_wa.c | 26 +- + drivers/gpu/drm/i915/display/intel_display_wa.h | 4 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 9 +- + drivers/gpu/drm/i915/display/intel_dp.c | 185 ++++++++++- + drivers/gpu/drm/i915/display/intel_dp.h | 8 + + drivers/gpu/drm/i915/display/intel_dp_aux.c | 142 +++++--- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 5 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 18 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 1 + + drivers/gpu/drm/i915/display/intel_flipq.c | 10 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 220 ++++++++---- + drivers/gpu/drm/i915/display/intel_gmbus.h | 2 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 27 +- + drivers/gpu/drm/i915/display/intel_hdcp.h | 4 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 26 +- + drivers/gpu/drm/i915/display/intel_pfit.c | 75 +++-- + drivers/gpu/drm/i915/display/intel_pfit.h | 3 +- + drivers/gpu/drm/i915/display/intel_pps.c | 14 + + drivers/gpu/drm/i915/display/intel_psr.c | 367 +++++++++++++++------ + drivers/gpu/drm/i915/display/intel_sprite.c | 27 +- + drivers/gpu/drm/i915/display/intel_tc.c | 9 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 53 ++- + drivers/gpu/drm/i915/display/skl_scaler.c | 59 ++-- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 4 + + drivers/gpu/drm/i915/i915_driver.c | 10 +- + drivers/gpu/drm/i915/i915_gem.c | 9 +- + drivers/gpu/drm/i915/i915_request.h | 4 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 81 ++--- + drivers/gpu/drm/i915/intel_clock_gating.h | 1 + + drivers/gpu/drm/xe/Makefile | 1 + + .../xe/compat-i915-headers/intel_clock_gating.h | 14 - + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 51 --- + drivers/gpu/drm/xe/display/xe_display.c | 4 - + include/drm/display/drm_dp_helper.h | 3 +- + 62 files changed, 1709 insertions(+), 912 deletions(-) + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_clock_gating.h +$ git am -3 ../patches/0001-drm-intel-git-merge-brings-power-beyond-belief.patch +Applying: drm: intel: git merge brings power beyond belief +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/display/intel_psr.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 40220979ecec1] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git + Date: Tue Nov 3 13:47:57 2026 +0000 +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 (8159948f64242 Merge drm/drm-next into drm-xe-next) +$ 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/Makefile +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-driver-intel-xe-cper | 18 + + 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 | 5 + + 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 | 366 +++++++++++ + drivers/gpu/drm/xe/xe_amc.c | 11 +- + drivers/gpu/drm/xe/xe_bo.c | 58 +- + drivers/gpu/drm/xe/xe_bo_types.h | 8 +- + drivers/gpu/drm/xe/xe_configfs.h | 2 +- + drivers/gpu/drm/xe/xe_cper.c | 322 ++++++++++ + drivers/gpu/drm/xe/xe_cper.h | 37 ++ + drivers/gpu/drm/xe/xe_cper_types.h | 110 ++++ + 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 | 47 +- + drivers/gpu/drm/xe/xe_device_wa_oob.rules | 1 - + drivers/gpu/drm/xe/xe_dma_buf.c | 38 +- + drivers/gpu/drm/xe/xe_dma_buf.h | 2 + + drivers/gpu/drm/xe/xe_drm_ras.c | 33 +- + drivers/gpu/drm/xe/xe_drm_ras_types.h | 3 - + drivers/gpu/drm/xe/xe_eu_stall.c | 6 +- + 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 | 121 ++-- + drivers/gpu/drm/xe/xe_gt.h | 3 +- + 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 | 76 ++- + drivers/gpu/drm/xe/xe_guc.h | 3 +- + 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 | 618 +++++++++++++----- + drivers/gpu/drm/xe/xe_irq.c | 3 + + drivers/gpu/drm/xe/xe_lmtt.c | 10 +- + drivers/gpu/drm/xe/xe_log.c | 5 +- + 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 | 180 +++++- + 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_pagefault.c | 8 - + drivers/gpu/drm/xe/xe_pagefault_types.h | 3 - + drivers/gpu/drm/xe/xe_pat.c | 131 +++- + drivers/gpu/drm/xe/xe_pat.h | 29 +- + drivers/gpu/drm/xe/xe_pci.c | 17 +- + 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_pm.c | 12 +- + drivers/gpu/drm/xe/xe_pt.c | 2 - + drivers/gpu/drm/xe/xe_ras.c | 469 ++++++++++++-- + drivers/gpu/drm/xe/xe_ras.h | 7 +- + 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_trace_cper.c | 9 + + drivers/gpu/drm/xe/xe_trace_cper.h | 65 ++ + 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 | 21 +- + drivers/gpu/drm/xe/xe_uc.h | 3 +- + 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 | 4 +- + 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 + + 119 files changed, 5998 insertions(+), 1333 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-xe-cper + create mode 100644 drivers/gpu/drm/xe/xe_cper.c + create mode 100644 drivers/gpu/drm/xe/xe_cper.h + create mode 100644 drivers/gpu/drm/xe/xe_cper_types.h + 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_trace_cper.c + create mode 100644 drivers/gpu/drm/xe/xe_trace_cper.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 +Using index info to reconstruct a base tree... +M drivers/gpu/drm/xe/xe_bo.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/xe/xe_bo.c +No changes -- Patch already applied. +Merging drm-rust/for-linux-next (1c221646e5e5f gpu: nova-core: gsp: cmdq: reduce sleep delta in wait_for_msg) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/for-linux-next +Merge made by the 'ort' strategy. + Documentation/gpu/nova/core/interrupts.rst | 7 +- + drivers/gpu/drm/nova/nova_drm_unstable.h | 212 +++++++++ + drivers/gpu/nova-core/api.rs | 2 +- + drivers/gpu/nova-core/falcon.rs | 9 +- + drivers/gpu/nova-core/fb/hal/gb100.rs | 4 +- + drivers/gpu/nova-core/firmware/fwsec/bootloader.rs | 10 +- + drivers/gpu/nova-core/fsp.rs | 3 +- + drivers/gpu/nova-core/gpu.rs | 2 +- + drivers/gpu/nova-core/gsp.rs | 4 +- + drivers/gpu/nova-core/gsp/boot.rs | 16 +- + drivers/gpu/nova-core/gsp/cmdq.rs | 492 +++++---------------- + drivers/gpu/nova-core/gsp/cmdq/rpc.rs | 415 +++++++++++++++++ + .../nova-core/gsp/cmdq/{ => rpc}/continuation.rs | 0 + drivers/gpu/nova-core/gsp/commands.rs | 329 +------------- + drivers/gpu/nova-core/gsp/commands/rpc.rs | 342 ++++++++++++++ + drivers/gpu/nova-core/gsp/fw.rs | 161 ++++--- + drivers/gpu/nova-core/gsp/fw/commands.rs | 39 +- + drivers/gpu/nova-core/gsp/sequencer.rs | 6 +- + drivers/gpu/nova-core/num.rs | 55 +-- + include/uapi/drm/nova_drm.h | 204 +-------- + rust/kernel/dma_buf/dma_fence.rs | 16 +- + rust/uapi/uapi_helper.h | 2 + + 22 files changed, 1254 insertions(+), 1076 deletions(-) + create mode 100644 drivers/gpu/drm/nova/nova_drm_unstable.h + create mode 100644 drivers/gpu/nova-core/gsp/cmdq/rpc.rs + rename drivers/gpu/nova-core/gsp/cmdq/{ => rpc}/continuation.rs (100%) + create mode 100644 drivers/gpu/nova-core/gsp/commands/rpc.rs +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 (3e13b8b8516ca 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/video/fbdev/vfb.c | 18 ++++++++++++++++-- + 1 file changed, 16 insertions(+), 2 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 0c1a200942114] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git + Date: Tue Nov 3 13:48:26 2026 +0000 +Merging regmap/for-next (506367f9d2f51 Merge regmap/for-7.5 into regmap-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/regcache-maple.c | 25 ++++++++++++++++++++----- + drivers/base/regmap/regcache-rbtree.c | 4 +++- + drivers/base/regmap/regcache.c | 3 +++ + drivers/base/regmap/regmap-kunit.c | 21 +++++++++++++++++++++ + include/linux/regmap.h | 4 ++-- + 5 files changed, 49 insertions(+), 8 deletions(-) +$ 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 (3f2882212c558 ALSA: ice1712: Make chip_init helpers return void) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Merge made by the 'ort' strategy. + sound/hda/codecs/generic.c | 22 +- + sound/hda/common/codec.c | 16 +- + sound/hda/common/hda_local.h | 14 +- + sound/isa/cs423x/cs4236.c | 9 +- + sound/pci/ali5451/ali5451.c | 10 +- + sound/pci/ice1712/ews.c | 141 +++++++++- + sound/pci/ice1712/ews.h | 7 + + sound/pci/ice1712/ice1712.c | 43 +-- + sound/pci/ice1712/ice1712.h | 1 + + sound/pci/ice1712/ice1724.c | 12 +- + sound/pci/vx222/vx222_ops.c | 7 +- + sound/usb/mixer_quirks.c | 285 +++++++++++++++++--- + sound/usb/mixer_scarlett2.c | 287 ++++++++++++++++++++- + tools/testing/selftests/alsa/test-pcmtest-driver.c | 167 +++++++++++- + 14 files changed, 887 insertions(+), 134 deletions(-) +Merging ieee1394/for-next (3110316fb834e firewire: cdev: Check return value in ioctl_get_cycle_timer()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Merge made by the 'ort' strategy. + drivers/firewire/core-cdev.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging sound-asoc/for-next (aae83f3931bc3 Merge asoc/for-7.5 into asoc-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/everest,es7202.yaml | 56 ++++ + .../devicetree/bindings/sound/ingenic,aic.yaml | 1 + + .../sound/mt8186-mt6366-da7219-max98357.yaml | 2 +- + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 2 +- + .../devicetree/bindings/sound/qcom,wcd937x.yaml | 15 + + .../devicetree/bindings/sound/realtek,rt5631.yaml | 8 + + .../bindings/sound/ti,twl4030-audio.yaml | 8 +- + sound/soc/codecs/Kconfig | 13 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/cs35l36.c | 3 + + sound/soc/codecs/cs43130.c | 15 + + sound/soc/codecs/cs43130.h | 2 + + sound/soc/codecs/cs4341.c | 14 +- + sound/soc/codecs/es7202.c | 373 +++++++++++++++++++++ + sound/soc/codecs/es7202.h | 131 ++++++++ + sound/soc/codecs/es9039q2m.c | 14 + + sound/soc/codecs/es9356.c | 11 +- + sound/soc/codecs/nau8821.c | 16 +- + sound/soc/codecs/nau8821.h | 1 + + sound/soc/codecs/nau8824.c | 17 +- + sound/soc/codecs/nau8824.h | 1 + + sound/soc/codecs/nau8825.c | 17 +- + sound/soc/codecs/nau8825.h | 1 + + sound/soc/codecs/ntp8835.c | 19 +- + sound/soc/codecs/ntp8918.c | 19 +- + sound/soc/codecs/rt-sdw-common.c | 6 +- + sound/soc/codecs/rt5631.c | 18 +- + sound/soc/codecs/rt5640.c | 37 +- + sound/soc/codecs/rt5640.h | 3 + + sound/soc/codecs/rt5659.c | 20 +- + sound/soc/codecs/rt5659.h | 3 + + sound/soc/codecs/rt5663.c | 17 +- + sound/soc/codecs/rt5668.c | 20 +- + sound/soc/codecs/rt5677.c | 37 +- + sound/soc/codecs/rt5677.h | 2 + + sound/soc/codecs/rt5682.c | 16 +- + sound/soc/codecs/rt5682.h | 1 + + sound/soc/codecs/rt5682s.c | 16 +- + sound/soc/codecs/rt5682s.h | 1 + + sound/soc/codecs/rt711-sdca.c | 22 +- + sound/soc/codecs/rt712-sdca.c | 22 +- + sound/soc/codecs/rt721-sdca.c | 11 + + sound/soc/codecs/rt722-sdca.c | 22 +- + sound/soc/codecs/si476x.c | 6 + + sound/soc/codecs/tfa989x.c | 17 +- + sound/soc/codecs/twl4030.c | 104 +++--- + sound/soc/codecs/twl6040.c | 1 + + sound/soc/codecs/wcd-mbhc-v2.c | 4 +- + sound/soc/codecs/wcd937x.c | 170 +++++++++- + sound/soc/codecs/wcd939x.c | 21 +- + sound/soc/codecs/wm8903.c | 18 +- + sound/soc/codecs/wm8903.h | 5 - + sound/soc/codecs/wm8962.c | 10 +- + sound/soc/codecs/wm8962.h | 2 - + sound/soc/codecs/wm8978.c | 31 +- + sound/soc/codecs/wm8994.c | 58 +++- + sound/soc/codecs/wm8994.h | 6 - + sound/soc/google/chv3-i2s.c | 8 +- + sound/soc/hisilicon/hi6210-i2s.c | 8 +- + sound/soc/img/img-i2s-in.c | 8 +- + sound/soc/img/img-i2s-out.c | 4 + + sound/soc/img/img-spdif-in.c | 11 +- + sound/soc/img/img-spdif-out.c | 4 + + sound/soc/intel/boards/bytcr_rt5640.c | 1 + + sound/soc/jz4740/jz4740-i2s.c | 48 ++- + sound/soc/kirkwood/kirkwood-i2s.c | 28 +- + sound/soc/loongson/loongson_i2s.c | 58 +++- + sound/soc/loongson/loongson_i2s.h | 11 + + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 1 + + sound/soc/mediatek/mt8196/mt8196-afe-pcm.c | 16 +- + sound/soc/meson/meson-card-utils.c | 7 +- + sound/soc/pxa/mmp-sspa.c | 8 +- + sound/soc/qcom/qdsp6/q6usb.c | 16 +- + sound/soc/qcom/sc8280xp.c | 20 ++ + sound/soc/qcom/storm.c | 1 + + sound/soc/samsung/littlemill.c | 6 +- + sound/soc/samsung/midas_wm1811.c | 3 +- + sound/soc/samsung/tobermory.c | 2 +- + sound/soc/soc-core.c | 51 ++- + sound/soc/soc-dapm.c | 24 +- + sound/soc/soc-internal.h | 11 + + sound/soc/soc-ops-test.c | 50 +++ + sound/soc/soc-ops.c | 48 +++ + sound/soc/tegra/tegra_wm8903.c | 5 +- + sound/soc/tegra/tegra_wm8962.c | 4 +- + sound/soc/tegra/tegra_wm8994.c | 4 +- + 86 files changed, 1695 insertions(+), 259 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/everest,es7202.yaml + create mode 100644 sound/soc/codecs/es7202.c + create mode 100644 sound/soc/codecs/es7202.h +Merging modules/modules-next (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (18519af74db06 dt-bindings: input: mediatek,mt6779-keypad: add the MT8173 keypad) +$ 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. + .../bindings/input/mediatek,mt6779-keypad.yaml | 1 + + .../bindings/input/touchscreen/st,stmfts.yaml | 30 +- + 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/serio/serport.c | 40 +- + drivers/input/touchscreen/s6sy761.c | 59 ++- + drivers/input/touchscreen/stmfts.c | 461 ++++++++++++++++++--- + drivers/input/touchscreen/ti_am335x_tsc.c | 93 ++--- + 13 files changed, 570 insertions(+), 173 deletions(-) +Merging block/for-next (81cb9aa432468 Merge branch 'io_uring-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/fops.c | 3 +++ + 1 file changed, 3 insertions(+) +$ 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 6c9347126e471] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Tue Nov 3 13:48:52 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 (6ba53556f93f7 ata: use dmaengine_desc_set_callback()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Merge made by the 'ort' strategy. + drivers/ata/ahci.c | 4 ++++ + drivers/ata/libata-eh.c | 6 ++---- + drivers/ata/pata_arasan_cf.c | 3 +-- + drivers/ata/pata_artop.c | 11 ++++++++++- + drivers/ata/pata_ep93xx.c | 3 +-- + drivers/ata/pata_pxa.c | 5 ++--- + drivers/ata/sata_dwc_460ex.c | 3 +-- + 7 files changed, 21 insertions(+), 14 deletions(-) +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 (aac882d8b77e7 MAINTAINERS: mfd: Drop MEN F21BMC (bouncing email)) +$ git merge -m Merge branch 'for-mfd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 9 ------ + drivers/mfd/da9062-core.c | 4 +-- + drivers/mfd/rz-mtu3.c | 70 ++++++++++++++++----------------------------- + drivers/mfd/twl-core.c | 13 ++------- + include/linux/mfd/rz-mtu3.h | 7 +++-- + 5 files changed, 34 insertions(+), 69 deletions(-) +Merging backlight/for-backlight-next (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (5436a50a0b44b Merge regulator/for-7.5 into regulator-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/qcom,pm8150l-lcdb.yaml | 81 ++++ + drivers/regulator/Kconfig | 10 +- + drivers/regulator/Makefile | 1 + + drivers/regulator/core.c | 30 +- + drivers/regulator/qcom-lcdb-regulator.c | 494 +++++++++++++++++++++ + drivers/regulator/sgm3804-regulator.c | 17 +- + drivers/regulator/sy7636a-regulator.c | 85 +++- + 7 files changed, 706 insertions(+), 12 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/qcom,pm8150l-lcdb.yaml + create mode 100644 drivers/regulator/qcom-lcdb-regulator.c +Merging security/next (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-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 (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +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 (36aad21d50d1a Merge tag 'ksmbd-for-7.4-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/smb) +$ 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 +Already up to date. +Merging tpmdd-keys/for-next-keys (aef3a8a4f988b KEYS: Protect the update method check against type removal) +$ 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 +Merge made by the 'ort' strategy. + fs/smb/client/cifsacl.c | 6 +++--- + include/linux/key.h | 7 +++++-- + security/keys/key.c | 26 ++++++++++++++++++-------- + security/keys/keyctl.c | 2 -- + security/keys/keyring.c | 13 ++++++++++++- + security/keys/request_key.c | 14 ++++++++++++-- + 6 files changed, 50 insertions(+), 18 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (bb95b7759d509 kbuild: Support directory targets for building DTBs) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/qcom,kpss-gcc.yaml | 2 +- + .../bindings/display/brcm,bcm2711-hdmi.yaml | 2 +- + .../bindings/display/msm/dp-controller.yaml | 2 +- + .../devicetree/bindings/dma/fsl,edma.yaml | 2 +- + .../devicetree/bindings/gpio/loongson,ls-gpio.yaml | 2 +- + .../bindings/iio/adc/amlogic,meson-saradc.yaml | 2 +- + .../bindings/media/mediatek,vcodec-encoder.yaml | 12 +- + .../devicetree/bindings/media/samsung,s5p-mfc.yaml | 2 +- + .../devicetree/bindings/pci/mediatek-pcie.yaml | 12 +- + Makefile | 40 +- + drivers/of/fdt.c | 3 - + drivers/of/of_private.h | 2 - + drivers/of/of_reserved_mem.c | 475 ++++++++++----------- + drivers/of/unittest-data/Makefile | 3 + + drivers/of/unittest.c | 43 -- + scripts/Makefile.build | 7 +- + scripts/Makefile.dtbs | 8 +- + 17 files changed, 279 insertions(+), 340 deletions(-) +Merging dt-krzk/for-next (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/for-next (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 (264d1cf962629 Merge spi/for-7.5 into spi-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. + drivers/spi/spi-amlogic-spisg.c | 55 ++++++++++++++++++++++++++++------------- + drivers/spi/spi-mtk-snfi.c | 3 +-- + drivers/spi/spi-stm32-ospi.c | 12 ++++++--- + drivers/spi/spi-ti-qspi.c | 21 ++++++++++++---- + drivers/spi/spi-topcliff-pch.c | 7 +++--- + drivers/spi/spi.c | 11 ++++++++- + 6 files changed, 77 insertions(+), 32 deletions(-) +Merging tip/master (b4e7e462d76ce 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/cpu/common.c | 4 ++-- + arch/x86/kernel/setup.c | 12 ++---------- + 7 files changed, 60 insertions(+), 45 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 53aea2ebfdec1] 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 (d21eef2084a9a KVM: VMX: Add array_index_nospec() to evmcs_field_offset()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/mmu/paging_tmpl.h +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/svm.h +Auto-merging arch/x86/kvm/vmx/nested.c +Merge made by the 'ort' strategy. + arch/x86/kvm/mmu/mmu.c | 10 +++++++++ + arch/x86/kvm/mmu/paging_tmpl.h | 11 +++++++++- + arch/x86/kvm/svm/nested.c | 23 ++++++++++++++------- + arch/x86/kvm/svm/svm.c | 2 ++ + arch/x86/kvm/svm/svm.h | 2 ++ + arch/x86/kvm/vmx/hyperv_evmcs.h | 2 ++ + arch/x86/kvm/vmx/nested.c | 1 + + arch/x86/kvm/x86.c | 46 ++++++++++++++++++++++------------------- + 8 files changed, 68 insertions(+), 29 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (5df47699c2771 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/wq.git workqueues/for-next +Merge made by the 'ort' strategy. + kernel/workqueue.c | 68 +++++++++++++++++++++++++++---------- + tools/workqueue/wq_dump.py | 84 ++++++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 132 insertions(+), 20 deletions(-) +Merging sched-ext/for-next (f7008fb94ee03 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 +Merge made by the 'ort' strategy. + kernel/sched/ext/ext.c | 138 +++++++----- + kernel/sched/ext/inlines.h | 39 +++- + kernel/sched/ext/internal.h | 14 +- + kernel/sched/ext/sub.c | 24 +- + kernel/sched/ext/sub.h | 2 +- + kernel/sched/sched.h | 17 +- + 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 | 11 + + 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 | 21 +- + tools/sched_ext/scx_flatcg.bpf.c | 5 - + tools/sched_ext/scx_qmap.bpf.c | 40 ++-- + 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 +++++++++++++++++++++ + 20 files changed, 633 insertions(+), 146 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 (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 '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 (f19a0c420750d platform/chrome: cros_ec_sensorhub: Drop sensor samples with past timestamps) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec_ishtp.c | 43 ++++++++- + drivers/platform/chrome/cros_ec_sensorhub_ring.c | 114 ++++++++++++++++++----- + drivers/platform/chrome/cros_usbpd_notify.c | 2 + + include/linux/platform_data/cros_ec_sensorhub.h | 2 - + 4 files changed, 137 insertions(+), 24 deletions(-) +Merging chrome-platform-firmware/for-firmware-next (676506be3e914 Merge branch 'for-firmware-7.4' into for-firmware-next) +$ 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 +Merge made by the 'ort' strategy. + drivers/firmware/coreboot/coreboot-cfr.c | 2 +- + drivers/firmware/coreboot/coreboot_table.c | 42 ++++++++++++++++++------------ + 2 files changed, 26 insertions(+), 18 deletions(-) +Merging hsi/for-next (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds-lj/for-leds-next (fb51196472331 leds: is31fl32xx: Fix NULL pointer dereference when binding via I2C ID table) +$ 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 +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-led | 73 +++- + .../ABI/testing/sysfs-class-led-trigger-oneshot | 29 -- + .../devicetree/bindings/leds/skyworks,aat1290.yaml | 13 +- + drivers/leds/flash/leds-aat1290.c | 91 +++-- + drivers/leds/flash/leds-qcom-flash.c | 22 +- + drivers/leds/leds-is31fl32xx.c | 22 +- + drivers/leds/leds-nic78bx.c | 2 +- + drivers/leds/rgb/Kconfig | 13 + + drivers/leds/rgb/Makefile | 1 + + drivers/leds/rgb/leds-asus-aura-scsi.c | 404 +++++++++++++++++++++ + 10 files changed, 589 insertions(+), 81 deletions(-) + create mode 100644 drivers/leds/rgb/leds-asus-aura-scsi.c +Merging ipmi/for-next (dcaeaa4ae71b1 ipmi:si: Allow a probe failure to be retried) +$ 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/Kconfig | 13 ++++++++++ + drivers/char/ipmi/ipmi_kcs_sm.c | 3 ++- + drivers/char/ipmi/ipmi_si_intf.c | 50 +++++++++++++++++++++++++++++++-------- + drivers/char/ipmi/ipmi_ssif.c | 39 ++++++++++++++++-------------- + drivers/char/ipmi/ipmi_watchdog.c | 12 +++++----- + 5 files changed, 82 insertions(+), 35 deletions(-) +Merging driver-core/driver-core-next (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (1390ca4953a74 iio: imu: bmi270: use iio_push_to_buffers_with_ts()) +$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging .mailmap +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/hid/hid-sensor-hub.c +Auto-merging drivers/iio/adc/qcom-spmi-adc5-gen3.c +Auto-merging drivers/iio/addac/ad74413r.c +Auto-merging drivers/iio/humidity/hid-sensor-humidity.c +CONFLICT (content): Merge conflict in drivers/iio/humidity/hid-sensor-humidity.c +Auto-merging drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c +Auto-merging drivers/iio/imu/kmx61.c +Auto-merging drivers/iio/light/hid-sensor-als.c +Auto-merging drivers/iio/light/tsl2591.c +Auto-merging drivers/iio/light/vcnl4035.c +Auto-merging drivers/iio/magnetometer/mmc35240.c +Auto-merging drivers/iio/proximity/sx9310.c +Auto-merging drivers/iio/proximity/sx9500.c +Auto-merging drivers/iio/temperature/hid-sensor-temperature.c +CONFLICT (content): Merge conflict in drivers/iio/temperature/hid-sensor-temperature.c +Recorded preimage for 'drivers/iio/humidity/hid-sensor-humidity.c' +Recorded preimage for 'drivers/iio/temperature/hid-sensor-temperature.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/iio/humidity/hid-sensor-humidity.c'. +Recorded resolution for 'drivers/iio/temperature/hid-sensor-temperature.c'. +[master dd5b33b849332] Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + Documentation/ABI/testing/sysfs-bus-iio | 2 + + .../devicetree/bindings/iio/accel/fsl,mma8452.yaml | 6 + + Documentation/devicetree/bindings/iio/adc/adc.yaml | 8 + + .../devicetree/bindings/iio/adc/adi,ad4080.yaml | 2 + + .../devicetree/bindings/iio/adc/adi,ad4134.yaml | 110 +- + .../devicetree/bindings/iio/adc/adi,ade9000.yaml | 29 +- + .../devicetree/bindings/iio/adc/lltc,ltc2497.yaml | 7 + + .../bindings/iio/adc/mediatek,mt6359-auxadc.yaml | 1 + + .../bindings/iio/adc/renesas,r9a09g077-adc.yaml | 38 +- + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 71 + + .../devicetree/bindings/iio/adc/ti,ads1262.yaml | 381 ++++ + .../bindings/iio/dac/microchip,mcp47a1.yaml | 2 +- + .../devicetree/bindings/iio/light/ams,as7343.yaml | 64 + + .../bindings/iio/opensensorfusion,osf.yaml | 55 + + .../bindings/iio/pressure/infineon,dps310.yaml | 4 +- + .../bindings/iio/pressure/sensirion,sdp31.yaml | 51 + + .../bindings/iio/proximity/vishay,vcnl36829.yaml | 55 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/iio/ad4134.rst | 127 ++ + Documentation/iio/ade9000.rst | 44 +- + Documentation/iio/ads112c14.rst | 355 ++++ + Documentation/iio/index.rst | 3 + + Documentation/iio/open-sensor-fusion.rst | 81 + + MAINTAINERS | 47 +- + drivers/hid/hid-sensor-hub.c | 35 + + drivers/iio/Kconfig | 1 + + drivers/iio/Makefile | 2 + + drivers/iio/accel/adis16209.c | 15 +- + drivers/iio/accel/adxl345_core.c | 121 +- + drivers/iio/accel/adxl345_i2c.c | 2 +- + drivers/iio/accel/adxl345_spi.c | 2 +- + drivers/iio/accel/bma220_spi.c | 2 +- + drivers/iio/accel/bmc150-accel-i2c.c | 24 +- + drivers/iio/accel/bmc150-accel-spi.c | 16 +- + drivers/iio/accel/da280.c | 4 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 40 +- + drivers/iio/accel/kionix-kx022a.c | 2 + + drivers/iio/accel/kxcjk-1013.c | 22 +- + drivers/iio/accel/mma7660.c | 2 +- + drivers/iio/accel/mma8452.c | 115 +- + drivers/iio/accel/mma9551.c | 2 +- + drivers/iio/accel/mma9553.c | 2 +- + drivers/iio/accel/mxc4005.c | 6 +- + drivers/iio/accel/mxc6255.c | 4 +- + drivers/iio/accel/st_accel_i2c.c | 4 +- + drivers/iio/accel/stk8ba50.c | 2 +- + drivers/iio/adc/Kconfig | 45 +- + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/ad4080.c | 18 + + drivers/iio/adc/ad4130.c | 5 +- + drivers/iio/adc/ad4134.c | 781 ++++++- + drivers/iio/adc/ad7298.c | 2 +- + drivers/iio/adc/ad7606.c | 8 +- + drivers/iio/adc/ad7606.h | 5 - + drivers/iio/adc/ad7606_par.c | 3 +- + drivers/iio/adc/ad7606_spi.c | 3 +- + drivers/iio/adc/ade9000.c | 76 +- + drivers/iio/adc/ltc2496.c | 1 + + drivers/iio/adc/ltc2497-core.c | 212 +- + drivers/iio/adc/ltc2497.c | 47 +- + drivers/iio/adc/ltc2497.h | 44 +- + drivers/iio/adc/meson_saradc.c | 2 + + drivers/iio/adc/mt6360-adc.c | 3 +- + drivers/iio/adc/mt6397-auxadc.c | 394 ++++ + drivers/iio/adc/pac1921.c | 2 +- + drivers/iio/adc/pac1934.c | 2 +- + drivers/iio/adc/qcom-spmi-adc5-gen3.c | 4 +- + drivers/iio/adc/rcar-gyroadc.c | 4 +- + drivers/iio/adc/rzt2h_adc.c | 327 ++- + drivers/iio/adc/stm32-adc-core.c | 104 +- + drivers/iio/adc/stm32-adc-core.h | 21 + + drivers/iio/adc/stm32-adc.c | 602 +++++- + drivers/iio/adc/ti-adc081c.c | 2 +- + drivers/iio/adc/ti-adc108s102.c | 2 +- + drivers/iio/adc/ti-adc128s052.c | 2 +- + drivers/iio/adc/ti-adc161s626.c | 3 +- + drivers/iio/adc/ti-ads1015.c | 50 +- + drivers/iio/adc/ti-ads112c14.c | 34 +- + drivers/iio/adc/ti-ads1262.c | 2136 ++++++++++++++++++++ + drivers/iio/addac/ad74413r.c | 5 +- + drivers/iio/buffer/industrialio-buffer-dma.c | 2 + + drivers/iio/chemical/ags02ma.c | 6 + + drivers/iio/chemical/atlas-sensor.c | 4 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 21 +- + .../iio/common/hid-sensors/hid-sensor-trigger.h | 5 +- + drivers/iio/dac/ad5529r.c | 29 +- + drivers/iio/dac/ad5592r.c | 2 +- + drivers/iio/dac/ad5593r.c | 2 +- + drivers/iio/dac/ad5686.h | 2 +- + drivers/iio/dac/mcp47a1.c | 4 +- + drivers/iio/gyro/bmg160_i2c.c | 2 +- + drivers/iio/gyro/fxas21002c_core.c | 137 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 41 +- + drivers/iio/gyro/mpu3050-core.c | 2 +- + drivers/iio/humidity/hdc100x.c | 2 +- + drivers/iio/humidity/hid-sensor-humidity.c | 36 +- + drivers/iio/humidity/hts221_i2c.c | 2 +- + drivers/iio/imu/bmi160/bmi160_i2c.c | 6 +- + drivers/iio/imu/bmi160/bmi160_spi.c | 4 +- + drivers/iio/imu/bmi270/bmi270_core.c | 4 +- + drivers/iio/imu/bmi270/bmi270_i2c.c | 4 +- + drivers/iio/imu/bmi323/bmi323_i2c.c | 2 +- + drivers/iio/imu/bno055/bno055.c | 4 +- + drivers/iio/imu/fxos8700_i2c.c | 2 +- + drivers/iio/imu/fxos8700_spi.c | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 1 - + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 4 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 7 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_aux.c | 6 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_magn.c | 14 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_magn.h | 5 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 4 + + drivers/iio/imu/kmx61.c | 25 +- + drivers/iio/imu/smi330/smi330_core.c | 3 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 2 +- + drivers/iio/industrialio-core.c | 18 +- + drivers/iio/light/Kconfig | 11 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/acpi-als.c | 2 +- + drivers/iio/light/al3320a.c | 2 +- + drivers/iio/light/apds9960.c | 50 +- + drivers/iio/light/as73211.c | 3 +- + drivers/iio/light/as7343.c | 485 +++++ + drivers/iio/light/cm32181.c | 15 +- + drivers/iio/light/gp2ap020a00f.c | 27 +- + drivers/iio/light/hid-sensor-als.c | 39 +- + drivers/iio/light/hid-sensor-prox.c | 40 +- + drivers/iio/light/isl29018.c | 6 +- + drivers/iio/light/jsa1212.c | 2 +- + drivers/iio/light/ltr501.c | 4 +- + drivers/iio/light/max44000.c | 2 +- + drivers/iio/light/opt3001.c | 1 + + drivers/iio/light/pa12203001.c | 61 +- + drivers/iio/light/rpr0521.c | 59 +- + drivers/iio/light/stk3310.c | 3 +- + drivers/iio/light/tsl2583.c | 27 +- + drivers/iio/light/tsl2591.c | 7 + + drivers/iio/light/us5182d.c | 34 +- + drivers/iio/light/vcnl4035.c | 4 +- + drivers/iio/light/veml3328.c | 4 +- + drivers/iio/light/veml6031x00.c | 2 + + drivers/iio/magnetometer/ak8975.c | 14 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 41 +- + drivers/iio/magnetometer/mmc35240.c | 2 +- + drivers/iio/orientation/hid-sensor-incl-3d.c | 42 +- + drivers/iio/orientation/hid-sensor-rotation.c | 40 +- + .../iio/position/hid-sensor-custom-intel-hinge.c | 38 +- + drivers/iio/potentiometer/max5487.c | 6 +- + drivers/iio/pressure/Kconfig | 17 +- + drivers/iio/pressure/Makefile | 3 +- + drivers/iio/pressure/dps310.c | 614 +++++- + drivers/iio/pressure/hid-sensor-press.c | 41 +- + drivers/iio/pressure/hp206c.c | 2 +- + drivers/iio/pressure/mprls0025pa.c | 4 +- + drivers/iio/pressure/ms5611_core.c | 4 +- + drivers/iio/pressure/sdp31.c | 243 +++ + drivers/iio/pressure/st_pressure_i2c.c | 2 +- + drivers/iio/proximity/Kconfig | 11 + + drivers/iio/proximity/Makefile | 1 + + drivers/iio/proximity/isl29501.c | 2 +- + drivers/iio/proximity/sx9310.c | 13 +- + drivers/iio/proximity/sx9500.c | 8 +- + drivers/iio/proximity/vcnl36829.c | 298 +++ + drivers/iio/sensorhubs/Kconfig | 7 + + drivers/iio/sensorhubs/Makefile | 3 + + drivers/iio/sensorhubs/osf/Kconfig | 15 + + drivers/iio/sensorhubs/osf/Makefile | 6 + + drivers/iio/sensorhubs/osf/osf_core.c | 460 +++++ + drivers/iio/sensorhubs/osf/osf_core.h | 75 + + drivers/iio/sensorhubs/osf/osf_iio.c | 288 +++ + drivers/iio/sensorhubs/osf/osf_iio.h | 22 + + drivers/iio/sensorhubs/osf/osf_protocol.c | 215 ++ + drivers/iio/sensorhubs/osf/osf_protocol.h | 99 + + drivers/iio/sensorhubs/osf/osf_serdev.c | 151 ++ + drivers/iio/sensorhubs/osf/osf_stream.c | 230 +++ + drivers/iio/sensorhubs/osf/osf_stream.h | 53 + + drivers/iio/temperature/hid-sensor-temperature.c | 36 +- + drivers/iio/temperature/ltc2983.c | 20 +- + drivers/iio/temperature/max30208.c | 2 +- + drivers/iio/temperature/tsys02d.c | 18 +- + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/adc/Kconfig | 18 - + drivers/staging/iio/adc/Makefile | 6 - + drivers/staging/iio/adc/ad7816.c | 464 ----- + drivers/staging/iio/addac/adt7316.c | 109 +- + drivers/staging/iio/frequency/ad9832.c | 5 +- + drivers/staging/iio/frequency/ad9834.c | 70 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 42 +- + .../dt-bindings/iio/adc/mediatek,mt6397-auxadc.h | 9 + + include/linux/hid-sensor-hub.h | 26 + + include/linux/iio/iio.h | 9 +- + 198 files changed, 10289 insertions(+), 1867 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads1262.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/ams,as7343.yaml + create mode 100644 Documentation/devicetree/bindings/iio/opensensorfusion,osf.yaml + create mode 100644 Documentation/devicetree/bindings/iio/pressure/sensirion,sdp31.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/vishay,vcnl36829.yaml + create mode 100644 Documentation/iio/ad4134.rst + create mode 100644 Documentation/iio/ads112c14.rst + create mode 100644 Documentation/iio/open-sensor-fusion.rst + create mode 100644 drivers/iio/adc/mt6397-auxadc.c + create mode 100644 drivers/iio/adc/ti-ads1262.c + create mode 100644 drivers/iio/light/as7343.c + create mode 100644 drivers/iio/pressure/sdp31.c + create mode 100644 drivers/iio/proximity/vcnl36829.c + create mode 100644 drivers/iio/sensorhubs/Kconfig + create mode 100644 drivers/iio/sensorhubs/Makefile + create mode 100644 drivers/iio/sensorhubs/osf/Kconfig + create mode 100644 drivers/iio/sensorhubs/osf/Makefile + create mode 100644 drivers/iio/sensorhubs/osf/osf_core.c + create mode 100644 drivers/iio/sensorhubs/osf/osf_core.h + create mode 100644 drivers/iio/sensorhubs/osf/osf_iio.c + create mode 100644 drivers/iio/sensorhubs/osf/osf_iio.h + create mode 100644 drivers/iio/sensorhubs/osf/osf_protocol.c + create mode 100644 drivers/iio/sensorhubs/osf/osf_protocol.h + create mode 100644 drivers/iio/sensorhubs/osf/osf_serdev.c + create mode 100644 drivers/iio/sensorhubs/osf/osf_stream.c + create mode 100644 drivers/iio/sensorhubs/osf/osf_stream.h + delete mode 100644 drivers/staging/iio/adc/Kconfig + delete mode 100644 drivers/staging/iio/adc/Makefile + delete mode 100644 drivers/staging/iio/adc/ad7816.c + create mode 100644 include/dt-bindings/iio/adc/mediatek,mt6397-auxadc.h +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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (afd88e7ad7817 soundwire: stream: skip bps mismatch check for PDM streams) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + drivers/soundwire/stream.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +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 (6628e7d4c6b25 Linux 7.4-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 (e8bb5d130f259 w1: sgi_w1: Search the bus only once) +$ 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/masters/sgi_w1.c | 3 +++ + drivers/w1/slaves/w1_ds28e17.c | 2 +- + drivers/w1/slaves/w1_therm.c | 2 +- + drivers/w1/w1.c | 5 ++++- + drivers/w1/w1_family.c | 2 +- + drivers/w1/w1_int.c | 3 +++ + drivers/w1/w1_netlink.h | 2 +- + include/linux/w1.h | 5 +++++ + 11 files changed, 23 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (d722f879730c7 counter: Allow 32-bit tasks to use the character device) +$ 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 ++---- + drivers/counter/counter-chrdev.c | 1 + + drivers/counter/ti-ecap-capture.c | 6 ++---- + 3 files changed, 5 insertions(+), 8 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (c132dc07771f9 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/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. + kernel/cgroup/cgroup.c | 22 +++++----- + kernel/cgroup/cpuset.c | 52 ++++++++++++++--------- + tools/testing/selftests/cgroup/test_core.c | 36 +++++++++++++++- + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 25 ++++++++++- + 4 files changed, 103 insertions(+), 32 deletions(-) +Merging scsi/for-next (2e37faaadcc38 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 +Merge made by the 'ort' strategy. +Merging scsi-mkp/for-next (6628e7d4c6b25 Linux 7.4-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (1a577f9402c17 virtio_pci: don't take the MSI mutex under cpu_hotplug_lock) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 ++ + drivers/block/virtio_blk.c | 45 +++++++++++++- + drivers/char/hw_random/virtio-rng.c | 7 +++ + drivers/iommu/virtio-iommu.c | 6 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 10 ++- + drivers/vdpa/solidrun/snet_ctrl.c | 3 +- + drivers/vdpa/vdpa.c | 7 ++- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 7 +++ + drivers/vdpa/vdpa_user/iova_domain.c | 11 +++- + drivers/vdpa/vdpa_user/vduse_dev.c | 15 +++-- + drivers/vhost/scsi.c | 68 +++++++++++++++++---- + drivers/vhost/test.c | 4 ++ + drivers/vhost/vdpa.c | 115 ++++++++++++++++++++++++----------- + drivers/vhost/vhost.c | 36 ++++++++--- + drivers/vhost/vringh.c | 29 ++++----- + drivers/virtio/virtio_balloon.c | 3 +- + drivers/virtio/virtio_mmio.c | 2 +- + drivers/virtio/virtio_pci_common.c | 12 +++- + drivers/virtio/virtio_pci_common.h | 5 +- + drivers/virtio/virtio_ring.c | 13 +++- + include/uapi/linux/virtio_spi.h | 2 +- + tools/virtio/vringh_test.c | 41 +++++++++++++ + 22 files changed, 347 insertions(+), 98 deletions(-) +Merging rpmsg/for-next (9d65b35ec38ff Merge branches 'rproc-next' 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. + .../bindings/remoteproc/fsl,imx-rproc.yaml | 11 ++++++++ + drivers/remoteproc/imx_rproc.c | 29 ++++++++++++++++++-- + drivers/remoteproc/mtk_scp.c | 32 ++++++++++++---------- + drivers/rpmsg/virtio_rpmsg_bus.c | 10 +++++-- + 4 files changed, 63 insertions(+), 19 deletions(-) +Merging gpio-brgl/gpio/for-next (d66b6b86d5a62 gpio: 74x164: add support for 74lv164 shift register variant) +$ git merge -m Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/gpio/fairchild,74hc595.yaml | 18 +- + .../devicetree/bindings/gpio/snps,dw-apb-gpio.yaml | 10 + + Documentation/driver-api/gpio/consumer.rst | 2 +- + MAINTAINERS | 8 + + 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-74x164.c | 2 + + drivers/gpio/gpio-aggregator.c | 8 +- + drivers/gpio/gpio-cgbc.c | 26 ++ + drivers/gpio/gpio-dwapb.c | 49 +++- + drivers/gpio/gpio-mxc.c | 295 ++++++++++++--------- + drivers/gpio/gpio-octeon.c | 2 +- + drivers/gpio/gpio-rcar.c | 5 +- + drivers/gpio/gpio-sim.c | 48 ++-- + drivers/gpio/gpio-virtio.c | 41 +-- + drivers/gpio/gpio-virtuser.c | 8 +- + 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 - + 26 files changed, 616 insertions(+), 409 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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (f9edef88c5e13 pinctrl: renesas: rzn1: Free maps on DT map failure) +$ 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 +Merge made by the 'ort' strategy. + drivers/pinctrl/renesas/pinctrl-rzn1.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging pinctrl-samsung/for-next (6628e7d4c6b25 Linux 7.4-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 (17a9fde355fd0 Merge tag 'v7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into pinctrl-qcom/for-next) +$ 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 (9ad5602d49436 pwm: tegra: Fix value discarding for duty and period) +$ 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/nxp,pca9685-pwm.txt | 27 -- + .../devicetree/bindings/pwm/nxp,pca9685-pwm.yaml | 62 ++++ + drivers/pwm/pwm-meson.c | 404 ++++++++++++--------- + drivers/pwm/pwm-tegra.c | 34 +- + 4 files changed, 317 insertions(+), 210 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pwm/nxp,pca9685-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/nxp,pca9685-pwm.yaml +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 +Already up to date. +Merging kselftest/next (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (6628e7d4c6b25 Linux 7.4-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 (6628e7d4c6b25 Linux 7.4-rc1) +$ 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 (7485659ecb81d rtc: rs5c372: use sysfs_emit() instead of sprintf()) +$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +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 +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/nvmem/Kconfig +Recorded preimage for 'MAINTAINERS' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'MAINTAINERS'. +[master 79cb45422fa4e] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 7 ------- + 1 file changed, 7 deletions(-) +Merging hyperv/hyperv-next (eab80895d447e arm64: hyperv: Implement hv_is_isolation_supported() for CCA Realms) +$ git merge -m Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Merge made by the 'ort' strategy. + arch/arm64/hyperv/hv_core.c | 157 +++++++++++++++++++++++++++++--------- + arch/arm64/hyperv/mshyperv.c | 62 ++++++++++++++- + arch/arm64/include/asm/mshyperv.h | 4 + + drivers/hv/hv_common.c | 17 ++++- + include/asm-generic/mshyperv.h | 1 + + include/linux/arm-rsi-cmds.h | 22 ++++++ + include/linux/arm-smccc-rsi.h | 7 ++ + 7 files changed, 229 insertions(+), 41 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 +Already up to date. +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 (6628e7d4c6b25 Linux 7.4-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 (8550ed0ea86ef Merge branch 'for-7.5/cxl-kunit' 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 +Merge made by the 'ort' strategy. + Documentation/driver-api/cxl/index.rst | 1 + + Documentation/driver-api/cxl/testing.rst | 139 +++++++++++++++++ + drivers/cxl/.kunitconfig | 4 + + drivers/cxl/Kconfig | 16 ++ + drivers/cxl/Makefile | 1 + + drivers/cxl/core/Makefile | 1 + + drivers/cxl/core/region.c | 243 ++++++++++++++++++------------ + drivers/cxl/core/tests/Makefile | 5 + + drivers/cxl/core/tests/mbox_kunit.c | 250 +++++++++++++++++++++++++++++++ + drivers/cxl/cxl.h | 21 +++ + drivers/cxl/cxlmem.h | 6 + + drivers/cxl/tests/Makefile | 5 + + drivers/cxl/tests/hdm_encoding_kunit.c | 159 ++++++++++++++++++++ + 13 files changed, 759 insertions(+), 92 deletions(-) + create mode 100644 Documentation/driver-api/cxl/testing.rst + create mode 100644 drivers/cxl/.kunitconfig + create mode 100644 drivers/cxl/core/tests/Makefile + create mode 100644 drivers/cxl/core/tests/mbox_kunit.c + create mode 100644 drivers/cxl/tests/Makefile + create mode 100644 drivers/cxl/tests/hdm_encoding_kunit.c +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 (70c0be5b80661 selftests/nolibc: don't download GCC toolchain for clang-only architectures) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Merge made by the 'ort' strategy. + tools/include/nolibc/dirent.h | 37 +++++++++++++++++----- + tools/include/nolibc/stdio.h | 3 ++ + tools/testing/selftests/nolibc/nolibc-test.c | 47 +++++++++++++++++++++++++--- + tools/testing/selftests/nolibc/run-tests.sh | 3 ++ + 4 files changed, 78 insertions(+), 12 deletions(-) +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 branches 'turbostat' and 'x86_energy_perf_policy' into utilities) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Merge made by the 'ort' strategy. +Merging pwrseq/pwrseq/for-next (a88a76c3f5297 Merge tag 'v7.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into pwrseq/for-next) +$ 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 (6628e7d4c6b25 Linux 7.4-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 3ad065446cf15] 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/ksm.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 include/sound/cs35l41.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 +Auto-merging sound/soc/codecs/cs35l41-lib.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 7b548176f5ce9] 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 |