diff options
Diffstat (limited to 'Next')
| -rw-r--r-- | Next/SHA1s | 427 | ||||
| -rw-r--r-- | Next/Trees | 427 | ||||
| -rw-r--r-- | Next/merge.log | 3688 |
3 files changed, 4542 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..5e96ea3b4dbf --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,427 @@ +Name SHA1 +---- ---- +origin 1b78070aaef63512688aebfbc82365ef9d6660f1 +ext4-fixes 981fcc5674e67158d24d23e841523eccba19d0e7 +vfs-brauner-fixes b64a9f67e082e04835ddd69d422a25168d69375b +fscrypt-current cf6c993c0feca7984797e634deba3c80342e199a +fsverity-current d2f96bcb89d36d488a10e3bcf819b98536968286 +btrfs-fixes af5534fe2fbc006e83d75d6283dfc5ec75d5d780 +vfs-fixes 49c5d168a3a8f4eb27d44a2a22b7e8a856ca601f +erofs-fixes 075b74841bd0065a3bda3440873c747938e69b68 +nfsd-fixes 46db3c8a1be96a354758b44b1d4fbb4b70d09a20 +v9fs-fixes 028ef9c96e96197026887c0f092424679298aae8 +overlayfs-fixes 4549871118cf616eecdd2d939f78e3b9e1dddc48 +fscrypt 7dd38d9dd7a05329825fe2324d4d8e27ad4b3cec +btrfs f037522c036c041858e59318df577c87e8200ac0 +ceph 8fdf946445732c2bcd685abc8bd0e509d2ebc158 +cifs ffd294d346d185b70e28b1a28abe367bbfe53c04 +configfs 41a9c2b48e258ed97e9a7153110ab583a2f3145b +ecryptfs f81cb44f9a4b88d73ee5dec4a1ccdb0232fd2e3f +dlm e61113cfcaf71cbdf4c17e3d086d8fb7f92c62bf +erofs a7d28aa0e9b2c983b915d091f9596f0e3b253355 +exfat d1b432080f57a2799a1b2d03531f7990be044414 +ext3 3d7e6f0b557dab405cc431029a450ff0047da292 +ext4 9091c97be34083587a75db174aab51551d8e8543 +f2fs c966d29e01bbf829f8bb4a39a49811c56cdb49c3 +fsverity dc59e4fea9d83f03bad6bddf3fa2e52491777482 +fuse 34b5c4a6e4fb9dbb3f9d87f3b0fb0372105c8302 +gfs2 4bb187d6f379c5490e3034b153fe476127308519 +jfs dad98c5b2a05ef744af4c884c97066a3c8cdad61 +ksmbd 35205b06fbb8a16074aa93f846666eb42b7b2e9f +nfs ee5a386cfe60f3f8286de16a9db8e1a08f0bc124 +nfs-anna e053b624f5d36669756990743346157be9f68c34 +nfsd d7f4c3a7a16060a854dc2e4f64341c364d4e3712 +ntfs ac727d86fb84bdc9626ba9c756c26767459f3083 +ntfs3 c22f91d82cb9a29d22bdffdce6c803467984ad0c +orangefs d410cd5303ec59c7cf23dd61423752ce8e9ecb59 +overlayfs 1f6ee9be92f8df85a8c9a5a78c20fd39c0c21a95 +ubifs a5e0055eac837a1168c781653943d4a0d9920af3 +v9fs aa88278693cbfaf7a2acf961379973fbb63b165c +v9fs-ericvh 028ef9c96e96197026887c0f092424679298aae8 +xfs 412f89fb3988a344175899776c8bc7073524ad84 +zonefs 3a8389d42bdf4213730f4067f8bfa78bae6564ef +vfs-brauner c4463c3bf63d0d5a8e4b55f78ca220ddf27a6859 +vfs 4dda01b67c8662c5d0c53034974cb8280c575a5d +mm-fixes 35314b1c46ced71c1c6bbfa6181902195f83f8d4 +fs-current 6f30852fa8e789fd58f5a2bfe543a59bc464a367 +kbuild-current e5a259d98823a93459643b239b71fed7589ab669 +clang-fixes 175db11786bde9061db526bf1ac5107d915f5163 +arc-current 1590cf0329716306e948a8fc29f1d3ee87d3989f +arm-current 1039bffd6ae9c75b42b7d148d6c1106134107b66 +arm64-fixes f73a8edc2ccc6ec72c37d5c578e7592d2e1f9922 +arm-soc-fixes e36c0670d5ebebd7dba493f14966051f354fbb34 +davinci-current dc59e4fea9d83f03bad6bddf3fa2e52491777482 +realtek-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drivers-memory-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current 2f8e3cad53b5c36ab0ed5d3195bfc55c59ea61a5 +powerpc-fixes fb442a6673ff1046bf67754957d95880fdb394b5 +s390-fixes eb363254472493e3458156fc11fd56dca92f4333 +net 1b78070aaef63512688aebfbc82365ef9d6660f1 +bpf ce6dcd0aed185432d02cafc82b738318af257ccd +ipsec d2f5082f9e84653fa1a9e8aebaaff23e688f5e19 +netfilter 1b78070aaef63512688aebfbc82365ef9d6660f1 +ipvs 2c7c88a412aa6d09cd04b414211b4ef8553b5309 +wireless 2812e64e1575e05500a35c405aaa6e99b7d7930b +ath 2812e64e1575e05500a35c405aaa6e99b7d7930b +iwlwifi d13d5d299c11b7bd3362d5692c56225d9e176664 +wpan 8ce4f287524c74a118b0af1eebd4b24a8efca57a +rdma-fixes 8049741ac93acd3a590dac070e12571fddf0e294 +sound-current c4a0927f535f779700d5ccda8182c2db01e9d551 +sound-asoc-fixes 32b4e6b134c62e14291206da331891e99e2fb63d +regmap-fixes 00268f9452d2a0d660aa9c1bb0ca07a994af6a4f +regulator-fixes bd2a0c2d8c49ffb7acfcb0c1177af355ea417caf +spi-fixes 67140664a029cf01f5b5d13ae8a9bd0852f1b19c +pci-current 570f7e331f5febb30f1384817463c7e42b65ca7d +driver-core.current 45c13f3f9e3bb15fd89ff2864c6f627a3b4b4229 +tty.current 45c13f3f9e3bb15fd89ff2864c6f627a3b4b4229 +usb.current 45c13f3f9e3bb15fd89ff2864c6f627a3b4b4229 +usb-serial-fixes d37186bd95a07e334447f47274a38a311dad2172 +phy 075b74841bd0065a3bda3440873c747938e69b68 +staging.current 45c13f3f9e3bb15fd89ff2864c6f627a3b4b4229 +iio-fixes 6b9f23b5460818aaf199dda90210d5fc08d66c8f +watchdog-fixes db2ddb87143519e20a95aa36c60b36107b736a58 +counter-current f1a3a9946aab611dd2200c01ff122f64b033dad2 +char-misc.current 45c13f3f9e3bb15fd89ff2864c6f627a3b4b4229 +soundwire-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +thunderbolt-fixes 8d3ae59288f1e7d58d76558a6ee96d533bc5019f +input-current 4d7fa28e151a6a6f24098d9e60f558f8ea61ddaa +crypto-current ee440d4fc0d2f15894ab1f64c474a3adbc858880 +libcrypto-fixes 1590cf0329716306e948a8fc29f1d3ee87d3989f +vfio-fixes e242e974e812e7a47e3088860c80d9492fac314f +kselftest-fixes c5c413534d40eb4c982f1794e62813f926aba747 +dmaengine-fixes 075b74841bd0065a3bda3440873c747938e69b68 +backlight-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mtd-fixes 2b533e775aec580cf60074417f4ca00ac9cf3580 +mfd-fixes d5d2d7a8d8be18681a0864f58e3875f1c639e11c +v4l-dvb-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +reset-fixes 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 +mips-fixes a13c140cc289c0b7b3770bce5b3ad42ab35074aa +at91-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +omap-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +kvm-fixes 8d3ae59288f1e7d58d76558a6ee96d533bc5019f +kvms390-fixes 30300ec2780efa6cb9ea0887d1b94506af9c4eea +kvm-arm-fixes 751a956c75a5449e1769897f374094ea476ba1a1 +hwmon-fixes 83a16909eb64360fd0659f7970665272cdbe65a1 +nvdimm-fixes a8aec14230322ed8f1e8042b6d656c1631d41163 +cxl-fixes d90f236f8b9e354848bd226f581db27755ab901d +dma-mapping-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drivers-x86-fixes 5b05bb3f6c5716fab6911e12d60dd1f43ad9806a +samsung-krzk-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-samsung-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-qcom-fixes 1e7b04c12c077e8829991833a9aa2cb3bdacab61 +devicetree-fixes 5bb01c657ff9fc807c2c592ca18af34c4fc3bc6f +dt-krzk-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +scsi-fixes c4f6916a99cf105c3ff340b6210fcbba3fa66b35 +drm-fixes 8d3ae59288f1e7d58d76558a6ee96d533bc5019f +drm-intel-fixes 266ebacffc5809478a2e80d61ddc58c921dbe2b4 +mmc-fixes 00179ed9fbe07799676e2cb63c4e7f0e7cd80a5c +rtc-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +gnss-fixes a13c140cc289c0b7b3770bce5b3ad42ab35074aa +hyperv-fixes 0fd49f7bfb8f1952ae157344ea9712da74734200 +risc-v-fixes 2c1efc460f9caefc1ae37413c1ce1225f124378c +riscv-dt-fixes 42c57c049054dfaa0be83f6721f7c4ce4a880e56 +riscv-soc-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx dc59e4fea9d83f03bad6bddf3fa2e52491777482 +gpio-brgl-fixes 16b10f64c63f78220c3b4035f1ed6cd3bdcb0b02 +gpio-intel-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-intel-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +auxdisplay-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +kunit-fixes 5142c56651578abc346d6c17f3fb919b9ffbb317 +renesas-fixes 6fa6ee724d8dadf392139e242ac936b5da730c4b +perf-current 9453bc6a69ef43755f1c28d5688cacdd69fa16bd +efi-fixes d8809f6931065cbbf3554647a50a65a471ab5983 +battery-fixes 160a783aa65b74782bc17cb874af1a6d3f5fba3c +iommufd-fixes 075b74841bd0065a3bda3440873c747938e69b68 +rust-fixes 1b0bab4a873f1034c27573cfc613394cff7e0a5b +w1-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pmdomain-fixes d4c177153bdfc2e4569108fdb6a2f6c64d7b12bc +i2c-andi-fixes b15b548d52b43ba8ac4652bc2c7244a8dd1e9622 +i2c-rust-fixes 4eb422482ca5d924d7212ad2ca1cb7ea6f5b524d +sparc-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +clk-fixes 7ae8acad2d5c415ecb754409a4b64f09169c082e +thead-clk-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +tenstorrent-clk-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +fustini-config-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +pwrseq-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +thead-dt-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +ftrace-fixes 1650a1b6cb1ae6cb99bb4fce21b30ebdf9fc238e +ring-buffer-fixes 057caace5214da3b457bbd295e1a2ad34d3685ea +trace-fixes 6727b7618f49401acf373fa3ec5712e2ec52e5cf +tracefs-fixes 07004a8c4b572171934390148ee48c4175c77eed +spacemit-fixes eb525edd48907795c0d4e498ff57ad168070b289 +tip-fixes d2f36b6e31d423d9331596b1095267157c433ae8 +kexec-fixes ada2e5a44e99113e08ad9b7b71396c6c572204da +liveupdate-fixes 3a0b8fa2eb36afc88b62a95f33f0c77c71fa5ded +drm-msm-fixes e2332abed2a4d3caa59052095dc16e4ce44791ea +uml-fixes af421e9aed3920c7ac88c24daa48606c7112feca +fwctl-fixes 075b74841bd0065a3bda3440873c747938e69b68 +devsec-tsm-fixes c3fd16c3b98ed726294feab2f94f876290bf7b61 +drm-rust-fixes 8cdeaa50eae8dad34885515f62559ee83e7e8dda +tenstorrent-dt-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +nfc-fixes be47ff78de05e931ede1d0a407f8ef6f063054d3 +drm-misc-fixes 20839d02c0cf7437bc508d4c5430538d9dc4f428 +rust 73e3f0710014fe6d4ed98cfc02292f6121db7558 +rust-interop 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b +rust-alloc 45c13f3f9e3bb15fd89ff2864c6f627a3b4b4229 +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init 1e26aea0355ad2afa1ccbc62885c01f5bcfc58ca +rust-timekeeping ddb1444d3335129ae87d9796ab1debf41c0ee51b +rust-xarray c455f19bbe6104debd980bb15515faf716bd81b8 +rust-analyzer 5f45afb8ab04d934fc0601a202f95267ebc20059 +mm 35314b1c46ced71c1c6bbfa6181902195f83f8d4 +mm-nonmm-stable 18fbf5151d2c0bfe433c7428eef03cabf5fdb2fa +mm-nonmm-unstable 4628ed590c74782907a93ffc915bf4001e73c952 +kbuild d900723d78adec229996aefbab0dcaa66a177b77 +clang-format 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +perf 9453bc6a69ef43755f1c28d5688cacdd69fa16bd +compiler-attributes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +dma-mapping 23e790697fd8ebbb53dcaa5222520fb4a704aacd +asm-generic adbbd9714f8058730f93c8df5c5bf1679456424b +alpha d58041d2c63e09a1c9083e0e9f4151e487c4e16a +arm 1345e9968d318758816dd0910f9d4c73d4d80d49 +arm64 2bd533739234d79b74afabfece1abfe9c6d52c83 +arm-perf 5936245125f78d896fdb1bbc2ae79213e28a6579 +arm-soc ae77d827fb0e6fb2faf8186f075c6c337f2dcf08 +amlogic 544455a3a844edd6107b15cd0ab0b657399f2d49 +asahi-soc 8776c12e06211d723104a754e047dc3d9bc8d2e6 +at91 d6e7bce8d43920ea01a217b5bccf4a30bf4165b5 +bmc cd7d1ef7d74ed5f5a1790a40389bc38382924556 +broadcom fca5276165993e9ca18e746f9b41af7627cbe349 +cix a0cffbd8878c55b12dc4555f883adf3372cecd91 +davinci dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drivers-memory 96aa6902ff2bf81b9b8e0fa228494595dc2374a9 +fsl e14b8d39388095fb806fe9f98a95b70619e4cabd +imx-mxs 9400c5b6aa357be2379c98ae86a207bc21dc7a48 +mediatek f5be25e697e0362103625b1b197af126ae4ba5f7 +mvebu 5acccc8f8d731a0a184ef10fa4b65ab202a38c99 +omap ba251bb5ce2db9228a4c1ca9aef787c368121af7 +qcom ed2647532a225739e86c7f236a2ce82764ec2772 +realtek 3c778f0c9fa36b6b9a26bd2146df24ed4e830ba4 +renesas f9592c355314cb76e76078dfc58ea747e382ea15 +reset d373605cd514837d8a6de3d00c786d4bae6dbaf8 +rockchip 2d578cd590adc2133aa24496afcd7c3f7f9ba36a +samsung-krzk acde40ba506aae78633e080b5704d33cf4bc13c6 +scmi 8703affc72639ff10c0881db5a9c228bdb7211e4 +sophgo 76acfee87c74dc0dc7a68a00b70b9c39d1c8428f +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit 3fca3cbc0516b839733a92be712aa34132249a93 +stm32 90d4d470d4d478ea011f2ebb6b4ecf199a6d0653 +sunxi 859c0e1925332d413ca8f9159c8ca5d04eea32a2 +tee a3067938fd192b116b6dfb325b654300a6d1b461 +tegra 48713e5ff96a2c04286071a2136455545e4c72a5 +tenstorrent-dt 33583baeb1ba7d328e6a9775d889036900b74cdb +fustini-config 020e209272bee0b8add8cba21125e4744f034b26 +thead-dt 15d32aaf6300b832814a9930fdbd20efdbc9adcf +ti 61831b50771af5ff3097f12c3396a7e9e33b6dad +xilinx a4ff2be345d0abc943da8dd8da98151843b750dc +socfpga ff98c9832fd430ba7b3158b8521002c8eb8aa16c +clk dd8eb789f18c4c600f28e61176a02bcf3b790117 +clk-imx 39ec460b56b26319d1f31b459e8be7ea34ae9c67 +clk-renesas 0fb9083a6e56f688aeeccfc7ef7eeba586e57dc6 +thead-clk b2ee00d0bf4cca5dd02702fc339d2b523191966f +tenstorrent-clk 23c8ebc952849b3ba47d04d0ec95daf5cc136061 +csky abb81e5ce7d995baa41556b8125fa59e28ba3be8 +loongarch e2a848868441874d416d47a5cba5452b34473504 +m68k 2f8e3cad53b5c36ab0ed5d3195bfc55c59ea61a5 +m68knommu de0dab22cbf6943d0f12f3b1e2eb1bbdd807f039 +microblaze 8d3ae59288f1e7d58d76558a6ee96d533bc5019f +mips 3b7711be02612845e44b5e9ef7c0b9f203cf29b6 +openrisc 6620f5e8c11c4f7e41222a86f5c97150cc5f84a5 +parisc-hd 8d3ae59288f1e7d58d76558a6ee96d533bc5019f +powerpc 1304643a1c20badbb91b86a5084dd76cb7620c05 +risc-v 77ae27fd98f3b548797c9f22c10ab5cf1c4ada53 +riscv-dt 82ab962ef6c2a3571e3d590b30c023118c92b776 +riscv-soc 8cdeaa50eae8dad34885515f62559ee83e7e8dda +s390 53158917ea1a0219f6886a0ae10f6f276ecfa2a6 +sh b0aa5e4b087b686575f1b31ce54048b4d059b7b8 +sparc 5b2a3b1a98fb47c593144c2770e012d463952b70 +uml 1590cf0329716306e948a8fc29f1d3ee87d3989f +xtensa eb049bdbf2b98d103d93daef44a5e1a0164d01eb +fs-next cfae6aa69b8eb8b299016941921bf26ce718d227 +printk ffe0486b139e45cd9c9ca2584f04a1910fe4f8a6 +pci 570f7e331f5febb30f1384817463c7e42b65ca7d +pstore 24b8f8dcb9a139a36cf48bfbe935e8dc1f33ed79 +hid 931aaa59d1826f43b0bb3f07e21233f6faf4540a +i2c 8cd9520d35a6c38db6567e97dd93b1f11f185dc6 +i2c-andi 1f3e66348d2527c31b9bedb0b4d9e28bdad9bc83 +i2c-rust 61ddec70c9bcc3d4b0471c8683e57d3b03cecf0a +i3c cab40cfc9e116acd4d60f95b4b1264cab78f3803 +dmi 1afafbaf749d8e8ec53f8e38efdc731131902b5b +hwmon-staging 75f2c0b3690702c90863c2e138cb5520670845ea +jc_docs 94509f50d696bff745fe26457ce421cea8525bee +v4l-dvb 4900cad020c0580dfb1be27776ff10a4ef110cfa +v4l-dvb-next adc218676eef25575469234709c2d87185ca223a +pm b2f3581c6481ee2953b7707daa90c6f6ad16befd +cpufreq-arm 8c3afcf27fa4582c1ab912503dc8a4ebb8dc0f82 +cpupower adfe0057326ffbc2cd5ff69a57ec0e50b5e74095 +devfreq 9a222650d9e70d0027126e4df5b00b1b5b678a97 +pmdomain 3ca7b513aec1db32b75b909395be1111c1198afb +opp 84f05af0975c9f9c8ffee0361d6f7cbb1f289231 +thermal b115930d716defc3a7daa2bc2ae2465d864b7114 +rdma 8049741ac93acd3a590dac070e12571fddf0e294 +net-next 1b78070aaef63512688aebfbc82365ef9d6660f1 +bpf-next 48b69cc8825d411a4c4df32de854434e9235a1b0 +ipsec-next 298bb2b8903323f6ef2eab4819a2e477765f0ff1 +mlx5-next 36b1d3299d0b6aa51485cc9a79b8d94948d5f3d4 +netfilter-next 91ec2035134982b98fab0609a9fd8480e8217dc1 +ipvs-next f6f3b36c15ed44de1fbb44e645e4fae8c4a4453e +bluetooth bcb621272aa04a116a74ab5fcc9324231ffa3acb +wireless-next ca800a9302764c445de0da0e84d2252400a770ee +ath-next ca800a9302764c445de0da0e84d2252400a770ee +iwlwifi-next 4a2610a5a9fcf77eaad82bb030ec77ec5e381db8 +wpan-next a6bfdfcc6711d1d5a92e98644359dedc67c0c858 +wpan-staging a6bfdfcc6711d1d5a92e98644359dedc67c0c858 +mtd 94d32f1ace8ee3ef3537ac6c8e71b76a418a4762 +nand 15a3cbce32994141252bb4ecfe3ff3a5d22d0b4f +spi-nor df415c5e1de0f1aeefacb4e6252ff98d38c04437 +crypto 7537036a2e6fe96f8ed82034f755c54714a0e417 +libcrypto 0f23d56f17fdfc7db69d51f64c8b91bbab947aa9 +drm a8b02aa825803e6c5b6b27340f583900afa0861d +drm-exynos 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc 271e90eb5f9ff34951647e5ed33c1775eebcca50 +amdgpu e4c3ab59021e7c146a84b6671f0d530972bd58b4 +drm-intel 65b92bc671db7c222f8de1146c88e40fe8764d95 +drm-msm 140b13475302601368c0cf4e193e66126a49feb3 +drm-msm-lumag 140b13475302601368c0cf4e193e66126a49feb3 +drm-xe 6a8789e948c15f6daea4961e73e8ba01016716b2 +drm-rust 4c9ba407018e8deb06dbc643112bac8f40404f95 +drm-nova 93296e9d9528f0d87f2cf3fee494599060a0f14a +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev 94e6a058b16820e02f25e1221a4c4e713ba23550 +regmap efc5e244e825887ed100d5b5bfbf80f210683e1b +sound c4a0927f535f779700d5ccda8182c2db01e9d551 +ieee1394 05bfb1327dc5fb61528bab31cd8f0c1e4bddec23 +sound-asoc 32b4e6b134c62e14291206da331891e99e2fb63d +modules 3dfaae04243cde460d82dfc2a7dd0bb6664d20ae +input fcc1d6eab4ce4ba86ae05a87ecf7ce06cd2ca4d8 +block 44e96e364b04163ddddc8a24289cef4982b7e36e +device-mapper 39c5aa3bd8ec3912d2cd0b3fe092642b0d2b0713 +libata 73b6bf3c314ad34a9fd389f84de6e8dbfc204880 +pcmcia b3c26ea81ccc522e77ed0b1707add61fc9206216 +mmc 35e689fb79dcbaa8d69cc4a58a7ad4d0d7346e4a +mfd 9d0e4b1ae5b045a2c92b0b9a1c3b268191c219d9 +backlight cf1a12e0804515e0ed8b3f50c1c32f7f425bd660 +battery 2da28b059e0ddcd2e1956eeae383246207965573 +regulator bd2a0c2d8c49ffb7acfcb0c1177af355ea417caf +security 0cee720cfd51402cfcb14d96cb326a36c13b823a +apparmor 3daad923a8685adb66087e0d819559b7eb6ba975 +integrity f1e10b10874051e4d99911dae0dd7b75a9f8ae66 +selinux 3b93fe26412a422d92ef5c4ff3339112e61c24f8 +smack fedc88e38ce979a720cd2de042578cb5df3dc8de +tomoyo 2d2338c93da79b3bfe4b6099a931d9468d539952 +tpmdd-tpm 55ba91d4c54ab31ee8387bae40e799de467f8269 +tpmdd-keys 5e2d672280d97d83de43031d93761b12dadd7b8a +watchdog 3bbbeb7fddf54a7d7116b2defe0a63a9b583c84e +iommu 3c6a2bac15247bc4f28125247ff89165324612fe +audit 2b10b6de62d7b99d46300afeb1097642a9ab0711 +devicetree e1c13aed4a1641550e8c9518c96f016e1d52d09b +dt-krzk 6bd34d56818cc881a75c789ad6ce8ec4a1e32f3a +mailbox 14af7a96afa39f4f3c1972705489b9ba15c01857 +spi 67140664a029cf01f5b5d13ae8a9bd0852f1b19c +tip d2f36b6e31d423d9331596b1095267157c433ae8 +kexec 9d50f7c5ad5b4b031c9b85f9a43c626d8268ab51 +liveupdate 352ebb57013a08679788bc18c7f9af90903db256 +clockevents 1b8b356b4b06e3a28feb852c04e06caeac07bc87 +edac 9fa765b3ed33d6dd64aca0ba8f6ed7697de50410 +ftrace 3df3ae98c30c249c4bbf3d74559cc6972898052c +rcu 9cc63f8bcd560c760d0b12e15bba8f81c86237cf +paulmck 85f4ab0da78876af7666ce41d429b52d16b56f46 +kvm 76671054f9a1ff6abb976583cd8da37650acdc97 +kvm-arm aa8e5dc6a7a2a1141ab40706a51010adcd0e57d2 +kvms390 dd6f4ef6f8a37412909ad787c837332fb070159c +kvm-ppc f5098b6bae761e346ebcd9da7f95622c04733cff +kvm-riscv b5060a4aa33d7d78a8c1837ab08ef0c81ea96650 +kvm-x86 76671054f9a1ff6abb976583cd8da37650acdc97 +xen-tip d330fb86a7170f845123ae82d95df440fad9b707 +percpu 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +workqueues cf9c8aaea0d47410df8708bec195889f3a85cd3c +sched-ext 6586705bc2dc06908309bf65d79efa53a347c9f0 +drivers-x86 5b05bb3f6c5716fab6911e12d60dd1f43ad9806a +chrome-platform 81c1c0cb68a13d14dd1bbffcf4c49e26f9a6478c +chrome-platform-firmware a58a57a1076f8c5dae0327e3710899478c3be901 +hsi e81250ec6b69248b00d38c523dc6a13efaf38aab +leds-lj f8cca63a0a4f3475199d9ab7f86782bdfeb0744d +ipmi 05ec76cfbce653e07cec19b9b8b20e33449d5d87 +driver-core 45c13f3f9e3bb15fd89ff2864c6f627a3b4b4229 +usb 45c13f3f9e3bb15fd89ff2864c6f627a3b4b4229 +thunderbolt 86feaba911f2f1a540a7695c8f4a98fd0fd60ac4 +usb-serial 15734de99517b0c81a1a5a3bccaff4593ef8d953 +tty 45c13f3f9e3bb15fd89ff2864c6f627a3b4b4229 +char-misc 45c13f3f9e3bb15fd89ff2864c6f627a3b4b4229 +coresight 9e3604d7369cfc0110100eb1a0acab1865ee2d18 +fastrpc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +fpga 4216e549a265701c88df660f42d74a7eb4819af2 +icc 9621c81fd2eb7db4b647814b7b6e537744831e60 +iio 350d1fb9204b13c5f95e511e98b8bcb47574d425 +nfc 9f69d05b5a85c417c73fa2d5c7a2d507ac81cf4b +phy-next ba8376e8c76c6512c98949dffbf4ded0b782a365 +soundwire 5b08a3afd2995e5312c4c47ffea9d21b651e8e13 +extcon 8d3ae59288f1e7d58d76558a6ee96d533bc5019f +gnss a13c140cc289c0b7b3770bce5b3ad42ab35074aa +vfio 4e3c1fc8abcb8eff062150b4340fa4569696d645 +w1 4d3721b204f961e905714954ff95633337b768e3 +spmi 8cdeaa50eae8dad34885515f62559ee83e7e8dda +staging 45c13f3f9e3bb15fd89ff2864c6f627a3b4b4229 +counter-next 353b2e09f44a91e64c6b8117df46b6999c52e465 +mux ac7bde3c53166656d80e3aacc7d274d3c60a6de4 +dmaengine 0d995da5fb97e8c312834575604d4423eb6225b7 +cgroup b57d03eb82b796a6451f834f3a9091908743060b +scsi cf1af0ccca54d5547cc31bf476c6a07cf658ad29 +scsi-mkp 12e67eb89eb2b9516685c744d3f7de0a2d1bd701 +vhost ae864da7d762b4c692e2cdf83cad43110d5d46ee +rpmsg d4d61a4b0a52e8f3cdb3e1578602850a3452ec3e +gpio-brgl 3d12d02dda0917f50fcc4cdf4b54bb417f609d78 +gpio-intel dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl d067f0f4c96cb5402a111cf649b7bf9c5771ec74 +pinctrl-intel ed1608d5e3c4432c1dcba709668b90f44228c10c +pinctrl-renesas 5a653cedec948423fc8a0180c90b8d05c2239d9d +pinctrl-samsung d441836c9d704d0f3db5dbf44df87af2ba7a9d26 +pinctrl-qcom 1860fb0be224dec0e4d170f46d1cbbc77e25e09e +pwm b4e94b0418ad6dbe62b6ca53369159ed3d9f0d8c +ktest 932cdaf3e273a2727e77af97f79f12577174c5a0 +kselftest 649ba27dfac784427a01f9c95c09ecbcb88900d8 +kunit dc59e4fea9d83f03bad6bddf3fa2e52491777482 +kunit-next dea754ded9518b51740c417d2c1e02ff540784c6 +livepatching 26260251022fbc2f248a3d747a9b2b961b18d2d8 +rtc afce9701d6423a63194a349d2f1e34c50ce76482 +nvdimm e99cb3ecd8334ca21e01ff9a79a916693f58f1fb +at24 dc59e4fea9d83f03bad6bddf3fa2e52491777482 +ntb dc59e4fea9d83f03bad6bddf3fa2e52491777482 +seccomp 41fa04327384148b0e2e828c9be9862c5240e9fa +slimbus c922423ce66bcee6c61d1b5aadea09b29ca81400 +nvmem dc59e4fea9d83f03bad6bddf3fa2e52491777482 +hyperv be0cfab740e58b70047ef6e7e3d578f00ed5d258 +auxdisplay e3e3bf40916c1e810df03958cfa7ba6883cdce79 +kgdb fdbdd0ccb30af18d3b29e714ac8d5ab6163279e0 +hmm 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +cfi dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mhi 9656bcd4c321a799148d00dd830ce7ebf20011da +cxl 7098e9cd98a05c0c5de2fae0c2465f9d966fdd07 +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi b2326338dc683e8c1067c0cbf7a47986c4190902 +unicode a511442085c140da9cdbe60e3f0fab1c71480801 +random bb9ff576fdff48c242876f55098a3ee20a29df5d +landlock 172b6a6d8463562b0cbebfd66f770b078f81966b +sysctl 8d75c338f0bcecaa6c9af67f86c176b67b6acf3e +execve ab11176bd3a76058ecafd066d0f9c718dc80f389 +bitmap f4806cc63cc65bd752fd72d84937614dca6504ec +hte 005b25ad11717139ca5c14c9f06c2a60855c2afd +kspp 3421b9b056a6576d0ebac1030eafb48ad0544092 +nolibc b58afc8d1cf85688601b8d7e271125fff666f661 +iommufd 8c07df7cdfcf52f1ff276c588612aabc6c6b8399 +turbostat 1c996a37fd244d19e5dbb715328c1676e28ef607 +pwrseq d51fc9d4cd6eb18ac82913d83ecf7bd8c85f71ee +capabilities-next 9b0ee13b80798feb0e6a83a6d69e915f23fcb6bc +ipe 028ef9c96e96197026887c0f092424679298aae8 +kcsan a8488ecbd7ba44d65b912dfe88a73f438eba2447 +crc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +keys-next 965e9a2cf23b066d8bdeb690dff9cd7089c5f667 +fwctl e052daab94ee8c4081c91de3549772bd1c235729 +devsec-tsm 3177779ae17db4c66c851f799505fb95c7530c03 +hisilicon a5db65458a911daa6f8927264366dab501715dc0 +device-id 995832b2cebe6969d1b42635db698803ee31294d +kthread fa39ec4f89f2637ed1cdbcde3656825951787668 +pagemap-headers e02cb91d4644dfff593146f89e70d2008cc6ac16 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..cb075bd5fdaa --- /dev/null +++ b/Next/Trees @@ -0,0 +1,427 @@ +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 +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 https://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux.git#clang-fixes-for-next +arc-current https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#fixes +arm64-fixes https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +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 +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 +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 +drm-misc-fixes https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes +rust https://github.com/Rust-for-Linux/linux.git#rust-next +rust-interop https://github.com/Rust-for-Linux/linux.git#interop-next +rust-alloc https://github.com/Rust-for-Linux/linux.git#alloc-next +rust-io https://github.com/Rust-for-Linux/linux.git#io-next +rust-pin-init https://github.com/Rust-for-Linux/linux.git#pin-init-next +rust-timekeeping https://github.com/Rust-for-Linux/linux.git#timekeeping-next +rust-xarray https://github.com/Rust-for-Linux/linux.git#xarray-next +rust-analyzer https://github.com/Rust-for-Linux/linux.git#rust-analyzer-next +mm https://git.kernel.org/pub/scm/linux/kernel/git/mm/linux.git#for-next +mm-nonmm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm-nonmm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-unstable +kbuild https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-for-next +clang-format https://github.com/ojeda/linux.git#clang-format +perf https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-for-next +asm-generic https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#master +alpha https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git#alpha-next +arm https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#for-next +arm64 https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +at91 https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +bmc https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git#for-next +broadcom https://github.com/Broadcom/stblinux.git#next +cix https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git#for-next +davinci https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +fsl https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git#soc_fsl +imx-mxs https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git#for-next +mediatek https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next +mvebu https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#for-next +qcom https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +realtek https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git#for-next +renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux#reset/next +rockchip https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +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 +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..408b0d007083 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3688 @@ +$ date -R +Fri, 28 Aug 2026 13:00:08 +0100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 73e3f0710014f Merge tag 'nfs-for-7.3-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs +Merging origin/master (1b78070aaef63 Merge tag 'net-7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 73e3f0710014f..1b78070aaef63 +Fast-forward (no commit created; -m option ignored) + Documentation/admin-guide/blockdev/zram.rst | 40 +- + Documentation/admin-guide/kernel-parameters.txt | 16 +- + Documentation/admin-guide/mm/transhuge.rst | 6 +- + Documentation/core-api/maple_tree.rst | 24 +- + Documentation/dev-tools/kmemleak.rst | 10 + + Documentation/devicetree/bindings/Makefile | 2 +- + .../bindings/input/qcom,spmi-haptics.yaml | 116 ++++ + .../devicetree/bindings/leds/adi,ltc3220.yaml | 133 +++++ + .../bindings/leds/backlight/88pm860x.txt | 1 + + .../bindings/leds/backlight/awinic,aw99706.yaml | 2 +- + .../bindings/leds/backlight/silergy,sy7758.yaml | 52 ++ + .../bindings/leds/backlight/ti,tps65217.yaml | 170 ++++++ + .../bindings/leds/backlight/tps65217-backlight.txt | 27 - + .../bindings/leds/brcm,bcm6358-leds.yaml | 96 ++++ + Documentation/devicetree/bindings/leds/common.yaml | 12 + + .../devicetree/bindings/leds/lacie,ns2-leds.yaml | 85 +++ + .../devicetree/bindings/leds/leds-bcm6358.txt | 143 ----- + .../devicetree/bindings/leds/leds-ns2.txt | 35 -- + .../bindings/leds/leds-pwm-multicolor.yaml | 4 + + .../devicetree/bindings/leds/nxp,pca963x.yaml | 108 +++- + .../bindings/mfd/marvell,88pm886-a1.yaml | 2 +- + .../bindings/mfd/mediatek,mt8195-scpsys.yaml | 1 + + .../devicetree/bindings/mfd/omap-usb-tll.txt | 27 - + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 5 + + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 4 + + .../devicetree/bindings/mfd/st,stmpe.yaml | 2 +- + .../devicetree/bindings/mfd/syscon-common.yaml | 34 ++ + Documentation/devicetree/bindings/mfd/syscon.yaml | 118 +---- + .../devicetree/bindings/mfd/ti,usbhs-tll.yaml | 53 ++ + .../devicetree/bindings/regulator/tps65217.txt | 78 --- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/filesystems/fscrypt.rst | 4 + + Documentation/filesystems/locking.rst | 8 +- + Documentation/filesystems/vfs.rst | 8 +- + Documentation/leds/leds-st1202.rst | 9 +- + Documentation/mm/allocation-profiling.rst | 16 + + Documentation/mm/ksm.rst | 4 +- + Documentation/mm/page_migration.rst | 6 +- + Documentation/networking/oa-tc6-framework.rst | 2 +- + Documentation/translations/zh_CN/mm/ksm.rst | 4 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 + + MAINTAINERS | 29 +- + arch/arm/mach-ux500/cpu-db8500.c | 6 +- + arch/s390/mm/gmap_helpers.c | 2 +- + arch/x86/hyperv/hv_init.c | 23 +- + arch/x86/kernel/cpu/mshyperv.c | 25 +- + drivers/base/Kconfig | 7 - + drivers/base/Makefile | 1 - + drivers/block/zram/backend_842.c | 10 + + drivers/block/zram/backend_deflate.c | 25 +- + drivers/block/zram/backend_lz4.c | 10 +- + drivers/block/zram/backend_lz4hc.c | 16 +- + drivers/block/zram/backend_lzo.c | 10 + + drivers/block/zram/backend_lzorle.c | 10 + + drivers/block/zram/backend_zstd.c | 11 +- + drivers/block/zram/zram_drv.c | 188 ++++--- + drivers/block/zram/zram_drv.h | 14 + + drivers/bluetooth/btmtk.c | 11 +- + drivers/bluetooth/btmtksdio.c | 37 +- + drivers/bluetooth/btnxpuart.c | 39 +- + drivers/bluetooth/btrtl.c | 13 - + drivers/bluetooth/btusb.c | 8 + + drivers/bluetooth/hci_bcm.c | 1 + + drivers/bluetooth/hci_bcm4377.c | 1 + + drivers/bluetooth/hci_h5.c | 4 +- + drivers/bluetooth/hci_intel.c | 1 + + drivers/bluetooth/hci_ldisc.c | 2 +- + drivers/bluetooth/hci_serdev.c | 2 +- + drivers/clk/ux500/clk-prcmu.c | 20 +- + drivers/clk/ux500/u8500_of_clk.c | 2 +- + drivers/clocksource/hyperv_timer.c | 150 +----- + drivers/cpuidle/cpuidle-ux500.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 4 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +- + drivers/gpu/drm/panthor/panthor_gem.c | 2 +- + drivers/gpu/drm/ttm/ttm_backup.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +- + drivers/gpu/drm/xe/xe_device.c | 2 +- + drivers/hv/channel.c | 182 ++++++- + drivers/hv/channel_mgmt.c | 8 +- + drivers/hv/connection.c | 11 +- + drivers/hv/hv.c | 4 - + drivers/hv/hv_balloon.c | 36 +- + drivers/hv/hv_common.c | 12 +- + drivers/hv/hv_snapshot.c | 5 - + drivers/hv/vmbus_drv.c | 25 +- + drivers/infiniband/hw/mlx5/main.c | 5 +- + drivers/leds/Kconfig | 14 + + drivers/leds/Makefile | 1 + + drivers/leds/blink/leds-bcm63138.c | 4 +- + drivers/leds/leds-gpio.c | 53 +- + drivers/leds/leds-is31fl319x.c | 61 +-- + drivers/leds/leds-ltc3220.c | 586 +++++++++++++++++++++ + drivers/leds/leds-pca9532.c | 18 +- + drivers/leds/leds-pca963x.c | 193 +++++-- + drivers/leds/leds-st1202.c | 102 ++-- + drivers/leds/rgb/leds-lp5860-core.c | 3 +- + drivers/leds/rgb/leds-lp5860-spi.c | 10 +- + drivers/leds/rgb/leds-pwm-multicolor.c | 2 + + drivers/leds/trigger/ledtrig-netdev.c | 46 +- + drivers/mfd/88pm886.c | 21 +- + drivers/mfd/Kconfig | 7 +- + drivers/mfd/Makefile | 1 + + drivers/mfd/ab8500-core.c | 2 +- + drivers/mfd/altera-a10sr.c | 2 +- + drivers/mfd/arizona-spi.c | 12 +- + drivers/mfd/axp20x.c | 2 +- + drivers/mfd/cgbc-core.c | 4 +- + drivers/mfd/cros_ec_dev.c | 18 +- + drivers/mfd/cs40l50-spi.c | 4 +- + drivers/mfd/cs42l43-i2c.c | 2 - + drivers/mfd/cs42l43-sdw.c | 13 +- + drivers/mfd/cs42l43.c | 30 +- + drivers/mfd/da9052-spi.c | 12 +- + drivers/mfd/db8500-prcmu.c | 6 +- + drivers/mfd/intel-m10-bmc-spi.c | 6 +- + drivers/mfd/ipaq-micro.c | 2 +- + drivers/mfd/iqs62x.c | 2 +- + drivers/mfd/macsmc.c | 8 +- + drivers/mfd/madera-spi.c | 18 +- + drivers/mfd/motorola-cpcap.c | 6 +- + drivers/mfd/mt6397-core.c | 6 + + drivers/mfd/ocelot-spi.c | 2 +- + drivers/mfd/qnap-mcu.c | 13 +- + drivers/mfd/rave-sp.c | 64 ++- + drivers/mfd/rk8xx-spi.c | 2 +- + drivers/mfd/rohm-bd71828.c | 84 +-- + drivers/mfd/rohm-bd718x7.c | 84 +-- + drivers/mfd/rohm-pwrbutton.c | 112 ++++ + drivers/mfd/rohm-pwrbutton.h | 12 + + drivers/mfd/rsmu_spi.c | 12 +- + drivers/mfd/si476x-cmd.c | 1 - + drivers/mfd/si476x-i2c.c | 47 +- + drivers/mfd/sm501.c | 2 + + drivers/mfd/sprd-sc27xx-spi.c | 3 +- + drivers/mfd/stmpe-spi.c | 12 +- + drivers/mfd/tps65912-spi.c | 2 +- + drivers/mfd/ucb1x00-assabet.c | 120 ++++- + drivers/mfd/ucb1x00-core.c | 16 +- + drivers/mfd/viperboard.c | 3 +- + drivers/mfd/wm831x-spi.c | 16 +- + drivers/net/dsa/mxl862xx/mxl862xx.c | 1 + + drivers/net/ethernet/airoha/airoha_npu.c | 2 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 25 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_gso.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c | 2 +- + drivers/net/ethernet/cadence/macb_main.c | 4 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 72 ++- + drivers/net/ethernet/freescale/enetc/enetc.h | 9 + + drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 16 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 14 +- + drivers/net/ethernet/freescale/fec_main.c | 6 +- + drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.c | 2 +- + drivers/net/ethernet/intel/igc/igc_main.c | 3 +- + .../net/ethernet/marvell/octeontx2/af/cn20k/api.h | 1 + + .../marvell/octeontx2/af/cn20k/mbox_init.c | 21 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 43 +- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 6 + + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 11 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 6 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 3 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 20 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_xsk.c | 3 +- + drivers/net/ethernet/mediatek/mtk_wed.c | 5 + + drivers/net/ethernet/mediatek/mtk_wed_regs.h | 1 + + .../net/ethernet/mellanox/mlx5/core/en/xsk/tx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 20 +- + .../ethernet/mellanox/mlx5/core/esw/adj_vport.c | 22 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 + + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 44 +- + .../net/ethernet/microchip/sparx5/sparx5_netdev.c | 11 +- + .../ethernet/microchip/sparx5/sparx5_vcap_impl.c | 5 +- + .../net/ethernet/microchip/vcap/vcap_api_debugfs.c | 21 + + .../net/ethernet/microchip/vcap/vcap_api_debugfs.h | 14 + + drivers/net/ethernet/microsoft/mana/gdma_main.c | 19 + + drivers/net/ethernet/nvidia/forcedeth.c | 6 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 6 +- + drivers/net/ethernet/qlogic/qede/qede.h | 8 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 1 + + drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 467 ++++++++-------- + .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 1 + + drivers/net/ethernet/renesas/rswitch_main.c | 18 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 - + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 26 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 6 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 57 +- + drivers/net/ethernet/wangxun/libwx/wx_ptp.c | 18 +- + drivers/net/ethernet/wangxun/libwx/wx_type.h | 2 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c | 5 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 2 +- + drivers/net/gtp.c | 23 +- + drivers/net/hyperv/hyperv_net.h | 8 +- + drivers/net/hyperv/netvsc.c | 123 +++-- + drivers/net/hyperv/netvsc_drv.c | 6 + + drivers/net/ipa/ipa_main.c | 6 +- + drivers/net/ipa/ipa_modem.c | 18 +- + drivers/net/netdevsim/netdev.c | 2 + + drivers/net/ntb_netdev.c | 38 +- + drivers/net/phy/air_en8811h.c | 18 +- + drivers/net/phy/phylink.c | 2 +- + drivers/net/slip/slip.c | 19 +- + drivers/net/thunderbolt/main.c | 6 +- + drivers/net/usb/cdc_ncm.c | 6 + + drivers/net/vxlan/vxlan_core.c | 20 +- + drivers/ntb/ntb_transport.c | 38 +- + drivers/of/base.c | 2 +- + drivers/of/irq.c | 4 +- + drivers/pci/controller/pci-hyperv.c | 1 + + drivers/platform/chrome/cros_ec_proto.c | 30 +- + drivers/ptp/ptp_netc.c | 10 +- + drivers/regulator/db8500-prcmu.c | 12 +- + drivers/regulator/tps65185.c | 6 + + drivers/scsi/storvsc_drv.c | 53 +- + drivers/spi/spi-amlogic-spisg.c | 2 +- + drivers/spi/spi-loongson-core.c | 6 +- + drivers/thermal/db8500_thermal.c | 10 +- + drivers/usb/atm/usbatm.c | 4 +- + drivers/video/backlight/Kconfig | 10 +- + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/aw99706.c | 25 +- + drivers/video/backlight/backlight.c | 16 +- + drivers/video/backlight/lcd.c | 6 +- + drivers/video/backlight/qcom-wled.c | 2 - + drivers/video/backlight/sy7758.c | 259 +++++++++ + drivers/watchdog/db8500_wdt.c | 22 +- + fs/nfs/direct.c | 20 - + fs/nfs/file.c | 44 +- + fs/proc/task_mmu.c | 2 +- + fs/ramfs/file-nommu.c | 3 + + fs/smb/client/file.c | 65 ++- + include/clocksource/hyperv_timer.h | 6 - + include/linux/codetag.h | 2 + + include/linux/ethtool_netlink.h | 3 - + include/linux/execmem.h | 2 +- + include/linux/fs.h | 1 - + include/linux/hyperv.h | 20 +- + include/linux/leds.h | 6 + + include/linux/lockdep.h | 3 + + include/linux/lockdep_types.h | 3 +- + include/linux/maple_tree.h | 16 +- + include/linux/memcontrol.h | 21 +- + include/linux/mfd/88pm886.h | 5 + + include/linux/mfd/cs42l43.h | 2 - + include/linux/mfd/db8500-prcmu.h | 252 ++++++++- + include/linux/mfd/dbx500-prcmu.h | 575 -------------------- + include/linux/mfd/si476x-core.h | 5 +- + include/linux/mfd/si476x-platform.h | 2 - + include/linux/mfd/ucb1x00.h | 3 + + include/linux/mfd/viperboard.h | 10 +- + include/linux/mlx5/vport.h | 3 +- + include/linux/mm.h | 136 ++++- + include/linux/mm_types.h | 40 +- + include/linux/mmzone.h | 16 +- + include/linux/nfs_fs.h | 1 - + include/linux/page_ext.h | 5 - + include/linux/pagemap.h | 40 +- + include/linux/percpu-defs.h | 7 +- + include/linux/platform_data/cros_ec_proto.h | 2 + + include/linux/rmap.h | 11 +- + include/linux/sched.h | 1 + + include/linux/shmem_fs.h | 5 +- + include/linux/skbuff.h | 24 + + include/linux/swap.h | 30 +- + include/linux/swap_ops.h | 44 ++ + include/linux/swapops.h | 7 +- + include/linux/virtio_net.h | 4 + + include/linux/vm_event_item.h | 4 + + include/linux/vmalloc.h | 2 +- + include/linux/vmstat.h | 17 +- + include/net/bluetooth/hci_core.h | 2 +- + include/net/bluetooth/l2cap.h | 5 + + include/net/inetpeer.h | 4 + + include/net/ip.h | 25 + + include/net/ip6_route.h | 37 ++ + include/net/libeth/xsk.h | 2 +- + include/net/netfilter/nf_tables.h | 3 +- + include/net/pkt_sched.h | 1 + + include/net/sctp/structs.h | 2 +- + include/net/tcp.h | 5 + + include/net/xdp_sock_drv.h | 22 +- + include/net/xsk_buff_pool.h | 3 +- + include/rv/da_monitor.h | 2 +- + include/uapi/linux/alloc_tag.h | 99 ++++ + include/uapi/linux/if_xdp.h | 1 + + kernel/dma/contiguous.c | 16 +- + kernel/events/uprobes.c | 2 +- + kernel/locking/lockdep.c | 58 +- + lib/Kconfig.debug | 15 - + lib/codetag.c | 18 + + lib/maple_tree.c | 401 +++++++++----- + lib/test_hmm.c | 5 +- + lib/xarray.c | 3 + + mm/Kconfig | 22 +- + mm/Kconfig.debug | 1 - + mm/Makefile | 1 + + mm/alloc_tag.c | 351 +++++++++++- + {drivers/base => mm}/arch_numa.c | 12 + + mm/cma.c | 2 +- + mm/cma.h | 1 + + mm/debug_page_alloc.c | 8 +- + mm/folio-compat.c | 1 + + mm/folio.c | 124 ++--- + mm/gup.c | 23 +- + mm/gup_test.c | 94 ++-- + mm/hmm.c | 5 +- + mm/huge_memory.c | 46 +- + mm/hugetlb.c | 10 +- + mm/hugetlb_cma.c | 142 ++++- + mm/hugetlb_cma.h | 2 + + mm/internal.h | 77 ++- + mm/interval_tree.c | 4 +- + mm/kasan/quarantine.c | 12 +- + mm/khugepaged.c | 130 ++--- + mm/kmemleak.c | 105 +++- + mm/ksm.c | 16 +- + mm/madvise.c | 17 +- + mm/memcontrol-v1.c | 4 +- + mm/memcontrol-v1.h | 1 + + mm/memcontrol.c | 69 ++- + mm/memory-failure.c | 4 +- + mm/memory.c | 140 +++-- + mm/mempolicy.c | 23 +- + mm/migrate.c | 21 +- + mm/migrate_device.c | 15 +- + mm/mm_init.c | 1 - + mm/mmzone.c | 1 + + mm/mremap.c | 8 +- + mm/nommu.c | 4 + + mm/page-writeback.c | 5 + + mm/page_alloc.c | 28 +- + mm/page_ext.c | 9 - + mm/page_io.c | 583 ++++++++++---------- + mm/page_reporting.c | 28 +- + mm/page_vma_mapped.c | 6 +- + mm/pgalloc-track.h | 3 + + mm/rmap.c | 43 +- + mm/shmem.c | 29 +- + mm/show_mem.c | 12 +- + mm/shuffle.h | 2 + + mm/sparse.c | 18 +- + mm/sparse.h | 6 + + mm/swap.h | 67 ++- + mm/swap_state.c | 54 +- + mm/swapfile.c | 24 +- + mm/userfaultfd.c | 4 +- + mm/vma.c | 113 ++-- + mm/vma.h | 93 ++-- + mm/vma_exec.c | 2 +- + mm/vma_init.c | 1 + + mm/vmalloc.c | 71 ++- + mm/vmalloc.h | 2 + + mm/vmscan.c | 234 +++++--- + mm/vmstat.c | 19 +- + mm/workingset.c | 5 - + mm/zsmalloc.c | 11 +- + mm/zswap.c | 46 +- + net/8021q/vlan_dev.c | 39 +- + net/batman-adv/bridge_loop_avoidance.c | 80 +-- + net/batman-adv/distributed-arp-table.c | 66 ++- + net/batman-adv/main.c | 4 + + net/batman-adv/mesh-interface.c | 7 +- + net/batman-adv/multicast_forw.c | 7 +- + net/batman-adv/tvlv.c | 5 +- + net/batman-adv/types.h | 2 +- + net/bluetooth/eir.c | 3 +- + net/bluetooth/hci_conn.c | 3 +- + net/bluetooth/hci_core.c | 2 +- + net/bluetooth/hci_event.c | 7 +- + net/bluetooth/hci_sync.c | 16 +- + net/bluetooth/iso.c | 8 + + net/bluetooth/l2cap_sock.c | 100 +++- + net/bluetooth/mgmt.c | 18 +- + net/bluetooth/rfcomm/core.c | 14 +- + net/bridge/br_arp_nd_proxy.c | 24 +- + net/bridge/br_multicast.c | 4 +- + net/bridge/br_netlink_tunnel.c | 3 +- + net/core/net_namespace.c | 25 +- + net/core/page_pool.c | 7 + + net/core/skbuff.c | 28 +- + net/core/xdp.c | 4 +- + net/ife/ife.c | 14 +- + net/ipv4/inet_fragment.c | 7 + + net/ipv4/inetpeer.c | 38 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/netfilter/ipt_ah.c | 10 +- + net/ipv4/netfilter/nf_tproxy_ipv4.c | 2 +- + net/ipv4/route.c | 4 +- + net/ipv4/tcp.c | 3 +- + net/ipv4/tcp_ao.c | 19 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv4/tcp_output.c | 8 +- + net/ipv6/ah6.c | 29 +- + net/ipv6/exthdrs.c | 26 +- + net/ipv6/ip6mr.c | 3 +- + net/ipv6/netfilter/ip6t_ah.c | 27 +- + net/ipv6/netfilter/ip6t_frag.c | 41 +- + net/ipv6/netfilter/ip6t_hbh.c | 40 +- + net/ipv6/netfilter/ip6t_mh.c | 3 - + net/ipv6/netfilter/ip6t_rt.c | 6 +- + net/ipv6/netfilter/nf_tproxy_ipv6.c | 2 +- + net/ipv6/route.c | 6 +- + net/ipv6/seg6_local.c | 16 + + net/ipv6/tcp_ipv6.c | 2 +- + net/ipv6/xfrm6_input.c | 2 +- + net/iucv/af_iucv.c | 2 + + net/l2tp/l2tp_netlink.c | 16 +- + net/mctp/route.c | 19 +- + net/mptcp/syncookies.c | 1 + + net/netfilter/ipset/ip_set_hash_gen.h | 174 ++++-- + net/netfilter/ipset/ip_set_hash_netiface.c | 1 - + net/netfilter/ipset/ip_set_hash_netportnet.c | 1 - + net/netfilter/ipvs/ip_vs_ftp.c | 10 +- + net/netfilter/nf_conncount.c | 3 +- + net/netfilter/nf_conntrack_expect.c | 11 +- + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/netfilter/nf_tables_api.c | 218 ++++---- + net/netfilter/nfnetlink_queue.c | 72 ++- + net/netfilter/nft_dynset.c | 25 +- + net/netfilter/nft_payload.c | 13 + + net/netfilter/nft_set_pipapo_avx2.c | 17 +- + net/netfilter/xt_IDLETIMER.c | 68 +-- + net/netfilter/xt_LOG.c | 4 +- + net/netfilter/xt_MASQUERADE.c | 4 +- + net/netfilter/xt_NETMAP.c | 6 +- + net/netfilter/xt_REDIRECT.c | 6 +- + net/netfilter/xt_cgroup.c | 12 +- + net/netfilter/xt_esp.c | 10 +- + net/netfilter/xt_hl.c | 4 +- + net/netfilter/xt_ipcomp.c | 8 +- + net/netfilter/xt_iprange.c | 32 +- + net/netfilter/xt_ipvs.c | 1 - + net/netfilter/xt_multiport.c | 4 - + net/netfilter/xt_sctp.c | 19 +- + net/netfilter/xt_tcpudp.c | 8 +- + net/openvswitch/conntrack.c | 120 +++-- + net/openvswitch/conntrack.h | 6 +- + net/openvswitch/datapath.c | 16 +- + net/openvswitch/datapath.h | 8 +- + net/packet/af_packet.c | 96 +++- + net/rds/cong.c | 4 +- + net/sched/act_api.c | 5 +- + net/sched/act_bpf.c | 26 + + net/sched/act_ct.c | 46 ++ + net/sched/act_ctinfo.c | 11 + + net/sched/act_ife.c | 55 +- + net/sched/act_pedit.c | 24 + + net/sched/act_police.c | 12 + + net/sched/act_sample.c | 9 + + net/sched/act_skbmod.c | 12 +- + net/sched/act_tunnel_key.c | 80 +++ + net/sched/cls_api.c | 3 +- + net/sched/cls_basic.c | 6 +- + net/sched/cls_bpf.c | 6 +- + net/sched/cls_cgroup.c | 2 +- + net/sched/cls_flow.c | 2 +- + net/sched/cls_flower.c | 4 +- + net/sched/cls_fw.c | 4 +- + net/sched/cls_matchall.c | 4 +- + net/sched/cls_route.c | 4 +- + net/sched/cls_u32.c | 11 +- + net/sched/sch_api.c | 7 +- + net/sched/sch_cake.c | 1 + + net/sched/sch_codel.c | 2 +- + net/sched/sch_fifo.c | 2 +- + net/sched/sch_fq.c | 14 +- + net/sched/sch_fq_codel.c | 6 +- + net/sched/sch_fq_pie.c | 3 +- + net/sched/sch_generic.c | 2 +- + net/sched/sch_gred.c | 4 +- + net/sched/sch_hhf.c | 4 + + net/sched/sch_htb.c | 7 +- + net/sched/sch_plug.c | 2 +- + net/sched/sch_sfq.c | 3 +- + net/sched/sch_teql.c | 1 + + net/sctp/inqueue.c | 7 +- + net/sctp/stream.c | 48 +- + net/smc/smc.h | 6 +- + net/smc/smc_core.c | 14 +- + net/smc/smc_inet.c | 16 + + net/smc/smc_llc.c | 125 ++++- + net/smc/smc_rx.c | 11 +- + net/smc/smc_wr.c | 6 +- + net/tls/tls_device.c | 3 +- + net/vmw_vsock/hyperv_transport.c | 3 - + net/vmw_vsock/virtio_transport.c | 2 +- + net/xdp/xsk.c | 30 +- + net/xdp/xsk_buff_pool.c | 7 +- + net/xfrm/espintcp.c | 9 +- + net/xfrm/xfrm_nat_keepalive.c | 53 +- + net/xfrm/xfrm_output.c | 4 +- + net/xfrm/xfrm_user.c | 2 +- + sound/soc/ux500/ux500_msp_dai.c | 2 +- + tools/include/uapi/linux/if_xdp.h | 1 + + tools/net/ynl/lib/ynl.c | 3 + + tools/testing/radix-tree/maple.c | 4 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/alloc_tag/Makefile | 8 + + .../selftests/alloc_tag/allocinfo_ioctl_test.c | 548 +++++++++++++++++++ + .../selftests/cgroup/lib/include/cgroup_util.h | 1 + + tools/testing/selftests/cgroup/test_zswap.c | 13 +- + tools/testing/selftests/mm/.gitignore | 76 +-- + tools/testing/selftests/mm/Makefile | 7 +- + tools/testing/selftests/mm/check_config.sh | 2 +- + tools/testing/selftests/mm/compaction_test.c | 38 +- + tools/testing/selftests/mm/cow.c | 11 +- + tools/testing/selftests/mm/folio_split_race_test.c | 2 +- + tools/testing/selftests/mm/guard-regions.c | 10 +- + tools/testing/selftests/mm/gup_longterm.c | 2 +- + tools/testing/selftests/mm/khugepaged.c | 204 +++++-- + .../testing/selftests/mm/ksft_kmemleak_confirm.sh | 130 +++++ + tools/testing/selftests/mm/memory-failure.c | 14 +- + tools/testing/selftests/mm/merge.c | 57 ++ + tools/testing/selftests/mm/migration.c | 37 +- + tools/testing/selftests/mm/mseal_test.c | 3 +- + tools/testing/selftests/mm/pagemap_ioctl.c | 8 +- + tools/testing/selftests/mm/prctl_thp_disable.c | 2 +- + tools/testing/selftests/mm/run_vmtests.sh | 2 + + tools/testing/selftests/mm/soft-dirty.c | 5 +- + tools/testing/selftests/mm/split_huge_page_test.c | 139 +---- + tools/testing/selftests/mm/uffd-common.c | 4 +- + tools/testing/selftests/mm/vm_util.c | 207 +++++++- + tools/testing/selftests/mm/vm_util.h | 8 +- + tools/testing/selftests/net/big_tcp_tunnels.sh | 38 +- + tools/testing/selftests/net/fin_ack_lat.c | 5 +- + tools/testing/selftests/net/fin_ack_lat.sh | 2 +- + .../net/packetdrill/tcp_advmss_pmtu_ipv4.pkt | 67 +++ + .../net/packetdrill/tcp_advmss_pmtu_ipv6.pkt | 67 +++ + .../net/packetdrill/tcp_urg_ptr_retransmit.pkt | 65 +++ + .../testing/selftests/net/tcp_ao/key-management.c | 67 ++- + tools/testing/selftests/net/tcp_ao/lib/aolib.h | 6 +- + tools/testing/selftests/net/tcp_ao/lib/sock.c | 4 +- + tools/testing/selftests/proc/proc-maps-race.c | 3 +- + tools/testing/vma/include/dup.h | 64 ++- + tools/testing/vma/shared.c | 3 +- + tools/testing/vma/tests/merge.c | 49 +- + tools/testing/vma/tests/vma.c | 50 +- + tools/testing/vma/vma_internal.h | 1 + + 545 files changed, 10894 insertions(+), 5142 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/qcom,spmi-haptics.yaml + create mode 100644 Documentation/devicetree/bindings/leds/adi,ltc3220.yaml + create mode 100644 Documentation/devicetree/bindings/leds/backlight/silergy,sy7758.yaml + create mode 100644 Documentation/devicetree/bindings/leds/backlight/ti,tps65217.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/backlight/tps65217-backlight.txt + create mode 100644 Documentation/devicetree/bindings/leds/brcm,bcm6358-leds.yaml + create mode 100644 Documentation/devicetree/bindings/leds/lacie,ns2-leds.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/leds-bcm6358.txt + delete mode 100644 Documentation/devicetree/bindings/leds/leds-ns2.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-tll.txt + create mode 100644 Documentation/devicetree/bindings/mfd/ti,usbhs-tll.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/tps65217.txt + create mode 100644 drivers/leds/leds-ltc3220.c + create mode 100644 drivers/mfd/rohm-pwrbutton.c + create mode 100644 drivers/mfd/rohm-pwrbutton.h + create mode 100644 drivers/video/backlight/sy7758.c + delete mode 100644 include/linux/mfd/dbx500-prcmu.h + create mode 100644 include/linux/swap_ops.h + create mode 100644 include/uapi/linux/alloc_tag.h + rename {drivers/base => mm}/arch_numa.c (95%) + create mode 100644 tools/testing/selftests/alloc_tag/Makefile + create mode 100644 tools/testing/selftests/alloc_tag/allocinfo_ioctl_test.c + create mode 100755 tools/testing/selftests/mm/ksft_kmemleak_confirm.sh + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_advmss_pmtu_ipv4.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_advmss_pmtu_ipv6.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_urg_ptr_retransmit.pkt +Merging ext4-fixes/fixes (981fcc5674e67 jbd2: fix deadlock in jbd2_journal_cancel_revoke()) +$ 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 (b64a9f67e082e pid: reject allocations through dead ancestor pid namespaces) +$ 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 (cf6c993c0feca fscrypt: use the mount idmap for the owner check in fscrypt_ioctl_set_policy()) +$ 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 (d2f96bcb89d36 fs,fsverity: remove check for fsverity being enabled in setattr_prepare()) +$ 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 (af5534fe2fbc0 Merge branch 'misc-7.2' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (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 (075b74841bd00 Linux 7.2-rc6) +$ 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 (46db3c8a1be96 nfsd: export NFSv4 callback op stats via netlink) +$ git merge -m Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (028ef9c96e961 Linux 7.0) +$ git merge -m Merge branch 'fixes/next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging overlayfs-fixes/ovl-fixes (4549871118cf6 Linux 7.1-rc7) +$ git merge -m Merge branch 'ovl-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging fscrypt/for-next (7dd38d9dd7a05 blk-crypto: Update docs for blk-crypto-fallback motivation) +$ 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 (f037522c036c0 Merge branch 'for-next-next-v7.2-20260808' into for-next-20260808) +$ 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/transaction.c | 18 ++++++++++-------- + 2 files changed, 11 insertions(+), 8 deletions(-) +Merging ceph/master (8fdf946445732 ceph: force a cap message when a deferred revoke can't be acked immediately) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Auto-merging fs/ceph/dir.c +Merge made by the 'ort' strategy. + Documentation/filesystems/ceph.rst | 6 ++ + fs/ceph/addr.c | 30 +++++-- + fs/ceph/caps.c | 166 ++++++++++++++++++++++++++----------- + fs/ceph/crypto.c | 50 ++++++++--- + fs/ceph/crypto.h | 4 +- + fs/ceph/dir.c | 22 +++-- + fs/ceph/export.c | 26 ++++-- + fs/ceph/file.c | 56 ++++++++++++- + fs/ceph/inode.c | 3 +- + fs/ceph/mds_client.c | 110 +++++++++++++++++++----- + fs/ceph/mds_client.h | 1 + + fs/ceph/mdsmap.c | 11 ++- + fs/ceph/super.c | 10 +++ + fs/ceph/super.h | 45 +++++++++- + fs/ceph/xattr.c | 1 + + include/linux/ceph/libceph.h | 2 - + net/ceph/messenger_v2.c | 5 ++ + net/ceph/osd_client.c | 30 +++++++ + net/ceph/osdmap.c | 2 + + net/ceph/pagevec.c | 13 --- + 20 files changed, 462 insertions(+), 131 deletions(-) +Merging cifs/cifs-next (ffd294d346d18 Linux 6.13) +$ 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 (41a9c2b48e258 MAINTAINERS: configfs: split configfs entry in C and Rust parts) +$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git configfs/configfs-next +Already up to date. +Merging ecryptfs/next (f81cb44f9a4b8 ecryptfs: ecryptfs_kernel.h: clean up kernel-doc comments) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging dlm/next (e61113cfcaf71 dlm: init per node debugfs before add to node hash) +$ 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 (a7d28aa0e9b2c erofs: simplify z_erofs_gbuf_growsize()) +$ 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 (d1b432080f57a exfat: map allocated extents for swap activation) +$ 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/iomap.c | 28 +++++++++++++++++++++++++++- + 1 file changed, 27 insertions(+), 1 deletion(-) +Merging ext3/for_next (3d7e6f0b557da Merge fsnotify bitmask race fix.) +$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (9091c97be3408 ext4: fix estimate extent index blocks in ext4_ext_index_trans_blocks()) +$ 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 (c966d29e01bbf f2fs: support resizable tail section and unify pinned allocation) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging Documentation/filesystems/f2fs.rst +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/super.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 18 ++ + Documentation/filesystems/f2fs.rst | 43 ++- + fs/f2fs/checkpoint.c | 123 ++++++++- + fs/f2fs/data.c | 50 +++- + fs/f2fs/debug.c | 4 - + fs/f2fs/dir.c | 7 +- + fs/f2fs/extent_cache.c | 9 + + fs/f2fs/f2fs.h | 90 ++++++- + fs/f2fs/file.c | 460 ++++++++++++++++++++++++++++---- + fs/f2fs/gc.c | 129 +++++---- + fs/f2fs/gc.h | 27 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/inode.c | 230 ++++++++++++---- + fs/f2fs/iostat.c | 6 + + fs/f2fs/namei.c | 168 +++++++----- + fs/f2fs/node.c | 81 +++--- + fs/f2fs/recovery.c | 55 ++-- + fs/f2fs/segment.c | 287 ++++++++++++++------ + fs/f2fs/segment.h | 37 ++- + fs/f2fs/shrinker.c | 3 +- + fs/f2fs/super.c | 99 ++++++- + fs/f2fs/sysfs.c | 34 ++- + fs/f2fs/xattr.c | 2 +- + include/trace/events/f2fs.h | 23 +- + include/uapi/linux/f2fs.h | 7 + + 25 files changed, 1535 insertions(+), 459 deletions(-) +Merging fsverity/for-next (dc59e4fea9d83 Linux 7.2-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 (34b5c4a6e4fb9 fuse: zero the partial EOF page when extending a file) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (4bb187d6f379c Merge tag 'gfs2-for-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Already up to date. +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 (35205b06fbb8a MAINTAINERS: Update the KSMBD entry) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/filesystems/smb/ksmbd.rst | 6 +- + MAINTAINERS | 5 +- + fs/smb/server/Kconfig | 2 + + fs/smb/server/Makefile | 1 + + fs/smb/server/smb2pdu.c | 5 + + fs/smb/server/smbacl.c | 2 + + fs/smb/server/tests/Kconfig | 15 ++ + fs/smb/server/tests/Makefile | 4 + + fs/smb/server/tests/smbacl_kunit.c | 301 ++++++++++++++++++++++++++++++++ + fs/smb/server/vfs.c | 2 + + 10 files changed, 336 insertions(+), 7 deletions(-) + create mode 100644 fs/smb/server/tests/Kconfig + create mode 100644 fs/smb/server/tests/Makefile + create mode 100644 fs/smb/server/tests/smbacl_kunit.c +$ 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 (ee5a386cfe60f NFSv4.1: fix layout segment leak on the pnfs_layout_process() forget path) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (e053b624f5d36 NFSv4.2: fix nfs4_listxattr size accounting) +$ 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 (d7f4c3a7a1606 NFSD: Point contributors and sashiko.dev to the nfsd-testing branch) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging MAINTAINERS +Auto-merging fs/nfs/nfs4file.c +Auto-merging include/linux/nfs4.h +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +- + fs/lockd/svc.c | 1 - + fs/lockd/trace.h | 1 - + fs/lockd/xdr.h | 2 +- + fs/namei.c | 2 + + fs/nfs/nfs4file.c | 1 + + fs/nfs/super.c | 25 --- + fs/nfs_common/nfs_ssc.c | 126 +++++++++------ + fs/nfsd/blocklayout.c | 1 + + fs/nfsd/blocklayoutxdr.c | 11 ++ + fs/nfsd/export.c | 8 +- + fs/nfsd/export.h | 3 +- + fs/nfsd/filecache.c | 1 + + fs/nfsd/flexfilelayout.c | 24 +-- + fs/nfsd/flexfilelayoutxdr.c | 9 +- + fs/nfsd/flexfilelayoutxdr.h | 8 +- + fs/nfsd/localio.c | 10 +- + fs/nfsd/lockd.c | 4 +- + fs/nfsd/nfs2acl.c | 1 + + fs/nfsd/nfs3acl.c | 1 + + fs/nfsd/nfs3proc.c | 37 ++++- + fs/nfsd/nfs3xdr.c | 3 + + fs/nfsd/nfs4acl.c | 1 + + fs/nfsd/nfs4callback.c | 8 +- + fs/nfsd/nfs4ctl.h | 83 ++++++++++ + fs/nfsd/nfs4idmap.c | 1 + + fs/nfsd/nfs4layouts.c | 1 + + fs/nfsd/nfs4proc.c | 362 ++++++++++++++++++++++++-------------------- + fs/nfsd/nfs4recover.c | 1 + + fs/nfsd/nfs4state.c | 244 ++++++++++++++++++++++++----- + fs/nfsd/nfs4xdr.c | 104 +++++++++++-- + fs/nfsd/nfscache.c | 1 + + fs/nfsd/nfsctl.c | 2 + + fs/nfsd/nfsd.h | 236 +---------------------------- + fs/nfsd/nfserr.h | 158 +++++++++++++++++++ + fs/nfsd/nfsfh.c | 72 ++++----- + fs/nfsd/nfsfh.h | 28 +++- + fs/nfsd/nfsproc.c | 20 ++- + fs/nfsd/nfssvc.c | 8 + + fs/nfsd/nfsxdr.c | 1 + + fs/nfsd/state.h | 43 +++++- + fs/nfsd/vfs.c | 91 ++++++----- + fs/nfsd/vfs.h | 10 +- + fs/nfsd/xdr3.h | 2 +- + fs/nfsd/xdr4.h | 152 ++----------------- + fs/nfsd/xdr4cb.h | 20 +-- + include/linux/nfs.h | 55 +------ + include/linux/nfs3.h | 8 + + include/linux/nfs4.h | 6 + + include/linux/nfs_fh.h | 63 ++++++++ + include/linux/nfs_ssc.h | 69 ++------- + include/linux/nfsd_ssc.h | 38 +++++ + include/linux/nfslocalio.h | 11 +- + include/trace/misc/nfs.h | 1 + + 54 files changed, 1276 insertions(+), 906 deletions(-) + create mode 100644 fs/nfsd/nfs4ctl.h + create mode 100644 fs/nfsd/nfserr.h + create mode 100644 include/linux/nfs_fh.h + create mode 100644 include/linux/nfsd_ssc.h +$ git am -3 ../patches/0001-Revert-smb-client-implement-fileattr_get-to-support-.patch +Applying: Revert "smb: client: implement fileattr_get to support FS_IOC_GETFLAGS" +Using index info to reconstruct a base tree... +M fs/smb/client/cifsfs.c +M fs/smb/client/cifsfs.h +M fs/smb/client/inode.c +Falling back to patching base and 3-way merge... +Auto-merging fs/smb/client/inode.c +Auto-merging fs/smb/client/cifsfs.h +Auto-merging fs/smb/client/cifsfs.c +No changes -- Patch already applied. +Merging ntfs/ntfs-next (ac727d86fb84b ntfs: leave HasEA flag untouched on setxattr failure) +$ 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 | 10 +++++----- + fs/ntfs/bdev-io.c | 2 +- + fs/ntfs/compress.c | 2 +- + fs/ntfs/ea.c | 49 ++++++++++++++++++++++++++++++++++++------------- + fs/ntfs/file.c | 15 +++++---------- + fs/ntfs/inode.c | 10 ++-------- + fs/ntfs/lcnalloc.c | 9 +++++---- + fs/ntfs/mft.c | 16 +++++++++------- + fs/ntfs/ntfs.h | 10 ++++------ + fs/ntfs/reparse.c | 7 ++++--- + fs/ntfs/super.c | 15 ++++++++------- + 11 files changed, 80 insertions(+), 65 deletions(-) +Merging ntfs3/master (c22f91d82cb9a fs/ntfs3: validate ef->size covers the record's name and value) +$ 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 (d410cd5303ec5 orangefs: skip leading spaces before parsing client debug masks) +$ 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 +Merge made by the 'ort' strategy. + drivers/mtd/ubi/attach.c | 4 ++-- + drivers/mtd/ubi/build.c | 48 +++++++++++++++++++++++++++++++-------- + drivers/mtd/ubi/cdev.c | 2 +- + drivers/mtd/ubi/fastmap-wl.c | 8 +++---- + drivers/mtd/ubi/fastmap.c | 6 +++-- + drivers/mtd/ubi/io.c | 11 +++++---- + drivers/mtd/ubi/ubi.h | 25 +++++++++++++++++--- + drivers/mtd/ubi/wl.c | 54 +++++++++++++++----------------------------- + fs/ubifs/auth.c | 2 +- + fs/ubifs/debug.h | 4 ++-- + fs/ubifs/key.h | 2 +- + fs/ubifs/ubifs.h | 20 +++++++++------- + include/uapi/mtd/ubi-user.h | 10 +++++++- + 13 files changed, 122 insertions(+), 74 deletions(-) +Merging v9fs/9p-next (aa88278693cbf 9p: Add missing read barrier in virtio zero-copy path) +$ git merge -m Merge branch '9p-next' of https://github.com/martinetd/linux v9fs/9p-next +Already up to date. +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 (412f89fb3988a capability: unexport has_capability_noaudit) +$ 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/quota/dquot.c | 2 +- + fs/xfs/Makefile | 1 + + fs/xfs/libxfs/xfs_rtgroup.h | 6 +- + fs/xfs/libxfs/xfs_sb.c | 37 ++++----- + fs/xfs/xfs_aops.c | 188 +------------------------------------------- + fs/xfs/xfs_aops.h | 1 - + fs/xfs/xfs_file.c | 2 +- + fs/xfs/xfs_fsmap.c | 3 +- + fs/xfs/xfs_icache.c | 16 ++-- + fs/xfs/xfs_ioctl.c | 2 +- + fs/xfs/xfs_ioend.c | 184 +++++++++++++++++++++++++++++++++++++++++++ + fs/xfs/xfs_ioend.h | 16 ++++ + fs/xfs/xfs_iomap.c | 7 +- + fs/xfs/xfs_iomap.h | 14 ++++ + fs/xfs/xfs_iops.c | 2 +- + fs/xfs/xfs_platform.h | 11 --- + fs/xfs/xfs_super.c | 2 +- + fs/xfs/xfs_trans_buf.c | 3 +- + fs/xfs/xfs_zone_alloc.c | 72 +++++++++++++---- + fs/xfs/xfs_zone_gc.c | 5 ++ + include/linux/capability.h | 5 ++ + kernel/capability.c | 19 ++++- + 22 files changed, 339 insertions(+), 259 deletions(-) + create mode 100644 fs/xfs/xfs_ioend.c + create mode 100644 fs/xfs/xfs_ioend.h +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 (c4463c3bf63d0 Merge branch 'vfs-7.3.sync' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging fs/nilfs2/inode.c +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + fs/nilfs2/Kconfig | 2 +- + fs/nilfs2/Makefile | 2 +- + fs/nilfs2/file.c | 40 +++++++++++++++++++++++++++--- + fs/nilfs2/inode.c | 13 ---------- + fs/nilfs2/iomap.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/nilfs2/iomap.h | 13 ++++++++++ + 6 files changed, 123 insertions(+), 18 deletions(-) + create mode 100644 fs/nilfs2/iomap.c + create mode 100644 fs/nilfs2/iomap.h +$ git am -3 ../patches/0001-ksmbd-Fix-removal-of-type-parameter-from-vfs_path_pa.patch +Applying: ksmbd: Fix removal of type parameter from vfs_path_parent_lookup() +Using index info to reconstruct a base tree... +M fs/smb/server/vfs.c +Falling back to patching base and 3-way merge... +Auto-merging fs/smb/server/vfs.c +No changes -- Patch already applied. +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 (35314b1c46ced 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 3 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 49 ++--------- + MAINTAINERS | 10 +-- + drivers/block/zram/zram_drv.c | 8 +- + include/linux/sched/user.h | 3 +- + kernel/module/main.c | 8 +- + lib/once.c | 2 +- + mm/huge_memory.c | 88 ++++++++++++++----- + mm/hugetlb.c | 29 +++++-- + mm/hugetlb_cgroup.c | 7 +- + mm/hugetlb_cma.c | 21 ++++- + mm/khugepaged.c | 6 -- + mm/madvise.c | 8 ++ + mm/memcontrol-v1.c | 43 +++++---- + mm/mempolicy.c | 2 +- + mm/migrate_device.c | 18 ++++ + mm/mremap.c | 22 +++-- + mm/secretmem.c | 116 +++++++++++++++++++++++-- + mm/shmem.c | 5 ++ + mm/userfaultfd.c | 4 +- + tools/testing/selftests/mm/memfd_secret.c | 30 +------ + 21 files changed, 321 insertions(+), 161 deletions(-) +Merging fs-current (6f30852fa8e78 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. +Merging kbuild-current/kbuild-fixes-for-next (e5a259d98823a kbuild: rpm-pkg: Preserve BTF sections in kernel modules during debuginfo stripping) +$ git merge -m Merge branch 'kbuild-fixes-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild-current/kbuild-fixes-for-next +Already up to date. +Merging clang-fixes/clang-fixes-for-next (175db11786bde Disable -Wattribute-alias for clang-23 and newer) +$ 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 arc-current/for-curr (1590cf0329716 Linux 7.2-rc4) +$ 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 (1039bffd6ae9c ARM: 9485/1: mm: acquire mmap write lock around show_pte() for user faults) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Auto-merging arch/arm/Kconfig +Merge made by the 'ort' strategy. + arch/arm/Kconfig | 3 ++- + arch/arm/kernel/hw_breakpoint.c | 11 ++++++----- + arch/arm/mm/fault.c | 22 ++++++++++++++++++++-- + 3 files changed, 28 insertions(+), 8 deletions(-) +Merging arm64-fixes/for-next/fixes (f73a8edc2ccc6 arm64: make huge_ptep_get handled unaligned addresses) +$ 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 (e36c0670d5ebe Merge tag 'tegra-for-7.2-arm64-dt-fixes-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/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 (dc59e4fea9d83 Linux 7.2-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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging sophgo-fixes/fixes (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b428 Linux 6.15-rc1) +$ git merge -m Merge branch 'soc-fixes' of https://github.com/sophgo/linux.git sophgo-soc-fixes/soc-fixes +Already up to date. +Merging m68k-current/for-linus (2f8e3cad53b5c m68k: nfcon: Do not call console_is_registered() in nfcon_device()) +$ 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 (fb442a6673ff1 powerpc/pseries: lparcfg - fix kbuf[] underflow) +$ 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 (eb36325447249 s390/zcrypt: Pad trailing CCA or EP11 message with zeros) +$ 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 (1b78070aaef63 Merge tag 'net-7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Already up to date. +Merging bpf/master (ce6dcd0aed185 selftests/bpf: a demo for check_cond_jmp_op() non-null inference bug) +$ 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. + arch/x86/net/bpf_jit_comp.c | 8 ++-- + include/linux/bpf.h | 2 +- + include/linux/filter.h | 1 - + kernel/bpf/arraymap.c | 5 ++- + kernel/bpf/core.c | 5 --- + kernel/bpf/disasm.c | 3 +- + kernel/bpf/hashtab.c | 5 ++- + kernel/bpf/local_storage.c | 5 ++- + kernel/bpf/percpu_freelist.c | 35 +++++++++++---- + kernel/bpf/percpu_freelist.h | 1 + + kernel/bpf/verifier.c | 20 ++++++--- + .../testing/selftests/bpf/progs/verifier_bounds.c | 41 +++++++++++++++++ + tools/testing/selftests/bpf/progs/verifier_cfg.c | 14 ++++++ + .../bpf/progs/verifier_jeq_infer_not_null.c | 52 ++++++++++++++++++++++ + 14 files changed, 166 insertions(+), 31 deletions(-) +Merging ipsec/master (d2f5082f9e846 xfrm: add missing rcu_read_lock(), skb_dst_force() and dev_hold() for xfrm_trans_reinject()) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/ipv6/xfrm6_output.c | 10 ++++++++-- + net/xfrm/xfrm_input.c | 11 +++++++++++ + net/xfrm/xfrm_iptfs.c | 12 ++++++++++-- + net/xfrm/xfrm_state.c | 5 +++++ + net/xfrm/xfrm_user.c | 18 +++++------------- + 5 files changed, 39 insertions(+), 17 deletions(-) +Merging netfilter/main (1b78070aaef63 Merge tag 'net-7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (2c7c88a412aa6 Merge tag 'net-7.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (2812e64e1575e Merge tag 'net-7.2-rc6' 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 (2812e64e1575e Merge tag 'net-7.2-rc6' 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 (d13d5d299c11b wifi: iwlwifi: validate SEC_RT TLV minimum size) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes +Already up to date. +Merging wpan/master (8ce4f287524c7 net: libwx: fix firmware mailbox abnormal return) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (8049741ac93ac RDMA/ucma: Allow path records to exactly fit the output buffer) +$ 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 (c4a0927f535f7 Merge tag 'asoc-fix-v7.3-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + Documentation/sound/alsa-configuration.rst | 25 +-- + include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h | 56 +++--- + include/sound/rawmidi.h | 8 +- + sound/aoa/soundbus/i2sbus/core.c | 2 + + sound/core/control_led.c | 2 + + sound/core/rawmidi.c | 11 +- + sound/core/ump.c | 3 +- + sound/drivers/mtpav.c | 4 +- + sound/hda/codecs/conexant.c | 18 +- + sound/hda/codecs/realtek/alc269.c | 93 ++++++++- + sound/pci/ice1712/ice1712.c | 7 +- + sound/pci/pcxhr/pcxhr.c | 14 +- + sound/soc/amd/acp-config.c | 23 ++- + sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c | 8 + + sound/soc/amd/yc/acp6x-mach.c | 14 ++ + sound/soc/codecs/max98926.c | 2 +- + sound/soc/codecs/rt712-sdca.c | 1 + + sound/soc/codecs/rt712-sdca.h | 1 + + sound/soc/codecs/rt766-sdca-sdw.c | 2 + + sound/soc/codecs/tac5xx2-sdw.c | 118 ++++++------ + sound/soc/codecs/tac5xx2.h | 5 +- + sound/soc/codecs/tas2783-sdw.c | 20 ++ + sound/soc/fsl/Kconfig | 4 +- + sound/soc/fsl/efika-audio-fabric.c | 2 - + sound/soc/fsl/pcm030-audio-fabric.c | 2 - + sound/soc/loongson/loongson_card.c | 14 +- + sound/soc/qcom/common.c | 6 +- + sound/soc/qcom/qdsp6/q6apm-dai.c | 4 +- + sound/soc/qcom/qdsp6/q6prm-clocks.c | 56 +++--- + sound/soc/qcom/qdsp6/q6prm.h | 56 +++--- + sound/soc/qcom/sc8280xp.c | 21 ++- + sound/soc/sdw_utils/soc_sdw_rt_amp.c | 2 + + sound/soc/sdw_utils/soc_sdw_utils.c | 28 ++- + sound/soc/soc-dapm.c | 2 +- + sound/soc/soc-generic-dmaengine-pcm.c | 20 +- + sound/soc/tegra/tegra210_admaif.c | 210 ++++++++++++++------- + sound/soc/tegra/tegra210_i2s.c | 20 +- + sound/soc/tegra/tegra210_i2s.h | 1 + + sound/soc/tegra/tegra210_mbdrc.c | 42 ++--- + sound/soc/tegra/tegra210_mixer.c | 10 +- + sound/usb/card.c | 14 +- + sound/usb/midi.c | 2 + + sound/usb/mixer.c | 82 +++----- + sound/usb/mixer_maps.c | 21 ++- + sound/usb/quirks-table.h | 22 +++ + sound/usb/quirks.c | 26 +-- + sound/usb/usbaudio.h | 24 +-- + 47 files changed, 705 insertions(+), 423 deletions(-) +Merging sound-asoc-fixes/for-linus (32b4e6b134c62 Merge remote-tracking branch 'asoc/for-7.2' into asoc-linus) +$ 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. +Merging regmap-fixes/for-linus (00268f9452d2a regmap: sdw-mbq: don't call an unset readable_reg callback) +$ 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 (bd2a0c2d8c49f Merge remote-tracking branch 'regulator/for-7.2' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. +Merging spi-fixes/for-linus (67140664a029c Merge remote-tracking branch 'spi/for-7.2' into spi-linus) +$ 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. +Merging pci-current/for-linus (570f7e331f5fe Merge tag 'pci-v7.3-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (45c13f3f9e3bb Merge tag 'hwlock-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ git merge -m Merge branch 'driver-core-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (45c13f3f9e3bb Merge tag 'hwlock-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (45c13f3f9e3bb Merge tag 'hwlock-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (d37186bd95a07 USB: serial: spcp8x5: drop broken carrier detect support) +$ 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 (075b74841bd00 Linux 7.2-rc6) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (45c13f3f9e3bb Merge tag 'hwlock-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ git merge -m Merge branch 'staging-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (6b9f23b546081 iio: frequency: admv1013: fix wrong channel field used in admv1013_read_raw()) +$ git merge -m Merge branch 'fixes-togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Auto-merging drivers/iio/accel/kionix-kx022a.c +Auto-merging drivers/iio/accel/sca3000.c +Auto-merging drivers/iio/adc/ade9000.c +Auto-merging drivers/iio/adc/adi-axi-adc.c +Auto-merging drivers/iio/adc/max1363.c +Auto-merging drivers/iio/adc/rohm-bd79124.c +Auto-merging drivers/iio/adc/xilinx-xadc-core.c +Auto-merging drivers/iio/dac/rohm-bd79703.c +Auto-merging drivers/iio/frequency/adf4377.c +Auto-merging drivers/iio/frequency/admv1013.c +Auto-merging drivers/iio/gyro/adis16136.c +Auto-merging drivers/iio/health/max30102.c +Auto-merging drivers/iio/imu/adis16400.c +Auto-merging drivers/iio/imu/adis16480.c +Auto-merging drivers/iio/light/gp2ap020a00f.c +Auto-merging drivers/iio/pressure/bmp280-core.c +Auto-merging drivers/iio/pressure/rohm-bm1390.c +Auto-merging drivers/iio/proximity/sx9324.c +Merge made by the 'ort' strategy. + drivers/iio/accel/kionix-kx022a.c | 2 +- + drivers/iio/accel/sca3000.c | 2 +- + drivers/iio/adc/ade9000.c | 31 ++++++++++++++++--------------- + drivers/iio/adc/adi-axi-adc.c | 4 ++++ + drivers/iio/adc/max1363.c | 8 ++++++++ + drivers/iio/adc/rohm-bd79124.c | 20 ++++++++++++++------ + drivers/iio/adc/xilinx-xadc-core.c | 9 +++++---- + drivers/iio/dac/rohm-bd79703.c | 3 +++ + drivers/iio/frequency/adf4377.c | 4 ++-- + drivers/iio/frequency/admv1013.c | 9 ++++++--- + drivers/iio/gyro/adis16136.c | 2 +- + drivers/iio/health/max30102.c | 12 +++++++++--- + drivers/iio/imu/adis16400.c | 2 +- + drivers/iio/imu/adis16480.c | 4 ++-- + drivers/iio/industrialio-buffer.c | 3 ++- + drivers/iio/light/gp2ap020a00f.c | 2 ++ + drivers/iio/light/rohm-bu27034.c | 2 +- + drivers/iio/pressure/bmp280-core.c | 2 +- + drivers/iio/pressure/rohm-bm1390.c | 2 +- + drivers/iio/proximity/aw96103.c | 30 ++++++++++++++++++++++++------ + drivers/iio/proximity/sx9324.c | 2 +- + 21 files changed, 105 insertions(+), 50 deletions(-) +Merging watchdog-fixes/watchdog (db2ddb8714351 Linux 7.2-rc7) +$ git merge -m Merge branch 'watchdog' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-fixes/watchdog +Already up to date. +Merging counter-current/counter-current (f1a3a9946aab6 counter: microchip-tcb-capture: Fix DT channel validation) +$ 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 (45c13f3f9e3bb Merge tag 'hwlock-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (8d3ae59288f1e Linux 7.2) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (4d7fa28e151a6 dt-bindings: input: mediatek,mt6779-keypad: add mt6572) +$ 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. + .../devicetree/bindings/input/mediatek,mt6779-keypad.yaml | 1 + + drivers/input/keyboard/adp5588-keys.c | 12 ++++++------ + 2 files changed, 7 insertions(+), 6 deletions(-) +Merging crypto-current/master (ee440d4fc0d2f crypto: acomp - allocate async request context when cloning) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Merge made by the 'ort' strategy. + crypto/acompress.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) +Merging libcrypto-fixes/libcrypto-fixes (1590cf0329716 Linux 7.2-rc4) +$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Already up to date. +Merging vfio-fixes/for-linus (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 (c5c413534d40e selftests/tracing: Have trigger-hist-poll.tc use sched_process_exit) +$ 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 (075b74841bd00 Linux 7.2-rc6) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (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 (2b533e775aec5 Revert "mtd: maps: remove uclinux map driver") +$ 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 (dc59e4fea9d83 Linux 7.2-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 (71827776667f4 reset: imx7: Correct polarity of MIPI CSI resets on i.MX8MQ) +$ git merge -m Merge branch 'reset/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (a13c140cc289c Linux 7.2-rc3) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (8d3ae59288f1e Linux 7.2) +$ 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 (30300ec2780ef KVM: s390: Fix potential tiny kernel stack leak) +$ 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 (751a956c75a54 KVM: arm64: GICv2: Don't WARN on out-of-range INTID writes to GICV_DIR) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm-fixes/fixes +Merge made by the 'ort' strategy. +Merging hwmon-fixes/hwmon (83a16909eb643 hwmon: (sht4x) Fix return value from heater_enable_store()) +$ 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/gpd-fan.rst | 2 +- + Documentation/hwmon/hwmon-kernel-api.rst | 15 +++ + drivers/hwmon/gpio-fan.c | 8 +- + drivers/hwmon/hwmon.c | 31 +++--- + drivers/hwmon/ina2xx.c | 163 ++++++++++++++++++++++++++----- + drivers/hwmon/ltc4282.c | 2 +- + drivers/hwmon/mcp9982.c | 2 + + drivers/hwmon/sht4x.c | 8 +- + drivers/hwmon/yogafan.c | 2 +- + 9 files changed, 189 insertions(+), 44 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 (d90f236f8b9e3 cxl/test: Update mock dev array before calling platform_device_add()) +$ 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 (dc59e4fea9d83 Linux 7.2-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 (5b05bb3f6c571 Merge tag 'platform-drivers-x86-v7.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (dc59e4fea9d83 Linux 7.2-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 (1e7b04c12c077 pinctrl: qcom: shikra: Fix intr_target_width for summary interrupt routing) +$ 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 +Already up to date. +Merging devicetree-fixes/dt/linus (5bb01c657ff9f of: fix out-of-bounds read in of_alias_scan() stem parser) +$ git merge -m Merge branch 'dt/linus' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (dc59e4fea9d83 Linux 7.2-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 (c4f6916a99cf1 scsi: scsi_debug: Negate wrapped memcmp() result) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (8d3ae59288f1e Linux 7.2) +$ 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 (266ebacffc580 drm/i915/lt_phy: program DDI_CLK_VALFREQ with DDI clock frequency) +$ 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 +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_dp_mst.c +Auto-merging drivers/gpu/drm/i915/display/intel_lt_phy.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 5 +++-- + drivers/gpu/drm/i915/display/intel_ddi.c | 11 +++++++++++ + drivers/gpu/drm/i915/display/intel_ddi.h | 1 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 ---- + drivers/gpu/drm/i915/display/intel_lt_phy.c | 6 ++++-- + 5 files changed, 19 insertions(+), 8 deletions(-) +Merging mmc-fixes/fixes (00179ed9fbe07 mmc: loongson2: Fix sg iteration in data reorder functions) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (254f49634ee16 Linux 7.1-rc1) +$ 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 (a13c140cc289c Linux 7.2-rc3) +$ 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 (0fd49f7bfb8f1 mshv_vtl: bounds-check cpu index in vtl mmap fault handler) +$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Auto-merging drivers/hv/connection.c +Merge made by the 'ort' strategy. +Merging risc-v-fixes/fixes (2c1efc460f9ca riscv: bug: Make RV32 use GENERIC_BUG_RELATIVE_POINTERS) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Auto-merging arch/riscv/Kconfig +Merge made by the 'ort' strategy. + arch/riscv/Kconfig | 2 +- + arch/riscv/include/asm/bug.h | 5 ----- + arch/riscv/kernel/patch.c | 2 ++ + arch/riscv/kernel/process.c | 4 +--- + arch/riscv/kernel/sys_hwprobe.c | 5 ++--- + arch/riscv/kernel/usercfi.c | 5 ++--- + arch/riscv/mm/init.c | 4 +++- + 7 files changed, 11 insertions(+), 16 deletions(-) +Merging riscv-dt-fixes/riscv-dt-fixes (42c57c049054d riscv: dts: starfive: jh7110-common: fix jh7110 SoC boot from SD-card.) +$ git merge -m Merge branch 'riscv-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 1 + + 1 file changed, 1 insertion(+) +Merging riscv-soc-fixes/riscv-soc-fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (dc59e4fea9d83 Linux 7.2-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 (16b10f64c63f7 gpiolib: Put fwnode reference on failure) +$ git merge -m Merge branch 'gpio/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'ort' strategy. + drivers/gpio/gpiolib-shared.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) +Merging gpio-intel-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (dc59e4fea9d83 Linux 7.2-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 (dc59e4fea9d83 Linux 7.2-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 (5142c56651578 bug: fix warning suppressions with kunit built as module) +$ 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 (6fa6ee724d8da arm64: dts: renesas: ironhide: Describe inline ECC carveouts) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf-tools (9453bc6a69ef4 perf vendor events arm64: Fix Tegra410 Olympus event 0x0197) +$ git merge -m Merge branch 'perf-tools' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (d8809f6931065 efi: sysfb_efi: Extend quirk to cover IdeaPad Duet 3 10IGL5-LTE) +$ git merge -m Merge branch 'urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging battery-fixes/fixes (160a783aa65b7 power: supply: bq25890: fix the -10 C NTC lookup entry) +$ 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 (075b74841bd00 Linux 7.2-rc6) +$ 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 (1b0bab4a873f1 rust: kbuild: disambiguate `zerocopy_derive` for `rusttest`) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Auto-merging Makefile +Auto-merging rust/Makefile +Auto-merging tools/objtool/check.c +Merge made by the 'ort' strategy. + Makefile | 13 ++++++++++++- + rust/Makefile | 6 ++++-- + rust/kernel/jump_label.rs | 12 ++++++++++++ + rust/kernel/list.rs | 2 +- + rust/kernel/num/bounded.rs | 30 +++++++++++++++++++++--------- + scripts/Makefile.build | 3 ++- + tools/objtool/check.c | 1 + + 7 files changed, 53 insertions(+), 14 deletions(-) +Merging w1-fixes/fixes (dc59e4fea9d83 Linux 7.2-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 (d4c177153bdfc Revert "pmdomain: qcom: rpmhpd: Add missing MXC and MMCX power domains for Eliza") +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pmdomain/qcom/rpmhpd.c | 4 ---- + 1 file changed, 4 deletions(-) +Merging i2c-andi-fixes/i2c/i2c-fixes (b15b548d52b43 i2c: core: fix debugfs UAF on adapter removal) +$ 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 +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-designware-platdrv.c | 2 +- + drivers/i2c/busses/i2c-imx-lpi2c.c | 27 +++++++++++++++++++++++---- + drivers/i2c/busses/i2c-qcom-cci.c | 11 ++++------- + drivers/i2c/busses/i2c-qcom-geni.c | 4 ++-- + drivers/i2c/i2c-core-base.c | 6 ++++++ + drivers/i2c/i2c-mux.c | 1 + + 6 files changed, 37 insertions(+), 14 deletions(-) +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 (254f49634ee16 Linux 7.1-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 (7ae8acad2d5c4 Merge tag 'qcom-clk-fixes-for-7.2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-fixes) +$ git merge -m Merge branch 'clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Already up to date. +Merging thead-clk-fixes/thead-clk-fixes (dc59e4fea9d83 Linux 7.2-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 (6de23f81a5e08 Linux 7.0-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 (254f49634ee16 Linux 7.1-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 (dc59e4fea9d83 Linux 7.2-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 (dc59e4fea9d83 Linux 7.2-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 (6727b7618f494 samples/ftrace: Fix kthread_stop() on ERR_PTR in ftrace-direct-multi-modify) +$ 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 +Auto-merging kernel/trace/trace.c +Merge made by the 'ort' strategy. + fs/tracefs/event_inode.c | 7 ++----- + kernel/trace/trace.c | 6 +++++- + kernel/trace/trace_events.c | 2 ++ + kernel/trace/trace_events_hist.c | 4 +++- + samples/ftrace/ftrace-direct-modify.c | 12 +++++++++--- + samples/ftrace/ftrace-direct-multi-modify.c | 12 +++++++++--- + 6 files changed, 30 insertions(+), 13 deletions(-) +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 (eb525edd48907 clk: spacemit: k3: set hdma clock as critical) +$ 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 (d2f36b6e31d42 Merge branch into tip/master: 'timers/urgent') +$ git merge -m Merge branch 'tip/urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Merge made by the 'ort' strategy. + arch/um/include/asm/timex.h | 13 +++++++++++++ + include/linux/spinlock.h | 26 ++++++++++++++------------ + kernel/sched/fair.c | 12 ++++++------ + 3 files changed, 33 insertions(+), 18 deletions(-) + create mode 100644 arch/um/include/asm/timex.h +Merging kexec-fixes/kexec-fixes (ada2e5a44e991 crash_dump: release keyring reference at the correct time) +$ 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 (e2332abed2a4d drm/msm: Only fini scheduler after successful init) +$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes +Auto-merging drivers/gpu/drm/msm/adreno/a5xx_gpu.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Auto-merging drivers/gpu/drm/msm/msm_ringbuffer.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 36 ++++++++++++++++++++++++++- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 5 ++++ + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 5 +++- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 8 ++++-- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 5 +++- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 12 +++++++++ + drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 5 +++- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 2 +- + drivers/gpu/drm/msm/dp/dp_panel.c | 4 ++- + drivers/gpu/drm/msm/dsi/dsi_host.c | 12 +++++++++ + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 18 ++++++++++++-- + drivers/gpu/drm/msm/msm_gpu.c | 8 ++++-- + drivers/gpu/drm/msm/msm_ringbuffer.c | 7 +++--- + drivers/gpu/drm/msm/msm_ringbuffer.h | 1 + + drivers/gpu/drm/msm/registers/adreno/a3xx.xml | 2 ++ + 16 files changed, 116 insertions(+), 15 deletions(-) +Merging uml-fixes/fixes (af421e9aed392 um: vector: fix use-after-free in vector_mmsg_rx()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging fwctl-fixes/for-rc (075b74841bd00 Linux 7.2-rc6) +$ 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 (8cdeaa50eae8d Linux 7.2-rc2) +$ 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 (6de23f81a5e08 Linux 7.0-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 (be47ff78de05e selftests: nci: Correct pthread_create return value check) +$ git merge -m Merge branch 'for-linus' of https://codeberg.org/linux-nfc/linux.git nfc-fixes/for-linus +Auto-merging drivers/nfc/fdp/i2c.c +Auto-merging drivers/nfc/pn533/pn533.c +Auto-merging drivers/nfc/port100.c +Auto-merging drivers/nfc/st21nfca/i2c.c +Auto-merging net/nfc/llcp_core.c +Merge made by the 'ort' strategy. + drivers/nfc/nfcmrvl/fw_dnld.c | 11 ++++++++--- + drivers/nfc/port100.c | 7 +++++++ + drivers/nfc/st21nfca/i2c.c | 29 +++++++++++++++++++---------- + net/nfc/llcp_core.c | 25 +++++++++++++++++++++++++ + tools/testing/selftests/nci/nci_dev.c | 12 +++++++----- + 5 files changed, 66 insertions(+), 18 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (20839d02c0cf7 drm/tegra: Add blend mode properties) +$ 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 drivers/accel/amdxdna/amdxdna_gem.c +Auto-merging drivers/accel/ethosu/ethosu_drv.c +CONFLICT (content): Merge conflict in drivers/accel/ethosu/ethosu_drv.c +Auto-merging drivers/accel/ethosu/ethosu_job.c +Auto-merging drivers/dma-buf/dma-heap.c +Auto-merging drivers/gpu/drm/drm_atomic_uapi.c +Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h +Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.h +Auto-merging drivers/gpu/drm/virtio/virtgpu_kms.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_object.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_vq.c +Auto-merging drivers/misc/fastrpc.c +Resolved 'drivers/accel/ethosu/ethosu_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h' using previous resolution. +Resolved 'drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3ab5a84fe12f0] Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git +$ git diff -M --stat --summary HEAD^.. + drivers/accel/amdxdna/aie2_message.c | 2 +- + drivers/accel/amdxdna/amdxdna_ctx.c | 4 +- + drivers/accel/amdxdna/amdxdna_ctx.h | 2 +- + drivers/accel/amdxdna/amdxdna_gem.c | 3 + + drivers/accel/ethosu/ethosu_drv.c | 2 + + drivers/accel/ethosu/ethosu_gem.c | 2 +- + drivers/accel/ethosu/ethosu_job.c | 10 +- + drivers/accel/qaic/qaic_control.c | 46 ++--- + drivers/dma-buf/dma-buf.c | 20 +++ + drivers/dma-buf/dma-heap.c | 80 ++++----- + drivers/gpu/drm/drm_atomic_uapi.c | 5 +- + drivers/gpu/drm/drm_prime.c | 2 +- + drivers/gpu/drm/gud/gud_connector.c | 12 +- + drivers/gpu/drm/gud/gud_drv.c | 2 + + drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h | 1 + + drivers/gpu/drm/nouveau/nouveau_chan.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c | 13 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gb202.c | 191 +++++++++++++++++++++ + drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h | 17 ++ + drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c | 86 +++++++++- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c | 125 ++++++-------- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/disp.c | 64 +++++++ + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gsp.c | 9 + + .../nouveau/nvkm/subdev/gsp/rm/r570/nvrm/disp.h | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h | 5 + + drivers/gpu/drm/sysfb/ofdrm.c | 8 +- + drivers/gpu/drm/tegra/dc.c | 6 + + drivers/gpu/drm/tegra/hub.c | 2 + + drivers/gpu/drm/tiny/cirrus-qemu.c | 3 + + drivers/gpu/drm/virtio/virtgpu_display.c | 9 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 21 +++ + drivers/gpu/drm/virtio/virtgpu_kms.c | 1 + + drivers/gpu/drm/virtio/virtgpu_object.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 21 ++- + drivers/misc/fastrpc.c | 16 +- + include/linux/dma-buf.h | 1 + + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 113 +++++++++++- + 41 files changed, 756 insertions(+), 175 deletions(-) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/gb202.c +Merging rust/rust-next (73e3f0710014f Merge tag 'nfs-for-7.3-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs) +$ 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 (45c13f3f9e3bb Merge tag 'hwlock-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ 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 (1e26aea0355ad rust: pin-init: add `#[inline]` to small functions) +$ 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 (ddb1444d33351 hrtimer: add usage examples to documentation) +$ git merge -m Merge branch 'timekeeping-next' of https://github.com/Rust-for-Linux/linux.git rust-timekeeping/timekeeping-next +Already up to date. +Merging rust-xarray/xarray-next (c455f19bbe610 rust: xarray: add __rust_helper to helpers) +$ git merge -m Merge branch 'xarray-next' of https://github.com/Rust-for-Linux/linux.git rust-xarray/xarray-next +Already up to date. +Merging rust-analyzer/rust-analyzer-next (5f45afb8ab04d 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 +Auto-merging scripts/generate_rust_analyzer.py +Merge made by the 'ort' strategy. + scripts/generate_rust_analyzer.py | 1 + + 1 file changed, 1 insertion(+) +Merging mm/for-next (35314b1c46ced 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' of https://git.kernel.org/pub/scm/linux/kernel/git/mm/linux.git mm/for-next +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (18fbf5151d2c0 Merge tag 'mm-stable-2026-08-26-15-22' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ 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 (4628ed590c747 selftests/membarrier: skip unpermitted membarrier command test if preregistered by libc) +$ 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 +Merge made by the 'ort' strategy. + .mailmap | 1 + + drivers/infiniband/hw/hfi1/fault.c | 1 - + drivers/media/v4l2-core/v4l2-vp9.c | 30 ++--- + drivers/usb/gadget/legacy/inode.c | 4 +- + fs/fat/fat.h | 2 +- + fs/fat/fatent.c | 21 +++- + fs/fat/file.c | 3 +- + fs/fat/misc.c | 6 +- + fs/ocfs2/xattr.c | 132 +++++++++++++++------ + include/linux/fault-inject.h | 10 +- + init/version.c | 3 + + ipc/mqueue.c | 7 ++ + kernel/resource.c | 2 +- + kernel/taskstats.c | 4 + + lib/fault-inject.c | 7 +- + lib/group_cpus.c | 87 +++++++++++++- + lib/klist.c | 16 ++- + lib/raid/Kconfig | 2 + + scripts/checkpatch.pl | 2 + + .../selftests/membarrier/membarrier_test_impl.h | 17 ++- + 20 files changed, 285 insertions(+), 72 deletions(-) +Merging kbuild/kbuild-for-next (d900723d78ade modpost: use mod_warn() and mod_error(), clean up logging) +$ 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 +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 (9453bc6a69ef4 perf vendor events arm64: Fix Tegra410 Olympus event 0x0197) +$ 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 (23e790697fd8e Merge branch 'dma-mapping-coco' into dma-mapping-for-next) +$ 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. +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 (1345e9968d318 Merge branches 'fixes' and 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Merge made by the 'ort' strategy. + arch/arm/kernel/entry-armv.S | 13 ++++++++++--- + arch/arm/mm/proc-arm920.S | 2 -- + arch/arm/mm/proc-arm922.S | 2 -- + arch/arm/mm/proc-arm925.S | 2 -- + arch/arm/mm/proc-arm926.S | 2 -- + arch/arm/probes/kprobes/test-core.c | 14 +++----------- + 6 files changed, 13 insertions(+), 22 deletions(-) +Merging arm64/for-next/core (2bd533739234d selftests/arm64: Add MTE test config fragment) +$ git merge -m Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging arch/arm64/include/asm/ptdump.h +Auto-merging arch/arm64/mm/ptdump.c +Merge made by the 'ort' strategy. + arch/arm64/include/asm/processor.h | 2 +- + arch/arm64/include/asm/ptdump.h | 2 ++ + arch/arm64/kernel/compat_alignment.c | 4 +-- + arch/arm64/kvm/ptdump.c | 11 +++++--- + arch/arm64/mm/ptdump.c | 14 +++++++++- + tools/testing/selftests/arm64/config | 17 ++++++++++++ + .../selftests/arm64/mte/check_buffer_fill.c | 2 ++ + .../selftests/arm64/mte/check_child_memory.c | 2 ++ + .../selftests/arm64/mte/check_gcr_el1_cswitch.c | 1 + + .../selftests/arm64/mte/check_hugetlb_options.c | 2 ++ + .../selftests/arm64/mte/check_ksm_options.c | 31 +++++++++++++++++++--- + .../selftests/arm64/mte/check_mmap_options.c | 2 ++ + tools/testing/selftests/arm64/mte/check_prctl.c | 2 +- + .../selftests/arm64/mte/check_tags_inclusion.c | 2 ++ + tools/testing/selftests/arm64/mte/check_user_mem.c | 2 ++ + 15 files changed, 84 insertions(+), 12 deletions(-) + create mode 100644 tools/testing/selftests/arm64/config +Merging arm-perf/for-next/perf (5936245125f78 perf/arm-cmn: Fix DVM node events) +$ 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 (ae77d827fb0e6 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 +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 175 +++++++++++++++++++++++++++++++++ + 1 file changed, 175 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (544455a3a844e Merge branch 'v7.3/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. +Merging asahi-soc/asahi-soc/for-next (8776c12e06211 Merge branch 'apple-soc/dt-7.3' into asahi-soc/for-next) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Merge made by the 'ort' strategy. +Merging at91/at91-next (d6e7bce8d4392 Merge branch 'microchip-dt64' into at91-next) +$ git merge -m Merge branch 'at91-next' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging bmc/for-next (cd7d1ef7d74ed Merge branches 'aspeed/drivers', 'aspeed/arm/dt', 'aspeed/fixes/drivers', 'aspeed/maintainers', 'nuvoton/arm/dt', 'nuvoton/arm/fixes' and 'nuvoton/arm64/dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next +Merge made by the 'ort' strategy. +Merging broadcom/next (fca5276165993 ARM: dts: BCM5301X: panamera: add phy-mode to switch) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Auto-merging arch/arm/boot/dts/broadcom/bcm-ns.dtsi +Auto-merging arch/arm/boot/dts/broadcom/bcm4709-linksys-ea9200.dts +Auto-merging arch/arm/boot/dts/broadcom/bcm47094-linksys-panamera.dts +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 | 57 ++++++++++++++++++++++ + .../boot/dts/broadcom/bcm4709-netgear-r8000.dts | 12 +++++ + .../boot/dts/broadcom/bcm47094-dlink-dir-890l.dts | 6 ++- + .../dts/broadcom/bcm47094-linksys-panamera.dts | 1 + + arch/arm/boot/dts/broadcom/bcm47189-tenda-ac9.dts | 20 ++++++++ + arch/arm/boot/dts/broadcom/bcm7445.dtsi | 2 +- + 9 files changed, 131 insertions(+), 2 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 (dc59e4fea9d83 Linux 7.2-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 (96aa6902ff2bf memory: jz4780-nemc: Use dev_err_probe() for clock error) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merging fsl/soc_fsl (e14b8d3938809 bus: fsl-mc: drop unused assignment of acpi_device_id::driver_data) +$ 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 (9400c5b6aa357 Merge branch 'imx/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (f5be25e697e03 Merge branch 'v7.2-next/dts32' 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 +Auto-merging drivers/soc/mediatek/mt8167-mmsys.h +CONFLICT (content): Merge conflict in drivers/soc/mediatek/mt8167-mmsys.h +Resolved 'drivers/soc/mediatek/mt8167-mmsys.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ca7d90b48af83] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/soc/mediatek/mt8167-mmsys.h | 5 ----- + 1 file changed, 5 deletions(-) +$ git am -3 ../patches/0001-mediatek-Take-the-other-branch.patch +Applying: mediatek: Take the other branch +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/soc/mediatek/mt8167-mmsys.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 8651edfc20a74] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git + Date: Fri Aug 28 13:54:03 2026 +0100 +Merging mvebu/for-next (5acccc8f8d731 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 (ba251bb5ce2db Merge branch 'omap-for-v7.3/drivers' into tmp/omap-next-20260706.114259) +$ 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 (ed2647532a225 Merge branches 'arm32-for-7.3', 'arm64-defconfig-for-7.3', 'arm64-fixes-for-7.2', 'arm64-for-7.3', 'clk-fixes-for-7.2', 'clk-for-7.3' and 'drivers-for-7.3' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging drivers/clk/qcom/cambistmclkcc-kaanapali.c +Auto-merging drivers/clk/qcom/cambistmclkcc-sm8750.c +Auto-merging drivers/clk/qcom/dispcc-sm8450.c +Auto-merging drivers/clk/qcom/gcc-eliza.c +Auto-merging drivers/clk/qcom/gcc-hawi.c +Auto-merging drivers/clk/qcom/gcc-kaanapali.c +Auto-merging drivers/clk/qcom/gcc-qcs8300.c +Auto-merging drivers/clk/qcom/gpucc-glymur.c +Auto-merging drivers/clk/qcom/gpucc-kaanapali.c +Auto-merging drivers/clk/qcom/nwgcc-nord.c +Auto-merging drivers/clk/qcom/videocc-glymur.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/qcom,hawi-gpucc.yaml | 80 + + .../bindings/clock/qcom,kaanapali-gxclkctl.yaml | 23 +- + .../bindings/clock/qcom,milos-camcc.yaml | 39 +- + .../bindings/clock/qcom,milos-videocc.yaml | 29 +- + .../bindings/clock/qcom,sm8450-camcc.yaml | 2 + + .../bindings/clock/qcom,sm8450-gpucc.yaml | 3 + + .../bindings/clock/qcom,sm8450-videocc.yaml | 2 + + drivers/clk/qcom/Kconfig | 65 + + drivers/clk/qcom/Makefile | 6 + + drivers/clk/qcom/cambistmclkcc-eliza.c | 464 +++ + drivers/clk/qcom/cambistmclkcc-kaanapali.c | 7 + + drivers/clk/qcom/cambistmclkcc-sm8750.c | 7 + + drivers/clk/qcom/camcc-eliza.c | 2803 +++++++++++++++++++ + drivers/clk/qcom/camcc-glymur.c | 7 + + drivers/clk/qcom/camcc-nord.c | 2941 ++++++++++++++++++++ + drivers/clk/qcom/clk-alpha-pll.c | 9 + + drivers/clk/qcom/dispcc-sm8450.c | 40 +- + drivers/clk/qcom/gcc-eliza.c | 6 +- + drivers/clk/qcom/gcc-hawi.c | 6 +- + drivers/clk/qcom/gcc-kaanapali.c | 6 +- + drivers/clk/qcom/gcc-msm8939.c | 4 + + drivers/clk/qcom/gcc-qcs8300.c | 103 + + drivers/clk/qcom/gpucc-eliza.c | 606 ++++ + drivers/clk/qcom/gpucc-glymur.c | 2 +- + drivers/clk/qcom/gpucc-hawi.c | 477 ++++ + drivers/clk/qcom/gpucc-kaanapali.c | 2 +- + drivers/clk/qcom/nwgcc-nord.c | 3 + + drivers/clk/qcom/videocc-eliza.c | 404 +++ + drivers/clk/qcom/videocc-glymur.c | 38 + + .../dt-bindings/clock/qcom,eliza-cambistmclkcc.h | 32 + + include/dt-bindings/clock/qcom,eliza-camcc.h | 151 + + include/dt-bindings/clock/qcom,eliza-gpucc.h | 51 + + include/dt-bindings/clock/qcom,eliza-videocc.h | 37 + + include/dt-bindings/clock/qcom,hawi-gpucc.h | 47 + + include/dt-bindings/clock/qcom,nord-camcc.h | 167 ++ + include/dt-bindings/clock/qcom,nord-nwgcc.h | 3 + + include/dt-bindings/clock/qcom,qcs8300-gcc.h | 6 + + 37 files changed, 8647 insertions(+), 31 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,hawi-gpucc.yaml + create mode 100644 drivers/clk/qcom/cambistmclkcc-eliza.c + create mode 100644 drivers/clk/qcom/camcc-eliza.c + create mode 100644 drivers/clk/qcom/camcc-nord.c + create mode 100644 drivers/clk/qcom/gpucc-eliza.c + create mode 100644 drivers/clk/qcom/gpucc-hawi.c + create mode 100644 drivers/clk/qcom/videocc-eliza.c + create mode 100644 include/dt-bindings/clock/qcom,eliza-cambistmclkcc.h + create mode 100644 include/dt-bindings/clock/qcom,eliza-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,eliza-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,eliza-videocc.h + create mode 100644 include/dt-bindings/clock/qcom,hawi-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,nord-camcc.h +Merging realtek/for-next (3c778f0c9fa36 arm64: dts: realtek: Add GPIO support for RTD1625) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git realtek/for-next +Already up to date. +Merging renesas/next (f9592c355314c Merge branches 'renesas-arm-soc-for-v7.3', 'renesas-drivers-for-v7.3' and 'renesas-dts-for-v7.3' into renesas-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. +Merging reset/reset/next (d373605cd5148 Merge tag 'reset-fixes-for-v7.0-2' into reset/next) +$ git merge -m Merge branch 'reset/next' of https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (2d578cd590adc Merge branch 'v7.3-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. +Merging samsung-krzk/for-next (acde40ba506aa Merge branch '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. +Merging scmi/for-linux-next (8703affc72639 Merge tag 'scmi-updates-7.3' 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. +Merging sophgo/for-next (76acfee87c74d Merge branch 'dt/arm' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. +Merging sophgo-soc/soc-for-next (c8754c7deab4c soc: sophgo: cv1800: rtcsys: New driver (handling RTC only)) +$ git merge -m Merge branch 'soc-for-next' of https://github.com/sophgo/linux.git sophgo-soc/soc-for-next +Already up to date. +Merging spacemit/for-next (3fca3cbc0516b Merge branch 'spacemit-dt-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 +Merge made by the 'ort' strategy. +Merging stm32/stm32-next (90d4d470d4d47 arm64: dts: st: Add I/O sync to eth1 pinctrl in stm32mp25-pinctrl.dtsi) +$ git merge -m Merge branch 'stm32-next' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/boot/dts/st/stm32mp135f-dk.dts +Auto-merging arch/arm64/boot/dts/st/stm32mp257f-ev1.dts +Merge made by the 'ort' strategy. + arch/arm/boot/dts/st/stm32mp131.dtsi | 24 ++++++++++ + arch/arm/boot/dts/st/stm32mp135.dtsi | 44 ++++++++--------- + arch/arm/boot/dts/st/stm32mp135f-dk.dts | 16 ++++++- + arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi | 34 +++++++++++++ + arch/arm/boot/dts/st/stm32mp151.dtsi | 20 ++++---- + .../arm/boot/dts/st/stm32mp153c-lxa-fairytux2.dtsi | 2 +- + arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts | 8 ++-- + arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts | 8 ++-- + arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts | 8 ++-- + arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts | 8 ++-- + arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 8 ++-- + arch/arm/boot/dts/st/stm32mp157c-lxa-mc1.dts | 2 +- + arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 2 +- + arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 34 +++++++++++-- + arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi | 2 + + arch/arm64/boot/dts/st/stm32mp257f-ev1.dts | 56 +++++++++++----------- + 16 files changed, 187 insertions(+), 89 deletions(-) +Merging sunxi/sunxi/for-next (859c0e1925332 Merge branch 'sunxi/dt-for-7.3' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (a3067938fd192 Merge branches 'qcomtee_for_v7.3', 'optee_fix_for_v7.2' and 'jw-korg' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (48713e5ff96a2 Merge branch for-7.3/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. +Merging tenstorrent-dt/tenstorrent-dt-for-next (33583baeb1ba7 dt-bindings: iommu: riscv: Add bindings for Tenstorrent RISC-V IOMMU) +$ 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 (020e209272bee riscv: defconfig: thead: enable PCA953X GPIO driver) +$ 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 (15d32aaf6300b riscv: dts: thead: Add remaining Lichee Pi 4A IO expansions) +$ 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 (61831b50771af Merge branch 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +Merging xilinx/for-next (a4ff2be345d0a Merge tag 'v7.3-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ 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 (ff98c9832fd43 arm64: dts: socfpga: use consistent QSPI boot partition label) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git socfpga/for-next +Already up to date. +Merging clk/clk-next (dd8eb789f18c4 Merge branches 'clk-pile' and 'clk-microchip' into clk-next) +$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (39ec460b56b26 clk: imx95-blk-ctl: Fix REFCLK rise-fall mismatch on i.MX95) +$ 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 (0fb9083a6e56f clk: renesas: Add R-Car X5H CPG driver) +$ 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 (b2ee00d0bf4cc clk: thead: allow COMPILE_TEST builds) +$ 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 (23c8ebc952849 clk: tenstorrent: Add Atlantis clock controller driver) +$ 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 (e2a8488684418 Merge branch 'loongarch-kvm' into loongarch-next) +$ git merge -m Merge branch 'loongarch-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Merge made by the 'ort' strategy. +Merging m68k/for-next (2f8e3cad53b5c m68k: nfcon: Do not call console_is_registered() in nfcon_device()) +$ 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 (de0dab22cbf69 m68k: coldfire/5441x: register mcf-rcm-reset platform device) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/coldfire/device.c | 2 +- + arch/m68k/coldfire/m5441x.c | 25 +++++++++++++++++ + arch/m68k/configs/m5235evb_defconfig | 52 ++++++++++++++++++++++++++++++++++++ + arch/m68k/configs/m5282evb_defconfig | 51 +++++++++++++++++++++++++++++++++++ + arch/m68k/include/asm/mcfgpio.h | 2 +- + 5 files changed, 130 insertions(+), 2 deletions(-) + create mode 100644 arch/m68k/configs/m5235evb_defconfig + create mode 100644 arch/m68k/configs/m5282evb_defconfig +Merging microblaze/next (8d3ae59288f1e Linux 7.2) +$ 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 (3b7711be02612 mips: dts: econet: Describe dual-VPE 34Kc processor) +$ 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 +Merge made by the 'ort' strategy. + arch/openrisc/mm/tlb.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging parisc-hd/for-next (8d3ae59288f1e Linux 7.2) +$ 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 (1304643a1c20b powerpc/pseries/iommu: switch to Default DMA window during kdump) +$ 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 (77ae27fd98f3b Merge tag 'printk-for-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux) +$ 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 (82ab962ef6c2a Merge branch 'k230-basic' into riscv-dt-for-next) +$ 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 (8cdeaa50eae8d Linux 7.2-rc2) +$ 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 +Already up to date. +Merging s390/for-next (53158917ea1a0 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. +Merging sh/for-next (b0aa5e4b087b6 sh: Fix fallout from ZERO_PAGE consolidation) +$ 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 (5b2a3b1a98fb4 sparc: Remove remaining defconfig references to the pktcdvd driver) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (1590cf0329716 Linux 7.2-rc4) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (eb049bdbf2b98 xtensa: remove unused setup_profiling_timer function) +$ git merge -m Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/include/asm/platform.h | 2 +- + arch/xtensa/kernel/smp.c | 7 ------- + arch/xtensa/kernel/time.c | 1 - + arch/xtensa/platforms/iss/console.c | 5 +++-- + 4 files changed, 4 insertions(+), 11 deletions(-) +Merging fs-next (cfae6aa69b8eb Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 18 ++ + Documentation/filesystems/ceph.rst | 6 + + Documentation/filesystems/f2fs.rst | 43 ++- + Documentation/filesystems/smb/ksmbd.rst | 6 +- + MAINTAINERS | 8 +- + drivers/mtd/ubi/attach.c | 4 +- + drivers/mtd/ubi/build.c | 48 +++- + drivers/mtd/ubi/cdev.c | 2 +- + drivers/mtd/ubi/fastmap-wl.c | 8 +- + drivers/mtd/ubi/fastmap.c | 6 +- + drivers/mtd/ubi/io.c | 11 +- + drivers/mtd/ubi/ubi.h | 25 +- + drivers/mtd/ubi/wl.c | 54 ++-- + fs/btrfs/Kconfig | 1 + + fs/btrfs/transaction.c | 18 +- + fs/ceph/addr.c | 30 ++- + fs/ceph/caps.c | 166 ++++++++---- + fs/ceph/crypto.c | 50 +++- + fs/ceph/crypto.h | 4 +- + fs/ceph/dir.c | 22 +- + fs/ceph/export.c | 26 +- + fs/ceph/file.c | 56 +++- + fs/ceph/inode.c | 3 +- + fs/ceph/mds_client.c | 110 ++++++-- + fs/ceph/mds_client.h | 1 + + fs/ceph/mdsmap.c | 11 +- + fs/ceph/super.c | 10 + + fs/ceph/super.h | 45 +++- + fs/ceph/xattr.c | 1 + + fs/exfat/iomap.c | 28 +- + fs/f2fs/checkpoint.c | 123 ++++++++- + fs/f2fs/data.c | 50 +++- + fs/f2fs/debug.c | 4 - + fs/f2fs/dir.c | 7 +- + fs/f2fs/extent_cache.c | 9 + + fs/f2fs/f2fs.h | 90 ++++++- + fs/f2fs/file.c | 460 ++++++++++++++++++++++++++++---- + fs/f2fs/gc.c | 129 +++++---- + fs/f2fs/gc.h | 27 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/inode.c | 230 ++++++++++++---- + fs/f2fs/iostat.c | 6 + + fs/f2fs/namei.c | 168 +++++++----- + fs/f2fs/node.c | 81 +++--- + fs/f2fs/recovery.c | 55 ++-- + fs/f2fs/segment.c | 287 ++++++++++++++------ + fs/f2fs/segment.h | 37 ++- + fs/f2fs/shrinker.c | 3 +- + fs/f2fs/super.c | 99 ++++++- + fs/f2fs/sysfs.c | 34 ++- + fs/f2fs/xattr.c | 2 +- + fs/lockd/svc.c | 1 - + fs/lockd/trace.h | 1 - + fs/lockd/xdr.h | 2 +- + fs/namei.c | 2 + + fs/nfs/nfs4file.c | 1 + + fs/nfs/super.c | 25 -- + fs/nfs_common/nfs_ssc.c | 126 +++++---- + fs/nfsd/blocklayout.c | 1 + + fs/nfsd/blocklayoutxdr.c | 11 + + fs/nfsd/export.c | 8 +- + fs/nfsd/export.h | 3 +- + fs/nfsd/filecache.c | 1 + + fs/nfsd/flexfilelayout.c | 24 +- + fs/nfsd/flexfilelayoutxdr.c | 9 +- + fs/nfsd/flexfilelayoutxdr.h | 8 +- + fs/nfsd/localio.c | 10 +- + fs/nfsd/lockd.c | 4 +- + fs/nfsd/nfs2acl.c | 1 + + fs/nfsd/nfs3acl.c | 1 + + fs/nfsd/nfs3proc.c | 37 ++- + fs/nfsd/nfs3xdr.c | 3 + + fs/nfsd/nfs4acl.c | 1 + + fs/nfsd/nfs4callback.c | 8 +- + fs/nfsd/nfs4ctl.h | 83 ++++++ + fs/nfsd/nfs4idmap.c | 1 + + fs/nfsd/nfs4layouts.c | 1 + + fs/nfsd/nfs4proc.c | 362 ++++++++++++++----------- + fs/nfsd/nfs4recover.c | 1 + + fs/nfsd/nfs4state.c | 244 ++++++++++++++--- + fs/nfsd/nfs4xdr.c | 104 +++++++- + fs/nfsd/nfscache.c | 1 + + fs/nfsd/nfsctl.c | 2 + + fs/nfsd/nfsd.h | 236 +--------------- + fs/nfsd/nfserr.h | 158 +++++++++++ + fs/nfsd/nfsfh.c | 72 ++--- + fs/nfsd/nfsfh.h | 28 +- + fs/nfsd/nfsproc.c | 20 +- + fs/nfsd/nfssvc.c | 8 + + fs/nfsd/nfsxdr.c | 1 + + fs/nfsd/state.h | 43 ++- + fs/nfsd/vfs.c | 91 ++++--- + fs/nfsd/vfs.h | 10 +- + fs/nfsd/xdr3.h | 2 +- + fs/nfsd/xdr4.h | 152 +---------- + fs/nfsd/xdr4cb.h | 20 +- + fs/nilfs2/Kconfig | 2 +- + fs/nilfs2/Makefile | 2 +- + fs/nilfs2/file.c | 40 ++- + fs/nilfs2/inode.c | 13 - + fs/nilfs2/iomap.c | 71 +++++ + fs/nilfs2/iomap.h | 13 + + fs/ntfs/attrib.c | 10 +- + fs/ntfs/bdev-io.c | 2 +- + fs/ntfs/compress.c | 2 +- + fs/ntfs/ea.c | 49 +++- + fs/ntfs/file.c | 15 +- + fs/ntfs/inode.c | 10 +- + fs/ntfs/lcnalloc.c | 9 +- + fs/ntfs/mft.c | 16 +- + fs/ntfs/ntfs.h | 10 +- + fs/ntfs/reparse.c | 7 +- + fs/ntfs/super.c | 15 +- + fs/quota/dquot.c | 2 +- + fs/smb/server/Kconfig | 2 + + fs/smb/server/Makefile | 1 + + fs/smb/server/smb2pdu.c | 5 + + fs/smb/server/smbacl.c | 2 + + fs/smb/server/tests/Kconfig | 15 ++ + fs/smb/server/tests/Makefile | 4 + + fs/smb/server/tests/smbacl_kunit.c | 301 +++++++++++++++++++++ + fs/smb/server/vfs.c | 2 + + fs/ubifs/auth.c | 2 +- + fs/ubifs/debug.h | 4 +- + fs/ubifs/key.h | 2 +- + fs/ubifs/ubifs.h | 20 +- + fs/xfs/Makefile | 1 + + fs/xfs/libxfs/xfs_rtgroup.h | 6 +- + fs/xfs/libxfs/xfs_sb.c | 37 ++- + fs/xfs/xfs_aops.c | 188 +------------ + fs/xfs/xfs_aops.h | 1 - + fs/xfs/xfs_file.c | 2 +- + fs/xfs/xfs_fsmap.c | 3 +- + fs/xfs/xfs_icache.c | 16 +- + fs/xfs/xfs_ioctl.c | 2 +- + fs/xfs/xfs_ioend.c | 184 +++++++++++++ + fs/xfs/xfs_ioend.h | 16 ++ + fs/xfs/xfs_iomap.c | 7 +- + fs/xfs/xfs_iomap.h | 14 + + fs/xfs/xfs_iops.c | 2 +- + fs/xfs/xfs_platform.h | 11 - + fs/xfs/xfs_super.c | 2 +- + fs/xfs/xfs_trans_buf.c | 3 +- + fs/xfs/xfs_zone_alloc.c | 72 +++-- + fs/xfs/xfs_zone_gc.c | 5 + + include/linux/capability.h | 5 + + include/linux/ceph/libceph.h | 2 - + include/linux/nfs.h | 55 +--- + include/linux/nfs3.h | 8 + + include/linux/nfs4.h | 6 + + include/linux/nfs_fh.h | 63 +++++ + include/linux/nfs_ssc.h | 69 +---- + include/linux/nfsd_ssc.h | 38 +++ + include/linux/nfslocalio.h | 11 +- + include/trace/events/f2fs.h | 23 +- + include/trace/misc/nfs.h | 1 + + include/uapi/linux/f2fs.h | 7 + + include/uapi/mtd/ubi-user.h | 10 +- + kernel/capability.c | 19 +- + net/ceph/messenger_v2.c | 5 + + net/ceph/osd_client.c | 30 +++ + net/ceph/osdmap.c | 2 + + net/ceph/pagevec.c | 13 - + 163 files changed, 4311 insertions(+), 1928 deletions(-) + create mode 100644 fs/nfsd/nfs4ctl.h + create mode 100644 fs/nfsd/nfserr.h + create mode 100644 fs/nilfs2/iomap.c + create mode 100644 fs/nilfs2/iomap.h + create mode 100644 fs/smb/server/tests/Kconfig + create mode 100644 fs/smb/server/tests/Makefile + create mode 100644 fs/smb/server/tests/smbacl_kunit.c + create mode 100644 fs/xfs/xfs_ioend.c + create mode 100644 fs/xfs/xfs_ioend.h + create mode 100644 include/linux/nfs_fh.h + create mode 100644 include/linux/nfsd_ssc.h +Merging printk/for-next (ffe0486b139e4 console: fix /dev/kmsg reference in flags kernel doc) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. + include/linux/console.h | 2 +- + kernel/printk/nbcon.c | 2 +- + kernel/printk/printk.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging pci/next (570f7e331f5fe Merge tag 'pci-v7.3-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (24b8f8dcb9a13 pstore/ftrace: Factor KASLR offset in the core kernel instruction addresses) +$ 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 (931aaa59d1826 Merge branch 'for-7.3/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. + drivers/hid/Kconfig | 2 +- + drivers/hid/hid-hyperv.c | 4 ++-- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-multitouch.c | 19 ++++++++----------- + drivers/hid/i2c-hid/i2c-hid-core.c | 2 ++ + drivers/hid/wacom_wac.c | 13 +++++++++++++ + 6 files changed, 27 insertions(+), 14 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 (1f3e66348d252 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. + Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 2 +- + drivers/i2c/busses/i2c-bcm2835.c | 2 +- + drivers/i2c/busses/i2c-qcom-geni.c | 3 +-- + drivers/i2c/i2c-core-acpi.c | 1 + + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging i2c-rust/rust-i2c-next (61ddec70c9bcc i2c: rust: mark I2cAdapter methods as inline) +$ 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 (cab40cfc9e116 i3c: dw: reduce do_daa time if there's no client) +$ 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 (75f2c0b369070 hwmon: (emc1403) Drop hysteresis for low limit temperature) +$ git merge -m Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (94509f50d696b docs: panic: Disclaimer about console verbosity when using panic_print with pstore) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/next (4900cad020c05 media: ipu-bridge: check all DMI entries when overriding sensor rotation) +$ 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 (b2f3581c6481e Merge branch 'acpi-scan' into fixes) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + drivers/acpi/power.c | 1 - + drivers/acpi/scan.c | 4 ++++ + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (8c3afcf27fa45 cpufreq: imx6q: fix out-of-bounds write when probed more than once) +$ 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 (adfe0057326ff cpupower: remove conditional return with no effect) +$ 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 (3ca7b513aec1d pmdomain: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Already up to date. +Merging opp/opp/linux-next (84f05af0975c9 opp: Use clk_get_optional() to avoid leaving opp_table->clk as an error pointer) +$ 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 (b115930d716de thermal/drivers/armada: Fix missing bitfields include) +$ 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 (8049741ac93ac RDMA/ucma: Allow path records to exactly fit the output buffer) +$ 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 (1b78070aaef63 Merge tag 'net-7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (48b69cc8825d4 selftests/bpf: Enable some of the blocked cpuv4 instruction tests for bpf-gcc) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging arch/x86/net/bpf_jit_comp.c +Auto-merging include/linux/bpf.h +Auto-merging include/linux/filter.h +Auto-merging kernel/bpf/core.c +Auto-merging kernel/bpf/verifier.c +Auto-merging tools/testing/selftests/bpf/Makefile +Merge made by the 'ort' strategy. + Documentation/bpf/kfuncs.rst | 65 ++++++ + arch/arm64/net/bpf_jit_comp.c | 5 + + arch/riscv/net/bpf_jit_comp64.c | 21 +- + arch/x86/net/bpf_jit_comp.c | 27 ++- + include/linux/bpf.h | 8 +- + include/linux/bpf_verifier.h | 9 + + include/linux/filter.h | 1 + + kernel/bpf/backtrack.c | 46 ++-- + kernel/bpf/btf.c | 29 ++- + kernel/bpf/cnum_defs.h | 37 ++-- + kernel/bpf/core.c | 5 + + kernel/bpf/liveness.c | 20 +- + kernel/bpf/stream.c | 55 +++-- + kernel/bpf/verifier.c | 218 +++++++++++++++---- + tools/lib/bpf/btf.c | 14 +- + tools/lib/bpf/usdt.c | 4 + + tools/testing/selftests/bpf/Makefile | 18 +- + tools/testing/selftests/bpf/bench.c | 6 + + .../testing/selftests/bpf/benchs/bench_libarena.c | 210 ++++++++++++++++++ + .../selftests/bpf/benchs/run_bench_libarena.sh | 31 +++ + tools/testing/selftests/bpf/libarena/Makefile | 31 ++- + .../bpf/libarena/benchs/bench_malloc.bpf.c | 51 +++++ + .../bpf/libarena/include/bpf_arena_spin_lock.h | 2 +- + .../selftests/bpf/libarena/include/bpf_atomic.h | 2 +- + .../selftests/bpf/libarena/include/bpf_may_goto.h | 1 + + .../bpf/libarena/include/libarena/bitmap.h | 30 ++- + .../bpf/libarena/include/libarena/common.h | 71 ++++++ + .../bpf/libarena/selftests/test_bitmap.bpf.c | 3 + + .../testing/selftests/bpf/libarena/src/asan.bpf.c | 21 +- + .../selftests/bpf/libarena/src/bitmap.bpf.c | 18 -- + .../testing/selftests/bpf/libarena/src/buddy.bpf.c | 44 ++-- + .../selftests/bpf/libarena/src/common.bpf.c | 27 ++- + tools/testing/selftests/bpf/network_helpers.c | 46 +++- + .../selftests/bpf/prog_tests/aggregate_ret.c | 11 + + .../testing/selftests/bpf/prog_tests/core_reloc.c | 10 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 16 ++ + tools/testing/selftests/bpf/prog_tests/stream.c | 67 ++++++ + tools/testing/selftests/bpf/prog_tests/usdt.c | 54 +++++ + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + .../selftests/bpf/progs/aggregate_ret_func.c | 237 +++++++++++++++++++++ + .../selftests/bpf/progs/aggregate_ret_kfunc.c | 121 +++++++++++ + .../selftests/bpf/progs/aggregate_ret_target.c | 29 +++ + tools/testing/selftests/bpf/progs/arena_kfunc.c | 3 +- + tools/testing/selftests/bpf/progs/bpf_misc.h | 10 +- + .../selftests/bpf/progs/compute_live_registers.c | 36 ++++ + .../testing/selftests/bpf/progs/exceptions_fail.c | 2 +- + .../selftests/bpf/progs/freplace_ret_pair.c | 12 ++ + tools/testing/selftests/bpf/progs/stack_arg_fail.c | 3 +- + .../selftests/bpf/progs/stack_arg_precision.c | 1 + + tools/testing/selftests/bpf/progs/stream.c | 28 +++ + .../selftests/bpf/progs/verifier_aggregate_ret.c | 179 ++++++++++++++++ + tools/testing/selftests/bpf/progs/verifier_bswap.c | 3 +- + tools/testing/selftests/bpf/progs/verifier_gotol.c | 1 + + tools/testing/selftests/bpf/progs/verifier_ldsx.c | 36 +++- + .../selftests/bpf/progs/verifier_load_acquire.c | 1 + + tools/testing/selftests/bpf/progs/verifier_movsx.c | 3 +- + .../selftests/bpf/progs/verifier_percpu_addr.c | 1 + + .../selftests/bpf/progs/verifier_private_stack.c | 1 + + tools/testing/selftests/bpf/progs/verifier_sdiv.c | 3 +- + .../selftests/bpf/progs/verifier_stack_arg.c | 1 + + .../selftests/bpf/progs/verifier_stack_arg_order.c | 1 + + .../selftests/bpf/progs/verifier_store_release.c | 1 + + .../testing/selftests/bpf/test_kmods/bpf_testmod.c | 55 +++++ + .../selftests/bpf/test_kmods/bpf_testmod_kfunc.h | 29 +++ + tools/testing/selftests/bpf/test_loader.c | 9 + + tools/testing/selftests/bpf/usdt_2.c | 16 ++ + 66 files changed, 1929 insertions(+), 229 deletions(-) + create mode 100644 tools/testing/selftests/bpf/benchs/bench_libarena.c + create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_libarena.sh + create mode 100644 tools/testing/selftests/bpf/libarena/benchs/bench_malloc.bpf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/aggregate_ret.c + create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_func.c + create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_kfunc.c + create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_target.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_ret_pair.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_aggregate_ret.c +$ 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 (298bb2b890332 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (36b1d3299d0b6 net/mlx5: Add qp_latency_sensitive_disable cap bit) +$ 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 (91ec203513498 Merge tag 'net-next-7.3' 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 (f6f3b36c15ed4 net: ethernet: qualcomm: remove unneeded 'fast_io' parameter in regmap_config) +$ 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 (bcb621272aa04 Bluetooth: btintel_pcie: Clear automask on spurious interrupts) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging drivers/bluetooth/btmtk.c +Auto-merging drivers/bluetooth/btmtksdio.c +Auto-merging drivers/bluetooth/btnxpuart.c +Auto-merging drivers/bluetooth/btusb.c +Auto-merging drivers/bluetooth/hci_serdev.c +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging include/net/bluetooth/l2cap.h +Auto-merging net/bluetooth/hci_core.c +Auto-merging net/bluetooth/hci_sync.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/l2cap_sock.c +Auto-merging net/bluetooth/mgmt.c +Resolved 'net/bluetooth/hci_sync.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2d3ce6d8defd5] Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/btintel.c | 7 + + drivers/bluetooth/btintel.h | 1 + + drivers/bluetooth/btintel_pcie.c | 431 +++++++++++++++++++++++++++++-- + drivers/bluetooth/btintel_pcie.h | 77 +++++- + drivers/bluetooth/btmrvl_main.c | 4 +- + drivers/bluetooth/btmtk.c | 4 + + drivers/bluetooth/btmtksdio.c | 22 ++ + drivers/bluetooth/btusb.c | 2 + + drivers/bluetooth/hci_serdev.c | 46 +++- + drivers/bluetooth/virtio_bt.c | 21 +- + include/net/bluetooth/hci_core.h | 44 ++++ + include/net/bluetooth/l2cap.h | 2 + + net/bluetooth/bnep/core.c | 4 +- + net/bluetooth/hci_core.c | 2 +- + net/bluetooth/hci_sync.c | 64 ++--- + net/bluetooth/l2cap_core.c | 29 ++- + net/bluetooth/l2cap_sock.c | 1 + + net/bluetooth/mgmt.c | 14 +- + scripts/context-analysis-suppression.txt | 1 + + 19 files changed, 679 insertions(+), 97 deletions(-) +Merging wireless-next/for-next (ca800a9302764 wifi: nxpwifi: bound uAP association event IEs to the event buffer) +$ 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 (ca800a9302764 wifi: nxpwifi: bound uAP association event IEs to the event buffer) +$ 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 (4a2610a5a9fcf wifi: iwlwifi: bump core version for BZ/SC/DR) +$ 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 (94d32f1ace8ee mtd: maps: remove dead select of MTD_CFI_BE_BYTE_SWAP) +$ 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 (15a3cbce32994 mtd: rawnand: sunxi: fix H6/H616 controller timings) +$ 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 (df415c5e1de0f mtd: spi-nor: spansion: add die erase support in s28hx-t) +$ 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 (7537036a2e6fe crypto: lskcipher - propagate errors from unaligned crypt) +$ 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 (0f23d56f17fdf Merge tag 'linux_kselftest-next-7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) +$ 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 (a8b02aa825803 Merge tag 'amd-drm-next-7.3-2026-08-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +Auto-merging Documentation/devicetree/bindings/iommu/arm,smmu.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/msm/adreno/adreno_gpu.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/xe/xe_i2c.c +Auto-merging drivers/gpu/drm/xe/xe_i2c.h +Merge made by the 'ort' strategy. + .../bindings/display/msm/dsi-controller-main.yaml | 4 + + .../devicetree/bindings/display/msm/gmu.yaml | 1 + + .../devicetree/bindings/display/msm/gpu.yaml | 4 + + .../bindings/display/msm/qcom,qcm2290-dpu.yaml | 6 +- + .../bindings/display/msm/qcom,qcm2290-mdss.yaml | 19 +- + MAINTAINERS | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 148 +++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c | 150 +++++++- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12_1.c | 150 +++++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 59 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 73 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 3 + + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 5 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 + + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 56 ++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 + + .../amd/display/amdgpu_dm/amdgpu_dm_backlight.c | 8 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 13 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 8 +- + .../src/dml2_core/dml2_core_dcn5_calcs_dchub.c | 4 +- + .../src/dml2_core/dml2_core_dcn6_calcs_dchub.c | 15 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 2 +- + drivers/gpu/drm/drm_mode_config.c | 5 +- + drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 40 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 19 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 6 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 81 +++- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 5 + + drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 2 +- + .../gpu/drm/msm/adreno/adreno_gen7_17_0_snapshot.h | 428 +++++++++++++++++++++ + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 17 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 5 + + .../drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 4 + + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 12 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 24 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 11 +- + drivers/gpu/drm/msm/dp/dp_audio.c | 4 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 409 +++++++++++--------- + drivers/gpu/drm/msm/dp/dp_ctrl.h | 30 +- + drivers/gpu/drm/msm/dp/dp_display.c | 341 ++++++++-------- + drivers/gpu/drm/msm/dp/dp_display.h | 9 + + drivers/gpu/drm/msm/dp/dp_drm.c | 52 ++- + drivers/gpu/drm/msm/dp/dp_drm.h | 12 - + drivers/gpu/drm/msm/dp/dp_panel.c | 77 +--- + drivers/gpu/drm/msm/dp/dp_panel.h | 17 +- + drivers/gpu/drm/msm/dp/dp_reg.h | 2 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 - + drivers/gpu/drm/msm/hdmi/hdmi.h | 19 + + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 98 ++--- + drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 85 ++-- + drivers/gpu/drm/msm/msm_drv.c | 26 +- + drivers/gpu/drm/msm/msm_drv.h | 17 - + drivers/gpu/drm/msm/msm_fb.c | 96 ++--- + drivers/gpu/drm/msm/msm_fbdev.c | 84 ++-- + drivers/gpu/drm/msm/msm_gem.c | 94 +++-- + drivers/gpu/drm/msm/msm_gem.h | 5 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 31 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 14 +- + drivers/gpu/drm/msm/msm_gpu.c | 2 +- + drivers/gpu/drm/msm/msm_gpu.h | 4 +- + drivers/gpu/drm/msm/msm_iommu.c | 22 ++ + drivers/gpu/drm/msm/msm_submitqueue.c | 24 +- + drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 2 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 5 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 23 +- + drivers/gpu/drm/xe/Makefile | 4 +- + drivers/gpu/drm/xe/regs/xe_i2c_regs.h | 2 + + drivers/gpu/drm/xe/tests/xe_migrate.c | 3 +- + drivers/gpu/drm/xe/xe_amc.c | 197 ++++++++++ + drivers/gpu/drm/xe/xe_amc.h | 25 ++ + drivers/gpu/drm/xe/xe_gt_idle.c | 3 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 6 + + drivers/gpu/drm/xe/xe_i2c.c | 165 ++++---- + drivers/gpu/drm/xe/xe_i2c.h | 14 +- + drivers/gpu/drm/xe/xe_pagefault.c | 2 +- + drivers/gpu/drm/xe/xe_sysctrl.c | 7 +- + drivers/gpu/drm/xe/xe_sysctrl_mailbox.c | 22 +- + drivers/gpu/drm/xe/xe_sysctrl_mailbox.h | 1 - + drivers/gpu/drm/xe/xe_sysctrl_types.h | 3 - + drivers/gpu/drm/xe/xe_wa_oob.rules | 2 +- + drivers/i2c/busses/i2c-designware-common.c | 2 + + drivers/i2c/busses/i2c-designware-core.h | 85 +--- + drivers/i2c/busses/i2c-designware-master.c | 2 + + drivers/i2c/busses/i2c-designware-slave.c | 2 + + include/linux/designware_i2c.h | 107 ++++++ + include/uapi/drm/msm_drm.h | 6 +- + 101 files changed, 2645 insertions(+), 1157 deletions(-) + create mode 100644 drivers/gpu/drm/msm/adreno/adreno_gen7_17_0_snapshot.h + create mode 100644 drivers/gpu/drm/xe/xe_amc.c + create mode 100644 drivers/gpu/drm/xe/xe_amc.h + create mode 100644 include/linux/designware_i2c.h +$ git am -3 ../patches/0001-drm-Fix-up-lut3d-mismerge.patch +Applying: drm: Fix up lut3d mismerge +Using index info to reconstruct a base tree... +M drivers/gpu/drm/drm_atomic.c +M include/drm/drm_colorop.h +Falling back to patching base and 3-way merge... +Auto-merging include/drm/drm_colorop.h +Auto-merging drivers/gpu/drm/drm_atomic.c +No changes -- Patch already applied. +$ git am -3 ../patches/0001-drm-amdgpu_dpm-Fix-up-commiting-unresolved-merge.patch +Applying: drm: amdgpu_dpm: Fix up commiting unresolved merge +Using index info to reconstruct a base tree... +M drivers/gpu/drm/amd/pm/amdgpu_dpm.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_dpm.c +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 (271e90eb5f9ff drm: use drm_warn() in validate_blend_mode_for_alpha_formats()) +$ 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. +$ git am -3 ../patches/0001-drm-bridge-microchip-lvds-Rename-drm_atomic_state-to.patch +Applying: drm/bridge: microchip-lvds: Rename drm_atomic_state to drm_atomic_commit +Using index info to reconstruct a base tree... +M drivers/gpu/drm/bridge/microchip-lvds.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/bridge/microchip-lvds.c +No changes -- Patch already applied. +Merging amdgpu/drm-next (e4c3ab59021e7 drm/amd/display: validate plane degamma LUT size for private color prop) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git amdgpu/drm-next +Already up to date. +$ git am -3 ../patches/0001-amdgpu-Fix-up-drm_atomic_commit-rename.patch +Applying: amdgpu: Fix up drm_atomic_commit rename +Using index info to reconstruct a base tree... +M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +No changes -- Patch already applied. +Merging drm-intel/for-linux-next (65b92bc671db7 Merge tag 'drm-xe-next-fixes-2026-08-13' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Already up to date. +Merging drm-msm/msm-next (140b134753026 drm/msm: detach the ARM DMA mapping before attaching our own domain) +$ 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 (140b134753026 drm/msm: detach the ARM DMA mapping before attaching our own domain) +$ 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 (6a8789e948c15 drm/xe: Add debugfs knob to control GPGPU preemption granularity) + 04984fcdbf687 ("drm/xe/sysctrl: Read mailbox phase bit from hardware") + 2ab2fb31411a4 ("i2c: designware: Global register definitions") + 76cc14e2faed1 ("drm/xe/i2c: Keep the i2c controller always enabled") + 8899e413c5ab8 ("drm/xe/xe_gt_idle: Add CCS to the powergating info print") + a55b76b8bc2c4 ("drm/xe/i2c: Fix the interrupt handling") + bfb24a06405b6 ("drm/xe: Reject page faults from non-fault-mode scratch VMs") + fae59d5de5de3 ("drm/xe: Do not apply WA 14025883347 to media 3503") +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe/drm-xe-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_drm_ras.c +Auto-merging drivers/gpu/drm/xe/xe_exec_queue.c +Auto-merging drivers/gpu/drm/xe/xe_gt_idle.c +Auto-merging drivers/gpu/drm/xe/xe_guc_pc.c +Auto-merging drivers/gpu/drm/xe/xe_guc_submit.c +Auto-merging drivers/gpu/drm/xe/xe_i2c.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_i2c.c +Auto-merging drivers/gpu/drm/xe/xe_i2c.h +Auto-merging drivers/gpu/drm/xe/xe_lrc.c +Auto-merging drivers/gpu/drm/xe/xe_oa.c +Auto-merging drivers/gpu/drm/xe/xe_pagefault.c +Auto-merging drivers/gpu/drm/xe/xe_ras.c +Recorded preimage for 'drivers/gpu/drm/xe/xe_i2c.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/xe/xe_i2c.c'. +[master 279833702c7ab] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/drm-ras.rst | 21 + + Documentation/gpu/drm-uapi.rst | 93 +++- + Documentation/gpu/xe/index.rst | 1 + + Documentation/gpu/xe/xe_sigid.rst | 14 + + Documentation/netlink/specs/drm_ras.yaml | 48 ++ + MAINTAINERS | 13 + + drivers/gpu/drm/drm_drv.c | 2 + + drivers/gpu/drm/drm_ras.c | 101 ++++ + drivers/gpu/drm/drm_ras_nl.c | 6 + + drivers/gpu/drm/drm_ras_nl.h | 4 + + drivers/gpu/drm/xe/Makefile | 1 + + drivers/gpu/drm/xe/abi/guc_actions_slpc_abi.h | 1 + + drivers/gpu/drm/xe/abi/xe_log_abi.h | 199 +++++++ + drivers/gpu/drm/xe/abi/xe_sigid_abi.h | 172 +++++++ + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 6 + + drivers/gpu/drm/xe/regs/xe_lrc_layout.h | 2 + + drivers/gpu/drm/xe/tests/Makefile | 1 + + drivers/gpu/drm/xe/tests/xe_any_kunit.c | 213 ++++++++ + drivers/gpu/drm/xe/tests/xe_kunit_helpers.c | 4 + + drivers/gpu/drm/xe/tests/xe_log_kunit.c | 553 ++++++++++++++++++++ + drivers/gpu/drm/xe/xe_any.h | 137 +++++ + drivers/gpu/drm/xe/xe_debugfs.c | 15 + + drivers/gpu/drm/xe/xe_debugfs.h | 2 + + drivers/gpu/drm/xe/xe_defaults.h | 1 + + drivers/gpu/drm/xe/xe_device.c | 30 +- + drivers/gpu/drm/xe/xe_device_types.h | 23 +- + drivers/gpu/drm/xe/xe_drm_ras.c | 31 ++ + drivers/gpu/drm/xe/xe_drm_ras.h | 3 + + drivers/gpu/drm/xe/xe_exec_queue.c | 6 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 21 +- + drivers/gpu/drm/xe/xe_gsc.c | 3 +- + drivers/gpu/drm/xe/xe_gt.c | 13 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 146 ++++++ + drivers/gpu/drm/xe/xe_gt_idle.c | 45 +- + drivers/gpu/drm/xe/xe_gt_printk.h | 3 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 191 ++++--- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 6 + + drivers/gpu/drm/xe/xe_gt_sriov_printk.h | 3 + + drivers/gpu/drm/xe/xe_gt_stats.c | 7 + + drivers/gpu/drm/xe/xe_gt_stats_types.h | 22 + + drivers/gpu/drm/xe/xe_gt_types.h | 29 ++ + drivers/gpu/drm/xe/xe_guc.c | 18 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 95 +++- + drivers/gpu/drm/xe/xe_guc_ct.h | 38 +- + drivers/gpu/drm/xe/xe_guc_exec_queue_types.h | 32 +- + drivers/gpu/drm/xe/xe_guc_pagefault.c | 39 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 15 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 267 +++++++--- + drivers/gpu/drm/xe/xe_guc_types.h | 6 + + drivers/gpu/drm/xe/xe_hwmon.c | 88 ++-- + drivers/gpu/drm/xe/xe_log.c | 235 +++++++++ + drivers/gpu/drm/xe/xe_log.h | 194 +++++++ + drivers/gpu/drm/xe/xe_lrc.c | 33 ++ + drivers/gpu/drm/xe/xe_mert.c | 2 +- + drivers/gpu/drm/xe/xe_migrate.c | 2 - + drivers/gpu/drm/xe/xe_module.c | 4 + + drivers/gpu/drm/xe/xe_module.h | 1 + + drivers/gpu/drm/xe/xe_oa.c | 7 +- + drivers/gpu/drm/xe/xe_pagefault.c | 716 +++++++++++++++++++++----- + drivers/gpu/drm/xe/xe_pagefault.h | 74 +++ + drivers/gpu/drm/xe/xe_pagefault_types.h | 114 +++- + drivers/gpu/drm/xe/xe_pci.c | 32 +- + drivers/gpu/drm/xe/xe_pci_error.c | 13 +- + drivers/gpu/drm/xe/xe_pcode.c | 23 +- + drivers/gpu/drm/xe/xe_pm.c | 5 + + drivers/gpu/drm/xe/xe_printk.h | 3 + + drivers/gpu/drm/xe/xe_pt.c | 6 + + drivers/gpu/drm/xe/xe_pxp_submit.c | 5 +- + drivers/gpu/drm/xe/xe_ras.c | 125 ++++- + drivers/gpu/drm/xe/xe_sriov_printk.h | 3 + + drivers/gpu/drm/xe/xe_sriov_vf_ccs.c | 1 - + drivers/gpu/drm/xe/xe_survivability_mode.c | 85 +-- + drivers/gpu/drm/xe/xe_svm.c | 146 ++++-- + drivers/gpu/drm/xe/xe_svm.h | 59 ++- + drivers/gpu/drm/xe/xe_tile_printk.h | 3 + + drivers/gpu/drm/xe/xe_tile_sriov_printk.h | 3 + + drivers/gpu/drm/xe/xe_userptr.c | 19 +- + drivers/gpu/drm/xe/xe_vm.c | 301 ++++++++--- + drivers/gpu/drm/xe/xe_vm_types.h | 42 +- + drivers/gpu/drm/xe/xe_wa.c | 4 +- + include/drm/drm_device.h | 1 + + include/drm/drm_ras.h | 5 + + include/uapi/drm/drm_ras.h | 15 + + 83 files changed, 4464 insertions(+), 607 deletions(-) + create mode 100644 Documentation/gpu/xe/xe_sigid.rst + create mode 100644 drivers/gpu/drm/xe/abi/xe_log_abi.h + create mode 100644 drivers/gpu/drm/xe/abi/xe_sigid_abi.h + create mode 100644 drivers/gpu/drm/xe/tests/xe_any_kunit.c + create mode 100644 drivers/gpu/drm/xe/tests/xe_log_kunit.c + create mode 100644 drivers/gpu/drm/xe/xe_any.h + create mode 100644 drivers/gpu/drm/xe/xe_log.c + create mode 100644 drivers/gpu/drm/xe/xe_log.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. +Merging drm-rust/for-linux-next (4c9ba407018e8 gpu: nova-core: falcon: use I/O projection to check transfer bounds) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/for-linux-next +Already up to date. +Merging drm-nova/nova-next (93296e9d9528f gpu: nova-core: vbios: store reference to Device where relevant) +$ git merge -m Merge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git drm-nova/nova-next +Already up to date. +Merging etnaviv/etnaviv/next (6bde14ba5f7ef drm/etnaviv: add optional reset support) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (94e6a058b1682 fbcon: Fix KASAN slab-out-of-bounds Read in fbcon_prepare_logo) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/tty/vt/vt.c | 9 +++++---- + drivers/video/fbdev/core/fbcon.c | 7 +++++++ + drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c | 5 +++-- + 3 files changed, 15 insertions(+), 6 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 370039565002d] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git + Date: Fri Aug 28 14:11:55 2026 +0100 +Merging regmap/for-next (efc5e244e8258 Merge remote-tracking branch 'regmap/for-7.3' 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. +Merging sound/for-next (c4a0927f535f7 Merge tag 'asoc-fix-v7.3-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging ieee1394/for-next (05bfb1327dc5f firewire: core: fix memory leak in error path of build_tree()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging sound-asoc/for-next (32b4e6b134c62 Merge remote-tracking branch 'asoc/for-7.2' into asoc-linus) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (3dfaae04243cd params: fix charp corruption on allocation failure) +$ 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 (fcc1d6eab4ce4 Input: st-keyscan - improve probe error handling) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'ort' strategy. + drivers/input/keyboard/snvs_pwrkey.c | 9 ++++----- + drivers/input/keyboard/st-keyscan.c | 13 +++++-------- + 2 files changed, 9 insertions(+), 13 deletions(-) +Merging block/for-next (44e96e364b041 Merge branch 'io_uring-7.3' 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 +Merge made by the 'ort' strategy. + io_uring/query.c | 3 +++ + io_uring/waitid.c | 33 ++++++++++++++++++++++++++------- + 2 files changed, 29 insertions(+), 7 deletions(-) +$ git am -3 ../patches/0001-Revert-block-remove-bio_last_bvec_all.patch +Applying: Revert "block: remove bio_last_bvec_all" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/block/biovecs.rst +M include/linux/bio.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master e231dd04581c6] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Fri Aug 28 14:12:02 2026 +0100 +Merging device-mapper/for-next (39c5aa3bd8ec3 dm-era: fix shadowed superblock leak on take-snap failure) +$ 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 (73b6bf3c314ad ata: use named initializers for acpi_device_id) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Already up to date. +Merging pcmcia/pcmcia-next (b3c26ea81ccc5 pcmcia: remove obsolete host controller drivers) +$ git merge -m Merge branch 'pcmcia-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (35e689fb79dcb ARM: PXA: Fix build error for PXA93x) +$ 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 (9d0e4b1ae5b04 mfd: cs42l43: Fix regmap defaults ordering) +$ git merge -m Merge branch 'for-mfd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (cf1a12e080451 backlight: Use sysfs_emit() instead of sprintf()) +$ 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 (2da28b059e0dd power: supply: bq27xxx: bq27z561: fix invalid AverageEnergy address) +$ 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 (bd2a0c2d8c49f Merge remote-tracking branch 'regulator/for-7.2' into regulator-linus) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Already up to date. +Merging security/next (0cee720cfd514 selftests/lsm: Fix memory leak in attr_lsm_count) +$ 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 (3daad923a8685 apparmor: policy_int make sure list heads are initialized before fail path) +$ 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 (f1e10b1087405 ima: measure userspace policy writes before parsing) +$ git merge -m Merge branch 'next-integrity' of https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging selinux/next (3b93fe26412a4 Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. +Merging smack/next (fedc88e38ce97 smack: fix cred UAF in smack_file_send_sigiotask()) +$ git merge -m Merge branch 'next' of https://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (2d2338c93da79 Merge tag 'i2c-fixes-7.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux) +$ 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 (55ba91d4c54ab tpm-buf: Add TPM buffer support header for standalone reuse) +$ 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 +Auto-merging drivers/char/tpm/st33zp24/st33zp24.c +Auto-merging drivers/char/tpm/tpm_i2c_nuvoton.c +Merge made by the 'ort' strategy. + drivers/char/tpm/Kconfig | 3 +- + drivers/char/tpm/st33zp24/st33zp24.c | 8 +- + drivers/char/tpm/tpm-buf.c | 147 +++++---- + drivers/char/tpm/tpm-sysfs.c | 26 +- + drivers/char/tpm/tpm.h | 180 ----------- + drivers/char/tpm/tpm1-cmd.c | 184 +++++------ + drivers/char/tpm/tpm2-cmd.c | 327 +++++++++---------- + drivers/char/tpm/tpm2-sessions.c | 166 +++++----- + drivers/char/tpm/tpm2-space.c | 57 ++-- + drivers/char/tpm/tpm_i2c_nuvoton.c | 6 +- + drivers/char/tpm/tpm_tis_core.h | 64 +--- + drivers/char/tpm/tpm_tis_spi.h | 8 +- + drivers/char/tpm/tpm_vtpm_proxy.c | 30 +- + include/keys/trusted_tpm.h | 1 - + include/linux/tpm.h | 230 +------------ + include/linux/tpm_buf.h | 60 ++++ + include/linux/tpm_command.h | 518 +++++++++++++++++++++++++++++- + include/linux/tpm_eventlog.h | 2 +- + include/linux/tpm_ptp.h | 133 ++++++++ + security/keys/trusted-keys/trusted_tpm1.c | 45 ++- + security/keys/trusted-keys/trusted_tpm2.c | 168 +++++----- + 21 files changed, 1261 insertions(+), 1102 deletions(-) + create mode 100644 include/linux/tpm_buf.h + create mode 100644 include/linux/tpm_ptp.h +Merging tpmdd-keys/for-next-keys (5e2d672280d97 KEYS: trusted: Fix TPM teardown ordering) +$ 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 +Already up to date. +Merging watchdog/watchdog-next (3bbbeb7fddf54 watchdog: orion_wdt: Propagate errors from optional IRQ lookup) +$ 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 (3c6a2bac15247 Merge branches 'arm/smmu/updates', 'arm/smmu/bindings', 'mediatek', 'qualcomm/msm', 'rockchip', 'ti/omap', 'riscv', 'intel/vt-d', 'amd/amd-vi', 'core' and 'typos' 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 (2b10b6de62d7b Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Merge made by the 'ort' strategy. +Merging devicetree/for-next (e1c13aed4a164 dt-bindings: interconnect: qcom-bwmon: Add Maili cpu-bwmon compatible) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging dt-krzk/for-next (6bd34d56818cc Merge branches 'next/dt' and 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. +Merging mailbox/for-next (14af7a96afa39 mailbox: add Axiado AX3005 mailbox driver) +$ 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 (67140664a029c Merge remote-tracking branch 'spi/for-7.2' into spi-linus) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/master (d2f36b6e31d42 Merge branch into tip/master: 'timers/urgent') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Already up to date. +Merging kexec/kexec-next (9d50f7c5ad5b4 Merge branch 'crashkernel-cma' 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 (352ebb57013a0 Merge branch 'luo-internal-api' 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 kernel/liveupdate/kexec_handover.c +Merge made by the 'ort' strategy. + include/linux/liveupdate.h | 22 +++++++++++++ + kernel/liveupdate/luo_file.c | 69 ++++++++++++++++++++++++++++++++++++++++ + kernel/liveupdate/luo_internal.h | 17 ++++++++++ + 3 files changed, 108 insertions(+) +Merging clockevents/timers/drivers/next (1b8b356b4b06e clocksource/drivers/armada: Unwind timer clock on init 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 +Auto-merging drivers/pwm/pwm-samsung.c +Merge made by the 'ort' strategy. +Merging edac/edac-for-next (9fa765b3ed33d Merge ras/edac-misc into for-next) +$ git merge -m Merge branch 'edac-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging CREDITS +Auto-merging MAINTAINERS +Auto-merging drivers/edac/ie31200_edac.c +Merge made by the 'ort' strategy. + CREDITS | 4 + + MAINTAINERS | 16 +- + drivers/edac/al_mc_edac.c | 12 +- + drivers/edac/altera_edac.c | 135 ++++++----- + drivers/edac/altera_edac.h | 1 + + drivers/edac/amd64_edac.c | 2 + + drivers/edac/aspeed_edac.c | 4 +- + drivers/edac/debugfs.c | 65 +----- + drivers/edac/edac_device.c | 10 +- + drivers/edac/edac_device_sysfs.c | 23 +- + drivers/edac/edac_mc_sysfs.c | 2 +- + drivers/edac/edac_module.h | 3 +- + drivers/edac/highbank_mc_edac.c | 4 +- + drivers/edac/ie31200_edac.c | 18 +- + drivers/edac/igen6_edac.c | 473 ++++++++++++++++++++++----------------- + drivers/edac/thunderx_edac.c | 4 +- + drivers/edac/xgene_edac.c | 5 +- + drivers/ras/amd/atl/core.c | 1 - + drivers/ras/amd/atl/map.c | 6 +- + include/linux/edac.h | 3 - + 20 files changed, 392 insertions(+), 399 deletions(-) +Merging ftrace/for-next (3df3ae98c30c2 Merge tracefs/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 +Merge made by the 'ort' strategy. +$ 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 (9cc63f8bcd560 Merge branches 'expcb.2026.07.24a', 'misc.2026.07.30a', 'rcu-tasks.2026.07.30a', 'srcu.2026.08.11a' and 'torture.2026.08.14a' 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 (85f4ab0da7887 Merge branch 'csd-lock.2026.08.23a', tag 'scftorture.2026.08.18a' 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 kernel/smp.c +CONFLICT (content): Merge conflict in kernel/smp.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Resolved 'kernel/smp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b28456741e981] Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git +$ git diff -M --stat --summary HEAD^.. + kernel/smp.c | 77 +++++++++++++++-------- + lib/Kconfig.debug | 12 ++++ + lib/Makefile | 1 + + lib/test_csd_lock.c | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 237 insertions(+), 26 deletions(-) + create mode 100644 lib/test_csd_lock.c +Merging kvm/next (76671054f9a1f Merge tag 'kvmarm-7.3' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +$ 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 (aa8e5dc6a7a2a Merge branch 'kvm-arm64/misc-7.3' into 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 (dd6f4ef6f8a37 s390/vfio-ap: Fix NULL deref in status_show() during queue probe) +$ 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 (f5098b6bae761 Linux 7.2-rc5) +$ 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 (b5060a4aa33d7 RISC-V: KVM: fix vcpu vector context handling for kernel-mode vector) +$ 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 (76671054f9a1f Merge tag 'kvmarm-7.3' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Already up to date. +$ git am -3 ../patches/0001-KVM-selftests-Fix-up-semantic-changes.patch +Applying: KVM: selftests: Fix up semantic changes +Using index info to reconstruct a base tree... +M tools/testing/selftests/kvm/lib/kvm_util.c +Falling back to patching base and 3-way merge... +Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c +No changes -- Patch already applied. +Merging xen-tip/linux-next (d330fb86a7170 xenbus: Unregister reboot notifier on init failure) +$ 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 (cf9c8aaea0d47 workqueue: Fix unbound pool lifetime for pending pwqs) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + kernel/workqueue.c | 27 ++++++++++++++++++--------- + 1 file changed, 18 insertions(+), 9 deletions(-) +Merging sched-ext/for-next (6586705bc2dc0 docs/sched_ext: document that cgroup CPU knobs are scheduler-dependent) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 16 +- + Documentation/scheduler/sched-ext.rst | 17 +- + kernel/sched/ext/ext.c | 35 +++- + kernel/sched/ext/internal.h | 23 ++- + tools/sched_ext/include/scx/common.bpf.h | 140 ++++++++++++--- + tools/sched_ext/include/scx/compat.bpf.h | 68 ++++++-- + tools/sched_ext/include/scx/compat.h | 97 +++++++++++ + tools/sched_ext/include/scx/enum_defs.autogen.h | 5 +- + tools/sched_ext/include/scx/enums_abi.autogen.h | 223 ++++++++++++++++++++++++ + 9 files changed, 577 insertions(+), 47 deletions(-) + create mode 100644 tools/sched_ext/include/scx/enums_abi.autogen.h +Merging drivers-x86/for-next (5b05bb3f6c571 Merge tag 'platform-drivers-x86-v7.3-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 (81c1c0cb68a13 platform/chrome: of_hw_prober: Add delay for hana trackpads) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging chrome-platform-firmware/for-firmware-next (a58a57a1076f8 firmware: coreboot: Validate table bounds) +$ git merge -m Merge branch 'for-firmware-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (e81250ec6b692 hsi: omap_ssi_core: fix missing DMA mask setup for SSI controller device) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds-lj/for-leds-next (f8cca63a0a4f3 leds: is31fl319x: Modernize registration) +$ git merge -m Merge branch 'for-leds-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Already up to date. +Merging ipmi/for-next (05ec76cfbce65 ipmi: Fix use-after-free of cmd_rcvr in _ipmi_destroy_user()) +$ 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 | 9 ++++ + drivers/char/ipmi/ipmb_dev_int.c | 9 ++-- + drivers/char/ipmi/ipmi_msghandler.c | 5 +++ + drivers/char/ipmi/ipmi_si_intf.c | 79 ++++++++++++++++++++++++++++-------- + drivers/char/ipmi/ipmi_si_platform.c | 4 +- + drivers/char/ipmi/ipmi_ssif.c | 4 +- + 6 files changed, 86 insertions(+), 24 deletions(-) +Merging driver-core/driver-core-next (45c13f3f9e3bb Merge tag 'hwlock-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ 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 (45c13f3f9e3bb Merge tag 'hwlock-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ 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 (86feaba911f2f thunderbolt: Clamp DMA tunnel credits to what a hop register can hold) +$ 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 (15734de99517b USB: serial: pl2303: add support for PL256X multi-port devices) +$ 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 (45c13f3f9e3bb Merge tag 'hwlock-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ 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 (45c13f3f9e3bb Merge tag 'hwlock-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ 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. +$ git am -3 ../patches/rust-vs-char-misc-fixup +Applying: pin-init changes for v7.3-rc1 +Using index info to reconstruct a base tree... +M rust/kernel/serdev.rs +Falling back to patching base and 3-way merge... +Auto-merging rust/kernel/serdev.rs +No changes -- Patch already applied. +$ git am -3 ../merge-fixes/rust_binder-use-LocalModule-for-THIS_MODULE +Applying: rust_binder: use `LocalModule` for `THIS_MODULE` +Using index info to reconstruct a base tree... +M drivers/android/binder/netlink.rs +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging coresight/next (9e3604d7369cf coresight: etm4x: remove redundant fields in etmv4_save_state) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (4216e549a2657 fpga: dfl: fix spelling in sysfs-platform-dfl-port ABI documentation) +$ 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 (9621c81fd2eb7 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 (350d1fb9204b1 iio: dac: mcp47a1: add support for new device) +$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging nfc/for-next (9f69d05b5a85c nfc: st95hf: switch to using sleeping variants of gpiod API) +$ 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 (ba8376e8c76c6 MAINTAINERS: Add Manivannan Sadhasivam as the Reviewer for Generic PHY Framework) +$ 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 (5b08a3afd2995 soundwire: dmi-quirks: Disable ghost Realtek on Asus ROG Zephyrus Duo) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (8d3ae59288f1e Linux 7.2) +$ git merge -m Merge branch 'extcon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (a13c140cc289c Linux 7.2-rc3) +$ 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 (4e3c1fc8abcb8 vfio/pci: Remove the pcie check for VFIO_PCI_ERR_IRQ_INDEX) +$ git merge -m Merge branch 'next' of https://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (4d3721b204f96 w1: ds2482: Fix signedness bug in ds2482_w1_triplet()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging spmi/spmi-next (8cdeaa50eae8d Linux 7.2-rc2) +$ 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 (45c13f3f9e3bb Merge tag 'hwlock-v7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ 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 (353b2e09f44a9 counter: ti-eqep: Remove redundant dev_err_probe()) +$ git merge -m Merge branch 'counter-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (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 (0d995da5fb97e dmaengine: dw-edma: Mark emulated IRQ as level-triggered) +$ 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 (b57d03eb82b79 Merge branch 'for-7.3-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging kernel/cgroup/cpuset.c +Auto-merging tools/testing/selftests/cgroup/test_zswap.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 2 +- + kernel/cgroup/cpuset.c | 39 ++++++++++---- + tools/testing/selftests/cgroup/test_core.c | 2 +- + tools/testing/selftests/cgroup/test_cpu.c | 2 +- + tools/testing/selftests/cgroup/test_cpuset.c | 2 +- + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 64 ++++++++++++++++++++--- + tools/testing/selftests/cgroup/test_freezer.c | 2 +- + tools/testing/selftests/cgroup/test_kill.c | 2 +- + tools/testing/selftests/cgroup/test_kmem.c | 4 +- + tools/testing/selftests/cgroup/test_memcontrol.c | 2 +- + tools/testing/selftests/cgroup/test_pids.c | 2 +- + tools/testing/selftests/cgroup/test_zswap.c | 2 +- + 12 files changed, 98 insertions(+), 27 deletions(-) +Merging scsi/for-next (cf1af0ccca54d 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 (12e67eb89eb2b scsi: snic: Fix SCSI host leak on workqueue allocation failure) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging drivers/scsi/hosts.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging include/scsi/scsi_host.h +Merge made by the 'ort' strategy. + .mailmap | 3 + + Documentation/scsi/leapraid.rst | 14 +- + MAINTAINERS | 6 +- + drivers/scsi/Makefile | 23 ++ + drivers/scsi/device_handler/Makefile | 3 + + drivers/scsi/hosts.c | 19 +- + drivers/scsi/ibmvscsi/ibmvfc-core.c | 2 +- + drivers/scsi/leapraid/leapraid_app.c | 14 +- + drivers/scsi/leapraid/leapraid_func.c | 2 +- + drivers/scsi/leapraid/leapraid_func.h | 4 +- + drivers/scsi/leapraid/leapraid_os.c | 89 +++-- + drivers/scsi/libsas/sas_expander.c | 98 ++++-- + drivers/scsi/libsas/sas_internal.h | 1 + + drivers/scsi/lpfc/lpfc_attr.c | 533 ++++++++++++------------------ + drivers/scsi/lpfc/lpfc_bsg.c | 6 +- + drivers/scsi/lpfc/lpfc_ct.c | 29 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 198 +++++------ + drivers/scsi/lpfc/lpfc_scsi.c | 49 +-- + drivers/scsi/lpfc/lpfc_scsi.h | 3 - + drivers/scsi/lpfc/lpfc_sli.c | 43 +-- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 4 +- + drivers/scsi/qla2xxx/qla_nx2.c | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 6 +- + drivers/scsi/scsi_lib.c | 3 +- + drivers/scsi/scsi_scan.c | 52 +-- + drivers/scsi/scsi_sysfs.c | 7 +- + drivers/scsi/snic/snic_main.c | 1 + + drivers/ufs/core/Makefile | 2 + + drivers/ufs/core/ufs-debugfs.c | 8 +- + drivers/ufs/core/ufshcd.c | 15 + + drivers/ufs/host/Makefile | 2 + + include/scsi/scsi_host.h | 24 +- + 36 files changed, 642 insertions(+), 631 deletions(-) +$ git am -3 ../patches/device-id-zorro +Applying: foofof +Using index info to reconstruct a base tree... +M include/linux/device-id/zorro.h +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging vhost/linux-next (ae864da7d762b vduse: Add suspend) +$ 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 +Auto-merging drivers/vhost/net.c +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/virtio/virtio_balloon.c +Auto-merging lib/iov_iter.c +Auto-merging net/vmw_vsock/virtio_transport_common.c +Merge made by the 'ort' strategy. + drivers/vhost/vhost.c | 11 ++++++ + drivers/vhost/vsock.c | 80 +++++++++++++++++++++++++++++++---------- + drivers/virtio/virtio_balloon.c | 51 ++++++++++++++++---------- + 3 files changed, 105 insertions(+), 37 deletions(-) +Merging rpmsg/for-next (d4d61a4b0a52e Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. +Merging gpio-brgl/gpio/for-next (3d12d02dda091 gpio: omap: Use device name as chip label) +$ 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/gpio/fsl,qoriq-gpio.yaml | 7 ++ + drivers/gpio/gpio-adp5585.c | 20 +--- + drivers/gpio/gpio-eic-sprd.c | 17 +--- + drivers/gpio/gpio-mmio.c | 5 + + drivers/gpio/gpio-omap.c | 11 +-- + drivers/gpio/gpio-pcf857x.c | 16 +++- + drivers/gpio/gpio-rtd1625.c | 26 ++--- + drivers/gpio/gpio-sloppy-logic-analyzer.c | 4 +- + drivers/gpio/gpiolib-kunit.c | 14 +-- + include/linux/notifier.h | 7 ++ + kernel/notifier.c | 105 +++++++++++++++++++++ + 11 files changed, 163 insertions(+), 69 deletions(-) +Merging gpio-intel/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (d067f0f4c96cb Merge tag 'pinctrl-qcom-updates-for-v7.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (ed1608d5e3c44 Merge patch series "upboard pinctrl support for device id INTC1055") +$ 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 (5a653cedec948 pinctrl: renesas: rza2: Embed pins in the priv struct) +$ git merge -m Merge branch 'renesas-pinctrl' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (d441836c9d704 pinctrl: samsung: Add Exynos8855 pinctrl configuration) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pinctrl-qcom/pinctrl-qcom/for-next (1860fb0be224d pinctrl: qcom: Add irq_get/set_irqchip_state() for msm gpio irqchip) +$ 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 +Already up to date. +Merging pwm/pwm/for-next (b4e94b0418ad6 pwm: th1520: use vertical import style) +$ git merge -m Merge branch 'pwm/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Already up to date. +Merging ktest/for-next (932cdaf3e273a ktest: Add logfile to failure directory) +$ 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 (649ba27dfac78 selftests/zram: fix kernel_gte() for POSIX sh) +$ 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 (dc59e4fea9d83 Linux 7.2-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 (dea754ded9518 kunit: tool: fix _list_tests filtering wrong variable when list has TAP prefix) +$ 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 (26260251022fb Merge tag 'livepatching-for-7.3' 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 (afce9701d6423 MAINTAINERS: update rtc subsystem patchwork location) +$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging MAINTAINERS +Auto-merging drivers/rtc/rtc-ds1307.c +Auto-merging drivers/rtc/rtc-rzn1.c +CONFLICT (content): Merge conflict in drivers/rtc/rtc-rzn1.c +Resolved 'drivers/rtc/rtc-rzn1.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 717e41b5b1136] Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/rtc/microchip,pic32-rtc.txt | 21 --- + .../bindings/rtc/microchip,pic32mzda-rtc.yaml | 50 ++++++ + .../devicetree/bindings/rtc/renesas,rzn1-rtc.yaml | 35 +++- + Documentation/devicetree/bindings/rtc/rtc-cmos.txt | 27 --- + .../devicetree/bindings/rtc/rtc-cmos.yaml | 63 +++++++ + Documentation/devicetree/bindings/rtc/rtc-omap.txt | 53 ------ + .../devicetree/bindings/rtc/rtc-palmas.txt | 32 ---- + .../devicetree/bindings/rtc/ti,omap-rtc.yaml | 140 +++++++++++++++ + .../devicetree/bindings/rtc/ti,palmas-rtc.yaml | 57 ++++++ + MAINTAINERS | 2 +- + drivers/rtc/Kconfig | 8 +- + drivers/rtc/rtc-ab-eoz9.c | 1 + + drivers/rtc/rtc-brcmstb-waketimer.c | 1 + + drivers/rtc/rtc-ds1307.c | 2 +- + drivers/rtc/rtc-ds1343.c | 4 +- + drivers/rtc/rtc-gamecube.c | 4 +- + drivers/rtc/rtc-hym8563.c | 2 +- + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-mv.c | 41 +---- + drivers/rtc/rtc-nct3018y.c | 2 +- + drivers/rtc/rtc-pcf2127.c | 7 +- + drivers/rtc/rtc-pcf85063.c | 2 +- + drivers/rtc/rtc-pcf85363.c | 17 +- + drivers/rtc/rtc-pcf8563.c | 6 +- + drivers/rtc/rtc-rv3028.c | 2 +- + drivers/rtc/rtc-rv3032.c | 2 +- + drivers/rtc/rtc-rzn1.c | 197 ++++++++++++--------- + drivers/rtc/rtc-s32g.c | 1 + + drivers/rtc/rtc-spacemit-p1.c | 5 +- + drivers/rtc/rtc-st-lpc.c | 9 +- + drivers/rtc/rtc-zynqmp.c | 7 +- + 31 files changed, 507 insertions(+), 295 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/rtc/microchip,pic32-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/microchip,pic32mzda-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-cmos.txt + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-cmos.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-omap.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-palmas.txt + create mode 100644 Documentation/devicetree/bindings/rtc/ti,omap-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/ti,palmas-rtc.yaml +Merging nvdimm/libnvdimm-for-next (e99cb3ecd8334 nvdimm-btt: clean up kernel-doc warnings) +$ 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 (41fa043273841 selftests/seccomp: Add hard-coded __NR_uprobe for x86_64) +$ 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 (c922423ce66bc slimbus: qcom-ngd-ctrl: Use the unified QMI service ID instead of defining it locally) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Auto-merging drivers/slimbus/qcom-ngd-ctrl.c +Merge made by the 'ort' strategy. + drivers/slimbus/qcom-ngd-ctrl.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging nvmem/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Already up to date. +Merging hyperv/hyperv-next (be0cfab740e58 clocksource: hyper-v: Remove support for stimer interrupts in message mode) +$ git merge -m Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/for-next (e3e3bf40916c1 auxdisplay: charlcd: cancel backlight work on registration failure) +$ 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 (fdbdd0ccb30af kdb: remove redundant check for scancode 0xe0) +$ git merge -m Merge branch 'kgdb/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'hmm' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'cfi/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (9656bcd4c321a PCI: epf-mhi: Implement mhi_cntrl->flush_async() to flush DMA read/write) +$ 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 (7098e9cd98a05 Merge branch 'for-7.3/cxl-misc' into cxl-for-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (65d1f5507ed2c zstd: Import upstream v1.5.7) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (b2326338dc683 efivarfs: Rate limit statfs() handler) +$ 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 (bb9ff576fdff4 virt: vmgenid: remap memory as decrypted) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Merge made by the 'ort' strategy. + drivers/virt/vmgenid.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging landlock/next (172b6a6d84635 landlock: Document tracepoints) +$ 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 (8d75c338f0bce sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL) +$ git merge -m Merge branch 'sysctl-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Already up to date. +$ git am -3 ../patches/0001-jifies-Fix-up-merge.patch +Applying: jifies: Fix up merge +Using index info to reconstruct a base tree... +M kernel/time/jiffies.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging execve/for-next/execve (ab11176bd3a76 x86/elf: Correct comment for STACK_RND_MASK()) +$ 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 (f4806cc63cc65 lib: test bitmap vs IDA vs Maple Tree performance for region allocations) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Already up to date. +Merging hte/for-next (005b25ad11717 hte: tegra194: Add Tegra264 GTE support) +$ 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 (3421b9b056a65 selftests/seccomp: Fix pointer type mismatch build error) +$ 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 +Already up to date. +Merging nolibc/for-next (b58afc8d1cf85 tools/nolibc: add support for Alpha) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Already up to date. +Merging iommufd/for-next (8c07df7cdfcf5 iommufd: Fix UAF in selftest IOPF reporting) +$ 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 (1c996a37fd244 tools/power turbostat: pmt: Improve sscanf() hygiene) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Merge made by the 'ort' strategy. + tools/power/x86/turbostat/turbostat.8 | 6 +- + tools/power/x86/turbostat/turbostat.c | 567 ++++++++++++++++------------------ + 2 files changed, 266 insertions(+), 307 deletions(-) +Merging pwrseq/pwrseq/for-next (d51fc9d4cd6eb power: sequencing: rename pwrseq_power_on/off() to pwrseq_enable/disable()) +$ 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 +Already up to date. +Merging capabilities-next/caps-next (9b0ee13b80798 capability: remove non-kernel-doc comments) +$ git merge -m Merge branch 'caps-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Already up to date. +$ 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 (028ef9c96e961 Linux 7.0) +$ 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 (a8488ecbd7ba4 kcsan: avoid unintended access checking in NMIs) +$ 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 (dc59e4fea9d83 Linux 7.2-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 (e052daab94ee8 rust: introduce abstractions for fwctl) +$ 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. +$ git am -3 ../patches/rust-fwctl-replace-__pinned_init-with-raw_try_init +Applying: rust: fwctl: replace `__pinned_init` with `raw_try_init` +Using index info to reconstruct a base tree... +M rust/kernel/fwctl.rs +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +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 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 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/msm/msm_fb.c +Auto-merging drivers/gpu/drm/panthor/panthor_gem.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/mfd/88pm886.c +Auto-merging drivers/mfd/cs42l43.c +Auto-merging drivers/pinctrl/pinctrl-sx150x.c +Auto-merging drivers/regulator/tps65185.c +Auto-merging fs/nfs/nfstrace.h +Auto-merging fs/nfs/pnfs.c +Auto-merging fs/nfsd/nfs4proc.c +Auto-merging include/linux/ceph/libceph.h +Auto-merging include/linux/i3c/master.h +Auto-merging include/linux/nfs_fs.h +Auto-merging include/linux/swap.h +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/sunrpc/xprtsock.c +Recorded preimage for 'net/ceph/osd_client.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'net/ceph/osd_client.c'. +[master 02c63e9d76a49] 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 |