diff options
| -rw-r--r-- | Next/SHA1s | 431 | ||||
| -rw-r--r-- | Next/Trees | 431 | ||||
| -rw-r--r-- | Next/merge.log | 15678 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 16541 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..4770a91034a1 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,431 @@ +Name SHA1 +---- ---- +origin a4ff2be345d0abc943da8dd8da98151843b750dc +ext4-fixes 981fcc5674e67158d24d23e841523eccba19d0e7 +vfs-brauner-fixes b64a9f67e082e04835ddd69d422a25168d69375b +fscrypt-current cf6c993c0feca7984797e634deba3c80342e199a +fsverity-current d2f96bcb89d36d488a10e3bcf819b98536968286 +btrfs-fixes af5534fe2fbc006e83d75d6283dfc5ec75d5d780 +vfs-fixes 49c5d168a3a8f4eb27d44a2a22b7e8a856ca601f +erofs-fixes 075b74841bd0065a3bda3440873c747938e69b68 +nfsd-fixes 5c4851e4cdfc3204128f88991be64a6e3929d3d0 +v9fs-fixes 028ef9c96e96197026887c0f092424679298aae8 +overlayfs-fixes 4549871118cf616eecdd2d939f78e3b9e1dddc48 +fscrypt 7dd38d9dd7a05329825fe2324d4d8e27ad4b3cec +btrfs f037522c036c041858e59318df577c87e8200ac0 +ceph 91880e4a7fac45bc407771bc57bbaf4f37e9b4c3 +cifs 9ca668da8e4c94ea80f5abb414b6a7f87c76202a +configfs 6363844fdbbb76afe1d44d678fe0746390204a5f +ecryptfs f81cb44f9a4b88d73ee5dec4a1ccdb0232fd2e3f +dlm e61113cfcaf71cbdf4c17e3d086d8fb7f92c62bf +erofs 988c3c186c730590a71df8adc1424c5578ef8bae +exfat 490529f668016c401d3da688104d15d3fc2c4fca +ext3 3d7e6f0b557dab405cc431029a450ff0047da292 +ext4 9091c97be34083587a75db174aab51551d8e8543 +f2fs 0a1703eba23707e3b2edfa2a2329352e7abc0ffa +fsverity dc59e4fea9d83f03bad6bddf3fa2e52491777482 +fuse d1dbc59200b54944f00251ca4dfbb2b318beca13 +gfs2 4bb187d6f379c5490e3034b153fe476127308519 +jfs dad98c5b2a05ef744af4c884c97066a3c8cdad61 +ksmbd 4a5b945de8f67b24144078b1be6dfe79074153fe +nfs 265e3f27bb8796a958fcb2a533f62012e7721d4a +nfs-anna e053b624f5d36669756990743346157be9f68c34 +nfsd 46db3c8a1be96a354758b44b1d4fbb4b70d09a20 +ntfs 9969d58a9b0417393d033b24c670d57b686cabbf +ntfs3 c22f91d82cb9a29d22bdffdce6c803467984ad0c +orangefs d410cd5303ec59c7cf23dd61423752ce8e9ecb59 +overlayfs 1f6ee9be92f8df85a8c9a5a78c20fd39c0c21a95 +ubifs a5e0055eac837a1168c781653943d4a0d9920af3 +v9fs aa88278693cbfaf7a2acf961379973fbb63b165c +v9fs-ericvh 028ef9c96e96197026887c0f092424679298aae8 +xfs 0877338ade31b825884a744e03f27c8de300f101 +zonefs 3a8389d42bdf4213730f4067f8bfa78bae6564ef +vfs-brauner c4463c3bf63d0d5a8e4b55f78ca220ddf27a6859 +vfs 4dda01b67c8662c5d0c53034974cb8280c575a5d +mm-hotfixes 90c4f67f851fd12eeb8eb1111108de90bb44cb3e +fs-current f4acfec974657cd5b764a3d50a955b381ac1eba6 +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 564973a259ec76f2dad0853420e7034cc43994c4 +bpf a13307e97d5c54b65720bb71fa379960ded1e51a +ipsec 4e9442ce551ebd84b52ad649df721e2dc28af95a +netfilter 7b53449540502cb21b32bca62a6258e22cd97bbe +ipvs 2c7c88a412aa6d09cd04b414211b4ef8553b5309 +wireless 2812e64e1575e05500a35c405aaa6e99b7d7930b +ath 2812e64e1575e05500a35c405aaa6e99b7d7930b +iwlwifi d13d5d299c11b7bd3362d5692c56225d9e176664 +wpan 8ce4f287524c74a118b0af1eebd4b24a8efca57a +rdma-fixes 31b7c700670830a0e8a4cdcd451c88a13cc5dc48 +sound-current 2b366b833f52a37f70be845892c1f5fe1d993051 +sound-asoc-fixes 079e27f52b929b554b90514b081ea40b3d632a25 +regmap-fixes 00268f9452d2a0d660aa9c1bb0ca07a994af6a4f +regulator-fixes bd2a0c2d8c49ffb7acfcb0c1177af355ea417caf +spi-fixes 11058bd3d47d57eb3473935feae53868d6d168b7 +pci-current 7678e81498e20e78d7d5f64e552cd153117c1d66 +driver-core.current db2ddb87143519e20a95aa36c60b36107b736a58 +tty.current 440915499231e9db1c361aa45bb702e8fd3b4a32 +usb.current db2ddb87143519e20a95aa36c60b36107b736a58 +usb-serial-fixes d37186bd95a07e334447f47274a38a311dad2172 +phy 075b74841bd0065a3bda3440873c747938e69b68 +staging.current 6829665d050983907b560173e49dcc6c11cb2730 +iio-fixes 16989c88e98fb6b795d514ba81ecb5493babfe09 +watchdog-fixes db2ddb87143519e20a95aa36c60b36107b736a58 +counter-current f1a3a9946aab611dd2200c01ff122f64b033dad2 +char-misc.current db2ddb87143519e20a95aa36c60b36107b736a58 +soundwire-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +thunderbolt-fixes 8d3ae59288f1e7d58d76558a6ee96d533bc5019f +input-current b4d85f863e5a6f1fa01b186001af0f68f4f5239e +crypto-current 7537036a2e6fe96f8ed82034f755c54714a0e417 +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 f7c9176d2326eacae3a87fa3f5214a78c818cc07 +nvdimm-fixes a8aec14230322ed8f1e8042b6d656c1631d41163 +cxl-fixes d90f236f8b9e354848bd226f581db27755ab901d +dma-mapping-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drivers-x86-fixes 78bf392ba77dd8b2a25656e489449d2f91cfd1eb +samsung-krzk-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-samsung-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-qcom-fixes 1e7b04c12c077e8829991833a9aa2cb3bdacab61 +devicetree-fixes bba13ad17b1a11b3f1ed9b3a5d556191d7755a59 +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 8d9d4fd2a15ff961a5f4ddd8ac672ec4628542be +riscv-dt-fixes 42c57c049054dfaa0be83f6721f7c4ce4a880e56 +riscv-soc-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx dc59e4fea9d83f03bad6bddf3fa2e52491777482 +gpio-brgl-fixes 44f3468a0aef1aabdad551898ab7cfa2a9d20e99 +gpio-intel-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-intel-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +auxdisplay-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +kunit-fixes 5142c56651578abc346d6c17f3fb919b9ffbb317 +memblock-fixes 97090500d776c3f6d08e857e3a0a7cf092999094 +renesas-fixes 6fa6ee724d8dadf392139e242ac936b5da730c4b +perf-current fac520e43a60230b24026f462a2b63e4d170566e +efi-fixes d8809f6931065cbbf3554647a50a65a471ab5983 +battery-fixes 160a783aa65b74782bc17cb874af1a6d3f5fba3c +iommufd-fixes 075b74841bd0065a3bda3440873c747938e69b68 +rust-fixes d24f5cdbeff8b6a063fca92d0a1f94122a799b59 +w1-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pmdomain-fixes 090a95dbe13df9965279b588d97eda134831769c +i2c-andi-fixes abea5c349368a683e40fdc2e745099aaaacc89d7 +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 c3730b8373bb5059d735509b9e6a00d7eb337d7c +tracefs-fixes 07004a8c4b572171934390148ee48c4175c77eed +spacemit-fixes eb525edd48907795c0d4e498ff57ad168070b289 +tip-fixes 57e0daeacc1da5a31da885b868e82d930efb2193 +slab-fixes 5ff172f6c94d282d83cb88bdfec5f647ad9c6105 +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 dc14753664240cedf669623b27ae9922b0618b25 +rust bd5f485f3f026225b86573e559af0b7254ef4184 +rust-interop 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b +rust-alloc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init 1e26aea0355ad2afa1ccbc62885c01f5bcfc58ca +rust-timekeeping ddb1444d3335129ae87d9796ab1debf41c0ee51b +rust-xarray c455f19bbe6104debd980bb15515faf716bd81b8 +rust-analyzer 5f45afb8ab04d934fc0601a202f95267ebc20059 +mm-stable 08745c62350126bc31b09548137be87e2866f628 +mm-nonmm-stable eef628bce8e18ce1eb8531c396bf55e36f86c62c +mm-unstable 4b2ae13f3393ef4b4bce0021e8762790354f369f +mm-nonmm-unstable 775c0f72566e86f6184ec5264574316b23ccd23a +kbuild d900723d78adec229996aefbab0dcaa66a177b77 +clang-format 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +perf 9453bc6a69ef43755f1c28d5688cacdd69fa16bd +compiler-attributes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +dma-mapping 42311aa29e20fdc0157746143c108b08b268f5cb +asm-generic adbbd9714f8058730f93c8df5c5bf1679456424b +alpha d58041d2c63e09a1c9083e0e9f4151e487c4e16a +arm 1345e9968d318758816dd0910f9d4c73d4d80d49 +arm64 26b77009ee74f6122a067a4f9926ff6e09fffb94 +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 69ea2faeb783165377c42dc30598966cea540a3d +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 8b585431a16cfb9d8f2955a9fa0787ce3dceb3c2 +powerpc 1304643a1c20badbb91b86a5084dd76cb7620c05 +risc-v 8da45c93dfa98f25b148512d92ecfa75d027a5cc +riscv-dt 82ab962ef6c2a3571e3d590b30c023118c92b776 +riscv-soc 8cdeaa50eae8dad34885515f62559ee83e7e8dda +s390 53158917ea1a0219f6886a0ae10f6f276ecfa2a6 +sh b0aa5e4b087b686575f1b31ce54048b4d059b7b8 +sparc 5b2a3b1a98fb47c593144c2770e012d463952b70 +uml 1590cf0329716306e948a8fc29f1d3ee87d3989f +xtensa a7c958e8721eb2724ee2e2ef13129bc67e1c8a75 +fs-next e928ee2ede92f33b28270bf9ac3d6f1bf58db91b +printk 703a9d76a45dd97b19b2432fc1ba4beb4d67a94f +pci 115c7e572e50570ab25fc5c0e83bbf93b22ea880 +pstore 24b8f8dcb9a139a36cf48bfbe935e8dc1f33ed79 +hid a8fcb3dbf9024da44f1614c42ea16001f4b860b0 +i2c 8cd9520d35a6c38db6567e97dd93b1f11f185dc6 +i2c-andi b0e590bb83a9e40dc1e77a2c82d7f3e670fb74b3 +i2c-rust 61ddec70c9bcc3d4b0471c8683e57d3b03cecf0a +i3c cab40cfc9e116acd4d60f95b4b1264cab78f3803 +dmi 1afafbaf749d8e8ec53f8e38efdc731131902b5b +hwmon-staging 75f2c0b3690702c90863c2e138cb5520670845ea +jc_docs 791e420360669d55b7f90ca0c6d61b10e4992aec +v4l-dvb 4900cad020c0580dfb1be27776ff10a4ef110cfa +v4l-dvb-next adc218676eef25575469234709c2d87185ca223a +pm a091e6870b6c770cb65e1de490e52be6ede7cc9c +cpufreq-arm 8c3afcf27fa4582c1ab912503dc8a4ebb8dc0f82 +cpupower adfe0057326ffbc2cd5ff69a57ec0e50b5e74095 +devfreq c096be11c2a9d4acca8e75f1f8edeb744aceb521 +pmdomain 3ca7b513aec1db32b75b909395be1111c1198afb +opp 84f05af0975c9f9c8ffee0361d6f7cbb1f289231 +thermal b115930d716defc3a7daa2bc2ae2465d864b7114 +rdma 60a42d510113f46de47e86a84bf5758597644487 +net-next 61eb236c41c2a4717015dff18016a75a5eb90052 +bpf-next f79066c784022fda83f5936559a1af414e41b603 +ipsec-next 298bb2b8903323f6ef2eab4819a2e477765f0ff1 +mlx5-next 36b1d3299d0b6aa51485cc9a79b8d94948d5f3d4 +netfilter-next a50eba1e778ad4da5b6f9ddbbf57dabbea59bc05 +ipvs-next f6f3b36c15ed44de1fbb44e645e4fae8c4a4453e +bluetooth 486f8908aa587ab2a213bbef39311743e4f8f57a +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 c44e278ce02efd0c4be79a8eda1ea6885c1ce5ec +drm-exynos 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc 271e90eb5f9ff34951647e5ed33c1775eebcca50 +amdgpu e4c3ab59021e7c146a84b6671f0d530972bd58b4 +drm-intel 65b92bc671db7c222f8de1146c88e40fe8764d95 +drm-msm 140b13475302601368c0cf4e193e66126a49feb3 +drm-msm-lumag 140b13475302601368c0cf4e193e66126a49feb3 +drm-xe a1c1dbd0f047bb05de6aaf6abe9103031179bf19 +drm-rust 4c9ba407018e8deb06dbc643112bac8f40404f95 +drm-nova 93296e9d9528f0d87f2cf3fee494599060a0f14a +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev 8c3c7f132f1464211ebf01d57533462637b82e73 +regmap efc5e244e825887ed100d5b5bfbf80f210683e1b +sound 2b366b833f52a37f70be845892c1f5fe1d993051 +ieee1394 05bfb1327dc5fb61528bab31cd8f0c1e4bddec23 +sound-asoc 2792cc1b80b7674cc0751b34a964aad76630c1fa +modules 3dfaae04243cde460d82dfc2a7dd0bb6664d20ae +input 9a29ee801f525bcad71fea021bfe2a030885c8df +block a33221f7ab120e9a6caa62c3ff8a1b09674370e8 +device-mapper 39c5aa3bd8ec3912d2cd0b3fe092642b0d2b0713 +libata 73b6bf3c314ad34a9fd389f84de6e8dbfc204880 +pcmcia b3c26ea81ccc522e77ed0b1707add61fc9206216 +mmc 35e689fb79dcbaa8d69cc4a58a7ad4d0d7346e4a +mfd 9d0e4b1ae5b045a2c92b0b9a1c3b268191c219d9 +backlight cf1a12e0804515e0ed8b3f50c1c32f7f425bd660 +battery 2da28b059e0ddcd2e1956eeae383246207965573 +regulator bd2a0c2d8c49ffb7acfcb0c1177af355ea417caf +security 0cee720cfd51402cfcb14d96cb326a36c13b823a +apparmor 4ec11f14d1d6fdda787d991b142537be7841d395 +integrity f1e10b10874051e4d99911dae0dd7b75a9f8ae66 +selinux 3b93fe26412a422d92ef5c4ff3339112e61c24f8 +smack fedc88e38ce979a720cd2de042578cb5df3dc8de +tomoyo 2d2338c93da79b3bfe4b6099a931d9468d539952 +tpmdd-tpm 9ab874896167123cb4b035bf457a96dc752ff15e +tpmdd-keys d239c5a8828cbf615a968e449efed9634d6b1f0a +watchdog 3bbbeb7fddf54a7d7116b2defe0a63a9b583c84e +iommu 3c6a2bac15247bc4f28125247ff89165324612fe +audit 2b10b6de62d7b99d46300afeb1097642a9ab0711 +devicetree e1c13aed4a1641550e8c9518c96f016e1d52d09b +dt-krzk 6bd34d56818cc881a75c789ad6ce8ec4a1e32f3a +mailbox 36cac4b5101f8ecbc851356df175b99543c84ec6 +spi 14a6d09db0c7177df12c22a42af75e2d45821ed3 +tip 57e0daeacc1da5a31da885b868e82d930efb2193 +kexec 9d50f7c5ad5b4b031c9b85f9a43c626d8268ab51 +liveupdate 352ebb57013a08679788bc18c7f9af90903db256 +clockevents 1b8b356b4b06e3a28feb852c04e06caeac07bc87 +edac 9fa765b3ed33d6dd64aca0ba8f6ed7697de50410 +ftrace 3df3ae98c30c249c4bbf3d74559cc6972898052c +rcu 9cc63f8bcd560c760d0b12e15bba8f81c86237cf +paulmck e39a12053df0951120ff6283177e0d5179feda45 +kvm a204badd8432f93b7e862e7dac6db0fe3d65f370 +kvm-arm aa8e5dc6a7a2a1141ab40706a51010adcd0e57d2 +kvms390 dd6f4ef6f8a37412909ad787c837332fb070159c +kvm-ppc f5098b6bae761e346ebcd9da7f95622c04733cff +kvm-riscv b5060a4aa33d7d78a8c1837ab08ef0c81ea96650 +kvm-x86 1b731e5ded480bd1e5546aed35584238661ce72e +xen-tip d330fb86a7170f845123ae82d95df440fad9b707 +percpu 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +workqueues 7e2f2a377ac9f50296ad60bd331f0d4def7aee51 +sched-ext 4fb8d6379d2c7ceecb2b3e111954d29089d59492 +drivers-x86 54745d563114b74f6fecebce68cd020d06c1772b +chrome-platform 81c1c0cb68a13d14dd1bbffcf4c49e26f9a6478c +chrome-platform-firmware a58a57a1076f8c5dae0327e3710899478c3be901 +hsi e81250ec6b69248b00d38c523dc6a13efaf38aab +leds-lj f8cca63a0a4f3475199d9ab7f86782bdfeb0744d +ipmi ae84a2536577057e97f23f75a202e26d0e86cf01 +driver-core 3b5ea0f078e1b72276e99c237f3dfc2fd72938bb +usb e1e6e541c5c9cf548e9fdc35fc26808c82074440 +thunderbolt 86feaba911f2f1a540a7695c8f4a98fd0fd60ac4 +usb-serial 15734de99517b0c81a1a5a3bccaff4593ef8d953 +tty 8b0b29fdcb47907ae0296b8fe829e918e05e300f +char-misc 8992f32c57607bdfaf5de2a2cd26b3b71f3a9d55 +coresight 9e3604d7369cfc0110100eb1a0acab1865ee2d18 +fastrpc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +fpga 4216e549a265701c88df660f42d74a7eb4819af2 +icc 9621c81fd2eb7db4b647814b7b6e537744831e60 +iio 350d1fb9204b13c5f95e511e98b8bcb47574d425 +nfc 9f69d05b5a85c417c73fa2d5c7a2d507ac81cf4b +phy-next ba8376e8c76c6512c98949dffbf4ded0b782a365 +soundwire 5b08a3afd2995e5312c4c47ffea9d21b651e8e13 +extcon 254f49634ee16a731174d2ae34bc50bd5f45e731 +gnss a13c140cc289c0b7b3770bce5b3ad42ab35074aa +vfio 4e3c1fc8abcb8eff062150b4340fa4569696d645 +w1 4d3721b204f961e905714954ff95633337b768e3 +spmi 8cdeaa50eae8dad34885515f62559ee83e7e8dda +staging c6eb4dc5964fdf4086b73b7f0f5dc0d595fb5cf3 +counter-next 353b2e09f44a91e64c6b8117df46b6999c52e465 +mux ac7bde3c53166656d80e3aacc7d274d3c60a6de4 +dmaengine 0d995da5fb97e8c312834575604d4423eb6225b7 +cgroup e0c62cce00d19e9d9d6edc845e38b2ecb505daed +scsi cf1af0ccca54d5547cc31bf476c6a07cf658ad29 +scsi-mkp 30733f28c0347d237ffb5333fdfab7a9a2d4ed34 +vhost ae864da7d762b4c692e2cdf83cad43110d5d46ee +rpmsg d4d61a4b0a52e8f3cdb3e1578602850a3452ec3e +gpio-brgl 146cc263e457ff6055fe7829e4f4f4b0b5d5dd86 +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 e77f165d26f72c280654cff248f5106cb9a53951 +rtc da5e8713aee51dd73310bccf23d28446b39e7b0e +nvdimm e99cb3ecd8334ca21e01ff9a79a916693f58f1fb +at24 dc59e4fea9d83f03bad6bddf3fa2e52491777482 +ntb dc59e4fea9d83f03bad6bddf3fa2e52491777482 +seccomp 41fa04327384148b0e2e828c9be9862c5240e9fa +slimbus c922423ce66bcee6c61d1b5aadea09b29ca81400 +nvmem dc59e4fea9d83f03bad6bddf3fa2e52491777482 +hyperv a4ffc59238be84dd1c26bf1c001543e832674fc6 +auxdisplay e3e3bf40916c1e810df03958cfa7ba6883cdce79 +kgdb fdbdd0ccb30af18d3b29e714ac8d5ab6163279e0 +hmm 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +cfi dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mhi 9656bcd4c321a799148d00dd830ce7ebf20011da +memblock b3c1ec1a9ad84ec2f14d343d28c6032feaec5b79 +cxl 7098e9cd98a05c0c5de2fae0c2465f9d966fdd07 +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi f56c000d6f5e0b98c1475b2af4fc7c5103afd202 +unicode a511442085c140da9cdbe60e3f0fab1c71480801 +slab e7f630142df2afccce90555e4972e60008222311 +random bb9ff576fdff48c242876f55098a3ee20a29df5d +landlock 172b6a6d8463562b0cbebfd66f770b078f81966b +sysctl 8d75c338f0bcecaa6c9af67f86c176b67b6acf3e +execve ab11176bd3a76058ecafd066d0f9c718dc80f389 +bitmap f4806cc63cc65bd752fd72d84937614dca6504ec +hte 005b25ad11717139ca5c14c9f06c2a60855c2afd +kspp 3421b9b056a6576d0ebac1030eafb48ad0544092 +nolibc b58afc8d1cf85688601b8d7e271125fff666f661 +iommufd 8c07df7cdfcf52f1ff276c588612aabc6c6b8399 +turbostat 1c996a37fd244d19e5dbb715328c1676e28ef607 +pwrseq a39ac4651e3b9d2ca78b6d3dc2a81a6bd25fa616 +capabilities-next 9b0ee13b80798feb0e6a83a6d69e915f23fcb6bc +ipe 028ef9c96e96197026887c0f092424679298aae8 +kcsan a8488ecbd7ba44d65b912dfe88a73f438eba2447 +crc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +keys-next 965e9a2cf23b066d8bdeb690dff9cd7089c5f667 +fwctl e052daab94ee8c4081c91de3549772bd1c235729 +devsec-tsm 3177779ae17db4c66c851f799505fb95c7530c03 +hisilicon a5db65458a911daa6f8927264366dab501715dc0 +device-id 995832b2cebe6969d1b42635db698803ee31294d +kthread fa39ec4f89f2637ed1cdbcde3656825951787668 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..d95efe8b6728 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,431 @@ +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 git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git#configfs-next +ecryptfs https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +dlm https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +erofs https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs https://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd https://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-hotfixes https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-fixes-for-next +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 +memblock-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +renesas-fixes https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git#perf-tools +efi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +battery-fixes https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +iommufd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes https://github.com/Rust-for-Linux/linux.git#rust-fixes +w1-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +i2c-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 +slab-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next-fixes +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-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-unstable +mm-nonmm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-unstable +kbuild https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-for-next +clang-format https://github.com/ojeda/linux.git#clang-format +perf https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-for-next +asm-generic https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#master +alpha https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git#alpha-next +arm https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#for-next +arm64 https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +at91 https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +bmc https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git#for-next +broadcom https://github.com/Broadcom/stblinux.git#next +cix https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git#for-next +davinci https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +fsl https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git#soc_fsl +imx-mxs https://git.kernel.org/pub/scm/linux/kernel/git/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 +memblock https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd https://github.com/terrelln/linux.git#zstd-next +efi https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next +random https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +sysctl https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git#sysctl-next +execve https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap https://github.com/norov/linux.git#bitmap-for-next +hte https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +nolibc https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git#for-next +iommufd https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +turbostat https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +pwrseq https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next +capabilities-next https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git#caps-next +ipe https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git#next +kcsan https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git#next +crc https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#crc-next +keys-next https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +fwctl https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-next +devsec-tsm https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#next +hisilicon https://github.com/hisilicon/linux-hisi.git#for-next +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 diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..0aaee04f5776 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,15678 @@ +$ date -R +Thu, 20 Aug 2026 12:36:32 +0100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 37% (4100/10828)
Updating files: 38% (4115/10828)
Updating files: 39% (4223/10828)
Updating files: 40% (4332/10828)
Updating files: 41% (4440/10828)
Updating files: 42% (4548/10828)
Updating files: 43% (4657/10828)
Updating files: 44% (4765/10828)
Updating files: 45% (4873/10828)
Updating files: 46% (4981/10828)
Updating files: 47% (5090/10828)
Updating files: 48% (5198/10828)
Updating files: 49% (5306/10828)
Updating files: 50% (5414/10828)
Updating files: 51% (5523/10828)
Updating files: 52% (5631/10828)
Updating files: 53% (5739/10828)
Updating files: 54% (5848/10828)
Updating files: 55% (5956/10828)
Updating files: 56% (6064/10828)
Updating files: 57% (6172/10828)
Updating files: 58% (6281/10828)
Updating files: 59% (6389/10828)
Updating files: 60% (6497/10828)
Updating files: 61% (6606/10828)
Updating files: 62% (6714/10828)
Updating files: 63% (6822/10828)
Updating files: 64% (6930/10828)
Updating files: 65% (7039/10828)
Updating files: 66% (7147/10828)
Updating files: 67% (7255/10828)
Updating files: 68% (7364/10828)
Updating files: 69% (7472/10828)
Updating files: 70% (7580/10828)
Updating files: 71% (7688/10828)
Updating files: 71% (7787/10828)
Updating files: 72% (7797/10828)
Updating files: 73% (7905/10828)
Updating files: 74% (8013/10828)
Updating files: 75% (8121/10828)
Updating files: 76% (8230/10828)
Updating files: 77% (8338/10828)
Updating files: 78% (8446/10828)
Updating files: 79% (8555/10828)
Updating files: 80% (8663/10828)
Updating files: 81% (8771/10828)
Updating files: 82% (8879/10828)
Updating files: 83% (8988/10828)
Updating files: 84% (9096/10828)
Updating files: 85% (9204/10828)
Updating files: 86% (9313/10828)
Updating files: 87% (9421/10828)
Updating files: 88% (9529/10828)
Updating files: 89% (9637/10828)
Updating files: 90% (9746/10828)
Updating files: 91% (9854/10828)
Updating files: 92% (9962/10828)
Updating files: 93% (10071/10828)
Updating files: 94% (10179/10828)
Updating files: 95% (10287/10828)
Updating files: 96% (10395/10828)
Updating files: 97% (10504/10828)
Updating files: 98% (10612/10828)
Updating files: 99% (10720/10828)
Updating files: 100% (10828/10828)
Updating files: 100% (10828/10828), done. +HEAD is now at bd5f485f3f026 Merge tag 'soc-arm-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc +Merging origin/master (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 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating bd5f485f3f026..a4ff2be345d0a +Fast-forward (no commit created; -m option ignored) + CREDITS | 7 + + Documentation/ABI/testing/sysfs-class-spi-master | 34 + + Documentation/ABI/testing/sysfs-firmware-gsmi | 2 +- + .../ABI/testing/sysfs-firmware-sev-vulnerabilities | 19 + + Documentation/ABI/testing/sysfs-uevent | 2 +- + Documentation/admin-guide/device-mapper/dm-ima.rst | 7 +- + .../admin-guide/device-mapper/dm-inlinecrypt.rst | 2 +- + .../admin-guide/device-mapper/dm-integrity.rst | 13 + + Documentation/admin-guide/kernel-parameters.txt | 3 + + .../admin-guide/media/em28xx-cardlist.rst | 4 + + Documentation/admin-guide/sysctl/crypto.rst | 36 + + Documentation/arch/arm64/silicon-errata.rst | 2 + + Documentation/crypto/architecture.rst | 2 +- + Documentation/crypto/userspace-if.rst | 13 +- + .../bindings/arm/arm,juno-fpga-apb-regs.yaml | 2 +- + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 2 +- + .../devicetree/bindings/arm/arm,vexpress-scc.yaml | 2 +- + .../bindings/arm/firmware/linaro,optee-tz.yaml | 8 +- + .../devicetree/bindings/arm/mediatek.yaml | 2 +- + Documentation/devicetree/bindings/arm/omap/l4.txt | 37 - + Documentation/devicetree/bindings/arm/psci.yaml | 18 +- + .../bindings/arm/qcom,coresight-tnoc.yaml | 2 +- + .../bindings/arm/qcom,coresight-tpdm.yaml | 2 +- + .../devicetree/bindings/arm/qcom-soc.yaml | 4 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 4 +- + .../bindings/arm/samsung/samsung-soc.yaml | 4 +- + Documentation/devicetree/bindings/arm/xen.txt | 62 - + Documentation/devicetree/bindings/arm/xen.yaml | 110 ++ + Documentation/devicetree/bindings/ata/st,ahci.yaml | 22 +- + .../devicetree/bindings/bus/ti,da850-mstpri.txt | 20 - + .../devicetree/bindings/bus/ti,da850-mstpri.yaml | 37 + + .../devicetree/bindings/bus/ti,omap-l4.yaml | 140 ++ + .../bindings/clock/qcom,dispcc-sm8x50.yaml | 2 +- + .../bindings/clock/qcom,gcc-apq8064.yaml | 2 +- + .../bindings/clock/qcom,gcc-apq8084.yaml | 2 +- + .../bindings/clock/qcom,gcc-ipq6018.yaml | 2 +- + .../bindings/clock/qcom,gcc-ipq8064.yaml | 2 +- + .../bindings/clock/qcom,gcc-mdm9607.yaml | 2 +- + .../bindings/clock/qcom,gcc-mdm9615.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8660.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8909.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8916.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8953.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8974.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sdm660.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gpucc.yaml | 2 +- + .../bindings/clock/qcom,ipq5018-gcc.yaml | 2 +- + .../bindings/clock/qcom,ipq9574-gcc.yaml | 2 +- + .../bindings/clock/qcom,qca8k-nsscc.yaml | 2 +- + .../bindings/clock/qcom,qcm2290-gpucc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 2 +- + .../bindings/clock/qcom,sc7280-lpasscorecc.yaml | 2 +- + .../bindings/clock/qcom,sc8280xp-lpasscc.yaml | 2 +- + .../bindings/clock/qcom,sm6115-lpasscc.yaml | 2 +- + .../bindings/clock/qcom,sm8350-videocc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,videocc.yaml | 2 +- + .../clock/renesas,rcar-usb2-clock-sel.yaml | 4 +- + .../bindings/clock/samsung,exynos5260-clock.yaml | 6 +- + .../bindings/clock/samsung,exynos5410-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos5433-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos7-clock.yaml | 2 +- + .../bindings/clock/samsung,exynos850-clock.yaml | 2 +- + .../bindings/clock/samsung,exynosautov9-clock.yaml | 2 +- + .../clock/samsung,exynosautov920-clock.yaml | 2 +- + .../bindings/clock/samsung,s5pv210-clock.yaml | 2 +- + .../bindings/crypto/qcom,inline-crypto-engine.yaml | 27 +- + .../devicetree/bindings/crypto/qcom,prng.yaml | 2 + + .../devicetree/bindings/crypto/qcom-qce.yaml | 1 + + .../devfreq/event/samsung,exynos-ppmu.yaml | 2 +- + .../bindings/display/msm/dsi-controller-main.yaml | 20 +- + .../bindings/display/samsung/samsung,fimd.yaml | 4 +- + .../bindings/display/ti/ti,am65x-dss.yaml | 12 +- + .../bindings/display/ti/ti,j721e-dss.yaml | 96 +- + .../devicetree/bindings/display/ti/ti,k2g-dss.yaml | 36 +- + .../bindings/display/verisilicon,dc.yaml | 2 + + .../bindings/dsp/mediatek,mt8195-dsp.yaml | 2 +- + .../devicetree/bindings/dts-coding-style.rst | 15 +- + .../bindings/dvfs/performance-domain.yaml | 2 +- + .../devicetree/bindings/firmware/arm,scmi.yaml | 2 +- + .../devicetree/bindings/firmware/arm,scpi.yaml | 2 +- + .../devicetree/bindings/firmware/qcom,scm.yaml | 3 + + .../devicetree/bindings/gpio/cdns,gpio.yaml | 7 +- + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 3 + + .../bindings/gpio/realtek,rtd1625-gpio.yaml | 71 + + .../bindings/gpio/rockchip,gpio-bank.yaml | 7 + + .../devicetree/bindings/gpio/st,nomadik-gpio.yaml | 2 +- + .../devicetree/bindings/gpu/img,powervr-rogue.yaml | 1 + + .../devicetree/bindings/hwmon/adi,adm1275.yaml | 43 +- + .../devicetree/bindings/hwmon/adi,adt7470.yaml | 58 + + .../bindings/hwmon/amphenol,chipcap2.yaml | 6 + + .../bindings/hwmon/eswin,eic7700-pvt.yaml | 72 + + .../bindings/hwmon/hpe,gxp-fan-ctrl.yaml | 16 +- + .../bindings/hwmon/pmbus/adi,max20830.yaml | 30 +- + .../bindings/hwmon/pmbus/adi,vt7505.yaml | 85 + + .../bindings/hwmon/pmbus/mps,mpq8785.yaml | 5 +- + .../bindings/hwmon/pmbus/silergy,sq24860.yaml | 74 + + .../bindings/hwmon/pmbus/ti,lm25066.yaml | 20 + + .../devicetree/bindings/hwmon/sensirion,sht30.yaml | 71 + + .../devicetree/bindings/hwmon/smsc,emc1403.yaml | 203 ++ + .../devicetree/bindings/hwmon/ti,ina2xx.yaml | 3 + + .../bindings/i2c/altr,softip-i2c-v1.0.yaml | 62 + + .../devicetree/bindings/i2c/cdns,i2c-r1p10.yaml | 10 +- + .../devicetree/bindings/i2c/i2c-altera.txt | 39 - + .../devicetree/bindings/i2c/i2c-axxia.txt | 30 - + .../devicetree/bindings/i2c/lsi,api2c.yaml | 52 + + .../bindings/i2c/qcom,sa8255p-geni-i2c.yaml | 68 + + .../devicetree/bindings/i2c/renesas,rcar-i2c.yaml | 6 + + .../bindings/i2c/samsung,s3c2410-i2c.yaml | 2 +- + .../devicetree/bindings/i2c/st,sti-i2c.yaml | 2 +- + .../bindings/input/focaltech,ft8112.yaml | 9 +- + .../bindings/input/gpio-charlieplex-keypad.yaml | 2 +- + .../devicetree/bindings/input/imagis,isa1200.yaml | 141 ++ + .../bindings/input/microchip,cap11xx.yaml | 92 +- + .../devicetree/bindings/input/syna,rmi4.yaml | 11 +- + .../bindings/input/ti,tps65217-pwrbutton.yaml | 42 + + .../bindings/input/tps65218-pwrbutton.txt | 30 - + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 6 +- + .../bindings/interconnect/samsung,exynos-bus.yaml | 14 +- + .../allwinner,sun7i-a20-sc-nmi.yaml | 3 + + .../mediatek,mt6577-sysirq.yaml | 3 +- + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../devicetree/bindings/iommu/arm,smmu.yaml | 8 + + .../devicetree/bindings/iommu/ti,omap-iommu.txt | 59 - + .../devicetree/bindings/iommu/ti,omap-iommu.yaml | 114 ++ + .../devicetree/bindings/leds/qcom,pm8058-led.yaml | 4 +- + .../devicetree/bindings/leds/skyworks,aat1290.yaml | 6 +- + .../devicetree/bindings/mailbox/arm,mhuv3.yaml | 2 +- + .../bindings/mailbox/st,sti-mailbox.yaml | 2 +- + .../devicetree/bindings/media/cec/cec-gpio.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx355.yaml | 11 +- + .../devicetree/bindings/media/i2c/sony,imx678.yaml | 130 ++ + .../devicetree/bindings/media/i2c/st,vd55g1.yaml | 3 +- + .../devicetree/bindings/media/nxp,imx8-isi.yaml | 4 +- + .../devicetree/bindings/media/qcom,milos-iris.yaml | 166 ++ + .../bindings/media/qcom,qcm2290-camss.yaml | 15 +- + Documentation/devicetree/bindings/media/rc.yaml | 4 +- + .../devicetree/bindings/media/renesas,fcp.yaml | 18 +- + .../devicetree/bindings/media/renesas,vsp1.yaml | 17 +- + .../devicetree/bindings/media/ti,am437x-vpfe.yaml | 93 + + .../devicetree/bindings/media/ti,da850-vpif.txt | 106 - + .../devicetree/bindings/media/ti,da850-vpif.yaml | 168 ++ + .../devicetree/bindings/media/ti-am437x-vpfe.txt | 61 - + .../bindings/memory-controllers/renesas,dbsc.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max77620.yaml | 2 +- + .../bindings/mmc/samsung,exynos-dw-mshc.yaml | 2 +- + .../bindings/net/wireless/qcom,ath10k.yaml | 34 +- + Documentation/devicetree/bindings/opp/opp-v2.yaml | 28 +- + .../bindings/phy/samsung,mipi-video-phy.yaml | 4 +- + .../devicetree/bindings/phy/samsung,usb2-phy.yaml | 2 +- + .../bindings/phy/samsung,usb3-drd-phy.yaml | 2 +- + .../bindings/pinctrl/mediatek,mt7988-pinctrl.yaml | 2 +- + .../bindings/pinctrl/samsung,pinctrl.yaml | 2 +- + .../bindings/power/amlogic,meson-sec-pwrc.yaml | 1 + + .../bindings/power/mediatek,power-controller.yaml | 22 +- + .../devicetree/bindings/power/qcom,rpmpd.yaml | 4 + + .../bindings/power/renesas,r8a78000-mdlc.yaml | 61 + + .../bindings/power/renesas,rcar-sysc.yaml | 2 +- + .../bindings/power/reset/keystone-reset.txt | 67 - + .../bindings/power/reset/restart-handler.yaml | 8 +- + .../bindings/power/reset/ti,keystone-reset.yaml | 81 + + .../bindings/power/supply/maxim,max17042.yaml | 4 +- + .../devicetree/bindings/power/ti,smartreflex.yaml | 50 + + .../devicetree/bindings/power/ti-smartreflex.txt | 47 - + Documentation/devicetree/bindings/ptp/fsl,ptp.yaml | 12 +- + .../bindings/pwm/nvidia,tegra20-pwm.yaml | 1 + + .../devicetree/bindings/pwm/pwm-sifive.yaml | 2 +- + .../bindings/regulator/fcs,fan53555.yaml | 8 + + .../bindings/regulator/lltc,ltc3589.yaml | 149 ++ + .../devicetree/bindings/regulator/ltc3589.txt | 99 - + .../bindings/regulator/maxim,max77802.yaml | 4 +- + .../regulator/mediatek,mt6358-regulator.yaml | 2 +- + .../bindings/regulator/nxp,pf8x00-regulator.yaml | 12 +- + .../bindings/regulator/pbias-regulator.txt | 32 - + .../regulator/qcom,sdm845-refgen-regulator.yaml | 31 +- + .../regulator/qcom,usb-vbus-regulator.yaml | 50 +- + .../bindings/regulator/richtek,rtq2208.yaml | 6 +- + .../bindings/regulator/rohm,bd71815-regulator.yaml | 27 +- + .../bindings/regulator/rohm,bd71828-regulator.yaml | 20 +- + .../bindings/regulator/rohm,bd71837-regulator.yaml | 20 +- + .../bindings/regulator/rohm,bd71847-regulator.yaml | 20 +- + .../bindings/regulator/rohm,bd72720-regulator.yaml | 40 +- + .../bindings/regulator/rohm,pmic-states.yaml | 57 + + .../bindings/regulator/ti,pbias-omap.yaml | 137 ++ + .../devicetree/bindings/regulator/ti,tps51632.yaml | 55 + + .../bindings/regulator/tps51632-regulator.txt | 27 - + .../bindings/rng/inside-secure,safexcel-eip76.yaml | 2 +- + .../bindings/serial/qcom,msm-uartdm.yaml | 2 +- + .../devicetree/bindings/slimbus/slimbus.yaml | 4 +- + .../bindings/soc/qcom/qcom,apr-services.yaml | 2 +- + .../bindings/soc/qcom/qcom,rpmh-rsc.yaml | 8 +- + .../devicetree/bindings/soc/qcom/qcom,wcnss.yaml | 2 +- + .../bindings/soc/renesas/renesas-soc.yaml | 4 +- + .../bindings/sound/amlogic,axg-sound-card.yaml | 2 +- + .../bindings/sound/amlogic,gx-sound-card.yaml | 2 +- + .../devicetree/bindings/sound/cirrus,cs35l36.yaml | 240 +++ + .../devicetree/bindings/sound/cirrus,cs42l43.yaml | 1 + + .../devicetree/bindings/sound/cs35l36.txt | 168 -- + .../devicetree/bindings/sound/dmic-codec.yaml | 4 + + .../bindings/sound/eukrea,asoc-tlv320.yaml | 61 + + .../devicetree/bindings/sound/eukrea-tlv320.txt | 26 - + .../devicetree/bindings/sound/everest,es8316.yaml | 28 + + .../devicetree/bindings/sound/fsl,micfil.yaml | 4 + + .../bindings/sound/loongson,ls-audio-card.yaml | 53 +- + .../bindings/sound/loongson,ls2k1000-i2s.yaml | 22 +- + .../bindings/sound/mediatek,mtk-btcvsd-snd.yaml | 59 + + .../devicetree/bindings/sound/mtk-btcvsd-snd.txt | 24 - + .../bindings/sound/neofidelity,ntp8918.yaml | 2 +- + .../devicetree/bindings/sound/omap-dmic.txt | 20 - + .../sound/qcom,msm8916-wcd-digital-codec.yaml | 8 +- + .../sound/qcom,pm8916-wcd-analog-codec.yaml | 11 +- + .../bindings/sound/qcom,q6apm-lpass-dais.yaml | 50 + + .../devicetree/bindings/sound/qcom,q6asm-dais.yaml | 2 +- + .../bindings/sound/qcom,q6dsp-lpass-ports.yaml | 4 +- + .../devicetree/bindings/sound/qcom,sm8250.yaml | 31 + + .../devicetree/bindings/sound/qcom,wsa8855.yaml | 93 + + .../devicetree/bindings/sound/realtek,rt1015.yaml | 2 +- + .../bindings/sound/renesas,r9a09g047-sound.yaml | 2 +- + .../devicetree/bindings/sound/spacemit,k1-i2s.yaml | 64 +- + .../devicetree/bindings/sound/st,sta32x.txt | 2 +- + .../devicetree/bindings/sound/ti,omap4-dmic.yaml | 58 + + .../devicetree/bindings/sound/wlf,wm8524.yaml | 4 + + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 6 + + .../bindings/spi/andestech,ae350-spi.yaml | 4 - + .../devicetree/bindings/spi/atmel,quadspi.yaml | 1 + + .../devicetree/bindings/spi/axiado,ax3000-spi.yaml | 1 - + .../bindings/spi/cavium,octeon-3010-spi.yaml | 61 + + .../bindings/spi/marvell,armada-3700-spi.yaml | 3 - + .../bindings/spi/nuvoton,ma35d1-qspi.yaml | 65 + + .../devicetree/bindings/spi/nxp,imx94-xspi.yaml | 10 + + .../bindings/spi/qcom,sa8255p-geni-spi.yaml | 68 + + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 22 + + .../devicetree/bindings/spi/spi-cadence.yaml | 1 - + .../devicetree/bindings/spi/spi-octeon.txt | 33 - + .../devicetree/bindings/spi/st,stm32-qspi.yaml | 3 + + .../devicetree/bindings/sram/qcom,imem.yaml | 20 + + .../devicetree/bindings/submitting-patches.rst | 3 + + .../bindings/thermal/samsung,exynos-thermal.yaml | 4 +- + .../devicetree/bindings/trivial-devices.yaml | 4 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 12 +- + .../devicetree/bindings/usb/qcom,snps-dwc3.yaml | 12 +- + .../devicetree/bindings/usb/ti,twl4030-usb.yaml | 2 +- + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + .../devicetree/bindings/watchdog/apple,wdt.yaml | 3 + + .../bindings/watchdog/microchip,pic32-dmt.txt | 19 - + .../bindings/watchdog/microchip,pic32-wdt.txt | 18 - + .../bindings/watchdog/microchip,pic32mzda-dmt.yaml | 45 + + .../bindings/watchdog/microchip,pic32mzda-wdt.yaml | 44 + + .../bindings/watchdog/nuvoton,ma35d1-wdt.yaml | 55 + + .../bindings/watchdog/nuvoton,npcm750-wdt.yaml | 14 + + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 1 + + .../devicetree/bindings/watchdog/snps,dw-wdt.yaml | 1 + + .../devicetree/bindings/writing-schema.rst | 13 +- + Documentation/driver-api/infrastructure.rst | 4 + + .../driver-api/media/maintainer-entry-profile.rst | 4 + + Documentation/driver-api/vfio.rst | 89 +- + Documentation/hid/hidintro.rst | 50 + + Documentation/hwmon/adm1275.rst | 24 + + Documentation/hwmon/asus_ec_sensors.rst | 5 + + Documentation/hwmon/asus_rog_ryujin.rst | 25 +- + Documentation/hwmon/chipcap2.rst | 2 + + Documentation/hwmon/coretemp.rst | 4 +- + Documentation/hwmon/corsair-psu.rst | 6 +- + Documentation/hwmon/emc1403.rst | 8 +- + Documentation/hwmon/index.rst | 6 + + Documentation/hwmon/kb9002.rst | 64 + + Documentation/hwmon/max20830.rst | 27 +- + Documentation/hwmon/max34440.rst | 26 +- + Documentation/hwmon/mpq82d00.rst | 73 + + Documentation/hwmon/mpq8646.rst | 300 +++ + Documentation/hwmon/nct6775.rst | 24 + + Documentation/hwmon/nzxt-kraken3.rst | 1 + + Documentation/hwmon/sg2042-mcu.rst | 2 +- + Documentation/hwmon/sht3x.rst | 17 +- + Documentation/hwmon/sq24860.rst | 96 + + Documentation/hwmon/tvs-mpfs.rst | 53 + + Documentation/hwmon/vt7505.rst | 89 + + Documentation/hwmon/yogafan.rst | 27 +- + Documentation/process/maintainer-devicetree.rst | 72 + + Documentation/security/credentials.rst | 6 +- + Documentation/sound/alsa-configuration.rst | 5 + + Documentation/sound/hd-audio/notes.rst | 2 +- + Documentation/spi/index.rst | 1 + + Documentation/spi/instantiating-devices.rst | 88 + + Documentation/tools/rtla/common_appendix.txt | 17 + + Documentation/tools/rtla/common_options.txt | 13 +- + .../tools/rtla/common_osnoise_options.txt | 4 + + .../tools/rtla/common_timerlat_options.txt | 4 + + Documentation/trace/ftrace.rst | 5 + + Documentation/trace/rv/monitor_rtapp.rst | 63 +- + .../translations/zh_CN/security/credentials.rst | 4 +- + .../media/cec/cec-ioc-adap-g-log-addrs.rst | 7 + + .../userspace-api/media/dvb/legacy_dvb_video.rst | 2 +- + .../media/v4l/ext-ctrls-colorimetry.rst | 12 +- + .../userspace-api/media/v4l/meta-formats.rst | 1 + + .../userspace-api/media/v4l/metafmt-rppx1.rst | 99 + + Documentation/userspace-api/media/v4l/v4l2-isp.rst | 43 +- + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 15 +- + .../media/v4l/vidioc-subdev-g-routing.rst | 2 +- + Documentation/watchdog/index.rst | 1 + + Documentation/watchdog/npcm_wdt.rst | 71 + + MAINTAINERS | 121 +- + arch/arm/configs/multi_v7_defconfig | 3 +- + arch/arm/configs/qcom_defconfig | 2 +- + arch/arm64/configs/defconfig | 3 +- + arch/arm64/kernel/pi/idreg-override.c | 2 + + arch/mips/alchemy/board-xxs1500.c | 2 +- + arch/mips/alchemy/devboards/db1000.c | 2 +- + arch/mips/alchemy/devboards/db1200.c | 2 +- + arch/mips/alchemy/devboards/db1550.c | 2 +- + arch/mips/bcm47xx/workarounds.c | 2 +- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 1 + + .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 2 +- + arch/powerpc/crypto/aes_cbc.c | 6 +- + arch/powerpc/platforms/powermac/low_i2c.c | 2 +- + arch/sh/Kconfig | 1 + + arch/sh/boards/Kconfig | 8 + + arch/sh/boards/board-magicpanelr2.c | 2 +- + arch/sh/boards/board-sh7757lcr.c | 2 +- + arch/sh/boards/board-urquell.c | 2 +- + arch/sh/boards/mach-ap325rxa/setup.c | 2 +- + arch/sh/boards/mach-ecovec24/setup.c | 2 +- + arch/sh/boards/mach-highlander/Kconfig | 1 + + arch/sh/boards/mach-highlander/pinmux-r7785rp.c | 2 +- + arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 2 +- + arch/sh/boards/mach-kfr2r09/setup.c | 2 +- + arch/sh/boards/mach-migor/lcd_qvga.c | 2 +- + arch/sh/boards/mach-migor/setup.c | 2 +- + arch/sh/boards/mach-rsk/Kconfig | 3 + + arch/sh/boards/mach-rsk/devices-rsk7269.c | 1 - + arch/sh/boards/mach-se/7724/setup.c | 2 +- + arch/sh/include/mach-common/mach/magicpanelr2.h | 2 - + arch/sh/kernel/cpu/sh4a/setup-shx3.c | 2 +- + arch/x86/Kconfig | 1 + + arch/x86/platform/olpc/olpc-xo1-sci.c | 2 +- + crypto/af_alg.c | 76 +- + crypto/algif_aead.c | 11 + + crypto/algif_hash.c | 24 + + crypto/algif_rng.c | 9 + + crypto/algif_skcipher.c | 23 + + crypto/api.c | 2 +- + crypto/crypto_user.c | 9 +- + crypto/ecc.c | 98 +- + crypto/hctr2.c | 3 +- + crypto/krb5/krb5_api.c | 8 +- + crypto/lrw.c | 2 +- + crypto/lskcipher.c | 4 +- + crypto/xts.c | 3 +- + drivers/acpi/arm64/apmt.c | 2 +- + drivers/acpi/arm64/iort.c | 2 +- + drivers/acpi/bus.c | 6 +- + drivers/acpi/scan.c | 2 + + drivers/ata/ahci_da850.c | 17 +- + drivers/ata/ahci_platform.c | 4 +- + drivers/ata/ahci_qoriq.c | 2 +- + drivers/ata/ahci_seattle.c | 4 +- + drivers/ata/ahci_xgene.c | 6 +- + drivers/ata/libata-core.c | 79 +- + drivers/ata/libata-eh.c | 6 +- + drivers/ata/libata-scsi.c | 716 ++++++- + drivers/ata/libata-sff.c | 24 +- + drivers/ata/libata.h | 2 +- + drivers/ata/pata_ep93xx.c | 30 +- + drivers/ata/pata_mpc52xx.c | 4 +- + drivers/ata/pata_pxa.c | 52 +- + drivers/ata/pata_rb532_cf.c | 16 +- + drivers/ata/sata_highbank.c | 18 +- + drivers/ata/sata_mv.c | 52 +- + drivers/base/Kconfig | 9 - + drivers/base/arch_numa.c | 4 - + drivers/base/attribute_container.c | 7 +- + drivers/base/core.c | 8 +- + drivers/base/dd.c | 4 +- + drivers/base/firmware_loader/builtin/Makefile | 32 +- + drivers/base/firmware_loader/builtin/main.c | 2 + + drivers/base/firmware_loader/fallback.c | 10 + + drivers/base/isa.c | 16 +- + drivers/base/module.c | 2 +- + drivers/base/platform.c | 90 +- + drivers/base/property.c | 41 +- + drivers/base/regmap/internal.h | 2 +- + drivers/base/regmap/regcache-flat.c | 4 +- + drivers/base/regmap/regcache-maple.c | 8 +- + drivers/base/regmap/regcache-rbtree.c | 8 +- + drivers/base/regmap/regcache.c | 38 +- + drivers/base/regmap/regmap-irq.c | 22 + + drivers/base/soc.c | 15 +- + drivers/base/swnode.c | 81 +- + drivers/base/test/Kconfig | 6 + + drivers/base/test/Makefile | 2 + + drivers/base/test/platform-device-test.c | 180 ++ + drivers/base/test/property-entry-test.c | 137 ++ + drivers/base/test/swnode-devlink-test.c | 337 ++++ + drivers/base/transport_class.c | 5 +- + drivers/char/hw_random/Kconfig | 13 +- + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/airoha-trng.c | 4 +- + drivers/char/hw_random/atmel-rng.c | 2 +- + drivers/char/hw_random/cctrng.c | 2 +- + drivers/char/hw_random/core.c | 105 +- + drivers/char/hw_random/hisi-trng-v2.c | 2 +- + drivers/char/hw_random/imx-rngc.c | 6 +- + drivers/char/hw_random/jh7110-trng.c | 3 +- + drivers/char/hw_random/ks-sa-rng.c | 9 +- + drivers/char/hw_random/omap-rng.c | 35 +- + drivers/{crypto => char/hw_random}/qcom-rng.c | 156 +- + drivers/char/hw_random/stm32-rng.c | 10 +- + drivers/char/hw_random/xgene-rng.c | 4 +- + drivers/char/hw_random/xilinx-trng.c | 32 +- + drivers/clk/imx/clk-imx8qxp.c | 1 + + drivers/cpufreq/rcpufreq_dt.rs | 1 - + drivers/crypto/Kconfig | 18 +- + drivers/crypto/Makefile | 1 - + drivers/crypto/allwinner/Kconfig | 16 - + drivers/crypto/allwinner/sun8i-ce/Makefile | 1 - + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 67 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 159 -- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 29 - + drivers/crypto/allwinner/sun8i-ss/Makefile | 1 - + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 49 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 177 -- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 23 - + drivers/crypto/amcc/crypto4xx_core.c | 34 +- + drivers/crypto/amlogic/amlogic-gxl-core.c | 4 +- + drivers/crypto/aspeed/aspeed-acry.c | 6 +- + drivers/crypto/aspeed/aspeed-hace.c | 6 +- + drivers/crypto/atmel-aes.c | 4 +- + drivers/crypto/atmel-ecc.c | 66 +- + drivers/crypto/atmel-i2c.c | 5 +- + drivers/crypto/atmel-sha.c | 4 +- + drivers/crypto/atmel-sha204a.c | 16 +- + drivers/crypto/atmel-tdes.c | 70 +- + drivers/crypto/bcm/cipher.c | 4 +- + drivers/crypto/caam/Kconfig | 9 - + drivers/crypto/caam/Makefile | 1 - + drivers/crypto/caam/caamprng.c | 241 --- + drivers/crypto/caam/intern.h | 15 - + drivers/crypto/caam/jr.c | 48 +- + drivers/crypto/cavium/nitrox/nitrox_hal.c | 3 +- + drivers/crypto/ccp/ccp-crypto-sha.c | 2 +- + drivers/crypto/ccp/sev-dev.c | 196 +- + drivers/crypto/ccp/sev-dev.h | 3 + + drivers/crypto/ccree/cc_driver.c | 4 +- + drivers/crypto/gemini/sl3516-ce-cipher.c | 8 - + drivers/crypto/gemini/sl3516-ce-core.c | 4 +- + drivers/crypto/hisilicon/qm.c | 5 +- + drivers/crypto/hisilicon/sec/sec_drv.c | 19 +- + drivers/crypto/hisilicon/sec2/sec.h | 3 - + drivers/crypto/hisilicon/sec2/sec_crypto.c | 37 +- + drivers/crypto/img-hash.c | 4 +- + drivers/crypto/inside-secure/eip93/eip93-main.c | 6 +- + drivers/crypto/inside-secure/eip93/eip93-main.h | 22 +- + drivers/crypto/inside-secure/safexcel.c | 4 +- + drivers/crypto/intel/iaa/iaa_crypto_main.c | 272 ++- + drivers/crypto/intel/iaa/iaa_crypto_stats.c | 9 + + drivers/crypto/intel/iaa/iaa_crypto_stats.h | 2 + + drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c | 1 + + .../crypto/intel/keembay/keembay-ocs-aes-core.c | 16 +- + drivers/crypto/intel/keembay/keembay-ocs-ecc.c | 5 +- + .../crypto/intel/keembay/keembay-ocs-hcu-core.c | 4 +- + drivers/crypto/intel/keembay/ocs-aes.c | 3 +- + drivers/crypto/intel/qat/qat_common/adf_aer.c | 2 + + drivers/crypto/intel/qat/qat_common/adf_cfg.c | 10 +- + .../crypto/intel/qat/qat_common/adf_cfg_common.h | 1 - + .../crypto/intel/qat/qat_common/adf_cfg_services.c | 15 +- + .../crypto/intel/qat/qat_common/adf_cfg_services.h | 2 +- + .../crypto/intel/qat/qat_common/adf_gen2_config.c | 8 +- + .../crypto/intel/qat/qat_common/adf_mstate_mgr.c | 3 +- + drivers/crypto/intel/qat/qat_common/adf_sysfs.c | 2 +- + .../intel/qat/qat_common/adf_transport_debug.c | 3 +- + drivers/crypto/intel/qat/qat_common/qat_algs.c | 1 + + .../crypto/intel/qat/qat_common/qat_compression.c | 3 +- + drivers/crypto/marvell/cesa/cesa.c | 55 +- + drivers/crypto/marvell/cesa/cesa.h | 2 + + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 28 +- + .../marvell/octeontx2/otx2_cpt_mbox_common.c | 7 +- + drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c | 5 +- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 4 +- + drivers/crypto/mxs-dcp.c | 10 +- + drivers/crypto/omap-aes.c | 88 +- + drivers/crypto/omap-des.c | 4 +- + drivers/crypto/omap-sham.c | 109 +- + drivers/crypto/qce/aead.c | 58 +- + drivers/crypto/qce/common.c | 55 +- + drivers/crypto/qce/common.h | 16 +- + drivers/crypto/qce/core.c | 115 +- + drivers/crypto/qce/regs-v5.h | 4 - + drivers/crypto/qce/sha.c | 61 +- + drivers/crypto/qce/sha.h | 1 - + drivers/crypto/qce/skcipher.c | 103 +- + drivers/crypto/rockchip/rk3288_crypto.c | 4 +- + drivers/crypto/rockchip/rk3288_crypto_ahash.c | 7 +- + drivers/crypto/sa2ul.c | 9 +- + drivers/crypto/sahara.c | 3 +- + drivers/crypto/stm32/stm32-cryp.c | 4 +- + drivers/crypto/stm32/stm32-hash.c | 4 +- + drivers/crypto/talitos.c | 30 +- + drivers/firmware/cirrus/test/cs_dsp_mock_regmap.c | 2 +- + drivers/firmware/google/coreboot_table.c | 43 +- + drivers/fwctl/Kconfig | 12 + + drivers/fwctl/bnxt/main.c | 396 +++- + drivers/gpib/gpio/gpib_bitbang.c | 1 - + drivers/gpio/Kconfig | 19 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-104-idi-48.c | 7 +- + drivers/gpio/gpio-amd-fch.c | 22 +- + drivers/gpio/gpio-bd72720.c | 24 +- + drivers/gpio/gpio-bt8xx.c | 21 +- + drivers/gpio/gpio-by-pinctrl.c | 4 +- + drivers/gpio/gpio-davinci.c | 8 +- + drivers/gpio/gpio-i8255.c | 4 +- + drivers/gpio/gpio-idio-16.c | 6 +- + drivers/gpio/gpio-max7360.c | 8 +- + drivers/gpio/gpio-mt7621.c | 42 +- + drivers/gpio/gpio-mvebu.c | 44 +- + drivers/gpio/gpio-mxs.c | 4 +- + drivers/gpio/gpio-nomadik.c | 64 +- + drivers/gpio/gpio-omap.c | 9 +- + drivers/gpio/gpio-pca9570.c | 2 +- + drivers/gpio/gpio-pcf857x.c | 13 +- + drivers/gpio/gpio-pcie-idio-24.c | 6 +- + drivers/gpio/gpio-pl061.c | 5 +- + drivers/gpio/gpio-pxa.c | 2 +- + drivers/gpio/gpio-rcar.c | 1 - + drivers/gpio/gpio-rda.c | 4 +- + drivers/gpio/gpio-regmap.c | 104 +- + drivers/gpio/gpio-rockchip.c | 16 +- + drivers/gpio/gpio-rtd1625.c | 677 +++++++ + drivers/gpio/gpio-sa1100.c | 2 +- + drivers/gpio/gpio-sifive.c | 1 + + drivers/gpio/gpio-sloppy-logic-analyzer.c | 1 + + drivers/gpio/gpio-sodaville.c | 2 +- + drivers/gpio/gpio-stmpe.c | 2 +- + drivers/gpio/gpio-tb10x.c | 5 +- + drivers/gpio/gpio-tegra.c | 4 +- + drivers/gpio/gpio-timberdale.c | 2 +- + drivers/gpio/gpio-vf610.c | 1 + + drivers/gpio/gpiolib-cdev.c | 9 +- + drivers/gpio/gpiolib-kunit.c | 571 +++++- + drivers/gpio/gpiolib-swnode.c | 23 +- + drivers/gpu/drm/ci/arm64.config | 2 +- + drivers/gpu/drm/nova/driver.rs | 1 - + drivers/gpu/drm/tyr/driver.rs | 1 - + drivers/gpu/drm/xe/xe_i2c.c | 22 +- + drivers/gpu/drm/xe/xe_i2c.h | 1 - + drivers/gpu/nova-core/driver.rs | 7 +- + drivers/gpu/nova-core/gpu.rs | 6 +- + drivers/gpu/nova-core/gsp.rs | 53 +- + drivers/gpu/nova-core/gsp/cmdq.rs | 66 +- + drivers/gpu/nova-core/gsp/fw.rs | 82 +- + drivers/hid/Kconfig | 46 + + drivers/hid/Makefile | 4 +- + drivers/hid/amd-sfh-hid/Kconfig | 1 + + drivers/hid/amd-sfh-hid/amd_sfh_client.c | 16 + + drivers/hid/amd-sfh-hid/amd_sfh_common.h | 13 + + drivers/hid/amd-sfh-hid/amd_sfh_hid.c | 16 +- + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 76 +- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c | 39 + + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.h | 1 - + drivers/hid/hid-apple.c | 22 +- + drivers/hid/hid-appletb-kbd.c | 6 +- + drivers/hid/hid-asus.c | 457 +++-- + drivers/hid/hid-axff.c | 40 +- + drivers/hid/hid-betopff.c | 33 +- + drivers/hid/hid-bigbenff.c | 89 +- + drivers/hid/hid-core.c | 73 +- + drivers/hid/hid-corsair-void.c | 17 + + drivers/hid/hid-corsair.c | 9 +- + drivers/hid/hid-dr.c | 66 +- + drivers/hid/hid-emsff.c | 50 +- + drivers/hid/hid-ft260.c | 70 +- + drivers/hid/hid-gaff.c | 53 +- + drivers/hid/hid-goodix-spi.c | 5 +- + drivers/hid/hid-google-stadiaff.c | 112 +- + drivers/hid/hid-haptic.c | 47 +- + drivers/hid/hid-haptic.h | 6 +- + drivers/hid/hid-holtekff.c | 46 +- + drivers/hid/hid-huawei.c | 5 +- + drivers/hid/hid-hyperv.c | 144 +- + drivers/hid/hid-hyperx.c | 117 ++ + drivers/hid/hid-ids.h | 36 +- + drivers/hid/hid-input.c | 41 +- + drivers/hid/hid-lg4ff.c | 8 + + drivers/hid/hid-logitech-dj.c | 52 +- + drivers/hid/hid-logitech-hidpp.c | 339 +++- + drivers/hid/hid-magicmouse.c | 73 +- + drivers/hid/hid-mcp2221.c | 17 +- + drivers/hid/hid-megaworld.c | 55 +- + drivers/hid/hid-mf.c | 85 +- + drivers/hid/hid-microsoft.c | 38 +- + drivers/hid/hid-msi.c | 2063 ++++++++++++++++++++ + drivers/hid/hid-multitouch.c | 12 +- + drivers/hid/hid-nintendo.c | 62 +- + drivers/hid/hid-oxp.c | 8 +- + drivers/hid/hid-picolcd_debugfs.c | 9 + + drivers/hid/hid-pl.c | 152 +- + drivers/hid/hid-quirks.c | 19 +- + drivers/hid/hid-rapoo.c | 2 +- + drivers/hid/hid-rmi.c | 2 +- + drivers/hid/hid-roccat-kone.c | 65 +- + drivers/hid/hid-roccat.c | 13 +- + drivers/hid/hid-sensor-custom.c | 30 +- + drivers/hid/hid-sensor-hub.c | 46 +- + drivers/hid/hid-sjoy.c | 91 +- + drivers/hid/hid-sony.c | 276 +-- + drivers/hid/hid-steam.c | 1674 ++++++++++++---- + drivers/hid/hid-steelseries-arctis.c | 718 +++++++ + drivers/hid/hid-steelseries.c | 565 +++--- + drivers/hid/hid-tmff.c | 56 +- + drivers/hid/hid-uclogic-core.c | 12 +- + drivers/hid/hid-universal-pidff.c | 4 +- + drivers/hid/hid-zpff.c | 43 +- + drivers/hid/i2c-hid/Makefile | 2 +- + drivers/hid/i2c-hid/i2c-hid-acpi-prp0001.c | 104 + + drivers/hid/i2c-hid/i2c-hid-acpi.c | 54 +- + drivers/hid/i2c-hid/i2c-hid-acpi.h | 33 + + drivers/hid/i2c-hid/i2c-hid-core.c | 2 +- + drivers/hid/i2c-hid/i2c-hid-of-goodix.c | 4 +- + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 4 +- + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 5 +- + .../intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 120 +- + .../intel-thc-hid/intel-quicki2c/quicki2c-dev.h | 19 +- + .../intel-thc-hid/intel-quickspi/pci-quickspi.c | 92 +- + .../intel-thc-hid/intel-quickspi/quickspi-dev.h | 7 + + .../intel-thc-hid/intel-quickspi/quickspi-hid.c | 2 +- + .../intel-quickspi/quickspi-protocol.c | 19 +- + .../intel-quickspi/quickspi-protocol.h | 2 +- + .../hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 69 +- + .../hid/intel-thc-hid/intel-thc/intel-thc-dev.h | 23 +- + .../hid/intel-thc-hid/intel-thc/intel-thc-dma.c | 51 + + .../hid/intel-thc-hid/intel-thc/intel-thc-dma.h | 1 + + drivers/hid/intel-thc-hid/intel-thc/intel-thc-hw.h | 3 + + drivers/hid/usbhid/hid-pidff.c | 13 +- + drivers/hid/wacom_wac.c | 8 +- + drivers/hwmon/Kconfig | 59 +- + drivers/hwmon/Makefile | 3 + + drivers/hwmon/acpi_power_meter.c | 6 +- + drivers/hwmon/adt7470.c | 203 +- + drivers/hwmon/applesmc.c | 490 +++-- + drivers/hwmon/asus-ec-sensors.c | 88 +- + drivers/hwmon/asus_rog_ryujin.c | 96 +- + drivers/hwmon/axi-fan-control.c | 3 +- + drivers/hwmon/chipcap2.c | 25 +- + drivers/hwmon/coretemp.c | 3 +- + drivers/hwmon/corsair-psu.c | 2 +- + drivers/hwmon/cros_ec_hwmon.c | 36 +- + drivers/hwmon/da9055-hwmon.c | 5 +- + drivers/hwmon/eic7700-pvt.c | 509 +++++ + drivers/hwmon/eic7700-pvt.h | 99 + + drivers/hwmon/emc1403.c | 48 +- + drivers/hwmon/gxp-fan-ctrl.c | 106 +- + drivers/hwmon/hwmon.c | 76 +- + drivers/hwmon/ina2xx.c | 20 + + drivers/hwmon/k10temp.c | 14 +- + drivers/hwmon/kb9002.c | 460 +++++ + drivers/hwmon/lm90.c | 58 +- + drivers/hwmon/ltc4283.c | 1 + + drivers/hwmon/max6621.c | 8 +- + drivers/hwmon/nct6775-core.c | 1 + + drivers/hwmon/nct6775-platform.c | 2 +- + drivers/hwmon/npcm750-pwm-fan.c | 4 +- + drivers/hwmon/nzxt-kraken3.c | 9 +- + drivers/hwmon/peci/common.h | 4 +- + drivers/hwmon/pmbus/Kconfig | 91 +- + drivers/hwmon/pmbus/Makefile | 4 + + drivers/hwmon/pmbus/acbel-fsg032.c | 1 + + drivers/hwmon/pmbus/adm1275.c | 151 +- + drivers/hwmon/pmbus/ir36021.c | 22 +- + drivers/hwmon/pmbus/lm25066.c | 37 + + drivers/hwmon/pmbus/ltc2978.c | 21 +- + drivers/hwmon/pmbus/max20830.c | 133 +- + drivers/hwmon/pmbus/max34440.c | 96 +- + drivers/hwmon/pmbus/mp2975.c | 5 - + drivers/hwmon/pmbus/mpq82d00.c | 249 +++ + drivers/hwmon/pmbus/mpq8646.c | 976 +++++++++ + drivers/hwmon/pmbus/pmbus.h | 22 +- + drivers/hwmon/pmbus/pmbus_core.c | 154 +- + drivers/hwmon/pmbus/sq24860.c | 430 ++++ + drivers/hwmon/pmbus/vt7505.c | 287 +++ + drivers/hwmon/pmbus/xdpe1a2g7b.c | 11 + + drivers/hwmon/pwm-fan.c | 6 +- + drivers/hwmon/sht15.c | 4 +- + drivers/hwmon/sht3x.c | 15 +- + drivers/hwmon/tmp102.c | 2 + + drivers/hwmon/tmp401.c | 2 +- + drivers/hwmon/tvs-mpfs.c | 390 ++++ + drivers/hwmon/xgene-hwmon.c | 4 - + drivers/hwmon/yogafan.c | 67 + + drivers/i2c/algos/i2c-algo-bit.c | 2 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-amd-asf-plat.c | 4 + + drivers/i2c/busses/i2c-davinci.c | 4 +- + drivers/i2c/busses/i2c-gpio.c | 223 ++- + drivers/i2c/busses/i2c-k1.c | 183 +- + drivers/i2c/busses/i2c-microchip-corei2c.c | 4 +- + drivers/i2c/busses/i2c-nomadik.c | 4 +- + drivers/i2c/busses/i2c-octeon-core.h | 2 +- + drivers/i2c/busses/i2c-pnx.c | 3 +- + drivers/i2c/busses/i2c-pxa-pci.c | 3 +- + drivers/i2c/busses/i2c-qcom-geni.c | 462 +++-- + drivers/i2c/busses/i2c-qup.c | 31 +- + drivers/i2c/busses/i2c-rcar.c | 22 +- + drivers/i2c/i2c-core-acpi.c | 6 +- + drivers/i2c/i2c-core-base.c | 3 +- + drivers/iio/adc/ad7173.c | 8 +- + drivers/iio/addac/stx104.c | 6 +- + drivers/input/input.c | 172 +- + drivers/input/keyboard/Kconfig | 38 - + drivers/input/keyboard/atkbd.c | 8 - + drivers/input/keyboard/cap11xx.c | 275 ++- + drivers/input/keyboard/charlieplex_keypad.c | 4 +- + drivers/input/keyboard/gpio_keys.c | 7 +- + drivers/input/keyboard/gpio_keys_polled.c | 4 +- + drivers/input/keyboard/hpps2atkbd.h | 110 -- + drivers/input/keyboard/matrix_keypad.c | 1 - + drivers/input/keyboard/pmic8xxx-keypad.c | 8 +- + drivers/input/keyboard/samsung-keypad.c | 39 +- + drivers/input/keyboard/snvs_pwrkey.c | 143 +- + drivers/input/keyboard/tca8418_keypad.c | 3 +- + drivers/input/misc/Kconfig | 30 + + drivers/input/misc/Makefile | 2 + + drivers/input/misc/amd_sfh_tabletmode.c | 81 + + drivers/input/misc/ims-pcu.c | 1 + + drivers/input/misc/isa1200.c | 533 +++++ + drivers/input/misc/soc_button_array.c | 1 - + drivers/input/mouse/elan_i2c.h | 3 +- + drivers/input/mouse/elan_i2c_core.c | 36 +- + drivers/input/mouse/elan_i2c_i2c.c | 5 +- + drivers/input/mouse/elan_i2c_smbus.c | 3 +- + drivers/input/mouse/focaltech.c | 17 +- + drivers/input/mouse/psmouse-base.c | 92 +- + drivers/input/mouse/synaptics.c | 1 + + drivers/input/mouse/synaptics_i2c.c | 2 +- + drivers/input/rmi4/rmi_f12.c | 16 +- + drivers/input/rmi4/rmi_smbus.c | 7 +- + drivers/input/serio/Kconfig | 27 + + drivers/input/serio/gscps2.c | 155 +- + drivers/input/serio/i8042-acpipnpio.h | 27 +- + drivers/input/touchscreen/elo.c | 4 +- + drivers/input/touchscreen/inexio.c | 4 +- + drivers/input/touchscreen/iqs5xx.c | 3 +- + drivers/input/touchscreen/mms114.c | 299 +-- + drivers/input/touchscreen/sur40.c | 4 +- + drivers/input/touchscreen/wacom_w8001.c | 17 +- + drivers/iommu/amd/amd_iommu_types.h | 9 +- + drivers/iommu/amd/debugfs.c | 12 +- + drivers/iommu/amd/init.c | 99 +- + drivers/iommu/amd/iommu.c | 75 +- + drivers/iommu/amd/ppr.c | 12 +- + .../iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 7 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 24 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 188 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 13 +- + drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 224 ++- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 1 + + drivers/iommu/arm/arm-smmu/arm-smmu.c | 9 +- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 39 +- + drivers/iommu/dma-iommu.c | 13 + + drivers/iommu/fsl_pamu.c | 16 +- + drivers/iommu/generic_pt/iommu_pt.h | 2 +- + drivers/iommu/intel/cache.c | 5 +- + drivers/iommu/intel/debugfs.c | 16 +- + drivers/iommu/intel/dmar.c | 98 +- + drivers/iommu/intel/iommu.c | 154 +- + drivers/iommu/intel/iommu.h | 73 +- + drivers/iommu/intel/pasid.c | 9 +- + drivers/iommu/intel/prq.c | 2 +- + drivers/iommu/intel/svm.c | 2 +- + drivers/iommu/iommu-sva.c | 2 +- + drivers/iommu/iommu.c | 6 +- + drivers/iommu/iommufd/Kconfig | 12 + + drivers/iommu/iommufd/Makefile | 1 + + drivers/iommu/iommufd/device.c | 232 ++- + drivers/iommu/iommufd/hw_pagetable.c | 19 +- + drivers/iommu/iommufd/hwpt_noiommu.c | 105 + + drivers/iommu/iommufd/io_pagetable.c | 80 +- + drivers/iommu/iommufd/ioas.c | 42 + + drivers/iommu/iommufd/iommufd_private.h | 39 +- + drivers/iommu/iommufd/main.c | 24 + + drivers/iommu/iommufd/selftest.c | 43 +- + drivers/iommu/iommufd/viommu.c | 14 +- + drivers/iommu/iova.c | 31 +- + drivers/iommu/msm_iommu.c | 15 +- + drivers/iommu/mtk_iommu.c | 2 +- + drivers/iommu/mtk_iommu_v1.c | 2 +- + drivers/iommu/riscv/iommu-pci.c | 6 +- + drivers/iommu/rockchip-iommu.c | 117 +- + drivers/md/dm-bufio.c | 10 +- + drivers/md/dm-cache-target.c | 56 +- + drivers/md/dm-dust.c | 16 +- + drivers/md/dm-era-target.c | 5 + + drivers/md/dm-inlinecrypt.c | 1 - + drivers/md/dm-integrity.c | 175 +- + drivers/md/dm-io.c | 96 +- + drivers/md/dm-ioctl.c | 208 +- + drivers/md/dm-kcopyd.c | 10 +- + drivers/md/dm-log-userspace-base.c | 1 + + drivers/md/dm-log.c | 4 +- + drivers/md/dm-pcache/cache.c | 29 + + drivers/md/dm-pcache/cache.h | 43 +- + drivers/md/dm-pcache/cache_dev.c | 22 +- + drivers/md/dm-pcache/cache_gc.c | 36 +- + drivers/md/dm-pcache/cache_key.c | 128 +- + drivers/md/dm-pcache/cache_req.c | 19 +- + drivers/md/dm-pcache/cache_segment.c | 12 +- + drivers/md/dm-pcache/cache_writeback.c | 38 +- + drivers/md/dm-pcache/dm_pcache.c | 4 +- + drivers/md/dm-raid1.c | 26 +- + drivers/md/dm-snap-persistent.c | 4 +- + drivers/md/dm-snap.c | 4 +- + drivers/md/dm-stats.c | 6 +- + drivers/md/dm-switch.c | 2 +- + drivers/md/dm-table.c | 2 +- + drivers/md/dm-vdo/indexer/config.c | 34 +- + drivers/md/dm-vdo/indexer/config.h | 2 +- + drivers/md/dm-vdo/indexer/geometry.c | 88 +- + drivers/md/dm-vdo/indexer/geometry.h | 13 +- + drivers/md/dm-vdo/indexer/index-layout.c | 2 +- + drivers/md/dm-vdo/indexer/index.c | 30 +- + drivers/md/dm-vdo/indexer/open-chapter.c | 2 +- + drivers/md/dm-vdo/indexer/open-chapter.h | 2 +- + drivers/md/dm-vdo/indexer/volume-index.c | 190 +- + drivers/md/dm-vdo/indexer/volume.c | 74 +- + drivers/md/dm-vdo/indexer/volume.h | 2 +- + drivers/md/dm-vdo/repair.c | 6 +- + drivers/md/dm-verity-target.c | 4 +- + drivers/md/dm-writecache.c | 14 +- + drivers/md/dm-zoned-metadata.c | 8 +- + drivers/md/dm-zoned-reclaim.c | 4 +- + drivers/md/dm.c | 14 +- + drivers/md/persistent-data/dm-array.c | 53 +- + drivers/media/cec/core/cec-adap.c | 95 +- + drivers/media/cec/core/cec-api.c | 5 +- + drivers/media/cec/core/cec-core.c | 117 +- + drivers/media/cec/core/cec-pin.c | 18 +- + drivers/media/cec/platform/meson/ao-cec-g12a.c | 5 +- + drivers/media/cec/platform/meson/ao-cec.c | 4 +- + drivers/media/cec/platform/seco/seco-cec.c | 6 +- + drivers/media/cec/platform/stm32/stm32-cec.c | 19 +- + drivers/media/cec/platform/tegra/tegra_cec.c | 38 +- + .../extron-da-hd-4k-plus/extron-da-hd-4k-plus.c | 3 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 14 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 13 - + drivers/media/dvb-core/dmxdev.c | 11 +- + drivers/media/dvb-core/dvb_frontend.c | 157 +- + drivers/media/dvb-frontends/helene.c | 56 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 23 +- + drivers/media/i2c/Kconfig | 23 + + drivers/media/i2c/Makefile | 2 + + drivers/media/i2c/alvium-csi2.c | 2 +- + drivers/media/i2c/cvs/core.c | 3 + + drivers/media/i2c/cvs/icvs.h | 2 - + drivers/media/i2c/cvs/v4l2.c | 17 +- + drivers/media/i2c/cx25840/cx25840-core.c | 2 + + drivers/media/i2c/gc0310.c | 30 +- + drivers/media/i2c/imx219.c | 27 +- + drivers/media/i2c/imx355.c | 1524 +++++---------- + drivers/media/i2c/imx412.c | 751 +++---- + drivers/media/i2c/imx415.c | 4 +- + drivers/media/i2c/imx471.c | 957 +++++++++ + drivers/media/i2c/imx678.c | 1447 ++++++++++++++ + drivers/media/i2c/max9286.c | 5 +- + drivers/media/i2c/msp3400-driver.c | 3 + + drivers/media/i2c/mt9p031.c | 6 +- + drivers/media/i2c/mt9t112.c | 9 +- + drivers/media/i2c/mt9v011.c | 3 + + drivers/media/i2c/ov02a10.c | 12 +- + drivers/media/i2c/ov2740.c | 37 +- + drivers/media/i2c/ov7740.c | 10 +- + drivers/media/i2c/ov8865.c | 48 +- + drivers/media/i2c/ov9282.c | 4 +- + drivers/media/i2c/rdacm21.c | 5 +- + drivers/media/i2c/saa7115.c | 2 + + drivers/media/i2c/vd55g1.c | 175 +- + drivers/media/i2c/video-i2c.c | 8 +- + drivers/media/pci/bt8xx/bttv-driver.c | 12 +- + drivers/media/pci/cobalt/cobalt-alsa-main.c | 1 - + drivers/media/pci/cobalt/cobalt-driver.c | 5 +- + drivers/media/pci/cx18/cx18-driver.c | 5 +- + drivers/media/pci/cx18/cx18-vbi.c | 2 +- + drivers/media/pci/cx23885/cimax2.c | 1 + + drivers/media/pci/cx23885/cx23885-core.c | 10 +- + drivers/media/pci/cx25821/cx25821-alsa.c | 4 +- + drivers/media/pci/cx25821/cx25821-core.c | 10 +- + drivers/media/pci/cx88/cx88-alsa.c | 6 +- + drivers/media/pci/cx88/cx88-mpeg.c | 6 +- + drivers/media/pci/cx88/cx88-video.c | 5 +- + drivers/media/pci/ddbridge/ddbridge-main.c | 2 +- + drivers/media/pci/ddbridge/ddbridge.h | 2 +- + drivers/media/pci/dm1105/dm1105.c | 10 +- + drivers/media/pci/dt3155/dt3155.c | 4 +- + drivers/media/pci/hws/hws_v4l2_ioctl.h | 4 - + drivers/media/pci/intel/ipu-bridge.c | 69 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- + drivers/media/pci/intel/ipu6/ipu6-isys.c | 1 + + drivers/media/pci/intel/ipu6/ipu6.c | 10 +- + drivers/media/pci/ivtv/ivtv-driver.c | 8 +- + drivers/media/pci/ivtv/ivtv-vbi.c | 2 +- + drivers/media/pci/mantis/mantis_common.h | 8 +- + drivers/media/pci/mgb4/mgb4_core.c | 6 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +- + drivers/media/pci/ngene/ngene-cards.c | 5 +- + drivers/media/pci/pluto2/pluto2.c | 5 +- + drivers/media/pci/saa7134/saa7134-cards.c | 1949 +++++++----------- + drivers/media/pci/saa7146/hexium_gemini.c | 22 +- + drivers/media/pci/saa7146/hexium_orion.c | 33 +- + drivers/media/pci/saa7146/mxb.c | 10 +- + drivers/media/pci/saa7164/saa7164-core.c | 13 +- + drivers/media/pci/smipcie/smipcie-main.c | 5 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 2 +- + drivers/media/pci/ttpci/budget-ci.c | 4 +- + drivers/media/pci/ttpci/budget.c | 4 +- + drivers/media/pci/tw5864/tw5864-core.c | 4 +- + drivers/media/pci/tw68/tw68-core.c | 16 +- + drivers/media/pci/tw686x/tw686x-core.c | 23 +- + drivers/media/pci/zoran/zoran_card.c | 9 +- + drivers/media/platform/Kconfig | 1 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/amd/isp4/Kconfig | 1 + + drivers/media/platform/amd/isp4/isp4_interface.c | 10 +- + drivers/media/platform/amd/isp4/isp4_interface.h | 2 +- + drivers/media/platform/amd/isp4/isp4_subdev.c | 30 +- + .../media/platform/amlogic/c3/isp/c3-isp-params.c | 42 +- + drivers/media/platform/amphion/venc.c | 2 - + .../media/platform/arm/mali-c55/mali-c55-capture.c | 4 +- + .../media/platform/arm/mali-c55/mali-c55-core.c | 2 + + .../media/platform/arm/mali-c55/mali-c55-params.c | 140 +- + .../platform/arm/mali-c55/mali-c55-registers.h | 15 +- + .../media/platform/arm/mali-c55/mali-c55-resizer.c | 2 +- + drivers/media/platform/broadcom/bcm2835-unicam.c | 5 +- + .../platform/chips-media/wave5/wave5-vpu-dec.c | 64 +- + .../platform/chips-media/wave5/wave5-vpu-enc.c | 6 +- + .../platform/chips-media/wave5/wave5-vpuconfig.h | 2 +- + drivers/media/platform/dreamchip/Kconfig | 3 + + drivers/media/platform/dreamchip/Makefile | 6 + + drivers/media/platform/dreamchip/rppx1/Kconfig | 12 + + drivers/media/platform/dreamchip/rppx1/Makefile | 33 + + .../media/platform/dreamchip/rppx1/rpp_module.c | 39 + + .../media/platform/dreamchip/rppx1/rpp_module.h | 119 ++ + .../media/platform/dreamchip/rppx1/rpp_params.c | 115 ++ + drivers/media/platform/dreamchip/rppx1/rpp_stats.c | 66 + + drivers/media/platform/dreamchip/rppx1/rppx1.c | 381 ++++ + drivers/media/platform/dreamchip/rppx1/rppx1.h | 105 + + drivers/media/platform/dreamchip/rppx1/rppx1_acq.c | 148 ++ + .../media/platform/dreamchip/rppx1/rppx1_awbg.c | 63 + + drivers/media/platform/dreamchip/rppx1/rppx1_bd.c | 53 + + .../media/platform/dreamchip/rppx1/rppx1_bdrgb.c | 81 + + drivers/media/platform/dreamchip/rppx1/rppx1_bls.c | 157 ++ + drivers/media/platform/dreamchip/rppx1/rppx1_cac.c | 30 + + .../media/platform/dreamchip/rppx1/rppx1_ccor.c | 166 ++ + drivers/media/platform/dreamchip/rppx1/rppx1_db.c | 45 + + .../media/platform/dreamchip/rppx1/rppx1_dpcc.c | 77 + + drivers/media/platform/dreamchip/rppx1/rppx1_exm.c | 127 ++ + drivers/media/platform/dreamchip/rppx1/rppx1_ga.c | 91 + + .../media/platform/dreamchip/rppx1/rppx1_hist.c | 186 ++ + .../media/platform/dreamchip/rppx1/rppx1_hist256.c | 47 + + drivers/media/platform/dreamchip/rppx1/rppx1_is.c | 43 + + drivers/media/platform/dreamchip/rppx1/rppx1_lin.c | 112 ++ + drivers/media/platform/dreamchip/rppx1/rppx1_lsc.c | 188 ++ + drivers/media/platform/dreamchip/rppx1/rppx1_ltm.c | 49 + + .../media/platform/dreamchip/rppx1/rppx1_ltmmeas.c | 42 + + .../media/platform/dreamchip/rppx1/rppx1_outif.c | 46 + + .../media/platform/dreamchip/rppx1/rppx1_outregs.c | 76 + + .../media/platform/dreamchip/rppx1/rppx1_rmap.c | 63 + + .../platform/dreamchip/rppx1/rppx1_rmapmeas.c | 47 + + .../media/platform/dreamchip/rppx1/rppx1_shrp.c | 65 + + .../media/platform/dreamchip/rppx1/rppx1_wbmeas.c | 165 ++ + .../media/platform/dreamchip/rppx1/rppx1_xyz2luv.c | 27 + + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 6 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.h | 6 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 6 +- + .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 29 +- + .../platform/microchip/microchip-sama7g5-isc.c | 7 +- + .../media/platform/nxp/imx8-isi/imx8-isi-core.c | 3 + + .../media/platform/nxp/imx8-isi/imx8-isi-core.h | 12 +- + .../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 113 +- + drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c | 22 +- + drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c | 2 +- + .../media/platform/nxp/imx8-isi/imx8-isi-pipe.c | 79 +- + .../media/platform/nxp/imx8-isi/imx8-isi-regs.h | 12 +- + .../media/platform/nxp/imx8-isi/imx8-isi-video.c | 98 +- + drivers/media/platform/qcom/camss/camss-ispif.c | 4 +- + drivers/media/platform/qcom/iris/iris_buffer.c | 123 +- + drivers/media/platform/qcom/iris/iris_buffer.h | 2 +- + drivers/media/platform/qcom/iris/iris_core.c | 12 +- + drivers/media/platform/qcom/iris/iris_ctrls.c | 43 +- + drivers/media/platform/qcom/iris/iris_ctrls.h | 2 + + drivers/media/platform/qcom/iris/iris_firmware.c | 119 +- + drivers/media/platform/qcom/iris/iris_hfi_gen1.c | 26 +- + .../platform/qcom/iris/iris_hfi_gen1_command.c | 5 +- + .../platform/qcom/iris/iris_hfi_gen1_defines.h | 1 + + drivers/media/platform/qcom/iris/iris_hfi_gen2.c | 905 ++++++++- + .../platform/qcom/iris/iris_hfi_gen2_command.c | 7 +- + .../platform/qcom/iris/iris_hfi_gen2_defines.h | 8 + + .../platform/qcom/iris/iris_hfi_gen2_response.c | 4 +- + .../platform/qcom/iris/iris_platform_common.h | 11 +- + .../media/platform/qcom/iris/iris_platform_milos.h | 27 + + .../media/platform/qcom/iris/iris_platform_vpu2.c | 46 +- + .../media/platform/qcom/iris/iris_platform_vpu3x.c | 10 +- + drivers/media/platform/qcom/iris/iris_probe.c | 8 +- + drivers/media/platform/qcom/iris/iris_resources.c | 19 +- + drivers/media/platform/qcom/iris/iris_state.c | 4 +- + drivers/media/platform/qcom/iris/iris_vidc.c | 14 +- + drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 4 +- + drivers/media/platform/qcom/iris/iris_vpu_common.c | 2 +- + drivers/media/platform/qcom/venus/hfi_helper.h | 6 +- + drivers/media/platform/qcom/venus/hfi_msgs.c | 2 +- + drivers/media/platform/qcom/venus/hfi_parser.c | 9 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 7 +- + drivers/media/platform/renesas/rcar-csi2.c | 6 +- + drivers/media/platform/renesas/rcar-isp/Kconfig | 2 + + drivers/media/platform/renesas/rcar-isp/Makefile | 2 +- + drivers/media/platform/renesas/rcar-isp/core-io.c | 997 ++++++++++ + drivers/media/platform/renesas/rcar-isp/core.c | 916 +++++++++ + drivers/media/platform/renesas/rcar-isp/csisp.c | 46 +- + .../media/platform/renesas/rcar-isp/risp-core.h | 178 ++ + .../media/platform/renesas/rzg2l-cru/rzg2l-cru.h | 2 - + .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 5 + + drivers/media/platform/renesas/vsp1/vsp1_brx.c | 7 +- + drivers/media/platform/renesas/vsp1/vsp1_clu.c | 3 +- + drivers/media/platform/renesas/vsp1/vsp1_dl.c | 12 +- + drivers/media/platform/renesas/vsp1/vsp1_drm.c | 14 +- + drivers/media/platform/renesas/vsp1/vsp1_drv.c | 44 +- + drivers/media/platform/renesas/vsp1/vsp1_entity.c | 4 +- + drivers/media/platform/renesas/vsp1/vsp1_hgo.c | 7 +- + drivers/media/platform/renesas/vsp1/vsp1_hgt.c | 13 +- + drivers/media/platform/renesas/vsp1/vsp1_lut.c | 3 +- + drivers/media/platform/renesas/vsp1/vsp1_pipe.c | 5 +- + drivers/media/platform/renesas/vsp1/vsp1_video.c | 34 +- + drivers/media/platform/renesas/vsp1/vsp1_wpf.c | 8 +- + drivers/media/platform/rockchip/rga/rga3-hw.c | 12 +- + .../platform/rockchip/rkvdec/rkvdec-hevc-common.c | 3 + + .../media/platform/rockchip/rkvdec/rkvdec-hevc.c | 4 +- + .../platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c | 8 +- + .../platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c | 8 +- + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 8 +- + .../media/platform/samsung/s3c-camif/camif-core.c | 17 +- + drivers/media/platform/st/stm32/stm32-dcmi.c | 19 +- + .../platform/st/stm32/stm32-dcmipp/dcmipp-core.c | 4 +- + drivers/media/platform/ti/Kconfig | 1 + + drivers/media/platform/ti/vpe/vip.c | 37 +- + drivers/media/platform/verisilicon/hantro_drv.c | 12 +- + drivers/media/radio/radio-cadet.c | 4 +- + drivers/media/radio/radio-gemtek.c | 4 +- + drivers/media/rc/fintek-cir.c | 4 +- + drivers/media/rc/ite-cir.c | 29 +- + drivers/media/rc/keymaps/Makefile | 2 +- + .../{rc-videomate-m1f.c => rc-videomate-k100.c} | 2 +- + drivers/media/rc/nuvoton-cir.c | 6 +- + drivers/media/rc/sunxi-cir.c | 9 +- + drivers/media/rc/winbond-cir.c | 4 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 4 +- + drivers/media/test-drivers/vimc/vimc-capture.c | 4 +- + drivers/media/test-drivers/vimc/vimc-sensor.c | 12 +- + drivers/media/test-drivers/vivid/vivid-meta-out.c | 23 +- + drivers/media/tuners/tda18250.c | 4 +- + drivers/media/usb/airspy/airspy.c | 19 +- + drivers/media/usb/au0828/au0828-cards.c | 14 + + drivers/media/usb/au0828/au0828-cards.h | 1 + + drivers/media/usb/au0828/au0828-dvb.c | 1 + + drivers/media/usb/cx231xx/cx231xx-audio.c | 5 + + drivers/media/usb/cx231xx/cx231xx-video.c | 4 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 12 +- + drivers/media/usb/em28xx/em28xx-cards.c | 36 +- + drivers/media/usb/em28xx/em28xx-core.c | 4 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 2 +- + drivers/media/usb/em28xx/em28xx-reg.h | 1 + + drivers/media/usb/em28xx/em28xx-video.c | 114 +- + drivers/media/usb/em28xx/em28xx.h | 3 +- + drivers/media/usb/go7007/go7007-driver.c | 14 +- + drivers/media/usb/go7007/go7007-fw.c | 28 +- + drivers/media/usb/go7007/s2250-board.c | 54 +- + drivers/media/usb/go7007/snd-go7007.c | 10 +- + drivers/media/usb/gspca/jl2005bcd.c | 7 +- + drivers/media/usb/s2255/s2255drv.c | 422 ++-- + drivers/media/usb/stk1160/stk1160-core.c | 15 +- + drivers/media/usb/stk1160/stk1160-video.c | 3 + + drivers/media/usb/usbtv/usbtv-audio.c | 11 + + drivers/media/usb/usbtv/usbtv-core.c | 5 +- + drivers/media/usb/usbtv/usbtv-video.c | 4 +- + drivers/media/v4l2-core/v4l2-async.c | 16 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 64 +- + drivers/media/v4l2-core/v4l2-dev.c | 28 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 2 + + drivers/media/v4l2-core/v4l2-ioctl.c | 2 + + drivers/media/v4l2-core/v4l2-isp.c | 55 + + drivers/mfd/aat2870-core.c | 2 +- + drivers/mfd/arizona-irq.c | 2 +- + drivers/mfd/lp3943.c | 2 +- + drivers/mfd/rohm-bd71828.c | 125 +- + drivers/mfd/rohm-bd718x7.c | 123 +- + drivers/mfd/sm501.c | 2 +- + drivers/mfd/tps6105x.c | 2 +- + drivers/mfd/tps6586x.c | 2 +- + drivers/mfd/tps65911-comparator.c | 2 +- + drivers/mfd/wm8994-irq.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 3 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- + drivers/of/base.c | 13 +- + drivers/of/kobj.c | 3 + + drivers/of/of_reserved_mem.c | 47 +- + drivers/of/platform.c | 2 +- + drivers/pci/ats.c | 13 +- + drivers/pcmcia/bcm63xx_pcmcia.c | 2 +- + drivers/pcmcia/db1xxx_ss.c | 2 +- + drivers/pcmcia/sa1100_h3600.c | 2 +- + drivers/pcmcia/soc_common.c | 2 +- + drivers/pcmcia/xxs1500_ss.c | 2 +- + drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c | 1 - + drivers/phy/rockchip/phy-rockchip-usbdp.c | 2 +- + drivers/phy/ti/phy-j721e-wiz.c | 1 - + drivers/pinctrl/bcm/pinctrl-bcm63xx.c | 1 + + drivers/pinctrl/pinctrl-tps6594.c | 1 + + drivers/platform/chrome/chromeos_of_hw_prober.c | 6 +- + drivers/platform/chrome/cros_ec.c | 5 +- + drivers/platform/chrome/cros_ec_chardev.c | 4 +- + drivers/platform/chrome/cros_ec_debugfs.c | 10 +- + drivers/platform/chrome/cros_ec_lightbar.c | 11 +- + drivers/platform/chrome/cros_ec_sensorhub.c | 4 +- + drivers/platform/chrome/cros_ec_sensorhub_ring.c | 28 +- + drivers/platform/chrome/cros_ec_sysfs.c | 4 +- + drivers/platform/chrome/cros_ec_typec.c | 6 + + drivers/platform/chrome/cros_ec_vbc.c | 4 +- + drivers/platform/chrome/cros_kbd_led_backlight.c | 4 +- + drivers/platform/chrome/cros_usbpd_logger.c | 4 +- + drivers/platform/chrome/cros_usbpd_notify.c | 4 +- + drivers/platform/chrome/wilco_ec/core.c | 4 +- + drivers/platform/chrome/wilco_ec/debugfs.c | 4 +- + drivers/platform/chrome/wilco_ec/telemetry.c | 4 +- + drivers/platform/surface/surface_gpe.c | 40 +- + drivers/platform/x86/intel/int3472/discrete.c | 51 +- + drivers/platform/x86/serial-multi-instantiate.c | 10 + + drivers/pmdomain/amlogic/meson-secure-pwrc.c | 69 + + drivers/pmdomain/arm/Kconfig | 2 +- + drivers/pmdomain/bcm/bcm2835-power.c | 9 +- + drivers/pmdomain/imx/Kconfig | 13 +- + drivers/pmdomain/imx/gpc.c | 3 +- + drivers/pmdomain/imx/imx8m-blk-ctrl.c | 1 + + drivers/pmdomain/imx/imx8mp-blk-ctrl.c | 1 + + drivers/pmdomain/imx/scu-pd.c | 8 +- + drivers/pmdomain/mediatek/mt6858-pm-domains.h | 466 +++++ + drivers/pmdomain/mediatek/mt8196-pm-domains.h | 27 + + drivers/pmdomain/mediatek/mtk-pm-domains.c | 195 +- + drivers/pmdomain/mediatek/mtk-pm-domains.h | 7 + + drivers/pmdomain/qcom/rpmhpd.c | 38 +- + drivers/pmdomain/renesas/Kconfig | 4 + + drivers/pmdomain/renesas/Makefile | 1 + + drivers/pmdomain/renesas/r8a78000-mdlc.c | 325 +++ + drivers/pmdomain/rockchip/pm-domains.c | 36 +- + drivers/pmdomain/tegra/powergate-bpmp.c | 9 +- + drivers/power/sequencing/pwrseq-pcie-m2.c | 12 +- + drivers/pwm/Kconfig | 2 +- + drivers/pwm/core.c | 6 +- + drivers/pwm/pwm-adp5585.c | 4 +- + drivers/pwm/pwm-apple.c | 2 +- + drivers/pwm/pwm-argon-fan-hat.c | 2 +- + drivers/pwm/pwm-atmel-hlcdc.c | 15 +- + drivers/pwm/pwm-atmel-tcb.c | 6 +- + drivers/pwm/pwm-atmel.c | 3 +- + drivers/pwm/pwm-bcm-iproc.c | 2 +- + drivers/pwm/pwm-bcm-kona.c | 2 +- + drivers/pwm/pwm-bcm2835.c | 2 +- + drivers/pwm/pwm-berlin.c | 2 +- + drivers/pwm/pwm-brcmstb.c | 2 +- + drivers/pwm/pwm-clk.c | 2 +- + drivers/pwm/pwm-clps711x.c | 2 +- + drivers/pwm/pwm-cros-ec.c | 2 +- + drivers/pwm/pwm-hibvt.c | 2 +- + drivers/pwm/pwm-imx-tpm.c | 2 +- + drivers/pwm/pwm-imx1.c | 2 +- + drivers/pwm/pwm-imx27.c | 2 +- + drivers/pwm/pwm-ipq.c | 4 +- + drivers/pwm/pwm-jz4740.c | 2 +- + drivers/pwm/pwm-loongson.c | 2 +- + drivers/pwm/pwm-lp3943.c | 2 +- + drivers/pwm/pwm-lpc18xx-sct.c | 2 +- + drivers/pwm/pwm-lpc32xx.c | 2 +- + drivers/pwm/pwm-lpss-pci.c | 2 +- + drivers/pwm/pwm-lpss-platform.c | 10 +- + drivers/pwm/pwm-mc33xs2410.c | 2 +- + drivers/pwm/pwm-mediatek.c | 2 +- + drivers/pwm/pwm-meson.c | 9 +- + drivers/pwm/pwm-mtk-disp.c | 8 +- + drivers/pwm/pwm-mxs.c | 2 +- + drivers/pwm/pwm-omap-dmtimer.c | 4 +- + drivers/pwm/pwm-pca9685.c | 6 +- + drivers/pwm/pwm-pxa.c | 30 +- + drivers/pwm/pwm-raspberrypi-poe.c | 2 +- + drivers/pwm/pwm-rcar.c | 4 +- + drivers/pwm/pwm-renesas-tpu.c | 10 +- + drivers/pwm/pwm-rockchip.c | 8 +- + drivers/pwm/pwm-rzg2l-gpt.c | 7 +- + drivers/pwm/pwm-samsung.c | 2 +- + drivers/pwm/pwm-sifive.c | 2 +- + drivers/pwm/pwm-sl28cpld.c | 2 +- + drivers/pwm/pwm-sophgo-sg2042.c | 7 +- + drivers/pwm/pwm-sprd.c | 4 +- + drivers/pwm/pwm-sti.c | 2 +- + drivers/pwm/pwm-stm32-lp.c | 4 +- + drivers/pwm/pwm-stm32.c | 6 +- + drivers/pwm/pwm-sun4i.c | 2 +- + drivers/pwm/pwm-sunplus.c | 4 +- + drivers/pwm/pwm-tegra.c | 160 +- + drivers/pwm/pwm-tiecap.c | 6 +- + drivers/pwm/pwm-tiehrpwm.c | 2 +- + drivers/pwm/pwm-twl-led.c | 2 +- + drivers/pwm/pwm-twl.c | 2 +- + drivers/pwm/pwm-visconti.c | 2 +- + drivers/pwm/pwm-vt8500.c | 2 +- + drivers/pwm/pwm-xilinx.c | 4 +- + drivers/pwm/pwm_th1520.rs | 25 +- + drivers/regulator/88pg86x.c | 4 +- + drivers/regulator/Kconfig | 7 + + drivers/regulator/Makefile | 1 + + drivers/regulator/ab8500.c | 1 - + drivers/regulator/act8865-regulator.c | 2 +- + drivers/regulator/ad5398.c | 4 +- + drivers/regulator/adp5055-regulator.c | 6 +- + drivers/regulator/as3722-regulator.c | 1 - + drivers/regulator/aw37503-regulator.c | 4 +- + drivers/regulator/core.c | 6 +- + drivers/regulator/da9121-regulator.c | 20 +- + drivers/regulator/da9210-regulator.c | 4 +- + drivers/regulator/da9211-regulator.c | 18 +- + drivers/regulator/fan53555.c | 35 +- + drivers/regulator/fan53880.c | 4 +- + drivers/regulator/isl6271a-regulator.c | 2 +- + drivers/regulator/isl9305.c | 4 +- + drivers/regulator/lp3971.c | 2 +- + drivers/regulator/lp3972.c | 2 +- + drivers/regulator/lp872x.c | 4 +- + drivers/regulator/lp8755.c | 4 +- + drivers/regulator/ltc3589.c | 6 +- + drivers/regulator/ltc3676.c | 2 +- + drivers/regulator/max14577-regulator.c | 103 +- + drivers/regulator/max1586.c | 2 +- + drivers/regulator/max20086-regulator.c | 8 +- + drivers/regulator/max20411-regulator.c | 2 +- + drivers/regulator/max77503-regulator.c | 2 +- + drivers/regulator/max77675-regulator.c | 2 +- + drivers/regulator/max77826-regulator.c | 2 +- + drivers/regulator/max77838-regulator.c | 2 +- + drivers/regulator/max77857-regulator.c | 8 +- + drivers/regulator/max8649.c | 2 +- + drivers/regulator/max8893.c | 2 +- + drivers/regulator/max8952.c | 2 +- + drivers/regulator/max8973-regulator.c | 6 +- + drivers/regulator/max8998.c | 1 - + drivers/regulator/mcp16502.c | 27 +- + drivers/regulator/mp5416.c | 6 +- + drivers/regulator/mp8859.c | 4 +- + drivers/regulator/mp886x.c | 6 +- + drivers/regulator/mpq7920.c | 4 +- + drivers/regulator/mt6311-regulator.c | 4 +- + drivers/regulator/pf530x-regulator.c | 8 +- + drivers/regulator/pf8x00-regulator.c | 8 +- + drivers/regulator/pfuze100-regulator.c | 20 + + drivers/regulator/pv88060-regulator.c | 4 +- + drivers/regulator/pv88080-regulator.c | 8 +- + drivers/regulator/pv88090-regulator.c | 4 +- + drivers/regulator/qcom-refgen-regulator.c | 113 +- + drivers/regulator/qcom-rpmh-regulator.c | 128 +- + drivers/regulator/qcom_usb_vbus-regulator.c | 102 +- + drivers/regulator/rt6245-regulator.c | 5 +- + drivers/regulator/rtq2208-regulator.c | 7 +- + drivers/regulator/sc2730-regulator.c | 375 ++++ + drivers/regulator/sgm3804-regulator.c | 2 +- + drivers/regulator/slg51000-regulator.c | 4 +- + drivers/regulator/sy8106a-regulator.c | 2 +- + drivers/regulator/sy8824x.c | 8 +- + drivers/regulator/sy8827n.c | 4 +- + drivers/regulator/tps51632-regulator.c | 4 +- + drivers/regulator/tps62360-regulator.c | 10 +- + drivers/regulator/tps6286x-regulator.c | 10 +- + drivers/regulator/tps6287x-regulator.c | 10 +- + drivers/regulator/tps65023-regulator.c | 6 +- + drivers/regulator/tps65132-regulator.c | 4 +- + drivers/regulator/tps65185.c | 5 +- + drivers/regulator/tps6594-regulator.c | 19 +- + drivers/regulator/wm831x-isink.c | 6 +- + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 2 +- + drivers/scsi/scsi_debug.c | 46 - + drivers/slimbus/qcom-ngd-ctrl.c | 2 +- + drivers/soc/qcom/qcom-geni-se.c | 5 + + drivers/soc/qcom/rpmh-rsc.c | 13 +- + drivers/soc/qcom/rpmh.c | 47 +- + drivers/soc/renesas/Kconfig | 1 + + drivers/soundwire/bus_type.c | 6 +- + drivers/spi/.kunitconfig | 4 + + drivers/spi/Kconfig | 27 +- + drivers/spi/Makefile | 2 + + drivers/spi/atmel-quadspi.c | 148 +- + drivers/spi/internals.h | 9 +- + drivers/spi/spi-altera-platform.c | 13 +- + drivers/spi/spi-amlogic-spifc-a1.c | 15 +- + drivers/spi/spi-at91-usart.c | 8 +- + drivers/spi/spi-atcspi200.c | 6 +- + drivers/spi/spi-ath79.c | 24 +- + drivers/spi/spi-axiado.c | 35 +- + drivers/spi/spi-axiado.h | 5 +- + drivers/spi/spi-bcm-qspi.c | 12 +- + drivers/spi/spi-bcm2835.c | 2 +- + drivers/spi/spi-bcm63xx-hsspi.c | 22 +- + drivers/spi/spi-bcm63xx.c | 11 +- + drivers/spi/spi-bcmbca-hsspi.c | 22 +- + drivers/spi/spi-brcmstb-qspi.c | 2 +- + drivers/spi/spi-cadence-xspi.c | 475 ++--- + drivers/spi/spi-cadence.c | 15 +- + drivers/spi/spi-coldfire-qspi.c | 12 +- + drivers/spi/spi-davinci.c | 7 +- + drivers/spi/spi-dln2.c | 11 +- + drivers/spi/spi-dw-core.c | 387 +++- + drivers/spi/spi-dw-mmio.c | 72 + + drivers/spi/spi-dw-pci.c | 6 +- + drivers/spi/spi-dw.h | 52 +- + drivers/spi/spi-fsl-dspi.c | 29 +- + drivers/spi/spi-fsl-espi.c | 11 +- + drivers/spi/spi-fsl-lpspi.c | 6 +- + drivers/spi/spi-geni-qcom.c | 155 +- + drivers/spi/spi-hisi-sfc-v3xx.c | 4 +- + drivers/spi/spi-img-spfi.c | 16 +- + drivers/spi/spi-iproc-qspi.c | 2 +- + drivers/spi/spi-loongson-core.c | 4 +- + drivers/spi/spi-loongson-pci.c | 2 +- + drivers/spi/spi-loongson-plat.c | 2 +- + drivers/spi/spi-ma35d1-qspi.c | 685 +++++++ + drivers/spi/spi-mem.c | 32 + + drivers/spi/spi-meson-spifc.c | 30 +- + drivers/spi/spi-mpc52xx.c | 16 +- + drivers/spi/spi-mt65xx.c | 11 +- + drivers/spi/spi-mtk-nor.c | 21 +- + drivers/spi/spi-mxic.c | 9 +- + drivers/spi/spi-npcm-fiu.c | 15 +- + drivers/spi/spi-nxp-fspi.c | 31 +- + drivers/spi/spi-nxp-xspi.c | 143 +- + drivers/spi/spi-oc-tiny.c | 24 +- + drivers/spi/spi-omap2-mcspi.c | 9 +- + drivers/spi/spi-orion.c | 37 +- + drivers/spi/spi-pl022.c | 10 +- + drivers/spi/spi-ppc4xx.c | 105 +- + drivers/spi/spi-qcom-qspi.c | 16 +- + drivers/spi/spi-qpic-snand.c | 174 +- + drivers/spi/spi-qup.c | 14 +- + drivers/spi/spi-realtek-rtl.c | 26 +- + drivers/spi/spi-rockchip-sfc.c | 12 +- + drivers/spi/spi-rockchip.c | 12 +- + drivers/spi/spi-rpc-if.c | 4 + + drivers/spi/spi-s3c64xx.c | 12 +- + drivers/spi/spi-slave-mt27xx.c | 12 +- + drivers/spi/spi-spacemit-k1.c | 10 +- + drivers/spi/spi-sprd-adi.c | 6 + + drivers/spi/spi-sprd.c | 9 +- + drivers/spi/spi-sunplus-sp7021.c | 16 +- + drivers/spi/spi-synquacer.c | 10 +- + drivers/spi/spi-tegra114.c | 10 +- + drivers/spi/spi-tegra20-sflash.c | 10 +- + drivers/spi/spi-tegra20-slink.c | 14 +- + drivers/spi/spi-tegra210-quad.c | 14 +- + drivers/spi/spi-topcliff-pch.c | 47 +- + drivers/spi/spi-zynqmp-gqspi.c | 15 +- + drivers/spi/spi.c | 395 +++- + drivers/spi/tests/Makefile | 3 + + drivers/spi/tests/spi-dma-kunit.c | 259 +++ + .../pci/base/circbuf/interface/ia_css_circbuf.h | 40 +- + .../base/circbuf/interface/ia_css_circbuf_comm.h | 4 +- + .../base/circbuf/interface/ia_css_circbuf_desc.h | 14 +- + .../pci/camera/util/interface/ia_css_util.h | 2 +- + .../pci/css_2401_system/host/csi_rx_private.h | 18 +- + .../pci/css_2401_system/host/isys_irq_private.h | 4 +- + .../host/isys_stream2mmio_private.h | 12 +- + .../pci/css_2401_system/host/pixelgen_private.h | 8 +- + .../atomisp/pci/css_2401_system/pixelgen_global.h | 2 +- + .../pci/hive_isp_css_common/timed_ctrl_global.h | 2 +- + .../device_access/device_access.h | 2 +- + .../pci/hive_isp_css_include/host/csi_rx_public.h | 18 +- + .../host/isys_stream2mmio_public.h | 12 +- + .../hive_isp_css_include/host/pixelgen_public.h | 8 +- + .../pci/hive_isp_css_include/host/tag_public.h | 4 +- + .../pci/hive_isp_css_include/platform_support.h | 2 +- + .../pci/hive_isp_css_include/type_support.h | 2 +- + .../media/atomisp/pci/ia_css_frame_public.h | 2 +- + .../staging/media/atomisp/pci/ia_css_host_data.h | 4 +- + .../staging/media/atomisp/pci/ia_css_pipe_public.h | 8 +- + drivers/staging/media/atomisp/pci/ia_css_prbs.h | 4 +- + drivers/staging/media/atomisp/pci/ia_css_stream.h | 2 +- + drivers/staging/media/atomisp/pci/ia_css_timer.h | 7 +- + drivers/staging/media/atomisp/pci/ia_css_types.h | 6 +- + .../conversion_1.0/ia_css_conversion_types.h | 2 +- + .../pci/isp/kernels/eed1_8/ia_css_eed1_8_types.h | 2 +- + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h | 42 +- + .../ipu2_io_ls/common/ia_css_common_io_param.h | 2 +- + .../ipu2_io_ls/common/ia_css_common_io_types.h | 2 +- + .../yuv444_io_ls/ia_css_yuv444_io.host.h | 2 +- + .../yuv444_io_ls/ia_css_yuv444_io_param.h | 2 +- + .../yuv444_io_ls/ia_css_yuv444_io_types.h | 2 +- + .../pci/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 4 +- + .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h | 14 +- + .../pci/isp/modes/interface/input_buf.isp.h | 2 +- + .../pci/runtime/binary/interface/ia_css_binary.h | 2 +- + .../pci/runtime/bufq/interface/ia_css_bufq.h | 26 +- + .../pci/runtime/debug/interface/ia_css_debug.h | 10 +- + .../runtime/debug/interface/ia_css_debug_pipe.h | 10 +- + .../pci/runtime/eventq/interface/ia_css_eventq.h | 4 +- + .../isp_param/interface/ia_css_isp_param_types.h | 2 +- + .../pci/runtime/isys/interface/ia_css_isys.h | 8 +- + .../runtime/pipeline/interface/ia_css_pipeline.h | 10 +- + .../pci/runtime/rmgr/interface/ia_css_rmgr.h | 4 +- + .../pci/runtime/rmgr/interface/ia_css_rmgr_vbuf.h | 18 +- + .../tagger/interface/ia_css_tagger_common.h | 4 +- + .../staging/media/atomisp/pci/sh_css_internal.h | 4 +- + drivers/staging/media/atomisp/pci/sh_css_sp.h | 14 +- + drivers/staging/media/atomisp/pci/system_global.h | 4 +- + drivers/staging/media/av7110/av7110.c | 20 +- + drivers/staging/media/ipu7/ipu7-isys.c | 2 + + drivers/staging/media/ipu7/ipu7.c | 4 +- + drivers/staging/media/meson/vdec/vdec.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 4 +- + drivers/staging/media/tegra-video/tegra20.c | 6 +- + drivers/staging/media/tegra-video/vi.c | 87 +- + drivers/staging/media/tegra-video/vip.c | 10 +- + drivers/tty/serdev/Kconfig | 7 + + drivers/usb/chipidea/core.c | 2 +- + drivers/usb/musb/jz4740.c | 2 +- + drivers/vfio/Kconfig | 7 +- + drivers/vfio/device_cdev.c | 9 + + drivers/vfio/iommufd.c | 12 +- + drivers/vfio/vfio.h | 23 +- + drivers/vfio/vfio_main.c | 26 +- + drivers/watchdog/Kconfig | 42 +- + drivers/watchdog/Makefile | 3 + + drivers/watchdog/apple_wdt.c | 4 +- + drivers/watchdog/aspeed_wdt.c | 2 + + drivers/watchdog/bd96801_wdt.c | 3 +- + drivers/watchdog/booke_wdt.c | 1 + + drivers/watchdog/cadence_wdt.c | 6 +- + drivers/watchdog/cros_ec_wdt.c | 4 +- + drivers/watchdog/dw_wdt.c | 2 +- + drivers/watchdog/intel-mid_wdt.c | 4 +- + drivers/watchdog/keembay_wdt.c | 4 +- + drivers/watchdog/lenovo_se30g2_se60_wdt.c | 289 +++ + drivers/watchdog/ma35d1_wdt.c | 363 ++++ + drivers/watchdog/marvell_gti_wdt.c | 2 +- + drivers/watchdog/max63xx_wdt.c | 14 +- + drivers/watchdog/max77620_wdt.c | 6 +- + drivers/watchdog/mtk_wdt.c | 4 +- + drivers/watchdog/npcm_wdt.c | 217 +- + drivers/watchdog/orion_wdt.c | 16 +- + drivers/watchdog/pretimeout_dump.c | 45 + + drivers/watchdog/qcom-wdt.c | 55 +- + drivers/watchdog/realtek_otto_wdt.c | 76 +- + drivers/watchdog/sama5d4_wdt.c | 4 +- + drivers/watchdog/sprd_wdt.c | 4 +- + drivers/watchdog/stm32_iwdg.c | 5 +- + drivers/watchdog/via_wdt.c | 1 + + drivers/watchdog/w83627hf_wdt.c | 22 +- + drivers/watchdog/watchdog_core.c | 26 +- + drivers/watchdog/watchdog_pretimeout.h | 4 +- + drivers/watchdog/wdat_wdt.c | 27 +- + fs/debugfs/file.c | 3 +- + fs/debugfs/inode.c | 5 +- + fs/kernfs/dir.c | 4 +- + fs/kernfs/inode.c | 4 +- + fs/kernfs/symlink.c | 2 +- + fs/tracefs/event_inode.c | 4 + + include/acpi/acpi_bus.h | 11 - + include/asm-generic/audit_change_attr.h | 3 + + include/asm-generic/audit_read.h | 31 + + include/asm-generic/audit_write.h | 3 + + include/crypto/aes.h | 2 +- + include/crypto/if_alg.h | 42 +- + include/crypto/internal/ecc.h | 4 +- + include/dt-bindings/power/amlogic,a9-pwrc.h | 61 + + include/dt-bindings/power/mediatek,mt6858-power.h | 23 + + include/dt-bindings/power/mediatek,mt8196-power.h | 4 + + include/dt-bindings/power/renesas,r8a78000-mdlc.h | 15 + + .../dt-bindings/regulator/fcs,fan53555-regulator.h | 20 + + include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h | 36 +- + include/kunit/fwnode.h | 29 + + include/linux/amd-pmf-io.h | 14 + + include/linux/ata.h | 17 + + include/linux/bnxt/hsi.h | 585 ++++++ + include/linux/btf.h | 2 + + include/linux/container_of.h | 5 +- + include/linux/cred.h | 1 - + include/linux/dm-io.h | 6 +- + include/linux/dmar.h | 1 + + include/linux/fwnode.h | 4 + + include/linux/gpio/machine.h | 2 +- + include/linux/gpio/regmap.h | 73 +- + include/linux/gpio_keys.h | 2 + + include/linux/hid.h | 4 +- + include/linux/hwmon-sysfs.h | 14 +- + include/linux/i2c-algo-bit.h | 1 + + include/linux/input.h | 20 +- + include/linux/input/elan-i2c-ids.h | 2 +- + include/linux/kobject.h | 75 +- + include/linux/libata.h | 93 +- + include/linux/lsm_hooks.h | 2 + + include/linux/mfd/lp3943.h | 2 +- + include/linux/mfd/max14577-private.h | 3 + + include/linux/mfd/ti-lmu.h | 1 - + include/linux/mfd/tps65910.h | 2 +- + include/linux/mfd/ucb1x00.h | 2 +- + include/linux/nmi.h | 10 +- + include/linux/of_reserved_mem.h | 7 + + include/linux/pci.h | 30 + + include/linux/platform_data/omap-twl4030.h | 42 - + include/linux/platform_device.h | 8 + + include/linux/property.h | 2 + + include/linux/psp-sev.h | 51 + + include/linux/regmap.h | 12 +- + include/linux/rhashtable.h | 1 - + include/linux/soc/mediatek/mtk_sip_svc.h | 3 + + include/linux/soc/qcom/geni-se.h | 38 + + include/linux/spi/spi-mem.h | 4 + + include/linux/spi/spi.h | 18 + + include/linux/sys_soc.h | 9 +- + include/linux/trace_events.h | 9 + + include/linux/vfio.h | 1 + + include/media/cec.h | 6 +- + include/media/drv-intf/s3c_camif.h | 2 - + include/media/drv-intf/saa7146.h | 11 +- + include/media/media-entity.h | 1 + + include/media/rc-map.h | 2 - + include/media/rppx1.h | 36 + + include/media/v4l2-ioctl.h | 4 +- + include/media/v4l2-isp.h | 92 +- + include/media/videobuf2-v4l2.h | 13 + + include/rv/da_monitor.h | 31 +- + include/rv/ha_monitor.h | 85 +- + include/rv/kunit.h | 73 + + include/rv/ltl_monitor.h | 14 +- + include/scsi/scsi_proto.h | 74 + + include/soc/qcom/rpmh.h | 5 + + include/soc/qcom/tcs.h | 2 + + include/sound/ac97/codec.h | 4 +- + include/sound/asequencer.h | 3 - + include/sound/aw88399.h | 621 ++++++ + include/sound/control.h | 3 + + include/sound/core.h | 4 +- + include/sound/cs35l56.h | 1 - + include/sound/dmaengine_pcm.h | 6 - + include/sound/hda-mlink.h | 23 +- + include/sound/hda_codec.h | 1 + + include/sound/hda_regmap.h | 42 +- + include/sound/pcm.h | 118 +- + include/sound/pcm_params.h | 13 +- + include/sound/rawmidi.h | 14 +- + include/sound/sdca_asoc.h | 15 +- + include/sound/sdca_fdl.h | 4 + + include/sound/sdca_function.h | 32 +- + include/sound/sdca_hid.h | 11 +- + include/sound/seq_virmidi.h | 1 - + include/sound/simple_card_utils.h | 37 +- + include/sound/soc-acpi.h | 23 +- + include/sound/soc-component.h | 11 + + include/sound/soc.h | 15 +- + include/sound/soc_sdw_utils.h | 31 +- + include/sound/sof/dai-amd.h | 1 + + include/sound/sof/dai.h | 3 + + include/sound/sof/header.h | 4 +- + include/sound/sof/ipc4/header.h | 133 +- + include/sound/tas2781-dsp.h | 7 +- + include/sound/tlv320aic32x4.h | 43 - + include/sound/wm8904.h | 4 +- + include/trace/events/qcom_geni_i2c.h | 82 + + include/trace/events/qcom_geni_se.h | 157 ++ + include/trace/trace_events.h | 23 + + include/uapi/fwctl/bnxt.h | 4 + + include/uapi/linux/cec.h | 2 + + include/uapi/linux/iommufd.h | 45 +- + include/uapi/linux/media/arm/mali-c55-config.h | 86 +- + include/uapi/linux/media/dreamchip/rppx1-config.h | 730 +++++++ + include/uapi/linux/media/v4l2-isp.h | 125 +- + include/uapi/linux/psp-sfs.h | 4 +- + include/uapi/linux/videodev2.h | 4 + + include/uapi/sound/asequencer.h | 18 +- + include/uapi/sound/asound.h | 200 +- + include/uapi/sound/firewire.h | 24 +- + include/uapi/sound/skl-tplg-interface.h | 168 -- + include/uapi/sound/snd_ar_tokens.h | 95 +- + include/uapi/sound/snd_sst_tokens.h | 324 --- + include/uapi/sound/sof/tokens.h | 5 +- + kernel/audit_watch.c | 2 +- + kernel/auditfilter.c | 6 +- + kernel/auditsc.c | 3 +- + kernel/bpf/btf.c | 4 +- + kernel/trace/ftrace.c | 43 +- + kernel/trace/preemptirq_delay_test.c | 9 + + kernel/trace/ring_buffer.c | 276 +-- + kernel/trace/rv/Kconfig | 15 + + kernel/trace/rv/Makefile | 2 + + kernel/trace/rv/monitors/nomiss/nomiss.c | 36 +- + kernel/trace/rv/monitors/nomiss/nomiss_kunit.c | 38 + + kernel/trace/rv/monitors/nomiss/nomiss_kunit.h | 35 + + kernel/trace/rv/monitors/opid/opid.c | 12 + + kernel/trace/rv/monitors/opid/opid_kunit.c | 33 + + kernel/trace/rv/monitors/opid/opid_kunit.h | 23 + + kernel/trace/rv/monitors/pagefault/pagefault.c | 20 +- + .../trace/rv/monitors/pagefault/pagefault_kunit.c | 34 + + .../trace/rv/monitors/pagefault/pagefault_kunit.h | 24 + + kernel/trace/rv/monitors/rtapp/Kconfig | 2 +- + kernel/trace/rv/monitors/sco/sco.c | 13 + + kernel/trace/rv/monitors/sco/sco_kunit.c | 29 + + kernel/trace/rv/monitors/sco/sco_kunit.h | 24 + + kernel/trace/rv/monitors/sleep/Kconfig | 1 - + kernel/trace/rv/monitors/sleep/sleep.c | 107 +- + kernel/trace/rv/monitors/sleep/sleep.h | 142 +- + kernel/trace/rv/monitors/sleep/sleep_kunit.c | 59 + + kernel/trace/rv/monitors/sleep/sleep_kunit.h | 29 + + kernel/trace/rv/monitors/sssw/sssw.c | 14 + + kernel/trace/rv/monitors/sssw/sssw_kunit.c | 33 + + kernel/trace/rv/monitors/sssw/sssw_kunit.h | 30 + + kernel/trace/rv/monitors/stall/stall.c | 2 +- + kernel/trace/rv/monitors/sts/sts.c | 19 + + kernel/trace/rv/monitors/sts/sts_kunit.c | 39 + + kernel/trace/rv/monitors/sts/sts_kunit.h | 33 + + kernel/trace/rv/monitors/wakeup/Kconfig | 16 + + kernel/trace/rv/monitors/wakeup/wakeup.c | 153 ++ + kernel/trace/rv/monitors/wakeup/wakeup.h | 92 + + kernel/trace/rv/monitors/wakeup/wakeup_trace.h | 14 + + kernel/trace/rv/rv.c | 86 +- + kernel/trace/rv/rv_monitors_test.c | 182 ++ + kernel/trace/rv/rv_reactors.c | 1 + + kernel/trace/rv/rv_trace.h | 1 + + kernel/trace/trace.c | 2 +- + kernel/trace/trace.h | 4 +- + kernel/trace/trace_events.c | 152 +- + kernel/trace/trace_events_hist.c | 96 +- + kernel/trace/trace_events_trigger.c | 16 +- + kernel/trace/trace_events_user.c | 10 +- + kernel/trace/trace_functions_graph.c | 2 +- + kernel/trace/trace_mmiotrace.c | 7 +- + kernel/trace/trace_printk.c | 3 +- + kernel/trace/trace_sched_switch.c | 6 +- + kernel/trace/trace_syscalls.c | 18 + + lib/kobject.c | 8 +- + lib/kunit/Makefile | 1 + + lib/kunit/fwnode.c | 146 ++ + lib/nmi_backtrace.c | 7 + + lib/rhashtable.c | 2 + + rust/bindings/bindings_helper.h | 2 + + rust/helpers/acpi.c | 16 - + rust/helpers/fwctl.c | 17 + + rust/helpers/helpers.c | 5 +- + rust/helpers/io.c | 13 + + rust/helpers/pci.c | 5 + + rust/helpers/serdev.c | 22 + + rust/helpers/task.c | 5 - + rust/kernel/acpi.rs | 14 +- + rust/kernel/auxiliary.rs | 96 +- + rust/kernel/debugfs/traits.rs | 41 +- + rust/kernel/device.rs | 71 +- + rust/kernel/device_id.rs | 196 +- + rust/kernel/devres.rs | 151 +- + rust/kernel/dma.rs | 287 +-- + rust/kernel/driver.rs | 135 +- + rust/kernel/firmware.rs | 8 +- + rust/kernel/fwctl.rs | 593 ++++++ + rust/kernel/i2c.rs | 26 +- + rust/kernel/io.rs | 1543 ++++++++++++--- + rust/kernel/io/mem.rs | 94 +- + rust/kernel/io/poll.rs | 6 +- + rust/kernel/io/register.rs | 86 +- + rust/kernel/iommu/pgtable.rs | 3 +- + rust/kernel/irq.rs | 2 +- + rust/kernel/irq/request.rs | 430 ++-- + rust/kernel/lib.rs | 7 + + rust/kernel/net/phy.rs | 66 +- + rust/kernel/of.rs | 14 +- + rust/kernel/pci.rs | 32 +- + rust/kernel/pci/io.rs | 205 +- + rust/kernel/pci/irq.rs | 210 +- + rust/kernel/platform.rs | 53 +- + rust/kernel/ptr.rs | 12 + + rust/kernel/pwm.rs | 4 +- + rust/kernel/serdev.rs | 604 ++++++ + rust/kernel/task.rs | 11 +- + rust/kernel/types.rs | 5 +- + rust/kernel/types/for_lt.rs | 103 +- + rust/kernel/usb.rs | 24 +- + rust/macros/for_lt.rs | 41 +- + rust/macros/lib.rs | 18 +- + samples/ftrace/ftrace-ops.c | 2 +- + samples/kobject/kobject-example.c | 24 +- + samples/rust/Kconfig | 11 + + samples/rust/Makefile | 1 + + samples/rust/rust_debugfs.rs | 5 +- + samples/rust/rust_debugfs_scoped.rs | 5 +- + samples/rust/rust_dma.rs | 25 +- + samples/rust/rust_driver_auxiliary.rs | 96 +- + samples/rust/rust_driver_i2c.rs | 3 - + samples/rust/rust_driver_pci.rs | 4 +- + samples/rust/rust_driver_platform.rs | 2 - + samples/rust/rust_driver_serdev.rs | 88 + + samples/rust/rust_driver_usb.rs | 3 +- + samples/rust/rust_i2c_client.rs | 2 - + samples/rust/rust_soc.rs | 2 - + scripts/coccinelle/hid/ff_race.cocci | 34 + + scripts/dtc/dt-check-style | 151 +- + .../dt-style-selftest/bad/dts-child-name-order.dts | 32 + + .../bad/dts-extend-node-child-name-order.dts | 25 + + .../bad/dts-extend-node-digit-node-order.dts | 33 + + .../dtc/dt-style-selftest/bad/dts-mixed-indent.dts | 21 + + .../dt-style-selftest/bad/dts-property-order.dts | 43 + + .../bad/yaml-prop-order-device-type.yaml | 31 + + .../expected/dts-child-name-order.dts.txt | 2 + + .../dts-extend-node-child-name-order.dts.txt | 2 + + .../dts-extend-node-digit-node-order.dts.txt | 2 + + .../expected/dts-mixed-indent.dts.txt | 9 + + .../expected/dts-property-order.dts.txt | 6 + + .../dt-style-selftest/expected/dts-spaces.dts.txt | 2 +- + .../expected/yaml-indent-strict.yaml.txt | 2 +- + .../expected/yaml-mixed-indent.yaml.txt | 3 +- + .../expected/yaml-prop-order-device-type.yaml.txt | 2 + + .../dt-style-selftest/expected/yaml-tab.yaml.txt | 2 +- + .../good/dts-child-name-order.dts | 32 + + .../good/dts-digit-node-order.dts | 43 + + scripts/dtc/dt-style-selftest/good/dts-dtc.dts | 21 + + .../good/dts-extend-node-child-name-order.dts | 25 + + .../good/dts-extend-node-digit-node-order.dts | 33 + + .../dt-style-selftest/good/dts-preprocessor.dts | 21 + + .../dt-style-selftest/good/dts-property-order.dts | 41 + + scripts/dtc/dt-style-selftest/good/soc.dtsi | 49 + + security/integrity/ima/Kconfig | 10 + + security/integrity/ima/ima.h | 5 + + security/integrity/ima/ima_efi.c | 2 + + security/integrity/ima/ima_fs.c | 9 +- + security/integrity/ima/ima_init.c | 15 +- + security/integrity/ima/ima_main.c | 26 + + security/integrity/ima/ima_policy.c | 95 +- + security/integrity/ima/ima_template_lib.c | 3 +- + security/lsm_init.c | 13 +- + security/security.c | 5 +- + security/selinux/avc.c | 3 +- + security/selinux/hooks.c | 27 +- + security/selinux/ima.c | 65 +- + security/selinux/include/ima.h | 4 + + security/selinux/selinuxfs.c | 19 +- + security/selinux/ss/policydb.c | 46 +- + security/selinux/ss/services.c | 18 +- + security/smack/smack.h | 6 +- + security/smack/smack_access.c | 9 + + security/smack/smack_lsm.c | 71 +- + security/smack/smackfs.c | 224 +-- + sound/atmel/ac97c.c | 67 +- + sound/core/compress_offload.c | 18 +- + sound/core/control.c | 93 +- + sound/core/control_compat.c | 15 +- + sound/core/hwdep.c | 25 +- + sound/core/info.c | 2 +- + sound/core/init.c | 67 +- + sound/core/jack.c | 38 +- + sound/core/oss/mixer_oss.c | 19 +- + sound/core/oss/pcm_oss.c | 43 +- + sound/core/oss/pcm_plugin.c | 20 +- + sound/core/pcm.c | 12 +- + sound/core/pcm_misc.c | 25 +- + sound/core/pcm_native.c | 90 +- + sound/core/rawmidi.c | 32 +- + sound/core/seq/oss/seq_oss.c | 21 +- + sound/core/seq/seq_clientmgr.c | 114 +- + sound/core/seq/seq_clientmgr.h | 1 - + sound/core/seq/seq_midi.c | 61 +- + sound/core/seq/seq_ports.c | 103 +- + sound/core/seq/seq_ports.h | 8 +- + sound/core/seq/seq_ump_client.c | 38 +- + sound/core/seq/seq_virmidi.c | 19 +- + sound/core/sound.c | 25 +- + sound/core/sound_kunit.c | 4 +- + sound/core/timer.c | 30 +- + sound/core/ump.c | 9 +- + sound/core/ump_convert.c | 1 + + sound/drivers/aloop.c | 130 +- + sound/drivers/dummy.c | 39 +- + sound/drivers/mpu401/mpu401.c | 6 + + sound/drivers/mts64.c | 6 + + sound/drivers/portman2x4.c | 6 + + sound/drivers/serial-u16550.c | 6 + + sound/drivers/virmidi.c | 6 + + sound/hda/codecs/ca0132.c | 33 +- + sound/hda/codecs/cm9825.c | 148 +- + sound/hda/codecs/conexant.c | 16 +- + sound/hda/codecs/generic.c | 23 +- + sound/hda/codecs/hdmi/hdmi.c | 5 +- + sound/hda/codecs/helpers/razer_blade16_2025.c | 820 ++++++++ + sound/hda/codecs/realtek/alc269.c | 252 ++- + sound/hda/codecs/realtek/alc662.c | 7 + + sound/hda/codecs/side-codecs/Kconfig | 18 + + sound/hda/codecs/side-codecs/Makefile | 4 + + sound/hda/codecs/side-codecs/aw88399_hda.c | 373 ++++ + sound/hda/codecs/side-codecs/aw88399_hda.h | 36 + + sound/hda/codecs/side-codecs/aw88399_hda_i2c.c | 54 + + sound/hda/codecs/side-codecs/cs35l41_hda.c | 43 +- + sound/hda/codecs/side-codecs/cs35l56_hda.c | 35 +- + sound/hda/codecs/side-codecs/tas2781_hda_i2c.c | 16 +- + sound/hda/codecs/side-codecs/tas2781_hda_spi.c | 21 +- + sound/hda/common/auto_parser.c | 66 +- + sound/hda/common/codec.c | 13 +- + sound/hda/common/hda_auto_parser.h | 2 +- + sound/hda/common/hda_local.h | 7 + + sound/hda/common/jack.c | 4 +- + sound/hda/common/proc.c | 2 +- + sound/hda/controllers/Kconfig | 1 + + sound/hda/controllers/intel.c | 25 +- + sound/hda/core/controller.c | 33 +- + sound/hda/core/device.c | 3 +- + sound/hda/core/ext/stream.c | 4 +- + sound/hda/core/hda_bus_type.c | 9 +- + sound/hda/core/stream.c | 40 +- + sound/isa/msnd/msnd_pinnacle.c | 18 +- + sound/isa/sscape.c | 8 +- + sound/isa/wavefront/wavefront_fx.c | 23 +- + sound/isa/wavefront/wavefront_synth.c | 4 +- + sound/pci/Kconfig | 1 + + sound/pci/asihpi/asihpi.c | 2 +- + sound/pci/asihpi/hpi6000.c | 5 + + sound/pci/asihpi/hpidspcd.c | 18 +- + sound/pci/asihpi/hpioctl.c | 17 +- + sound/pci/cs46xx/cs46xx_lib.c | 30 +- + sound/pci/cs5535audio/cs5535audio_olpc.c | 2 +- + sound/pci/emu10k1/emufx.c | 18 +- + sound/pci/korg1212/korg1212.c | 8 +- + sound/pci/mixart/mixart_hwdep.c | 4 +- + sound/pci/pcxhr/pcxhr_hwdep.c | 3 +- + sound/pci/sis7019.c | 10 +- + sound/pci/via82xx_modem.c | 26 +- + sound/sh/aica.c | 4 +- + sound/soc/amd/acp-config.c | 19 + + sound/soc/amd/acp-pcm-dma.c | 8 +- + sound/soc/amd/acp/acp-i2s.c | 6 + + sound/soc/amd/acp/acp-mach-common.c | 11 +- + sound/soc/amd/acp/acp-pci.c | 26 +- + sound/soc/amd/acp/acp-sdw-legacy-mach.c | 20 +- + sound/soc/amd/acp/acp-sdw-sof-mach.c | 16 +- + sound/soc/amd/acp/acp-sof-mach.c | 14 +- + sound/soc/amd/acp/amd-acp70-acpi-match.c | 56 + + sound/soc/amd/mach-config.h | 1 + + sound/soc/amd/raven/acp3x-i2s.c | 6 + + sound/soc/amd/vangogh/acp5x-i2s.c | 6 + + sound/soc/amd/yc/acp6x-mach.c | 12 +- + sound/soc/apple/mca.c | 323 ++- + sound/soc/atmel/atmel-i2s.c | 4 + + sound/soc/atmel/atmel_ssc_dai.c | 7 + + sound/soc/atmel/atmel_wm8904.c | 13 +- + sound/soc/atmel/mchp-i2s-mcc.c | 9 + + sound/soc/atmel/mchp-pdmc.c | 4 + + sound/soc/au1x/db1200.c | 2 +- + sound/soc/au1x/i2sc.c | 11 + + sound/soc/au1x/psc-ac97.c | 4 +- + sound/soc/au1x/psc-i2s.c | 11 + + sound/soc/bcm/bcm2835-i2s.c | 13 + + sound/soc/bcm/cygnus-ssp.c | 7 + + sound/soc/cirrus/ep93xx-i2s.c | 11 + + sound/soc/codecs/Kconfig | 61 +- + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/ab8500-codec.c | 12 +- + sound/soc/codecs/ad1836.c | 6 + + sound/soc/codecs/ad193x.c | 10 + + sound/soc/codecs/adau1761.c | 34 +- + sound/soc/codecs/adau7118-hw.c | 2 +- + sound/soc/codecs/adav80x.c | 8 + + sound/soc/codecs/ak4613.c | 77 +- + sound/soc/codecs/arizona-jack.c | 121 +- + sound/soc/codecs/arizona.c | 26 +- + sound/soc/codecs/aw87390.c | 17 +- + sound/soc/codecs/aw88081.c | 27 +- + sound/soc/codecs/aw88166.c | 32 +- + sound/soc/codecs/aw88261.c | 35 +- + sound/soc/codecs/aw88261.h | 6 - + sound/soc/codecs/aw88395/aw88395.c | 32 +- + sound/soc/codecs/aw88395/aw88395_device.c | 40 +- + sound/soc/codecs/aw88399-lib.c | 1409 +++++++++++++ + sound/soc/codecs/aw88399.c | 1358 +------------ + sound/soc/codecs/aw88399.h | 582 +----- + sound/soc/codecs/bt-sco.c | 10 +- + sound/soc/codecs/cpcap.c | 130 +- + sound/soc/codecs/cros_ec_codec.c | 26 +- + sound/soc/codecs/cs-amp-lib.c | 11 +- + sound/soc/codecs/cs35l32.c | 10 +- + sound/soc/codecs/cs35l33.c | 14 +- + sound/soc/codecs/cs35l34.c | 14 +- + sound/soc/codecs/cs35l56-i2c.c | 10 +- + sound/soc/codecs/cs35l56-sdw.c | 71 +- + sound/soc/codecs/cs35l56-shared.c | 69 +- + sound/soc/codecs/cs35l56-spi.c | 10 +- + sound/soc/codecs/cs35l56.c | 58 +- + sound/soc/codecs/cs35l56.h | 11 +- + sound/soc/codecs/cs40l50-codec.c | 4 +- + sound/soc/codecs/cs42l42-sdw.c | 14 +- + sound/soc/codecs/cs42l42.c | 56 +- + sound/soc/codecs/cs42l43-jack.c | 138 +- + sound/soc/codecs/cs42l43.c | 20 +- + sound/soc/codecs/cs42l84.c | 11 +- + sound/soc/codecs/cs43130.c | 72 +- + sound/soc/codecs/cs4349.c | 8 +- + sound/soc/codecs/cs47l15.c | 11 +- + sound/soc/codecs/cs47l35.c | 11 +- + sound/soc/codecs/cs47l85.c | 11 +- + sound/soc/codecs/cs47l90.c | 11 +- + sound/soc/codecs/cs47l92.c | 11 +- + sound/soc/codecs/cs48l32.c | 26 +- + sound/soc/codecs/cx2072x.c | 141 +- + sound/soc/codecs/da7213.c | 37 +- + sound/soc/codecs/da7219.c | 62 +- + sound/soc/codecs/dmic.c | 1 - + sound/soc/codecs/es8316.c | 44 +- + sound/soc/codecs/es8326.c | 30 +- + sound/soc/codecs/es8328.c | 5 + + sound/soc/codecs/es8389.c | 236 ++- + sound/soc/codecs/es8389.h | 11 +- + sound/soc/codecs/es9356.c | 33 +- + sound/soc/codecs/fs-amp-lib.c | 3 +- + sound/soc/codecs/fs210x.c | 89 +- + sound/soc/codecs/hdac_hda.c | 7 +- + sound/soc/codecs/hdac_hdmi.c | 137 +- + sound/soc/codecs/hdmi-codec.c | 15 +- + sound/soc/codecs/idt821034.c | 144 +- + sound/soc/codecs/lochnagar-sc.c | 8 + + sound/soc/codecs/lpass-macro-common.c | 12 +- + sound/soc/codecs/lpass-rx-macro.c | 141 +- + sound/soc/codecs/lpass-tx-macro.c | 130 +- + sound/soc/codecs/lpass-va-macro.c | 139 +- + sound/soc/codecs/lpass-wsa-macro.c | 144 +- + sound/soc/codecs/madera.c | 51 +- + sound/soc/codecs/max98090.c | 9 +- + sound/soc/codecs/max98095.c | 35 +- + sound/soc/codecs/max98363.c | 7 +- + sound/soc/codecs/max98373-i2c.c | 9 +- + sound/soc/codecs/max98373-sdw.c | 7 +- + sound/soc/codecs/max98388.c | 8 +- + sound/soc/codecs/max98390.c | 24 +- + sound/soc/codecs/max98396.c | 24 +- + sound/soc/codecs/max9860.c | 2 +- + sound/soc/codecs/max98927.c | 8 +- + sound/soc/codecs/ml26124.c | 4 +- + sound/soc/codecs/msm8916-wcd-analog.c | 144 +- + sound/soc/codecs/mt6357.c | 4 +- + sound/soc/codecs/mt6359-accdet.c | 13 +- + sound/soc/codecs/ntpfw.c | 21 +- + sound/soc/codecs/ntpfw.h | 11 +- + sound/soc/codecs/pcm1681.c | 7 + + sound/soc/codecs/pcm1754.c | 6 + + sound/soc/codecs/pcm1789.c | 7 + + sound/soc/codecs/pcm179x.c | 6 + + sound/soc/codecs/pcm186x.c | 9 + + sound/soc/codecs/pcm3060.c | 8 + + sound/soc/codecs/pcm512x.c | 68 +- + sound/soc/codecs/pcm6240.c | 41 +- + sound/soc/codecs/peb2466.c | 23 +- + sound/soc/codecs/pm4125-sdw.c | 10 +- + sound/soc/codecs/pm4125.c | 3 +- + sound/soc/codecs/rt1017-sdca-sdw.c | 7 +- + sound/soc/codecs/rt1017-sdca-sdw.h | 10 +- + sound/soc/codecs/rt1316-sdw.c | 9 +- + sound/soc/codecs/rt1318-sdw.c | 9 +- + sound/soc/codecs/rt1318.c | 4 +- + sound/soc/codecs/rt1320-sdw.c | 882 +++++++-- + sound/soc/codecs/rt1320-sdw.h | 19 + + sound/soc/codecs/rt274.c | 8 +- + sound/soc/codecs/rt286.c | 14 +- + sound/soc/codecs/rt298.c | 14 +- + sound/soc/codecs/rt5514-spi.c | 21 +- + sound/soc/codecs/rt5514.c | 16 +- + sound/soc/codecs/rt5575-spi.c | 3 +- + sound/soc/codecs/rt5645.c | 180 +- + sound/soc/codecs/rt5665.c | 15 +- + sound/soc/codecs/rt5668.c | 10 +- + sound/soc/codecs/rt5677-spi.c | 36 +- + sound/soc/codecs/rt5677.c | 100 +- + sound/soc/codecs/rt5682-sdw.c | 44 +- + sound/soc/codecs/rt5682.c | 5 +- + sound/soc/codecs/rt5682s.c | 17 +- + sound/soc/codecs/rt700-sdw.c | 20 +- + sound/soc/codecs/rt700-sdw.h | 11 +- + sound/soc/codecs/rt711-sdca-sdw.c | 29 +- + sound/soc/codecs/rt711-sdca-sdw.h | 6 +- + sound/soc/codecs/rt711-sdca.c | 5 +- + sound/soc/codecs/rt711-sdw.c | 24 +- + sound/soc/codecs/rt711-sdw.h | 10 +- + sound/soc/codecs/rt711.c | 50 +- + sound/soc/codecs/rt712-sdca-dmic.c | 17 +- + sound/soc/codecs/rt712-sdca-dmic.h | 6 +- + sound/soc/codecs/rt712-sdca-sdw.c | 45 +- + sound/soc/codecs/rt712-sdca-sdw.h | 11 +- + sound/soc/codecs/rt712-sdca.c | 5 +- + sound/soc/codecs/rt715-sdca-sdw.h | 48 +- + sound/soc/codecs/rt715-sdw.h | 32 +- + sound/soc/codecs/rt721-sdca-sdw.c | 44 +- + sound/soc/codecs/rt721-sdca-sdw.h | 44 +- + sound/soc/codecs/rt721-sdca.c | 5 +- + sound/soc/codecs/rt722-sdca-sdw.c | 37 +- + sound/soc/codecs/rt722-sdca.c | 16 +- + sound/soc/codecs/rt766-sdca-sdw.c | 339 ++++ + sound/soc/codecs/rt766-sdca-sdw.h | 61 + + sound/soc/codecs/rt766-sdca.c | 1378 +++++++++++++ + sound/soc/codecs/rt766-sdca.h | 140 ++ + sound/soc/codecs/rt9120.c | 9 +- + sound/soc/codecs/sgtl5000.c | 2 +- + sound/soc/codecs/sigmadsp.c | 30 +- + sound/soc/codecs/sma1303.c | 2 + + sound/soc/codecs/sma1307.c | 6 +- + sound/soc/codecs/sta32x.c | 21 +- + sound/soc/codecs/sta350.c | 20 +- + sound/soc/codecs/sti-sas.c | 2 +- + sound/soc/codecs/tac5xx2-sdw.c | 90 +- + sound/soc/codecs/tas2552.c | 24 +- + sound/soc/codecs/tas2764.c | 2 +- + sound/soc/codecs/tas2780.c | 2 +- + sound/soc/codecs/tas2781-comlib-i2c.c | 5 +- + sound/soc/codecs/tas2781-fmwlib.c | 65 +- + sound/soc/codecs/tas2781-i2c.c | 253 ++- + sound/soc/codecs/tas2783-sdw.c | 316 +-- + sound/soc/codecs/tas5805m.c | 30 +- + sound/soc/codecs/tas675x.c | 18 +- + sound/soc/codecs/tlv320aic26.c | 6 + + sound/soc/codecs/tlv320aic31xx.c | 8 +- + sound/soc/codecs/tlv320aic32x4-clk.c | 68 +- + sound/soc/codecs/tlv320aic32x4-i2c.c | 21 +- + sound/soc/codecs/tlv320aic32x4-spi.c | 25 +- + sound/soc/codecs/tlv320aic32x4.c | 468 ++--- + sound/soc/codecs/tlv320aic32x4.h | 32 +- + sound/soc/codecs/tlv320dac33.c | 87 +- + sound/soc/codecs/tscs42xx.c | 61 +- + sound/soc/codecs/tscs454.c | 107 +- + sound/soc/codecs/twl6040.c | 5 +- + sound/soc/codecs/uda1342.c | 9 +- + sound/soc/codecs/wcd9335.c | 4 +- + sound/soc/codecs/wcd934x.c | 48 +- + sound/soc/codecs/wcd937x-sdw.c | 8 +- + sound/soc/codecs/wcd937x.c | 25 +- + sound/soc/codecs/wcd938x-sdw.c | 8 +- + sound/soc/codecs/wcd938x.c | 22 +- + sound/soc/codecs/wcd939x-sdw.c | 8 +- + sound/soc/codecs/wcd939x.c | 20 +- + sound/soc/codecs/wm0010.c | 86 +- + sound/soc/codecs/wm2000.c | 35 +- + sound/soc/codecs/wm2200.c | 10 +- + sound/soc/codecs/wm5100.c | 10 +- + sound/soc/codecs/wm5102.c | 23 +- + sound/soc/codecs/wm8731.c | 9 +- + sound/soc/codecs/wm8903.c | 9 +- + sound/soc/codecs/wm8940.c | 2 +- + sound/soc/codecs/wm8958-dsp2.c | 10 +- + sound/soc/codecs/wm8962.c | 22 +- + sound/soc/codecs/wm8994.c | 30 +- + sound/soc/codecs/wm9712.c | 5 +- + sound/soc/codecs/wm9713.c | 5 +- + sound/soc/codecs/wm_adsp.c | 77 +- + sound/soc/codecs/wsa881x.c | 8 +- + sound/soc/codecs/wsa883x.c | 19 +- + sound/soc/codecs/wsa884x.c | 18 +- + sound/soc/codecs/wsa885x.c | 1533 +++++++++++++++ + sound/soc/codecs/zl38060.c | 11 +- + sound/soc/dwc/dwc-i2s.c | 4 +- + sound/soc/fsl/fsl-asoc-card.c | 730 ++++--- + sound/soc/fsl/fsl_asrc.c | 12 +- + sound/soc/fsl/fsl_asrc.h | 6 +- + sound/soc/fsl/fsl_asrc_dma.c | 4 +- + sound/soc/fsl/fsl_asrc_m2m.c | 10 +- + sound/soc/fsl/fsl_audmix.c | 35 +- + sound/soc/fsl/fsl_dma.c | 68 +- + sound/soc/fsl/fsl_dma.h | 4 +- + sound/soc/fsl/fsl_easrc.c | 45 +- + sound/soc/fsl/fsl_easrc.h | 4 +- + sound/soc/fsl/fsl_esai.c | 16 +- + sound/soc/fsl/fsl_qmc_audio.c | 8 +- + sound/soc/fsl/fsl_spdif.c | 8 +- + sound/soc/fsl/fsl_ssi.c | 13 +- + sound/soc/fsl/fsl_xcvr.c | 39 +- + sound/soc/fsl/imx-audio-rpmsg.c | 25 +- + sound/soc/fsl/imx-card.c | 4 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 75 +- + sound/soc/fsl/mpc5200_dma.c | 114 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 38 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 12 +- + sound/soc/fsl/p1022_ds.c | 14 +- + sound/soc/fsl/p1022_rdk.c | 14 +- + sound/soc/generic/audio-graph-card.c | 16 +- + sound/soc/generic/audio-graph-card2.c | 35 +- + sound/soc/generic/simple-card-utils.c | 82 +- + sound/soc/generic/simple-card.c | 127 +- + sound/soc/intel/atom/sst-atom-controls.c | 67 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 66 +- + sound/soc/intel/atom/sst/sst_ipc.c | 5 +- + sound/soc/intel/atom/sst/sst_pci.c | 4 +- + sound/soc/intel/atom/sst/sst_pvt.c | 9 +- + sound/soc/intel/avs/apl.c | 8 +- + sound/soc/intel/avs/avs.h | 5 +- + sound/soc/intel/avs/boards/da7219.c | 7 +- + sound/soc/intel/avs/boards/dmic.c | 6 +- + sound/soc/intel/avs/boards/es8336.c | 6 +- + sound/soc/intel/avs/boards/hdaudio.c | 6 +- + sound/soc/intel/avs/boards/i2s_test.c | 6 +- + sound/soc/intel/avs/boards/max98357a.c | 6 +- + sound/soc/intel/avs/boards/max98373.c | 6 +- + sound/soc/intel/avs/boards/max98927.c | 6 +- + sound/soc/intel/avs/boards/nau8825.c | 6 +- + sound/soc/intel/avs/boards/pcm3168a.c | 6 +- + sound/soc/intel/avs/boards/probe.c | 2 +- + sound/soc/intel/avs/boards/rt274.c | 2 +- + sound/soc/intel/avs/boards/rt286.c | 2 +- + sound/soc/intel/avs/boards/rt298.c | 2 +- + sound/soc/intel/avs/boards/rt5514.c | 2 +- + sound/soc/intel/avs/boards/rt5640.c | 2 +- + sound/soc/intel/avs/boards/rt5663.c | 2 +- + sound/soc/intel/avs/boards/rt5682.c | 2 +- + sound/soc/intel/avs/boards/ssm4567.c | 2 +- + sound/soc/intel/avs/control.c | 7 +- + sound/soc/intel/avs/core.c | 4 +- + sound/soc/intel/avs/debug.h | 10 +- + sound/soc/intel/avs/debugfs.c | 19 +- + sound/soc/intel/avs/ipc.c | 59 +- + sound/soc/intel/avs/loader.c | 15 +- + sound/soc/intel/avs/path.c | 30 +- + sound/soc/intel/avs/pcm.c | 19 +- + sound/soc/intel/avs/probes.c | 18 +- + sound/soc/intel/avs/topology.c | 3 +- + sound/soc/intel/avs/utils.c | 45 +- + sound/soc/intel/boards/sof_sdw.c | 16 +- + sound/soc/intel/catpt/core.h | 4 +- + sound/soc/intel/catpt/device.c | 33 +- + sound/soc/intel/catpt/loader.c | 148 +- + sound/soc/intel/catpt/pcm.c | 59 +- + sound/soc/intel/common/soc-acpi-intel-arl-match.c | 3 + + sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 15 +- + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 18 +- + sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 6 +- + .../soc/intel/common/soc-acpi-intel-sdca-quirks.c | 8 + + .../soc/intel/common/soc-acpi-intel-sdca-quirks.h | 1 + + sound/soc/intel/keembay/kmb_platform.c | 2 + + sound/soc/loongson/loongson_card.c | 171 +- + sound/soc/loongson/loongson_i2s_plat.c | 42 +- + sound/soc/mediatek/Kconfig | 2 +- + sound/soc/mediatek/common/mtk-dsp-sof-common.c | 7 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 4 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 4 +- + sound/soc/mediatek/mt8186/mt8186-mt6366.c | 2 +- + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 2 +- + sound/soc/mediatek/mt8189/mt8189-dai-adda.c | 2 - + sound/soc/mediatek/mt8189/mt8189-nau8825.c | 2 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 14 +- + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 4 +- + sound/soc/mediatek/mt8196/mt8196-nau8825.c | 4 +- + sound/soc/mediatek/mt8365/mt8365-afe-pcm.c | 16 +- + sound/soc/mediatek/mt8365/mt8365-mt6357.c | 10 +- + sound/soc/meson/Makefile | 2 + + sound/soc/meson/aiu-encoder-i2s.c | 367 +++- + sound/soc/meson/aiu-formatter-i2s.c | 103 + + sound/soc/meson/aiu.c | 33 +- + sound/soc/meson/aiu.h | 4 + + sound/soc/meson/axg-card.c | 25 +- + sound/soc/meson/g12a-toacodec.c | 2 +- + sound/soc/meson/g12a-tohdmitx.c | 2 +- + sound/soc/meson/gx-card.c | 6 +- + sound/soc/meson/gx-formatter.c | 282 +++ + sound/soc/meson/gx-formatter.h | 56 + + sound/soc/meson/gx-interface.h | 42 + + sound/soc/meson/meson-card-utils.c | 39 +- + sound/soc/meson/meson-codec-glue.c | 2 +- + sound/soc/meson/t9015.c | 12 +- + sound/soc/mxs/mxs-saif.c | 21 +- + sound/soc/mxs/mxs-sgtl5000.c | 2 - + sound/soc/pxa/pxa-ssp.c | 7 +- + sound/soc/pxa/pxa2xx-ac97-lib.c | 4 +- + sound/soc/qcom/common.c | 164 +- + sound/soc/qcom/common.h | 16 +- + sound/soc/qcom/qdsp6/audioreach.c | 140 +- + sound/soc/qcom/qdsp6/audioreach.h | 90 + + sound/soc/qcom/qdsp6/q6afe-dai.c | 48 + + sound/soc/qcom/qdsp6/q6afe.c | 56 + + sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 228 ++- + sound/soc/qcom/qdsp6/q6apm.c | 12 +- + sound/soc/qcom/qdsp6/q6dsp-lpass-clocks.c | 2 +- + sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c | 5 + + sound/soc/qcom/qdsp6/q6prm-clocks.c | 35 + + sound/soc/qcom/qdsp6/q6prm.c | 16 +- + sound/soc/qcom/qdsp6/q6prm.h | 44 + + sound/soc/qcom/qdsp6/q6routing.c | 78 +- + sound/soc/qcom/qdsp6/topology.c | 107 +- + sound/soc/qcom/sc8280xp.c | 430 +++- + sound/soc/qcom/sdm845.c | 2 - + sound/soc/qcom/sm8250.c | 17 + + sound/soc/qcom/storm.c | 12 +- + sound/soc/renesas/fsi.c | 13 +- + sound/soc/renesas/rcar/adg.c | 8 +- + sound/soc/renesas/siu_dai.c | 4 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 16 +- + sound/soc/rockchip/rockchip_i2s.c | 30 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 15 +- + sound/soc/rockchip/rockchip_max98090.c | 5 +- + sound/soc/rockchip/rockchip_pdm.c | 8 +- + sound/soc/rockchip/rockchip_rt5645.c | 5 +- + sound/soc/rockchip/rockchip_sai.c | 15 +- + sound/soc/rockchip/rockchip_spdif.c | 4 +- + sound/soc/samsung/aries_wm8994.c | 1 + + sound/soc/samsung/i2s.c | 58 +- + sound/soc/samsung/smdk_spdif.c | 8 +- + sound/soc/samsung/spdif.c | 8 +- + sound/soc/sdca/sdca_asoc.c | 18 +- + sound/soc/sdca/sdca_class_function.c | 2 +- + sound/soc/sdca/sdca_fdl.c | 8 +- + sound/soc/sdca/sdca_function_device.c | 7 +- + sound/soc/sdca/sdca_functions.c | 187 +- + sound/soc/sdca/sdca_hid.c | 48 +- + sound/soc/sdca/sdca_interrupts.c | 6 + + sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c | 4 +- + sound/soc/sdw_utils/soc_sdw_utils.c | 72 +- + sound/soc/soc-component.c | 53 +- + sound/soc/soc-core.c | 44 +- + sound/soc/soc-dapm.c | 6 + + sound/soc/soc-generic-dmaengine-pcm.c | 58 +- + sound/soc/soc-topology-test.c | 133 +- + sound/soc/sof/amd/Kconfig | 11 + + sound/soc/sof/amd/Makefile | 2 + + sound/soc/sof/amd/acp-dsp-offset.h | 17 + + sound/soc/sof/amd/acp-ipc.c | 13 +- + sound/soc/sof/amd/acp-loader.c | 37 +- + sound/soc/sof/amd/acp.c | 267 ++- + sound/soc/sof/amd/acp.h | 20 + + sound/soc/sof/amd/acp7x.c | 185 ++ + sound/soc/sof/amd/pci-acp7x.c | 116 ++ + sound/soc/sof/fw-file-profile.c | 19 +- + sound/soc/sof/intel/hda-ctrl.c | 19 + + sound/soc/sof/intel/hda-dai-ops.c | 76 +- + sound/soc/sof/intel/hda-dai.c | 2 +- + sound/soc/sof/intel/hda-dsp.c | 6 +- + sound/soc/sof/intel/hda-loader.c | 11 +- + sound/soc/sof/intel/hda-mlink.c | 35 +- + sound/soc/sof/intel/hda-sdw-bpt.c | 2 +- + sound/soc/sof/intel/hda-stream.c | 18 +- + sound/soc/sof/intel/hda.c | 18 +- + sound/soc/sof/intel/hda.h | 31 +- + sound/soc/sof/intel/icl.c | 10 +- + sound/soc/sof/intel/mtl.c | 23 + + sound/soc/sof/ipc3-pcm.c | 6 + + sound/soc/sof/ipc3-topology.c | 39 +- + sound/soc/sof/ipc4-topology.c | 382 +++- + sound/soc/sof/ipc4-topology.h | 12 +- + sound/soc/sof/ipc4.c | 84 + + sound/soc/sof/nocodec.c | 16 +- + sound/soc/sof/pcm.c | 2 +- + sound/soc/sof/sof-audio.c | 5 +- + sound/soc/sof/sof-audio.h | 8 +- + sound/soc/sof/topology.c | 53 +- + sound/soc/sophgo/cv1800b-tdm.c | 16 +- + sound/soc/spacemit/k1_i2s.c | 47 +- + sound/soc/spear/spdif_in.c | 12 +- + sound/soc/spear/spdif_out.c | 2 +- + sound/soc/sprd/sprd-mcdt.c | 4 +- + sound/soc/sprd/sprd-pcm-dma.c | 2 - + sound/soc/starfive/jh7110_pwmdac.c | 15 +- + sound/soc/starfive/jh7110_tdm.c | 27 +- + sound/soc/stm/stm32_adfsdm.c | 5 +- + sound/soc/stm/stm32_i2s.c | 6 +- + sound/soc/stm/stm32_sai_sub.c | 8 +- + sound/soc/stm/stm32_spdifrx.c | 6 +- + sound/soc/sunxi/sun4i-codec.c | 93 +- + sound/soc/sunxi/sun4i-i2s.c | 28 +- + sound/soc/sunxi/sun4i-spdif.c | 23 +- + sound/soc/sunxi/sun50i-codec-analog.c | 11 +- + sound/soc/sunxi/sun8i-codec-analog.c | 11 +- + sound/soc/tegra/tegra20_das.c | 7 +- + sound/soc/tegra/tegra210_adx.c | 12 +- + sound/soc/tegra/tegra210_amx.c | 12 +- + sound/soc/tegra/tegra210_i2s.c | 18 +- + sound/soc/tegra/tegra210_mixer.c | 2 +- + sound/soc/ti/ams-delta.c | 8 +- + sound/soc/ti/davinci-evm.c | 3 +- + sound/soc/ti/j721e-evm.c | 11 +- + sound/soc/ti/omap-abe-twl6040.c | 15 +- + sound/soc/ti/omap-dmic.c | 7 +- + sound/soc/ti/omap-hdmi.c | 9 +- + sound/soc/ti/omap-twl4030.c | 168 +- + sound/soc/ti/rx51.c | 51 +- + sound/soc/uniphier/aio-cpu.c | 8 +- + sound/soc/uniphier/aio.h | 2 +- + sound/soc/ux500/mop500.c | 12 +- + sound/soc/ux500/mop500_ab8500.c | 2 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 16 +- + sound/soc/xilinx/xlnx_i2s.c | 30 +- + sound/soc/xilinx/xlnx_spdif.c | 39 +- + sound/soc/xtensa/xtfpga-i2s.c | 60 +- + sound/sparc/dbri.c | 2 + + sound/usb/6fire/comm.c | 9 +- + sound/usb/6fire/firmware.c | 24 +- + sound/usb/bcd2000/bcd2000.c | 11 +- + sound/usb/card.c | 72 +- + sound/usb/clock.c | 11 +- + sound/usb/endpoint.c | 7 +- + sound/usb/fcp.c | 42 +- + sound/usb/mixer.c | 6 + + sound/usb/mixer.h | 2 + + sound/usb/mixer_maps.c | 18 + + sound/usb/mixer_quirks.c | 20 + + sound/usb/mixer_scarlett2.c | 98 +- + sound/usb/quirks-table.h | 77 + + sound/usb/quirks.c | 29 +- + sound/usb/quirks.h | 3 - + sound/usb/usbaudio.h | 18 +- + sound/usb/usx2y/us144mkii_pcm.h | 6 +- + sound/usb/usx2y/usbusx2yaudio.c | 1 - + tools/testing/kunit/configs/all_tests.config | 1 + + tools/testing/kunit/configs/default.config | 1 + + .../testing/selftests/bpf/prog_tests/tp_btf_ids.c | 132 ++ + tools/testing/selftests/livepatch/functions.sh | 14 + + tools/testing/selftests/livepatch/test-ftrace.sh | 45 +- + tools/testing/selftests/lsm/common.c | 4 +- + .../selftests/verification/test.d/rv_deadline.tc | 23 + + .../test.d/rv_monitor_enable_disable.tc | 10 +- + .../verification/test.d/rv_monitor_reactor.tc | 4 +- + .../selftests/verification/test.d/rv_stall.tc | 33 + + .../verification/test.d/rv_wwnr_printk.tc | 32 +- + tools/tracing/rtla/src/cli.c | 42 +- + tools/tracing/rtla/src/cli_p.h | 497 +++-- + tools/tracing/rtla/tests/engine.sh | 39 +- + tools/tracing/rtla/tests/hwnoise.t | 3 + + tools/tracing/rtla/tests/osnoise.t | 39 +- + .../rtla/tests/scripts/check-osnoise-option.sh | 16 + + .../rtla/tests/scripts/check-tracefs-value.sh | 11 + + tools/tracing/rtla/tests/timerlat.t | 40 +- + tools/tracing/rtla/tests/unit/cli_opt_callback.c | 542 +++-- + tools/tracing/rtla/tests/unit/osnoise_hist_cli.c | 18 + + tools/tracing/rtla/tests/unit/osnoise_top_cli.c | 18 + + tools/tracing/rtla/tests/unit/timerlat_hist_cli.c | 18 + + tools/tracing/rtla/tests/unit/timerlat_top_cli.c | 18 + + tools/verification/models/rtapp/sleep.ltl | 11 +- + tools/verification/models/rtapp/wakeup.ltl | 5 + + tools/verification/rv/Makefile | 5 +- + tools/verification/rv/src/rv.c | 24 +- + tools/verification/rv/tests/rv_list.t | 48 + + tools/verification/rv/tests/rv_mon.t | 95 + + tools/verification/rvgen/Makefile | 5 + + tools/verification/rvgen/__main__.py | 22 +- + tools/verification/rvgen/rvgen/automata.py | 635 +++--- + tools/verification/rvgen/rvgen/dot2c.py | 10 +- + tools/verification/rvgen/rvgen/dot2k.py | 321 ++- + tools/verification/rvgen/rvgen/generator.py | 51 +- + tools/verification/rvgen/rvgen/kunit.py | 194 ++ + tools/verification/rvgen/rvgen/ltl2ba.py | 184 +- + tools/verification/rvgen/rvgen/ltl2k.py | 2 +- + .../rvgen/rvgen/templates/container/main.c | 2 +- + .../rvgen/rvgen/templates/dot2k/main.c | 2 +- + tools/verification/rvgen/rvgen/templates/kunit.c | 33 + + .../rvgen/rvgen/templates/ltl2k/main.c | 8 +- + .../rvgen/tests/golden/da_global/Kconfig | 9 + + .../rvgen/tests/golden/da_global/da_global.c | 95 + + .../rvgen/tests/golden/da_global/da_global.h | 47 + + .../rvgen/tests/golden/da_global/da_global_trace.h | 15 + + .../rvgen/tests/golden/da_perobj_parent/Kconfig | 11 + + .../golden/da_perobj_parent/da_perobj_parent.c | 119 ++ + .../golden/da_perobj_parent/da_perobj_parent.h | 64 + + .../da_perobj_parent/da_perobj_parent_trace.h | 15 + + .../rvgen/tests/golden/da_pertask_desc/Kconfig | 9 + + .../tests/golden/da_pertask_desc/da_pertask_desc.c | 105 + + .../tests/golden/da_pertask_desc/da_pertask_desc.h | 64 + + .../golden/da_pertask_desc/da_pertask_desc_trace.h | 15 + + .../rvgen/tests/golden/ha_percpu/Kconfig | 9 + + .../rvgen/tests/golden/ha_percpu/ha_percpu.c | 227 +++ + .../rvgen/tests/golden/ha_percpu/ha_percpu.h | 72 + + .../rvgen/tests/golden/ha_percpu/ha_percpu_trace.h | 19 + + .../rvgen/tests/golden/ltl_pertask/Kconfig | 9 + + .../rvgen/tests/golden/ltl_pertask/ltl_pertask.c | 107 + + .../rvgen/tests/golden/ltl_pertask/ltl_pertask.h | 108 + + .../tests/golden/ltl_pertask/ltl_pertask_trace.h | 14 + + .../rvgen/tests/golden/test_bak_kunit/Kconfig | 9 + + .../tests/golden/test_bak_kunit/test_bak_kunit.c | 107 + + .../tests/golden/test_bak_kunit/test_bak_kunit.h | 108 + + .../golden/test_bak_kunit/test_bak_kunit_kunit.c | 33 + + .../test_bak_kunit/test_bak_kunit_kunit.c.bak | 1 + + .../golden/test_bak_kunit/test_bak_kunit_kunit.h | 22 + + .../golden/test_bak_kunit/test_bak_kunit_trace.h | 14 + + .../rvgen/tests/golden/test_container/Kconfig | 5 + + .../tests/golden/test_container/test_container.c | 35 + + .../tests/golden/test_container/test_container.h | 3 + + .../rvgen/tests/golden/test_da/Kconfig | 9 + + .../rvgen/tests/golden/test_da/test_da.c | 95 + + .../rvgen/tests/golden/test_da/test_da.h | 47 + + .../rvgen/tests/golden/test_da/test_da_trace.h | 15 + + .../rvgen/tests/golden/test_da_kunit/Kconfig | 9 + + .../tests/golden/test_da_kunit/test_da_kunit.c | 107 + + .../tests/golden/test_da_kunit/test_da_kunit.h | 47 + + .../golden/test_da_kunit/test_da_kunit_kunit.c | 33 + + .../golden/test_da_kunit/test_da_kunit_kunit.h | 23 + + .../golden/test_da_kunit/test_da_kunit_trace.h | 15 + + .../rvgen/tests/golden/test_ha/Kconfig | 9 + + .../rvgen/tests/golden/test_ha/test_ha.c | 230 +++ + .../rvgen/tests/golden/test_ha/test_ha.h | 72 + + .../rvgen/tests/golden/test_ha/test_ha_trace.h | 19 + + .../rvgen/tests/golden/test_ha_kunit/Kconfig | 9 + + .../tests/golden/test_ha_kunit/test_ha_kunit.c | 243 +++ + .../tests/golden/test_ha_kunit/test_ha_kunit.h | 88 + + .../golden/test_ha_kunit/test_ha_kunit_kunit.c | 33 + + .../golden/test_ha_kunit/test_ha_kunit_kunit.h | 24 + + .../golden/test_ha_kunit/test_ha_kunit_trace.h | 19 + + .../rvgen/tests/golden/test_ltl/Kconfig | 11 + + .../rvgen/tests/golden/test_ltl/test_ltl.c | 108 + + .../rvgen/tests/golden/test_ltl/test_ltl.h | 108 + + .../rvgen/tests/golden/test_ltl/test_ltl_trace.h | 14 + + .../rvgen/tests/golden/test_ltl_kunit/Kconfig | 9 + + .../tests/golden/test_ltl_kunit/test_ltl_kunit.c | 107 + + .../tests/golden/test_ltl_kunit/test_ltl_kunit.h | 108 + + .../golden/test_ltl_kunit/test_ltl_kunit_kunit.c | 33 + + .../golden/test_ltl_kunit/test_ltl_kunit_kunit.h | 22 + + .../golden/test_ltl_kunit/test_ltl_kunit_trace.h | 14 + + tools/verification/rvgen/tests/rvgen_container.t | 20 + + tools/verification/rvgen/tests/rvgen_kunit.t | 41 + + tools/verification/rvgen/tests/rvgen_monitor.t | 87 + + tools/verification/rvgen/tests/specs/test_da.dot | 16 + + tools/verification/rvgen/tests/specs/test_da2.dot | 19 + + tools/verification/rvgen/tests/specs/test_ha.dot | 27 + + .../rvgen/tests/specs/test_invalid.dot | 8 + + .../rvgen/tests/specs/test_invalid.ltl | 1 + + .../rvgen/tests/specs/test_invalid_ha.dot | 16 + + tools/verification/rvgen/tests/specs/test_ltl.ltl | 1 + + tools/verification/tests/engine.sh | 175 ++ + 2416 files changed, 82891 insertions(+), 28683 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-spi-master + create mode 100644 Documentation/ABI/testing/sysfs-firmware-sev-vulnerabilities + delete mode 100644 Documentation/devicetree/bindings/arm/omap/l4.txt + delete mode 100644 Documentation/devicetree/bindings/arm/xen.txt + create mode 100644 Documentation/devicetree/bindings/arm/xen.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/ti,da850-mstpri.txt + create mode 100644 Documentation/devicetree/bindings/bus/ti,da850-mstpri.yaml + create mode 100644 Documentation/devicetree/bindings/bus/ti,omap-l4.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/realtek,rtd1625-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/adi,adt7470.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/eswin,eic7700-pvt.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/adi,vt7505.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/silergy,sq24860.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/sensirion,sht30.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/smsc,emc1403.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/altr,softip-i2c-v1.0.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-altera.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-axxia.txt + create mode 100644 Documentation/devicetree/bindings/i2c/lsi,api2c.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/qcom,sa8255p-geni-i2c.yaml + create mode 100644 Documentation/devicetree/bindings/input/imagis,isa1200.yaml + create mode 100644 Documentation/devicetree/bindings/input/ti,tps65217-pwrbutton.yaml + delete mode 100644 Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt + delete mode 100644 Documentation/devicetree/bindings/iommu/ti,omap-iommu.txt + create mode 100644 Documentation/devicetree/bindings/iommu/ti,omap-iommu.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx678.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,milos-iris.yaml + create mode 100644 Documentation/devicetree/bindings/media/ti,am437x-vpfe.yaml + delete mode 100644 Documentation/devicetree/bindings/media/ti,da850-vpif.txt + create mode 100644 Documentation/devicetree/bindings/media/ti,da850-vpif.yaml + delete mode 100644 Documentation/devicetree/bindings/media/ti-am437x-vpfe.txt + create mode 100644 Documentation/devicetree/bindings/power/renesas,r8a78000-mdlc.yaml + delete mode 100644 Documentation/devicetree/bindings/power/reset/keystone-reset.txt + create mode 100644 Documentation/devicetree/bindings/power/reset/ti,keystone-reset.yaml + create mode 100644 Documentation/devicetree/bindings/power/ti,smartreflex.yaml + delete mode 100644 Documentation/devicetree/bindings/power/ti-smartreflex.txt + create mode 100644 Documentation/devicetree/bindings/regulator/lltc,ltc3589.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/ltc3589.txt + delete mode 100644 Documentation/devicetree/bindings/regulator/pbias-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/rohm,pmic-states.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/ti,pbias-omap.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps51632.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/tps51632-regulator.txt + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs35l36.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/cs35l36.txt + create mode 100644 Documentation/devicetree/bindings/sound/eukrea,asoc-tlv320.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/eukrea-tlv320.txt + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mtk-btcvsd-snd.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mtk-btcvsd-snd.txt + delete mode 100644 Documentation/devicetree/bindings/sound/omap-dmic.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,wsa8855.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,omap4-dmic.yaml + create mode 100644 Documentation/devicetree/bindings/spi/cavium,octeon-3010-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/nuvoton,ma35d1-qspi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/qcom,sa8255p-geni-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-octeon.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32-dmt.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32mzda-dmt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32mzda-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/nuvoton,ma35d1-wdt.yaml + create mode 100644 Documentation/hwmon/kb9002.rst + create mode 100644 Documentation/hwmon/mpq82d00.rst + create mode 100644 Documentation/hwmon/mpq8646.rst + create mode 100644 Documentation/hwmon/sq24860.rst + create mode 100644 Documentation/hwmon/tvs-mpfs.rst + create mode 100644 Documentation/hwmon/vt7505.rst + create mode 100644 Documentation/process/maintainer-devicetree.rst + create mode 100644 Documentation/spi/instantiating-devices.rst + create mode 100644 Documentation/userspace-api/media/v4l/metafmt-rppx1.rst + create mode 100644 Documentation/watchdog/npcm_wdt.rst + create mode 100644 drivers/base/test/swnode-devlink-test.c + rename drivers/{crypto => char/hw_random}/qcom-rng.c (53%) + delete mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c + delete mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c + delete mode 100644 drivers/crypto/caam/caamprng.c + create mode 100644 drivers/gpio/gpio-rtd1625.c + create mode 100644 drivers/hid/hid-hyperx.c + create mode 100644 drivers/hid/hid-msi.c + create mode 100644 drivers/hid/hid-steelseries-arctis.c + create mode 100644 drivers/hid/i2c-hid/i2c-hid-acpi-prp0001.c + create mode 100644 drivers/hid/i2c-hid/i2c-hid-acpi.h + create mode 100644 drivers/hwmon/eic7700-pvt.c + create mode 100644 drivers/hwmon/eic7700-pvt.h + create mode 100644 drivers/hwmon/kb9002.c + create mode 100644 drivers/hwmon/pmbus/mpq82d00.c + create mode 100644 drivers/hwmon/pmbus/mpq8646.c + create mode 100644 drivers/hwmon/pmbus/sq24860.c + create mode 100644 drivers/hwmon/pmbus/vt7505.c + create mode 100644 drivers/hwmon/tvs-mpfs.c + delete mode 100644 drivers/input/keyboard/hpps2atkbd.h + create mode 100644 drivers/input/misc/amd_sfh_tabletmode.c + create mode 100644 drivers/input/misc/isa1200.c + create mode 100644 drivers/iommu/iommufd/hwpt_noiommu.c + create mode 100644 drivers/media/i2c/imx471.c + create mode 100644 drivers/media/i2c/imx678.c + create mode 100644 drivers/media/platform/dreamchip/Kconfig + create mode 100644 drivers/media/platform/dreamchip/Makefile + create mode 100644 drivers/media/platform/dreamchip/rppx1/Kconfig + create mode 100644 drivers/media/platform/dreamchip/rppx1/Makefile + create mode 100644 drivers/media/platform/dreamchip/rppx1/rpp_module.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rpp_module.h + create mode 100644 drivers/media/platform/dreamchip/rppx1/rpp_params.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rpp_stats.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1.h + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_acq.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_awbg.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_bd.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_bdrgb.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_bls.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_cac.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_ccor.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_db.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_dpcc.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_exm.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_ga.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_hist.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_hist256.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_is.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_lin.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_lsc.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_ltm.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_ltmmeas.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_outif.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_outregs.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_rmap.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_rmapmeas.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_shrp.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_wbmeas.c + create mode 100644 drivers/media/platform/dreamchip/rppx1/rppx1_xyz2luv.c + create mode 100644 drivers/media/platform/qcom/iris/iris_platform_milos.h + create mode 100644 drivers/media/platform/renesas/rcar-isp/core-io.c + create mode 100644 drivers/media/platform/renesas/rcar-isp/core.c + create mode 100644 drivers/media/platform/renesas/rcar-isp/risp-core.h + rename drivers/media/rc/keymaps/{rc-videomate-m1f.c => rc-videomate-k100.c} (97%) + create mode 100644 drivers/pmdomain/mediatek/mt6858-pm-domains.h + create mode 100644 drivers/pmdomain/renesas/r8a78000-mdlc.c + create mode 100644 drivers/regulator/sc2730-regulator.c + create mode 100644 drivers/spi/.kunitconfig + create mode 100644 drivers/spi/spi-ma35d1-qspi.c + create mode 100644 drivers/spi/tests/Makefile + create mode 100644 drivers/spi/tests/spi-dma-kunit.c + create mode 100644 drivers/watchdog/lenovo_se30g2_se60_wdt.c + create mode 100644 drivers/watchdog/ma35d1_wdt.c + create mode 100644 drivers/watchdog/pretimeout_dump.c + create mode 100644 include/dt-bindings/power/amlogic,a9-pwrc.h + create mode 100644 include/dt-bindings/power/mediatek,mt6858-power.h + create mode 100644 include/dt-bindings/power/renesas,r8a78000-mdlc.h + create mode 100644 include/dt-bindings/regulator/fcs,fan53555-regulator.h + create mode 100644 include/kunit/fwnode.h + delete mode 100644 include/linux/platform_data/omap-twl4030.h + create mode 100644 include/media/rppx1.h + create mode 100644 include/rv/kunit.h + create mode 100644 include/sound/aw88399.h + delete mode 100644 include/sound/tlv320aic32x4.h + create mode 100644 include/trace/events/qcom_geni_i2c.h + create mode 100644 include/trace/events/qcom_geni_se.h + create mode 100644 include/uapi/linux/media/dreamchip/rppx1-config.h + delete mode 100644 include/uapi/sound/skl-tplg-interface.h + delete mode 100644 include/uapi/sound/snd_sst_tokens.h + create mode 100644 kernel/trace/rv/monitors/nomiss/nomiss_kunit.c + create mode 100644 kernel/trace/rv/monitors/nomiss/nomiss_kunit.h + create mode 100644 kernel/trace/rv/monitors/opid/opid_kunit.c + create mode 100644 kernel/trace/rv/monitors/opid/opid_kunit.h + create mode 100644 kernel/trace/rv/monitors/pagefault/pagefault_kunit.c + create mode 100644 kernel/trace/rv/monitors/pagefault/pagefault_kunit.h + create mode 100644 kernel/trace/rv/monitors/sco/sco_kunit.c + create mode 100644 kernel/trace/rv/monitors/sco/sco_kunit.h + create mode 100644 kernel/trace/rv/monitors/sleep/sleep_kunit.c + create mode 100644 kernel/trace/rv/monitors/sleep/sleep_kunit.h + create mode 100644 kernel/trace/rv/monitors/sssw/sssw_kunit.c + create mode 100644 kernel/trace/rv/monitors/sssw/sssw_kunit.h + create mode 100644 kernel/trace/rv/monitors/sts/sts_kunit.c + create mode 100644 kernel/trace/rv/monitors/sts/sts_kunit.h + create mode 100644 kernel/trace/rv/monitors/wakeup/Kconfig + create mode 100644 kernel/trace/rv/monitors/wakeup/wakeup.c + create mode 100644 kernel/trace/rv/monitors/wakeup/wakeup.h + create mode 100644 kernel/trace/rv/monitors/wakeup/wakeup_trace.h + create mode 100644 kernel/trace/rv/rv_monitors_test.c + create mode 100644 lib/kunit/fwnode.c + delete mode 100644 rust/helpers/acpi.c + create mode 100644 rust/helpers/fwctl.c + create mode 100644 rust/helpers/serdev.c + create mode 100644 rust/kernel/fwctl.rs + create mode 100644 rust/kernel/serdev.rs + create mode 100644 samples/rust/rust_driver_serdev.rs + create mode 100644 scripts/coccinelle/hid/ff_race.cocci + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-child-name-order.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-extend-node-child-name-order.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-extend-node-digit-node-order.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-mixed-indent.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-property-order.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/yaml-prop-order-device-type.yaml + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-child-name-order.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-extend-node-child-name-order.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-extend-node-digit-node-order.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-mixed-indent.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-property-order.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/yaml-prop-order-device-type.yaml.txt + create mode 100644 scripts/dtc/dt-style-selftest/good/dts-child-name-order.dts + create mode 100644 scripts/dtc/dt-style-selftest/good/dts-digit-node-order.dts + create mode 100644 scripts/dtc/dt-style-selftest/good/dts-dtc.dts + create mode 100644 scripts/dtc/dt-style-selftest/good/dts-extend-node-child-name-order.dts + create mode 100644 scripts/dtc/dt-style-selftest/good/dts-extend-node-digit-node-order.dts + create mode 100644 scripts/dtc/dt-style-selftest/good/dts-preprocessor.dts + create mode 100644 scripts/dtc/dt-style-selftest/good/dts-property-order.dts + create mode 100644 scripts/dtc/dt-style-selftest/good/soc.dtsi + create mode 100644 sound/hda/codecs/helpers/razer_blade16_2025.c + create mode 100644 sound/hda/codecs/side-codecs/aw88399_hda.c + create mode 100644 sound/hda/codecs/side-codecs/aw88399_hda.h + create mode 100644 sound/hda/codecs/side-codecs/aw88399_hda_i2c.c + create mode 100644 sound/soc/codecs/aw88399-lib.c + create mode 100644 sound/soc/codecs/rt766-sdca-sdw.c + create mode 100644 sound/soc/codecs/rt766-sdca-sdw.h + create mode 100644 sound/soc/codecs/rt766-sdca.c + create mode 100644 sound/soc/codecs/rt766-sdca.h + create mode 100644 sound/soc/codecs/wsa885x.c + create mode 100644 sound/soc/meson/aiu-formatter-i2s.c + create mode 100644 sound/soc/meson/gx-formatter.c + create mode 100644 sound/soc/meson/gx-formatter.h + create mode 100644 sound/soc/meson/gx-interface.h + create mode 100644 sound/soc/sof/amd/acp7x.c + create mode 100644 sound/soc/sof/amd/pci-acp7x.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/tp_btf_ids.c + create mode 100644 tools/testing/selftests/verification/test.d/rv_deadline.tc + create mode 100644 tools/testing/selftests/verification/test.d/rv_stall.tc + create mode 100755 tools/tracing/rtla/tests/scripts/check-osnoise-option.sh + create mode 100755 tools/tracing/rtla/tests/scripts/check-tracefs-value.sh + create mode 100644 tools/verification/models/rtapp/wakeup.ltl + create mode 100644 tools/verification/rv/tests/rv_list.t + create mode 100644 tools/verification/rv/tests/rv_mon.t + create mode 100644 tools/verification/rvgen/rvgen/kunit.py + create mode 100644 tools/verification/rvgen/rvgen/templates/kunit.c + create mode 100644 tools/verification/rvgen/tests/golden/da_global/Kconfig + create mode 100644 tools/verification/rvgen/tests/golden/da_global/da_global.c + create mode 100644 tools/verification/rvgen/tests/golden/da_global/da_global.h + create mode 100644 tools/verification/rvgen/tests/golden/da_global/da_global_trace.h + create mode 100644 tools/verification/rvgen/tests/golden/da_perobj_parent/Kconfig + create mode 100644 tools/verification/rvgen/tests/golden/da_perobj_parent/da_perobj_parent.c + create mode 100644 tools/verification/rvgen/tests/golden/da_perobj_parent/da_perobj_parent.h + create mode 100644 tools/verification/rvgen/tests/golden/da_perobj_parent/da_perobj_parent_trace.h + create mode 100644 tools/verification/rvgen/tests/golden/da_pertask_desc/Kconfig + create mode 100644 tools/verification/rvgen/tests/golden/da_pertask_desc/da_pertask_desc.c + create mode 100644 tools/verification/rvgen/tests/golden/da_pertask_desc/da_pertask_desc.h + create mode 100644 tools/verification/rvgen/tests/golden/da_pertask_desc/da_pertask_desc_trace.h + create mode 100644 tools/verification/rvgen/tests/golden/ha_percpu/Kconfig + create mode 100644 tools/verification/rvgen/tests/golden/ha_percpu/ha_percpu.c + create mode 100644 tools/verification/rvgen/tests/golden/ha_percpu/ha_percpu.h + create mode 100644 tools/verification/rvgen/tests/golden/ha_percpu/ha_percpu_trace.h + create mode 100644 tools/verification/rvgen/tests/golden/ltl_pertask/Kconfig + create mode 100644 tools/verification/rvgen/tests/golden/ltl_pertask/ltl_pertask.c + create mode 100644 tools/verification/rvgen/tests/golden/ltl_pertask/ltl_pertask.h + create mode 100644 tools/verification/rvgen/tests/golden/ltl_pertask/ltl_pertask_trace.h + create mode 100644 tools/verification/rvgen/tests/golden/test_bak_kunit/Kconfig + create mode 100644 tools/verification/rvgen/tests/golden/test_bak_kunit/test_bak_kunit.c + create mode 100644 tools/verification/rvgen/tests/golden/test_bak_kunit/test_bak_kunit.h + create mode 100644 tools/verification/rvgen/tests/golden/test_bak_kunit/test_bak_kunit_kunit.c + create mode 100644 tools/verification/rvgen/tests/golden/test_bak_kunit/test_bak_kunit_kunit.c.bak + create mode 100644 tools/verification/rvgen/tests/golden/test_bak_kunit/test_bak_kunit_kunit.h + create mode 100644 tools/verification/rvgen/tests/golden/test_bak_kunit/test_bak_kunit_trace.h + create mode 100644 tools/verification/rvgen/tests/golden/test_container/Kconfig + create mode 100644 tools/verification/rvgen/tests/golden/test_container/test_container.c + create mode 100644 tools/verification/rvgen/tests/golden/test_container/test_container.h + create mode 100644 tools/verification/rvgen/tests/golden/test_da/Kconfig + create mode 100644 tools/verification/rvgen/tests/golden/test_da/test_da.c + create mode 100644 tools/verification/rvgen/tests/golden/test_da/test_da.h + create mode 100644 tools/verification/rvgen/tests/golden/test_da/test_da_trace.h + create mode 100644 tools/verification/rvgen/tests/golden/test_da_kunit/Kconfig + create mode 100644 tools/verification/rvgen/tests/golden/test_da_kunit/test_da_kunit.c + create mode 100644 tools/verification/rvgen/tests/golden/test_da_kunit/test_da_kunit.h + create mode 100644 tools/verification/rvgen/tests/golden/test_da_kunit/test_da_kunit_kunit.c + create mode 100644 tools/verification/rvgen/tests/golden/test_da_kunit/test_da_kunit_kunit.h + create mode 100644 tools/verification/rvgen/tests/golden/test_da_kunit/test_da_kunit_trace.h + create mode 100644 tools/verification/rvgen/tests/golden/test_ha/Kconfig + create mode 100644 tools/verification/rvgen/tests/golden/test_ha/test_ha.c + create mode 100644 tools/verification/rvgen/tests/golden/test_ha/test_ha.h + create mode 100644 tools/verification/rvgen/tests/golden/test_ha/test_ha_trace.h + create mode 100644 tools/verification/rvgen/tests/golden/test_ha_kunit/Kconfig + create mode 100644 tools/verification/rvgen/tests/golden/test_ha_kunit/test_ha_kunit.c + create mode 100644 tools/verification/rvgen/tests/golden/test_ha_kunit/test_ha_kunit.h + create mode 100644 tools/verification/rvgen/tests/golden/test_ha_kunit/test_ha_kunit_kunit.c + create mode 100644 tools/verification/rvgen/tests/golden/test_ha_kunit/test_ha_kunit_kunit.h + create mode 100644 tools/verification/rvgen/tests/golden/test_ha_kunit/test_ha_kunit_trace.h + create mode 100644 tools/verification/rvgen/tests/golden/test_ltl/Kconfig + create mode 100644 tools/verification/rvgen/tests/golden/test_ltl/test_ltl.c + create mode 100644 tools/verification/rvgen/tests/golden/test_ltl/test_ltl.h + create mode 100644 tools/verification/rvgen/tests/golden/test_ltl/test_ltl_trace.h + create mode 100644 tools/verification/rvgen/tests/golden/test_ltl_kunit/Kconfig + create mode 100644 tools/verification/rvgen/tests/golden/test_ltl_kunit/test_ltl_kunit.c + create mode 100644 tools/verification/rvgen/tests/golden/test_ltl_kunit/test_ltl_kunit.h + create mode 100644 tools/verification/rvgen/tests/golden/test_ltl_kunit/test_ltl_kunit_kunit.c + create mode 100644 tools/verification/rvgen/tests/golden/test_ltl_kunit/test_ltl_kunit_kunit.h + create mode 100644 tools/verification/rvgen/tests/golden/test_ltl_kunit/test_ltl_kunit_trace.h + create mode 100644 tools/verification/rvgen/tests/rvgen_container.t + create mode 100644 tools/verification/rvgen/tests/rvgen_kunit.t + create mode 100644 tools/verification/rvgen/tests/rvgen_monitor.t + create mode 100644 tools/verification/rvgen/tests/specs/test_da.dot + create mode 100644 tools/verification/rvgen/tests/specs/test_da2.dot + create mode 100644 tools/verification/rvgen/tests/specs/test_ha.dot + create mode 100644 tools/verification/rvgen/tests/specs/test_invalid.dot + create mode 100644 tools/verification/rvgen/tests/specs/test_invalid.ltl + create mode 100644 tools/verification/rvgen/tests/specs/test_invalid_ha.dot + create mode 100644 tools/verification/rvgen/tests/specs/test_ltl.ltl + create mode 100644 tools/verification/tests/engine.sh +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 (5c4851e4cdfc3 lockd: fix NLMv3 GRANTED_MSG handling) +$ 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 +Auto-merging fs/btrfs/direct-io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/volumes.h +Merge made by the 'ort' strategy. + fs/btrfs/Kconfig | 1 + + fs/btrfs/acl.c | 4 + + fs/btrfs/block-group.c | 13 +- + fs/btrfs/block-group.h | 4 +- + fs/btrfs/compression.c | 14 +- + fs/btrfs/ctree.c | 36 ++- + fs/btrfs/ctree.h | 6 +- + fs/btrfs/defrag.c | 61 +++-- + fs/btrfs/delayed-inode.c | 12 +- + fs/btrfs/direct-io.c | 210 +++++++------- + fs/btrfs/disk-io.c | 153 +++++++---- + fs/btrfs/disk-io.h | 2 + + fs/btrfs/extent-io-tree.c | 21 ++ + fs/btrfs/extent-tree.c | 28 +- + fs/btrfs/extent_io.c | 637 ++++++++++++++++++++++++++++++++----------- + fs/btrfs/extent_io.h | 29 ++ + fs/btrfs/fiemap.c | 6 +- + fs/btrfs/file.c | 120 ++++---- + fs/btrfs/fs.c | 19 +- + fs/btrfs/fs.h | 6 +- + fs/btrfs/inode.c | 86 ++++-- + fs/btrfs/ioctl.c | 138 ++++++---- + fs/btrfs/messages.c | 10 +- + fs/btrfs/qgroup.c | 26 +- + fs/btrfs/raid56.c | 18 +- + fs/btrfs/raid56.h | 2 +- + fs/btrfs/reflink.c | 111 ++++---- + fs/btrfs/relocation.c | 97 +++++-- + fs/btrfs/root-tree.c | 6 +- + fs/btrfs/scrub.c | 234 +++++++--------- + fs/btrfs/send.c | 17 +- + fs/btrfs/space-info.c | 2 +- + fs/btrfs/subpage.c | 7 +- + fs/btrfs/subpage.h | 3 +- + fs/btrfs/super.c | 37 +-- + fs/btrfs/sysfs.c | 2 +- + fs/btrfs/transaction.c | 36 ++- + fs/btrfs/transaction.h | 25 +- + fs/btrfs/tree-log.c | 99 +++---- + fs/btrfs/verity.c | 18 +- + fs/btrfs/volumes.c | 64 ++--- + fs/btrfs/volumes.h | 10 +- + include/trace/events/btrfs.h | 4 +- + 43 files changed, 1448 insertions(+), 986 deletions(-) +Merging ceph/master (91880e4a7fac4 ceph: use the mount idmap for the owner checks in the SET_LAYOUT ioctls) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (9ca668da8e4c9 smb/client: return EOPNOTSUPP for unsupported O_TMPFILE) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging fs/smb/client/dir.c +Merge made by the 'ort' strategy. + fs/smb/client/dir.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging configfs/configfs-next (6363844fdbbb7 samples: configfs: Constify struct configfs_item_operations and configfs_group_operations) +$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git configfs/configfs-next +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 +Merge made by the 'ort' strategy. + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 15 ++++++++------- + fs/ecryptfs/keystore.c | 45 +++++++++++++++++++++++++++++++++++++------ + fs/ecryptfs/messaging.c | 11 ++++++++++- + fs/ecryptfs/miscdev.c | 5 +++-- + fs/ecryptfs/mmap.c | 30 +++++------------------------ + fs/ecryptfs/super.c | 7 +++++++ + 7 files changed, 73 insertions(+), 42 deletions(-) +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 (988c3c186c730 erofs: fix unused pcluster_pools for higher page sizes) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Auto-merging fs/erofs/data.c +Auto-merging fs/erofs/super.c +Auto-merging fs/erofs/zdata.c +Auto-merging fs/erofs/zmap.c +Merge made by the 'ort' strategy. + Documentation/filesystems/erofs.rst | 17 ++++++ + fs/erofs/data.c | 28 +++------ + fs/erofs/decompressor.c | 1 + + fs/erofs/fileio.c | 21 +++++++ + fs/erofs/internal.h | 14 +++-- + fs/erofs/super.c | 112 ++++++++++++++++++++++++++++-------- + fs/erofs/zdata.c | 25 ++++---- + fs/erofs/zmap.c | 38 +++++++----- + 8 files changed, 182 insertions(+), 74 deletions(-) +Merging exfat/dev (490529f668016 exfat: replace truncate_lock with inode_lock) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Auto-merging MAINTAINERS +Auto-merging fs/exfat/iomap.c +Auto-merging fs/exfat/namei.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + fs/exfat/balloc.c | 31 +++++---- + fs/exfat/dir.c | 10 ++- + fs/exfat/exfat_fs.h | 8 +-- + fs/exfat/file.c | 184 ++++++++++++++++++++++++++++++++++++++++------------ + fs/exfat/inode.c | 5 +- + fs/exfat/iomap.c | 11 +++- + fs/exfat/namei.c | 27 ++++++-- + fs/exfat/super.c | 1 - + 9 files changed, 207 insertions(+), 72 deletions(-) +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 +Auto-merging MAINTAINERS +Auto-merging arch/loongarch/configs/loongson32_defconfig +Auto-merging arch/loongarch/configs/loongson64_defconfig +Auto-merging fs/ext2/xattr.c +CONFLICT (content): Merge conflict in fs/ext2/xattr.c +Auto-merging fs/udf/inode.c +Auto-merging fs/udf/super.c +Auto-merging fs/udf/udfdecl.h +Resolved 'fs/ext2/xattr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 4a285d7cd9333] Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 - + arch/loongarch/configs/loongson32_defconfig | 1 - + arch/loongarch/configs/loongson64_defconfig | 1 - + arch/mips/configs/bigsur_defconfig | 1 - + arch/mips/configs/ip22_defconfig | 1 - + arch/mips/configs/loongson2k_defconfig | 1 - + drivers/tty/tty_io.c | 27 ----- + fs/ext2/xattr.c | 14 +-- + fs/isofs/compress.c | 7 +- + fs/isofs/dir.c | 31 +----- + fs/isofs/export.c | 10 +- + fs/isofs/isofs.h | 3 + + fs/isofs/namei.c | 59 +++++----- + fs/notify/fanotify/fanotify.c | 4 +- + fs/notify/fanotify/fanotify.h | 6 +- + fs/notify/fanotify/fanotify_user.c | 29 +++-- + fs/notify/inotify/inotify_user.c | 15 +-- + fs/quota/Kconfig | 10 -- + fs/quota/dquot.c | 81 +------------- + fs/udf/balloc.c | 12 ++- + fs/udf/inode.c | 162 +++++++++++++++++----------- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 23 ++-- + fs/udf/symlink.c | 2 + + fs/udf/truncate.c | 2 +- + fs/udf/udfdecl.h | 3 +- + 26 files changed, 211 insertions(+), 297 deletions(-) +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 +Auto-merging fs/buffer.c +Auto-merging fs/ext4/crypto.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/ext4_jbd2.c +Auto-merging fs/ext4/extents.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/super.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + Documentation/filesystems/ext4/group_descr.rst | 9 +- + fs/buffer.c | 3 + + fs/ext4/balloc.c | 4 + + fs/ext4/crypto.c | 40 ++--- + fs/ext4/dir.c | 20 ++- + fs/ext4/ext4.h | 40 +++-- + fs/ext4/ext4_jbd2.c | 34 ++-- + fs/ext4/ext4_jbd2.h | 6 +- + fs/ext4/extents.c | 184 +++++++++++++++++----- + fs/ext4/fast_commit.c | 37 ++--- + fs/ext4/file.c | 151 ++++++++++++------ + fs/ext4/ialloc.c | 4 + + fs/ext4/inline.c | 38 +++-- + fs/ext4/inode.c | 207 ++++++++++++++++++------- + fs/ext4/mballoc.c | 21 +-- + fs/ext4/migrate.c | 3 +- + fs/ext4/namei.c | 2 + + fs/ext4/orphan.c | 17 +- + fs/ext4/super.c | 32 +++- + fs/ext4/xattr.c | 178 +++++++++++---------- + fs/ext4/xattr.h | 9 +- + fs/jbd2/checkpoint.c | 28 ++-- + fs/jbd2/journal.c | 1 + + include/linux/fs.h | 15 ++ + include/linux/jbd2.h | 11 +- + 25 files changed, 734 insertions(+), 360 deletions(-) +Merging f2fs/dev (0a1703eba2370 f2fs: fix to avoid pinfile fragment on fragment:{block, segment} mode) +$ 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 | 10 + + Documentation/filesystems/f2fs.rst | 35 +++ + fs/f2fs/checkpoint.c | 27 +- + 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 | 78 +++++- + fs/f2fs/file.c | 438 +++++++++++++++++++++++++++++--- + fs/f2fs/gc.c | 102 +++++--- + fs/f2fs/gc.h | 27 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/inode.c | 224 +++++++++++----- + fs/f2fs/iostat.c | 6 + + fs/f2fs/namei.c | 20 +- + fs/f2fs/node.c | 5 +- + fs/f2fs/recovery.c | 55 ++-- + fs/f2fs/segment.c | 252 +++++++++++++----- + fs/f2fs/segment.h | 36 ++- + fs/f2fs/shrinker.c | 3 +- + fs/f2fs/super.c | 59 ++++- + fs/f2fs/sysfs.c | 32 ++- + fs/f2fs/xattr.c | 2 +- + include/trace/events/f2fs.h | 20 +- + include/uapi/linux/f2fs.h | 7 + + 25 files changed, 1183 insertions(+), 327 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 (d1dbc59200b54 fuse: wake one waiter per freed slot when raising max_background) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging drivers/block/ublk_drv.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/file.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging include/linux/iomap.h +Auto-merging io_uring/rsrc.c +Merge made by the 'ort' strategy. + Documentation/block/ublk.rst | 14 +- + Documentation/filesystems/fuse/fuse-io-uring.rst | 32 ++ + Documentation/filesystems/fuse/index.rst | 1 + + .../filesystems/fuse/uapi/fuse-uapi-io-uring.rst | 126 +++++ + drivers/block/ublk_drv.c | 22 +- + fs/fuse/args.h | 2 + + fs/fuse/cuse.c | 8 +- + fs/fuse/dev.c | 104 ++-- + fs/fuse/dev.h | 2 +- + fs/fuse/dev_uring.c | 608 ++++++++++++++++++--- + fs/fuse/dev_uring_i.h | 56 +- + fs/fuse/dir.c | 34 +- + fs/fuse/file.c | 6 +- + fs/fuse/fuse_dev_i.h | 5 + + fs/fuse/fuse_i.h | 2 + + fs/fuse/inode.c | 12 +- + fs/fuse/readdir.c | 2 +- + fs/fuse/req_timeout.c | 12 +- + include/linux/io_uring/cmd.h | 38 +- + include/linux/io_uring_types.h | 5 + + include/uapi/linux/fuse.h | 63 ++- + io_uring/io_uring.c | 2 +- + io_uring/rsrc.c | 131 +++-- + io_uring/rsrc.h | 5 - + 24 files changed, 1072 insertions(+), 220 deletions(-) + create mode 100644 Documentation/filesystems/fuse/uapi/fuse-uapi-io-uring.rst +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 (4a5b945de8f67 MAINTAINERS: add myself as KSMBD reviewer) +$ 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 +Auto-merging fs/smb/server/auth.c +Auto-merging fs/smb/server/mgmt/share_config.c +Auto-merging fs/smb/server/smb2pdu.c +Auto-merging fs/smb/server/vfs.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + fs/smb/client/smb2pdu.h | 24 - + fs/smb/common/fscc.h | 15 + + fs/smb/common/smb2pdu.h | 39 +- + fs/smb/common/smb2status.h | 1 + + fs/smb/common/smbfsctl.h | 1 + + fs/smb/common/smbglob.h | 1 + + fs/smb/server/Kconfig | 1 - + fs/smb/server/auth.c | 215 ++- + fs/smb/server/auth.h | 4 + + fs/smb/server/compress.c | 76 +- + fs/smb/server/compress.h | 1 + + fs/smb/server/connection.c | 223 ++- + fs/smb/server/connection.h | 47 +- + fs/smb/server/ksmbd_netlink.h | 8 +- + fs/smb/server/ksmbd_work.c | 5 + + fs/smb/server/ksmbd_work.h | 14 + + fs/smb/server/mgmt/share_config.c | 65 +- + fs/smb/server/mgmt/share_config.h | 25 + + fs/smb/server/mgmt/tree_connect.c | 2 + + fs/smb/server/mgmt/user_config.c | 18 +- + fs/smb/server/mgmt/user_session.c | 248 +-- + fs/smb/server/mgmt/user_session.h | 4 + + fs/smb/server/misc.h | 11 +- + fs/smb/server/oplock.c | 344 +++- + fs/smb/server/oplock.h | 8 +- + fs/smb/server/proc.c | 170 +- + fs/smb/server/server.c | 86 +- + fs/smb/server/server.h | 2 + + fs/smb/server/smb2misc.c | 79 + + fs/smb/server/smb2ops.c | 22 +- + fs/smb/server/smb2pdu.c | 3175 ++++++++++++++++++++++++++++++++----- + fs/smb/server/smb2pdu.h | 82 + + fs/smb/server/smb_common.c | 17 +- + fs/smb/server/smb_common.h | 2 +- + fs/smb/server/smbacl.c | 115 +- + fs/smb/server/smbacl.h | 3 +- + fs/smb/server/stats.h | 57 +- + fs/smb/server/transport_ipc.c | 27 +- + fs/smb/server/transport_rdma.c | 19 +- + fs/smb/server/transport_rdma.h | 2 + + fs/smb/server/transport_tcp.c | 31 +- + fs/smb/server/vfs.c | 559 ++++++- + fs/smb/server/vfs.h | 20 +- + fs/smb/server/vfs_cache.c | 280 +++- + fs/smb/server/vfs_cache.h | 43 +- + fs/smb/smbdirect/accept.c | 16 +- + fs/smb/smbdirect/connection.c | 13 +- + fs/smb/smbdirect/socket.c | 98 +- + 49 files changed, 5446 insertions(+), 874 deletions(-) +$ git am -3 ../patches/0001-ntfs3-Fix-up-merge-with-Linus.patch +Applying: ntfs3: Fix up merge with Linus +Using index info to reconstruct a base tree... +M fs/ntfs3/file.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging nfs/linux-next (265e3f27bb879 NFSv4.1: initialize referring call pointers before decoding) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging fs/nfs/blocklayout/dev.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfs/internal.h +Merge made by the 'ort' strategy. + fs/lockd/clntproc.c | 3 ++ + fs/nfs/blocklayout/dev.c | 21 +++++++--- + fs/nfs/callback_proc.c | 5 ++- + fs/nfs/callback_xdr.c | 1 + + fs/nfs/client.c | 14 ++++++- + fs/nfs/delegation.c | 20 ++++++--- + fs/nfs/dir.c | 17 ++++++++ + fs/nfs/filelayout/filelayoutdev.c | 2 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 26 +++++++++++- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 3 +- + fs/nfs/inode.c | 28 ++++++++++--- + fs/nfs/internal.h | 8 ++-- + fs/nfs/localio.c | 56 +++++++++++++++++++------ + fs/nfs/nfs4client.c | 23 +++++++---- + fs/nfs/nfs4file.c | 2 + + fs/nfs/nfs4proc.c | 69 ++++++++++++++++++++++++++++--- + fs/nfs/nfs4session.c | 21 ++++++---- + fs/nfs/nfs4session.h | 3 +- + fs/nfs/nfs4state.c | 40 ++++++++++++++---- + fs/nfs/nfs4trace.h | 58 +++++++++++++++++++++++++- + fs/nfs/nfs4xdr.c | 35 +++++++++++++++- + fs/nfs/nfstrace.h | 3 +- + fs/nfs/pnfs.c | 57 +++++++++++-------------- + fs/nfs/pnfs.h | 5 ++- + fs/nfs/pnfs_nfs.c | 14 ++++--- + fs/nfs/write.c | 13 +++--- + include/linux/nfs4.h | 9 ++++ + include/linux/nfs_fs.h | 4 ++ + include/linux/nfs_xdr.h | 8 +++- + include/linux/workqueue.h | 1 + + kernel/workqueue.c | 24 +++++++++++ + net/sunrpc/clnt.c | 22 +++++++--- + net/sunrpc/rpcb_clnt.c | 4 ++ + net/sunrpc/xprtsock.c | 32 +++++++++----- + 34 files changed, 516 insertions(+), 135 deletions(-) +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 (46db3c8a1be96 nfsd: export NFSv4 callback op stats via netlink) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging fs/nfs/callback_xdr.c +Auto-merging include/linux/nfs4.h +Merge made by the 'ort' strategy. + .../ABI/testing/procfs-nfsd-reply_cache_stats | 38 + + Documentation/admin-guide/kernel-parameters.txt | 20 +- + Documentation/netlink/specs/nfsd.yaml | 111 ++ + Documentation/sunrpc/xdr/nfs4_1.x | 258 +++- + fs/lockd/lockd.h | 2 +- + fs/lockd/nlm3xdr_gen.c | 30 +- + fs/lockd/nlm3xdr_gen.h | 4 +- + fs/lockd/nlm4xdr_gen.c | 75 +- + fs/lockd/nlm4xdr_gen.h | 4 +- + fs/lockd/share.h | 8 +- + fs/lockd/svc.c | 4 +- + fs/lockd/svc4proc.c | 55 +- + fs/lockd/svclock.c | 42 +- + fs/lockd/svcproc.c | 55 +- + fs/lockd/svcshare.c | 36 +- + fs/lockd/svcsubs.c | 107 +- + fs/nfs/callback.c | 4 +- + fs/nfs/callback_xdr.c | 6 - + fs/nfs_common/nfslocalio.c | 16 +- + fs/nfsd/attr4.h | 162 +++ + fs/nfsd/auth.c | 19 + + fs/nfsd/auth.h | 6 + + fs/nfsd/cache.h | 3 +- + fs/nfsd/filecache.c | 265 ++-- + fs/nfsd/filecache.h | 3 + + fs/nfsd/flexfilelayoutxdr.c | 20 +- + fs/nfsd/localio.c | 11 +- + fs/nfsd/lockd.c | 6 +- + fs/nfsd/netlink.c | 5 + + fs/nfsd/netlink.h | 2 + + fs/nfsd/netns.h | 47 +- + fs/nfsd/nfs2acl.c | 55 +- + fs/nfsd/nfs3acl.c | 20 +- + fs/nfsd/nfs3proc.c | 45 +- + fs/nfsd/nfs3xdr.c | 2 +- + fs/nfsd/nfs4callback.c | 229 +++- + fs/nfsd/nfs4idmap.c | 1 + + fs/nfsd/nfs4layouts.c | 45 +- + fs/nfsd/nfs4proc.c | 412 +++++-- + fs/nfsd/nfs4recover.c | 48 +- + fs/nfsd/nfs4state.c | 1281 ++++++++++++++++---- + fs/nfsd/nfs4xdr.c | 411 ++++++- + fs/nfsd/nfs4xdr_gen.c | 600 ++++++++- + fs/nfsd/nfs4xdr_gen.h | 20 +- + fs/nfsd/nfscache.c | 8 +- + fs/nfsd/nfsctl.c | 435 ++++++- + fs/nfsd/nfsd.h | 214 +--- + fs/nfsd/nfsfh.c | 44 +- + fs/nfsd/nfsfh.h | 3 + + fs/nfsd/nfsproc.c | 12 +- + fs/nfsd/nfssvc.c | 71 +- + fs/nfsd/nfsxdr.c | 34 +- + fs/nfsd/state.h | 97 +- + fs/nfsd/stats.c | 4 +- + fs/nfsd/stats.h | 86 +- + fs/nfsd/trace.h | 43 +- + fs/nfsd/vfs.c | 63 +- + fs/nfsd/vfs.h | 5 +- + fs/nfsd/xdr.h | 1 + + fs/nfsd/xdr3.h | 1 + + fs/nfsd/xdr4.h | 37 +- + fs/nfsd/xdr4cb.h | 12 + + include/linux/lockd/bind.h | 12 +- + include/linux/nfs4.h | 127 -- + include/linux/sunrpc/bc_xprt.h | 5 + + include/linux/sunrpc/stats.h | 6 + + include/linux/sunrpc/svc.h | 4 +- + include/linux/sunrpc/svc_rdma_pcl.h | 4 +- + include/linux/sunrpc/xdrgen/_builtins.h | 32 + + include/linux/sunrpc/xdrgen/_defs.h | 2 + + include/linux/sunrpc/xdrgen/nfs4_1.h | 290 ++++- + include/linux/sunrpc/xdrgen/nlm3.h | 2 +- + include/linux/sunrpc/xdrgen/nlm4.h | 2 +- + include/uapi/linux/nfs4.h | 2 - + include/uapi/linux/nfsd_netlink.h | 36 + + net/sunrpc/auth_gss/auth_gss.c | 6 +- + net/sunrpc/auth_gss/gss_krb5_unseal.c | 3 + + net/sunrpc/auth_gss/gss_krb5_wrap.c | 13 +- + net/sunrpc/auth_gss/gss_rpc_upcall.c | 6 - + net/sunrpc/auth_gss/gss_rpc_upcall.h | 1 - + net/sunrpc/auth_gss/gss_rpc_xdr.c | 15 +- + net/sunrpc/auth_gss/svcauth_gss.c | 8 +- + net/sunrpc/backchannel_rqst.c | 38 +- + net/sunrpc/cache.c | 7 +- + net/sunrpc/stats.c | 2 +- + net/sunrpc/sunrpc_syms.c | 1 + + net/sunrpc/svc.c | 495 ++++---- + net/sunrpc/svc_xprt.c | 6 +- + net/sunrpc/svcauth_unix.c | 4 +- + net/sunrpc/xdr.c | 2 +- + net/sunrpc/xprtrdma/ib_client.c | 42 +- + net/sunrpc/xprtrdma/svc_rdma_pcl.c | 63 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 24 +- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 52 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 47 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 69 +- + tools/net/sunrpc/xdrgen/generators/program.py | 8 + + tools/net/sunrpc/xdrgen/subcmds/declarations.py | 10 +- + tools/net/sunrpc/xdrgen/subcmds/definitions.py | 7 +- + tools/net/sunrpc/xdrgen/subcmds/lint.py | 7 +- + tools/net/sunrpc/xdrgen/subcmds/source.py | 7 +- + .../xdrgen/templates/C/enum/declaration/enum.j2 | 1 + + .../xdrgen/templates/C/pointer/encoder/string.j2 | 2 + + .../C/pointer/encoder/variable_length_opaque.j2 | 2 + + .../xdrgen/templates/C/program/decoder/argument.j2 | 4 - + .../xdrgen/templates/C/program/encoder/result.j2 | 4 - + .../xdrgen/templates/C/struct/encoder/string.j2 | 2 + + .../C/struct/encoder/variable_length_opaque.j2 | 2 + + .../xdrgen/templates/C/union/definition/close.j2 | 6 - + .../xdrgen/tests/bad-procedure-number-negative.x | 20 + + .../xdrgen/tests/bad-procedure-number-too-large.x | 20 + + .../xdrgen/tests/bad-program-number-negative.x | 19 + + .../xdrgen/tests/bad-program-number-too-large.x | 19 + + .../xdrgen/tests/bad-version-number-negative.x | 19 + + .../xdrgen/tests/bad-version-number-too-large.x | 19 + + tools/net/sunrpc/xdrgen/xdr_ast.py | 290 ++++- + tools/net/sunrpc/xdrgen/xdr_parse.py | 46 +- + 117 files changed, 5969 insertions(+), 1736 deletions(-) + create mode 100644 Documentation/ABI/testing/procfs-nfsd-reply_cache_stats + create mode 100644 fs/nfsd/attr4.h + create mode 100644 tools/net/sunrpc/xdrgen/tests/bad-procedure-number-negative.x + create mode 100644 tools/net/sunrpc/xdrgen/tests/bad-procedure-number-too-large.x + create mode 100644 tools/net/sunrpc/xdrgen/tests/bad-program-number-negative.x + create mode 100644 tools/net/sunrpc/xdrgen/tests/bad-program-number-too-large.x + create mode 100644 tools/net/sunrpc/xdrgen/tests/bad-version-number-negative.x + create mode 100644 tools/net/sunrpc/xdrgen/tests/bad-version-number-too-large.x +$ 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 (9969d58a9b041 ntfs: fix resource leak in ntfs_new_attr_flags) +$ git merge -m Merge branch 'ntfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git ntfs/ntfs-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + fs/ntfs/attrib.c | 36 ++++- + fs/ntfs/compress.c | 389 +++++++++++++++++++++++++++++------------------------ + fs/ntfs/dir.c | 5 +- + fs/ntfs/ea.c | 225 +++++++++++++++++++++++-------- + fs/ntfs/ea.h | 3 +- + fs/ntfs/file.c | 81 +++++++---- + fs/ntfs/index.c | 96 ++++++++++--- + fs/ntfs/inode.c | 85 ++++++++++-- + fs/ntfs/inode.h | 3 +- + fs/ntfs/iomap.c | 66 ++++----- + fs/ntfs/lcnalloc.c | 7 +- + fs/ntfs/mft.c | 15 ++- + fs/ntfs/namei.c | 10 +- + fs/ntfs/reparse.c | 13 +- + fs/ntfs/runlist.c | 29 ++++ + fs/ntfs/super.c | 12 +- + 17 files changed, 716 insertions(+), 361 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 +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/namei.c +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 159 +++++++++++++++++----------- + fs/ntfs3/attrlist.c | 15 ++- + fs/ntfs3/dir.c | 132 ++++++++++++++++------- + fs/ntfs3/file.c | 66 ++++++++---- + fs/ntfs3/frecord.c | 199 +++++++++++++++++++++++++++++------ + fs/ntfs3/fslog.c | 68 +++++++++--- + fs/ntfs3/fsntfs.c | 34 ++++-- + fs/ntfs3/index.c | 8 +- + fs/ntfs3/inode.c | 298 +++++++++++++++++++++++++++++++++++++++++++++------- + fs/ntfs3/lznt.c | 4 +- + fs/ntfs3/namei.c | 64 +++++++---- + fs/ntfs3/ntfs.h | 3 +- + fs/ntfs3/ntfs_fs.h | 51 ++++++--- + fs/ntfs3/record.c | 34 +++++- + fs/ntfs3/run.c | 9 +- + fs/ntfs3/super.c | 38 +++++-- + fs/ntfs3/xattr.c | 26 ++--- + 17 files changed, 924 insertions(+), 284 deletions(-) +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 +Merge made by the 'ort' strategy. + fs/orangefs/devorangefs-req.c | 1 + + fs/orangefs/inode.c | 8 ++++---- + fs/orangefs/orangefs-debugfs.c | 1 + + fs/orangefs/xattr.c | 5 ----- + 4 files changed, 6 insertions(+), 9 deletions(-) +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 (0877338ade31b Merge branch 'xfs-7.3-merge' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. +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 +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-hotfixes/mm-hotfixes-unstable (90c4f67f851fd MAINTAINERS: add Lance Yang as a hung task detector co-maintainer) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging mm/hugetlb.c +Merge made by the 'ort' strategy. + .mailmap | 3 + + Documentation/admin-guide/cgroup-v1/memory.rst | 49 ++---------- + MAINTAINERS | 5 +- + mm/hugetlb.c | 6 +- + mm/hugetlb_cgroup.c | 7 +- + mm/hugetlb_cma.c | 21 ++++- + mm/khugepaged.c | 6 -- + mm/madvise.c | 8 ++ + mm/memcontrol-v1.c | 43 ++++++----- + mm/memcontrol.c | 102 ++++++++++++++++++++----- + mm/migrate_device.c | 18 +++++ + mm/pagewalk.c | 6 +- + mm/swapfile.c | 9 ++- + mm/userfaultfd.c | 4 +- + mm/vmscan.c | 2 +- + 15 files changed, 189 insertions(+), 100 deletions(-) +Merging fs-current (f4acfec974657 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 +Merge made by the 'ort' strategy. + arch/m68k/amiga/config.c | 4 +--- + arch/m68k/configs/amiga_defconfig | 5 ----- + arch/m68k/configs/apollo_defconfig | 5 ----- + arch/m68k/configs/atari_defconfig | 5 ----- + arch/m68k/configs/bvme6000_defconfig | 5 ----- + arch/m68k/configs/hp300_defconfig | 5 ----- + arch/m68k/configs/mac_defconfig | 5 ----- + arch/m68k/configs/multi_defconfig | 5 ----- + arch/m68k/configs/mvme147_defconfig | 5 ----- + arch/m68k/configs/mvme16x_defconfig | 5 ----- + arch/m68k/configs/q40_defconfig | 5 ----- + arch/m68k/configs/sun3_defconfig | 5 ----- + arch/m68k/configs/sun3x_defconfig | 5 ----- + arch/m68k/emu/nfcon.c | 2 +- + arch/m68k/kernel/traps.c | 4 ++-- + 15 files changed, 4 insertions(+), 66 deletions(-) +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 (564973a259ec7 ipv6: use RCU iterator to dump route exceptions) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + drivers/dpll/dpll_core.c | 24 +++--- + drivers/dpll/dpll_netlink.c | 59 ++++++++++++-- + drivers/net/bonding/bond_netlink.c | 2 +- + drivers/net/dsa/b53/b53_common.c | 2 +- + drivers/net/dsa/mv88e6xxx/pcs-6352.c | 5 +- + drivers/net/dsa/realtek/rtl83xx.c | 4 +- + drivers/net/ethernet/huawei/hinic3/hinic3_tx.c | 9 ++- + drivers/net/ethernet/ibm/emac/mal.c | 13 +++- + drivers/net/ethernet/intel/ice/devlink/devlink.c | 32 ++------ + drivers/net/ethernet/intel/ice/ice_ethtool.c | 18 ++--- + drivers/net/ethernet/intel/ice/ice_lib.c | 3 + + drivers/net/ethernet/intel/ice/ice_nvm.c | 90 +++++++++++----------- + drivers/net/ethernet/intel/ice/ice_nvm.h | 2 +- + drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 38 ++++----- + drivers/net/ethernet/intel/idpf/idpf_txrx.c | 2 +- + .../net/ethernet/marvell/octeontx2/af/mcs_rvu_if.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 5 ++ + drivers/net/ethernet/pensando/ionic/ionic_main.c | 4 + + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 31 ++++---- + drivers/net/ethernet/realtek/8139cp.c | 2 +- + drivers/net/ethernet/renesas/ravb.h | 3 + + drivers/net/ethernet/renesas/ravb_main.c | 9 ++- + drivers/net/ethernet/renesas/ravb_ptp.c | 44 +++++++++-- + drivers/net/ipa/ipa_modem.c | 18 ++++- + drivers/net/ppp/pppox.c | 17 ++++ + drivers/net/thunderbolt/main.c | 12 +++ + drivers/net/tun.c | 21 +++-- + drivers/net/virtio_net.c | 14 ++++ + drivers/net/vxlan/vxlan_core.c | 11 +-- + drivers/net/vxlan/vxlan_mdb.c | 9 ++- + drivers/net/vxlan/vxlan_vnifilter.c | 6 +- + drivers/nfc/fdp/i2c.c | 27 +++++++ + drivers/nfc/microread/microread.c | 31 +++++++- + drivers/nfc/pn533/pn533.c | 22 ++++-- + drivers/nfc/st21nfca/dep.c | 3 + + drivers/ptp/ptp_netc.c | 3 + + drivers/ptp/ptp_vmclock.c | 6 ++ + include/net/af_vsock.h | 5 +- + include/net/ip_tunnels.h | 11 ++- + net/bridge/br_netlink_tunnel.c | 3 +- + net/bridge/br_vlan.c | 4 +- + net/core/dev.c | 60 ++++++++------- + net/core/page_pool.c | 64 +++++++-------- + net/hsr/hsr_device.c | 2 + + net/ipv4/ip_output.c | 4 + + net/ipv4/ip_tunnel.c | 2 +- + net/ipv4/ipmr.c | 3 + + net/ipv6/ip6_gre.c | 14 ++-- + net/ipv6/ip6_input.c | 1 + + net/ipv6/ip6_output.c | 2 + + net/ipv6/ip6_tunnel.c | 22 ++---- + net/ipv6/route.c | 2 +- + net/ipv6/sit.c | 2 +- + net/kcm/kcmsock.c | 3 + + net/mpls/af_mpls.c | 2 + + net/nfc/digital_core.c | 2 +- + net/nfc/digital_technology.c | 2 + + net/nfc/llcp_commands.c | 18 ++++- + net/nfc/llcp_core.c | 44 ++++++++--- + net/nfc/llcp_sock.c | 14 +++- + net/nfc/nci/data.c | 10 +-- + net/nfc/nci/ntf.c | 36 +++++++-- + net/nfc/nci/rsp.c | 42 +++++++++- + net/openvswitch/conntrack.c | 8 +- + net/openvswitch/datapath.c | 47 +++++------ + net/sctp/sm_sideeffect.c | 4 + + net/smc/af_smc.c | 5 +- + net/smc/smc_core.c | 13 ++-- + net/smc/smc_tx.h | 6 +- + net/tls/tls_strp.c | 16 ++-- + net/vmw_vsock/af_vsock.c | 62 +++++---------- + net/xdp/xsk.c | 30 +++++++- + 72 files changed, 779 insertions(+), 389 deletions(-) +Merging bpf/master (a13307e97d5c5 Merge tag 'bpf-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master +Already up to date. +Merging ipsec/master (4e9442ce551eb xfrm: bound nat keepalive state collection) +$ 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/ah6.c | 29 ++++++++++++++--------- + net/ipv6/xfrm6_input.c | 2 +- + net/xfrm/espintcp.c | 9 +++++++- + net/xfrm/xfrm_nat_keepalive.c | 53 +++++++++++++++++++++++++++++++++++-------- + net/xfrm/xfrm_output.c | 4 +--- + net/xfrm/xfrm_user.c | 2 +- + 6 files changed, 73 insertions(+), 26 deletions(-) +Merging netfilter/main (7b53449540502 Merge tag 'nf-26-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) +$ 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 (31b7c70067083 RDMA/ipoib: Drain RCU callbacks during module teardown) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'ort' strategy. + drivers/infiniband/core/device.c | 1 + + drivers/infiniband/hw/mlx5/main.c | 2 ++ + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 ++ + 3 files changed, 5 insertions(+) +Merging sound-current/for-linus (2b366b833f52a ALSA: hda/conexant: Simplify headset plugin type handling) +$ 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. + sound/hda/codecs/conexant.c | 8 +++----- + sound/hda/codecs/realtek/alc269.c | 16 ++++++++++++++++ + sound/pci/ice1712/ice1712.c | 7 ++++--- + sound/pci/pcxhr/pcxhr.c | 14 +++++++------- + sound/usb/quirks.c | 2 ++ + 5 files changed, 32 insertions(+), 15 deletions(-) +Merging sound-asoc-fixes/for-linus (079e27f52b929 ASoC: Intel: NVL: Add entry for HDMI-In capture support to non-I2S codec boards.) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Already up to date. +Merging regmap-fixes/for-linus (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. + drivers/regulator/tps65185.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging spi-fixes/for-linus (11058bd3d47d5 spi: virtio: mark device ready before registering the controller) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (7678e81498e20 PCI: imx6: Fix i.MX6Q/DL boot hang caused by improper PHY power sequencing) +$ 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 (db2ddb8714351 Linux 7.2-rc7) +$ git merge -m Merge branch 'driver-core-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (440915499231e serial: amba-pl011: synchronize DMA teardown) +$ 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 (db2ddb8714351 Linux 7.2-rc7) +$ 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 +Merge made by the 'ort' strategy. + drivers/usb/serial/digi_acceleport.c | 9 +++++++-- + drivers/usb/serial/spcp8x5.c | 13 ------------- + 2 files changed, 7 insertions(+), 15 deletions(-) +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 (6829665d05098 staging: rtl8723bs: validate monitor transmit frame lengths) +$ 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 (16989c88e98fb iio: frequency: adf4377: Make sure clk_init_data is fully initialized) +$ 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/adc/ad4080.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/chemical/atlas-sensor.c +Auto-merging drivers/iio/dac/ad3552r-hs.c +Auto-merging drivers/iio/dac/ad5446-i2c.c +Auto-merging drivers/iio/health/max30102.c +Auto-merging drivers/iio/light/gp2ap020a00f.c +Auto-merging drivers/iio/light/ltrf216a.c +Auto-merging drivers/iio/proximity/srf04.c +Auto-merging drivers/iio/proximity/sx9324.c +Auto-merging drivers/iio/temperature/hid-sensor-temperature.c +Merge made by the 'ort' strategy. + drivers/iio/accel/kionix-kx022a.c | 2 +- + drivers/iio/adc/Kconfig | 2 ++ + drivers/iio/adc/ad4080.c | 5 +++ + drivers/iio/adc/ade9000.c | 31 ++++++++--------- + drivers/iio/adc/adi-axi-adc.c | 34 +++++++++++++++++++ + drivers/iio/adc/max1363.c | 8 +++++ + drivers/iio/adc/pac1921.c | 2 +- + drivers/iio/adc/rohm-bd79124.c | 20 +++++++---- + drivers/iio/adc/ti-ads7138.c | 42 +++++++++++++++++++----- + drivers/iio/chemical/atlas-sensor.c | 19 ++++------- + drivers/iio/dac/Kconfig | 1 + + drivers/iio/dac/ad3552r-hs.c | 2 +- + drivers/iio/dac/ad5446-i2c.c | 2 +- + drivers/iio/dac/m62332.c | 17 +++++++--- + drivers/iio/dac/rohm-bd79703.c | 3 ++ + drivers/iio/frequency/adf4377.c | 2 +- + drivers/iio/gyro/mpu3050-core.c | 2 +- + drivers/iio/health/max30102.c | 12 +++++-- + drivers/iio/industrialio-buffer.c | 38 ++++++++++----------- + drivers/iio/light/apds9306.c | 8 ++--- + drivers/iio/light/gp2ap002.c | 24 +++++++++++--- + drivers/iio/light/gp2ap020a00f.c | 2 ++ + drivers/iio/light/ltrf216a.c | 3 +- + drivers/iio/light/opt4001.c | 37 +++++++-------------- + drivers/iio/light/opt4060.c | 9 +++-- + drivers/iio/light/rohm-bu27034.c | 2 +- + drivers/iio/pressure/bmp280-core.c | 2 +- + drivers/iio/pressure/dps310.c | 3 +- + drivers/iio/pressure/rohm-bm1390.c | 2 +- + drivers/iio/proximity/srf04.c | 1 + + drivers/iio/proximity/sx9324.c | 2 +- + drivers/iio/temperature/hid-sensor-temperature.c | 3 +- + 32 files changed, 218 insertions(+), 124 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 (db2ddb8714351 Linux 7.2-rc7) +$ 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 (b4d85f863e5a6 Merge branch 'next' into for-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (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/crypto-2.6.git crypto-current/master +Already up to date. +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 +Merge made by the 'ort' strategy. + arch/s390/include/asm/nmi.h | 3 ++ + arch/s390/kernel/nmi.c | 5 +- + arch/s390/kvm/dat.c | 13 ++--- + arch/s390/kvm/guestdbg.c | 9 +++- + arch/s390/kvm/interrupt.c | 107 ++++++++++++++++++++------------------ + arch/s390/kvm/kvm-s390.c | 28 ++++++---- + arch/s390/kvm/pv.c | 4 ++ + arch/s390/kvm/vsie.c | 1 + + drivers/s390/crypto/vfio_ap_ops.c | 45 +++++++--------- + 9 files changed, 116 insertions(+), 99 deletions(-) +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. + arch/arm64/kvm/vgic/vgic-v2.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging hwmon-fixes/hwmon (f7c9176d2326e hwmon: (emc1403) Drop hysteresis for low limit temperature) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Auto-merging drivers/hwmon/coretemp.c +Auto-merging drivers/hwmon/emc1403.c +Merge made by the 'ort' strategy. +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 (78bf392ba77dd platform/x86: asus-wmi: temporarily revert to setting a charge limit) +$ 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 +Merge made by the 'ort' strategy. + drivers/pinctrl/qcom/pinctrl-shikra.c | 1 + + 1 file changed, 1 insertion(+) +Merging devicetree-fixes/dt/linus (bba13ad17b1a1 of/address: Fix NULL bus dereference in of_pci_range_parser_one()) +$ 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 +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 +Merge made by the 'ort' strategy. +Merging risc-v-fixes/fixes (8d9d4fd2a15ff riscv: patch: skip fixmap mapping when kernel text is already writable) +$ 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 MAINTAINERS +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/include/asm/acpi.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/acpi.h +Auto-merging arch/riscv/kernel/traps.c +Auto-merging arch/riscv/mm/init.c +Resolved 'arch/riscv/include/asm/acpi.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cc4144d3d835f] Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/arch/riscv/hwprobe.rst | 20 +++ + .../devicetree/bindings/riscv/extensions.yaml | 69 ++++++++++ + MAINTAINERS | 8 ++ + arch/riscv/Kconfig | 19 +++ + arch/riscv/Makefile | 10 +- + arch/riscv/boot/.gitignore | 1 - + arch/riscv/boot/Makefile | 3 +- + arch/riscv/include/asm/acpi.h | 21 +++ + arch/riscv/include/asm/cmpxchg.h | 14 +- + arch/riscv/include/asm/csr.h | 53 +++++++ + arch/riscv/include/asm/csr_indirect.h | 50 +++++++ + arch/riscv/include/asm/hwcap.h | 30 ++-- + arch/riscv/include/asm/hwprobe.h | 7 - + arch/riscv/include/asm/pgtable.h | 12 +- + arch/riscv/include/asm/processor.h | 3 + + arch/riscv/include/asm/qos.h | 74 ++++++++++ + arch/riscv/include/asm/switch_to.h | 7 +- + arch/riscv/include/asm/tlbflush.h | 23 ++++ + arch/riscv/include/asm/vdso.h | 6 + + arch/riscv/include/asm/vdso/arch_data.h | 6 - + arch/riscv/include/uapi/asm/hwprobe.h | 152 +++++++++++---------- + arch/riscv/kernel/Makefile | 2 + + arch/riscv/kernel/acpi.c | 5 + + arch/riscv/kernel/alternative.c | 33 +++-- + arch/riscv/kernel/cpufeature.c | 80 +++++++---- + arch/riscv/kernel/efi.c | 5 + + arch/riscv/kernel/patch.c | 2 + + arch/riscv/kernel/probes/decode-insn.c | 2 +- + arch/riscv/kernel/probes/simulate-insn.c | 7 + + arch/riscv/kernel/probes/simulate-insn.h | 1 + + arch/riscv/kernel/qos.c | 101 ++++++++++++++ + arch/riscv/kernel/reset.c | 9 +- + arch/riscv/kernel/setup.c | 2 + + arch/riscv/kernel/sys_hwprobe.c | 83 +++-------- + arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S | 24 ++++ + arch/riscv/kernel/traps.c | 3 + + arch/riscv/kernel/unaligned_access_speed.c | 19 +-- + arch/riscv/kernel/usercfi.c | 4 +- + arch/riscv/kernel/vdso/Makefile | 7 +- + arch/riscv/kernel/vdso/hwprobe.c | 2 +- + arch/riscv/kernel/vdso/vdso.lds.S | 2 + + arch/riscv/kernel/vmlinux-xip.lds.S | 143 ------------------- + arch/riscv/kvm/isa.c | 16 +-- + arch/riscv/kvm/main.c | 2 +- + arch/riscv/kvm/vcpu_fp.c | 20 +-- + arch/riscv/kvm/vcpu_onereg.c | 6 +- + arch/riscv/kvm/vcpu_vector.c | 10 +- + arch/riscv/mm/init.c | 7 +- + arch/riscv/mm/tlbflush.c | 23 ---- + drivers/acpi/tables.c | 1 + + drivers/perf/riscv_pmu_sbi.c | 33 ++++- + 51 files changed, 801 insertions(+), 441 deletions(-) + create mode 100644 arch/riscv/include/asm/csr_indirect.h + create mode 100644 arch/riscv/include/asm/qos.h + create mode 100644 arch/riscv/kernel/qos.c + delete mode 100644 arch/riscv/kernel/vmlinux-xip.lds.S +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 (44f3468a0aef1 gpio: sloppy-logic-analyzer: fix use-after-free via debugfs trigger on unbind) +$ 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 +Already up to date. +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 memblock-fixes/fixes (97090500d776c mm/mm_init: deferred_grow_zone(): fix out-of-range first_deferred_pfn) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/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 (fac520e43a602 tools headers: Sync KVM headers with the kernel sources) +$ 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 (d24f5cdbeff8b Merge tag 'rust-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging w1-fixes/fixes (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 (090a95dbe13df pmdomain: mediatek: mfg: initialize prev_o in mtk_mfg_attach_dev()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging i2c-andi-fixes/i2c/i2c-fixes (abea5c349368a Merge tag 'i2c-7.3-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux) +$ git merge -m Merge branch 'i2c/i2c-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-andi-fixes/i2c/i2c-fixes +Already up to date. +Merging i2c-rust-fixes/rust-i2c-fixes (4eb422482ca5d rust: i2c: fix I2cAdapter refcounts double increment) +$ git merge -m Merge branch 'rust-i2c-fixes' of https://github.com/ikrtn/rust-for-linux i2c-rust-fixes/rust-i2c-fixes +Already up to date. +Merging sparc-fixes/for-linus (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 (c3730b8373bb5 tracing: Fix race between update_event_fields and, event_define_fields) +$ git merge -m Merge branch 'trace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes +Already up to date. +Merging tracefs-fixes/tracefs/fixes (07004a8c4b572 eventfs: Hold eventfs_mutex and SRCU when remount walks events) +$ git merge -m Merge branch 'tracefs/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes +Already up to date. +Merging spacemit-fixes/fixes (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 (57e0daeacc1da Merge branch into tip/master: 'locking/urgent') +$ git merge -m Merge branch 'tip/urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Merge made by the 'ort' strategy. + drivers/irqchip/irq-ast2700-intc0.c | 4 +- + drivers/irqchip/irq-ast2700-intc1.c | 3 +- + drivers/irqchip/irq-renesas-rzg2l.c | 4 +- + fs/exec.c | 9 ++- + include/linux/futex.h | 8 +-- + include/linux/sched/mm.h | 10 +-- + kernel/exit.c | 2 +- + kernel/fork.c | 10 +-- + kernel/futex/core.c | 79 ++++++++++++++--------- + kernel/futex/pi.c | 125 +++++++++++++++++++++++++++--------- + kernel/time/timer.c | 1 + + 11 files changed, 170 insertions(+), 85 deletions(-) +Merging slab-fixes/slab/for-next-fixes (5ff172f6c94d2 slab: silence sparse warning with type-based partitioning) +$ git merge -m Merge branch 'slab/for-next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes +Already up to date. +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/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 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 (dc14753664240 accel/amdxdna: return early from a zero-length flush) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/accel/amdxdna/amdxdna_gem.c | 3 +++ + drivers/accel/qaic/qaic_control.c | 46 +++++++++++++++++--------------- + 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 ++++++++++++--- + 7 files changed, 74 insertions(+), 29 deletions(-) +Merging rust/rust-next (bd5f485f3f026 Merge tag 'soc-arm-7.3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'alloc-next' of https://github.com/Rust-for-Linux/linux.git rust-alloc/alloc-next +Already up to date. +Merging rust-io/io-next (86731a2a651e5 Linux 6.16-rc3) +$ git merge -m Merge branch 'io-next' of https://github.com/Rust-for-Linux/linux.git rust-io/io-next +Already up to date. +Merging rust-pin-init/pin-init-next (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-stable/mm-stable (08745c6235012 selftests/mm: thuge-gen: fix test_shmget() for PAGE_SIZE check) +$ git merge -m Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging CREDITS +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/mips/kernel/vdso.c +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/events/intel/ds.c +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/include/asm/pgtable_types.h +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging drivers/accel/amdxdna/aie2_ctx.c +Auto-merging drivers/base/arch_numa.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/panthor/panthor_gem.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/video/fbdev/core/fb_io_fops.c +Auto-merging fs/binfmt_elf.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging include/linux/cpuset.h +Auto-merging include/linux/memory_hotplug.h +Auto-merging include/linux/mmap_lock.h +Auto-merging include/linux/sched/mm.h +Auto-merging init/Kconfig +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/events/core.c +Auto-merging kernel/events/uprobes.c +Auto-merging kernel/liveupdate/kexec_handover.c +Auto-merging kernel/trace/ring_buffer.c +Auto-merging mm/damon/lru_sort.c +Auto-merging mm/damon/ops-common.c +Auto-merging mm/damon/paddr.c +Auto-merging mm/damon/reclaim.c +Auto-merging mm/damon/vaddr.c +Auto-merging mm/filemap.c +Auto-merging mm/huge_memory.c +Auto-merging mm/hugetlb.c +Auto-merging mm/hugetlb_cma.c +Auto-merging mm/khugepaged.c +Auto-merging mm/madvise.c +Auto-merging mm/memblock.c +Auto-merging mm/memcontrol-v1.c +Auto-merging mm/memcontrol.c +Auto-merging mm/memory.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/migrate_device.c +Auto-merging mm/mm_init.c +Auto-merging mm/page_table_check.c +Auto-merging mm/pagewalk.c +Auto-merging mm/shmem.c +Auto-merging mm/swapfile.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/vmalloc.c +Auto-merging mm/vmscan.c +Auto-merging samples/damon/mtier.c +Auto-merging tools/testing/selftests/Makefile +Resolved 'arch/riscv/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a6d8ab64d7efe] Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + CREDITS | 4 + + Documentation/ABI/testing/sysfs-block-zram | 6 +- + Documentation/ABI/testing/sysfs-bus-dax | 24 + + Documentation/ABI/testing/sysfs-kernel-mm-damon | 75 +- + Documentation/admin-guide/blockdev/zram.rst | 40 +- + Documentation/admin-guide/cgroup-v1/cpusets.rst | 2 +- + Documentation/admin-guide/mm/damon/usage.rst | 19 +- + Documentation/admin-guide/mm/pagemap.rst | 13 +- + Documentation/admin-guide/mm/transhuge.rst | 2 +- + Documentation/admin-guide/mm/userfaultfd.rst | 269 +++++- + Documentation/admin-guide/sysctl/vm.rst | 83 +- + Documentation/core-api/mm-api.rst | 3 +- + Documentation/driver-api/basics.rst | 3 + + Documentation/filesystems/proc.rst | 1 + + Documentation/mm/damon/design.rst | 43 +- + Documentation/mm/hmm.rst | 81 +- + Documentation/mm/page_owner.rst | 78 +- + Documentation/mm/physical_memory.rst | 3 - + Documentation/mm/process_addrs.rst | 2 +- + Documentation/userspace-api/mseal.rst | 14 +- + MAINTAINERS | 34 +- + arch/arm/mm/fault-armv.c | 4 +- + arch/arm/mm/flush.c | 2 +- + arch/arm64/Kconfig | 3 +- + arch/arm64/include/asm/fixmap.h | 3 - + arch/arm64/include/asm/pgtable-prot.h | 8 +- + arch/arm64/include/asm/pgtable.h | 51 +- + arch/arm64/kernel/setup.c | 2 - + arch/csky/abiv1/inc/abi/cacheflush.h | 7 +- + arch/loongarch/Kconfig | 3 +- + arch/loongarch/include/asm/pgtable.h | 4 +- + arch/mips/kernel/vdso.c | 4 +- + arch/nios2/mm/cacheflush.c | 2 +- + arch/parisc/kernel/cache.c | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 7 +- + arch/powerpc/mm/book3s64/slice.c | 6 +- + arch/powerpc/mm/hugetlbpage.c | 13 +- + arch/powerpc/platforms/Kconfig.cputype | 3 +- + arch/riscv/Kconfig | 3 +- + arch/riscv/include/asm/fixmap.h | 3 - + arch/riscv/include/asm/pgtable-bits.h | 12 +- + arch/riscv/include/asm/pgtable.h | 67 +- + arch/s390/Kconfig | 3 +- + arch/s390/include/asm/hugetlb.h | 12 +- + arch/s390/include/asm/pgtable.h | 6 +- + arch/s390/mm/vmem.c | 4 +- + arch/sparc/include/asm/pgtable_64.h | 4 - + arch/x86/Kconfig | 3 +- + arch/x86/events/intel/ds.c | 6 +- + arch/x86/include/asm/pgtable.h | 58 +- + arch/x86/include/asm/pgtable_types.h | 16 +- + arch/x86/kernel/cpu/sgx/virt.c | 3 +- + arch/x86/kvm/vmx/vmx.c | 2 +- + arch/x86/mm/init_64.c | 134 +-- + arch/x86/virt/hw.c | 2 +- + drivers/accel/amdxdna/aie2_ctx.c | 23 +- + drivers/base/memory.c | 9 + + drivers/block/zram/zram_drv.c | 26 +- + drivers/block/zram/zram_drv.h | 3 +- + drivers/dax/bus.h | 2 + + drivers/dax/kmem.c | 506 ++++++++-- + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/drm_gem_dma_helper.c | 2 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- + drivers/gpu/drm/drm_gpusvm.c | 60 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 6 +- + drivers/gpu/drm/gma500/gem.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 12 +- + drivers/gpu/drm/msm/msm_gem.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 20 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 11 +- + drivers/gpu/drm/panthor/panthor_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/tegra/gem.c | 5 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 2 +- + drivers/gpu/drm/xe/xe_device.c | 2 +- + drivers/gpu/drm/xe/xe_mmio_gem.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +- + drivers/hv/mshv_regions.c | 54 +- + drivers/infiniband/core/umem_odp.c | 18 +- + drivers/misc/sgi-xp/xpc_uv.c | 5 +- + drivers/net/ethernet/fungible/funeth/funeth_rx.c | 2 +- + drivers/vfio/pci/nvgrace-gpu/main.c | 3 +- + drivers/vfio/pci/vfio_pci_core.c | 3 +- + drivers/video/fbdev/core/fb_io_fops.c | 2 +- + fs/aio.c | 2 +- + fs/binfmt_elf.c | 7 +- + fs/dax.c | 2 +- + fs/hugetlbfs/inode.c | 23 +- + fs/proc/page.c | 56 +- + fs/proc/task_mmu.c | 119 ++- + include/asm-generic/fixmap.h | 4 +- + include/asm-generic/getorder.h | 4 +- + include/asm-generic/hugetlb.h | 18 +- + include/asm-generic/memory_model.h | 6 +- + include/asm-generic/mmu.h | 2 +- + include/asm-generic/pgtable-nop4d.h | 4 +- + include/asm-generic/pgtable-nopmd.h | 4 +- + include/asm-generic/pgtable-nopud.h | 4 +- + include/asm-generic/pgtable_uffd.h | 32 +- + include/linux/alloc_tag.h | 4 +- + include/linux/backing-dev.h | 2 - + include/linux/bootmem_info.h | 89 -- + include/linux/compaction.h | 3 +- + include/linux/cpuset.h | 4 +- + include/linux/damon.h | 177 ++-- + include/linux/gfp.h | 55 +- + include/linux/gfp_types.h | 12 +- + include/linux/hmm.h | 2 + + include/linux/huge_mm.h | 56 +- + include/linux/hugetlb.h | 57 +- + include/linux/hugetlb_cgroup.h | 2 +- + include/linux/leafops.h | 32 +- + include/linux/memfd.h | 6 +- + include/linux/memory.h | 27 + + include/linux/memory_hotplug.h | 14 + + include/linux/migrate.h | 8 +- + include/linux/migrate_mode.h | 1 + + include/linux/mm.h | 277 ++++-- + include/linux/mm_inline.h | 57 +- + include/linux/mm_types.h | 3 + + include/linux/mmap_lock.h | 8 + + include/linux/mmzone.h | 43 +- + include/linux/oom.h | 2 +- + include/linux/page-flags.h | 14 - + include/linux/page_owner.h | 7 +- + include/linux/pagemap.h | 35 +- + include/linux/percpu-defs.h | 4 +- + include/linux/percpu-refcount.h | 5 +- + include/linux/pfn.h | 2 +- + include/linux/pgtable.h | 71 +- + include/linux/radix-tree.h | 5 +- + include/linux/sched/mm.h | 13 +- + include/linux/skbuff.h | 2 +- + include/linux/swap.h | 83 +- + include/linux/swapops.h | 10 +- + include/linux/userfaultfd_k.h | 106 +- + include/linux/vmalloc.h | 4 +- + include/linux/vmpressure.h | 48 +- + include/linux/writeback.h | 2 +- + include/trace/events/damon.h | 8 +- + include/trace/events/huge_memory.h | 2 +- + include/trace/events/migrate.h | 11 +- + include/trace/events/mmflags.h | 17 +- + include/trace/events/pagemap.h | 8 + + include/uapi/linux/fs.h | 1 + + include/uapi/linux/mempolicy.h | 2 +- + include/uapi/linux/userfaultfd.h | 54 +- + init/Kconfig | 10 +- + ipc/shm.c | 3 +- + kernel/cgroup/cpuset.c | 15 +- + kernel/dma/coherent.c | 7 +- + kernel/dma/direct.c | 6 +- + kernel/dma/mapping.c | 8 +- + kernel/dma/ops_helpers.c | 4 +- + kernel/events/core.c | 20 +- + kernel/events/uprobes.c | 13 +- + kernel/kcov.c | 2 +- + kernel/liveupdate/kexec_handover.c | 3 +- + kernel/trace/ring_buffer.c | 3 +- + lib/Kconfig.debug | 28 - + lib/Makefile | 1 - + lib/maple_tree.c | 8 +- + lib/percpu-refcount.c | 2 +- + lib/test_hmm.c | 109 ++- + lib/test_hmm_uapi.h | 1 + + mm/Kconfig | 20 +- + mm/Kconfig.debug | 28 + + mm/Makefile | 4 +- + mm/alloc_tag.c | 1020 ++++++++++++++++++++ + mm/bootmem_info.c | 72 -- + mm/cma.c | 4 +- + mm/compaction.c | 106 +- + mm/damon/core.c | 662 ++++++++----- + mm/damon/lru_sort.c | 13 +- + mm/damon/ops-common.c | 9 +- + mm/damon/paddr.c | 38 +- + mm/damon/reclaim.c | 11 +- + mm/damon/stat.c | 2 +- + mm/damon/sysfs-schemes.c | 31 +- + mm/damon/sysfs.c | 200 ++-- + mm/damon/tests/core-kunit.h | 275 +++++- + mm/damon/tests/vaddr-kunit.h | 5 + + mm/damon/vaddr.c | 44 +- + mm/debug.c | 7 +- + mm/debug_vm_pgtable.c | 16 +- + mm/early_ioremap.c | 10 +- + mm/execmem.c | 1 + + mm/filemap.c | 50 +- + mm/{swap.c => folio.c} | 68 +- + mm/gup.c | 13 +- + mm/hmm.c | 280 ++++-- + mm/huge_memory.c | 227 +++-- + mm/hugetlb.c | 723 ++++++++------ + mm/hugetlb_cma.c | 44 +- + mm/hugetlb_cma.h | 8 +- + mm/hugetlb_vmemmap.c | 141 +-- + mm/hugetlb_vmemmap.h | 5 - + mm/internal.h | 612 +++--------- + mm/interval_tree.c | 111 ++- + mm/kasan/hw_tags.c | 2 +- + mm/khugepaged.c | 85 +- + mm/kmemleak.c | 91 +- + mm/kmsan/hooks.c | 1 + + mm/kmsan/init.c | 2 +- + mm/kmsan/shadow.c | 1 + + mm/ksm.c | 97 +- + mm/madvise.c | 16 +- + mm/mapping_dirty_helpers.c | 2 +- + mm/memblock.c | 1 + + mm/memcontrol-v1.c | 309 +++++- + mm/memcontrol-v1.h | 6 - + mm/memcontrol.c | 48 +- + mm/memfd.c | 16 +- + mm/memory-failure.c | 119 ++- + mm/memory.c | 332 +++++-- + mm/memory_hotplug.c | 166 +++- + mm/mempolicy.c | 32 +- + mm/migrate.c | 97 +- + mm/migrate_device.c | 42 +- + mm/mincore.c | 75 +- + mm/mlock.c | 101 +- + mm/mm_init.c | 90 +- + mm/mm_init.h | 120 +++ + mm/mm_slot.h | 11 + + mm/mmap.c | 205 ++-- + mm/mmu_notifier.c | 2 +- + mm/mmzone.c | 5 +- + mm/mprotect.c | 117 ++- + mm/mremap.c | 67 +- + mm/mseal.c | 170 ++-- + mm/msync.c | 4 +- + mm/nommu.c | 64 +- + mm/page-writeback.c | 10 - + mm/page_alloc.c | 504 ++++++---- + mm/page_alloc.h | 312 ++++++ + mm/page_frag_cache.c | 6 +- + mm/page_isolation.c | 1 + + mm/page_owner.c | 303 ++++-- + mm/page_reporting.c | 1 + + mm/page_table_check.c | 8 +- + mm/page_vma_mapped.c | 8 +- + mm/pagewalk.c | 4 +- + mm/percpu-km.c | 9 +- + mm/percpu-vm.c | 49 +- + mm/percpu.c | 20 +- + mm/rmap.c | 481 ++++----- + mm/secretmem.c | 2 +- + mm/shmem.c | 30 +- + mm/show_mem.c | 10 +- + mm/shuffle.c | 1 + + mm/slab.h | 2 +- + mm/slub.c | 17 +- + mm/sparse-vmemmap.c | 28 +- + mm/sparse.c | 53 +- + mm/sparse.h | 63 ++ + mm/swap.h | 6 +- + mm/swap_state.c | 52 +- + mm/swapfile.c | 31 +- + mm/userfaultfd.c | 393 +++++++- + mm/util.c | 14 +- + mm/vma.c | 309 ++++-- + mm/vma.h | 88 +- + mm/vma_exec.c | 32 +- + mm/vma_init.c | 6 +- + mm/vma_internal.h | 4 +- + mm/vmalloc.c | 32 +- + mm/vmalloc.h | 46 + + mm/vmpressure.c | 301 +----- + mm/vmscan.c | 89 +- + mm/vmstat.c | 3 +- + mm/zsmalloc.c | 243 ++++- + samples/damon/Kconfig | 2 +- + samples/damon/mtier.c | 9 +- + samples/damon/prcl.c | 9 +- + samples/damon/wsse.c | 9 +- + scripts/gdb/linux/page_owner.py | 4 +- + sound/core/memalloc.c | 2 +- + tools/include/linux/gfp_types.h | 7 - + tools/include/uapi/linux/fs.h | 1 + + tools/include/uapi/linux/userfaultfd.h | 54 +- + tools/mm/.gitignore | 1 + + tools/mm/Makefile | 4 +- + tools/mm/page_owner_filter.c | 310 ++++++ + tools/mm/page_owner_sort.c | 87 +- + tools/testing/memblock/internal.h | 20 - + tools/testing/memblock/mm_init.h | 24 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/damon/Makefile | 1 + + tools/testing/selftests/damon/_damon_sysfs.py | 23 +- + .../selftests/damon/damos_apply_interval.py | 2 +- + tools/testing/selftests/damon/damos_quota_goal.py | 2 +- + .../testing/selftests/damon/damos_tried_regions.py | 4 +- + .../selftests/damon/drgn_dump_damon_status.py | 3 +- + tools/testing/selftests/damon/sysfs.py | 35 +- + tools/testing/selftests/damon/sysfs.sh | 79 +- + tools/testing/selftests/damon/sysfs_refresh.py | 75 ++ + ..._update_schemes_tried_regions_wss_estimation.py | 2 +- + tools/testing/selftests/dax/Makefile | 6 + + tools/testing/selftests/dax/config | 4 + + tools/testing/selftests/dax/dax-kmem-hotplug.sh | 317 ++++++ + tools/testing/selftests/dax/settings | 1 + + tools/testing/selftests/mincore/mincore_selftest.c | 12 +- + tools/testing/selftests/mm/Makefile | 1 - + tools/testing/selftests/mm/gup_longterm.c | 2 +- + tools/testing/selftests/mm/hmm-tests.c | 792 +++++++-------- + tools/testing/selftests/mm/hugepage_settings.c | 2 +- + tools/testing/selftests/mm/hugetlb-vmemmap.c | 132 --- + tools/testing/selftests/mm/ksm_tests.c | 28 +- + tools/testing/selftests/mm/memory-failure.c | 44 +- + tools/testing/selftests/mm/mremap_dontunmap.c | 2 +- + tools/testing/selftests/mm/mseal_test.c | 106 +- + tools/testing/selftests/mm/pagemap_ioctl.c | 126 ++- + tools/testing/selftests/mm/pkey-helpers.h | 4 +- + tools/testing/selftests/mm/pkey-powerpc.h | 2 +- + tools/testing/selftests/mm/pkey_sighandler_tests.c | 115 ++- + tools/testing/selftests/mm/pkey_util.c | 90 ++ + tools/testing/selftests/mm/protection_keys.c | 99 +- + tools/testing/selftests/mm/rmap.c | 81 ++ + tools/testing/selftests/mm/run_vmtests.sh | 3 +- + tools/testing/selftests/mm/thuge-gen.c | 15 +- + tools/testing/selftests/mm/uffd-common.c | 9 +- + tools/testing/selftests/mm/uffd-unit-tests.c | 919 ++++++++++++++++++ + tools/testing/selftests/mm/vm_util.c | 26 +- + tools/testing/selftests/mm/vm_util.h | 1 + + tools/testing/vma/Makefile | 2 +- + tools/testing/vma/include/dup.h | 52 +- + tools/testing/vma/include/stubs.h | 16 +- + tools/testing/vma/shared.c | 9 - + tools/testing/vma/shared.h | 43 +- + tools/testing/vma/tests/merge.c | 40 +- + tools/testing/vma/vma_internal.h | 4 +- + virt/kvm/guest_memfd.c | 2 +- + 339 files changed, 12508 insertions(+), 6365 deletions(-) + delete mode 100644 include/linux/bootmem_info.h + create mode 100644 mm/alloc_tag.c + delete mode 100644 mm/bootmem_info.c + rename mm/{swap.c => folio.c} (95%) + create mode 100644 mm/mm_init.h + create mode 100644 mm/page_alloc.h + create mode 100644 mm/sparse.h + create mode 100644 mm/vmalloc.h + create mode 100644 tools/mm/page_owner_filter.c + create mode 100644 tools/testing/memblock/mm_init.h + create mode 100755 tools/testing/selftests/damon/sysfs_refresh.py + create mode 100644 tools/testing/selftests/dax/Makefile + create mode 100644 tools/testing/selftests/dax/config + create mode 100755 tools/testing/selftests/dax/dax-kmem-hotplug.sh + create mode 100644 tools/testing/selftests/dax/settings + delete mode 100644 tools/testing/selftests/mm/hugetlb-vmemmap.c +Merging mm-nonmm-stable/mm-nonmm-stable (eef628bce8e18 mailmap: fix bouncing address for Taniya Das) +$ git merge -m Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging fs/fat/inode.c +Auto-merging fs/fat/misc.c +Auto-merging fs/ocfs2/namei.c +Auto-merging include/linux/nmi.h +Auto-merging include/linux/sched.h +Auto-merging kernel/fork.c +Auto-merging kernel/kcov.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/test_hmm.c +Auto-merging tools/mm/page_owner_sort.c +Merge made by the 'ort' strategy. + .get_maintainer.ignore | 1 + + .mailmap | 6 +- + MAINTAINERS | 2 + + drivers/gpu/drm/drm_modeset_lock.c | 4 - + drivers/infiniband/hw/cxgb4/mem.c | 10 +- + drivers/pps/clients/pps-gpio.c | 66 ++-- + drivers/pps/kc.c | 10 + + drivers/pps/pps.c | 10 +- + drivers/rapidio/devices/rio_mport_cdev.c | 10 +- + drivers/rapidio/rio-scan.c | 1 + + fs/fat/inode.c | 5 +- + fs/fat/misc.c | 4 + + fs/fat/nfs.c | 4 +- + fs/ocfs2/acl.c | 141 +++++--- + fs/ocfs2/acl.h | 19 +- + fs/ocfs2/cluster/heartbeat.c | 383 +++++++++++++++------ + fs/ocfs2/cluster/heartbeat.h | 5 + + fs/ocfs2/cluster/nodemanager.c | 29 +- + fs/ocfs2/cluster/nodemanager.h | 3 + + fs/ocfs2/cluster/tcp.c | 186 ++++++++-- + fs/ocfs2/cluster/tcp.h | 2 + + fs/ocfs2/dir.c | 93 ++++- + fs/ocfs2/dlm/dlmmaster.c | 6 + + fs/ocfs2/dlm/dlmrecovery.c | 9 + + fs/ocfs2/inode.c | 22 +- + fs/ocfs2/namei.c | 34 +- + fs/ocfs2/refcounttree.c | 47 ++- + fs/ocfs2/suballoc.c | 2 +- + fs/ocfs2/xattr.c | 324 ++++++++++++++--- + fs/ocfs2/xattr.h | 11 +- + fs/squashfs/cache.c | 116 ++++++- + fs/squashfs/squashfs_fs_sb.h | 9 + + include/linux/list.h | 15 +- + include/linux/llist.h | 2 +- + include/linux/nmi.h | 4 +- + include/linux/pps_kernel.h | 1 + + include/linux/rbtree.h | 2 +- + include/linux/rbtree_latch.h | 2 +- + include/linux/sched.h | 8 + + include/linux/stacktrace.h | 6 +- + include/linux/taskstats_kern.h | 1 - + ipc/ipc_sysctl.c | 2 +- + kernel/fork.c | 2 +- + kernel/kcov.c | 90 ++--- + kernel/params.c | 4 +- + kernel/resource.c | 2 +- + kernel/signal.c | 76 ++-- + kernel/sys.c | 2 +- + kernel/taskstats.c | 45 +-- + kernel/watchdog.c | 16 +- + lib/Kconfig | 6 - + lib/Kconfig.debug | 39 ++- + lib/interval_tree_test.c | 4 +- + lib/math/tests/Makefile | 1 + + lib/math/tests/polynomial_kunit.c | 270 +++++++++++++++ + lib/raid/Kconfig | 12 + + lib/raid/raid6/Makefile | 2 + + lib/raid/raid6/algos.c | 102 +++--- + lib/raid/raid6/tests/raid6_kunit.c | 66 +++- + lib/raid/xor/Makefile | 2 + + lib/raid/xor/tests/Makefile | 2 + + lib/raid/xor/tests/xor_kunit.c | 64 +++- + lib/raid/xor/xor-core.c | 55 ++- + lib/random32.c | 184 +--------- + lib/string.c | 3 +- + lib/test_hmm.c | 6 - + lib/tests/Makefile | 3 +- + lib/tests/random32_kunit.c | 182 ++++++++++ + lib/ucs2_string.c | 38 +- + lib/xz/xz_dec_bcj.c | 2 +- + lib/xz/xz_dec_lzma2.c | 63 ++-- + lib/xz/xz_dec_stream.c | 4 +- + lib/xz/xz_lzma2.h | 2 +- + scripts/checkpatch.pl | 7 + + tools/accounting/delaytop.c | 2 +- + tools/accounting/getdelays.c | 32 +- + tools/include/linux/compiler.h | 2 +- + tools/mm/page_owner_sort.c | 10 +- + tools/testing/selftests/acct/.gitignore | 1 + + tools/testing/selftests/acct/Makefile | 11 + + tools/testing/selftests/acct/cgroupstats.c | 231 +++++++++++++ + tools/testing/selftests/acct/netlink_helper.c | 116 +++++++ + tools/testing/selftests/acct/netlink_helper.h | 44 +++ + .../selftests/acct/taskstats_fill_stats_tgid.c | 134 +------ + tools/testing/selftests/ipc/msgque.c | 2 +- + .../selftests/prctl/set-anon-vma-name-test.c | 21 +- + 86 files changed, 2590 insertions(+), 989 deletions(-) + create mode 100644 lib/math/tests/polynomial_kunit.c + create mode 100644 lib/tests/random32_kunit.c + create mode 100644 tools/testing/selftests/acct/cgroupstats.c + create mode 100644 tools/testing/selftests/acct/netlink_helper.c + create mode 100644 tools/testing/selftests/acct/netlink_helper.h +Merging mm-unstable/mm-unstable (4b2ae13f3393e selftests/mm: check stat() return value in khugepaged get_finfo()) +$ git merge -m Merge branch 'mm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-unstable/mm-unstable +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/filesystems/fscrypt.rst +Auto-merging Documentation/filesystems/locking.rst +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging MAINTAINERS +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/sh/Kconfig +Auto-merging arch/sh/kernel/cpu/sh4a/setup-shx3.c +Auto-merging drivers/base/Kconfig +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/panthor/panthor_gem.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging fs/smb/client/file.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/sched.h +Auto-merging include/rv/da_monitor.h +Auto-merging init/Kconfig +Auto-merging kernel/events/uprobes.c +Auto-merging kernel/locking/lockdep.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/test_hmm.c +Auto-merging mm/arch_numa.c +Auto-merging mm/hugetlb.c +Auto-merging mm/memory.c +Auto-merging mm/mm_init.c +Auto-merging mm/shmem.c +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + 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 | 21 +- + Documentation/dev-tools/kmemleak.rst | 10 + + Documentation/filesystems/fscrypt.rst | 4 + + Documentation/filesystems/locking.rst | 8 +- + Documentation/filesystems/vfs.rst | 8 +- + Documentation/mm/allocation-profiling.rst | 16 + + Documentation/mm/ksm.rst | 4 +- + Documentation/mm/page_migration.rst | 6 +- + Documentation/translations/zh_CN/mm/ksm.rst | 4 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 + + MAINTAINERS | 6 + + arch/riscv/include/asm/cacheflush.h | 15 +- + arch/riscv/include/asm/pgtable.h | 9 +- + arch/riscv/kernel/entry.S | 11 +- + arch/s390/mm/gmap_helpers.c | 2 +- + arch/sh/Kconfig | 12 - + arch/sh/configs/migor_defconfig | 1 - + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/se7722_defconfig | 1 - + arch/sh/configs/shx3_defconfig | 1 - + arch/sh/configs/ul2_defconfig | 1 - + arch/sh/include/asm/mmu.h | 2 + + arch/sh/include/asm/mmzone.h | 42 -- + arch/sh/include/asm/setup.h | 3 + + arch/sh/include/asm/sparsemem.h | 12 - + arch/sh/include/asm/topology.h | 13 - + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 5 - + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 7 - + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 1 - + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 1 - + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 5 - + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 7 - + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 5 - + arch/sh/kernel/cpu/sh4a/setup-shx3.c | 18 - + arch/sh/kernel/setup.c | 7 - + arch/sh/kernel/topology.c | 12 - + arch/sh/kernel/vmcore_info.c | 4 - + arch/sh/mm/Kconfig | 29 - + arch/sh/mm/Makefile | 1 - + arch/sh/mm/init.c | 24 - + arch/sh/mm/numa.c | 53 -- + arch/sh/mm/sram.c | 3 +- + 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/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 +- + 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/linux/codetag.h | 2 + + include/linux/execmem.h | 2 +- + include/linux/fs.h | 1 - + include/linux/lockdep.h | 3 + + include/linux/lockdep_types.h | 3 +- + include/linux/maple_tree.h | 14 +- + include/linux/memcontrol.h | 21 +- + 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/rmap.h | 11 +- + include/linux/sched.h | 1 + + include/linux/shmem_fs.h | 5 +- + include/linux/swap.h | 30 +- + include/linux/swap_ops.h | 44 ++ + include/linux/swapops.h | 7 +- + include/linux/vm_event_item.h | 4 + + include/linux/vmalloc.h | 2 +- + include/linux/vmstat.h | 17 +- + include/rv/da_monitor.h | 2 +- + include/uapi/linux/alloc_tag.h | 99 ++++ + init/Kconfig | 7 - + kernel/events/uprobes.c | 2 +- + kernel/locking/lockdep.c | 58 +- + lib/Kconfig.debug | 15 - + lib/codetag.c | 18 + + lib/maple_tree.c | 366 +++++++++---- + 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 | 115 ++-- + mm/gup.c | 23 +- + mm/gup_test.c | 94 ++-- + mm/hmm.c | 5 +- + mm/huge_memory.c | 46 +- + mm/hugetlb.c | 26 +- + 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 | 136 ++--- + 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 | 227 +++++--- + mm/vmstat.c | 19 +- + mm/workingset.c | 5 - + mm/zsmalloc.c | 11 +- + mm/zswap.c | 46 +- + 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 | 231 +++++++- + tools/testing/selftests/mm/vm_util.h | 8 +- + 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 + + 199 files changed, 4583 insertions(+), 2073 deletions(-) + delete mode 100644 arch/sh/include/asm/mmzone.h + delete mode 100644 arch/sh/include/asm/sparsemem.h + delete mode 100644 arch/sh/mm/numa.c + 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 +$ git am -3 ../patches/0001-mm-Fix-up-build-for-uninitialised-pte.patch +Applying: mm: Fix up build for uninitialised pte +Using index info to reconstruct a base tree... +M mm/khugepaged.c +Falling back to patching base and 3-way merge... +Auto-merging mm/khugepaged.c +No changes -- Patch already applied. +Merging mm-nonmm-unstable/mm-nonmm-unstable (775c0f72566e8 checkpatch: skip CamelCase cache for --no-tree without root) +$ 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. + drivers/media/v4l2-core/v4l2-vp9.c | 30 +++++++++++++++--------------- + kernel/taskstats.c | 4 ++++ + scripts/checkpatch.pl | 2 ++ + 3 files changed, 21 insertions(+), 15 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 +Merge made by the 'ort' strategy. + Documentation/trace/hisi-ptt.rst | 28 +- + tools/bpf/resolve_btfids/Makefile | 3 - + tools/build/Makefile.feature | 2 - + tools/build/feature/Makefile | 14 - + tools/lib/api/Makefile | 4 - + tools/lib/api/fd/array.c | 17 +- + tools/lib/bpf/Makefile | 8 +- + tools/lib/subcmd/Makefile | 4 - + tools/lib/symbol/Makefile | 4 - + tools/perf/.clang-format | 9 +- + tools/perf/Documentation/perf-c2c.txt | 71 + + tools/perf/Documentation/perf-sched.txt | 6 + + tools/perf/Documentation/perf-stat.txt | 3 + + tools/perf/Documentation/perf-test.txt | 6 +- + tools/perf/Documentation/perf-trace.txt | 4 + + tools/perf/Documentation/topdown.txt | 4 +- + tools/perf/Makefile.perf | 37 +- + tools/perf/arch/arm/util/cs-etm.c | 10 +- + tools/perf/arch/arm64/util/arm-spe.c | 8 +- + tools/perf/arch/arm64/util/hisi-ptt.c | 2 +- + tools/perf/arch/x86/tests/amd-ibs-period.c | 20 +- + tools/perf/arch/x86/tests/hybrid.c | 22 +- + tools/perf/arch/x86/tests/topdown.c | 4 +- + tools/perf/arch/x86/util/auxtrace.c | 2 +- + tools/perf/arch/x86/util/intel-bts.c | 6 +- + tools/perf/arch/x86/util/intel-pt.c | 9 +- + tools/perf/arch/x86/util/iostat.c | 14 +- + tools/perf/bench/evlist-open-close.c | 29 +- + tools/perf/builtin-annotate.c | 7 +- + tools/perf/builtin-c2c.c | 221 +- + tools/perf/builtin-ftrace.c | 32 +- + tools/perf/builtin-inject.c | 9 +- + tools/perf/builtin-kvm.c | 130 +- + tools/perf/builtin-kwork.c | 8 +- + tools/perf/builtin-lock.c | 4 +- + tools/perf/builtin-record.c | 148 +- + tools/perf/builtin-report.c | 13 +- + tools/perf/builtin-sched.c | 404 ++- + tools/perf/builtin-script.c | 16 +- + tools/perf/builtin-stat.c | 124 +- + tools/perf/builtin-timechart.c | 212 +- + tools/perf/builtin-top.c | 106 +- + tools/perf/builtin-trace.c | 202 +- + .../pmu-events/arch/arm64/nvidia/t410/metrics.json | 28 +- + .../pmu-events/arch/arm64/nvidia/t410/misc.json | 6 +- + .../arch/common/common/legacy-hardware.json | 2 +- + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 80 +- + .../perf/pmu-events/arch/x86/alderlake/cache.json | 36 + + .../arch/x86/alderlake/metricgroups.json | 2 +- + .../pmu-events/arch/x86/alderlake/pipeline.json | 6 +- + .../perf/pmu-events/arch/x86/alderlaken/cache.json | 32 + + .../arch/x86/amdzen5/floating-point.json | 160 +- + .../pmu-events/arch/x86/amdzen5/load-store.json | 8 +- + .../arch/x86/amdzen6/floating-point.json | 34 +- + .../pmu-events/arch/x86/arrowlake/arl-metrics.json | 152 +- + .../perf/pmu-events/arch/x86/arrowlake/cache.json | 30 +- + .../arch/x86/arrowlake/floating-point.json | 45 + + .../perf/pmu-events/arch/x86/arrowlake/memory.json | 18 + + .../arch/x86/arrowlake/metricgroups.json | 2 +- + .../pmu-events/arch/x86/arrowlake/pipeline.json | 131 +- + .../arch/x86/arrowlake/uncore-memory.json | 84 +- + .../arch/x86/clearwaterforest/memory.json | 33 + + .../arch/x86/clearwaterforest/pipeline.json | 19 + + .../x86/clearwaterforest/uncore-interconnect.json | 10 + + .../arch/x86/clearwaterforest/uncore-memory.json | 2 +- + .../pmu-events/arch/x86/emeraldrapids/cache.json | 9 + + .../arch/x86/emeraldrapids/emr-metrics.json | 135 +- + .../arch/x86/emeraldrapids/metricgroups.json | 2 +- + .../perf/pmu-events/arch/x86/grandridge/cache.json | 25 + + .../pmu-events/arch/x86/grandridge/counter.json | 42 - + .../arch/x86/grandridge/floating-point.json | 56 + + .../pmu-events/arch/x86/grandridge/memory.json | 57 + + .../pmu-events/arch/x86/grandridge/pipeline.json | 140 ++ + .../arch/x86/grandridge/uncore-memory.json | 2 +- + .../arch/x86/grandridge/virtual-memory.json | 8 + + .../arch/x86/graniterapids/gnr-metrics.json | 102 +- + .../arch/x86/graniterapids/metricgroups.json | 2 +- + .../arch/x86/graniterapids/pipeline.json | 2 +- + .../x86/graniterapids/uncore-interconnect.json | 10 + + .../arch/x86/graniterapids/uncore-memory.json | 2 +- + .../perf/pmu-events/arch/x86/lunarlake/cache.json | 2 +- + .../pmu-events/arch/x86/lunarlake/lnl-metrics.json | 142 +- + .../arch/x86/lunarlake/metricgroups.json | 2 +- + .../pmu-events/arch/x86/lunarlake/pipeline.json | 29 +- + .../arch/x86/lunarlake/uncore-memory.json | 208 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 25 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 11 +- + .../arch/x86/meteorlake/metricgroups.json | 2 +- + .../arch/x86/meteorlake/mtl-metrics.json | 88 +- + .../pmu-events/arch/x86/meteorlake/pipeline.json | 4 +- + .../arch/x86/meteorlake/uncore-memory.json | 84 +- + tools/perf/pmu-events/arch/x86/novalake/cache.json | 749 ++++++ + .../perf/pmu-events/arch/x86/novalake/counter.json | 17 + + .../arch/x86/novalake/floating-point.json | 452 ++++ + .../pmu-events/arch/x86/novalake/frontend.json | 600 +++++ + .../perf/pmu-events/arch/x86/novalake/memory.json | 299 +++ + tools/perf/pmu-events/arch/x86/novalake/other.json | 144 ++ + .../pmu-events/arch/x86/novalake/pipeline.json | 1976 +++++++++++++++ + .../arch/x86/novalake/uncore-memory.json | 42 + + .../arch/x86/novalake/virtual-memory.json | 338 +++ + .../pmu-events/arch/x86/pantherlake/counter.json | 5 + + .../pmu-events/arch/x86/pantherlake/pipeline.json | 31 +- + .../arch/x86/pantherlake/uncore-interconnect.json | 10 + + .../arch/x86/pantherlake/uncore-memory.json | 221 +- + .../pmu-events/arch/x86/sierraforest/counter.json | 77 - + .../arch/x86/sierraforest/uncore-interconnect.json | 10 + + .../arch/x86/sierraforest/uncore-memory.json | 2 +- + tools/perf/pmu-events/empty-pmu-events.c | 362 +-- + tools/perf/pmu-events/jevents.py | 122 +- + tools/perf/pmu-events/metric.py | 23 +- + tools/perf/python/perf.pyi | 672 +++++ + tools/perf/python/perf_live.py | 59 + + tools/perf/scripts/install-build-deps.sh | 603 +++++ + tools/perf/scripts/python/arm-cs-trace-disasm.py | 9 +- + tools/perf/scripts/python/powerpc-hcalls.py | 137 +- + tools/perf/tests/backward-ring-buffer.c | 26 +- + tools/perf/tests/builtin-test.c | 192 +- + tools/perf/tests/code-reading.c | 14 +- + tools/perf/tests/event-times.c | 6 +- + tools/perf/tests/event_update.c | 4 +- + tools/perf/tests/evsel-roundtrip-name.c | 8 +- + tools/perf/tests/evsel-tp-sched.c | 4 +- + tools/perf/tests/expand-cgroup.c | 15 +- + tools/perf/tests/hists_cumulate.c | 2 +- + tools/perf/tests/hists_filter.c | 2 +- + tools/perf/tests/hists_link.c | 2 +- + tools/perf/tests/hists_output.c | 2 +- + tools/perf/tests/hwmon_pmu.c | 7 +- + tools/perf/tests/keep-tracking.c | 10 +- + tools/perf/tests/mmap-basic.c | 24 +- + tools/perf/tests/openat-syscall-all-cpus.c | 6 +- + tools/perf/tests/openat-syscall-tp-fields.c | 26 +- + tools/perf/tests/openat-syscall.c | 6 +- + tools/perf/tests/parse-events.c | 150 +- + tools/perf/tests/parse-metric.c | 11 +- + tools/perf/tests/parse-no-sample-id-all.c | 2 +- + tools/perf/tests/perf-record.c | 38 +- + tools/perf/tests/perf-time-to-tsc.c | 12 +- + tools/perf/tests/pfm.c | 12 +- + tools/perf/tests/pmu-events.c | 21 +- + tools/perf/tests/pmu.c | 4 +- + tools/perf/tests/sample-parsing.c | 84 +- + tools/perf/tests/shell/coresight/callchain.sh | 172 ++ + .../shell/coresight/test_arm_coresight_disasm.sh | 4 +- + tools/perf/tests/shell/inject_aslr.sh | 10 +- + tools/perf/tests/shell/jitdump-python.sh | 69 +- + tools/perf/tests/shell/kvm.sh | 71 +- + .../perf/tests/shell/lib/perf_metric_validation.py | 11 +- + tools/perf/tests/shell/lib/perf_record.sh | 58 + + tools/perf/tests/shell/lib/setup_python.sh | 13 + + tools/perf/tests/shell/lock_contention.sh | 33 +- + tools/perf/tests/shell/pipe_test.sh | 4 +- + .../shell/record+zstd_comp_decomp_multi_record.sh | 63 + + tools/perf/tests/shell/record.sh | 216 +- + tools/perf/tests/shell/record_lbr.sh | 50 +- + tools/perf/tests/shell/record_offcpu.sh | 14 +- + tools/perf/tests/shell/sched.sh | 29 + + tools/perf/tests/shell/stat.sh | 58 + + tools/perf/tests/shell/stat_all_metrics.sh | 77 +- + tools/perf/tests/shell/stat_bpf_counters.sh | 28 +- + tools/perf/tests/shell/stat_bpf_counters_cgrp.sh | 15 + + tools/perf/tests/shell/stat_metrics_values.sh | 9 +- + tools/perf/tests/shell/test_brstack.sh | 99 +- + .../tests/shell/test_dwarf_unwind_multithreaded.sh | 65 + + tools/perf/tests/shell/timechart.sh | 24 +- + tools/perf/tests/shell/trace_record_replay.sh | 38 +- + tools/perf/tests/sw-clock.c | 20 +- + tools/perf/tests/switch-tracking.c | 11 +- + tools/perf/tests/task-exit.c | 20 +- + tools/perf/tests/tests.h | 1 + + tools/perf/tests/time-utils-test.c | 14 +- + tools/perf/tests/tool_pmu.c | 7 +- + tools/perf/tests/topology.c | 4 +- + tools/perf/tests/uncore-event-sorting.c | 6 +- + tools/perf/tests/workloads/Build | 2 + + tools/perf/tests/workloads/callchain.c | 33 + + tools/perf/tests/workloads/noploop.c | 17 +- + tools/perf/tests/workloads/thloop.c | 16 +- + tools/perf/ui/browsers/Build | 1 + + tools/perf/ui/browsers/annotate.c | 4 +- + tools/perf/ui/browsers/c2c-function.c | 209 ++ + tools/perf/ui/browsers/hists.c | 201 +- + tools/perf/util/Build | 3 +- + tools/perf/util/amd-sample-raw.c | 2 +- + tools/perf/util/annotate-data.c | 2 +- + tools/perf/util/annotate.c | 61 +- + tools/perf/util/annotate.h | 3 +- + tools/perf/util/arm-spe.c | 4 + + tools/perf/util/aslr.c | 1 + + tools/perf/util/auxtrace.c | 29 +- + tools/perf/util/block-info.c | 4 +- + tools/perf/util/bpf-event.c | 3 +- + tools/perf/util/bpf-filter.c | 22 +- + tools/perf/util/bpf_counter.c | 2 +- + tools/perf/util/bpf_counter_cgroup.c | 14 +- + tools/perf/util/bpf_ftrace.c | 9 +- + tools/perf/util/bpf_lock_contention.c | 12 +- + tools/perf/util/bpf_off_cpu.c | 44 +- + .../util/bpf_skel/augmented_raw_syscalls.bpf.c | 155 +- + tools/perf/util/bpf_trace_augment.c | 8 +- + tools/perf/util/c2c-function.c | 1642 ++++++++++++ + tools/perf/util/c2c.c | 21 + + tools/perf/util/c2c.h | 135 + + tools/perf/util/cap.c | 4 +- + tools/perf/util/cap.h | 3 +- + tools/perf/util/capstone.c | 62 +- + tools/perf/util/cgroup.c | 26 +- + tools/perf/util/compress.h | 6 +- + tools/perf/util/cs-etm.c | 418 ++-- + tools/perf/util/data-convert-bt.c | 2 +- + tools/perf/util/data-convert-json.c | 1 + + tools/perf/util/data.c | 27 +- + tools/perf/util/data.h | 4 +- + tools/perf/util/disasm.c | 8 +- + tools/perf/util/dso.c | 48 +- + tools/perf/util/dso.h | 57 +- + tools/perf/util/evlist.c | 509 ++-- + tools/perf/util/evlist.h | 273 +- + tools/perf/util/evsel.c | 163 +- + tools/perf/util/evsel.h | 61 +- + tools/perf/util/expr.c | 2 +- + tools/perf/util/find-map.c | 10 +- + tools/perf/util/header.c | 74 +- + tools/perf/util/header.h | 2 +- + .../util/hisi-ptt-decoder/hisi-ptt-pkt-decoder.c | 63 +- + .../util/hisi-ptt-decoder/hisi-ptt-pkt-decoder.h | 14 +- + tools/perf/util/hisi-ptt.c | 24 +- + tools/perf/util/hist.c | 1 + + tools/perf/util/intel-bts.c | 2 +- + tools/perf/util/intel-pt.c | 10 +- + tools/perf/util/intel-tpebs.c | 7 +- + tools/perf/util/iostat.c | 2 +- + tools/perf/util/iostat.h | 2 +- + tools/perf/util/kvm-stat-arch/book3s_hv_exits.h | 4 +- + tools/perf/util/kvm-stat-arch/kvm-stat-powerpc.c | 31 +- + tools/perf/util/kvm-stat-arch/kvm-stat-x86.c | 35 +- + tools/perf/util/kvm-stat.c | 41 + + tools/perf/util/kvm-stat.h | 20 +- + tools/perf/util/libbfd.c | 27 +- + tools/perf/util/libdw.c | 32 +- + tools/perf/util/machine.c | 43 +- + tools/perf/util/map.h | 9 +- + tools/perf/util/metricgroup.c | 45 +- + tools/perf/util/metricgroup.h | 4 +- + tools/perf/util/parse-events.c | 40 +- + tools/perf/util/parse-events.h | 17 +- + tools/perf/util/parse-events.y | 2 +- + tools/perf/util/perf_api_probe.c | 20 +- + tools/perf/util/pfm.c | 4 +- + tools/perf/util/pmu.c | 6 +- + tools/perf/util/pmus.c | 2 + + tools/perf/util/print-events.c | 2 +- + tools/perf/util/probe-file.c | 2 + + tools/perf/util/python.c | 2636 +++++++++++++++++--- + tools/perf/util/record.c | 11 +- + tools/perf/util/s390-sample-raw.c | 22 +- + tools/perf/util/sample-raw.c | 4 +- + tools/perf/util/sample.c | 19 +- + tools/perf/util/session.c | 69 +- + tools/perf/util/session.h | 2 + + tools/perf/util/setup.py | 245 +- + tools/perf/util/sideband_evlist.c | 54 +- + tools/perf/util/sort.c | 78 +- + tools/perf/util/stat-display.c | 9 +- + tools/perf/util/stat-shadow.c | 24 +- + tools/perf/util/stat.c | 22 +- + tools/perf/util/stat.h | 1 + + tools/perf/util/stream.c | 4 +- + tools/perf/util/symbol-elf.c | 11 +- + tools/perf/util/symbol.c | 7 +- + tools/perf/util/symbol.h | 12 + + tools/perf/util/synthetic-events.c | 328 ++- + tools/perf/util/thread-stack.c | 2 +- + tools/perf/util/time-utils.c | 12 +- + tools/perf/util/top.c | 4 +- + tools/perf/util/trace-event-read.c | 54 +- + tools/perf/util/trace-event.c | 11 +- + tools/perf/util/unwind-libdw.c | 24 +- + tools/perf/util/util.c | 12 +- + tools/perf/util/zstd.c | 25 +- + tools/scripts/Makefile.arch | 8 +- + tools/scripts/Makefile.include | 85 +- + tools/testing/selftests/bpf/Makefile | 1 - + 283 files changed, 17987 insertions(+), 3799 deletions(-) + delete mode 100644 tools/perf/pmu-events/arch/x86/grandridge/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/uncore-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/pantherlake/uncore-interconnect.json + delete mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/counter.json + create mode 100644 tools/perf/python/perf.pyi + create mode 100755 tools/perf/python/perf_live.py + create mode 100755 tools/perf/scripts/install-build-deps.sh + create mode 100755 tools/perf/tests/shell/coresight/callchain.sh + create mode 100644 tools/perf/tests/shell/lib/perf_record.sh + create mode 100755 tools/perf/tests/shell/record+zstd_comp_decomp_multi_record.sh + create mode 100755 tools/perf/tests/shell/test_dwarf_unwind_multithreaded.sh + create mode 100644 tools/perf/tests/workloads/callchain.c + create mode 100644 tools/perf/ui/browsers/c2c-function.c + create mode 100644 tools/perf/util/c2c-function.c + create mode 100644 tools/perf/util/c2c.c + create mode 100644 tools/perf/util/c2c.h +Merging compiler-attributes/compiler-attributes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/dma-mapping-for-next (42311aa29e20f 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 +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/s390/Kconfig +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging kernel/dma/coherent.c +Auto-merging kernel/dma/direct.c +Auto-merging kernel/dma/mapping.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/core-api/dma-attributes.rst | 29 ++ + Documentation/core-api/swiotlb.rst | 7 +- + MAINTAINERS | 3 +- + arch/arm64/mm/init.c | 5 +- + arch/powerpc/platforms/pseries/cc_platform.c | 1 + + arch/powerpc/platforms/pseries/svm.c | 2 +- + arch/s390/Kconfig | 1 + + arch/s390/mm/init.c | 17 +- + arch/x86/kernel/amd_gart_64.c | 30 +- + arch/x86/kernel/pci-dma.c | 4 +- + drivers/iommu/dma-iommu.c | 89 +++-- + drivers/xen/swiotlb-xen.c | 8 +- + include/linux/dma-direct.h | 20 +- + include/linux/dma-map-ops.h | 3 +- + include/linux/dma-mapping.h | 8 + + include/linux/swiotlb.h | 41 ++- + include/trace/events/dma.h | 3 +- + kernel/dma/Kconfig | 22 ++ + kernel/dma/coherent.c | 10 +- + kernel/dma/direct.c | 331 +++++++++++++----- + kernel/dma/direct.h | 56 +-- + kernel/dma/mapping.c | 25 +- + kernel/dma/pool.c | 237 +++++++++---- + kernel/dma/swiotlb.c | 445 +++++++++++++++++------- + 25 files changed, 980 insertions(+), 421 deletions(-) +Merging asm-generic/master (adbbd9714f805 scripts: headers_install.sh: Remove config leak ignore machinery) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic asm-generic/master +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 (26b77009ee74f Merge branch 'for-next/uapi' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +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. + drivers/clk/at91/dt-compat.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +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 03d649eddc396] 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 31025e1080b93] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git + Date: Thu Aug 20 13:35:53 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 Documentation/devicetree/bindings/clock/qcom,gcc-mdm9607.yaml +Auto-merging Documentation/devicetree/bindings/clock/qcom,qcm2290-gpucc.yaml +Auto-merging drivers/clk/qcom/cambistmclkcc-kaanapali.c +Auto-merging drivers/clk/qcom/cambistmclkcc-sm8750.c +Auto-merging drivers/clk/qcom/camcc-sc8280xp.c +Auto-merging drivers/clk/qcom/camcc-x1p42100.c +Auto-merging drivers/clk/qcom/dispcc-qcm2290.c +Auto-merging drivers/clk/qcom/dispcc-sm8450.c +Auto-merging drivers/clk/qcom/gcc-eliza.c +Auto-merging drivers/clk/qcom/gcc-glymur.c +Auto-merging drivers/clk/qcom/gcc-hawi.c +Auto-merging drivers/clk/qcom/gcc-kaanapali.c +Auto-merging drivers/clk/qcom/gcc-nord.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/gpucc-qcm2290.c +Auto-merging drivers/clk/qcom/gxclkctl-kaanapali.c +Auto-merging drivers/clk/qcom/negcc-nord.c +Auto-merging drivers/clk/qcom/nwgcc-nord.c +Auto-merging drivers/clk/qcom/tcsrcc-glymur.c +CONFLICT (content): Merge conflict in drivers/clk/qcom/tcsrcc-glymur.c +Auto-merging drivers/clk/qcom/videocc-glymur.c +Auto-merging drivers/clk/qcom/videocc-x1p42100.c +Resolved 'drivers/clk/qcom/tcsrcc-glymur.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6f063c6141633] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/clock/qcom,a53pll.yaml | 1 + + .../bindings/clock/qcom,gcc-mdm9607.yaml | 18 +- + .../devicetree/bindings/clock/qcom,glymur-gcc.yaml | 8 + + .../bindings/clock/qcom,glymur-tcsr.yaml | 146 + + .../devicetree/bindings/clock/qcom,hawi-gcc.yaml | 11 +- + .../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,qcm2290-dispcc.yaml | 15 +- + .../bindings/clock/qcom,qcm2290-gpucc.yaml | 4 +- + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 65 +- + .../bindings/clock/qcom,shikra-audiocorecc.yaml | 55 + + .../bindings/clock/qcom,sm8450-camcc.yaml | 14 +- + .../bindings/clock/qcom,sm8450-gpucc.yaml | 7 + + .../bindings/clock/qcom,sm8450-videocc.yaml | 19 +- + .../bindings/clock/qcom,sm8550-dispcc.yaml | 3 + + .../bindings/clock/qcom,sm8550-tcsr.yaml | 34 +- + .../bindings/reset/qcom,shikra-audiocore-csr.yaml | 42 + + drivers/clk/qcom/Kconfig | 339 +- + drivers/clk/qcom/Makefile | 15 + + drivers/clk/qcom/apss-ipq-pll.c | 19 + + drivers/clk/qcom/audiocorecc-shikra.c | 810 ++++ + 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 | 2286 ++++++++++ + drivers/clk/qcom/camcc-nord.c | 2941 +++++++++++++ + drivers/clk/qcom/camcc-sc8280xp.c | 19 - + drivers/clk/qcom/camcc-x1p42100.c | 6 +- + drivers/clk/qcom/clk-alpha-pll.c | 9 + + drivers/clk/qcom/clk-hfpll.c | 4 +- + drivers/clk/qcom/clk-krait.c | 2 +- + drivers/clk/qcom/clk-rcg.c | 4 +- + drivers/clk/qcom/clk-rcg2.c | 2 +- + drivers/clk/qcom/clk-ref.c | 205 + + drivers/clk/qcom/clk-smd-rpm.c | 5 + + drivers/clk/qcom/common.c | 6 +- + drivers/clk/qcom/dispcc-qcm2290.c | 44 +- + drivers/clk/qcom/dispcc-sm8450.c | 40 +- + drivers/clk/qcom/dispcc0-nord.c | 2004 +++++++++ + drivers/clk/qcom/dispcc1-nord.c | 2004 +++++++++ + drivers/clk/qcom/evacc-glymur.c | 454 ++ + drivers/clk/qcom/gcc-eliza.c | 6 +- + drivers/clk/qcom/gcc-glymur.c | 33 +- + drivers/clk/qcom/gcc-hawi.c | 207 +- + drivers/clk/qcom/gcc-ipq5424.c | 11 - + drivers/clk/qcom/gcc-ipq9650.c | 89 + + drivers/clk/qcom/gcc-kaanapali.c | 6 +- + drivers/clk/qcom/gcc-mdm9607.c | 193 +- + drivers/clk/qcom/gcc-msm8916.c | 5 +- + drivers/clk/qcom/gcc-msm8939.c | 9 +- + drivers/clk/qcom/gcc-nord.c | 45 +- + drivers/clk/qcom/gcc-qcm2290.c | 131 +- + drivers/clk/qcom/gcc-qcs8300.c | 111 +- + drivers/clk/qcom/gcc-shikra.c | 4432 ++++++++++++++++++++ + drivers/clk/qcom/gcc-sm6115.c | 7 +- + drivers/clk/qcom/gdsc.c | 47 +- + drivers/clk/qcom/gdsc.h | 1 + + drivers/clk/qcom/gpu2cc-nord.c | 545 +++ + 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/gpucc-nord.c | 593 +++ + drivers/clk/qcom/gpucc-qcm2290.c | 102 +- + drivers/clk/qcom/gxclkctl-kaanapali.c | 12 +- + drivers/clk/qcom/negcc-nord.c | 75 +- + drivers/clk/qcom/nwgcc-nord.c | 3 + + drivers/clk/qcom/tcsrcc-glymur.c | 477 +-- + drivers/clk/qcom/videocc-eliza.c | 404 ++ + drivers/clk/qcom/videocc-glymur.c | 38 + + drivers/clk/qcom/videocc-hawi.c | 839 ++++ + drivers/clk/qcom/videocc-maili.c | 660 +++ + drivers/clk/qcom/videocc-x1p42100.c | 4 +- + .../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,gcc-mdm9607.h | 1 - + include/dt-bindings/clock/qcom,hawi-gpucc.h | 47 + + include/dt-bindings/clock/qcom,hawi-videocc.h | 64 + + include/dt-bindings/clock/qcom,ipq9650-gcc.h | 5 + + include/dt-bindings/clock/qcom,maili-gcc.h | 21 + + include/dt-bindings/clock/qcom,maili-videocc.h | 50 + + include/dt-bindings/clock/qcom,nord-camcc.h | 167 + + include/dt-bindings/clock/qcom,nord-dispcc.h | 115 + + include/dt-bindings/clock/qcom,nord-gpu2cc.h | 47 + + include/dt-bindings/clock/qcom,nord-gpucc.h | 48 + + include/dt-bindings/clock/qcom,nord-nwgcc.h | 3 + + include/dt-bindings/clock/qcom,qcs8300-gcc.h | 6 + + .../dt-bindings/clock/qcom,shikra-audiocorecc.h | 49 + + include/linux/clk/qcom.h | 67 + + 94 files changed, 25356 insertions(+), 889 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,glymur-tcsr.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,hawi-gpucc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,shikra-audiocorecc.yaml + create mode 100644 Documentation/devicetree/bindings/reset/qcom,shikra-audiocore-csr.yaml + create mode 100644 drivers/clk/qcom/audiocorecc-shikra.c + 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-glymur.c + create mode 100644 drivers/clk/qcom/camcc-nord.c + create mode 100644 drivers/clk/qcom/clk-ref.c + create mode 100644 drivers/clk/qcom/dispcc0-nord.c + create mode 100644 drivers/clk/qcom/dispcc1-nord.c + create mode 100644 drivers/clk/qcom/evacc-glymur.c + create mode 100644 drivers/clk/qcom/gcc-shikra.c + create mode 100644 drivers/clk/qcom/gpu2cc-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/gpucc-nord.c + create mode 100644 drivers/clk/qcom/videocc-eliza.c + create mode 100644 drivers/clk/qcom/videocc-hawi.c + create mode 100644 drivers/clk/qcom/videocc-maili.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,hawi-videocc.h + create mode 100644 include/dt-bindings/clock/qcom,maili-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,maili-videocc.h + create mode 100644 include/dt-bindings/clock/qcom,nord-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,nord-dispcc.h + create mode 100644 include/dt-bindings/clock/qcom,nord-gpu2cc.h + create mode 100644 include/dt-bindings/clock/qcom,nord-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,shikra-audiocorecc.h + create mode 100644 include/linux/clk/qcom.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. + .../bindings/clock/rockchip,rv1106-cru.yaml | 60 ++ + drivers/clk/rockchip/Kconfig | 7 + + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-pll.c | 16 +- + drivers/clk/rockchip/clk-rk3576.c | 15 +- + drivers/clk/rockchip/clk-rk3588.c | 6 +- + drivers/clk/rockchip/clk-rv1106.c | 1099 ++++++++++++++++++++ + drivers/clk/rockchip/clk.h | 8 +- + include/dt-bindings/clock/rockchip,rv1106-cru.h | 306 ++++++ + 9 files changed, 1500 insertions(+), 18 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rv1106-cru.yaml + create mode 100644 drivers/clk/rockchip/clk-rv1106.c + create mode 100644 include/dt-bindings/clock/rockchip,rv1106-cru.h +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 +Auto-merging drivers/clk/samsung/clk-exynos990.c +Auto-merging drivers/clk/samsung/clk.c +Merge made by the 'ort' strategy. + drivers/clk/samsung/clk-cpu.c | 34 +++++++--------- + drivers/clk/samsung/clk-exynos990.c | 24 +++++++----- + drivers/clk/samsung/clk-pll.c | 56 +++++++++++++-------------- + drivers/clk/samsung/clk.c | 11 +++--- + drivers/clk/samsung/clk.h | 4 +- + include/dt-bindings/clock/samsung,exynos990.h | 1 + + 6 files changed, 63 insertions(+), 67 deletions(-) +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. + drivers/clk/spacemit/ccu-k3.c | 41 +++++++++++++++++--------- + include/dt-bindings/clock/spacemit,k3-clocks.h | 4 +++ + include/soc/spacemit/k3-syscon.h | 3 +- + 3 files changed, 33 insertions(+), 15 deletions(-) +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. + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 13 +++ + drivers/clk/sunxi-ng/ccu-sun6i-rtc.c | 127 +++++++++++++++------ + drivers/clk/sunxi-ng/ccu-sun6i-rtc.h | 3 +- + drivers/clk/sunxi-ng/ccu_common.c | 12 +- + drivers/clk/sunxi-ng/ccu_common.h | 1 + + drivers/clk/sunxi-ng/ccu_div.c | 31 ++++- + drivers/clk/sunxi-ng/ccu_div.h | 1 + + drivers/clk/sunxi-ng/ccu_mux.c | 58 +++++----- + include/dt-bindings/clock/sun6i-rtc.h | 4 + + 9 files changed, 176 insertions(+), 74 deletions(-) +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 (69ea2faeb7831 Merge branch 'clk-pile' into clk-next) +$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Auto-merging CREDITS +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/cix/sky1.dtsi +Auto-merging drivers/clk/imx/clk-imx8qxp.c +Auto-merging drivers/pmdomain/mediatek/mtk-mfg-pmdomain.c +Merge made by the 'ort' strategy. + CREDITS | 4 + + .../bindings/clock/amlogic,a9-aoclkc.yaml | 76 + + .../clock/amlogic,a9-peripherals-clkc.yaml | 164 ++ + .../bindings/clock/eswin,eic7700-hspcrg.yaml | 63 + + .../devicetree/bindings/clock/keystone-gate.txt | 27 - + .../bindings/clock/mediatek,mt8173-mfgtop.yaml | 70 + + .../bindings/clock/mediatek,pericfg.yaml | 2 +- + .../bindings/clock/renesas,r8a78000-cpg.yaml | 55 + + .../bindings/clock/renesas,rzv2h-cpg.yaml | 6 + + .../bindings/clock/renesas,versaclock7.yaml | 2 +- + .../devicetree/bindings/clock/silabs,si544.yaml | 10 +- + .../bindings/clock/st,stm32mp21-rcc.yaml | 140 +- + .../bindings/clock/st,stm32mp25-rcc.yaml | 160 +- + .../bindings/clock/ti,keystone,psc-clock.yaml | 60 + + .../devicetree/bindings/clock/ti/apll.txt | 43 - + .../devicetree/bindings/clock/ti/clockdomain.txt | 25 - + .../bindings/clock/ti/ti,apll-clock.yaml | 89 + + .../bindings/clock/ti/ti,clockdomain.yaml | 44 + + .../bindings/clock/ti/ti,gate-clock.yaml | 2 +- + .../bindings/clock/ultrarisc,dp1000-clk.yaml | 60 + + .../bindings/clock/xlnx,clocking-wizard.yaml | 2 +- + .../bindings/remoteproc/ti,keystone-rproc.txt | 2 +- + .../bindings/soc/cix/cix,sky1-audss-cru.yaml | 92 + + .../bindings/soc/mobileye/mobileye,eyeq7h-olb.yaml | 192 ++ + Documentation/driver-api/clk.rst | 58 +- + Documentation/driver-api/driver-model/devres.rst | 1 + + MAINTAINERS | 23 +- + arch/arm64/boot/dts/cix/sky1.dtsi | 18 + + drivers/clk/.kunitconfig | 1 + + drivers/clk/Kconfig | 18 +- + drivers/clk/Makefile | 22 +- + drivers/clk/aspeed/clk-ast2700.c | 10 + + drivers/clk/bcm/clk-kona.c | 3 +- + drivers/clk/cix/Kconfig | 16 + + drivers/clk/cix/Makefile | 3 + + drivers/clk/cix/clk-sky1-audss.c | 1206 +++++++++++ + drivers/clk/clk-bd718x7.c | 12 +- + drivers/clk/clk-cdce706.c | 2 +- + drivers/clk/clk-cdce925.c | 8 +- + drivers/clk/clk-composite.c | 1 + + drivers/clk/clk-conf.c | 76 + + drivers/clk/clk-cs2000-cp.c | 10 +- + drivers/clk/clk-devres.c | 19 +- + drivers/clk/clk-divider.c | 25 +- + drivers/clk/clk-divider_test.c | 153 ++ + drivers/clk/clk-en7523.c | 43 +- + drivers/clk/clk-eyeq.c | 1268 ++++++++---- + drivers/clk/clk-fixed-factor.c | 78 +- + drivers/clk/clk-k230.c | 4 + + drivers/clk/clk-lmk04832.c | 39 +- + drivers/clk/clk-max77686.c | 8 +- + drivers/clk/clk-moxart.c | 14 - + drivers/clk/clk-palmas.c | 24 +- + drivers/clk/clk-renesas-pcie.c | 6 +- + drivers/clk/clk-rp1.c | 8 +- + drivers/clk/clk-s2mps11.c | 12 +- + drivers/clk/clk-scmi-oem.c | 108 + + drivers/clk/clk-scmi.c | 44 +- + drivers/clk/clk-scmi.h | 51 + + drivers/clk/clk-scpi.c | 14 +- + drivers/clk/clk-si514.c | 2 +- + drivers/clk/clk-si521xx.c | 6 +- + drivers/clk/clk-si5341.c | 10 +- + drivers/clk/clk-si5351.c | 8 +- + drivers/clk/clk-si544.c | 82 +- + drivers/clk/clk-si570.c | 8 +- + drivers/clk/clk-versaclock5.c | 16 +- + drivers/clk/clk-versaclock7.c | 6 +- + drivers/clk/clk.c | 112 +- + drivers/clk/clk_test.c | 214 +- + drivers/clk/eswin/Kconfig | 13 + + drivers/clk/eswin/Makefile | 1 + + drivers/clk/eswin/clk-eic7700-hsp.c | 345 ++++ + drivers/clk/eswin/clk-eic7700.c | 3 +- + drivers/clk/eswin/clk.c | 4 +- + drivers/clk/hisilicon/Kconfig | 14 + + drivers/clk/hisilicon/clk-hi3660-stub.c | 22 +- + drivers/clk/hisilicon/reset.c | 2 +- + drivers/clk/imx/clk-imx8mm.c | 6 + + drivers/clk/imx/clk-imx8qxp-lpcg.c | 1 + + drivers/clk/imx/clk-imx8qxp.c | 1 + + drivers/clk/imx/clk-imx95-blk-ctl.c | 21 +- + drivers/clk/imx/clk-pll14xx.c | 119 +- + drivers/clk/imx/clk-scu.c | 24 +- + drivers/clk/imx/clk.h | 1 + + drivers/clk/kunit_clk_assigned_rates.h | 10 + + .../clk/kunit_clk_assigned_rates_u64_multiple.dtso | 6 + + ...t_clk_assigned_rates_u64_multiple_consumer.dtso | 6 + + drivers/clk/kunit_clk_assigned_rates_u64_one.dtso | 3 + + .../kunit_clk_assigned_rates_u64_one_consumer.dtso | 3 + + drivers/clk/kunit_clk_assigned_sscs_multiple.dtso | 20 + + .../kunit_clk_assigned_sscs_multiple_consumer.dtso | 24 + + drivers/clk/kunit_clk_assigned_sscs_null.dtso | 16 + + .../clk/kunit_clk_assigned_sscs_null_consumer.dtso | 20 + + drivers/clk/kunit_clk_assigned_sscs_one.dtso | 16 + + .../clk/kunit_clk_assigned_sscs_one_consumer.dtso | 20 + + drivers/clk/kunit_clk_assigned_sscs_without.dtso | 15 + + .../kunit_clk_assigned_sscs_without_consumer.dtso | 19 + + drivers/clk/kunit_clk_assigned_sscs_zero.dtso | 12 + + .../clk/kunit_clk_assigned_sscs_zero_consumer.dtso | 16 + + drivers/clk/mediatek/Kconfig | 11 + + drivers/clk/mediatek/Makefile | 1 + + drivers/clk/mediatek/clk-mt6735-apmixedsys.c | 5 +- + drivers/clk/mediatek/clk-mt6735-vdecsys.c | 1 + + drivers/clk/mediatek/clk-mt6735-vencsys.c | 1 + + drivers/clk/mediatek/clk-mt8135.c | 5 +- + drivers/clk/mediatek/clk-mt8173-mfgtop.c | 242 +++ + drivers/clk/mediatek/clk-mt8196-vlpckgen.c | 1 - + drivers/clk/mediatek/clk-pllfh.c | 98 +- + drivers/clk/meson/Kconfig | 27 + + drivers/clk/meson/Makefile | 2 + + drivers/clk/meson/a9-aoclk.c | 489 +++++ + drivers/clk/meson/a9-peripherals.c | 2089 ++++++++++++++++++++ + drivers/clk/meson/gxbb.c | 2 +- + drivers/clk/microchip/clk-mpfs.c | 2 +- + drivers/clk/mmp/clk-pxa1908-apbc.c | 2 +- + drivers/clk/mmp/clk-pxa1908-apbcp.c | 2 +- + drivers/clk/mvebu/clk-cpu.c | 2 +- + drivers/clk/mvebu/kirkwood.c | 21 +- + drivers/clk/nuvoton/clk-ma35d1-pll.c | 42 +- + drivers/clk/qcom/clk-rpm.c | 15 +- + drivers/clk/qcom/clk-rpmh.c | 8 +- + drivers/clk/qcom/clk-smd-rpm.c | 13 +- + drivers/clk/renesas/Kconfig | 10 + + drivers/clk/renesas/Makefile | 2 + + drivers/clk/renesas/r8a78000-cpg.c | 166 ++ + drivers/clk/renesas/r9a08g045-cpg.c | 9 + + drivers/clk/renesas/r9a08g046-cpg.c | 130 ++ + drivers/clk/renesas/r9a09g047-cpg.c | 123 +- + drivers/clk/renesas/r9a09g077-cpg.c | 375 +++- + drivers/clk/renesas/renesas-cpg-mssr.c | 20 +- + drivers/clk/renesas/rzg2l-cpg.c | 8 +- + drivers/clk/renesas/rzv2h-cpg-lib.c | 217 ++ + drivers/clk/renesas/rzv2h-cpg.c | 203 -- + drivers/clk/samsung/clk-acpm.c | 18 +- + drivers/clk/samsung/clk.h | 2 +- + drivers/clk/sprd/pll.c | 8 +- + drivers/clk/st/clkgen-pll.c | 20 +- + drivers/clk/stm32/clk-stm32mp21.c | 1 + + drivers/clk/stm32/clk-stm32mp25.c | 1 + + drivers/clk/tegra/clk-bpmp.c | 10 +- + drivers/clk/tegra/clk-pll.c | 1 + + drivers/clk/tegra/clk-tegra114.c | 39 +- + drivers/clk/tegra/clk-tegra124-emc.c | 1 + + drivers/clk/tegra/clk-tegra210.c | 2 +- + drivers/clk/ti/adpll.c | 4 +- + drivers/clk/ti/composite.c | 26 +- + drivers/clk/ti/divider.c | 2 +- + drivers/clk/ti/mux.c | 22 +- + drivers/clk/ultrarisc/Kconfig | 18 + + drivers/clk/ultrarisc/Makefile | 4 + + drivers/clk/ultrarisc/clk-dp1000.c | 154 ++ + drivers/clk/ultrarisc/clk-ultrarisc.c | 399 ++++ + drivers/clk/ultrarisc/clk-ultrarisc.h | 71 + + drivers/clk/visconti/clkc.c | 2 +- + drivers/clk/x86/clk-pmc-atom.c | 3 + + drivers/clk/xilinx/clk-xlnx-clock-wizard.c | 146 +- + drivers/clk/zynq/clkc.c | 8 + + drivers/clk/zynq/pll.c | 8 +- + drivers/phy/mediatek/phy-mtk-hdmi-mt2701.c | 8 +- + drivers/pmdomain/mediatek/airoha-cpu-pmdomain.c | 8 +- + drivers/pmdomain/mediatek/mtk-mfg-pmdomain.c | 23 +- + drivers/reset/Kconfig | 24 + + drivers/reset/Makefile | 2 + + drivers/reset/reset-eic7700-hsp.c | 113 ++ + drivers/reset/reset-eyeq.c | 271 ++- + drivers/reset/reset-sky1-audss.c | 127 ++ + include/dt-bindings/clock/amlogic,a9-aoclkc.h | 76 + + .../clock/amlogic,a9-peripherals-clkc.h | 351 ++++ + include/dt-bindings/clock/aspeed,ast2700-scu.h | 2 + + include/dt-bindings/clock/cix,sky1-audss-cru.h | 60 + + include/dt-bindings/clock/clock.h | 14 + + include/dt-bindings/clock/eswin,eic7700-hspcrg.h | 33 + + include/dt-bindings/clock/mobileye,eyeq7h-clk.h | 119 ++ + include/dt-bindings/clock/mt8173-clk.h | 7 + + include/dt-bindings/clock/renesas,r8a78000-cpg.h | 14 + + .../dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h | 2 + + .../dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h | 2 + + include/dt-bindings/clock/ultrarisc,dp1000-clk.h | 27 + + include/dt-bindings/reset/airoha,en7581-reset.h | 4 + + include/dt-bindings/reset/cix,sky1-audss-cru.h | 25 + + include/dt-bindings/reset/eswin,eic7700-hspcrg.h | 21 + + include/linux/clk-provider.h | 134 +- + include/linux/clk.h | 27 +- + include/linux/clk/renesas.h | 34 +- + 185 files changed, 11331 insertions(+), 1554 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,a9-aoclkc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,a9-peripherals-clkc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/eswin,eic7700-hspcrg.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/keystone-gate.txt + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt8173-mfgtop.yaml + create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a78000-cpg.yaml + create mode 100644 Documentation/devicetree/bindings/clock/ti,keystone,psc-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/ti/apll.txt + delete mode 100644 Documentation/devicetree/bindings/clock/ti/clockdomain.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,apll-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,clockdomain.yaml + create mode 100644 Documentation/devicetree/bindings/clock/ultrarisc,dp1000-clk.yaml + create mode 100644 Documentation/devicetree/bindings/soc/cix/cix,sky1-audss-cru.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mobileye/mobileye,eyeq7h-olb.yaml + create mode 100644 drivers/clk/cix/Kconfig + create mode 100644 drivers/clk/cix/Makefile + create mode 100644 drivers/clk/cix/clk-sky1-audss.c + create mode 100644 drivers/clk/clk-divider_test.c + create mode 100644 drivers/clk/clk-scmi-oem.c + create mode 100644 drivers/clk/clk-scmi.h + create mode 100644 drivers/clk/eswin/clk-eic7700-hsp.c + create mode 100644 drivers/clk/kunit_clk_assigned_sscs_multiple.dtso + create mode 100644 drivers/clk/kunit_clk_assigned_sscs_multiple_consumer.dtso + create mode 100644 drivers/clk/kunit_clk_assigned_sscs_null.dtso + create mode 100644 drivers/clk/kunit_clk_assigned_sscs_null_consumer.dtso + create mode 100644 drivers/clk/kunit_clk_assigned_sscs_one.dtso + create mode 100644 drivers/clk/kunit_clk_assigned_sscs_one_consumer.dtso + create mode 100644 drivers/clk/kunit_clk_assigned_sscs_without.dtso + create mode 100644 drivers/clk/kunit_clk_assigned_sscs_without_consumer.dtso + create mode 100644 drivers/clk/kunit_clk_assigned_sscs_zero.dtso + create mode 100644 drivers/clk/kunit_clk_assigned_sscs_zero_consumer.dtso + create mode 100644 drivers/clk/mediatek/clk-mt8173-mfgtop.c + create mode 100644 drivers/clk/meson/a9-aoclk.c + create mode 100644 drivers/clk/meson/a9-peripherals.c + create mode 100644 drivers/clk/renesas/r8a78000-cpg.c + create mode 100644 drivers/clk/renesas/rzv2h-cpg-lib.c + create mode 100644 drivers/clk/ultrarisc/Kconfig + create mode 100644 drivers/clk/ultrarisc/Makefile + create mode 100644 drivers/clk/ultrarisc/clk-dp1000.c + create mode 100644 drivers/clk/ultrarisc/clk-ultrarisc.c + create mode 100644 drivers/clk/ultrarisc/clk-ultrarisc.h + create mode 100644 drivers/reset/reset-eic7700-hsp.c + create mode 100644 drivers/reset/reset-sky1-audss.c + create mode 100644 include/dt-bindings/clock/amlogic,a9-aoclkc.h + create mode 100644 include/dt-bindings/clock/amlogic,a9-peripherals-clkc.h + create mode 100644 include/dt-bindings/clock/cix,sky1-audss-cru.h + create mode 100644 include/dt-bindings/clock/clock.h + create mode 100644 include/dt-bindings/clock/eswin,eic7700-hspcrg.h + create mode 100644 include/dt-bindings/clock/mobileye,eyeq7h-clk.h + create mode 100644 include/dt-bindings/clock/renesas,r8a78000-cpg.h + create mode 100644 include/dt-bindings/clock/ultrarisc,dp1000-clk.h + create mode 100644 include/dt-bindings/reset/cix,sky1-audss-cru.h + create mode 100644 include/dt-bindings/reset/eswin,eic7700-hspcrg.h +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 +Auto-merging arch/loongarch/include/asm/pgtable.h +Merge made by the 'ort' strategy. + arch/loongarch/include/asm/inst.h | 25 +++ + arch/loongarch/include/asm/pgtable.h | 9 +- + arch/loongarch/include/asm/ptrace.h | 6 +- + arch/loongarch/kernel/acpi.c | 3 +- + arch/loongarch/kernel/module-sections.c | 6 +- + arch/loongarch/kvm/exit.c | 19 +- + arch/loongarch/kvm/intc/dmsintc.c | 18 +- + arch/loongarch/kvm/intc/eiointc.c | 32 ++-- + arch/loongarch/kvm/intc/ipi.c | 77 ++++---- + arch/loongarch/kvm/intc/pch_pic.c | 12 +- + arch/loongarch/kvm/timer.c | 14 ++ + arch/loongarch/kvm/vcpu.c | 7 +- + arch/loongarch/kvm/vm.c | 4 + + arch/loongarch/mm/init.c | 17 +- + arch/loongarch/net/Makefile | 2 +- + arch/loongarch/net/bpf_jit.c | 197 +++++++++++++-------- + arch/loongarch/net/bpf_jit.h | 2 +- + arch/loongarch/net/bpf_timed_may_goto.S | 47 +++++ + .../selftests/bpf/prog_tests/kptr_xchg_inline.c | 3 +- + tools/testing/selftests/kvm/Makefile.kvm | 3 +- + .../selftests/kvm/include/loongarch/processor.h | 18 ++ + .../selftests/kvm/lib/loongarch/processor.c | 11 +- + tools/testing/selftests/kvm/loongarch/fpu_test.c | 137 ++++++++++++++ + 23 files changed, 494 insertions(+), 175 deletions(-) + create mode 100644 arch/loongarch/net/bpf_timed_may_goto.S + create mode 100644 tools/testing/selftests/kvm/loongarch/fpu_test.c +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 +Auto-merging arch/mips/Kconfig +Auto-merging arch/mips/kernel/ptrace.c +Merge made by the 'ort' strategy. + arch/mips/Kconfig | 1 - + arch/mips/bcm47xx/buttons.c | 444 ++++++++++++++++++-------------- + arch/mips/boot/dts/econet/en751221.dtsi | 7 + + arch/mips/econet/Kconfig | 4 +- + arch/mips/econet/init.c | 42 ++- + arch/mips/include/asm/gio_device.h | 1 - + arch/mips/include/asm/txx9/generic.h | 9 +- + arch/mips/include/asm/txx9/tx4938.h | 1 - + arch/mips/include/asm/txx9pio.h | 3 +- + arch/mips/kernel/gpio_txx9.c | 5 +- + arch/mips/kernel/proc.c | 4 +- + arch/mips/kernel/ptrace.c | 6 +- + arch/mips/txx9/Kconfig | 1 - + arch/mips/txx9/generic/setup.c | 45 ++-- + arch/mips/txx9/generic/setup_tx4938.c | 6 - + arch/mips/txx9/rbtx4927/setup.c | 41 ++- + drivers/bcma/driver_gpio.c | 43 +++- + drivers/ssb/driver_gpio.c | 48 +++- + include/linux/bcma/bcma.h | 2 + + include/linux/ssb/ssb.h | 2 + + 20 files changed, 447 insertions(+), 268 deletions(-) +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 (8b585431a16cf parisc: eisa: Fix infinite loop when parsing invalid IRQ value) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/include/asm/serial.h | 8 -------- + arch/parisc/kernel/head.S | 1 + + drivers/parisc/eisa.c | 5 +++++ + drivers/parisc/eisa_eeprom.c | 1 + + drivers/parisc/sba_iommu.c | 21 --------------------- + drivers/parisc/superio.c | 2 +- + include/uapi/linux/personality.h | 1 - + 7 files changed, 8 insertions(+), 31 deletions(-) + delete mode 100644 arch/parisc/include/asm/serial.h +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 (8da45c93dfa98 RISC-V: hwprobe: Use BIT macro to avoid warnings) +$ 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 +Auto-merging MAINTAINERS +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/include/asm/hugetlb.h +Auto-merging arch/s390/kernel/syscall.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kvm/pv.c +Auto-merging arch/s390/kvm/vsie.c +Auto-merging arch/s390/mm/gmap_helpers.c +Auto-merging arch/s390/mm/init.c +CONFLICT (content): Merge conflict in arch/s390/mm/init.c +Auto-merging include/linux/tick.h +Resolved 'arch/s390/mm/init.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 70d50ed0e6a74] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 8 + + arch/s390/Kconfig | 10 ++ + arch/s390/appldata/Makefile | 2 + + arch/s390/configs/debug_defconfig | 4 +- + arch/s390/configs/defconfig | 2 + + arch/s390/crypto/paes_s390.c | 44 +---- + arch/s390/crypto/phmac_s390.c | 25 +-- + arch/s390/hypfs/Makefile | 2 + + arch/s390/include/asm/ap.h | 4 +- + arch/s390/include/asm/asm-extable.h | 4 + + arch/s390/include/asm/cfi.h | 7 + + arch/s390/include/asm/hugetlb.h | 4 +- + arch/s390/include/asm/irqflags.h | 20 ++- + arch/s390/include/asm/percpu.h | 4 +- + arch/s390/include/asm/pkey.h | 16 ++ + arch/s390/include/asm/processor.h | 4 - + arch/s390/include/asm/ptrace.h | 4 +- + arch/s390/include/asm/sclp.h | 3 + + arch/s390/include/asm/thread_info.h | 1 + + arch/s390/include/asm/uv.h | 18 +- + arch/s390/include/asm/word-at-a-time.h | 22 +++ + arch/s390/include/uapi/asm/Kbuild | 1 - + arch/s390/kernel/Makefile | 3 + + arch/s390/kernel/debug.c | 10 +- + arch/s390/kernel/entry.S | 9 +- + arch/s390/kernel/entry.h | 10 +- + arch/s390/kernel/idle.c | 1 - + arch/s390/kernel/ipl.c | 58 ++++--- + arch/s390/kernel/irq.c | 4 - + arch/s390/kernel/irqflags.c | 28 ++++ + arch/s390/kernel/mcount.S | 9 +- + arch/s390/kernel/perf_cpum_cf.c | 222 ++++++++++++++++--------- + arch/s390/kernel/smp.c | 6 +- + arch/s390/kernel/syscall.c | 4 +- + arch/s390/kernel/sysinfo.c | 2 + + arch/s390/kernel/text_amode31.S | 13 +- + arch/s390/kernel/traps.c | 45 ++++- + arch/s390/kernel/uv.c | 67 +++++++- + arch/s390/kernel/vdso/Makefile | 3 +- + arch/s390/kernel/vdso/vdso.lds.S | 11 +- + arch/s390/kvm/gaccess.c | 8 +- + arch/s390/kvm/gmap.c | 4 - + arch/s390/kvm/kvm-s390.c | 1 - + arch/s390/kvm/pv.c | 17 +- + arch/s390/kvm/vsie.c | 1 - + arch/s390/lib/Makefile | 2 + + arch/s390/lib/spinlock.c | 3 + + arch/s390/mm/Makefile | 2 + + arch/s390/mm/cmm.c | 2 - + arch/s390/mm/extable.c | 18 ++ + arch/s390/mm/fault.c | 36 ++-- + arch/s390/mm/gmap_helpers.c | 4 +- + arch/s390/mm/hugetlbpage.c | 10 +- + arch/s390/mm/init.c | 2 +- + arch/s390/mm/maccess.c | 2 +- + arch/s390/mm/pageattr.c | 5 - + arch/s390/mm/pgalloc.c | 1 - + arch/s390/net/Makefile | 3 + + arch/s390/net/bpf_jit_comp.c | 28 +++- + arch/s390/pci/Makefile | 2 + + arch/s390/pci/pci.c | 4 +- + arch/s390/pci/pci_event.c | 205 ++++++++++++----------- + arch/s390/purgatory/Makefile | 2 + + arch/s390/tools/relocs.c | 158 +++++++++++++++++- + drivers/cpuidle/Kconfig | 5 + + drivers/cpuidle/Kconfig.s390 | 11 ++ + drivers/cpuidle/Makefile | 4 + + drivers/cpuidle/cpuidle-s390.c | 115 +++++++++++++ + drivers/s390/char/Makefile | 2 + + drivers/s390/char/con3215.c | 1 + + drivers/s390/char/sclp_pci.c | 3 + + drivers/s390/char/uvdevice.c | 6 +- + drivers/s390/cio/Makefile | 2 + + drivers/s390/cio/css.c | 8 - + drivers/s390/cio/vfio_ccw_drv.c | 1 + + drivers/s390/cio/vfio_ccw_private.h | 3 +- + drivers/s390/crypto/ap_bus.c | 4 +- + drivers/s390/crypto/ap_bus.h | 2 +- + drivers/s390/crypto/ap_card.c | 2 +- + drivers/s390/crypto/pkey_api.c | 290 ++++++++++++++++++--------------- + drivers/s390/virtio/Makefile | 2 + + include/linux/tick.h | 3 - + kernel/time/tick-sched.c | 7 +- + 83 files changed, 1159 insertions(+), 546 deletions(-) + create mode 100644 arch/s390/include/asm/cfi.h + create mode 100644 arch/s390/kernel/irqflags.c + create mode 100644 drivers/cpuidle/Kconfig.s390 + create mode 100644 drivers/cpuidle/cpuidle-s390.c +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 (a7c958e8721eb xtensa: correct CONFIG_XTENSA_CALIBRATE_CCOUNT macro name in comment) +$ 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/platforms/iss/console.c | 5 +++-- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging fs-next (e928ee2ede92f Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging include/linux/fs.h +Auto-merging include/linux/nfs_fs.h +Merge made by the 'ort' strategy. + .../ABI/testing/procfs-nfsd-reply_cache_stats | 38 + + Documentation/ABI/testing/sysfs-fs-f2fs | 10 + + Documentation/admin-guide/kernel-parameters.txt | 20 +- + Documentation/block/ublk.rst | 14 +- + Documentation/filesystems/erofs.rst | 17 + + Documentation/filesystems/ext4/group_descr.rst | 9 +- + Documentation/filesystems/f2fs.rst | 35 + + Documentation/filesystems/fuse/fuse-io-uring.rst | 32 + + Documentation/filesystems/fuse/index.rst | 1 + + .../filesystems/fuse/uapi/fuse-uapi-io-uring.rst | 126 + + Documentation/netlink/specs/nfsd.yaml | 111 + + Documentation/sunrpc/xdr/nfs4_1.x | 258 +- + MAINTAINERS | 7 +- + arch/loongarch/configs/loongson32_defconfig | 1 - + arch/loongarch/configs/loongson64_defconfig | 1 - + arch/mips/configs/bigsur_defconfig | 1 - + arch/mips/configs/ip22_defconfig | 1 - + arch/mips/configs/loongson2k_defconfig | 1 - + drivers/block/ublk_drv.c | 22 +- + 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 +- + drivers/tty/tty_io.c | 27 - + fs/btrfs/Kconfig | 1 + + fs/btrfs/acl.c | 4 + + fs/btrfs/block-group.c | 13 +- + fs/btrfs/block-group.h | 4 +- + fs/btrfs/compression.c | 14 +- + fs/btrfs/ctree.c | 36 +- + fs/btrfs/ctree.h | 6 +- + fs/btrfs/defrag.c | 61 +- + fs/btrfs/delayed-inode.c | 12 +- + fs/btrfs/direct-io.c | 210 +- + fs/btrfs/disk-io.c | 153 +- + fs/btrfs/disk-io.h | 2 + + fs/btrfs/extent-io-tree.c | 21 + + fs/btrfs/extent-tree.c | 28 +- + fs/btrfs/extent_io.c | 637 +++- + fs/btrfs/extent_io.h | 29 + + fs/btrfs/fiemap.c | 6 +- + fs/btrfs/file.c | 120 +- + fs/btrfs/fs.c | 19 +- + fs/btrfs/fs.h | 6 +- + fs/btrfs/inode.c | 86 +- + fs/btrfs/ioctl.c | 138 +- + fs/btrfs/messages.c | 10 +- + fs/btrfs/qgroup.c | 26 +- + fs/btrfs/raid56.c | 18 +- + fs/btrfs/raid56.h | 2 +- + fs/btrfs/reflink.c | 111 +- + fs/btrfs/relocation.c | 97 +- + fs/btrfs/root-tree.c | 6 +- + fs/btrfs/scrub.c | 234 +- + fs/btrfs/send.c | 17 +- + fs/btrfs/space-info.c | 2 +- + fs/btrfs/subpage.c | 7 +- + fs/btrfs/subpage.h | 3 +- + fs/btrfs/super.c | 37 +- + fs/btrfs/sysfs.c | 2 +- + fs/btrfs/transaction.c | 36 +- + fs/btrfs/transaction.h | 25 +- + fs/btrfs/tree-log.c | 99 +- + fs/btrfs/verity.c | 18 +- + fs/btrfs/volumes.c | 64 +- + fs/btrfs/volumes.h | 10 +- + fs/buffer.c | 3 + + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 15 +- + fs/ecryptfs/keystore.c | 45 +- + fs/ecryptfs/messaging.c | 11 +- + fs/ecryptfs/miscdev.c | 5 +- + fs/ecryptfs/mmap.c | 30 +- + fs/ecryptfs/super.c | 7 + + fs/erofs/data.c | 28 +- + fs/erofs/decompressor.c | 1 + + fs/erofs/fileio.c | 21 + + fs/erofs/internal.h | 14 +- + fs/erofs/super.c | 112 +- + fs/erofs/zdata.c | 25 +- + fs/erofs/zmap.c | 38 +- + fs/exfat/balloc.c | 31 +- + fs/exfat/dir.c | 10 +- + fs/exfat/exfat_fs.h | 8 +- + fs/exfat/file.c | 184 +- + fs/exfat/inode.c | 5 +- + fs/exfat/iomap.c | 11 +- + fs/exfat/namei.c | 27 +- + fs/exfat/super.c | 1 - + fs/ext2/xattr.c | 14 +- + fs/ext4/balloc.c | 4 + + fs/ext4/crypto.c | 40 +- + fs/ext4/dir.c | 20 +- + fs/ext4/ext4.h | 40 +- + fs/ext4/ext4_jbd2.c | 34 +- + fs/ext4/ext4_jbd2.h | 6 +- + fs/ext4/extents.c | 184 +- + fs/ext4/fast_commit.c | 37 +- + fs/ext4/file.c | 151 +- + fs/ext4/ialloc.c | 4 + + fs/ext4/inline.c | 38 +- + fs/ext4/inode.c | 207 +- + fs/ext4/mballoc.c | 21 +- + fs/ext4/migrate.c | 3 +- + fs/ext4/namei.c | 2 + + fs/ext4/orphan.c | 17 +- + fs/ext4/super.c | 32 +- + fs/ext4/xattr.c | 178 +- + fs/ext4/xattr.h | 9 +- + fs/f2fs/checkpoint.c | 27 +- + 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 | 78 +- + fs/f2fs/file.c | 438 ++- + fs/f2fs/gc.c | 102 +- + fs/f2fs/gc.h | 27 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/inode.c | 224 +- + fs/f2fs/iostat.c | 6 + + fs/f2fs/namei.c | 20 +- + fs/f2fs/node.c | 5 +- + fs/f2fs/recovery.c | 55 +- + fs/f2fs/segment.c | 252 +- + fs/f2fs/segment.h | 36 +- + fs/f2fs/shrinker.c | 3 +- + fs/f2fs/super.c | 59 +- + fs/f2fs/sysfs.c | 32 +- + fs/f2fs/xattr.c | 2 +- + fs/fuse/args.h | 2 + + fs/fuse/cuse.c | 8 +- + fs/fuse/dev.c | 104 +- + fs/fuse/dev.h | 2 +- + fs/fuse/dev_uring.c | 608 +++- + fs/fuse/dev_uring_i.h | 56 +- + fs/fuse/dir.c | 34 +- + fs/fuse/file.c | 6 +- + fs/fuse/fuse_dev_i.h | 5 + + fs/fuse/fuse_i.h | 2 + + fs/fuse/inode.c | 12 +- + fs/fuse/readdir.c | 2 +- + fs/fuse/req_timeout.c | 12 +- + fs/isofs/compress.c | 7 +- + fs/isofs/dir.c | 31 +- + fs/isofs/export.c | 10 +- + fs/isofs/isofs.h | 3 + + fs/isofs/namei.c | 59 +- + fs/jbd2/checkpoint.c | 28 +- + fs/jbd2/journal.c | 1 + + fs/lockd/clntproc.c | 3 + + fs/lockd/lockd.h | 2 +- + fs/lockd/nlm3xdr_gen.c | 30 +- + fs/lockd/nlm3xdr_gen.h | 4 +- + fs/lockd/nlm4xdr_gen.c | 75 +- + fs/lockd/nlm4xdr_gen.h | 4 +- + fs/lockd/share.h | 8 +- + fs/lockd/svc.c | 4 +- + fs/lockd/svc4proc.c | 55 +- + fs/lockd/svclock.c | 42 +- + fs/lockd/svcproc.c | 55 +- + fs/lockd/svcshare.c | 36 +- + fs/lockd/svcsubs.c | 107 +- + fs/nfs/blocklayout/dev.c | 21 +- + fs/nfs/callback.c | 4 +- + fs/nfs/callback_proc.c | 5 +- + fs/nfs/callback_xdr.c | 7 +- + fs/nfs/client.c | 14 +- + fs/nfs/delegation.c | 20 +- + fs/nfs/dir.c | 17 + + fs/nfs/filelayout/filelayoutdev.c | 2 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 26 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 3 +- + fs/nfs/inode.c | 28 +- + fs/nfs/internal.h | 8 +- + fs/nfs/localio.c | 56 +- + fs/nfs/nfs4client.c | 23 +- + fs/nfs/nfs4file.c | 2 + + fs/nfs/nfs4proc.c | 69 +- + fs/nfs/nfs4session.c | 21 +- + fs/nfs/nfs4session.h | 3 +- + fs/nfs/nfs4state.c | 40 +- + fs/nfs/nfs4trace.h | 58 +- + fs/nfs/nfs4xdr.c | 35 +- + fs/nfs/nfstrace.h | 3 +- + fs/nfs/pnfs.c | 57 +- + fs/nfs/pnfs.h | 5 +- + fs/nfs/pnfs_nfs.c | 14 +- + fs/nfs/write.c | 13 +- + fs/nfs_common/nfslocalio.c | 16 +- + fs/nfsd/attr4.h | 162 + + fs/nfsd/auth.c | 19 + + fs/nfsd/auth.h | 6 + + fs/nfsd/cache.h | 3 +- + fs/nfsd/filecache.c | 265 +- + fs/nfsd/filecache.h | 3 + + fs/nfsd/flexfilelayoutxdr.c | 20 +- + fs/nfsd/localio.c | 11 +- + fs/nfsd/lockd.c | 6 +- + fs/nfsd/netlink.c | 5 + + fs/nfsd/netlink.h | 2 + + fs/nfsd/netns.h | 47 +- + fs/nfsd/nfs2acl.c | 55 +- + fs/nfsd/nfs3acl.c | 20 +- + fs/nfsd/nfs3proc.c | 45 +- + fs/nfsd/nfs3xdr.c | 2 +- + fs/nfsd/nfs4callback.c | 229 +- + fs/nfsd/nfs4idmap.c | 1 + + fs/nfsd/nfs4layouts.c | 45 +- + fs/nfsd/nfs4proc.c | 412 ++- + fs/nfsd/nfs4recover.c | 48 +- + fs/nfsd/nfs4state.c | 1281 ++++++-- + fs/nfsd/nfs4xdr.c | 411 ++- + fs/nfsd/nfs4xdr_gen.c | 600 +++- + fs/nfsd/nfs4xdr_gen.h | 20 +- + fs/nfsd/nfscache.c | 8 +- + fs/nfsd/nfsctl.c | 435 ++- + fs/nfsd/nfsd.h | 214 +- + fs/nfsd/nfsfh.c | 44 +- + fs/nfsd/nfsfh.h | 3 + + fs/nfsd/nfsproc.c | 12 +- + fs/nfsd/nfssvc.c | 71 +- + fs/nfsd/nfsxdr.c | 34 +- + fs/nfsd/state.h | 97 +- + fs/nfsd/stats.c | 4 +- + fs/nfsd/stats.h | 86 +- + fs/nfsd/trace.h | 43 +- + fs/nfsd/vfs.c | 63 +- + fs/nfsd/vfs.h | 5 +- + fs/nfsd/xdr.h | 1 + + fs/nfsd/xdr3.h | 1 + + fs/nfsd/xdr4.h | 37 +- + fs/nfsd/xdr4cb.h | 12 + + 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/notify/fanotify/fanotify.c | 4 +- + fs/notify/fanotify/fanotify.h | 6 +- + fs/notify/fanotify/fanotify_user.c | 29 +- + fs/notify/inotify/inotify_user.c | 15 +- + fs/ntfs/attrib.c | 36 +- + fs/ntfs/compress.c | 389 +-- + fs/ntfs/dir.c | 5 +- + fs/ntfs/ea.c | 225 +- + fs/ntfs/ea.h | 3 +- + fs/ntfs/file.c | 81 +- + fs/ntfs/index.c | 96 +- + fs/ntfs/inode.c | 85 +- + fs/ntfs/inode.h | 3 +- + fs/ntfs/iomap.c | 66 +- + fs/ntfs/lcnalloc.c | 7 +- + fs/ntfs/mft.c | 15 +- + fs/ntfs/namei.c | 10 +- + fs/ntfs/reparse.c | 13 +- + fs/ntfs/runlist.c | 29 + + fs/ntfs/super.c | 12 +- + fs/ntfs3/attrib.c | 159 +- + fs/ntfs3/attrlist.c | 15 +- + fs/ntfs3/dir.c | 132 +- + fs/ntfs3/file.c | 66 +- + fs/ntfs3/frecord.c | 199 +- + fs/ntfs3/fslog.c | 68 +- + fs/ntfs3/fsntfs.c | 34 +- + fs/ntfs3/index.c | 8 +- + fs/ntfs3/inode.c | 298 +- + fs/ntfs3/lznt.c | 4 +- + fs/ntfs3/namei.c | 64 +- + fs/ntfs3/ntfs.h | 3 +- + fs/ntfs3/ntfs_fs.h | 51 +- + fs/ntfs3/record.c | 34 +- + fs/ntfs3/run.c | 9 +- + fs/ntfs3/super.c | 38 +- + fs/ntfs3/xattr.c | 26 +- + fs/orangefs/devorangefs-req.c | 1 + + fs/orangefs/inode.c | 8 +- + fs/orangefs/orangefs-debugfs.c | 1 + + fs/orangefs/xattr.c | 5 - + fs/quota/Kconfig | 10 - + fs/quota/dquot.c | 81 +- + fs/smb/client/dir.c | 2 + + fs/smb/client/smb2pdu.h | 24 - + fs/smb/common/fscc.h | 15 + + fs/smb/common/smb2pdu.h | 39 +- + fs/smb/common/smb2status.h | 1 + + fs/smb/common/smbfsctl.h | 1 + + fs/smb/common/smbglob.h | 1 + + fs/smb/server/Kconfig | 1 - + fs/smb/server/auth.c | 215 +- + fs/smb/server/auth.h | 4 + + fs/smb/server/compress.c | 76 +- + fs/smb/server/compress.h | 1 + + fs/smb/server/connection.c | 223 +- + fs/smb/server/connection.h | 47 +- + fs/smb/server/ksmbd_netlink.h | 8 +- + fs/smb/server/ksmbd_work.c | 5 + + fs/smb/server/ksmbd_work.h | 14 + + fs/smb/server/mgmt/share_config.c | 65 +- + fs/smb/server/mgmt/share_config.h | 25 + + fs/smb/server/mgmt/tree_connect.c | 2 + + fs/smb/server/mgmt/user_config.c | 18 +- + fs/smb/server/mgmt/user_session.c | 248 +- + fs/smb/server/mgmt/user_session.h | 4 + + fs/smb/server/misc.h | 11 +- + fs/smb/server/oplock.c | 344 ++- + fs/smb/server/oplock.h | 8 +- + fs/smb/server/proc.c | 170 +- + fs/smb/server/server.c | 86 +- + fs/smb/server/server.h | 2 + + fs/smb/server/smb2misc.c | 79 + + fs/smb/server/smb2ops.c | 22 +- + fs/smb/server/smb2pdu.c | 3175 +++++++++++++++++--- + fs/smb/server/smb2pdu.h | 82 + + fs/smb/server/smb_common.c | 17 +- + fs/smb/server/smb_common.h | 2 +- + fs/smb/server/smbacl.c | 115 +- + fs/smb/server/smbacl.h | 3 +- + fs/smb/server/stats.h | 57 +- + fs/smb/server/transport_ipc.c | 27 +- + fs/smb/server/transport_rdma.c | 19 +- + fs/smb/server/transport_rdma.h | 2 + + fs/smb/server/transport_tcp.c | 31 +- + fs/smb/server/vfs.c | 559 +++- + fs/smb/server/vfs.h | 20 +- + fs/smb/server/vfs_cache.c | 280 +- + fs/smb/server/vfs_cache.h | 43 +- + fs/smb/smbdirect/accept.c | 16 +- + fs/smb/smbdirect/connection.c | 13 +- + fs/smb/smbdirect/socket.c | 98 +- + fs/ubifs/auth.c | 2 +- + fs/ubifs/debug.h | 4 +- + fs/ubifs/key.h | 2 +- + fs/ubifs/ubifs.h | 20 +- + fs/udf/balloc.c | 12 +- + fs/udf/inode.c | 162 +- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 23 +- + fs/udf/symlink.c | 2 + + fs/udf/truncate.c | 2 +- + fs/udf/udfdecl.h | 3 +- + include/linux/fs.h | 15 + + include/linux/io_uring/cmd.h | 38 +- + include/linux/io_uring_types.h | 5 + + include/linux/jbd2.h | 11 +- + include/linux/lockd/bind.h | 12 +- + include/linux/nfs4.h | 136 +- + include/linux/nfs_fs.h | 4 + + include/linux/nfs_xdr.h | 8 +- + include/linux/sunrpc/bc_xprt.h | 5 + + include/linux/sunrpc/stats.h | 6 + + include/linux/sunrpc/svc.h | 4 +- + include/linux/sunrpc/svc_rdma_pcl.h | 4 +- + include/linux/sunrpc/xdrgen/_builtins.h | 32 + + include/linux/sunrpc/xdrgen/_defs.h | 2 + + include/linux/sunrpc/xdrgen/nfs4_1.h | 290 +- + include/linux/sunrpc/xdrgen/nlm3.h | 2 +- + include/linux/sunrpc/xdrgen/nlm4.h | 2 +- + include/linux/workqueue.h | 1 + + include/trace/events/btrfs.h | 4 +- + include/trace/events/f2fs.h | 20 +- + include/uapi/linux/f2fs.h | 7 + + include/uapi/linux/fuse.h | 63 +- + include/uapi/linux/nfs4.h | 2 - + include/uapi/linux/nfsd_netlink.h | 36 + + include/uapi/mtd/ubi-user.h | 10 +- + io_uring/io_uring.c | 2 +- + io_uring/rsrc.c | 131 +- + io_uring/rsrc.h | 5 - + kernel/workqueue.c | 24 + + net/sunrpc/auth_gss/auth_gss.c | 6 +- + net/sunrpc/auth_gss/gss_krb5_unseal.c | 3 + + net/sunrpc/auth_gss/gss_krb5_wrap.c | 13 +- + net/sunrpc/auth_gss/gss_rpc_upcall.c | 6 - + net/sunrpc/auth_gss/gss_rpc_upcall.h | 1 - + net/sunrpc/auth_gss/gss_rpc_xdr.c | 15 +- + net/sunrpc/auth_gss/svcauth_gss.c | 8 +- + net/sunrpc/backchannel_rqst.c | 38 +- + net/sunrpc/cache.c | 7 +- + net/sunrpc/clnt.c | 22 +- + net/sunrpc/rpcb_clnt.c | 4 + + net/sunrpc/stats.c | 2 +- + net/sunrpc/sunrpc_syms.c | 1 + + net/sunrpc/svc.c | 495 +-- + net/sunrpc/svc_xprt.c | 6 +- + net/sunrpc/svcauth_unix.c | 4 +- + net/sunrpc/xdr.c | 2 +- + net/sunrpc/xprtrdma/ib_client.c | 42 +- + net/sunrpc/xprtrdma/svc_rdma_pcl.c | 63 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 24 +- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 52 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 47 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 69 +- + net/sunrpc/xprtsock.c | 32 +- + tools/net/sunrpc/xdrgen/generators/program.py | 8 + + tools/net/sunrpc/xdrgen/subcmds/declarations.py | 10 +- + tools/net/sunrpc/xdrgen/subcmds/definitions.py | 7 +- + tools/net/sunrpc/xdrgen/subcmds/lint.py | 7 +- + tools/net/sunrpc/xdrgen/subcmds/source.py | 7 +- + .../xdrgen/templates/C/enum/declaration/enum.j2 | 1 + + .../xdrgen/templates/C/pointer/encoder/string.j2 | 2 + + .../C/pointer/encoder/variable_length_opaque.j2 | 2 + + .../xdrgen/templates/C/program/decoder/argument.j2 | 4 - + .../xdrgen/templates/C/program/encoder/result.j2 | 4 - + .../xdrgen/templates/C/struct/encoder/string.j2 | 2 + + .../C/struct/encoder/variable_length_opaque.j2 | 2 + + .../xdrgen/templates/C/union/definition/close.j2 | 6 - + .../xdrgen/tests/bad-procedure-number-negative.x | 20 + + .../xdrgen/tests/bad-procedure-number-too-large.x | 20 + + .../xdrgen/tests/bad-program-number-negative.x | 19 + + .../xdrgen/tests/bad-program-number-too-large.x | 19 + + .../xdrgen/tests/bad-version-number-negative.x | 19 + + .../xdrgen/tests/bad-version-number-too-large.x | 19 + + tools/net/sunrpc/xdrgen/xdr_ast.py | 290 +- + tools/net/sunrpc/xdrgen/xdr_parse.py | 46 +- + 420 files changed, 18934 insertions(+), 5869 deletions(-) + create mode 100644 Documentation/ABI/testing/procfs-nfsd-reply_cache_stats + create mode 100644 Documentation/filesystems/fuse/uapi/fuse-uapi-io-uring.rst + create mode 100644 fs/nfsd/attr4.h + create mode 100644 fs/nilfs2/iomap.c + create mode 100644 fs/nilfs2/iomap.h + create mode 100644 tools/net/sunrpc/xdrgen/tests/bad-procedure-number-negative.x + create mode 100644 tools/net/sunrpc/xdrgen/tests/bad-procedure-number-too-large.x + create mode 100644 tools/net/sunrpc/xdrgen/tests/bad-program-number-negative.x + create mode 100644 tools/net/sunrpc/xdrgen/tests/bad-program-number-too-large.x + create mode 100644 tools/net/sunrpc/xdrgen/tests/bad-version-number-negative.x + create mode 100644 tools/net/sunrpc/xdrgen/tests/bad-version-number-too-large.x +Merging printk/for-next (703a9d76a45dd Merge branch 'for-7.3-console-registration-cleanup' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. + kernel/printk/printk.c | 30 +++++++++++++++++------------- + lib/tests/test_ratelimit.c | 29 +++++++++++++++++++---------- + lib/vsprintf.c | 4 ++++ + 3 files changed, 40 insertions(+), 23 deletions(-) +Merging pci/next (115c7e572e505 Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging Documentation/arch/arm64/silicon-errata.rst +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging drivers/dma/switchtec_dma.c +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/pci/controller/dwc/pci-imx6.c +Auto-merging drivers/pci/controller/dwc/pci-meson.c +Auto-merging drivers/pci/controller/dwc/pcie-keembay.c +Auto-merging drivers/pci/controller/dwc/pcie-spacemit-k1.c +Auto-merging drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/pcie-dwc.h +Resolved 'arch/arm64/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 315e1c2a5ca9a] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/debugfs-cdns-pcie | 5 + + Documentation/ABI/testing/sysfs-bus-pci | 2 +- + Documentation/PCI/controller/index.rst | 1 + + .../PCI/controller/pci-controller-drivers.rst | 402 ++++++++++++++++++ + Documentation/arch/arm64/silicon-errata.rst | 1 + + .../bindings/pci/airoha,en7581-pcie.yaml | 244 +++++++++++ + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 2 +- + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 25 ++ + .../bindings/pci/mediatek-pcie-gen3.yaml | 81 +--- + .../bindings/pci/nvidia,tegra264-pcie.yaml | 109 +++-- + .../devicetree/bindings/pci/qcom,hawi-pcie.yaml | 201 +++++++++ + .../devicetree/bindings/pci/qcom,pcie-ipq9574.yaml | 15 + + .../bindings/pci/rcar-gen4-pci-host.yaml | 3 + + .../bindings/pci/renesas,pci-rcar-gen2.yaml | 2 +- + .../bindings/pci/renesas,r9a08g045-pcie.yaml | 34 +- + .../devicetree/bindings/pci/ti,am65-pci-ep.yaml | 8 +- + .../devicetree/bindings/pci/ti,am65-pci-host.yaml | 12 +- + .../devicetree/bindings/pci/toshiba,tc9563.yaml | 21 +- + .../bindings/pci/ultrarisc,dp1000-pcie.yaml | 16 + + MAINTAINERS | 7 +- + arch/alpha/kernel/pci-sysfs.c | 32 +- + arch/arm64/Kconfig | 9 + + arch/powerpc/kernel/pci-common.c | 9 +- + drivers/ata/ata_generic.c | 6 +- + drivers/char/agp/amd-k7-agp.c | 26 +- + drivers/char/agp/via-agp.c | 308 ++++---------- + drivers/dma/switchtec_dma.c | 1 + + drivers/ipack/carriers/tpci200.c | 1 - + drivers/ipack/carriers/tpci200.h | 1 - + drivers/irqchip/irq-gic-v3-its.c | 24 +- + drivers/misc/pci_endpoint_test.c | 38 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 11 +- + drivers/pci/controller/Kconfig | 12 +- + drivers/pci/controller/Makefile | 1 + + drivers/pci/controller/cadence/Kconfig | 13 +- + drivers/pci/controller/cadence/Makefile | 1 + + drivers/pci/controller/cadence/pci-j721e.c | 4 +- + drivers/pci/controller/cadence/pci-sky1.c | 5 + + .../pci/controller/cadence/pcie-cadence-debugfs.c | 263 ++++++++++++ + drivers/pci/controller/cadence/pcie-cadence-ep.c | 3 + + .../controller/cadence/pcie-cadence-host-common.c | 6 +- + .../pci/controller/cadence/pcie-cadence-host-hpa.c | 21 +- + drivers/pci/controller/cadence/pcie-cadence-host.c | 9 +- + .../pci/controller/cadence/pcie-cadence-lga-regs.h | 5 - + drivers/pci/controller/cadence/pcie-cadence-plat.c | 1 + + drivers/pci/controller/cadence/pcie-cadence.h | 198 +++++++++ + drivers/pci/controller/dwc/Kconfig | 7 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 4 +- + drivers/pci/controller/dwc/pci-imx6.c | 72 ++-- + drivers/pci/controller/dwc/pci-keystone.c | 10 +- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 6 +- + drivers/pci/controller/dwc/pci-meson.c | 4 +- + drivers/pci/controller/dwc/pcie-artpec6.c | 4 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 33 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 10 +- + drivers/pci/controller/dwc/pcie-designware.c | 28 +- + drivers/pci/controller/dwc/pcie-designware.h | 5 +- + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 138 +++++- + drivers/pci/controller/dwc/pcie-keembay.c | 4 +- + drivers/pci/controller/dwc/pcie-qcom.c | 194 ++++++++- + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 124 +++++- + drivers/pci/controller/dwc/pcie-spacemit-k1.c | 1 + + drivers/pci/controller/dwc/pcie-tegra194.c | 16 +- + drivers/pci/controller/dwc/pcie-ultrarisc.c | 87 +++- + drivers/pci/controller/mobiveil/pcie-mobiveil.c | 4 +- + drivers/pci/controller/mobiveil/pcie-mobiveil.h | 5 - + drivers/pci/controller/pci-aardvark.c | 9 +- + drivers/pci/controller/pci-host-common.c | 64 +-- + drivers/pci/controller/pci-host-common.h | 1 + + drivers/pci/controller/pci-host-generic.c | 11 +- + drivers/pci/controller/pci-tegra.c | 3 +- + drivers/pci/controller/pci-xgene.c | 5 +- + drivers/pci/controller/pcie-aspeed.c | 8 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 113 ++++- + drivers/pci/controller/pcie-mediatek.c | 154 +++++++ + drivers/pci/controller/pcie-rockchip.c | 4 +- + drivers/pci/controller/pcie-rzg3s-host.c | 233 +++++++++- + drivers/pci/controller/pcie-tegra264.c | 467 +++++++++++++++++++++ + drivers/pci/controller/pcie-xilinx-nwl.c | 9 +- + drivers/pci/controller/plda/pcie-plda-host.c | 52 ++- + drivers/pci/controller/plda/pcie-starfive.c | 32 +- + drivers/pci/controller/vmd.c | 203 +++++++-- + drivers/pci/doe.c | 4 +- + drivers/pci/ecam.c | 13 + + drivers/pci/hotplug/acpiphp_ibm.c | 3 +- + drivers/pci/hotplug/pnv_php.c | 2 +- + drivers/pci/hotplug/rpaphp_slot.c | 2 +- + drivers/pci/msi/msi.c | 10 + + drivers/pci/of.c | 79 ++++ + drivers/pci/p2pdma.c | 5 + + drivers/pci/pci-acpi.c | 4 +- + drivers/pci/pci-driver.c | 192 +++++---- + drivers/pci/pci-sysfs.c | 177 +++++--- + drivers/pci/pci.c | 66 ++- + drivers/pci/pci.h | 70 ++- + drivers/pci/pcie/aer.c | 275 +++++++++--- + drivers/pci/pcie/aspm.c | 275 +++++++----- + drivers/pci/pcie/bwctrl.c | 22 - + drivers/pci/pcie/err.c | 6 +- + drivers/pci/pcie/portdrv.c | 30 +- + drivers/pci/probe.c | 2 + + drivers/pci/proc.c | 16 +- + drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 144 ++++--- + drivers/pci/quirks.c | 10 +- + drivers/pci/remove.c | 1 + + drivers/pci/search.c | 8 +- + drivers/pci/setup-bus.c | 2 +- + drivers/pci/slot.c | 50 ++- + drivers/pci/switch/switchtec.c | 1 + + drivers/scsi/nsp32.c | 8 +- + drivers/scsi/nsp32.h | 8 +- + include/linux/of_pci.h | 6 + + include/linux/pci-ecam.h | 3 + + include/linux/pci.h | 12 +- + include/linux/pci_ids.h | 1 + + include/linux/pcie-dwc.h | 4 + + 116 files changed, 4670 insertions(+), 1164 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-cdns-pcie + create mode 100644 Documentation/PCI/controller/pci-controller-drivers.rst + create mode 100644 Documentation/devicetree/bindings/pci/airoha,en7581-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/qcom,hawi-pcie.yaml + create mode 100644 drivers/pci/controller/cadence/pcie-cadence-debugfs.c + create mode 100644 drivers/pci/controller/pcie-tegra264.c +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 (a8fcb3dbf9024 Merge branch 'for-7.2/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. +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 (b0e590bb83a9e Merge branch 'i2c/i2c' into i2c/i2c-next) +$ git merge -m Merge branch 'i2c/i2c-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-andi/i2c/i2c-next +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-amd-asf-plat.c | 4 +-- + drivers/i2c/busses/i2c-bcm-iproc.c | 3 +-- + drivers/i2c/busses/i2c-gxp.c | 2 +- + drivers/i2c/busses/i2c-hisi.c | 2 +- + drivers/i2c/busses/i2c-imx-lpi2c.c | 40 +++++++++++++++++++++--------- + drivers/i2c/busses/i2c-imx.c | 2 +- + drivers/i2c/busses/i2c-k1.c | 4 +-- + drivers/i2c/busses/i2c-ls2x.c | 2 +- + drivers/i2c/busses/i2c-microchip-corei2c.c | 3 +-- + drivers/i2c/busses/i2c-mlxbf.c | 2 +- + drivers/i2c/busses/i2c-mxs.c | 5 +--- + drivers/i2c/busses/i2c-nomadik.c | 3 +-- + drivers/i2c/busses/i2c-ocores.c | 6 ++++- + drivers/i2c/busses/i2c-qcom-geni.c | 3 +-- + drivers/i2c/busses/i2c-rcar.c | 27 +++++++++----------- + drivers/i2c/busses/i2c-riic.c | 3 +-- + drivers/i2c/busses/i2c-rzv2m.c | 2 +- + drivers/i2c/busses/i2c-sprd.c | 4 +-- + drivers/i2c/busses/i2c-st.c | 3 +-- + drivers/i2c/busses/i2c-stm32f4.c | 6 ++--- + drivers/i2c/busses/i2c-stm32f7.c | 4 +-- + drivers/i2c/busses/i2c-sun6i-p2wi.c | 4 +-- + drivers/i2c/busses/i2c-synquacer.c | 2 +- + drivers/i2c/busses/i2c-uniphier-f.c | 2 +- + drivers/i2c/busses/i2c-uniphier.c | 2 +- + drivers/i2c/busses/i2c-viai2c-wmt.c | 3 +-- + drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 3 +-- + drivers/i2c/busses/i2c-xlp9xx.c | 2 +- + drivers/i2c/muxes/i2c-demux-pinctrl.c | 1 + + 29 files changed, 75 insertions(+), 74 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 +Auto-merging rust/kernel/i2c.rs +Merge made by the 'ort' strategy. + rust/kernel/i2c.rs | 3 +++ + 1 file changed, 3 insertions(+) +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 +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/i3c/cdns,i3c-master.yaml | 1 + + Documentation/devicetree/bindings/i3c/i3c.yaml | 36 +- + .../bindings/i3c/snps,dw-i3c-master.yaml | 3 + + .../devicetree/bindings/i3c/xlnx,axi-i3c-1.0.yaml | 58 + + MAINTAINERS | 8 + + drivers/hwmon/Kconfig | 9 +- + drivers/hwmon/spd5118.c | 119 +-- + drivers/i3c/device.c | 13 +- + drivers/i3c/internals.h | 5 + + drivers/i3c/master.c | 632 +++++++++-- + drivers/i3c/master/Kconfig | 15 + + drivers/i3c/master/Makefile | 1 + + drivers/i3c/master/adi-i3c-master.c | 19 +- + drivers/i3c/master/amd-i3c-master.c | 1124 ++++++++++++++++++++ + drivers/i3c/master/dw-i3c-master.c | 188 +++- + drivers/i3c/master/dw-i3c-master.h | 1 + + drivers/i3c/master/i3c-master-cdns.c | 3 + + drivers/i3c/master/mipi-i3c-hci/core.c | 30 +- + drivers/i3c/master/mipi-i3c-hci/dma.c | 15 +- + drivers/i3c/master/mipi-i3c-hci/hci.h | 7 + + drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c | 32 +- + drivers/i3c/master/mipi-i3c-hci/pio.c | 74 +- + drivers/i3c/master/renesas-i3c.c | 390 +++++-- + drivers/i3c/master/svc-i3c-master.c | 22 +- + include/dt-bindings/i3c/i3c.h | 4 + + include/linux/i3c/ccc.h | 12 +- + include/linux/i3c/master.h | 27 +- + 27 files changed, 2470 insertions(+), 378 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i3c/xlnx,axi-i3c-1.0.yaml + create mode 100644 drivers/i3c/master/amd-i3c-master.c +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 (791e420360669 Doc: admin-guide: pm: Remove unnecessary backticks and fix a spell) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging CREDITS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/mm/pagemap.rst +Auto-merging Documentation/admin-guide/pm/amd-pstate.rst +Auto-merging Documentation/filesystems/overlayfs.rst +Auto-merging Documentation/filesystems/proc.rst +Auto-merging Documentation/process/coding-assistants.rst +CONFLICT (content): Merge conflict in Documentation/process/coding-assistants.rst +Auto-merging MAINTAINERS +Auto-merging scripts/checkpatch.pl +Resolved 'Documentation/process/coding-assistants.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1ad65af3862e2] Merge branch 'docs-next' of git://git.lwn.net/linux.git +$ git diff -M --stat --summary HEAD^.. + CREDITS | 4 + + Documentation/ABI/README | 2 +- + Documentation/ABI/testing/sysfs-edac-memory-repair | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 34 +- + Documentation/admin-guide/media/bttv.rst | 2 +- + Documentation/admin-guide/mm/pagemap.rst | 8 +- + Documentation/admin-guide/pm/amd-pstate.rst | 2 +- + Documentation/conf.py | 6 +- + Documentation/core-api/SMP.rst | 11 + + Documentation/core-api/dma-api.rst | 2 +- + Documentation/core-api/errseq.rst | 2 +- + Documentation/core-api/index.rst | 1 + + Documentation/core-api/list.rst | 2 +- + Documentation/core-api/min_heap.rst | 13 - + Documentation/core-api/packing.rst | 4 +- + Documentation/core-api/real-time/hardware.rst | 104 +++ + Documentation/core-api/real-time/index.rst | 1 + + .../core-api/real-time/kernel-configuration.rst | 307 +++++++++ + Documentation/dev-tools/container.rst | 6 +- + Documentation/driver-api/ipmi.rst | 2 +- + .../driver-api/usb/writing_usb_driver.rst | 3 - + Documentation/filesystems/overlayfs.rst | 3 +- + Documentation/filesystems/proc.rst | 2 +- + Documentation/index.rst | 8 + + Documentation/kernel-hacking/locking.rst | 8 +- + Documentation/process/coding-assistants.rst | 12 +- + Documentation/process/generated-content.rst | 7 + + Documentation/process/submitting-patches.rst | 14 +- + Documentation/scheduler/sched-energy.rst | 2 +- + Documentation/scheduler/sched-pelt.c | 3 +- + Documentation/sphinx-static/custom.css | 24 +- + Documentation/sphinx/maintainers_include.py | 7 +- + .../it_IT/doc-guide/checktransupdate.rst | 59 ++ + .../translations/it_IT/doc-guide/contributing.rst | 319 ++++++++++ + .../translations/it_IT/doc-guide/index.rst | 13 +- + .../translations/it_IT/doc-guide/kernel-doc.rst | 88 ++- + .../it_IT/doc-guide/maintainer-profile.rst | 60 ++ + .../translations/it_IT/doc-guide/parse-headers.rst | 242 +++---- + .../translations/it_IT/doc-guide/sphinx.rst | 178 ++++-- + .../translations/it_IT/process/changes.rst | 118 ++-- + .../ja_JP/process/submitting-patches.rst | 225 ++++--- + Documentation/translations/pt_BR/index.rst | 13 +- + .../translations/pt_BR/process/4.Coding.rst | 440 +++++++++++++ + .../translations/pt_BR/process/5.Posting.rst | 376 +++++++++++ + .../translations/pt_BR/process/6.Followthrough.rst | 220 +++++++ + .../pt_BR/process/7.AdvancedTopics.rst | 201 ++++++ + .../translations/pt_BR/process/8.Conclusion.rst | 73 +++ + .../translations/pt_BR/process/adding-syscalls.rst | 700 +++++++++++++++++++++ + .../pt_BR/process/applying-patches.rst | 447 +++++++++++++ + .../translations/pt_BR/process/backporting.rst | 598 ++++++++++++++++++ + .../pt_BR/process/botching-up-ioctls.rst | 256 ++++++++ + .../process/code-of-conduct-interpretation.rst | 257 ++++++++ + .../translations/pt_BR/process/code-of-conduct.rst | 88 +++ + .../pt_BR/process/contribution-maturity-model.rst | 111 ++++ + Documentation/translations/pt_BR/process/cve.rst | 125 ++++ + .../translations/pt_BR/process/deprecated.rst | 422 +++++++++++++ + .../pt_BR/process/development-process.rst | 5 + + .../translations/pt_BR/process/email-clients.rst | 368 +++++++++++ + Documentation/translations/pt_BR/process/index.rst | 102 +++ + .../pt_BR/process/kernel-driver-statement.rst | 205 ++++++ + .../pt_BR/process/maintainer-netdev.rst | 23 +- + .../pt_BR/process/management-style.rst | 265 ++++++++ + .../translations/pt_BR/process/security-bugs.rst | 368 +++++++++++ + .../pt_BR/process/submit-checklist.rst | 145 +++++ + .../translations/zh_CN/accounting/psi.rst | 2 +- + .../translations/zh_CN/admin-guide/index.rst | 206 ++++-- + .../zh_CN/admin-guide/module-signing.rst | 250 ++++++++ + .../translations/zh_CN/dev-tools/kasan.rst | 2 +- + Documentation/translations/zh_CN/how-to.rst | 149 +++-- + .../translations/zh_CN/rust/arch-support.rst | 1 + + .../zh_CN/rust/general-information.rst | 82 ++- + .../translations/zh_CN/rust/quick-start.rst | 48 +- + Documentation/translations/zh_CN/rust/testing.rst | 4 + + .../translations/zh_CN/scheduler/sched-energy.rst | 2 +- + .../zh_CN/security/self-protection.rst | 2 +- + .../zh_TW/process/stable-api-nonsense.rst | 62 +- + MAINTAINERS | 7 +- + README | 18 +- + scripts/checkpatch.pl | 7 +- + tools/docs/documentation-file-ref-check | 2 +- + tools/docs/sphinx-build-wrapper | 13 +- + tools/lib/python/abi/abi_regex.py | 11 +- + tools/lib/python/kdoc/kdoc_output.py | 2 +- + tools/lib/python/kdoc/kdoc_parser.py | 58 +- + tools/lib/python/kdoc/xforms_lists.py | 1 + + 85 files changed, 8031 insertions(+), 616 deletions(-) + create mode 100644 Documentation/core-api/SMP.rst + create mode 100644 Documentation/core-api/real-time/kernel-configuration.rst + create mode 100644 Documentation/translations/it_IT/doc-guide/checktransupdate.rst + create mode 100644 Documentation/translations/it_IT/doc-guide/contributing.rst + create mode 100644 Documentation/translations/it_IT/doc-guide/maintainer-profile.rst + create mode 100644 Documentation/translations/pt_BR/process/4.Coding.rst + create mode 100644 Documentation/translations/pt_BR/process/5.Posting.rst + create mode 100644 Documentation/translations/pt_BR/process/6.Followthrough.rst + create mode 100644 Documentation/translations/pt_BR/process/7.AdvancedTopics.rst + create mode 100644 Documentation/translations/pt_BR/process/8.Conclusion.rst + create mode 100644 Documentation/translations/pt_BR/process/adding-syscalls.rst + create mode 100644 Documentation/translations/pt_BR/process/applying-patches.rst + create mode 100644 Documentation/translations/pt_BR/process/backporting.rst + create mode 100644 Documentation/translations/pt_BR/process/botching-up-ioctls.rst + create mode 100644 Documentation/translations/pt_BR/process/code-of-conduct-interpretation.rst + create mode 100644 Documentation/translations/pt_BR/process/code-of-conduct.rst + create mode 100644 Documentation/translations/pt_BR/process/contribution-maturity-model.rst + create mode 100644 Documentation/translations/pt_BR/process/cve.rst + create mode 100644 Documentation/translations/pt_BR/process/deprecated.rst + create mode 100644 Documentation/translations/pt_BR/process/email-clients.rst + create mode 100644 Documentation/translations/pt_BR/process/index.rst + create mode 100644 Documentation/translations/pt_BR/process/kernel-driver-statement.rst + create mode 100644 Documentation/translations/pt_BR/process/management-style.rst + create mode 100644 Documentation/translations/pt_BR/process/security-bugs.rst + create mode 100644 Documentation/translations/pt_BR/process/submit-checklist.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/module-signing.rst +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 (a091e6870b6c7 Merge branch 'thermal' into linux-next) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging drivers/acpi/bus.c +Auto-merging drivers/acpi/scan.c +Auto-merging include/acpi/acpi_bus.h +CONFLICT (content): Merge conflict in include/acpi/acpi_bus.h +Resolved 'include/acpi/acpi_bus.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f70da784689b3] Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/airoha,en7581-chip-scu.yaml | 14 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 4 + + .../bindings/thermal/mediatek,lvts-thermal.yaml | 13 +- + .../bindings/thermal/qcom,pm8775-mbg-tm.yaml | 72 ++++ + .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 + + drivers/acpi/acpi_apd.c | 35 +- + drivers/acpi/acpi_platform.c | 16 +- + drivers/acpi/battery.c | 147 ++++--- + drivers/acpi/bus.c | 54 ++- + drivers/acpi/scan.c | 33 +- + drivers/cpufreq/intel_pstate.c | 126 +++--- + drivers/iio/adc/qcom-spmi-adc5-gen3.c | 69 +--- + drivers/thermal/airoha_thermal.c | 382 ++++++++++++++---- + drivers/thermal/armada_thermal.c | 105 +++-- + drivers/thermal/broadcom/brcmstb_thermal.c | 3 +- + drivers/thermal/db8500_thermal.c | 8 +- + drivers/thermal/hisi_thermal.c | 4 +- + drivers/thermal/imx91_thermal.c | 2 +- + drivers/thermal/imx_thermal.c | 13 +- + drivers/thermal/loongson2_thermal.c | 2 +- + drivers/thermal/max77620_thermal.c | 8 +- + drivers/thermal/mediatek/lvts_thermal.c | 17 +- + drivers/thermal/qcom/Kconfig | 23 ++ + drivers/thermal/qcom/Makefile | 2 + + drivers/thermal/qcom/lmh.c | 1 - + drivers/thermal/qcom/qcom-spmi-adc-tm5-gen3.c | 434 +++++++++++++++++++++ + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 3 - + drivers/thermal/qcom/qcom-spmi-mbg-tm.c | 256 ++++++++++++ + drivers/thermal/qcom/tsens.c | 5 +- + drivers/thermal/qoriq_thermal.c | 13 +- + drivers/thermal/renesas/rcar_thermal.c | 19 +- + drivers/thermal/renesas/rzg3e_thermal.c | 4 +- + drivers/thermal/rockchip_thermal.c | 3 +- + drivers/thermal/samsung/exynos_tmu.c | 4 +- + drivers/thermal/spacemit/k1_tsensor.c | 80 +++- + drivers/thermal/st/st_thermal_memmap.c | 4 +- + drivers/thermal/st/stm_thermal.c | 5 +- + drivers/thermal/sun8i_thermal.c | 1 - + drivers/thermal/tegra/soctherm.c | 8 +- + drivers/thermal/tegra/tegra30-tsensor.c | 3 +- + drivers/thermal/thermal-fw.c | 12 + + drivers/thermal/thermal_fw.c | 97 +++++ + drivers/thermal/thermal_of.c | 2 +- + include/acpi/acpi_bus.h | 6 + + include/linux/iio/adc/qcom-adc5-gen3-common.h | 2 - + kernel/sched/cpufreq_schedutil.c | 15 +- + tools/lib/thermal/include/thermal.h | 4 +- + 47 files changed, 1694 insertions(+), 440 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/qcom,pm8775-mbg-tm.yaml + create mode 100644 drivers/thermal/qcom/qcom-spmi-adc-tm5-gen3.c + create mode 100644 drivers/thermal/qcom/qcom-spmi-mbg-tm.c + create mode 100644 drivers/thermal/thermal-fw.c + create mode 100644 drivers/thermal/thermal_fw.c +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 (c096be11c2a9d 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 +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 (60a42d510113f RDMA/uverbs: Guard legacy bundles without method_elm) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging Documentation/admin-guide/cgroup-v1/rdma.rst +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging drivers/infiniband/hw/cxgb4/mem.c +Auto-merging fs/smb/smbdirect/accept.c +Auto-merging fs/smb/smbdirect/connection.c +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging net/rds/ib.c +Auto-merging net/rds/ib_cm.c +Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/configfs-rdma_cm | 4 + + Documentation/admin-guide/cgroup-v1/rdma.rst | 8 + + Documentation/admin-guide/cgroup-v2.rst | 15 +- + Documentation/infiniband/user_mad.rst | 2 +- + drivers/infiniband/core/Makefile | 1 + + drivers/infiniband/core/addr.c | 2 +- + drivers/infiniband/core/cgroup.c | 1 + + drivers/infiniband/core/cma.c | 8 +- + drivers/infiniband/core/cma_configfs.c | 4 + + drivers/infiniband/core/core_priv.h | 3 +- + drivers/infiniband/core/counters.c | 5 +- + drivers/infiniband/core/cq.c | 5 +- + drivers/infiniband/core/device.c | 254 ++++++++++++-- + drivers/infiniband/core/ib_core_uverbs.c | 3 + + drivers/infiniband/core/iwpm_msg.c | 2 +- + drivers/infiniband/core/nldev.c | 69 +++- + drivers/infiniband/core/rdma_core.h | 1 + + drivers/infiniband/core/restrack.c | 169 ++++++++-- + drivers/infiniband/core/restrack.h | 3 + + drivers/infiniband/core/security.c | 6 + + drivers/infiniband/core/ucma.c | 14 +- + drivers/infiniband/core/umem.c | 8 +- + drivers/infiniband/core/umem_dmabuf.c | 4 +- + drivers/infiniband/core/uverbs_main.c | 1 + + .../infiniband/core/uverbs_std_types_comp_cntr.c | 172 ++++++++++ + drivers/infiniband/core/uverbs_std_types_device.c | 51 ++- + drivers/infiniband/core/uverbs_std_types_dmah.c | 7 +- + drivers/infiniband/core/uverbs_std_types_mr.c | 6 +- + drivers/infiniband/core/uverbs_std_types_qp.c | 67 +++- + drivers/infiniband/core/uverbs_std_types_srq.c | 2 + + drivers/infiniband/core/uverbs_uapi.c | 1 + + drivers/infiniband/core/verbs.c | 40 ++- + drivers/infiniband/hw/bng_re/bng_fw.c | 10 +- + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 6 - + drivers/infiniband/hw/bnxt_re/debugfs.c | 31 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 191 +++++++---- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 8 +- + drivers/infiniband/hw/bnxt_re/main.c | 4 - + drivers/infiniband/hw/bnxt_re/uapi.c | 181 ++++++---- + drivers/infiniband/hw/cxgb4/device.c | 8 +- + drivers/infiniband/hw/cxgb4/mem.c | 54 ++- + drivers/infiniband/hw/cxgb4/provider.c | 4 +- + drivers/infiniband/hw/efa/Makefile | 4 +- + drivers/infiniband/hw/efa/efa.h | 20 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 296 ++++++++++++----- + drivers/infiniband/hw/efa/efa_admin_defs.h | 33 +- + drivers/infiniband/hw/efa/efa_ah_cache.c | 135 ++++++++ + drivers/infiniband/hw/efa/efa_ah_cache.h | 39 +++ + drivers/infiniband/hw/efa/efa_com.c | 206 ++++++++---- + drivers/infiniband/hw/efa/efa_com.h | 19 +- + drivers/infiniband/hw/efa/efa_com_cmd.c | 329 ++++++++++++------ + drivers/infiniband/hw/efa/efa_com_cmd.h | 48 +++ + drivers/infiniband/hw/efa/efa_io_defs.h | 32 +- + drivers/infiniband/hw/efa/efa_main.c | 10 +- + drivers/infiniband/hw/efa/efa_verbs.c | 272 ++++++++++++++- + drivers/infiniband/hw/erdma/Kconfig | 2 +- + drivers/infiniband/hw/erdma/erdma_cm.c | 6 +- + drivers/infiniband/hw/erdma/erdma_eq.c | 10 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 45 ++- + drivers/infiniband/hw/erdma/erdma_verbs.h | 40 ++- + drivers/infiniband/hw/hfi1/chip.c | 21 +- + drivers/infiniband/hw/hfi1/chip.h | 2 +- + drivers/infiniband/hw/hfi1/device.c | 32 +- + drivers/infiniband/hw/hfi1/device.h | 1 - + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/hfi1/hfi.h | 4 +- + drivers/infiniband/hw/hfi1/init.c | 196 +++++------ + drivers/infiniband/hw/hfi1/pcie.c | 32 +- + drivers/infiniband/hw/hfi1/user_sdma.c | 13 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 6 +- + drivers/infiniband/hw/ionic/ionic_controlpath.c | 72 ++++ + drivers/infiniband/hw/ionic/ionic_datapath.c | 43 +-- + drivers/infiniband/hw/ionic/ionic_fw.h | 12 +- + drivers/infiniband/hw/ionic/ionic_hw_stats.c | 95 +++--- + drivers/infiniband/hw/ionic/ionic_ibdev.c | 5 +- + drivers/infiniband/hw/ionic/ionic_ibdev.h | 14 +- + drivers/infiniband/hw/ionic/ionic_lif_cfg.c | 4 +- + drivers/infiniband/hw/ionic/ionic_lif_cfg.h | 1 + + drivers/infiniband/hw/irdma/i40iw_hw.c | 4 +- + drivers/infiniband/hw/irdma/icrdma_hw.c | 2 + + drivers/infiniband/hw/irdma/icrdma_hw.h | 2 + + drivers/infiniband/hw/irdma/icrdma_if.c | 8 +- + drivers/infiniband/hw/irdma/irdma.h | 2 + + drivers/infiniband/hw/irdma/utils.c | 6 + + drivers/infiniband/hw/irdma/verbs.c | 368 +++++++++++++-------- + drivers/infiniband/hw/irdma/verbs.h | 3 + + drivers/infiniband/hw/mana/cq.c | 8 +- + drivers/infiniband/hw/mana/device.c | 1 + + drivers/infiniband/hw/mana/main.c | 129 ++++++-- + drivers/infiniband/hw/mana/mana_ib.h | 83 ++++- + drivers/infiniband/hw/mana/mr.c | 13 + + drivers/infiniband/hw/mana/qp.c | 229 +++++++++---- + drivers/infiniband/hw/mana/wq.c | 12 + + drivers/infiniband/hw/mlx4/cm.c | 120 +++++-- + drivers/infiniband/hw/mlx4/main.c | 2 - + drivers/infiniband/hw/mlx4/mr.c | 6 +- + drivers/infiniband/hw/mlx5/cong.c | 24 +- + drivers/infiniband/hw/mlx5/counters.c | 11 +- + drivers/infiniband/hw/mlx5/main.c | 16 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 + + drivers/infiniband/hw/mlx5/mr.c | 6 +- + drivers/infiniband/hw/mlx5/odp.c | 6 +- + drivers/infiniband/hw/mlx5/qp.c | 37 ++- + drivers/infiniband/hw/mlx5/srq.c | 25 +- + drivers/infiniband/hw/mlx5/umr.c | 13 +- + drivers/infiniband/hw/mthca/mthca_allocator.c | 6 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 10 +- + drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 26 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 5 +- + drivers/infiniband/hw/qedr/verbs.c | 8 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 5 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 4 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 4 +- + drivers/infiniband/sw/rdmavt/qp.c | 8 +- + drivers/infiniband/sw/rdmavt/vt.c | 8 +- + drivers/infiniband/sw/rxe/rxe_mmap.c | 35 +- + drivers/infiniband/sw/rxe/rxe_mw.c | 20 +- + drivers/infiniband/sw/rxe/rxe_odp.c | 12 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 40 ++- + drivers/infiniband/sw/rxe/rxe_req.c | 15 + + drivers/infiniband/sw/rxe/rxe_resp.c | 9 +- + drivers/infiniband/sw/rxe/rxe_srq.c | 16 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 9 +- + drivers/infiniband/sw/siw/siw_cm.c | 2 +- + drivers/infiniband/sw/siw/siw_verbs.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 10 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 5 +- + drivers/infiniband/ulp/isert/ib_isert.c | 92 ++++-- + drivers/infiniband/ulp/isert/ib_isert.h | 1 + + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 11 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 11 +- + drivers/infiniband/ulp/srp/ib_srp.c | 63 +++- + drivers/infiniband/ulp/srpt/ib_srpt.c | 30 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 12 +- + .../ethernet/mellanox/mlx5/core/steering/hws/cmd.c | 6 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 12 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 1 + + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 5 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 3 +- + drivers/net/ethernet/pensando/ionic/ionic_phc.c | 63 +++- + drivers/nvme/host/rdma.c | 8 +- + drivers/nvme/target/rdma.c | 26 +- + fs/smb/smbdirect/accept.c | 5 +- + fs/smb/smbdirect/connect.c | 5 +- + fs/smb/smbdirect/connection.c | 8 +- + include/linux/cgroup_rdma.h | 1 + + include/linux/mlx5/device.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 41 +-- + include/linux/sunrpc/svc_rdma.h | 4 +- + include/net/mana/gdma.h | 6 +- + include/rdma/ib_umem.h | 2 +- + include/rdma/ib_verbs.h | 102 ++++-- + include/rdma/restrack.h | 6 +- + include/rdma/uverbs_ioctl.h | 20 ++ + include/uapi/rdma/bnxt_re-abi.h | 3 + + include/uapi/rdma/efa-abi.h | 11 +- + include/uapi/rdma/ib_user_ioctl_cmds.h | 44 +++ + include/uapi/rdma/ib_user_ioctl_verbs.h | 19 ++ + include/uapi/rdma/ib_user_mad.h | 95 +++--- + include/uapi/rdma/ib_user_verbs.h | 33 ++ + include/uapi/rdma/ionic-abi.h | 1 + + include/uapi/rdma/irdma-abi.h | 1 + + include/uapi/rdma/mana-abi.h | 35 +- + include/uapi/rdma/mlx5-abi.h | 15 +- + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 4 + + include/uapi/rdma/rdma_netlink.h | 10 +- + kernel/cgroup/rdma.c | 71 +++- + net/rds/ib.c | 10 +- + net/rds/ib_cm.c | 10 +- + net/smc/smc_pnet.c | 20 +- + net/sunrpc/xprtrdma/frwr_ops.c | 7 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 5 +- + net/sunrpc/xprtrdma/verbs.c | 2 +- + tools/testing/selftests/rdma/Makefile | 3 +- + tools/testing/selftests/rdma/config | 2 + + tools/testing/selftests/rdma/rxe_netns_names.sh | 334 +++++++++++++++++++ + 178 files changed, 4604 insertions(+), 1617 deletions(-) + create mode 100644 drivers/infiniband/core/uverbs_std_types_comp_cntr.c + create mode 100644 drivers/infiniband/hw/efa/efa_ah_cache.c + create mode 100644 drivers/infiniband/hw/efa/efa_ah_cache.h + create mode 100755 tools/testing/selftests/rdma/rxe_netns_names.sh +Merging net-next/main (61eb236c41c2a Merge 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 +Auto-merging Documentation/devicetree/bindings/net/altr,socfpga-stmmac.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/net/ethernet/pensando/ionic/ionic_lif.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7921/regd.c +CONFLICT (content): Merge conflict in drivers/net/wireless/mediatek/mt76/mt7921/regd.c +Auto-merging drivers/net/wireless/mediatek/mt76/mt7921/regd.h +Auto-merging drivers/nfc/port100.c +Auto-merging drivers/nfc/st21nfca/i2c.c +Auto-merging drivers/pci/controller/dwc/pcie-spacemit-k1.c +Auto-merging include/linux/net.h +Auto-merging include/linux/pci_ids.h +CONFLICT (content): Merge conflict in include/linux/pci_ids.h +Auto-merging include/linux/skbuff.h +Auto-merging include/net/mana/gdma.h +Auto-merging kernel/irq/manage.c +Auto-merging net/bluetooth/smp.c +Auto-merging net/ipv6/route.c +Auto-merging net/unix/af_unix.c +Auto-merging net/xfrm/xfrm_nat_keepalive.c +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/net/wireless/mediatek/mt76/mt7921/regd.c' using previous resolution. +Resolved 'include/linux/pci_ids.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f5ef7414ea687] Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-pci-drivers-btintel_pcie | 15 + + .../bindings/dpll/microchip,zl30731.yaml | 19 +- + .../devicetree/bindings/net/adi,ad3306.yaml | 71 + + .../bindings/net/altr,gmii-to-sgmii-2.0.yaml | 2 +- + .../bindings/net/altr,socfpga-stmmac.yaml | 2 +- + .../bindings/net/can/rockchip,rk3568v2-canfd.yaml | 4 +- + .../bindings/net/can/ti,am3517-hecc.yaml | 64 + + .../devicetree/bindings/net/can/ti_hecc.txt | 32 - + .../devicetree/bindings/net/can/xilinx,can.yaml | 5 +- + .../devicetree/bindings/net/dptel,dap8211r.yaml | 62 + + .../bindings/net/dsa/mediatek,mt7530.yaml | 5 + + .../bindings/net/dsa/mediatek,mt7628-esw.yaml | 96 + + .../devicetree/bindings/net/eswin,eic7700-eth.yaml | 74 +- + .../devicetree/bindings/net/fsl,gianfar.yaml | 2 +- + .../devicetree/bindings/net/microchip,lan7800.yaml | 89 + + .../devicetree/bindings/net/microchip,lan78xx.txt | 53 - + .../devicetree/bindings/net/microchip,lan95xx.yaml | 2 +- + .../bindings/net/microchip,lan966x-switch.yaml | 4 +- + .../bindings/net/microchip,sparx5-switch.yaml | 6 +- + .../bindings/net/pse-pd/realtek,pse-mcu-gen1.yaml | 182 + + .../bindings/net/renesas,rzv2h-gbeth.yaml | 8 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/dpll.rst | 18 +- + Documentation/netlink/specs/devlink.yaml | 30 +- + Documentation/netlink/specs/dpll.yaml | 19 + + Documentation/netlink/specs/netdev.yaml | 19 + + Documentation/netlink/specs/nl80211.yaml | 4 +- + Documentation/netlink/specs/rt-addr.yaml | 4 + + Documentation/netlink/specs/rt-link.yaml | 5 + + Documentation/netlink/specs/rt-route.yaml | 85 +- + .../device_drivers/can/ctu/fsm_txt_buffer_user.svg | 4 +- + .../device_drivers/ethernet/amd/pds_core.rst | 89 + + .../networking/device_drivers/ethernet/index.rst | 1 + + .../device_drivers/ethernet/intel/ixd.rst | 39 + + .../networking/devlink/devlink-params.rst | 6 + + Documentation/networking/devlink/devlink-port.rst | 11 + + Documentation/networking/devlink/index.rst | 9 +- + Documentation/networking/devlink/ixd.rst | 30 + + Documentation/networking/devlink/mlx5.rst | 40 +- + .../net_cachelines/netns_ipv4_sysctl.rst | 1 + + Documentation/networking/netdevices.rst | 7 + + Documentation/networking/oa-tc6-framework.rst | 3 +- + Documentation/networking/tuntap.rst | 32 + + Documentation/process/maintainer-netdev.rst | 20 + + MAINTAINERS | 76 +- + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/include/uapi/asm/socket.h | 2 + + arch/parisc/include/uapi/asm/socket.h | 2 + + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/mm/mem.c | 6 - + arch/sparc/include/uapi/asm/socket.h | 2 + + drivers/bluetooth/Makefile | 2 + + drivers/bluetooth/bfusb.c | 37 +- + drivers/bluetooth/btintel.c | 200 +- + drivers/bluetooth/btintel.h | 18 + + drivers/bluetooth/btintel_pcie.c | 299 +- + drivers/bluetooth/btintel_pcie.h | 12 +- + drivers/bluetooth/btmrvl_main.c | 20 + + drivers/bluetooth/btmrvl_sdio.c | 2 +- + drivers/bluetooth/btmtksdio.c | 3 + + drivers/bluetooth/btnxpuart.c | 52 +- + drivers/bluetooth/btqca.c | 25 +- + drivers/bluetooth/btrsi.c | 3 +- + drivers/bluetooth/btusb.c | 137 +- + drivers/bluetooth/hci_aml.c | 18 +- + drivers/bluetooth/hci_bcm.c | 336 +- + drivers/bluetooth/hci_bcsp.c | 5 +- + drivers/bluetooth/hci_h5.c | 6 +- + drivers/bluetooth/hci_intel.c | 4 +- + drivers/bluetooth/hci_ldisc.c | 10 +- + drivers/bluetooth/hci_nokia.c | 20 + + drivers/bluetooth/hci_qca.c | 16 +- + drivers/bluetooth/virtio_bt.c | 8 +- + drivers/cxl/core/core.h | 2 + + drivers/cxl/core/mbox.c | 51 +- + drivers/cxl/core/memdev.c | 67 + + drivers/cxl/core/pci.c | 1 + + drivers/cxl/core/port.c | 1 + + drivers/cxl/core/regs.c | 1 + + drivers/cxl/cxlpci.h | 12 - + drivers/cxl/pci.c | 1 + + drivers/dpll/dpll_core.c | 6 +- + drivers/dpll/dpll_netlink.c | 235 +- + drivers/dpll/dpll_nl.c | 2 +- + drivers/dpll/zl3073x/Kconfig | 6 +- + drivers/dpll/zl3073x/chan.c | 449 +- + drivers/dpll/zl3073x/chan.h | 80 + + drivers/dpll/zl3073x/core.c | 62 +- + drivers/dpll/zl3073x/core.h | 35 +- + drivers/dpll/zl3073x/dpll.c | 984 ++- + drivers/dpll/zl3073x/dpll.h | 9 + + drivers/dpll/zl3073x/out.c | 8 +- + drivers/dpll/zl3073x/regs.h | 63 + + drivers/infiniband/core/lag.c | 2 +- + drivers/infiniband/sw/rxe/rxe_net.c | 4 +- + drivers/mmc/core/quirks.h | 3 + + drivers/net/amt.c | 52 +- + drivers/net/bareudp.c | 45 +- + drivers/net/bonding/bond_3ad.c | 24 +- + drivers/net/bonding/bond_main.c | 10 +- + drivers/net/bonding/bond_netlink.c | 111 +- + drivers/net/bonding/bond_options.c | 8 +- + drivers/net/can/m_can/m_can.c | 2 +- + drivers/net/can/m_can/m_can_pci.c | 6 +- + drivers/net/can/m_can/tcan4x5x-core.c | 31 +- + drivers/net/can/rockchip/rockchip_canfd-core.c | 17 + + drivers/net/can/rockchip/rockchip_canfd-rx.c | 5 +- + drivers/net/can/rockchip/rockchip_canfd.h | 14 +- + drivers/net/can/usb/gs_usb.c | 2 +- + drivers/net/can/vxcan.c | 26 +- + drivers/net/dsa/Kconfig | 10 + + drivers/net/dsa/Makefile | 1 + + drivers/net/dsa/b53/b53_priv.h | 3 +- + drivers/net/dsa/microchip/ksz8.c | 742 +- + drivers/net/dsa/microchip/ksz8_reg.h | 1 + + drivers/net/dsa/microchip/ksz9477.c | 164 +- + drivers/net/dsa/microchip/ksz9477.h | 4 +- + drivers/net/dsa/microchip/ksz_common.c | 611 +- + drivers/net/dsa/microchip/ksz_common.h | 91 +- + drivers/net/dsa/microchip/ksz_ptp.c | 277 +- + drivers/net/dsa/microchip/ksz_ptp.h | 16 + + drivers/net/dsa/microchip/ksz_ptp_reg.h | 10 + + drivers/net/dsa/microchip/lan937x_main.c | 6 +- + drivers/net/dsa/mt7530-mmio.c | 1 + + drivers/net/dsa/mt7530.c | 144 +- + drivers/net/dsa/mt7530.h | 1 + + drivers/net/dsa/mt7628.c | 652 ++ + drivers/net/dsa/qca/qca8k-leds.c | 3 + + drivers/net/dsa/realtek/rtl8365mb_main.c | 619 +- + drivers/net/dsa/realtek/rtl8366rb.c | 267 +- + drivers/net/dsa/realtek/rtl83xx.c | 26 +- + drivers/net/dsa/yt921x.h | 2 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/adi/Kconfig | 12 + + drivers/net/ethernet/adi/Makefile | 1 + + drivers/net/ethernet/adi/adin1140.c | 791 +++ + drivers/net/ethernet/agere/et131x.c | 2 +- + drivers/net/ethernet/airoha/airoha_eth.c | 265 +- + drivers/net/ethernet/airoha/airoha_eth.h | 33 +- + drivers/net/ethernet/airoha/airoha_npu.c | 10 +- + drivers/net/ethernet/airoha/airoha_ppe.c | 36 +- + drivers/net/ethernet/airoha/airoha_regs.h | 1 + + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 6 +- + drivers/net/ethernet/amd/Kconfig | 1 + + drivers/net/ethernet/amd/pds_core/core.c | 173 + + drivers/net/ethernet/amd/pds_core/core.h | 54 +- + drivers/net/ethernet/amd/pds_core/debugfs.c | 45 + + drivers/net/ethernet/amd/pds_core/dev.c | 144 +- + drivers/net/ethernet/amd/pds_core/devlink.c | 149 +- + drivers/net/ethernet/amd/pds_core/fw.c | 796 ++- + drivers/net/ethernet/amd/pds_core/main.c | 7 + + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_macsec.c | 6 +- + drivers/net/ethernet/broadcom/bnge/bnge_netdev.c | 132 +- + drivers/net/ethernet/broadcom/bnge/bnge_netdev.h | 6 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 8 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 138 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 11 +- + drivers/net/ethernet/brocade/bna/bnad.c | 2 +- + drivers/net/ethernet/cadence/macb.h | 26 +- + drivers/net/ethernet/cadence/macb_main.c | 969 +-- + drivers/net/ethernet/cadence/macb_pci.c | 46 +- + drivers/net/ethernet/cadence/macb_ptp.c | 18 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 3 +- + drivers/net/ethernet/cisco/enic/Makefile | 3 +- + drivers/net/ethernet/cisco/enic/enic.h | 41 +- + drivers/net/ethernet/cisco/enic/enic_admin.c | 667 ++ + drivers/net/ethernet/cisco/enic/enic_admin.h | 27 + + drivers/net/ethernet/cisco/enic/enic_main.c | 431 +- + drivers/net/ethernet/cisco/enic/enic_mbox.c | 647 ++ + drivers/net/ethernet/cisco/enic/enic_mbox.h | 95 + + drivers/net/ethernet/cisco/enic/enic_pp.c | 5 + + drivers/net/ethernet/cisco/enic/enic_res.c | 4 +- + drivers/net/ethernet/cisco/enic/vnic_cq.h | 9 + + drivers/net/ethernet/cisco/enic/vnic_devcmd.h | 13 + + drivers/net/ethernet/cisco/enic/vnic_enet.h | 4 +- + drivers/net/ethernet/dec/tulip/Kconfig | 16 +- + drivers/net/ethernet/dec/tulip/Makefile | 1 - + drivers/net/ethernet/dec/tulip/xircom_cb.c | 1172 ---- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 12 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 935 ++- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.h | 42 +- + drivers/net/ethernet/freescale/dpaa2/dpsw-cmd.h | 18 +- + drivers/net/ethernet/freescale/dpaa2/dpsw.c | 60 + + drivers/net/ethernet/freescale/dpaa2/dpsw.h | 30 + + drivers/net/ethernet/freescale/enetc/enetc.h | 4 +- + .../net/ethernet/freescale/enetc/enetc4_debugfs.c | 42 +- + drivers/net/ethernet/freescale/enetc/enetc4_hw.h | 6 +- + drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 471 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 12 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 94 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.h | 6 - + .../net/ethernet/freescale/enetc/enetc_pf_common.c | 150 +- + .../net/ethernet/freescale/enetc/enetc_pf_common.h | 5 + + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 4 +- + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 9 +- + drivers/net/ethernet/freescale/gianfar.c | 6 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 89 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 11 +- + drivers/net/ethernet/google/gve/gve_main.c | 111 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 15 +- + drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.c | 1 + + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 4 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 14 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 3 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 48 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 12 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 9 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 3 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 172 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 7 + + drivers/net/ethernet/huawei/hinic3/hinic3_tx.c | 5 +- + drivers/net/ethernet/ibm/Kconfig | 9 - + drivers/net/ethernet/ibm/Makefile | 1 - + drivers/net/ethernet/ibm/ehea/Makefile | 7 - + drivers/net/ethernet/ibm/ehea/ehea.h | 477 -- + drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 277 - + drivers/net/ethernet/ibm/ehea/ehea_hw.h | 253 - + drivers/net/ethernet/ibm/ehea/ehea_main.c | 3581 ---------- + drivers/net/ethernet/ibm/ehea/ehea_phyp.c | 612 -- + drivers/net/ethernet/ibm/ehea/ehea_phyp.h | 433 -- + drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 999 --- + drivers/net/ethernet/ibm/ehea/ehea_qmr.h | 390 -- + drivers/net/ethernet/intel/Kconfig | 2 + + drivers/net/ethernet/intel/Makefile | 1 + + drivers/net/ethernet/intel/i40e/i40e.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 2 +- + drivers/net/ethernet/intel/iavf/iavf.h | 2 +- + drivers/net/ethernet/intel/iavf/iavf_common.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_prototype.h | 3 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_types.h | 4 +- + drivers/net/ethernet/intel/ice/ice.h | 2 +- + drivers/net/ethernet/intel/ice/ice_common.h | 2 +- + drivers/net/ethernet/intel/ice/ice_gnss.c | 5 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 2 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 2 +- + drivers/net/ethernet/intel/ice/virt/virtchnl.h | 2 +- + drivers/net/ethernet/intel/idpf/Kconfig | 1 + + drivers/net/ethernet/intel/idpf/Makefile | 2 - + drivers/net/ethernet/intel/idpf/idpf.h | 99 +- + drivers/net/ethernet/intel/idpf/idpf_controlq.c | 621 -- + drivers/net/ethernet/intel/idpf/idpf_controlq.h | 144 - + .../net/ethernet/intel/idpf/idpf_controlq_api.h | 177 - + .../net/ethernet/intel/idpf/idpf_controlq_setup.c | 169 - + drivers/net/ethernet/intel/idpf/idpf_dev.c | 97 +- + drivers/net/ethernet/intel/idpf/idpf_ethtool.c | 28 +- + drivers/net/ethernet/intel/idpf/idpf_idc.c | 32 +- + drivers/net/ethernet/intel/idpf/idpf_lib.c | 69 +- + drivers/net/ethernet/intel/idpf/idpf_main.c | 115 +- + drivers/net/ethernet/intel/idpf/idpf_mem.h | 20 - + drivers/net/ethernet/intel/idpf/idpf_txrx.c | 6 +- + drivers/net/ethernet/intel/idpf/idpf_txrx.h | 4 +- + drivers/net/ethernet/intel/idpf/idpf_vf_dev.c | 92 +- + drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 1969 +++--- + drivers/net/ethernet/intel/idpf/idpf_virtchnl.h | 127 +- + .../net/ethernet/intel/idpf/idpf_virtchnl_ptp.c | 310 +- + drivers/net/ethernet/intel/igb/e1000_82575.h | 21 + + drivers/net/ethernet/intel/igb/e1000_i210.c | 6 +- + drivers/net/ethernet/intel/igb/igb.h | 3 + + drivers/net/ethernet/intel/igb/igb_ethtool.c | 89 +- + drivers/net/ethernet/intel/igb/igb_main.c | 25 +- + drivers/net/ethernet/intel/igc/igc.h | 3 + + drivers/net/ethernet/intel/igc/igc_base.c | 33 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 9 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 279 +- + drivers/net/ethernet/intel/igc/igc_hw.h | 10 +- + drivers/net/ethernet/intel/igc/igc_mac.c | 35 +- + drivers/net/ethernet/intel/igc/igc_main.c | 10 +- + drivers/net/ethernet/intel/igc/igc_phy.c | 71 +- + drivers/net/ethernet/intel/igc/igc_phy.h | 1 + + drivers/net/ethernet/intel/igc/igc_tsn.c | 8 +- + drivers/net/ethernet/intel/ixd/Kconfig | 14 + + drivers/net/ethernet/intel/ixd/Makefile | 13 + + drivers/net/ethernet/intel/ixd/ixd.h | 67 + + drivers/net/ethernet/intel/ixd/ixd_ctlq.c | 141 + + drivers/net/ethernet/intel/ixd/ixd_ctlq.h | 34 + + drivers/net/ethernet/intel/ixd/ixd_dev.c | 89 + + drivers/net/ethernet/intel/ixd/ixd_devlink.c | 99 + + drivers/net/ethernet/intel/ixd/ixd_devlink.h | 50 + + drivers/net/ethernet/intel/ixd/ixd_lan_regs.h | 68 + + drivers/net/ethernet/intel/ixd/ixd_lib.c | 173 + + drivers/net/ethernet/intel/ixd/ixd_main.c | 144 + + drivers/net/ethernet/intel/ixd/ixd_virtchnl.c | 190 + + drivers/net/ethernet/intel/ixd/ixd_virtchnl.h | 12 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 7 +- + drivers/net/ethernet/intel/libeth/rx.c | 12 +- + drivers/net/ethernet/intel/libie/Kconfig | 14 + + drivers/net/ethernet/intel/libie/Makefile | 8 + + drivers/net/ethernet/intel/libie/controlq.c | 1295 ++++ + drivers/net/ethernet/intel/libie/pci.c | 229 + + drivers/net/ethernet/marvell/mvneta.c | 18 + + drivers/net/ethernet/marvell/mvneta_bm.c | 87 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 9 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 4 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 2 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 52 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 80 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 7 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c | 1 + + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 2 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 2 +- + .../ethernet/marvell/prestera/prestera_router.c | 6 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 5 + + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 17 +- + drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 139 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 1 + + .../ethernet/mellanox/mlx5/core/diag/rsc_dump.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 7 +- + .../net/ethernet/mellanox/mlx5/core/en/health.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 4 +- + .../mellanox/mlx5/core/en_accel/en_accel.h | 19 +- + .../net/ethernet/mellanox/mlx5/core/en_accel/psp.c | 1059 ++- + .../net/ethernet/mellanox/mlx5/core/en_accel/psp.h | 18 +- + .../mellanox/mlx5/core/en_accel/psp_rxtx.c | 13 +- + .../mellanox/mlx5/core/en_accel/psp_rxtx.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 29 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 10 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 2 +- + .../mellanox/mlx5/core/esw/acl/egress_ofld.c | 105 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 605 +- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h | 3 - + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 27 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 18 +- + .../net/ethernet/mellanox/mlx5/core/lib/hv_vhca.c | 22 +- + .../net/ethernet/mellanox/mlx5/core/lib/hv_vhca.h | 5 +- + .../net/ethernet/mellanox/mlx5/core/lib/nv_param.c | 125 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/sd.c | 75 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/sd.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 11 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 + + .../ethernet/mellanox/mlx5/core/steering/hws/cmd.c | 15 +- + .../mellanox/mlx5/core/steering/hws/send.c | 67 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 8 +- + .../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 2 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 2 + + drivers/net/ethernet/microchip/lan743x_main.c | 35 +- + drivers/net/ethernet/microchip/lan743x_main.h | 6 + + drivers/net/ethernet/microchip/lan865x/lan865x.c | 2 +- + .../microchip/sparx5/lan969x/lan969x_regs.c | 3 + + .../ethernet/microchip/sparx5/sparx5_main_regs.h | 12 + + .../net/ethernet/microchip/sparx5/sparx5_port.c | 4 + + drivers/net/ethernet/microchip/sparx5/sparx5_qos.c | 49 + + drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 1 + + .../net/ethernet/microchip/sparx5/sparx5_regs.c | 3 + + .../net/ethernet/microchip/sparx5/sparx5_regs.h | 3 + + drivers/net/ethernet/microchip/vcap/vcap_api.c | 9 +- + drivers/net/ethernet/microsoft/Kconfig | 1 + + drivers/net/ethernet/microsoft/mana/gdma_main.c | 272 +- + drivers/net/ethernet/microsoft/mana/hw_channel.c | 2 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 353 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 383 +- + drivers/net/ethernet/oa_tc6.c | 263 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 17 +- + .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 7 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 7 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 7 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 13 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 6 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 2 +- + drivers/net/ethernet/qualcomm/ppe/ppe.c | 1 - + drivers/net/ethernet/qualcomm/ppe/ppe_config.c | 7 +- + drivers/net/ethernet/qualcomm/ppe/ppe_config.h | 2 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 3 +- + drivers/net/ethernet/realtek/r8169.h | 2 +- + drivers/net/ethernet/realtek/r8169_leds.c | 11 +- + drivers/net/ethernet/renesas/rtsn.c | 7 +- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 3 +- + drivers/net/ethernet/sfc/Kconfig | 9 + + drivers/net/ethernet/sfc/Makefile | 1 + + drivers/net/ethernet/sfc/ef10.c | 41 +- + drivers/net/ethernet/sfc/efx.c | 18 +- + drivers/net/ethernet/sfc/efx_cxl.c | 105 + + drivers/net/ethernet/sfc/efx_cxl.h | 32 + + drivers/net/ethernet/sfc/falcon/net_driver.h | 2 +- + drivers/net/ethernet/sfc/falcon/selftest.c | 4 +- + drivers/net/ethernet/sfc/falcon/tx.c | 16 +- + drivers/net/ethernet/sfc/mcdi.c | 7 +- + drivers/net/ethernet/sfc/net_driver.h | 10 + + drivers/net/ethernet/sfc/nic.h | 3 + + drivers/net/ethernet/sfc/selftest.c | 4 +- + drivers/net/ethernet/sfc/siena/mcdi.c | 7 +- + drivers/net/ethernet/sfc/siena/selftest.c | 4 +- + drivers/net/ethernet/sfc/siena/tx.c | 12 +- + drivers/net/ethernet/sfc/tc_encap_actions.c | 2 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 9 +- + .../net/ethernet/stmicro/stmmac/dwmac-eic7700.c | 117 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 2 + + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 + + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 10 + + drivers/net/ethernet/stmicro/stmmac/hwif.c | 12 - + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 15 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c | 14 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 25 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 121 +- + drivers/net/ethernet/sun/niu.c | 6 +- + drivers/net/ethernet/sun/niu.h | 2 +- + drivers/net/ethernet/ti/cpsw_priv.c | 2 +- + drivers/net/ethernet/wangxun/libwx/Makefile | 2 +- + drivers/net/ethernet/wangxun/libwx/wx_err.c | 332 + + drivers/net/ethernet/wangxun/libwx/wx_err.h | 18 + + drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 70 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 17 +- + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 92 +- + drivers/net/ethernet/wangxun/libwx/wx_lib.h | 5 +- + drivers/net/ethernet/wangxun/libwx/wx_ptp.c | 27 + + drivers/net/ethernet/wangxun/libwx/wx_ptp.h | 1 + + drivers/net/ethernet/wangxun/libwx/wx_type.h | 24 +- + drivers/net/ethernet/wangxun/libwx/wx_vf.h | 1 - + drivers/net/ethernet/wangxun/libwx/wx_vf_common.c | 4 +- + drivers/net/ethernet/wangxun/libwx/wx_vf_common.h | 2 + + drivers/net/ethernet/wangxun/libwx/wx_vf_lib.c | 13 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c | 1 - + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 84 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 1 + + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 64 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 5 +- + drivers/net/ethernet/zte/Kconfig | 20 + + drivers/net/ethernet/zte/Makefile | 6 + + drivers/net/ethernet/zte/dinghai/Kconfig | 34 + + drivers/net/ethernet/zte/dinghai/Makefile | 7 + + drivers/net/ethernet/zte/dinghai/dh_queue.h | 56 + + drivers/net/ethernet/zte/dinghai/en_pf.c | 449 ++ + drivers/net/ethernet/zte/dinghai/en_pf.h | 75 + + drivers/net/fjes/fjes_main.c | 9 +- + drivers/net/geneve.c | 549 +- + drivers/net/ipvlan/ipvlan.h | 12 +- + drivers/net/ipvlan/ipvlan_main.c | 147 +- + drivers/net/ipvlan/ipvtap.c | 25 +- + drivers/net/macsec.c | 78 +- + drivers/net/macvlan.c | 138 +- + drivers/net/mctp/Kconfig | 16 + + drivers/net/mctp/Makefile | 1 + + drivers/net/mctp/mctp-usb.c | 360 +- + drivers/net/mctp/mctp-usblib-test.c | 412 ++ + drivers/net/mctp/mctp-usblib.c | 625 ++ + drivers/net/mdio/Kconfig | 9 +- + drivers/net/netconsole.c | 594 +- + drivers/net/netdevsim/bus.c | 3 - + drivers/net/netdevsim/dev.c | 81 +- + drivers/net/netdevsim/netdevsim.h | 3 +- + drivers/net/netdevsim/psample.c | 2 +- + drivers/net/netdevsim/psp.c | 8 +- + drivers/net/pcs/pcs-mtk-lynxi.c | 7 +- + drivers/net/pfcp.c | 32 +- + drivers/net/phy/Kconfig | 15 + + drivers/net/phy/Makefile | 2 + + drivers/net/phy/adin1140-phy.c | 72 + + drivers/net/phy/dap8211r.c | 220 + + drivers/net/phy/dp83640.c | 131 +- + drivers/net/phy/mdio_device.c | 1 - + drivers/net/phy/mediatek/Kconfig | 19 +- + drivers/net/phy/mediatek/Makefile | 1 + + drivers/net/phy/mediatek/mtk-fe-soc.c | 52 + + drivers/net/phy/mediatek/mtk-ge-soc.c | 35 + + drivers/net/phy/micrel.c | 60 + + drivers/net/phy/microchip_t1.c | 6 +- + drivers/net/phy/microchip_t1s.c | 32 +- + drivers/net/phy/motorcomm.c | 13 + + drivers/net/phy/nxp-tja11xx.c | 9 + + drivers/net/phy/phy-c45.c | 125 + + drivers/net/phy/phy_device.c | 25 + + drivers/net/phy/phy_package.c | 23 + + drivers/net/phy/phylib.h | 2 + + drivers/net/phy/phylink.c | 26 +- + drivers/net/phy/qcom/at803x.c | 2 +- + drivers/net/phy/realtek/realtek_main.c | 411 ++ + drivers/net/phy/sfp.c | 45 +- + drivers/net/phy/sfp.h | 1 + + drivers/net/ppp/ppp_async.c | 2 - + drivers/net/ppp/ppp_generic.c | 153 +- + drivers/net/ppp/ppp_synctty.c | 2 - + drivers/net/ppp/pppoe.c | 20 +- + drivers/net/ppp/pptp.c | 8 +- + drivers/net/pse-pd/Kconfig | 28 + + drivers/net/pse-pd/Makefile | 3 + + drivers/net/pse-pd/realtek-pse-mcu-core.c | 998 +++ + drivers/net/pse-pd/realtek-pse-mcu-i2c.c | 148 + + drivers/net/pse-pd/realtek-pse-mcu-uart.c | 164 + + drivers/net/pse-pd/realtek-pse-mcu.h | 94 + + drivers/net/pse-pd/tps23881.c | 6 +- + drivers/net/tap.c | 5 +- + drivers/net/team/team_core.c | 4 +- + drivers/net/tun.c | 242 +- + drivers/net/tun_vnet.h | 8 +- + drivers/net/usb/cdc_ether.c | 16 + + drivers/net/usb/lg-vl600.c | 2 +- + drivers/net/usb/qmi_wwan.c | 1 + + drivers/net/usb/rndis_host.c | 6 +- + drivers/net/usb/rtl8150.c | 4 +- + drivers/net/veth.c | 34 +- + drivers/net/vrf.c | 4 +- + drivers/net/vxlan/vxlan_core.c | 44 +- + drivers/net/wan/lapbether.c | 8 +- + drivers/net/wan/wanxl.c | 17 - + drivers/net/wireguard/receive.c | 2 +- + drivers/net/wireless/Kconfig | 2 + + drivers/net/wireless/Makefile | 2 + + drivers/net/wireless/ath/ath10k/ahb.c | 12 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 6 +- + drivers/net/wireless/ath/ath10k/snoc.c | 9 +- + drivers/net/wireless/ath/ath10k/testmode.c | 14 + + drivers/net/wireless/ath/ath11k/ahb.c | 79 +- + drivers/net/wireless/ath/ath11k/core.c | 4 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 32 +- + drivers/net/wireless/ath/ath11k/wmi.c | 46 +- + drivers/net/wireless/ath/ath12k/Kconfig | 2 +- + drivers/net/wireless/ath/ath12k/ahb.c | 244 +- + drivers/net/wireless/ath/ath12k/ahb.h | 36 +- + drivers/net/wireless/ath/ath12k/core.c | 41 +- + drivers/net/wireless/ath/ath12k/core.h | 24 +- + drivers/net/wireless/ath/ath12k/debugfs.c | 14 +- + drivers/net/wireless/ath/ath12k/dp.c | 16 +- + drivers/net/wireless/ath/ath12k/dp.h | 8 +- + drivers/net/wireless/ath/ath12k/dp_mon.c | 70 +- + drivers/net/wireless/ath/ath12k/dp_mon.h | 4 +- + drivers/net/wireless/ath/ath12k/dp_tx.c | 46 + + drivers/net/wireless/ath/ath12k/dp_tx.h | 2 + + drivers/net/wireless/ath/ath12k/hal.c | 42 +- + drivers/net/wireless/ath/ath12k/hal.h | 15 +- + drivers/net/wireless/ath/ath12k/hw.h | 2 +- + drivers/net/wireless/ath/ath12k/mac.c | 104 +- + drivers/net/wireless/ath/ath12k/pci.c | 15 +- + drivers/net/wireless/ath/ath12k/peer.c | 132 +- + drivers/net/wireless/ath/ath12k/peer.h | 14 +- + drivers/net/wireless/ath/ath12k/qmi.c | 437 +- + drivers/net/wireless/ath/ath12k/qmi.h | 48 +- + drivers/net/wireless/ath/ath12k/wifi7/ahb.c | 90 +- + drivers/net/wireless/ath/ath12k/wifi7/dp.c | 2 +- + drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c | 66 +- + drivers/net/wireless/ath/ath12k/wifi7/dp_tx.c | 64 +- + .../net/wireless/ath/ath12k/wifi7/hal_qcc2072.c | 4 +- + .../net/wireless/ath/ath12k/wifi7/hal_qcn9274.c | 13 +- + .../net/wireless/ath/ath12k/wifi7/hal_rx_desc.h | 34 +- + .../net/wireless/ath/ath12k/wifi7/hal_wcn7850.c | 13 +- + drivers/net/wireless/ath/ath12k/wifi7/hw.c | 76 +- + drivers/net/wireless/ath/ath12k/wmi.c | 197 +- + drivers/net/wireless/ath/ath12k/wmi.h | 26 + + drivers/net/wireless/ath/ath6kl/cfg80211.c | 29 +- + drivers/net/wireless/ath/ath6kl/core.h | 5 +- + drivers/net/wireless/ath/ath6kl/init.c | 2 +- + drivers/net/wireless/ath/ath6kl/main.c | 1 + + drivers/net/wireless/ath/ath6kl/txrx.c | 1 + + drivers/net/wireless/ath/ath6kl/wmi.c | 19 +- + drivers/net/wireless/ath/ath6kl/wmi.h | 1 + + drivers/net/wireless/ath/carl9170/carl9170.h | 1 + + drivers/net/wireless/ath/carl9170/cmd.c | 4 +- + drivers/net/wireless/ath/carl9170/debug.c | 2 + + drivers/net/wireless/ath/carl9170/main.c | 8 +- + drivers/net/wireless/ath/carl9170/rx.c | 4 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 20 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 2 +- + drivers/net/wireless/ath/wil6210/p2p.c | 6 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 4 +- + drivers/net/wireless/broadcom/b43/debugfs.c | 12 +- + drivers/net/wireless/broadcom/b43legacy/debugfs.c | 12 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 6 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 161 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 2 +- + .../broadcom/brcm80211/brcmfmac/cyw/core.c | 8 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 47 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 68 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.h | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 3 +- + .../broadcom/brcm80211/include/brcmu_wifi.h | 2 + + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 5 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 51 +- + drivers/net/wireless/intel/iwlwifi/fw/dump.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 6 + + drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 3 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 13 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 28 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 8 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 33 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 22 +- + drivers/net/wireless/intel/iwlwifi/mei/main.c | 28 +- + drivers/net/wireless/intel/iwlwifi/mld/agg.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mld/d3.c | 136 +- + .../net/wireless/intel/iwlwifi/mld/ftm-initiator.c | 21 + + .../net/wireless/intel/iwlwifi/mld/ftm-initiator.h | 1 + + drivers/net/wireless/intel/iwlwifi/mld/hcmd.h | 9 +- + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 19 +- + drivers/net/wireless/intel/iwlwifi/mld/mac80211.h | 2 + + drivers/net/wireless/intel/iwlwifi/mld/mcc.c | 26 +- + drivers/net/wireless/intel/iwlwifi/mld/mld.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mld/mld.h | 2 - + drivers/net/wireless/intel/iwlwifi/mld/notif.c | 5 +- + .../net/wireless/intel/iwlwifi/mld/regulatory.c | 90 +- + drivers/net/wireless/intel/iwlwifi/mld/scan.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mld/sta.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 36 + + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 23 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/time-sync.h | 4 + + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 54 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 + + .../wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c | 2 + + .../net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c | 11 +- + drivers/net/wireless/intersil/p54/Kconfig | 6 +- + drivers/net/wireless/intersil/p54/fwio.c | 4 +- + drivers/net/wireless/intersil/p54/p54usb.c | 2 +- + drivers/net/wireless/marvell/libertas/debugfs.c | 39 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 26 +- + drivers/net/wireless/marvell/mwifiex/debugfs.c | 62 +- + drivers/net/wireless/marvell/mwifiex/main.c | 4 +- + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 12 + + drivers/net/wireless/mediatek/mt76/channel.c | 98 +- + drivers/net/wireless/mediatek/mt76/dma.c | 48 +- + drivers/net/wireless/mediatek/mt76/dma.h | 112 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 20 +- + drivers/net/wireless/mediatek/mt76/mcu.c | 12 +- + drivers/net/wireless/mediatek/mt76/mmio.c | 18 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 11 + + drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 2 + + drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/eeprom.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 73 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 89 +- + drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 4 + + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 5 +- + .../net/wireless/mediatek/mt76/mt7615/pci_mac.c | 5 +- + .../net/wireless/mediatek/mt76/mt7615/usb_sdio.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 16 +- + .../net/wireless/mediatek/mt76/mt76_connac3_mac.h | 42 + + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 8 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 267 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 47 + + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 5 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 17 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 41 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 34 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 25 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 43 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 15 +- + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 20 + + drivers/net/wireless/mediatek/mt76/mt7915/pci.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 1 + + drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 2 +- + .../net/wireless/mediatek/mt76/mt7915/testmode.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 35 +- + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 112 +- + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7921/regd.c | 194 +- + drivers/net/wireless/mediatek/mt76/mt7921/regd.h | 55 +- + drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 5 + + drivers/net/wireless/mediatek/mt76/mt7925/Makefile | 2 +- + drivers/net/wireless/mediatek/mt76/mt7925/init.c | 37 + + drivers/net/wireless/mediatek/mt76/mt7925/mac.c | 241 +- + drivers/net/wireless/mediatek/mt76/mt7925/mac.h | 9 +- + drivers/net/wireless/mediatek/mt76/mt7925/main.c | 279 +- + drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 267 +- + drivers/net/wireless/mediatek/mt76/mt7925/mcu.h | 43 + + drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h | 9 + + drivers/net/wireless/mediatek/mt76/mt7925/nan.c | 1098 +++ + drivers/net/wireless/mediatek/mt76/mt7925/nan.h | 421 ++ + drivers/net/wireless/mediatek/mt76/mt7925/pci.c | 305 +- + .../net/wireless/mediatek/mt76/mt7925/pci_mac.c | 8 +- + .../net/wireless/mediatek/mt76/mt7925/pci_mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7925/regd.c | 250 +- + drivers/net/wireless/mediatek/mt76/mt7925/regd.h | 57 + + drivers/net/wireless/mediatek/mt76/mt7925/regs.h | 67 +- + drivers/net/wireless/mediatek/mt76/mt7925/usb.c | 8 + + drivers/net/wireless/mediatek/mt76/mt792x.h | 85 +- + drivers/net/wireless/mediatek/mt76/mt792x_core.c | 146 +- + drivers/net/wireless/mediatek/mt76/mt792x_dma.c | 124 +- + drivers/net/wireless/mediatek/mt76/mt792x_regs.h | 25 +- + drivers/net/wireless/mediatek/mt76/mt792x_usb.c | 138 +- + drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c | 6 + + drivers/net/wireless/mediatek/mt76/mt7996/init.c | 30 +- + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 96 +- + drivers/net/wireless/mediatek/mt76/mt7996/main.c | 75 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 205 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 42 +- + drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 93 +- + drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 9 +- + drivers/net/wireless/mediatek/mt76/mt7996/regs.h | 24 +- + drivers/net/wireless/mediatek/mt76/scan.c | 26 +- + drivers/net/wireless/mediatek/mt76/sdio.c | 11 +- + drivers/net/wireless/mediatek/mt76/tx.c | 102 +- + drivers/net/wireless/mediatek/mt76/usb.c | 75 +- + drivers/net/wireless/mediatek/mt76/wed.c | 7 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 19 +- + drivers/net/wireless/microchip/wilc1000/mon.c | 30 +- + drivers/net/wireless/morsemicro/Kconfig | 15 + + drivers/net/wireless/morsemicro/Makefile | 2 + + drivers/net/wireless/morsemicro/mm81x/Kconfig | 26 + + drivers/net/wireless/morsemicro/mm81x/Makefile | 21 + + drivers/net/wireless/morsemicro/mm81x/bus.h | 99 + + drivers/net/wireless/morsemicro/mm81x/command.c | 563 ++ + drivers/net/wireless/morsemicro/mm81x/command.h | 85 + + .../net/wireless/morsemicro/mm81x/command_defs.h | 1658 +++++ + drivers/net/wireless/morsemicro/mm81x/core.c | 138 + + drivers/net/wireless/morsemicro/mm81x/core.h | 456 ++ + drivers/net/wireless/morsemicro/mm81x/fw.c | 752 +++ + drivers/net/wireless/morsemicro/mm81x/fw.h | 143 + + drivers/net/wireless/morsemicro/mm81x/hif.h | 117 + + drivers/net/wireless/morsemicro/mm81x/hw.c | 367 + + drivers/net/wireless/morsemicro/mm81x/hw.h | 159 + + drivers/net/wireless/morsemicro/mm81x/mac.c | 2443 +++++++ + drivers/net/wireless/morsemicro/mm81x/mac.h | 63 + + drivers/net/wireless/morsemicro/mm81x/mmrc.c | 1354 ++++ + drivers/net/wireless/morsemicro/mm81x/mmrc.h | 193 + + drivers/net/wireless/morsemicro/mm81x/ps.c | 120 + + drivers/net/wireless/morsemicro/mm81x/ps.h | 22 + + drivers/net/wireless/morsemicro/mm81x/rate_code.h | 177 + + drivers/net/wireless/morsemicro/mm81x/rc.c | 494 ++ + drivers/net/wireless/morsemicro/mm81x/rc.h | 51 + + drivers/net/wireless/morsemicro/mm81x/sdio.c | 613 ++ + drivers/net/wireless/morsemicro/mm81x/skbq.c | 1064 +++ + drivers/net/wireless/morsemicro/mm81x/skbq.h | 218 + + drivers/net/wireless/morsemicro/mm81x/usb.c | 943 +++ + drivers/net/wireless/morsemicro/mm81x/yaps.c | 704 ++ + drivers/net/wireless/morsemicro/mm81x/yaps.h | 77 + + drivers/net/wireless/morsemicro/mm81x/yaps_hw.c | 702 ++ + drivers/net/wireless/morsemicro/mm81x/yaps_hw.h | 52 + + drivers/net/wireless/nxp/Kconfig | 17 + + drivers/net/wireless/nxp/Makefile | 3 + + drivers/net/wireless/nxp/nxpwifi/11ac.c | 280 + + drivers/net/wireless/nxp/nxpwifi/11ac.h | 33 + + drivers/net/wireless/nxp/nxpwifi/11ax.c | 597 ++ + drivers/net/wireless/nxp/nxpwifi/11ax.h | 73 + + drivers/net/wireless/nxp/nxpwifi/11h.c | 339 + + drivers/net/wireless/nxp/nxpwifi/11n.c | 838 +++ + drivers/net/wireless/nxp/nxpwifi/11n.h | 158 + + drivers/net/wireless/nxp/nxpwifi/11n_aggr.c | 251 + + drivers/net/wireless/nxp/nxpwifi/11n_aggr.h | 21 + + drivers/net/wireless/nxp/nxpwifi/11n_rxreorder.c | 815 +++ + drivers/net/wireless/nxp/nxpwifi/11n_rxreorder.h | 71 + + drivers/net/wireless/nxp/nxpwifi/Kconfig | 23 + + drivers/net/wireless/nxp/nxpwifi/Makefile | 39 + + drivers/net/wireless/nxp/nxpwifi/cfg.h | 1019 +++ + drivers/net/wireless/nxp/nxpwifi/cfg80211.c | 3935 +++++++++++ + drivers/net/wireless/nxp/nxpwifi/cfg80211.h | 18 + + drivers/net/wireless/nxp/nxpwifi/cfp.c | 478 ++ + drivers/net/wireless/nxp/nxpwifi/cmdevt.c | 1310 ++++ + drivers/net/wireless/nxp/nxpwifi/cmdevt.h | 122 + + drivers/net/wireless/nxp/nxpwifi/debugfs.c | 1094 +++ + drivers/net/wireless/nxp/nxpwifi/ethtool.c | 58 + + drivers/net/wireless/nxp/nxpwifi/fw.h | 2475 +++++++ + drivers/net/wireless/nxp/nxpwifi/ie.c | 480 ++ + drivers/net/wireless/nxp/nxpwifi/init.c | 607 ++ + drivers/net/wireless/nxp/nxpwifi/join.c | 787 +++ + drivers/net/wireless/nxp/nxpwifi/main.c | 1673 +++++ + drivers/net/wireless/nxp/nxpwifi/main.h | 1436 ++++ + drivers/net/wireless/nxp/nxpwifi/scan.c | 2698 ++++++++ + drivers/net/wireless/nxp/nxpwifi/sdio.c | 2328 +++++++ + drivers/net/wireless/nxp/nxpwifi/sdio.h | 340 + + drivers/net/wireless/nxp/nxpwifi/sta_cfg.c | 1177 ++++ + drivers/net/wireless/nxp/nxpwifi/sta_cmd.c | 3393 ++++++++++ + drivers/net/wireless/nxp/nxpwifi/sta_event.c | 862 +++ + drivers/net/wireless/nxp/nxpwifi/sta_rx.c | 242 + + drivers/net/wireless/nxp/nxpwifi/sta_tx.c | 190 + + drivers/net/wireless/nxp/nxpwifi/txrx.c | 352 + + drivers/net/wireless/nxp/nxpwifi/uap_cmd.c | 1256 ++++ + drivers/net/wireless/nxp/nxpwifi/uap_event.c | 506 ++ + drivers/net/wireless/nxp/nxpwifi/uap_txrx.c | 478 ++ + drivers/net/wireless/nxp/nxpwifi/util.c | 1380 ++++ + drivers/net/wireless/nxp/nxpwifi/util.h | 155 + + drivers/net/wireless/nxp/nxpwifi/wmm.c | 1318 ++++ + drivers/net/wireless/nxp/nxpwifi/wmm.h | 77 + + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 4 +- + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 2 +- + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/8723b.c | 11 +- + drivers/net/wireless/realtek/rtl8xxxu/core.c | 20 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 49 +- + .../wireless/realtek/rtlwifi/rtl8192d/hw_common.c | 21 +- + .../net/wireless/realtek/rtlwifi/rtl8192du/sw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192du/trx.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 6 - + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 7 +- + drivers/net/wireless/realtek/rtw88/bf.c | 6 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 8 +- + drivers/net/wireless/realtek/rtw88/main.h | 1 + + drivers/net/wireless/realtek/rtw88/pci.c | 14 +- + drivers/net/wireless/realtek/rtw88/rtw8723x.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8814a.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 4 +- + drivers/net/wireless/realtek/rtw88/rtw8821c.h | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 9 +- + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 15 +- + drivers/net/wireless/realtek/rtw88/rtw88xxa.c | 3 +- + drivers/net/wireless/realtek/rtw88/tx.c | 1 + + drivers/net/wireless/realtek/rtw89/Kconfig | 29 + + drivers/net/wireless/realtek/rtw89/Makefile | 9 + + drivers/net/wireless/realtek/rtw89/coex.c | 7136 ++++++++++++-------- + drivers/net/wireless/realtek/rtw89/coex.h | 155 +- + drivers/net/wireless/realtek/rtw89/core.c | 131 +- + drivers/net/wireless/realtek/rtw89/core.h | 1397 +++- + drivers/net/wireless/realtek/rtw89/debug.c | 124 +- + drivers/net/wireless/realtek/rtw89/debug.h | 1 + + drivers/net/wireless/realtek/rtw89/efuse.h | 7 + + drivers/net/wireless/realtek/rtw89/efuse_be.c | 117 +- + drivers/net/wireless/realtek/rtw89/fw.c | 1526 ++++- + drivers/net/wireless/realtek/rtw89/fw.h | 366 +- + drivers/net/wireless/realtek/rtw89/led.c | 139 + + drivers/net/wireless/realtek/rtw89/led.h | 37 + + drivers/net/wireless/realtek/rtw89/led_mc.c | 81 + + drivers/net/wireless/realtek/rtw89/mac.c | 71 +- + drivers/net/wireless/realtek/rtw89/mac.h | 52 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 38 +- + drivers/net/wireless/realtek/rtw89/mac_be.c | 87 +- + drivers/net/wireless/realtek/rtw89/pci.c | 17 + + drivers/net/wireless/realtek/rtw89/pci.h | 6 +- + drivers/net/wireless/realtek/rtw89/pci_be.c | 11 +- + drivers/net/wireless/realtek/rtw89/phy.c | 95 +- + drivers/net/wireless/realtek/rtw89/phy.h | 28 +- + drivers/net/wireless/realtek/rtw89/phy_be.c | 53 +- + drivers/net/wireless/realtek/rtw89/reg.h | 100 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 146 +- + drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c | 22 +- + .../net/wireless/realtek/rtw89/rtw8851b_table.c | 23 +- + .../net/wireless/realtek/rtw89/rtw8851b_table.h | 2 +- + drivers/net/wireless/realtek/rtw89/rtw8851be.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8851bu.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 91 +- + drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 36 +- + .../net/wireless/realtek/rtw89/rtw8852a_table.c | 27 +- + .../net/wireless/realtek/rtw89/rtw8852a_table.h | 2 +- + drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852au.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 80 +- + .../net/wireless/realtek/rtw89/rtw8852b_common.c | 7 +- + drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c | 36 +- + .../net/wireless/realtek/rtw89/rtw8852b_table.c | 31 +- + .../net/wireless/realtek/rtw89/rtw8852b_table.h | 2 +- + drivers/net/wireless/realtek/rtw89/rtw8852be.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852bt.c | 80 +- + drivers/net/wireless/realtek/rtw89/rtw8852bte.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852bu.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 87 +- + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 101 +- + .../net/wireless/realtek/rtw89/rtw8852c_table.c | 39 +- + .../net/wireless/realtek/rtw89/rtw8852c_table.h | 2 +- + drivers/net/wireless/realtek/rtw89/rtw8852ce.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852cu.c | 57 +- + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 142 +- + drivers/net/wireless/realtek/rtw89/rtw8922ae.c | 3 + + drivers/net/wireless/realtek/rtw89/rtw8922au.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8922d.c | 521 +- + drivers/net/wireless/realtek/rtw89/rtw8922de.c | 3 + + drivers/net/wireless/realtek/rtw89/wow.c | 27 +- + drivers/net/wireless/rsi/rsi_91x_coex.c | 3 +- + drivers/net/wireless/rsi/rsi_91x_main.c | 7 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 3 +- + drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 7 +- + drivers/net/wireless/rsi/rsi_common.h | 2 +- + drivers/net/wireless/rsi/rsi_sdio.h | 2 +- + drivers/net/wireless/rsi/rsi_usb.h | 2 +- + drivers/net/wireless/ti/wlcore/main.c | 14 +- + drivers/net/wireless/virtual/mac80211_hwsim_main.c | 69 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 8 + + drivers/net/wwan/wwan_core.c | 27 +- + drivers/nfc/fdp/i2c.c | 4 +- + drivers/nfc/microread/mei.c | 10 +- + drivers/nfc/nfcmrvl/i2c.c | 6 +- + drivers/nfc/nfcmrvl/spi.c | 12 +- + drivers/nfc/nfcmrvl/usb.c | 1 - + drivers/nfc/nxp-nci/i2c.c | 14 +- + drivers/nfc/pn533/i2c.c | 10 +- + drivers/nfc/pn533/pn533.c | 10 +- + drivers/nfc/pn533/uart.c | 4 +- + drivers/nfc/pn544/i2c.c | 14 +- + drivers/nfc/pn544/mei.c | 10 +- + drivers/nfc/port100.c | 4 +- + drivers/nfc/s3fwrn5/i2c.c | 6 +- + drivers/nfc/s3fwrn5/uart.c | 4 +- + drivers/nfc/st-nci/i2c.c | 18 +- + drivers/nfc/st-nci/spi.c | 18 +- + drivers/nfc/st21nfca/i2c.c | 14 +- + drivers/nfc/st95hf/core.c | 14 +- + drivers/nfc/trf7970a.c | 14 +- + drivers/pci/controller/dwc/pcie-spacemit-k1.c | 3 - + drivers/ptp/Kconfig | 1 + + drivers/ptp/ptp_clock.c | 14 +- + drivers/ptp/ptp_fc3.c | 18 +- + drivers/s390/net/Makefile | 2 + + drivers/s390/net/ctcm_fsms.c | 20 +- + drivers/s390/net/ctcm_mpc.c | 6 +- + drivers/s390/net/fsm.h | 152 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 7 +- + drivers/usb/atm/cxacru.c | 10 +- + drivers/usb/atm/ueagle-atm.c | 3 +- + drivers/vhost/net.c | 21 +- + include/cxl/cxl.h | 2 + + include/cxl/pci.h | 22 + + include/linux/atmdev.h | 3 - + include/linux/fsl/ntmp.h | 2 + + include/linux/ieee80211-eht.h | 92 + + include/linux/ieee80211-uhr.h | 44 +- + include/linux/ieee80211.h | 12 + + include/linux/if_tun.h | 4 + + include/linux/mdio.h | 6 +- + include/linux/mlx5/driver.h | 8 +- + include/linux/mlx5/vport.h | 3 +- + include/linux/mmc/sdio_ids.h | 4 + + include/linux/net.h | 23 + + include/linux/net/intel/libie/controlq.h | 436 ++ + include/linux/net/intel/libie/pci.h | 56 + + include/linux/{avf => net/intel}/virtchnl.h | 0 + .../idpf => include/linux/net/intel}/virtchnl2.h | 0 + .../linux/net/intel}/virtchnl2_lan_desc.h | 0 + include/linux/netdevice.h | 52 +- + include/linux/netfilter.h | 7 + + include/linux/netfilter/nf_conntrack_amanda.h | 1 + + include/linux/netfilter/nf_conntrack_ftp.h | 1 + + include/linux/netfilter/nf_conntrack_h323.h | 2 - + include/linux/netfilter/nf_conntrack_irc.h | 1 + + include/linux/netfilter/nf_conntrack_pptp.h | 2 - + include/linux/netfilter/nf_conntrack_sane.h | 2 - + include/linux/netfilter/nf_conntrack_tftp.h | 3 +- + include/linux/netpoll.h | 23 +- + include/linux/oa_tc6.h | 73 +- + include/linux/pci_ids.h | 4 + + include/linux/pds/pds_core_if.h | 469 ++ + include/linux/phy.h | 9 + + include/linux/phylink.h | 1 + + include/linux/ptr_ring.h | 26 +- + include/linux/rfkill.h | 9 +- + include/linux/rtnetlink.h | 8 + + include/linux/skbuff.h | 1 + + include/linux/sonet.h | 20 - + include/linux/tcp.h | 2 +- + include/linux/udp.h | 27 + + include/linux/usb/mctp-usb.h | 88 +- + include/net/af_unix.h | 1 + + include/net/bluetooth/coredump.h | 14 + + include/net/bluetooth/hci.h | 64 + + include/net/bluetooth/hci_core.h | 33 +- + include/net/bluetooth/hci_sync.h | 5 +- + include/net/bluetooth/mgmt.h | 29 + + include/net/bond_3ad.h | 4 +- + include/net/bonding.h | 8 +- + include/net/cfg80211.h | 61 +- + include/net/devlink.h | 19 +- + include/net/dsa.h | 4 + + include/net/fib_rules.h | 4 +- + include/net/geneve.h | 5 - + include/net/gre.h | 2 - + include/net/ieee80211_radiotap.h | 190 + + include/net/ip6_fib.h | 5 +- + include/net/ip6_route.h | 2 + + include/net/ip_fib.h | 3 +- + include/net/ip_tunnels.h | 1 - + include/net/ip_vs.h | 4 +- + include/net/libeth/rx.h | 4 +- + include/net/mac80211.h | 27 +- + include/net/mana/gdma.h | 45 +- + include/net/mana/mana.h | 109 +- + include/net/mptcp.h | 4 - + include/net/ndisc.h | 2 + + include/net/net_namespace.h | 8 +- + include/net/net_shaper.h | 52 +- + include/net/netfilter/nf_conntrack_expect.h | 3 + + include/net/netfilter/nf_conntrack_helper.h | 11 +- + include/net/netfilter/nf_flow_table.h | 10 +- + include/net/netns/ipv4.h | 1 + + include/net/nexthop.h | 6 +- + include/net/scm.h | 13 +- + include/net/sctp/auth.h | 6 +- + include/net/udp.h | 2 +- + include/net/vxlan.h | 8 +- + include/trace/events/icmp.h | 2 +- + include/trace/events/mptcp.h | 6 +- + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/batadv_packet.h | 16 +- + include/uapi/linux/devlink.h | 2 + + include/uapi/linux/dpll.h | 8 + + include/uapi/linux/ethtool.h | 6 + + include/uapi/linux/if_addr.h | 1 + + include/uapi/linux/if_tun.h | 4 + + include/uapi/linux/mdio.h | 5 + + include/uapi/linux/netdev.h | 1 + + include/uapi/linux/nexthop.h | 3 + + include/uapi/linux/nl80211.h | 46 +- + include/uapi/linux/openvswitch.h | 31 +- + include/uapi/linux/rtnetlink.h | 25 + + include/uapi/linux/seg6_iptunnel.h | 1 + + kernel/irq/manage.c | 1 + + lib/tests/blackhole_dev_kunit.c | 2 +- + net/6lowpan/nhc_udp.c | 10 +- + net/atm/atm_misc.c | 79 - + net/batman-adv/bat_algo.c | 16 +- + net/batman-adv/bat_iv_ogm.c | 331 +- + net/batman-adv/bat_iv_ogm.h | 1 + + net/batman-adv/bat_v.c | 100 +- + net/batman-adv/bat_v.h | 5 + + net/batman-adv/bat_v_elp.c | 28 +- + net/batman-adv/bat_v_ogm.c | 67 +- + net/batman-adv/bitarray.c | 9 +- + net/batman-adv/bridge_loop_avoidance.c | 122 +- + net/batman-adv/distributed-arp-table.c | 239 +- + net/batman-adv/fragmentation.c | 35 +- + net/batman-adv/gateway_client.c | 48 +- + net/batman-adv/gateway_common.c | 6 +- + net/batman-adv/hard-interface.c | 259 +- + net/batman-adv/hard-interface.h | 10 +- + net/batman-adv/hash.c | 5 +- + net/batman-adv/hash.h | 42 +- + net/batman-adv/log.h | 16 +- + net/batman-adv/main.c | 113 +- + net/batman-adv/main.h | 3 - + net/batman-adv/mesh-interface.c | 126 +- + net/batman-adv/multicast.c | 43 +- + net/batman-adv/multicast_forw.c | 26 +- + net/batman-adv/netlink.c | 26 +- + net/batman-adv/netlink.h | 2 +- + net/batman-adv/originator.c | 68 +- + net/batman-adv/routing.c | 123 +- + net/batman-adv/send.c | 13 +- + net/batman-adv/tp_meter.c | 256 +- + net/batman-adv/translation-table.c | 385 +- + net/batman-adv/tvlv.c | 130 +- + net/batman-adv/types.h | 32 +- + net/bluetooth/6lowpan.c | 2 + + net/bluetooth/Kconfig | 2 +- + net/bluetooth/Makefile | 2 + + net/bluetooth/af_bluetooth.c | 7 +- + net/bluetooth/bnep/Kconfig | 2 +- + net/bluetooth/bnep/Makefile | 2 + + net/bluetooth/coredump.c | 54 +- + net/bluetooth/hci_conn.c | 20 +- + net/bluetooth/hci_core.c | 12 +- + net/bluetooth/hci_debugfs.c | 12 +- + net/bluetooth/hci_event.c | 122 +- + net/bluetooth/hci_sync.c | 267 +- + net/bluetooth/hidp/Kconfig | 2 +- + net/bluetooth/hidp/Makefile | 2 + + net/bluetooth/iso.c | 32 +- + net/bluetooth/l2cap_core.c | 32 +- + net/bluetooth/l2cap_sock.c | 1 + + net/bluetooth/mgmt.c | 169 +- + net/bluetooth/msft.c | 5 + + net/bluetooth/rfcomm/Kconfig | 2 +- + net/bluetooth/rfcomm/Makefile | 2 + + net/bluetooth/rfcomm/core.c | 24 +- + net/bluetooth/rfcomm/sock.c | 1 + + net/bluetooth/smp.c | 7 +- + net/bluetooth/smp.h | 6 +- + net/bridge/br_arp_nd_proxy.c | 55 +- + net/bridge/br_device.c | 4 +- + net/bridge/br_input.c | 4 +- + net/bridge/br_multicast.c | 105 +- + net/bridge/br_private.h | 6 +- + net/bridge/netfilter/ebtables.c | 12 +- + net/compat.c | 4 +- + net/core/dev.c | 281 +- + net/core/devmem.c | 37 +- + net/core/devmem.h | 13 +- + net/core/failover.c | 4 +- + net/core/fib_rules.c | 83 +- + net/core/lock_debug.c | 4 +- + net/core/net-sysfs.c | 2 +- + net/core/net_namespace.c | 4 + + net/core/netdev-genl-gen.c | 11 +- + net/core/netdev-genl-gen.h | 1 + + net/core/netdev-genl.c | 30 +- + net/core/netpoll.c | 259 +- + net/core/pktgen.c | 29 +- + net/core/rtnetlink.c | 96 +- + net/core/scm.c | 40 +- + net/core/selftests.c | 4 +- + net/core/skbuff.c | 16 +- + net/core/sysctl_net_core.c | 38 +- + net/core/tso.c | 3 +- + net/devlink/core.c | 20 +- + net/devlink/dev.c | 16 +- + net/devlink/devl_internal.h | 20 + + net/devlink/dpipe.c | 14 +- + net/devlink/health.c | 12 +- + net/devlink/linecard.c | 4 +- + net/devlink/netlink.c | 82 +- + net/devlink/netlink_gen.c | 24 +- + net/devlink/netlink_gen.h | 8 + + net/devlink/param.c | 9 +- + net/devlink/port.c | 26 +- + net/devlink/rate.c | 329 +- + net/devlink/region.c | 6 +- + net/devlink/resource.c | 14 +- + net/devlink/sb.c | 22 +- + net/devlink/trap.c | 12 +- + net/dns_resolver/dns_key.c | 3 +- + net/dns_resolver/dns_query.c | 2 +- + net/dsa/Kconfig | 6 + + net/dsa/Makefile | 1 + + net/dsa/dsa.c | 22 +- + net/dsa/tag_ksz.c | 237 +- + net/dsa/tag_mt7628.c | 93 + + net/dsa/user.c | 24 +- + net/ethtool/tsconfig.c | 12 +- + net/hsr/hsr_device.c | 44 +- + net/hsr/hsr_forward.c | 46 +- + net/hsr/hsr_framereg.c | 27 +- + net/hsr/hsr_framereg.h | 2 + + net/hsr/hsr_main.h | 2 +- + net/hsr/hsr_netlink.c | 8 +- + net/ieee802154/socket.c | 38 +- + net/ipv4/devinet.c | 10 +- + net/ipv4/esp4.c | 2 +- + net/ipv4/fib_frontend.c | 69 +- + net/ipv4/fib_rules.c | 20 +- + net/ipv4/fib_trie.c | 3 +- + net/ipv4/fou_core.c | 2 +- + net/ipv4/igmp.c | 2 + + net/ipv4/ip_gre.c | 89 +- + net/ipv4/ip_tunnel.c | 17 +- + net/ipv4/ipconfig.c | 6 +- + net/ipv4/ipip.c | 18 +- + net/ipv4/netfilter/nf_nat_snmp_basic_main.c | 6 +- + net/ipv4/netfilter/nf_reject_ipv4.c | 6 +- + net/ipv4/nexthop.c | 34 +- + net/ipv4/raw.c | 41 +- + net/ipv4/route.c | 35 +- + net/ipv4/sysctl_net_ipv4.c | 54 +- + net/ipv4/tcp_minisocks.c | 4 +- + net/ipv4/tcp_output.c | 8 +- + net/ipv4/tcp_timer.c | 2 +- + net/ipv4/udp.c | 52 +- + net/ipv4/udp_offload.c | 49 +- + net/ipv4/udp_tunnel_core.c | 2 +- + net/ipv4/xfrm4_policy.c | 22 +- + net/ipv6/Makefile | 2 +- + net/ipv6/addrconf.c | 28 +- + net/ipv6/esp6.c | 5 +- + net/ipv6/fib6_rules.c | 17 +- + net/ipv6/fou6.c | 2 +- + net/ipv6/icmp.c | 2 +- + net/ipv6/ip6_fib.c | 14 +- + net/ipv6/ip6_gre.c | 5 +- + net/ipv6/ip6_tunnel.c | 35 +- + net/ipv6/ip6_udp_tunnel.c | 2 +- + net/ipv6/mcast.c | 1 + + net/ipv6/ndisc.c | 5 +- + net/ipv6/ndisc_snoop.c | 190 + + net/ipv6/netfilter/nf_reject_ipv6.c | 8 +- + net/ipv6/raw.c | 29 +- + net/ipv6/route.c | 77 +- + net/ipv6/seg6_iptunnel.c | 132 +- + net/ipv6/sysctl_net_ipv6.c | 2 +- + net/ipv6/udp.c | 32 +- + net/ipv6/udp_offload.c | 2 +- + net/ipv6/xfrm6_policy.c | 22 +- + net/l2tp/l2tp_core.c | 2 +- + net/l2tp/l2tp_netlink.c | 7 +- + net/mac80211/airtime.c | 87 +- + net/mac80211/cfg.c | 141 +- + net/mac80211/chan.c | 6 +- + net/mac80211/debugfs.c | 32 +- + net/mac80211/ibss.c | 4 +- + net/mac80211/ieee80211_i.h | 26 +- + net/mac80211/link.c | 3 +- + net/mac80211/main.c | 5 +- + net/mac80211/mlme.c | 182 +- + net/mac80211/offchannel.c | 27 +- + net/mac80211/parse.c | 4 +- + net/mac80211/s1g.c | 2 +- + net/mac80211/spectmgmt.c | 11 +- + net/mac80211/sta_info.c | 66 +- + net/mac80211/sta_info.h | 3 +- + net/mac80211/status.c | 10 +- + net/mac80211/tdls.c | 2 +- + net/mac80211/tx.c | 111 +- + net/mac80211/util.c | 24 +- + net/mptcp/mib.c | 10 + + net/mptcp/mib.h | 10 + + net/mptcp/options.c | 32 +- + net/mptcp/pm.c | 44 +- + net/mptcp/pm_userspace.c | 7 +- + net/mptcp/protocol.c | 313 +- + net/mptcp/protocol.h | 16 +- + net/mptcp/subflow.c | 10 + + net/netfilter/ipvs/ip_vs_core.c | 9 +- + net/netfilter/ipvs/ip_vs_ctl.c | 6 +- + net/netfilter/ipvs/ip_vs_est.c | 2 +- + net/netfilter/ipvs/ip_vs_nfct.c | 2 +- + net/netfilter/ipvs/ip_vs_xmit.c | 2 +- + net/netfilter/nf_conncount.c | 2 + + net/netfilter/nf_conntrack_amanda.c | 8 +- + net/netfilter/nf_conntrack_broadcast.c | 8 +- + net/netfilter/nf_conntrack_core.c | 2 +- + net/netfilter/nf_conntrack_ecache.c | 7 +- + net/netfilter/nf_conntrack_expect.c | 11 + + net/netfilter/nf_conntrack_ftp.c | 34 +- + net/netfilter/nf_conntrack_h323_main.c | 12 +- + net/netfilter/nf_conntrack_helper.c | 91 +- + net/netfilter/nf_conntrack_irc.c | 29 +- + net/netfilter/nf_conntrack_netbios_ns.c | 2 - + net/netfilter/nf_conntrack_netlink.c | 5 + + net/netfilter/nf_conntrack_ovs.c | 6 +- + net/netfilter/nf_conntrack_pptp.c | 2 +- + net/netfilter/nf_conntrack_proto_tcp.c | 6 +- + net/netfilter/nf_conntrack_proto_udp.c | 15 +- + net/netfilter/nf_conntrack_sane.c | 34 +- + net/netfilter/nf_conntrack_sip.c | 45 +- + net/netfilter/nf_conntrack_snmp.c | 4 +- + net/netfilter/nf_conntrack_standalone.c | 2 +- + net/netfilter/nf_conntrack_tftp.c | 35 +- + net/netfilter/nf_flow_table_core.c | 2 + + net/netfilter/nf_flow_table_ip.c | 175 +- + net/netfilter/nf_flow_table_path.c | 118 +- + net/netfilter/nf_hooks_lwtunnel.c | 4 +- + net/netfilter/nf_log_syslog.c | 2 +- + net/netfilter/nf_nat_amanda.c | 7 +- + net/netfilter/nf_nat_core.c | 6 - + net/netfilter/nf_nat_ftp.c | 4 +- + net/netfilter/nf_nat_helper.c | 2 +- + net/netfilter/nf_nat_irc.c | 2 +- + net/netfilter/nf_nat_proto.c | 8 + + net/netfilter/nf_nat_sip.c | 5 + + net/netfilter/nf_nat_tftp.c | 5 +- + net/netfilter/nfnetlink_cthelper.c | 21 +- + net/netfilter/nfnetlink_cttimeout.c | 2 +- + net/netfilter/nfnetlink_hook.c | 37 +- + net/netfilter/nft_ct.c | 168 +- + net/netfilter/nft_meta.c | 6 +- + net/netfilter/nft_rt.c | 6 +- + net/netfilter/nft_set_rbtree.c | 3 +- + net/netfilter/nft_xfrm.c | 9 +- + net/netfilter/x_tables.c | 30 +- + net/netfilter/xt_TCPOPTSTRIP.c | 8 +- + net/netfilter/xt_dscp.c | 12 + + net/netfilter/xt_recent.c | 2 +- + net/netfilter/xt_tcpmss.c | 14 + + net/netlink/af_netlink.c | 2 +- + net/openvswitch/Kconfig | 35 - + net/openvswitch/Makefile | 4 - + net/openvswitch/conntrack.c | 12 +- + net/openvswitch/datapath.c | 28 +- + net/openvswitch/vport-geneve.c | 143 - + net/openvswitch/vport-gre.c | 106 - + net/openvswitch/vport-netdev.c | 29 +- + net/openvswitch/vport-netdev.h | 2 - + net/openvswitch/vport-vxlan.c | 172 - + net/openvswitch/vport.c | 81 +- + net/openvswitch/vport.h | 23 +- + net/phonet/pep.c | 36 +- + net/psp/psp_main.c | 2 +- + net/psp/psp_nl.c | 3 +- + net/psp/psp_sock.c | 2 +- + net/rds/ib_rdma.c | 4 +- + net/rds/info.c | 23 +- + net/rds/loop.c | 6 +- + net/rds/message.c | 26 + + net/rds/rdma.c | 63 +- + net/rds/rds.h | 15 +- + net/rds/recv.c | 3 + + net/rds/send.c | 33 +- + net/sched/act_csum.c | 4 +- + net/sched/act_ct.c | 10 +- + net/sched/cls_api.c | 18 +- + net/sched/sch_mqprio.c | 4 +- + net/sched/sch_mqprio_lib.c | 10 +- + net/sched/sch_taprio.c | 35 +- + net/sctp/associola.c | 4 + + net/sctp/auth.c | 10 +- + net/sctp/endpointola.c | 4 + + net/sctp/output.c | 12 +- + net/sctp/sm_statefuns.c | 9 +- + net/sctp/sysctl.c | 2 +- + net/smc/smc_sysctl.c | 26 +- + net/sysctl_net.c | 23 +- + net/tls/tls_main.c | 80 +- + net/unix/af_unix.c | 24 +- + net/unix/sysctl_net_unix.c | 21 +- + net/vmw_vsock/af_vsock.c | 25 +- + net/vmw_vsock/virtio_transport_common.c | 49 +- + net/wireless/core.c | 3 + + net/wireless/core.h | 7 +- + net/wireless/mlme.c | 2 +- + net/wireless/nl80211.c | 546 +- + net/wireless/rdev-ops.h | 24 +- + net/wireless/reg.c | 3 +- + net/wireless/scan.c | 93 +- + net/wireless/tests/scan.c | 121 +- + net/wireless/trace.h | 2 +- + net/wireless/util.c | 107 +- + net/wireless/wext-compat.c | 3 +- + net/wireless/wext-core.c | 6 +- + net/xdp/xsk_queue.c | 12 +- + net/xfrm/xfrm_nat_keepalive.c | 2 +- + net/xfrm/xfrm_sysctl.c | 2 +- + tools/include/uapi/linux/if_tun.h | 4 + + tools/include/uapi/linux/netdev.h | 1 + + tools/net/ynl/Makefile.deps | 1 + + tools/net/ynl/pyynl/__init__.py | 9 + + tools/net/ynl/pyynl/cli.py | 56 +- + tools/net/ynl/pyynl/lib/__init__.py | 3 +- + tools/net/ynl/pyynl/lib/nlspec.py | 22 +- + tools/net/ynl/pyynl/lib/specdir.py | 51 + + tools/net/ynl/pyynl/lib/ynl.py | 19 +- + tools/net/ynl/pyynl/ynl_gen_c.py | 35 +- + tools/net/ynl/tests/ethtool.py | 7 +- + tools/testing/selftests/bpf/prog_tests/test_xsk.c | 4 +- + .../drivers/net/bonding/bond_topo_2d1c.sh | 10 +- + tools/testing/selftests/drivers/net/config | 5 + + tools/testing/selftests/drivers/net/hw/Makefile | 6 +- + tools/testing/selftests/drivers/net/hw/config | 2 + + tools/testing/selftests/drivers/net/hw/csum.py | 2 +- + .../drivers/net/hw/devlink_rate_cross_esw.py | 296 + + tools/testing/selftests/drivers/net/hw/devmem.py | 11 +- + .../testing/selftests/drivers/net/hw/devmem_lib.py | 114 +- + .../selftests/drivers/net/hw/ethtool_rmon.sh | 2 + + .../selftests/drivers/net/hw/ethtool_std_stats.sh | 6 +- + tools/testing/selftests/drivers/net/hw/ncdevmem.c | 38 +- + .../testing/selftests/drivers/net/hw/nk_devmem.py | 10 +- + tools/testing/selftests/drivers/net/hw/rss_ctx.py | 11 +- + tools/testing/selftests/drivers/net/hw/toeplitz.py | 22 + + tools/testing/selftests/drivers/net/hw/tso.py | 2 +- + tools/testing/selftests/drivers/net/lib/py/env.py | 59 +- + .../selftests/drivers/net/netconsole/Makefile | 1 + + .../drivers/net/netconsole/netcons_userdata.sh | 229 + + .../drivers/net/netdevsim/ethtool-coalesce.sh | 10 +- + .../testing/selftests/drivers/net/ring_reconfig.py | 255 +- + tools/testing/selftests/drivers/net/shaper.py | 1065 ++- + tools/testing/selftests/drivers/net/so_txtime.py | 21 +- + tools/testing/selftests/drivers/net/xdp.py | 94 +- + tools/testing/selftests/net/Makefile | 5 +- + tools/testing/selftests/net/af_unix/.gitignore | 2 + + tools/testing/selftests/net/af_unix/Makefile | 8 + + tools/testing/selftests/net/af_unix/config | 7 + + .../net/af_unix/scm_rights_denial_lsm.bpf.c | 36 + + .../selftests/net/af_unix/scm_rights_denial_lsm.c | 292 + + tools/testing/selftests/net/big_tcp_tunnels.sh | 188 + + tools/testing/selftests/net/config | 6 +- + tools/testing/selftests/net/fib_nexthops.sh | 83 + + tools/testing/selftests/net/fin_ack_lat.c | 2 +- + tools/testing/selftests/net/forwarding/lib.sh | 15 + + tools/testing/selftests/net/fou_mcast_encap.sh | 172 + + tools/testing/selftests/net/getsockopt_iter.c | 336 + + tools/testing/selftests/net/hsr/Makefile | 1 + + tools/testing/selftests/net/hsr/hsr_prp_redbox.sh | 99 + + tools/testing/selftests/net/ipv6_flowlabel.sh | 3 - + tools/testing/selftests/net/ipv6_flowlabel_mgr.c | 576 +- + tools/testing/selftests/net/lib/py/__init__.py | 4 +- + tools/testing/selftests/net/lib/py/ynl.py | 7 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 +- + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 8 +- + tools/testing/selftests/net/mptcp/mptcp_diag.c | 3 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 95 +- + tools/testing/selftests/net/mptcp/simult_flows.sh | 11 +- + .../selftests/net/netfilter/conntrack_dump_flush.c | 31 +- + tools/testing/selftests/net/openvswitch/config | 4 +- + .../selftests/net/openvswitch/openvswitch.sh | 296 +- + .../testing/selftests/net/openvswitch/ovs-dpctl.py | 122 +- + tools/testing/selftests/net/psock_snd.c | 237 +- + tools/testing/selftests/net/psock_snd.sh | 15 + + tools/testing/selftests/net/reuseport_bpf_numa.c | 24 + + tools/testing/selftests/net/rtnetlink.py | 286 +- + .../selftests/net/srv6_encap_lookup_l3vpn_test.sh | 1027 +++ + .../selftests/net/srv6_end_dt46_l3vpn_test.sh | 10 + + tools/testing/selftests/net/tcp_mmap.c | 10 +- + tools/testing/selftests/net/test_vxlan_nh.sh | 40 +- + .../tc-testing/tc-tests/infra/qdiscs.json | 164 + + 1387 files changed, 110662 insertions(+), 28564 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-drivers-btintel_pcie + create mode 100644 Documentation/devicetree/bindings/net/adi,ad3306.yaml + create mode 100644 Documentation/devicetree/bindings/net/can/ti,am3517-hecc.yaml + delete mode 100644 Documentation/devicetree/bindings/net/can/ti_hecc.txt + create mode 100644 Documentation/devicetree/bindings/net/dptel,dap8211r.yaml + create mode 100644 Documentation/devicetree/bindings/net/dsa/mediatek,mt7628-esw.yaml + create mode 100644 Documentation/devicetree/bindings/net/microchip,lan7800.yaml + delete mode 100644 Documentation/devicetree/bindings/net/microchip,lan78xx.txt + create mode 100644 Documentation/devicetree/bindings/net/pse-pd/realtek,pse-mcu-gen1.yaml + create mode 100644 Documentation/networking/device_drivers/ethernet/intel/ixd.rst + create mode 100644 Documentation/networking/devlink/ixd.rst + create mode 100644 drivers/net/dsa/mt7628.c + create mode 100644 drivers/net/ethernet/adi/adin1140.c + create mode 100644 drivers/net/ethernet/cisco/enic/enic_admin.c + create mode 100644 drivers/net/ethernet/cisco/enic/enic_admin.h + create mode 100644 drivers/net/ethernet/cisco/enic/enic_mbox.c + create mode 100644 drivers/net/ethernet/cisco/enic/enic_mbox.h + delete mode 100644 drivers/net/ethernet/dec/tulip/xircom_cb.c + delete mode 100644 drivers/net/ethernet/ibm/ehea/Makefile + delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea.h + delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_ethtool.c + delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_hw.h + delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_main.c + delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_phyp.c + delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_phyp.h + delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_qmr.c + delete mode 100644 drivers/net/ethernet/ibm/ehea/ehea_qmr.h + delete mode 100644 drivers/net/ethernet/intel/idpf/idpf_controlq.c + delete mode 100644 drivers/net/ethernet/intel/idpf/idpf_controlq.h + delete mode 100644 drivers/net/ethernet/intel/idpf/idpf_controlq_api.h + delete mode 100644 drivers/net/ethernet/intel/idpf/idpf_controlq_setup.c + delete mode 100644 drivers/net/ethernet/intel/idpf/idpf_mem.h + create mode 100644 drivers/net/ethernet/intel/ixd/Kconfig + create mode 100644 drivers/net/ethernet/intel/ixd/Makefile + create mode 100644 drivers/net/ethernet/intel/ixd/ixd.h + create mode 100644 drivers/net/ethernet/intel/ixd/ixd_ctlq.c + create mode 100644 drivers/net/ethernet/intel/ixd/ixd_ctlq.h + create mode 100644 drivers/net/ethernet/intel/ixd/ixd_dev.c + create mode 100644 drivers/net/ethernet/intel/ixd/ixd_devlink.c + create mode 100644 drivers/net/ethernet/intel/ixd/ixd_devlink.h + create mode 100644 drivers/net/ethernet/intel/ixd/ixd_lan_regs.h + create mode 100644 drivers/net/ethernet/intel/ixd/ixd_lib.c + create mode 100644 drivers/net/ethernet/intel/ixd/ixd_main.c + create mode 100644 drivers/net/ethernet/intel/ixd/ixd_virtchnl.c + create mode 100644 drivers/net/ethernet/intel/ixd/ixd_virtchnl.h + create mode 100644 drivers/net/ethernet/intel/libie/controlq.c + create mode 100644 drivers/net/ethernet/intel/libie/pci.c + create mode 100644 drivers/net/ethernet/sfc/efx_cxl.c + create mode 100644 drivers/net/ethernet/sfc/efx_cxl.h + create mode 100644 drivers/net/ethernet/wangxun/libwx/wx_err.c + create mode 100644 drivers/net/ethernet/wangxun/libwx/wx_err.h + create mode 100644 drivers/net/ethernet/zte/Kconfig + create mode 100644 drivers/net/ethernet/zte/Makefile + create mode 100644 drivers/net/ethernet/zte/dinghai/Kconfig + create mode 100644 drivers/net/ethernet/zte/dinghai/Makefile + create mode 100644 drivers/net/ethernet/zte/dinghai/dh_queue.h + create mode 100644 drivers/net/ethernet/zte/dinghai/en_pf.c + create mode 100644 drivers/net/ethernet/zte/dinghai/en_pf.h + create mode 100644 drivers/net/mctp/mctp-usblib-test.c + create mode 100644 drivers/net/mctp/mctp-usblib.c + create mode 100644 drivers/net/phy/adin1140-phy.c + create mode 100644 drivers/net/phy/dap8211r.c + create mode 100644 drivers/net/phy/mediatek/mtk-fe-soc.c + create mode 100644 drivers/net/pse-pd/realtek-pse-mcu-core.c + create mode 100644 drivers/net/pse-pd/realtek-pse-mcu-i2c.c + create mode 100644 drivers/net/pse-pd/realtek-pse-mcu-uart.c + create mode 100644 drivers/net/pse-pd/realtek-pse-mcu.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/nan.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/nan.h + create mode 100644 drivers/net/wireless/morsemicro/Kconfig + create mode 100644 drivers/net/wireless/morsemicro/Makefile + create mode 100644 drivers/net/wireless/morsemicro/mm81x/Kconfig + create mode 100644 drivers/net/wireless/morsemicro/mm81x/Makefile + create mode 100644 drivers/net/wireless/morsemicro/mm81x/bus.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/command.c + create mode 100644 drivers/net/wireless/morsemicro/mm81x/command.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/command_defs.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/core.c + create mode 100644 drivers/net/wireless/morsemicro/mm81x/core.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/fw.c + create mode 100644 drivers/net/wireless/morsemicro/mm81x/fw.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/hif.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/hw.c + create mode 100644 drivers/net/wireless/morsemicro/mm81x/hw.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/mac.c + create mode 100644 drivers/net/wireless/morsemicro/mm81x/mac.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/mmrc.c + create mode 100644 drivers/net/wireless/morsemicro/mm81x/mmrc.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/ps.c + create mode 100644 drivers/net/wireless/morsemicro/mm81x/ps.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/rate_code.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/rc.c + create mode 100644 drivers/net/wireless/morsemicro/mm81x/rc.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/sdio.c + create mode 100644 drivers/net/wireless/morsemicro/mm81x/skbq.c + create mode 100644 drivers/net/wireless/morsemicro/mm81x/skbq.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/usb.c + create mode 100644 drivers/net/wireless/morsemicro/mm81x/yaps.c + create mode 100644 drivers/net/wireless/morsemicro/mm81x/yaps.h + create mode 100644 drivers/net/wireless/morsemicro/mm81x/yaps_hw.c + create mode 100644 drivers/net/wireless/morsemicro/mm81x/yaps_hw.h + create mode 100644 drivers/net/wireless/nxp/Kconfig + create mode 100644 drivers/net/wireless/nxp/Makefile + create mode 100644 drivers/net/wireless/nxp/nxpwifi/11ac.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/11ac.h + create mode 100644 drivers/net/wireless/nxp/nxpwifi/11ax.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/11ax.h + create mode 100644 drivers/net/wireless/nxp/nxpwifi/11h.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/11n.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/11n.h + create mode 100644 drivers/net/wireless/nxp/nxpwifi/11n_aggr.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/11n_aggr.h + create mode 100644 drivers/net/wireless/nxp/nxpwifi/11n_rxreorder.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/11n_rxreorder.h + create mode 100644 drivers/net/wireless/nxp/nxpwifi/Kconfig + create mode 100644 drivers/net/wireless/nxp/nxpwifi/Makefile + create mode 100644 drivers/net/wireless/nxp/nxpwifi/cfg.h + create mode 100644 drivers/net/wireless/nxp/nxpwifi/cfg80211.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/cfg80211.h + create mode 100644 drivers/net/wireless/nxp/nxpwifi/cfp.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/cmdevt.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/cmdevt.h + create mode 100644 drivers/net/wireless/nxp/nxpwifi/debugfs.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/ethtool.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/fw.h + create mode 100644 drivers/net/wireless/nxp/nxpwifi/ie.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/init.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/join.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/main.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/main.h + create mode 100644 drivers/net/wireless/nxp/nxpwifi/scan.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/sdio.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/sdio.h + create mode 100644 drivers/net/wireless/nxp/nxpwifi/sta_cfg.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/sta_cmd.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/sta_event.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/sta_rx.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/sta_tx.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/txrx.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/uap_cmd.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/uap_event.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/uap_txrx.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/util.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/util.h + create mode 100644 drivers/net/wireless/nxp/nxpwifi/wmm.c + create mode 100644 drivers/net/wireless/nxp/nxpwifi/wmm.h + create mode 100644 drivers/net/wireless/realtek/rtw89/led.c + create mode 100644 drivers/net/wireless/realtek/rtw89/led.h + create mode 100644 drivers/net/wireless/realtek/rtw89/led_mc.c + create mode 100644 include/cxl/pci.h + create mode 100644 include/linux/net/intel/libie/controlq.h + create mode 100644 include/linux/net/intel/libie/pci.h + rename include/linux/{avf => net/intel}/virtchnl.h (100%) + rename {drivers/net/ethernet/intel/idpf => include/linux/net/intel}/virtchnl2.h (100%) + rename {drivers/net/ethernet/intel/idpf => include/linux/net/intel}/virtchnl2_lan_desc.h (100%) + delete mode 100644 include/linux/sonet.h + create mode 100644 net/dsa/tag_mt7628.c + create mode 100644 net/ipv6/ndisc_snoop.c + delete mode 100644 net/openvswitch/vport-geneve.c + delete mode 100644 net/openvswitch/vport-gre.c + delete mode 100644 net/openvswitch/vport-vxlan.c + create mode 100644 tools/net/ynl/pyynl/lib/specdir.py + create mode 100755 tools/testing/selftests/drivers/net/hw/devlink_rate_cross_esw.py + create mode 100755 tools/testing/selftests/drivers/net/netconsole/netcons_userdata.sh + create mode 100644 tools/testing/selftests/net/af_unix/scm_rights_denial_lsm.bpf.c + create mode 100644 tools/testing/selftests/net/af_unix/scm_rights_denial_lsm.c + create mode 100755 tools/testing/selftests/net/big_tcp_tunnels.sh + create mode 100755 tools/testing/selftests/net/fou_mcast_encap.sh + create mode 100755 tools/testing/selftests/net/hsr/hsr_prp_redbox.sh + create mode 100755 tools/testing/selftests/net/srv6_encap_lookup_l3vpn_test.sh +Merging bpf-next/for-next (f79066c784022 selftests/bpf: Add tests for a store on a fault prone qdisc pointer) +$ 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 MAINTAINERS +Auto-merging arch/s390/net/bpf_jit_comp.c +Auto-merging include/linux/btf.h +Auto-merging kernel/bpf/btf.c +Auto-merging net/socket.c +Auto-merging net/unix/af_unix.c +Auto-merging tools/bpf/resolve_btfids/Makefile +Auto-merging tools/lib/bpf/features.c +Auto-merging tools/lib/bpf/usdt.c +Auto-merging tools/testing/selftests/bpf/Makefile +Auto-merging tools/testing/selftests/bpf/bench.c +Auto-merging tools/testing/selftests/bpf/bpf_experimental.h +Merge made by the 'ort' strategy. + Documentation/bpf/bpf_devel_QA.rst | 5 +- + Documentation/bpf/index.rst | 1 + + Documentation/bpf/kfuncs.rst | 99 +- + Documentation/bpf/signing.rst | 497 +++ + Documentation/process/changes.rst | 5 - + MAINTAINERS | 6 +- + arch/arm64/include/asm/insn.h | 23 + + arch/arm64/lib/insn.c | 60 + + arch/arm64/net/bpf_jit.h | 11 + + arch/arm64/net/bpf_jit_comp.c | 229 +- + arch/riscv/net/Makefile | 2 +- + arch/riscv/net/bpf_jit.h | 1 + + arch/riscv/net/bpf_jit_comp32.c | 111 +- + arch/riscv/net/bpf_jit_comp64.c | 158 +- + arch/riscv/net/bpf_jit_core.c | 5 +- + arch/riscv/net/bpf_timed_may_goto.S | 47 + + arch/s390/net/bpf_jit_comp.c | 213 +- + arch/x86/mm/init.c | 4 +- + arch/x86/net/bpf_jit_comp.c | 178 +- + drivers/hid/bpf/hid_bpf_dispatch.c | 10 +- + include/linux/bpf.h | 123 +- + include/linux/bpf_ksock.h | 36 + + include/linux/bpf_verifier.h | 173 +- + include/linux/btf.h | 2 + + include/linux/filter.h | 70 +- + include/linux/socket.h | 2 + + include/uapi/linux/bpf.h | 117 +- + kernel/bpf/Makefile | 2 +- + kernel/bpf/arena.c | 43 +- + kernel/bpf/arraymap.c | 72 +- + kernel/bpf/backtrack.c | 5 +- + kernel/bpf/bloom_filter.c | 19 +- + kernel/bpf/bpf_iter.c | 17 +- + kernel/bpf/bpf_lsm.c | 5 +- + kernel/bpf/bpf_struct_ops.c | 68 +- + kernel/bpf/btf.c | 100 +- + kernel/bpf/cfg.c | 38 +- + kernel/bpf/cgroup.c | 35 +- + kernel/bpf/check_btf.c | 14 +- + kernel/bpf/const_fold.c | 12 +- + kernel/bpf/core.c | 95 +- + kernel/bpf/cpumask.c | 6 +- + kernel/bpf/diagnostics.c | 2359 +++++++++++++ + kernel/bpf/diagnostics.h | 111 + + kernel/bpf/disasm.c | 68 +- + kernel/bpf/dispatcher.c | 5 +- + kernel/bpf/fixups.c | 254 +- + kernel/bpf/hashtab.c | 2 - + kernel/bpf/helpers.c | 116 +- + kernel/bpf/liveness.c | 120 +- + kernel/bpf/log.c | 11 - + kernel/bpf/mmap_unlock_work.h | 51 +- + kernel/bpf/net_namespace.c | 17 +- + kernel/bpf/queue_stack_maps.c | 9 +- + kernel/bpf/ringbuf.c | 6 +- + kernel/bpf/rqspinlock.c | 8 +- + kernel/bpf/stackmap.c | 351 +- + kernel/bpf/states.c | 3 +- + kernel/bpf/syscall.c | 142 +- + kernel/bpf/task_iter.c | 48 +- + kernel/bpf/trampoline.c | 73 +- + kernel/bpf/verifier.c | 3551 +++++++++++++------- + kernel/trace/bpf_trace.c | 119 +- + net/core/Makefile | 3 + + net/core/bpf_ksock.c | 328 ++ + net/core/filter.c | 508 ++- + net/core/lwt_bpf.c | 15 +- + net/core/sock_map.c | 8 +- + net/ipv4/tcp_ipv4.c | 4 +- + net/socket.c | 32 +- + net/unix/af_unix.c | 4 +- + scripts/Makefile.btf | 4 +- + tools/bpf/bpftool/Makefile | 2 +- + tools/bpf/bpftool/btf.c | 13 +- + tools/bpf/bpftool/btf_dumper.c | 14 +- + tools/bpf/bpftool/common.c | 4 + + tools/bpf/bpftool/gen.c | 55 +- + tools/bpf/bpftool/link.c | 133 + + tools/bpf/bpftool/map.c | 16 +- + tools/bpf/bpftool/sign.c | 24 +- + tools/bpf/bpftool/struct_ops.c | 4 + + tools/bpf/bpftool/xlated_dumper.c | 19 +- + tools/bpf/resolve_btfids/Makefile | 5 +- + tools/bpf/resolve_btfids/main.c | 478 ++- + tools/include/linux/btf_ids.h | 78 +- + tools/include/uapi/linux/bpf.h | 117 +- + tools/lib/bpf/bpf_gen_internal.h | 4 +- + tools/lib/bpf/btf.c | 20 +- + tools/lib/bpf/btf.h | 2 + + tools/lib/bpf/btf_dump.c | 4 +- + tools/lib/bpf/btf_relocate.c | 8 +- + tools/lib/bpf/elf.c | 2 +- + tools/lib/bpf/features.c | 35 + + tools/lib/bpf/gen_loader.c | 95 +- + tools/lib/bpf/libbpf.c | 183 +- + tools/lib/bpf/libbpf.map | 1 + + tools/lib/bpf/libbpf_internal.h | 5 +- + tools/lib/bpf/nlattr.c | 2 +- + tools/lib/bpf/relo_core.c | 22 +- + tools/lib/bpf/ringbuf.c | 2 +- + tools/lib/bpf/skel_internal.h | 55 +- + tools/lib/bpf/usdt.c | 33 +- + tools/sched_ext/include/scx/compat.bpf.h | 2 +- + tools/testing/selftests/bpf/DENYLIST.riscv64 | 1 - + tools/testing/selftests/bpf/Makefile | 32 +- + tools/testing/selftests/bpf/README.rst | 4 +- + tools/testing/selftests/bpf/bench.c | 4 + + tools/testing/selftests/bpf/benchs/bench_bpf_for.c | 104 + + .../selftests/bpf/benchs/run_bench_bpf_for.sh | 15 + + tools/testing/selftests/bpf/bpf_experimental.h | 7 + + tools/testing/selftests/bpf/config.aarch64 | 1 - + tools/testing/selftests/bpf/config.ppc64el | 1 - + tools/testing/selftests/bpf/config.riscv64 | 1 - + tools/testing/selftests/bpf/config.s390x | 1 - + tools/testing/selftests/bpf/config.x86_64 | 1 - + tools/testing/selftests/bpf/disasm_helpers.c | 3 +- + .../bpf/libarena/include/bpf_arena_spin_lock.h | 7 +- + .../selftests/bpf/libarena/include/bpf_atomic.h | 20 + + .../bpf/libarena/include/libarena/bitmap.h | 34 + + .../bpf/libarena/include/libarena/common.h | 2 +- + .../bpf/libarena/include/libarena/userspace.h | 2 +- + .../{st_asan_buddy.bpf.c => test_asan_buddy.bpf.c} | 10 +- + .../{st_asan_common.h => test_asan_common.h} | 0 + .../bpf/libarena/selftests/test_bitmap.bpf.c | 394 +++ + .../selftests/{st_buddy.bpf.c => test_buddy.bpf.c} | 8 +- + .../libarena/selftests/test_parallel_bitmap.bpf.c | 190 ++ + .../libarena/selftests/test_parallel_spmc.bpf.c | 9 +- + .../selftests/bpf/libarena/src/bitmap.bpf.c | 245 ++ + .../selftests/bpf/libarena/src/common.bpf.c | 16 +- + tools/testing/selftests/bpf/network_helpers.c | 28 +- + tools/testing/selftests/bpf/network_helpers.h | 5 + + .../selftests/bpf/prog_tests/arena_atomics.c | 2 +- + .../selftests/bpf/prog_tests/arena_direct_value.c | 2 +- + .../testing/selftests/bpf/prog_tests/arena_htab.c | 2 +- + .../testing/selftests/bpf/prog_tests/arena_list.c | 2 +- + .../selftests/bpf/prog_tests/arena_mem_usage.c | 122 + + .../selftests/bpf/prog_tests/arena_spin_lock.c | 2 +- + .../selftests/bpf/prog_tests/arena_strsearch.c | 2 +- + tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c | 2 + + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 12 + + tools/testing/selftests/bpf/prog_tests/btf.c | 48 + + .../selftests/bpf/prog_tests/cgroup_iter_memcg.c | 43 + + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 71 +- + .../testing/selftests/bpf/prog_tests/fib_lookup.c | 741 +++- + .../selftests/bpf/prog_tests/fill_link_info.c | 242 ++ + .../bpf/prog_tests/get_smp_processor_id.c | 45 + + .../selftests/bpf/prog_tests/global_data_init.c | 336 ++ + .../selftests/bpf/prog_tests/global_map_resize.c | 8 +- + .../selftests/bpf/prog_tests/icmp_send_kfunc.c | 292 ++ + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 4 + + tools/testing/selftests/bpf/prog_tests/ksock.c | 130 + + tools/testing/selftests/bpf/prog_tests/ksock_wq.c | 45 + + tools/testing/selftests/bpf/prog_tests/libarena.c | 28 +- + .../selftests/bpf/prog_tests/libarena_asan.c | 10 +- + .../testing/selftests/bpf/prog_tests/linked_list.c | 1 + + tools/testing/selftests/bpf/prog_tests/lsm_bdev.c | 3 +- + .../selftests/bpf/prog_tests/lwt_ip_encap.c | 11 +- + tools/testing/selftests/bpf/prog_tests/mptcp.c | 13 +- + .../selftests/bpf/prog_tests/rcu_read_lock.c | 2 + + .../selftests/bpf/prog_tests/res_spin_lock.c | 20 + + .../selftests/bpf/prog_tests/resolve_btfids.c | 282 +- + tools/testing/selftests/bpf/prog_tests/sha256.c | 4 +- + .../selftests/bpf/prog_tests/signed_loader.c | 1083 ++++-- + .../selftests/bpf/prog_tests/sockmap_basic.c | 52 - + tools/testing/selftests/bpf/prog_tests/sockopt.c | 22 + + tools/testing/selftests/bpf/prog_tests/stream.c | 6 + + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 55 + + .../testing/selftests/bpf/prog_tests/task_kfunc.c | 8 + + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 68 + + .../selftests/bpf/prog_tests/test_map_uninit.c | 68 + + .../bpf/prog_tests/test_struct_ops_arena.c | 128 + + .../selftests/bpf/prog_tests/test_tc_tunnel.c | 1 - + .../selftests/bpf/prog_tests/test_veristat.c | 113 +- + .../selftests/bpf/prog_tests/tracing_failure.c | 20 + + .../selftests/bpf/prog_tests/tracing_multi.c | 69 + + .../selftests/bpf/prog_tests/tracing_struct.c | 36 + + tools/testing/selftests/bpf/prog_tests/verifier.c | 16 + + tools/testing/selftests/bpf/progs/arena_atomics.c | 18 +- + tools/testing/selftests/bpf/progs/arena_kfunc.c | 243 ++ + .../testing/selftests/bpf/progs/arena_kfunc_jit.c | 118 + + .../testing/selftests/bpf/progs/arena_mem_usage.c | 40 + + .../testing/selftests/bpf/progs/arena_spin_lock.c | 7 + + tools/testing/selftests/bpf/progs/bpf_for_bench.c | 32 + + tools/testing/selftests/bpf/progs/bpf_misc.h | 9 +- + .../bpf/progs/bpf_qdisc_fail__untrusted_write.c | 65 + + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 5 + + tools/testing/selftests/bpf/progs/btf_data.c | 40 + + .../selftests/bpf/progs/cgrp_kfunc_failure.c | 2 +- + tools/testing/selftests/bpf/progs/cpumask_common.h | 2 +- + .../testing/selftests/bpf/progs/cpumask_failure.c | 31 +- + .../testing/selftests/bpf/progs/cpumask_success.c | 6 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 8 +- + .../testing/selftests/bpf/progs/fentry_sleepable.c | 18 + + tools/testing/selftests/bpf/progs/fib_lookup.c | 57 + + .../selftests/bpf/progs/freplace_cls_redirect.c | 34 - + .../selftests/bpf/progs/get_smp_processor_id.c | 20 + + tools/testing/selftests/bpf/progs/icmp_send.c | 123 + + tools/testing/selftests/bpf/progs/iters.c | 83 + + .../selftests/bpf/progs/iters_task_failure.c | 46 + + .../testing/selftests/bpf/progs/kfunc_call_fail.c | 72 + + .../testing/selftests/bpf/progs/kfunc_call_test.c | 12 + + tools/testing/selftests/bpf/progs/ksock_common.h | 78 + + tools/testing/selftests/bpf/progs/ksock_lsm.c | 72 + + .../selftests/bpf/progs/ksock_lsm_verifier.c | 35 + + tools/testing/selftests/bpf/progs/ksock_wq.c | 62 + + .../testing/selftests/bpf/progs/linked_list_fail.c | 23 + + tools/testing/selftests/bpf/progs/map_kptr.c | 12 + + tools/testing/selftests/bpf/progs/map_kptr_fail.c | 9 + + .../selftests/bpf/progs/mem_rdonly_untrusted.c | 236 +- + tools/testing/selftests/bpf/progs/mptcpify.c | 2 +- + tools/testing/selftests/bpf/progs/pyperf.h | 12 +- + tools/testing/selftests/bpf/progs/rcu_read_lock.c | 76 + + .../selftests/bpf/progs/refcounted_kptr_fail.c | 9 + + tools/testing/selftests/bpf/progs/setget_sockopt.c | 2 + + .../selftests/bpf/progs/sockmap_verdict_prog.c | 14 +- + tools/testing/selftests/bpf/progs/stream.c | 147 + + .../testing/selftests/bpf/progs/struct_ops_arena.c | 139 + + .../selftests/bpf/progs/struct_ops_arena_attach.c | 25 + + .../selftests/bpf/progs/struct_ops_arena_fail.c | 20 + + .../selftests/bpf/progs/tailcall_callback.c | 81 + + .../selftests/bpf/progs/task_kfunc_common.h | 14 + + .../selftests/bpf/progs/task_kfunc_failure.c | 75 +- + .../selftests/bpf/progs/task_kfunc_success.c | 195 ++ + .../bpf/progs/tcp_ca_untrusted_btf_write.c | 26 + + .../selftests/bpf/progs/test_fill_link_info.c | 6 + + .../selftests/bpf/progs/test_global_percpu_data.c | 89 + + .../selftests/bpf/progs/test_signed_loader.c | 9 +- + .../selftests/bpf/progs/test_sockmap_update.c | 48 - + tools/testing/selftests/bpf/progs/test_tc_peer.c | 22 + + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 91 +- + .../testing/selftests/bpf/progs/tracing_failure.c | 6 + + .../bpf/progs/tracing_multi_intersect_attach.c | 8 + + .../selftests/bpf/progs/tracing_struct_int128.c | 18 + + tools/testing/selftests/bpf/progs/verifier_arena.c | 72 +- + .../selftests/bpf/progs/verifier_basic_stack.c | 6 +- + .../testing/selftests/bpf/progs/verifier_bounds.c | 2 +- + .../selftests/bpf/progs/verifier_bpf_fastcall.c | 32 +- + .../selftests/bpf/progs/verifier_global_subprogs.c | 10 +- + tools/testing/selftests/bpf/progs/verifier_gotox.c | 25 + + .../bpf/progs/verifier_helper_access_var_len.c | 6 +- + .../bpf/progs/verifier_helper_value_access.c | 2 +- + .../selftests/bpf/progs/verifier_load_acquire.c | 44 + + .../selftests/bpf/progs/verifier_map_in_map.c | 3 +- + .../bpf/progs/verifier_map_lookup_refine.c | 73 + + .../testing/selftests/bpf/progs/verifier_map_ptr.c | 23 +- + .../selftests/bpf/progs/verifier_may_goto_1.c | 67 + + .../selftests/bpf/progs/verifier_mem_size_reg.c | 28 + + .../selftests/bpf/progs/verifier_percpu_addr.c | 72 + + .../selftests/bpf/progs/verifier_private_stack.c | 15 +- + .../selftests/bpf/progs/verifier_scalar_ids.c | 56 + + .../selftests/bpf/progs/verifier_sockmap_mutate.c | 12 +- + .../selftests/bpf/progs/verifier_spill_fill.c | 68 + + .../bpf/progs/verifier_subprog_insn_stats.c | 223 ++ + .../testing/selftests/bpf/progs/verifier_uninit.c | 1 + + .../testing/selftests/bpf/progs/verifier_unpriv.c | 18 + + .../testing/selftests/bpf/progs/verifier_var_off.c | 116 +- + .../selftests/bpf/progs/verifier_vfs_reject.c | 6 +- + tools/testing/selftests/bpf/progs/verifier_zext.c | 392 +++ + tools/testing/selftests/bpf/progs/veristat_bar.c | 3 + + tools/testing/selftests/bpf/progs/veristat_foo.c | 31 + + tools/testing/selftests/bpf/progs/xdp_dummy.c | 6 + + .../testing/selftests/bpf/test_kmods/bpf_testmod.c | 131 +- + .../testing/selftests/bpf/test_kmods/bpf_testmod.h | 14 + + .../selftests/bpf/test_kmods/bpf_testmod_kfunc.h | 13 + + tools/testing/selftests/bpf/test_loader.c | 2 +- + tools/testing/selftests/bpf/test_progs.c | 91 +- + tools/testing/selftests/bpf/test_progs.h | 3 +- + tools/testing/selftests/bpf/test_sockmap.c | 3 +- + tools/testing/selftests/bpf/test_verifier.c | 2 +- + tools/testing/selftests/bpf/verifier/calls.c | 18 +- + tools/testing/selftests/bpf/veristat.c | 122 +- + tools/testing/selftests/bpf/vmtest.sh | 13 +- + 272 files changed, 19015 insertions(+), 3464 deletions(-) + create mode 100644 Documentation/bpf/signing.rst + create mode 100644 arch/riscv/net/bpf_timed_may_goto.S + create mode 100644 include/linux/bpf_ksock.h + create mode 100644 kernel/bpf/diagnostics.c + create mode 100644 kernel/bpf/diagnostics.h + create mode 100644 net/core/bpf_ksock.c + create mode 100644 tools/testing/selftests/bpf/benchs/bench_bpf_for.c + create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_bpf_for.sh + create mode 100644 tools/testing/selftests/bpf/libarena/include/libarena/bitmap.h + rename tools/testing/selftests/bpf/libarena/selftests/{st_asan_buddy.bpf.c => test_asan_buddy.bpf.c} (98%) + rename tools/testing/selftests/bpf/libarena/selftests/{st_asan_common.h => test_asan_common.h} (100%) + create mode 100644 tools/testing/selftests/bpf/libarena/selftests/test_bitmap.bpf.c + rename tools/testing/selftests/bpf/libarena/selftests/{st_buddy.bpf.c => test_buddy.bpf.c} (97%) + create mode 100644 tools/testing/selftests/bpf/libarena/selftests/test_parallel_bitmap.bpf.c + create mode 100644 tools/testing/selftests/bpf/libarena/src/bitmap.bpf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/arena_mem_usage.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/get_smp_processor_id.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/icmp_send_kfunc.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ksock.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ksock_wq.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_map_uninit.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_arena.c + create mode 100644 tools/testing/selftests/bpf/progs/arena_kfunc.c + create mode 100644 tools/testing/selftests/bpf/progs/arena_kfunc_jit.c + create mode 100644 tools/testing/selftests/bpf/progs/arena_mem_usage.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_for_bench.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_qdisc_fail__untrusted_write.c + create mode 100644 tools/testing/selftests/bpf/progs/fentry_sleepable.c + delete mode 100644 tools/testing/selftests/bpf/progs/freplace_cls_redirect.c + create mode 100644 tools/testing/selftests/bpf/progs/get_smp_processor_id.c + create mode 100644 tools/testing/selftests/bpf/progs/icmp_send.c + create mode 100644 tools/testing/selftests/bpf/progs/ksock_common.h + create mode 100644 tools/testing/selftests/bpf/progs/ksock_lsm.c + create mode 100644 tools/testing/selftests/bpf/progs/ksock_lsm_verifier.c + create mode 100644 tools/testing/selftests/bpf/progs/ksock_wq.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_arena.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_arena_attach.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_arena_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_callback.c + create mode 100644 tools/testing/selftests/bpf/progs/tcp_ca_untrusted_btf_write.c + create mode 100644 tools/testing/selftests/bpf/progs/test_global_percpu_data.c + delete mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_update.c + create mode 100644 tools/testing/selftests/bpf/progs/tracing_struct_int128.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_map_lookup_refine.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_mem_size_reg.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_percpu_addr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_subprog_insn_stats.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_zext.c + create mode 100644 tools/testing/selftests/bpf/progs/veristat_bar.c + create mode 100644 tools/testing/selftests/bpf/progs/veristat_foo.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 (a50eba1e778ad net: dns_resolver: allow shorter names in dns_query()) +$ 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 (486f8908aa587 Bluetooth: ISO: fix use-after-free of listener socket in iso_conn_ready) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btintel.c | 7 + + drivers/bluetooth/btintel.h | 1 + + drivers/bluetooth/btintel_pcie.c | 428 +++++++++++++++++++++++++++++-- + drivers/bluetooth/btintel_pcie.h | 77 +++++- + drivers/bluetooth/btmrvl_main.c | 4 +- + drivers/bluetooth/btmtk.c | 11 +- + drivers/bluetooth/btmtksdio.c | 59 ++++- + drivers/bluetooth/btnxpuart.c | 39 ++- + drivers/bluetooth/btusb.c | 2 + + 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_serdev.c | 46 +++- + drivers/bluetooth/virtio_bt.c | 21 +- + include/net/bluetooth/hci_core.h | 46 +++- + include/net/bluetooth/l2cap.h | 7 + + net/bluetooth/bnep/core.c | 4 +- + net/bluetooth/eir.c | 3 +- + net/bluetooth/hci_conn.c | 3 +- + net/bluetooth/hci_core.c | 4 +- + net/bluetooth/hci_event.c | 7 +- + net/bluetooth/hci_sync.c | 67 +++-- + net/bluetooth/iso.c | 8 + + net/bluetooth/l2cap_core.c | 29 ++- + net/bluetooth/l2cap_sock.c | 101 ++++++-- + net/bluetooth/mgmt.c | 32 ++- + scripts/context-analysis-suppression.txt | 1 + + 28 files changed, 862 insertions(+), 152 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 +Auto-merging drivers/mtd/maps/Kconfig +Auto-merging drivers/mtd/mtdpart.c +Auto-merging drivers/mtd/mtdswap.c +Merge made by the 'ort' strategy. + drivers/mtd/chips/cfi_cmdset_0001.c | 6 ++++++ + drivers/mtd/devices/mtd_intel_dg.c | 2 +- + drivers/mtd/maps/Kconfig | 1 - + drivers/mtd/maps/map_funcs.c | 2 +- + drivers/mtd/mtdoops.c | 3 +++ + drivers/mtd/mtdpart.c | 3 ++- + drivers/mtd/mtdswap.c | 1 + + drivers/mtd/nand/raw/mpc5121_nfc.c | 39 ++++++++++++------------------------- + drivers/mtd/parsers/afs.c | 7 +++++++ + 9 files changed, 33 insertions(+), 31 deletions(-) +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 +Auto-merging drivers/mtd/nand/spi/core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/qcom,nandc.yaml | 25 +++ + drivers/memory/omap-gpmc.c | 9 +- + drivers/mtd/nand/ecc-realtek.c | 1 + + drivers/mtd/nand/raw/atmel/nand-controller.c | 3 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 29 +++ + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 6 + + drivers/mtd/nand/raw/nand_ids.c | 3 + + drivers/mtd/nand/raw/nand_onfi.c | 27 ++- + drivers/mtd/nand/raw/nand_toshiba.c | 4 +- + drivers/mtd/nand/raw/omap2.c | 6 +- + drivers/mtd/nand/raw/pl35x-nand-controller.c | 20 +- + drivers/mtd/nand/raw/qcom_nandc.c | 30 ++- + drivers/mtd/nand/raw/sunxi_nand.c | 233 +++++++++++++++++---- + drivers/mtd/nand/spi/Makefile | 2 +- + drivers/mtd/nand/spi/core.c | 1 + + drivers/mtd/nand/spi/fmsh.c | 103 +++++++++ + drivers/mtd/nand/spi/heyangtek.c | 132 ++++++++++++ + drivers/mtd/parsers/redboot.c | 9 +- + include/linux/mtd/nand-qpic-common.h | 2 + + include/linux/mtd/spinand.h | 1 + + include/linux/platform_data/mtd-nand-omap2.h | 7 - + 21 files changed, 576 insertions(+), 77 deletions(-) + create mode 100644 drivers/mtd/nand/spi/heyangtek.c +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 (c44e278ce02ef BackMerge tag 'v7.2' into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging .mailmap +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/accel/amdxdna/amdxdna_gem.c +Auto-merging drivers/firmware/Kconfig +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/drm_gpusvm.c +Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/display/intel_lt_phy.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.c +Auto-merging drivers/gpu/drm/nova/driver.rs +Auto-merging drivers/gpu/drm/panthor/panthor_gem.c +Auto-merging drivers/gpu/drm/tyr/driver.rs +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/gpu/drm/virtio/virtgpu_vram.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_i2c.c +Auto-merging drivers/gpu/nova-core/gpu.rs +CONFLICT (content): Merge conflict in drivers/gpu/nova-core/gpu.rs +Auto-merging drivers/gpu/nova-core/gsp/cmdq.rs +Auto-merging include/linux/pci.h +Auto-merging kernel/events/core.c +Auto-merging rust/helpers/pci.c +CONFLICT (content): Merge conflict in rust/helpers/pci.c +Auto-merging rust/kernel/dma.rs +Auto-merging rust/kernel/drm/device.rs +Auto-merging rust/kernel/drm/gem/mod.rs +Auto-merging rust/kernel/drm/gpuvm/va.rs +Auto-merging rust/kernel/drm/gpuvm/vm_bo.rs +Auto-merging rust/kernel/firmware.rs +Auto-merging rust/kernel/io.rs +Auto-merging rust/kernel/iommu/pgtable.rs +Auto-merging rust/kernel/pci.rs +Resolved 'drivers/gpu/nova-core/gpu.rs' using previous resolution. +Resolved 'rust/helpers/pci.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ffa9b46bd1ce0] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git +$ git diff -M --stat --summary HEAD^.. + .clang-format | 2 +- + .mailmap | 4 +- + .../ABI/testing/sysfs-driver-intel-xe-hwmon | 7 + + .../ABI/testing/sysfs-driver-intel-xe-ras | 30 + + Documentation/admin-guide/cgroup-v2.rst | 6 + + .../bindings/display/bridge/renesas,dsi.yaml | 1 + + .../display/bridge/renesas,r9a08g046-lvds.yaml | 120 + + .../bindings/display/mediatek/mediatek,cec.yaml | 11 +- + .../bindings/display/panel/anbernic,td4310.yaml | 66 + + .../bindings/display/panel/chipone,icna3512.yaml | 79 + + .../bindings/display/panel/himax,hx83121a.yaml | 3 + + .../bindings/display/panel/ilitek,ili7807s.yaml | 71 + + .../bindings/display/panel/ilitek,ili9488.yaml | 63 + + .../bindings/display/panel/jadard,jd9365da-h3.yaml | 1 + + .../bindings/display/panel/novatek,nt36536.yaml | 91 + + .../bindings/display/panel/panel-lvds.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/panel/renesas,r63419.yaml | 98 + + .../display/panel/rocktech,jh057n00900.yaml | 2 + + .../bindings/display/panel/samsung,atna33xc20.yaml | 2 + + .../bindings/display/renesas,rzg2l-du.yaml | 26 +- + .../display/rockchip/rockchip,analogix-dp.yaml | 47 +- + .../display/tegra/nvidia,tegra124-vic.yaml | 1 + + .../display/tegra/nvidia,tegra20-host1x.yaml | 20 +- + .../devicetree/bindings/gpu/img,powervr-rogue.yaml | 3 +- + .../devicetree/bindings/gpu/img,powervr-sgx.yaml | 3 +- + .../devicetree/bindings/vendor-prefixes.yaml | 10 + + .../gpu/amdgpu/display/display-manager.rst | 9 + + Documentation/gpu/automated_testing.rst | 3 +- + Documentation/gpu/drm-kms-helpers.rst | 6 + + Documentation/gpu/drm-kms.rst | 12 + + .../gpu/intel-display/dp-link-capabilities.rst | 11 + + .../gpu/intel-display/dp-link-training.rst | 8 + + Documentation/gpu/intel-display/index.rst | 2 + + Documentation/gpu/nova/core/fsp.rst | 142 + + Documentation/gpu/nova/core/tlv.rst | 184 + + Documentation/gpu/nova/index.rst | 2 + + Documentation/gpu/todo.rst | 50 +- + Documentation/gpu/xe/xe_device.rst | 7 + + MAINTAINERS | 22 +- + drivers/accel/amdxdna/amdxdna_gem.c | 6 + + drivers/accel/ethosu/Makefile | 2 +- + drivers/accel/ethosu/ethosu_device.h | 35 +- + drivers/accel/ethosu/ethosu_drv.c | 23 +- + drivers/accel/ethosu/ethosu_drv.h | 61 +- + drivers/accel/ethosu/ethosu_job.c | 61 +- + drivers/accel/ethosu/ethosu_job.h | 2 + + drivers/accel/ethosu/ethosu_perfmon.c | 301 + + drivers/accel/ivpu/ivpu_drv.c | 28 +- + drivers/accel/ivpu/ivpu_drv.h | 5 +- + drivers/accel/ivpu/ivpu_fw.c | 2 +- + drivers/accel/ivpu/ivpu_hw.c | 4 + + drivers/accel/ivpu/ivpu_ipc.c | 25 +- + drivers/accel/ivpu/ivpu_ipc.h | 3 +- + drivers/accel/ivpu/ivpu_job.c | 59 +- + drivers/accel/ivpu/ivpu_job.h | 7 +- + drivers/accel/ivpu/ivpu_mmu_context.c | 4 +- + drivers/accel/rocket/rocket_job.c | 32 +- + drivers/dma-buf/dma-fence-unwrap.c | 8 +- + drivers/dma-buf/dma-fence.c | 22 +- + drivers/dma-buf/dma-heap.c | 3 +- + drivers/dma-buf/st-dma-fence-chain.c | 4 +- + drivers/dma-buf/st-dma-fence-unwrap.c | 42 +- + drivers/dma-buf/st-dma-fence.c | 16 +- + drivers/dma-buf/st-dma-resv.c | 10 +- + drivers/dma-buf/udmabuf.c | 4 +- + drivers/firmware/Kconfig | 28 +- + drivers/gpu/Kconfig | 3 +- + drivers/gpu/Makefile | 58 +- + drivers/gpu/buddy.c | 158 +- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/adp/adp-mipi.c | 4 + + drivers/gpu/drm/amd/amdgpu/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 321 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 985 - + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 232 - + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 68 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.h | 151 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_fence.c | 18 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c | 3 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12_1.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 184 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 62 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 135 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cper.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 74 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 215 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 439 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 313 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 177 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 651 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 367 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 23 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 85 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ip.c | 157 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 486 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 108 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 312 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 89 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 23 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 40 - + drivers/gpu/drm/amd/amdgpu/amdgpu_preempt_mgr.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 1019 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 514 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 26 - + drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 210 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 39 + + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.h | 78 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 28 - + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 150 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 266 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 44 - + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 228 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 88 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 3 + + .../amdgpu_video_codecs.h} | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 37 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 128 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 65 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_wb.c | 129 + + drivers/gpu/drm/amd/amdgpu/amdgpu_wb.h | 102 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 308 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 27 + + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 61 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 66 +- + drivers/gpu/drm/amd/amdgpu/atom.h | 3 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 8 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 66 - + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 57 - + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 57 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 425 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 318 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 301 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 386 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 348 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 239 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 34 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 1131 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 - + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 4 - + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 4 - + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 125 - + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/imu_v12_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h | 4 + + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 21 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 88 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.h | 4 + + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 94 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h | 8 + + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.c | 66 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_3_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 182 +- + drivers/gpu/drm/amd/amdgpu/mes_userqueue.h | 9 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 362 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 298 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_1.c | 379 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 231 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c | 65 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 7 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 28 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 2 + + drivers/gpu/drm/amd/amdgpu/nv.c | 7 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c | 4 +- + drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 10 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 73 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 204 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 10 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 28 +- + drivers/gpu/drm/amd/amdgpu/si.c | 12 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 8 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 10 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 61 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 34 +- + drivers/gpu/drm/amd/amdgpu/soc24.c | 12 +- + drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 40 - + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 736 +- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 31 - + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 55 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 69 - + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 12 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 45 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 87 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c | 90 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_2.c | 3 - + drivers/gpu/drm/amd/amdgpu/vi.c | 43 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 28 +- + drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 115 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 24 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 345 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 241 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.h | 4 - + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 16 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 10 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 54 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 16 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 70 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 43 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 152 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 25 +- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 376 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 26 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 11 +- + drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c | 18 +- + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 8 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8242 +-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 124 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_audio.c | 338 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_audio.h | 58 + + .../amd/display/amdgpu_dm/amdgpu_dm_backlight.c | 737 + + .../amd/display/amdgpu_dm/amdgpu_dm_backlight.h | 90 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 235 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.h | 34 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 3 +- + .../amd/display/amdgpu_dm/amdgpu_dm_connector.c | 3965 ++ + .../amd/display/amdgpu_dm/amdgpu_dm_connector.h | 226 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 122 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 6 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 47 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h | 15 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_cursor.c | 448 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_cursor.h | 52 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 135 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c | 964 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.h | 78 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c | 362 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.h | 65 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 297 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 64 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 152 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.h | 61 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 1765 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 84 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_ism.c | 6 +- + .../display/amdgpu_dm/amdgpu_dm_kunit_helpers.h | 19 - + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 195 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 26 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 528 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 63 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 379 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.h | 64 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 53 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 5 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_quirks.c | 34 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 12 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 60 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 34 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h | 17 + + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.h | 6 +- + .../drm/amd/display/amdgpu_dm/tests/.kunitconfig | 6 + + .../gpu/drm/amd/display/amdgpu_dm/tests/Makefile | 19 + + .../display/amdgpu_dm/tests/amdgpu_dm_audio_test.c | 1259 + + .../amdgpu_dm/tests/amdgpu_dm_backlight_test.c | 1995 + + .../display/amdgpu_dm/tests/amdgpu_dm_color_test.c | 1465 +- + .../amdgpu_dm/tests/amdgpu_dm_colorop_test.c | 140 +- + .../amdgpu_dm/tests/amdgpu_dm_connector_test.c | 5691 ++ + .../display/amdgpu_dm/tests/amdgpu_dm_crc_test.c | 850 + + .../display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c | 1939 + + .../amdgpu_dm/tests/amdgpu_dm_cursor_test.c | 268 + + .../display/amdgpu_dm/tests/amdgpu_dm_dmub_test.c | 1419 + + .../amdgpu_dm/tests/amdgpu_dm_freesync_test.c | 453 + + .../display/amdgpu_dm/tests/amdgpu_dm_hdcp_test.c | 2480 +- + .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 3907 ++ + .../display/amdgpu_dm/tests/amdgpu_dm_irq_test.c | 4093 ++ + .../display/amdgpu_dm/tests/amdgpu_dm_ism_test.c | 392 +- + .../amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c | 195 + + .../amdgpu_dm/tests/amdgpu_dm_kunit_test_helpers.h | 39 + + .../amdgpu_dm/tests/amdgpu_dm_mst_types_test.c | 1429 + + .../display/amdgpu_dm/tests/amdgpu_dm_plane_test.c | 3137 + + .../amdgpu_dm/tests/amdgpu_dm_pp_smu_test.c | 2474 + + .../display/amdgpu_dm/tests/amdgpu_dm_psr_test.c | 509 +- + .../amdgpu_dm/tests/amdgpu_dm_quirks_test.c | 168 + + .../amdgpu_dm/tests/amdgpu_dm_replay_test.c | 432 +- + .../amdgpu_dm/tests/amdgpu_dm_services_test.c | 313 + + .../amd/display/amdgpu_dm/tests/amdgpu_dm_test.c | 1232 + + .../display/amdgpu_dm/tests/amdgpu_dm_wb_test.c | 437 + + drivers/gpu/drm/amd/display/dc/basics/conversion.c | 61 +- + drivers/gpu/drm/amd/display/dc/basics/conversion.h | 12 +- + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 9 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 15 + + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 57 +- + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h | 9 + + .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 72 +- + .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.h | 2 + + .../drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.c | 29 +- + .../drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.h | 2 + + .../amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c | 183 +- + .../gpu/drm/amd/display/dc/clk_mgr/dcn60/dalsmc.h | 389 + + .../amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.c | 1673 + + .../amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.h | 150 + + .../dc/clk_mgr/dcn60/dcn60_clk_mgr_smu_msg.c | 369 + + .../dc/clk_mgr/dcn60/dcn60_clk_mgr_smu_msg.h | 35 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 895 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 1025 +- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 7 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 156 +- + drivers/gpu/drm/amd/display/dc/core/dc_sink.c | 3 + + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 82 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 76 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 44 +- + drivers/gpu/drm/amd/display/dc/dc.h | 486 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 89 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 66 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_helper.c | 228 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 53 +- + drivers/gpu/drm/amd/display/dc/dc_probe.h | 97 + + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 32 +- + drivers/gpu/drm/amd/display/dc/dc_state.h | 7 + + drivers/gpu/drm/amd/display/dc/dc_state_priv.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 62 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 81 +- + drivers/gpu/drm/amd/display/dc/dccg/Makefile | 8 + + .../gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.h | 10 + + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c | 11 +- + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h | 5 +- + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c | 61 +- + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.h | 1 + + .../gpu/drm/amd/display/dc/dccg/dcn60/dcn60_dccg.c | 187 + + .../gpu/drm/amd/display/dc/dccg/dcn60/dcn60_dccg.h | 182 + + drivers/gpu/drm/amd/display/dc/dce/Makefile | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 9 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 28 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 9 + + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 73 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_cacp.c | 213 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_cacp.h | 20 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 2 +- + .../drm/amd/display/dc/dce110/dce110_compressor.c | 2 - + .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 2 - + .../drm/amd/display/dc/dce112/dce112_compressor.c | 8 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 184 + + drivers/gpu/drm/amd/display/dc/dio/Makefile | 8 + + .../amd/display/dc/dio/dcn10/dcn10_link_encoder.c | 10 +- + .../amd/display/dc/dio/dcn10/dcn10_link_encoder.h | 16 + + .../display/dc/dio/dcn31/dcn31_dio_link_encoder.c | 4 + + .../display/dc/dio/dcn31/dcn31_dio_link_encoder.h | 2 + + .../dc/dio/dcn401/dcn401_dio_link_encoder.c | 15 + + .../dc/dio/dcn401/dcn401_dio_link_encoder.h | 10 + + .../display/dc/dio/dcn60/dcn60_dio_link_encoder.c | 373 + + .../display/dc/dio/dcn60/dcn60_dio_link_encoder.h | 43 + + .../dc/dio/dcn60/dcn60_dio_stream_encoder.c | 538 + + .../dc/dio/dcn60/dcn60_dio_stream_encoder.h | 181 + + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 19 + + drivers/gpu/drm/amd/display/dc/dm_services.h | 4 - + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 2 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 2 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dml1_frl_cap_chk.c | 10 +- + drivers/gpu/drm/amd/display/dc/dml2_0/Makefile | 40 +- + .../dc/dml2_0/dml21/dml21_translation_helper.c | 149 +- + .../drm/amd/display/dc/dml2_0/dml21/dml21_utils.c | 146 +- + .../drm/amd/display/dc/dml2_0/dml21/dml21_utils.h | 5 + + .../display/dc/dml2_0/dml21/dml21_wrapper_fpu.c | 40 +- + .../dml2_0/dml21/inc/bounding_boxes/dcn42_soc_bb.h | 6 - + .../dml21/inc/bounding_boxes/dcn42b_soc_bb.h | 42 +- + .../dml2_0/dml21/inc/bounding_boxes/dcn5_soc_bb.h | 36 + + .../dml2_0/dml21/inc/bounding_boxes/dcn6_soc_bb.h | 229 + + .../inc/bounding_boxes/utm_qos_model_dchub_v1.h | 109 + + .../inc/bounding_boxes/utm_qos_model_dchub_v2.h | 122 + + .../inc/bounding_boxes/utm_qos_model_dchub_v3.h | 53 + + .../dml21/inc/bounding_boxes/utm_qos_model_types.h | 51 + + .../amd/display/dc/dml2_0/dml21/inc/dml_dmub_cmd.h | 502 + + .../dc/dml2_0/dml21/inc/dml_top_dchub_registers.h | 30 + + .../dml2_0/dml21/inc/dml_top_display_cfg_types.h | 10 + + .../dml2_0/dml21/inc/dml_top_soc_parameter_types.h | 15 + + .../display/dc/dml2_0/dml21/inc/dml_top_types.h | 50 + + .../dc/dml2_0/dml21/src/dml2_cga/dml2_cga_dcn6.c | 152 + + .../dc/dml2_0/dml21/src/dml2_cga/dml2_cga_dcn6.h | 9 + + .../dml2_0/dml21/src/dml2_cga/dml2_cga_factory.c | 38 + + .../dml2_0/dml21/src/dml2_cga/dml2_cga_factory.h | 9 + + .../dml2_core/dml2_core_calcs_dsc_shared_types.h | 32 + + .../dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn4.c | 38 +- + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 149 +- + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.h | 2 + + .../src/dml2_core/dml2_core_dcn5_calcs_dchub.c | 5893 ++ + .../src/dml2_core/dml2_core_dcn5_calcs_dchub.h | 426 + + .../dml2_core/dml2_core_dcn5_calcs_display_pipe.c | 1029 + + .../dml2_core/dml2_core_dcn5_calcs_display_pipe.h | 151 + + .../dml2_core/dml2_core_dcn5_calcs_dsc_latency.c | 501 + + .../dml2_core/dml2_core_dcn5_calcs_dsc_latency.h | 23 + + .../dml2_core/dml2_core_dcn5_funcs_initialize.c | 78 + + .../dml2_core/dml2_core_dcn5_funcs_initialize.h | 12 + + .../dml2_core_dcn5_funcs_mode_programming.c | 1791 + + .../dml2_core_dcn5_funcs_mode_programming.h | 11 + + .../dml2_core/dml2_core_dcn5_funcs_mode_support.c | 2957 + + .../dml2_core/dml2_core_dcn5_funcs_mode_support.h | 11 + + .../dml21/src/dml2_core/dml2_core_dcn6_calcs.c | 11 + + .../dml21/src/dml2_core/dml2_core_dcn6_calcs.h | 8 + + .../src/dml2_core/dml2_core_dcn6_calcs_dchub.c | 1951 + + .../src/dml2_core/dml2_core_dcn6_calcs_dchub.h | 101 + + .../dml2_core/dml2_core_dcn6_funcs_initialize.c | 165 + + .../dml2_core/dml2_core_dcn6_funcs_initialize.h | 12 + + .../dml2_core_dcn6_funcs_mode_programming.c | 1389 + + .../dml2_core_dcn6_funcs_mode_programming.h | 11 + + .../dml2_core/dml2_core_dcn6_funcs_mode_support.c | 4277 ++ + .../dml2_core/dml2_core_dcn6_funcs_mode_support.h | 11 + + .../dml2_0/dml21/src/dml2_core/dml2_core_factory.c | 27 +- + .../dml21/src/dml2_core/dml2_core_shared_types.h | 165 +- + .../dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 22 +- + .../dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_dcn5.c | 449 + + .../dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_dcn5.h | 19 + + .../dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 12 + + .../dml2_0/dml21/src/dml2_mcg/dml2_mcg_factory.c | 5 + + .../dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn42.c | 32 +- + .../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 59 +- + .../dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn5.c | 522 + + .../dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn5.h | 21 + + .../src/dml2_pmo/dml2_pmo_dcn5_stage_optimizers.c | 2228 + + .../src/dml2_pmo/dml2_pmo_dcn5_stage_optimizers.h | 97 + + .../dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn6.c | 506 + + .../dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn6.h | 22 + + .../src/dml2_pmo/dml2_pmo_dcn6_stage_optimizers.c | 1789 + + .../src/dml2_pmo/dml2_pmo_dcn6_stage_optimizers.h | 17 + + .../dml2_0/dml21/src/dml2_pmo/dml2_pmo_factory.c | 34 + + .../alternate_pstate_shared_lib.c | 1078 + + .../alternate_pstate_shared_lib.h | 109 + + .../dml21/src/dml2_top/dml2_top_interfaces.c | 7 + + .../dc/dml2_0/dml21/src/dml2_top/dml2_top_utm.c | 394 + + .../dc/dml2_0/dml21/src/dml2_top/dml2_top_utm.h | 9 + + .../src/dml2_utm_soc_bb/dml2_utm_soc_bb_dcn5.c | 144 + + .../src/dml2_utm_soc_bb/dml2_utm_soc_bb_dcn5.h | 11 + + .../src/dml2_utm_soc_bb/dml2_utm_soc_bb_dcn6.c | 405 + + .../src/dml2_utm_soc_bb/dml2_utm_soc_bb_dcn6.h | 12 + + .../src/dml2_utm_soc_bb/dml2_utm_soc_bb_factory.c | 29 + + .../src/dml2_utm_soc_bb/dml2_utm_soc_bb_factory.h | 11 + + .../dml21/src/inc/dml2_internal_shared_types.h | 486 +- + .../gpu/drm/amd/display/dc/dml2_0/dml2_wrapper.h | 8 + + drivers/gpu/drm/amd/display/dc/dpp/Makefile | 17 + + .../drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 13 +- + .../drm/amd/display/dc/dpp/dcn20/dcn20_dpp_cm.c | 8 +- + .../drm/amd/display/dc/dpp/dcn30/dcn30_dpp_cm.c | 8 +- + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h | 41 + + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 51 +- + .../gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.c | 7 +- + .../gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.h | 6 + + .../gpu/drm/amd/display/dc/dpp/dcn50/dcn50_dpp.c | 391 + + .../gpu/drm/amd/display/dc/dpp/dcn50/dcn50_dpp.h | 86 + + .../gpu/drm/amd/display/dc/dpp/dcn60/dcn60_dpp.c | 346 + + .../gpu/drm/amd/display/dc/dpp/dcn60/dcn60_dpp.h | 525 + + .../drm/amd/display/dc/dpp/dcn60/dcn60_dpp_dscl.c | 315 + + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 7 + + .../gpu/drm/amd/display/dc/dsc/dcn60/dcn60_dsc.c | 447 + + .../gpu/drm/amd/display/dc/dsc/dcn60/dcn60_dsc.h | 248 + + .../drm/amd/display/dc/dwb/dcn30/dcn30_cm_common.h | 4 + + .../drm/amd/display/dc/dwb/dcn30/dcn30_dwb_cm.c | 3 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 10 + + .../amd/display/dc/gpio/dce80/hw_translate_dce80.c | 5 +- + .../amd/display/dc/gpio/dcn10/hw_translate_dcn10.c | 484 +- + .../amd/display/dc/gpio/dcn20/hw_translate_dcn20.c | 434 +- + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 419 +- + .../amd/display/dc/gpio/dcn30/hw_translate_dcn30.c | 434 +- + .../display/dc/gpio/dcn315/hw_translate_dcn315.c | 420 +- + .../amd/display/dc/gpio/dcn32/hw_translate_dcn32.c | 386 +- + .../display/dc/gpio/dcn401/hw_translate_dcn401.c | 394 +- + .../amd/display/dc/gpio/dcn42/hw_translate_dcn42.c | 191 +- + .../amd/display/dc/gpio/dcn60/hw_factory_dcn60.c | 228 + + .../amd/display/dc/gpio/dcn60/hw_factory_dcn60.h | 11 + + .../amd/display/dc/gpio/dcn60/hw_translate_dcn60.c | 168 + + .../amd/display/dc/gpio/dcn60/hw_translate_dcn60.h | 13 + + drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h | 15 + + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 302 + + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.h | 28 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 4 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 90 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.h | 21 + + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 9 + + drivers/gpu/drm/amd/display/dc/hpo/Makefile | 8 + + .../dc/hpo/dcn31/dcn31_hpo_dp_stream_encoder.h | 47 - + .../dc/hpo/dcn60/dcn60_hpo_frl_link_encoder.c | 114 + + .../dc/hpo/dcn60/dcn60_hpo_frl_link_encoder.h | 18 + + .../dc/hpo/dcn60/dcn60_hpo_frl_stream_encoder.c | 358 + + .../dc/hpo/dcn60/dcn60_hpo_frl_stream_encoder.h | 32 + + drivers/gpu/drm/amd/display/dc/hubbub/Makefile | 8 + + .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h | 108 + + .../drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c | 8 +- + .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c | 2 +- + .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.h | 7 +- + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 3 +- + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.h | 4 +- + .../drm/amd/display/dc/hubbub/dcn60/dcn60_hubbub.c | 1816 + + .../drm/amd/display/dc/hubbub/dcn60/dcn60_hubbub.h | 207 + + drivers/gpu/drm/amd/display/dc/hubp/Makefile | 16 + + .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.c | 3 +- + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h | 32 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 201 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h | 23 +- + .../gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.c | 135 +- + .../gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.h | 15 +- + .../gpu/drm/amd/display/dc/hubp/dcn50/dcn50_hubp.c | 532 + + .../gpu/drm/amd/display/dc/hubp/dcn50/dcn50_hubp.h | 48 + + .../gpu/drm/amd/display/dc/hubp/dcn60/dcn60_hubp.c | 472 + + .../gpu/drm/amd/display/dc/hubp/dcn60/dcn60_hubp.h | 272 + + drivers/gpu/drm/amd/display/dc/hwss/Makefile | 16 + + .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h | 9 + + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 49 +- + .../drm/amd/display/dc/hwss/dce60/dce60_hwseq.c | 10 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 96 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.h | 5 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 101 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.h | 3 +- + .../drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 40 +- + .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.h | 2 + + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 68 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 6 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 70 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 72 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.h | 8 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 19 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 775 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 23 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 3 +- + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 540 +- + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.h | 9 +- + .../gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.c | 2 - + .../drm/amd/display/dc/hwss/dcn50/dcn50_hwseq.c | 759 + + .../drm/amd/display/dc/hwss/dcn50/dcn50_hwseq.h | 32 + + .../drm/amd/display/dc/hwss/dcn60/dcn60_hwseq.c | 1164 + + .../drm/amd/display/dc/hwss/dcn60/dcn60_hwseq.h | 32 + + .../gpu/drm/amd/display/dc/hwss/dcn60/dcn60_init.c | 181 + + .../gpu/drm/amd/display/dc/hwss/dcn60/dcn60_init.h | 12 + + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 315 +- + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 10 +- + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 10 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 54 + + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 23 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 22 + + .../drm/amd/display/dc/inc/hw/cursor_reg_cache.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 18 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 7 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 35 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/mcif_wb.h | 24 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 81 +- + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/link_service.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 19 - + drivers/gpu/drm/amd/display/dc/inc/resource.h | 9 +- + .../drm/amd/display/dc/inc/soc_and_ip_translator.h | 14 - + drivers/gpu/drm/amd/display/dc/irq/Makefile | 9 + + .../amd/display/dc/irq/dcn60/irq_service_dcn60.c | 417 + + .../amd/display/dc/irq/dcn60/irq_service_dcn60.h | 12 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 56 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 360 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.h | 4 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 12 +- + .../drm/amd/display/dc/link/protocols/link_ddc.c | 28 +- + .../drm/amd/display/dc/link/protocols/link_ddc.h | 2 + + .../display/dc/link/protocols/link_dp_capability.c | 14 +- + .../dc/link/protocols/link_dp_irq_handler.c | 1 - + .../dc/link/protocols/link_dp_panel_replay.c | 3 +- + .../display/dc/link/protocols/link_dp_training.c | 28 +- + .../dc/link/protocols/link_edp_panel_control.c | 21 +- + .../amd/display/dc/link/protocols/link_hdmi_frl.c | 25 +- + drivers/gpu/drm/amd/display/dc/mmhubbub/Makefile | 10 + + .../amd/display/dc/mmhubbub/dcn32/dcn32_mmhubbub.c | 4 +- + .../amd/display/dc/mmhubbub/dcn32/dcn32_mmhubbub.h | 5 + + .../display/dc/mmhubbub/dcn401/dcn401_mmhubbub.c | 135 + + .../display/dc/mmhubbub/dcn401/dcn401_mmhubbub.h | 40 + + .../amd/display/dc/mmhubbub/dcn42/dcn42_mmhubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/mpc/Makefile | 8 + + .../gpu/drm/amd/display/dc/mpc/dcn20/dcn20_mpc.c | 4 - + .../gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.c | 44 +- + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 246 +- + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h | 31 +- + .../gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c | 405 +- + .../gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.h | 55 +- + .../gpu/drm/amd/display/dc/mpc/dcn60/dcn60_mpc.c | 330 + + .../gpu/drm/amd/display/dc/mpc/dcn60/dcn60_mpc.h | 472 + + drivers/gpu/drm/amd/display/dc/opp/Makefile | 8 + + .../gpu/drm/amd/display/dc/opp/dcn20/dcn20_opp.c | 51 +- + .../gpu/drm/amd/display/dc/opp/dcn60/dcn60_opp.c | 25 + + .../gpu/drm/amd/display/dc/opp/dcn60/dcn60_opp.h | 64 + + drivers/gpu/drm/amd/display/dc/optc/Makefile | 9 + + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c | 41 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 3 +- + .../gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.c | 5 - + .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c | 5 - + .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.h | 4 + + .../drm/amd/display/dc/optc/dcn314/dcn314_optc.c | 5 - + .../drm/amd/display/dc/optc/dcn314/dcn314_optc.h | 1 + + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 5 - + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.h | 2 + + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 31 +- + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 5 - + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.h | 1 + + .../gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.c | 9 +- + .../gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.h | 4 + + .../gpu/drm/amd/display/dc/optc/dcn60/dcn60_optc.c | 107 + + .../gpu/drm/amd/display/dc/optc/dcn60/dcn60_optc.h | 178 + + drivers/gpu/drm/amd/display/dc/os_types.h | 10 + + .../drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.c | 258 +- + .../drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.h | 22 +- + drivers/gpu/drm/amd/display/dc/resource/Makefile | 10 + + .../display/dc/resource/dce100/dce100_resource.h | 1 - + .../display/dc/resource/dce112/dce112_resource.h | 7 - + .../amd/display/dc/resource/dcn10/dcn10_resource.c | 1 + + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 1 + + .../display/dc/resource/dcn201/dcn201_resource.c | 1 + + .../amd/display/dc/resource/dcn21/dcn21_resource.c | 1 + + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 5 +- + .../display/dc/resource/dcn301/dcn301_resource.c | 3 + + .../display/dc/resource/dcn302/dcn302_resource.c | 5 +- + .../display/dc/resource/dcn303/dcn303_resource.c | 5 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 8 +- + .../display/dc/resource/dcn314/dcn314_resource.c | 8 +- + .../display/dc/resource/dcn315/dcn315_resource.c | 13 +- + .../display/dc/resource/dcn316/dcn316_resource.c | 12 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 5 +- + .../display/dc/resource/dcn321/dcn321_resource.c | 5 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 10 +- + .../display/dc/resource/dcn351/dcn351_resource.c | 10 +- + .../amd/display/dc/resource/dcn36/dcn36_resource.c | 10 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 65 +- + .../display/dc/resource/dcn401/dcn401_resource.h | 11 +- + .../amd/display/dc/resource/dcn42/dcn42_resource.c | 44 +- + .../amd/display/dc/resource/dcn42/dcn42_resource.h | 1 + + .../display/dc/resource/dcn42b/dcn42b_resource.c | 60 +- + .../display/dc/resource/dcn42b/dcn42b_resource.h | 43 +- + .../amd/display/dc/resource/dcn60/dcn60_resource.c | 2377 + + .../amd/display/dc/resource/dcn60/dcn60_resource.h | 676 + + .../amd/display/dc/soc_and_ip_translator/Makefile | 6 + + .../dcn401/dcn401_soc_and_ip_translator.c | 16 + + .../dcn42/dcn42_soc_and_ip_translator.c | 18 +- + .../dcn42/dcn42_soc_and_ip_translator.h | 1 + + .../dcn42b/dcn42b_soc_and_ip_translator.c | 42 + + .../dcn42b/dcn42b_soc_and_ip_translator.h | 17 + + .../dcn60/dcn60_soc_and_ip_translator.c | 117 + + .../dcn60/dcn60_soc_and_ip_translator.h | 16 + + .../soc_and_ip_translator/soc_and_ip_translator.c | 9 +- + drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c | 202 +- + drivers/gpu/drm/amd/display/dc/sspl/dc_spl_types.h | 58 +- + drivers/gpu/drm/amd/display/dc/sspl/spl_debug.h | 4 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 14 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 518 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn60.c | 732 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn60.h | 303 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 107 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 18 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + .../drm/amd/display/include/ddc_service_types.h | 1 + + drivers/gpu/drm/amd/display/include/gpio_types.h | 48 + + .../drm/amd/display/modules/freesync/freesync.c | 8 +- + .../gpu/drm/amd/display/modules/inc/mod_power.h | 11 + + drivers/gpu/drm/amd/display/modules/power/Makefile | 2 +- + drivers/gpu/drm/amd/display/modules/power/power.c | 28 +- + .../gpu/drm/amd/display/modules/power/power_abm.c | 365 +- + .../drm/amd/display/modules/power/power_helpers.h | 19 + + .../gpu/drm/amd/display/modules/power/power_psr.c | 7 + + .../drm/amd/display/modules/power/power_replay.c | 16 +- + drivers/gpu/drm/amd/include/amd_shared.h | 6 - + drivers/gpu/drm/amd/include/amdgpu_ptl.h | 9 +- + .../amd/include/asic_reg/dcn/dcn_6_0_0_offset.h | 15799 +++++ + .../amd/include/asic_reg/dcn/dcn_6_0_0_sh_mask.h | 58556 +++++++++++++++++++ + .../amd/include/asic_reg/dpcs/dpcs_6_0_0_offset.h | 47 + + .../amd/include/asic_reg/dpcs/dpcs_6_0_0_sh_mask.h | 55 + + .../drm/amd/include/asic_reg/gca/gfx_6_0_sh_mask.h | 32 +- + .../include/asic_reg/mmhub/mmhub_5_0_1_offset.h | 17 + + .../include/asic_reg/mmhub/mmhub_5_0_1_sh_mask.h | 17 + + .../amd/include/asic_reg/sdma/sdma_4_4_2_offset.h | 4 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 3 + + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 52 +- + drivers/gpu/drm/amd/include/mes_v12_api_def.h | 5 +- + drivers/gpu/drm/amd/include/soc15_hw_ip.h | 1 + + drivers/gpu/drm/amd/include/v9_structs.h | 4 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 9 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 151 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 - + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 21 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 38 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c | 11 +- + .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 753 +- + .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 450 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 60 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 83 +- + .../pm/powerplay/hwmgr/vega10_processpptables.c | 761 +- + .../pm/powerplay/hwmgr/vega12_processpptables.c | 7 + + .../pm/powerplay/hwmgr/vega20_processpptables.c | 7 + + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 20 + + .../gpu/drm/amd/pm/powerplay/smumgr/smu7_smumgr.c | 25 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 267 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 109 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v15_0_0_metrics.h | 230 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v15_0_0_ppsmc.h | 5 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 3 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 17 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 24 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 15 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v15_0.h | 15 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 73 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 94 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 124 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 105 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 134 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 98 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 117 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 128 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 148 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 816 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 31 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 128 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 108 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 105 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 134 +- + drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c | 109 +- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.c | 314 +- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.h | 13 + + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c | 150 +- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 140 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 13 + + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 4 +- + drivers/gpu/drm/amd/ras/Makefile | 4 +- + drivers/gpu/drm/amd/ras/{rascore => core}/Makefile | 16 +- + .../drm/amd/ras/{rascore/ras_aca.c => core/aca.c} | 21 +- + .../drm/amd/ras/{rascore/ras_aca.h => core/aca.h} | 4 +- + .../{rascore/ras_aca_v1_0.c => core/aca_v1_0.c} | 17 +- + .../{rascore/ras_aca_v1_0.h => core/aca_v1_0.h} | 4 +- + .../drm/amd/ras/{rascore/ras_cmd.c => core/cmd.c} | 2 +- + .../drm/amd/ras/{rascore/ras_cmd.h => core/cmd.h} | 8 +- + .../amd/ras/{rascore/ras_core.c => core/core.c} | 40 +- + .../ras_core_status.h => core/core_status.h} | 4 +- + .../ras/{rascore/ras_eeprom.c => core/eeprom.c} | 10 +- + .../ras/{rascore/ras_eeprom.h => core/eeprom.h} | 8 +- + .../{rascore/ras_eeprom_fw.c => core/eeprom_fw.c} | 2 +- + .../{rascore/ras_eeprom_fw.h => core/eeprom_fw.h} | 4 +- + .../{rascore/ras_log_ring.c => core/log_ring.c} | 4 +- + .../{rascore/ras_log_ring.h => core/log_ring.h} | 6 +- + drivers/gpu/drm/amd/ras/{rascore => core}/ras.h | 22 +- + .../gpu/drm/amd/ras/{rascore => core}/ras_cper.c | 4 +- + .../gpu/drm/amd/ras/{rascore => core}/ras_cper.h | 0 + .../gpu/drm/amd/ras/{rascore => core}/ras_gfx.c | 2 +- + .../gpu/drm/amd/ras/{rascore => core}/ras_gfx.h | 0 + .../drm/amd/ras/{rascore => core}/ras_gfx_v9_0.c | 2 +- + .../drm/amd/ras/{rascore => core}/ras_gfx_v9_0.h | 0 + .../gpu/drm/amd/ras/{rascore => core}/ras_mp1.c | 19 +- + .../gpu/drm/amd/ras/{rascore => core}/ras_mp1.h | 3 + + .../drm/amd/ras/{rascore => core}/ras_mp1_v13_0.c | 15 +- + .../drm/amd/ras/{rascore => core}/ras_mp1_v13_0.h | 0 + .../gpu/drm/amd/ras/{rascore => core}/ras_nbio.c | 0 + .../gpu/drm/amd/ras/{rascore => core}/ras_nbio.h | 0 + .../drm/amd/ras/{rascore => core}/ras_nbio_v7_9.c | 0 + .../drm/amd/ras/{rascore => core}/ras_nbio_v7_9.h | 0 + .../drm/amd/ras/{rascore => core}/ras_process.c | 5 +- + .../drm/amd/ras/{rascore => core}/ras_process.h | 0 + .../gpu/drm/amd/ras/{rascore => core}/ras_psp.c | 5 +- + .../gpu/drm/amd/ras/{rascore => core}/ras_psp.h | 2 +- + .../drm/amd/ras/{rascore => core}/ras_psp_v13_0.c | 0 + .../drm/amd/ras/{rascore => core}/ras_psp_v13_0.h | 0 + .../gpu/drm/amd/ras/{rascore => core}/ras_umc.c | 216 +- + .../gpu/drm/amd/ras/{rascore => core}/ras_umc.h | 51 +- + .../drm/amd/ras/{rascore => core}/ras_umc_v12_0.c | 240 +- + .../drm/amd/ras/{rascore => core}/ras_umc_v12_0.h | 5 +- + .../amd/ras/{rascore/ras_ta_if.h => core/ta_if.h} | 4 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c | 89 +- + .../drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.c | 4 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c | 96 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.h | 4 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1_v13_0.c | 14 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_sys.c | 22 + + drivers/gpu/drm/amd/ras/ras_mgr/ras_sys.h | 3 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 12 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 27 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 13 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 19 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 6 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 32 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 6 +- + drivers/gpu/drm/bridge/aux-bridge.c | 4 + + drivers/gpu/drm/bridge/aux-hpd-bridge.c | 4 + + drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 9 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 8 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 6 +- + drivers/gpu/drm/bridge/chrontel-ch7033.c | 15 +- + drivers/gpu/drm/bridge/cros-ec-anx7688.c | 4 + + drivers/gpu/drm/bridge/display-connector.c | 38 +- + drivers/gpu/drm/bridge/fsl-ldb.c | 3 +- + drivers/gpu/drm/bridge/imx/Kconfig | 11 + + drivers/gpu/drm/bridge/imx/Makefile | 1 + + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c | 2 +- + drivers/gpu/drm/bridge/imx/imx8qm-ldb.c | 2 +- + drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c | 2 +- + .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 2 +- + drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 2 +- + drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 2 +- + drivers/gpu/drm/bridge/imx/imx93-pdfc.c | 222 + + drivers/gpu/drm/bridge/inno-hdmi.c | 2 +- + drivers/gpu/drm/bridge/ite-it6263.c | 4 +- + drivers/gpu/drm/bridge/ite-it6505.c | 4 +- + drivers/gpu/drm/bridge/ite-it66121.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt8713sx.c | 6 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 14 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 7 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 6 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 5 +- + drivers/gpu/drm/bridge/lvds-codec.c | 13 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 11 +- + drivers/gpu/drm/bridge/microchip-lvds.c | 3 + + drivers/gpu/drm/bridge/nwl-dsi.c | 2 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 21 +- + drivers/gpu/drm/bridge/of-display-mode-bridge.c | 6 +- + drivers/gpu/drm/bridge/panel.c | 22 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 26 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 2 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 5 +- + drivers/gpu/drm/bridge/sii902x.c | 8 +- + drivers/gpu/drm/bridge/sii9234.c | 41 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 6 +- + drivers/gpu/drm/bridge/simple-bridge.c | 13 +- + drivers/gpu/drm/bridge/ssd2825.c | 3 +- + drivers/gpu/drm/bridge/synopsys/dw-dp.c | 9 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 3 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 5 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 3 +- + drivers/gpu/drm/bridge/tc358762.c | 21 +- + drivers/gpu/drm/bridge/tc358764.c | 32 +- + drivers/gpu/drm/bridge/tc358767.c | 10 +- + drivers/gpu/drm/bridge/tc358768.c | 7 +- + drivers/gpu/drm/bridge/tc358775.c | 6 +- + drivers/gpu/drm/bridge/tda998x_drv.c | 15 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 14 +- + drivers/gpu/drm/bridge/ti-dlpc3433.c | 4 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 9 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 8 +- + drivers/gpu/drm/bridge/ti-tdp158.c | 2 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 14 +- + drivers/gpu/drm/bridge/ti-tpd12s015.c | 4 + + drivers/gpu/drm/bridge/waveshare-dsi.c | 15 +- + drivers/gpu/drm/clients/drm_log.c | 10 +- + drivers/gpu/drm/display/drm_bridge_connector.c | 45 +- + drivers/gpu/drm/display/drm_dp_tunnel.c | 116 +- + drivers/gpu/drm/display/drm_hdmi_state_helper.c | 68 +- + drivers/gpu/drm/drm_atomic.c | 82 +- + drivers/gpu/drm/drm_atomic_helper.c | 86 + + drivers/gpu/drm/drm_atomic_state_helper.c | 154 +- + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_blend.c | 20 +- + drivers/gpu/drm/drm_bridge.c | 187 +- + drivers/gpu/drm/drm_buddy.c | 30 +- + drivers/gpu/drm/drm_colorop.c | 41 +- + drivers/gpu/drm/drm_connector.c | 192 +- + drivers/gpu/drm/drm_displayid_internal.h | 24 + + drivers/gpu/drm/drm_draw_internal.h | 7 - + drivers/gpu/drm/drm_drv.c | 46 +- + drivers/gpu/drm/drm_dumb_buffers.c | 1 - + drivers/gpu/drm/drm_edid.c | 80 +- + drivers/gpu/drm/drm_exec.c | 2 +- + drivers/gpu/drm/drm_fb_helper.c | 11 +- + drivers/gpu/drm/drm_gem.c | 3 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 22 +- + drivers/gpu/drm/drm_gpusvm.c | 243 +- + drivers/gpu/drm/drm_gpuvm.c | 44 - + drivers/gpu/drm/drm_mode_config.c | 210 +- + drivers/gpu/drm/drm_modes.c | 23 + + drivers/gpu/drm/drm_of.c | 49 +- + drivers/gpu/drm/drm_panel.c | 68 +- + drivers/gpu/drm/drm_panic.c | 6 +- + drivers/gpu/drm/drm_print.c | 4 +- + drivers/gpu/drm/drm_probe_helper.c | 53 +- + drivers/gpu/drm/drm_syncobj.c | 2 +- + drivers/gpu/drm/drm_writeback.c | 6 + + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 33 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 6 + + drivers/gpu/drm/exynos/exynos_dp.c | 32 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 17 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 14 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 14 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 20 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 18 + + drivers/gpu/drm/gma500/cdv_intel_crt.c | 9 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 120 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 10 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 9 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 9 +- + drivers/gpu/drm/gma500/psb_drv.c | 56 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 9 +- + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 4 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 114 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 78 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 5 + + drivers/gpu/drm/hyperv/hyperv_drm.h | 16 +- + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 100 +- + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 110 +- + drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 70 +- + drivers/gpu/drm/i915/.kunitconfig | 9 + + drivers/gpu/drm/i915/Kconfig.debug | 12 + + drivers/gpu/drm/i915/Makefile | 7 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 15 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 4 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 2 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 8 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 5 +- + drivers/gpu/drm/i915/display/intel_alpm.c | 15 +- + drivers/gpu/drm/i915/display/intel_audio.c | 55 +- + drivers/gpu/drm/i915/display/intel_bios.c | 62 +- + drivers/gpu/drm/i915/display/intel_bw.c | 280 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 60 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 1 + + drivers/gpu/drm/i915/display/intel_cmtg.c | 280 +- + drivers/gpu/drm/i915/display/intel_cmtg.h | 19 +- + drivers/gpu/drm/i915/display/intel_cmtg_regs.h | 24 +- + drivers/gpu/drm/i915/display/intel_color.c | 115 +- + drivers/gpu/drm/i915/display/intel_crt.c | 9 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 2 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 5 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 11 + + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 1 - + drivers/gpu/drm/i915/display/intel_ddi.c | 37 +- + drivers/gpu/drm/i915/display/intel_de.c | 40 +- + drivers/gpu/drm/i915/display/intel_display.c | 242 +- + drivers/gpu/drm/i915/display/intel_display.h | 7 + + drivers/gpu/drm/i915/display/intel_display_core.h | 16 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 2 + + .../gpu/drm/i915/display/intel_display_device.c | 14 + + .../gpu/drm/i915/display/intel_display_device.h | 6 +- + .../gpu/drm/i915/display/intel_display_driver.c | 202 +- + .../gpu/drm/i915/display/intel_display_driver.h | 17 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 21 +- + drivers/gpu/drm/i915/display/intel_display_irq.h | 2 + + .../gpu/drm/i915/display/intel_display_limits.h | 2 + + drivers/gpu/drm/i915/display/intel_display_power.c | 189 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 40 + + .../drm/i915/display/intel_display_power_well.c | 76 +- + .../drm/i915/display/intel_display_power_well.h | 1 + + drivers/gpu/drm/i915/display/intel_display_regs.h | 49 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 67 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 4 + + drivers/gpu/drm/i915/display/intel_display_wa.h | 2 + + drivers/gpu/drm/i915/display/intel_dmc.c | 25 +- + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 2 + + drivers/gpu/drm/i915/display/intel_dmc_wl.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 849 +- + drivers/gpu/drm/i915/display/intel_dp.h | 31 +- + drivers/gpu/drm/i915/display/intel_dp_link_caps.c | 1312 + + drivers/gpu/drm/i915/display/intel_dp_link_caps.h | 195 + + .../gpu/drm/i915/display/intel_dp_link_training.c | 1271 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 46 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 87 +- + drivers/gpu/drm/i915/display/intel_dp_test.c | 108 +- + drivers/gpu/drm/i915/display/intel_dp_test.h | 3 +- + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 55 +- + drivers/gpu/drm/i915/display/intel_dp_tunnel.h | 17 + + drivers/gpu/drm/i915/display/intel_dram.c | 14 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 32 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 5 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 21 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 35 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 148 +- + drivers/gpu/drm/i915/display/intel_gmbus.h | 22 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 2 + + drivers/gpu/drm/i915/display/intel_hdmi.c | 45 +- + drivers/gpu/drm/i915/display/intel_initial_plane.c | 8 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 4 +- + drivers/gpu/drm/i915/display/intel_lt_phy.c | 14 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 5 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 30 +- + drivers/gpu/drm/i915/display/intel_panel.c | 170 +- + drivers/gpu/drm/i915/display/intel_panel.h | 6 +- + drivers/gpu/drm/i915/display/intel_parent.c | 6 +- + drivers/gpu/drm/i915/display/intel_parent.h | 4 +- + drivers/gpu/drm/i915/display/intel_plane.c | 109 +- + drivers/gpu/drm/i915/display/intel_plane.h | 10 +- + drivers/gpu/drm/i915/display/intel_pmdemand.c | 12 +- + drivers/gpu/drm/i915/display/intel_psr.c | 280 +- + drivers/gpu/drm/i915/display/intel_psr.h | 1 + + drivers/gpu/drm/i915/display/intel_psr_regs.h | 1 + + drivers/gpu/drm/i915/display/intel_sdvo.c | 7 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 22 +- + drivers/gpu/drm/i915/display/intel_tv.c | 5 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 29 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 4 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 22 +- + drivers/gpu/drm/i915/display/skl_universal_plane.h | 9 + + drivers/gpu/drm/i915/display/skl_watermark.c | 6 + + drivers/gpu/drm/i915/display/tests/Makefile | 7 + + .../drm/i915/display/tests/intel_dp_link_test.c | 1408 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 7 - + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 128 - + drivers/gpu/drm/i915/gem/i915_gem_panic.c | 147 + + drivers/gpu/drm/i915/gem/i915_gem_panic.h | 11 + + drivers/gpu/drm/i915/gt/intel_gsc.c | 2 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 2 +- + .../gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c | 2 +- + drivers/gpu/drm/i915/gvt/edid.c | 14 +- + drivers/gpu/drm/i915/i915_active.c | 2 +- + drivers/gpu/drm/i915/i915_driver.c | 181 +- + drivers/gpu/drm/i915/i915_initial_plane.c | 12 +- + drivers/gpu/drm/i915/i915_panic.c | 35 - + drivers/gpu/drm/i915/i915_panic.h | 9 - + drivers/gpu/drm/imagination/pvr_ccb.c | 6 +- + drivers/gpu/drm/imagination/pvr_check.h | 36 + + drivers/gpu/drm/imagination/pvr_device.c | 4 +- + drivers/gpu/drm/imagination/pvr_device_info.h | 6 +- + drivers/gpu/drm/imagination/pvr_drv.c | 7 +- + drivers/gpu/drm/imagination/pvr_gem.h | 12 +- + drivers/gpu/drm/imagination/pvr_queue.c | 14 +- + drivers/gpu/drm/imagination/pvr_rogue_fwif_check.h | 11 +- + .../drm/imagination/pvr_rogue_fwif_client_check.h | 9 +- + .../drm/imagination/pvr_rogue_fwif_shared_check.h | 9 +- + .../gpu/drm/imagination/pvr_rogue_heap_config.h | 10 +- + drivers/gpu/drm/imagination/pvr_rogue_mips_check.h | 71 +- + drivers/gpu/drm/imx/dc/dc-ic.c | 6 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 4 + + drivers/gpu/drm/imx/ipuv3/parallel-display.c | 2 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 6 +- + drivers/gpu/drm/lima/lima_device.c | 12 +- + drivers/gpu/drm/logicvc/logicvc_interface.c | 12 + + drivers/gpu/drm/loongson/lsdc_drv.c | 4 +- + drivers/gpu/drm/mcde/mcde_drv.c | 1 + + drivers/gpu/drm/mcde/mcde_dsi.c | 4 + + drivers/gpu/drm/mediatek/mtk_dp.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 12 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- + drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 2 +- + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 2 +- + drivers/gpu/drm/meson/meson_encoder_dsi.c | 2 +- + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 24 +- + drivers/gpu/drm/msm/dp/dp_drm.c | 4 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 25 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 13 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 2 - + drivers/gpu/drm/mxsfb/lcdif_drv.c | 2 +- + drivers/gpu/drm/mxsfb/lcdif_kms.c | 18 +- + drivers/gpu/drm/mxsfb/lcdif_regs.h | 1 + + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 + + drivers/gpu/drm/nouveau/dispnv50/base.h | 6 + + drivers/gpu/drm/nouveau/dispnv50/base507c.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/base827c.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/base907c.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 3 + + drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 + + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 40 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.h | 11 + + drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/wndwc67e.c | 1 + + drivers/gpu/drm/nouveau/dispnv50/wndwca7e.c | 1 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 14 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 36 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 8 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h | 2 + + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c | 8 +- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fbsr.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 39 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h | 1 + + drivers/gpu/drm/nova/Makefile | 5 +- + drivers/gpu/drm/nova/driver.rs | 36 +- + drivers/gpu/drm/nova/file.rs | 22 +- + drivers/gpu/drm/nova/gem.rs | 18 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 14 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 21 +- + drivers/gpu/drm/omapdrm/dss/dsi.h | 2 - + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +- + drivers/gpu/drm/omapdrm/dss/output.c | 1 + + drivers/gpu/drm/omapdrm/dss/sdi.c | 14 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 14 +- + drivers/gpu/drm/panel/Kconfig | 67 + + drivers/gpu/drm/panel/Makefile | 6 + + drivers/gpu/drm/panel/panel-anbernic-td4310.c | 258 + + .../gpu/drm/panel/panel-boe-th101mb31ig002-28a.c | 3 +- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 3 +- + drivers/gpu/drm/panel/panel-chipone-icna35xx.c | 423 + + drivers/gpu/drm/panel/panel-chipwealth-ch13726a.c | 3 +- + drivers/gpu/drm/panel/panel-edp.c | 73 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 3 +- + drivers/gpu/drm/panel/panel-focaltech-ota7290b.c | 3 +- + drivers/gpu/drm/panel/panel-himax-hx83102.c | 3 +- + drivers/gpu/drm/panel/panel-himax-hx83121a.c | 39 +- + drivers/gpu/drm/panel/panel-himax-hx8394.c | 3 +- + drivers/gpu/drm/panel/panel-ilitek-ili7807s.c | 285 + + drivers/gpu/drm/panel/panel-ilitek-ili9488.c | 290 + + drivers/gpu/drm/panel/panel-ilitek-ili9805.c | 212 +- + drivers/gpu/drm/panel/panel-ilitek-ili9806e-dsi.c | 3 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 3 +- + drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 3 +- + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 251 +- + drivers/gpu/drm/panel/panel-lvds.c | 2 +- + drivers/gpu/drm/panel/panel-novatek-nt36523.c | 3 +- + drivers/gpu/drm/panel/panel-novatek-nt36536.c | 486 + + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 522 +- + drivers/gpu/drm/panel/panel-novatek-nt37801.c | 106 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 14 +- + drivers/gpu/drm/panel/panel-renesas-r63419.c | 351 + + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 4 + + drivers/gpu/drm/panel/panel-simple.c | 38 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 3 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 99 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 3 +- + drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c | 42 +- + drivers/gpu/drm/panel/panel-visionox-vtdr6130.c | 42 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 1 - + drivers/gpu/drm/panfrost/panfrost_device.h | 1 - + drivers/gpu/drm/panfrost/panfrost_drv.c | 1 + + drivers/gpu/drm/panthor/panthor_device.h | 3 + + drivers/gpu/drm/panthor/panthor_drv.c | 16 +- + drivers/gpu/drm/panthor/panthor_fw.c | 22 +- + drivers/gpu/drm/panthor/panthor_gem.c | 18 + + drivers/gpu/drm/panthor/panthor_gem.h | 2 + + drivers/gpu/drm/panthor/panthor_mmu.c | 270 +- + drivers/gpu/drm/panthor/panthor_sched.c | 1 - + drivers/gpu/drm/pl111/pl111_drv.c | 1 + + drivers/gpu/drm/qxl/qxl_display.c | 12 +- + drivers/gpu/drm/qxl/qxl_drv.c | 15 +- + drivers/gpu/drm/radeon/r600_dpm.c | 21 +- + drivers/gpu/drm/radeon/radeon_bios.c | 64 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 20 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_encoder.c | 1 + + drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c | 3 +- + drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 2 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 1 + + drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 2 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 51 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 11 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c | 8 +- + drivers/gpu/drm/rockchip/dw_dp-rockchip.c | 16 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 228 +- + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 112 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 10 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 4 + + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 176 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 15 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 11 +- + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 46 +- + drivers/gpu/drm/scheduler/sched_entity.c | 7 - + drivers/gpu/drm/scheduler/sched_main.c | 9 - + drivers/gpu/drm/scheduler/tests/tests_basic.c | 359 + + drivers/gpu/drm/scheduler/tests/tests_scheduler.c | 2 +- + drivers/gpu/drm/solomon/ssd130x.c | 414 +- + drivers/gpu/drm/sti/sti_dvo.c | 23 +- + drivers/gpu/drm/sti/sti_hda.c | 20 +- + drivers/gpu/drm/sti/sti_hdmi.c | 20 +- + drivers/gpu/drm/stm/ltdc.c | 2 + + drivers/gpu/drm/stm/lvds.c | 14 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 3 + + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 19 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 13 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 23 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 23 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 24 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 10 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 16 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 10 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 71 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.h | 6 + + drivers/gpu/drm/sun4i/sun8i_vi_scaler.c | 20 +- + drivers/gpu/drm/sun4i/sun8i_vi_scaler.h | 1 + + drivers/gpu/drm/sysfb/Kconfig | 7 +- + drivers/gpu/drm/sysfb/simpledrm.c | 120 +- + drivers/gpu/drm/tegra/drm.c | 3 + + drivers/gpu/drm/tegra/dsi.c | 131 +- + drivers/gpu/drm/tegra/dsi.h | 10 + + drivers/gpu/drm/tegra/falcon.c | 66 +- + drivers/gpu/drm/tegra/falcon.h | 23 + + drivers/gpu/drm/tegra/output.c | 24 +- + drivers/gpu/drm/tegra/vic.c | 92 +- + drivers/gpu/drm/tegra/vic.h | 9 +- + drivers/gpu/drm/tests/Makefile | 3 +- + drivers/gpu/drm/tests/drm_bridge_test.c | 1017 +- + drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 347 +- + drivers/gpu/drm/tests/drm_kunit_edid.c | 995 + + drivers/gpu/drm/tests/drm_kunit_edid.h | 985 +- + drivers/gpu/drm/tidss/tidss_crtc.c | 17 +- + drivers/gpu/drm/tidss/tidss_encoder.c | 2 +- + drivers/gpu/drm/tidss/tidss_kms.c | 16 +- + drivers/gpu/drm/tidss/tidss_oldi.c | 2 +- + drivers/gpu/drm/tidss/tidss_plane.c | 2 +- + drivers/gpu/drm/tiny/gm12u320.c | 5 +- + drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 322 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 3 +- + drivers/gpu/drm/ttm/ttm_pool.c | 37 +- + drivers/gpu/drm/ttm/ttm_resource.c | 111 +- + drivers/gpu/drm/tve200/tve200_drv.c | 2 + + drivers/gpu/drm/tyr/Kconfig | 5 + + drivers/gpu/drm/tyr/driver.rs | 81 +- + drivers/gpu/drm/tyr/file.rs | 15 +- + drivers/gpu/drm/tyr/fw.rs | 321 + + drivers/gpu/drm/tyr/fw/parser.rs | 588 + + drivers/gpu/drm/tyr/gem.rs | 141 +- + drivers/gpu/drm/tyr/mmu.rs | 120 + + drivers/gpu/drm/tyr/mmu/address_space.rs | 511 + + drivers/gpu/drm/tyr/regs.rs | 149 +- + drivers/gpu/drm/tyr/slot.rs | 404 + + drivers/gpu/drm/tyr/tyr.rs | 4 + + drivers/gpu/drm/tyr/vm.rs | 950 + + drivers/gpu/drm/v3d/Kconfig | 1 + + drivers/gpu/drm/v3d/v3d_drv.c | 20 +- + drivers/gpu/drm/v3d/v3d_drv.h | 88 +- + drivers/gpu/drm/v3d/v3d_gem.c | 7 +- + drivers/gpu/drm/v3d/v3d_irq.c | 7 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 189 +- + drivers/gpu/drm/v3d/v3d_power.c | 4 + + drivers/gpu/drm/v3d/v3d_sched.c | 103 +- + drivers/gpu/drm/v3d/v3d_submit.c | 1008 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 2 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +- + drivers/gpu/drm/verisilicon/vs_bridge.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 101 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 26 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 71 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 90 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 45 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 50 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 5 +- + drivers/gpu/drm/xe/.gitignore | 1 + + drivers/gpu/drm/xe/.kunitconfig-display | 11 + + drivers/gpu/drm/xe/Kconfig.debug | 16 + + drivers/gpu/drm/xe/Kconfig.profile | 71 +- + drivers/gpu/drm/xe/Makefile | 5 + + drivers/gpu/drm/xe/abi/guc_actions_abi.h | 1 + + drivers/gpu/drm/xe/abi/guc_capture_abi.h | 3 +- + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 39 +- + drivers/gpu/drm/xe/abi/guc_scheduler_abi.h | 3 +- + drivers/gpu/drm/xe/abi/xe_driver_klvs_abi.h | 27 + + drivers/gpu/drm/xe/display/tests/Makefile | 13 + + drivers/gpu/drm/xe/display/xe_display.c | 284 +- + drivers/gpu/drm/xe/display/xe_display.h | 12 +- + drivers/gpu/drm/xe/display/xe_display_bo.c | 33 +- + drivers/gpu/drm/xe/display/xe_initial_plane.c | 58 +- + drivers/gpu/drm/xe/display/xe_panic.c | 26 +- + drivers/gpu/drm/xe/regs/xe_pmt.h | 2 + + drivers/gpu/drm/xe/regs/xe_regs.h | 2 + + drivers/gpu/drm/xe/tests/Makefile | 1 + + drivers/gpu/drm/xe/tests/xe_bo.c | 242 + + .../gpu/drm/xe/tests/xe_guc_klv_helpers_kunit.c | 429 + + drivers/gpu/drm/xe/tests/xe_live_test_mod.c | 6 + + drivers/gpu/drm/xe/tests/xe_pci.c | 53 +- + drivers/gpu/drm/xe/tests/xe_rtp_tables_test.c | 112 + + drivers/gpu/drm/xe/tests/xe_rtp_test.c | 52 + + drivers/gpu/drm/xe/tests/xe_sriov_packet_kunit.c | 89 + + drivers/gpu/drm/xe/tests/xe_wa_test.c | 3 - + drivers/gpu/drm/xe/xe_bo.c | 174 +- + drivers/gpu/drm/xe/xe_bo.h | 1 + + drivers/gpu/drm/xe/xe_configfs.c | 65 + + drivers/gpu/drm/xe/xe_configfs.h | 2 + + drivers/gpu/drm/xe/xe_debugfs.c | 166 +- + drivers/gpu/drm/xe/xe_debugfs.h | 6 + + drivers/gpu/drm/xe/xe_device.c | 70 +- + drivers/gpu/drm/xe/xe_device.h | 65 +- + drivers/gpu/drm/xe/xe_device_types.h | 45 +- + drivers/gpu/drm/xe/xe_drm_client.c | 5 +- + drivers/gpu/drm/xe/xe_drm_ras.c | 44 +- + drivers/gpu/drm/xe/xe_eu_stall.c | 42 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 17 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 29 +- + drivers/gpu/drm/xe/xe_execlist.c | 8 +- + drivers/gpu/drm/xe/xe_ggtt.c | 8 +- + drivers/gpu/drm/xe/xe_gt.c | 21 +- + drivers/gpu/drm/xe/xe_gt.h | 14 +- + drivers/gpu/drm/xe/xe_gt_mcr.c | 28 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 5 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c | 5 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 47 + + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 4 + + drivers/gpu/drm/xe/xe_gt_types.h | 17 +- + drivers/gpu/drm/xe/xe_guc.c | 70 + + drivers/gpu/drm/xe/xe_guc.h | 23 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 134 +- + drivers/gpu/drm/xe/xe_guc_capture.c | 21 +- + drivers/gpu/drm/xe/xe_guc_capture.h | 6 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 43 +- + drivers/gpu/drm/xe/xe_guc_engine_activity.c | 12 +- + drivers/gpu/drm/xe/xe_guc_exec_queue_types.h | 7 + + drivers/gpu/drm/xe/xe_guc_fwif.h | 1 + + drivers/gpu/drm/xe/xe_guc_klv_helpers.c | 260 +- + drivers/gpu/drm/xe/xe_guc_klv_helpers.h | 10 + + drivers/gpu/drm/xe/xe_guc_submit.c | 382 +- + drivers/gpu/drm/xe/xe_guc_submit.h | 1 + + drivers/gpu/drm/xe/xe_guc_tlb_inval.c | 6 - + drivers/gpu/drm/xe/xe_hw_engine.c | 300 +- + drivers/gpu/drm/xe/xe_hw_engine_group.c | 85 +- + drivers/gpu/drm/xe/xe_hw_engine_types.h | 7 +- + drivers/gpu/drm/xe/xe_hw_error.c | 34 +- + drivers/gpu/drm/xe/xe_i2c.c | 3 - + drivers/gpu/drm/xe/xe_lrc.c | 8 +- + drivers/gpu/drm/xe/xe_migrate.c | 65 +- + drivers/gpu/drm/xe/xe_mmio.c | 100 +- + drivers/gpu/drm/xe/xe_module.c | 3 - + drivers/gpu/drm/xe/xe_module.h | 1 - + drivers/gpu/drm/xe/xe_oa.c | 25 +- + drivers/gpu/drm/xe/xe_observation.c | 32 +- + drivers/gpu/drm/xe/xe_observation.h | 3 +- + drivers/gpu/drm/xe/xe_pat.c | 44 + + drivers/gpu/drm/xe/xe_pci.c | 206 +- + drivers/gpu/drm/xe/xe_pci_error.c | 139 + + drivers/gpu/drm/xe/xe_pci_error.h | 13 + + drivers/gpu/drm/xe/xe_pci_types.h | 3 + + drivers/gpu/drm/xe/xe_pcode.c | 40 +- + drivers/gpu/drm/xe/xe_pcode.h | 9 +- + drivers/gpu/drm/xe/xe_pm.c | 2 + + drivers/gpu/drm/xe/xe_preempt_fence.c | 7 + + drivers/gpu/drm/xe/xe_pt.c | 84 +- + drivers/gpu/drm/xe/xe_pxp.c | 35 +- + drivers/gpu/drm/xe/xe_query.c | 7 +- + drivers/gpu/drm/xe/xe_ras.c | 604 +- + drivers/gpu/drm/xe/xe_ras.h | 7 + + drivers/gpu/drm/xe/xe_ras_types.h | 216 + + drivers/gpu/drm/xe/xe_reg_whitelist.c | 5 +- + drivers/gpu/drm/xe/xe_reg_whitelist.h | 4 + + drivers/gpu/drm/xe/xe_rtp.c | 10 +- + drivers/gpu/drm/xe/xe_rtp.h | 19 + + drivers/gpu/drm/xe/xe_rtp_types.h | 33 +- + drivers/gpu/drm/xe/xe_sched_job.c | 2 +- + drivers/gpu/drm/xe/xe_sriov_packet.c | 115 +- + drivers/gpu/drm/xe/xe_step.c | 38 +- + drivers/gpu/drm/xe/xe_step.h | 8 +- + drivers/gpu/drm/xe/xe_survivability_mode.c | 13 +- + drivers/gpu/drm/xe/xe_svm.c | 68 +- + drivers/gpu/drm/xe/xe_svm.h | 14 +- + drivers/gpu/drm/xe/xe_sysctrl_event.c | 2 +- + drivers/gpu/drm/xe/xe_sysctrl_event_types.h | 3 - + drivers/gpu/drm/xe/xe_sysctrl_mailbox.c | 28 + + drivers/gpu/drm/xe/xe_sysctrl_mailbox.h | 3 + + drivers/gpu/drm/xe/xe_sysctrl_mailbox_types.h | 13 + + drivers/gpu/drm/xe/xe_tile.c | 4 +- + drivers/gpu/drm/xe/xe_trace.h | 5 + + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 16 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 71 +- + drivers/gpu/drm/xe/xe_tuning.c | 3 +- + drivers/gpu/drm/xe/xe_tuning.h | 6 + + drivers/gpu/drm/xe/xe_uc_fw.c | 1 + + drivers/gpu/drm/xe/xe_userptr.c | 7 +- + drivers/gpu/drm/xe/xe_vm.c | 28 +- + drivers/gpu/drm/xe/xe_wa.c | 15 +- + drivers/gpu/drm/xe/xe_wa.h | 7 + + drivers/gpu/drm/xe/xe_wa_oob.rules | 7 + + drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +- + drivers/gpu/host1x/Makefile | 3 +- + drivers/gpu/host1x/bus.c | 2 +- + drivers/gpu/host1x/cdma.c | 3 +- + drivers/gpu/host1x/context.c | 13 +- + drivers/gpu/host1x/debug.c | 4 +- + drivers/gpu/host1x/dev.c | 41 + + drivers/gpu/host1x/hw/cdma_hw.c | 14 +- + drivers/gpu/host1x/hw/channel_hw.c | 15 +- + drivers/gpu/host1x/hw/host1x10.c | 33 + + drivers/gpu/host1x/hw/host1x10.h | 15 + + drivers/gpu/host1x/hw/host1x10_hardware.h | 21 + + drivers/gpu/host1x/hw/hw_host1x10_common.h | 6 + + drivers/gpu/host1x/hw/hw_host1x10_hypervisor.h | 10 + + drivers/gpu/host1x/hw/hw_host1x10_uclass.h | 181 + + drivers/gpu/host1x/hw/hw_host1x10_vm.h | 36 + + drivers/gpu/host1x/intr.c | 5 +- + drivers/gpu/host1x/job.c | 2 +- + drivers/gpu/host1x/syncpt.c | 7 +- + drivers/gpu/host1x/syncpt.h | 3 +- + drivers/gpu/nova-core/.gitignore | 1 + + drivers/gpu/nova-core/Makefile | 5 +- + drivers/gpu/nova-core/bitfield.rs | 329 - + drivers/gpu/nova-core/falcon.rs | 272 +- + drivers/gpu/nova-core/falcon/fsp.rs | 65 +- + drivers/gpu/nova-core/falcon/gsp.rs | 32 +- + drivers/gpu/nova-core/falcon/hal.rs | 19 +- + drivers/gpu/nova-core/falcon/hal/ga102.rs | 36 +- + drivers/gpu/nova-core/falcon/hal/tu102.rs | 28 +- + drivers/gpu/nova-core/fb.rs | 104 +- + drivers/gpu/nova-core/fb/hal.rs | 2 +- + drivers/gpu/nova-core/fb/hal/ga100.rs | 10 +- + drivers/gpu/nova-core/fb/hal/ga102.rs | 2 +- + drivers/gpu/nova-core/fb/hal/gb100.rs | 11 +- + drivers/gpu/nova-core/fb/hal/gb202.rs | 39 +- + drivers/gpu/nova-core/fb/hal/gh100.rs | 37 +- + drivers/gpu/nova-core/fb/hal/tu102.rs | 14 +- + drivers/gpu/nova-core/fb/regs.rs | 155 + + drivers/gpu/nova-core/firmware.rs | 327 +- + drivers/gpu/nova-core/firmware/booter.rs | 344 +- + drivers/gpu/nova-core/firmware/fsp.rs | 88 +- + drivers/gpu/nova-core/firmware/fwsec.rs | 24 +- + drivers/gpu/nova-core/firmware/fwsec/bootloader.rs | 95 +- + drivers/gpu/nova-core/firmware/gsp.rs | 65 +- + drivers/gpu/nova-core/firmware/riscv.rs | 75 +- + drivers/gpu/nova-core/firmware/tlv.rs | 262 + + drivers/gpu/nova-core/fsp.rs | 366 +- + drivers/gpu/nova-core/fsp/hal.rs | 4 + + drivers/gpu/nova-core/fsp/hal/gb100.rs | 6 + + drivers/gpu/nova-core/fsp/hal/gb202.rs | 9 +- + drivers/gpu/nova-core/fsp/hal/gh100.rs | 9 +- + drivers/gpu/nova-core/gpu.rs | 191 +- + drivers/gpu/nova-core/gsp.rs | 48 +- + drivers/gpu/nova-core/gsp/boot.rs | 152 +- + drivers/gpu/nova-core/gsp/cmdq.rs | 11 +- + drivers/gpu/nova-core/gsp/commands.rs | 90 +- + drivers/gpu/nova-core/gsp/fw.rs | 119 +- + drivers/gpu/nova-core/gsp/fw/commands.rs | 42 +- + drivers/gpu/nova-core/gsp/fw/r570_144/bindings.rs | 1 + + drivers/gpu/nova-core/gsp/hal.rs | 72 +- + drivers/gpu/nova-core/gsp/hal/ga102.rs | 14 + + drivers/gpu/nova-core/gsp/hal/gh100.rs | 122 +- + drivers/gpu/nova-core/gsp/hal/tu102.rs | 390 +- + drivers/gpu/nova-core/gsp/regs.rs | 22 + + drivers/gpu/nova-core/gsp/sequencer.rs | 112 +- + drivers/gpu/nova-core/mctp.rs | 88 +- + drivers/gpu/nova-core/nova_core.rs | 6 +- + drivers/gpu/nova-core/nova_core_exports.c | 15 + + drivers/gpu/nova-core/regs.rs | 148 +- + drivers/gpu/nova-core/vbios.rs | 64 +- + drivers/gpu/nova-core/vgpu.rs | 91 + + drivers/gpu/nova-core/vgpu/hal.rs | 25 + + drivers/gpu/nova-core/vgpu/hal/gb202.rs | 15 + + drivers/gpu/nova-core/vgpu/hal/tu102.rs | 15 + + drivers/gpu/tests/.kunitconfig | 2 + + drivers/gpu/tests/gpu_buddy_test.c | 95 + + drivers/pci/iov.c | 2 +- + include/drm/bridge/analogix_dp.h | 13 +- + include/drm/bridge/dw_dp.h | 1 + + include/drm/display/drm_dp.h | 25 +- + include/drm/display/drm_dp_tunnel.h | 21 + + include/drm/display/drm_hdmi_state_helper.h | 4 +- + include/drm/drm_atomic.h | 5 +- + include/drm/drm_atomic_helper.h | 7 + + include/drm/drm_atomic_state_helper.h | 18 +- + include/drm/drm_bridge.h | 151 +- + include/drm/drm_colorop.h | 2 + + include/drm/drm_connector.h | 123 +- + include/drm/drm_crtc.h | 16 + + include/drm/drm_debugfs.h | 2 +- + include/drm/drm_drv.h | 10 +- + include/drm/drm_gem.h | 3 - + include/drm/drm_gem_shmem_helper.h | 4 + + include/drm/drm_gpusvm.h | 67 +- + include/drm/drm_gpuvm.h | 4 +- + include/drm/drm_managed.h | 2 +- + include/drm/drm_mipi_dsi.h | 2 + + include/drm/drm_mode_config.h | 1 + + include/drm/drm_modes.h | 1 + + include/drm/drm_of.h | 11 + + include/drm/drm_panel.h | 8 - + include/drm/drm_plane.h | 16 + + include/drm/drm_print.h | 2 +- + include/drm/gpu_scheduler.h | 3 +- + include/drm/intel/display_parent_interface.h | 4 +- + include/drm/intel/mchbar_regs.h | 2 - + include/drm/intel/pciids.h | 5 +- + include/drm/ttm/ttm_bo.h | 10 + + include/drm/ttm/ttm_resource.h | 13 +- + include/linux/cgroup.h | 21 + + include/linux/cgroup_dmem.h | 63 +- + include/linux/dma-fence-unwrap.h | 6 +- + include/linux/dma-fence.h | 4 +- + include/linux/font.h | 3 + + include/linux/gpu_buddy.h | 17 + + include/linux/pci.h | 4 +- + include/linux/perf_event.h | 31 +- + include/linux/sysfb.h | 4 +- + include/uapi/drm/amdgpu_drm.h | 21 + + include/uapi/drm/drm_fourcc.h | 209 +- + include/uapi/drm/drm_mode.h | 1 + + include/uapi/drm/ethosu_accel.h | 60 +- + include/uapi/drm/nouveau_drm.h | 1 + + include/uapi/drm/panthor_drm.h | 26 +- + include/uapi/drm/xe_drm.h | 17 +- + include/uapi/linux/kfd_ioctl.h | 180 +- + kernel/cgroup/dmem.c | 278 +- + kernel/events/core.c | 18 + + lib/fonts/fonts.c | 31 + + rust/helpers/pci.c | 8 + + rust/kernel/alloc/kvec.rs | 27 + + rust/kernel/dma.rs | 70 +- + rust/kernel/drm/device.rs | 291 +- + rust/kernel/drm/driver.rs | 113 +- + rust/kernel/drm/gem/mod.rs | 111 +- + rust/kernel/drm/gem/shmem.rs | 594 +- + rust/kernel/drm/gpuvm/mod.rs | 36 +- + rust/kernel/drm/gpuvm/sm_ops.rs | 4 +- + rust/kernel/drm/gpuvm/va.rs | 8 + + rust/kernel/drm/gpuvm/vm_bo.rs | 9 + + rust/kernel/drm/ioctl.rs | 56 +- + rust/kernel/drm/mod.rs | 4 +- + rust/kernel/faux.rs | 81 +- + rust/kernel/firmware.rs | 46 +- + rust/kernel/iommu/pgtable.rs | 32 +- + rust/kernel/pci.rs | 13 + + samples/rust/rust_driver_faux.rs | 3 +- + 1576 files changed, 229746 insertions(+), 39851 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-xe-ras + create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,r9a08g046-lvds.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/anbernic,td4310.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/chipone,icna3512.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili7807s.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9488.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt36536.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/renesas,r63419.yaml + create mode 100644 Documentation/gpu/intel-display/dp-link-capabilities.rst + create mode 100644 Documentation/gpu/intel-display/dp-link-training.rst + create mode 100644 Documentation/gpu/nova/core/fsp.rst + create mode 100644 Documentation/gpu/nova/core/tlv.rst + create mode 100644 drivers/accel/ethosu/ethosu_perfmon.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sa.h + rename drivers/gpu/drm/amd/{display/modules/power/power_helpers.c => amdgpu/amdgpu_video_codecs.h} (63%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_wb.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_wb.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_audio.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_audio.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_cursor.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_cursor.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.h + delete mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_kunit_helpers.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_audio_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_backlight_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_cursor_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_dmub_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_freesync_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_helpers_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_irq_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_kunit_test_helpers.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_mst_types_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_plane_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_pp_smu_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_quirks_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_services_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_test.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_wb_test.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn60/dalsmc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr_smu_msg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr_smu_msg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_probe.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dccg/dcn60/dcn60_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dccg/dcn60/dcn60_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm_cacp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm_cacp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn60/dcn60_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn60/dcn60_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn60/dcn60_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn60/dcn60_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/bounding_boxes/dcn5_soc_bb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/bounding_boxes/dcn6_soc_bb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/bounding_boxes/utm_qos_model_dchub_v1.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/bounding_boxes/utm_qos_model_dchub_v2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/bounding_boxes/utm_qos_model_dchub_v3.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/bounding_boxes/utm_qos_model_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_dmub_cmd.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_cga/dml2_cga_dcn6.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_cga/dml2_cga_dcn6.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_cga/dml2_cga_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_cga/dml2_cga_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_calcs_dsc_shared_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn5_calcs_dchub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn5_calcs_dchub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn5_calcs_display_pipe.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn5_calcs_display_pipe.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn5_calcs_dsc_latency.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn5_calcs_dsc_latency.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn5_funcs_initialize.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn5_funcs_initialize.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn5_funcs_mode_programming.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn5_funcs_mode_programming.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn5_funcs_mode_support.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn5_funcs_mode_support.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn6_calcs.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn6_calcs.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn6_calcs_dchub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn6_calcs_dchub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn6_funcs_initialize.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn6_funcs_initialize.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn6_funcs_mode_programming.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn6_funcs_mode_programming.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn6_funcs_mode_support.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn6_funcs_mode_support.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_dcn5.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_dcn5.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn5.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn5.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn5_stage_optimizers.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn5_stage_optimizers.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn6.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn6.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn6_stage_optimizers.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_dcn6_stage_optimizers.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_standalone_libraries/alternate_pstate_shared_lib.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_standalone_libraries/alternate_pstate_shared_lib.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_top/dml2_top_utm.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_top/dml2_top_utm.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_utm_soc_bb/dml2_utm_soc_bb_dcn5.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_utm_soc_bb/dml2_utm_soc_bb_dcn5.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_utm_soc_bb/dml2_utm_soc_bb_dcn6.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_utm_soc_bb/dml2_utm_soc_bb_dcn6.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_utm_soc_bb/dml2_utm_soc_bb_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_utm_soc_bb/dml2_utm_soc_bb_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn50/dcn50_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn50/dcn50_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn60/dcn60_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn60/dcn60_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn60/dcn60_dpp_dscl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/dcn60/dcn60_dsc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/dcn60/dcn60_dsc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn60/hw_factory_dcn60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn60/hw_factory_dcn60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn60/hw_translate_dcn60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn60/hw_translate_dcn60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hpo/dcn60/dcn60_hpo_frl_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hpo/dcn60/dcn60_hpo_frl_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hpo/dcn60/dcn60_hpo_frl_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hpo/dcn60/dcn60_hpo_frl_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/dcn60/dcn60_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/dcn60/dcn60_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/dcn50/dcn50_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/dcn50/dcn50_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/dcn60/dcn60_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/dcn60/dcn60_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn50/dcn50_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn50/dcn50_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn60/dcn60_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn60/dcn60_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn60/dcn60_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn60/dcn60_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn60/irq_service_dcn60.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn60/irq_service_dcn60.h + create mode 100644 drivers/gpu/drm/amd/display/dc/mmhubbub/dcn401/dcn401_mmhubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/mmhubbub/dcn401/dcn401_mmhubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/mpc/dcn60/dcn60_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/mpc/dcn60/dcn60_mpc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/opp/dcn60/dcn60_opp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/opp/dcn60/dcn60_opp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/dcn60/dcn60_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/dcn60/dcn60_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn60/dcn60_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn60/dcn60_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn42b/dcn42b_soc_and_ip_translator.c + create mode 100644 drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn42b/dcn42b_soc_and_ip_translator.h + create mode 100644 drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn60/dcn60_soc_and_ip_translator.c + create mode 100644 drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn60/dcn60_soc_and_ip_translator.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn60.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn60.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_6_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_6_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_6_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_6_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_5_0_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_5_0_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v15_0_0_metrics.h + rename drivers/gpu/drm/amd/ras/{rascore => core}/Makefile (86%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_aca.c => core/aca.c} (97%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_aca.h => core/aca.h} (98%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_aca_v1_0.c => core/aca_v1_0.c} (97%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_aca_v1_0.h => core/aca_v1_0.h} (98%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_cmd.c => core/cmd.c} (99%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_cmd.h => core/cmd.h} (99%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_core.c => core/core.c} (94%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_core_status.h => core/core_status.h} (96%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_eeprom.c => core/eeprom.c} (99%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_eeprom.h => core/eeprom.h} (97%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_eeprom_fw.c => core/eeprom_fw.c} (99%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_eeprom_fw.h => core/eeprom_fw.h} (98%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_log_ring.c => core/log_ring.c} (99%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_log_ring.h => core/log_ring.h} (97%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras.h (94%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_cper.c (99%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_cper.h (100%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_gfx.c (98%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_gfx.h (100%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_gfx_v9_0.c (99%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_gfx_v9_0.h (100%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_mp1.c (86%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_mp1.h (92%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_mp1_v13_0.c (89%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_mp1_v13_0.h (100%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_nbio.c (100%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_nbio.h (100%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_nbio_v7_9.c (100%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_nbio_v7_9.h (100%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_process.c (98%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_process.h (100%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_psp.c (99%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_psp.h (99%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_psp_v13_0.c (100%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_psp_v13_0.h (100%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_umc.c (77%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_umc.h (78%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_umc_v12_0.c (75%) + rename drivers/gpu/drm/amd/ras/{rascore => core}/ras_umc_v12_0.h (99%) + rename drivers/gpu/drm/amd/ras/{rascore/ras_ta_if.h => core/ta_if.h} (99%) + create mode 100644 drivers/gpu/drm/bridge/imx/imx93-pdfc.c + create mode 100644 drivers/gpu/drm/i915/.kunitconfig + create mode 100644 drivers/gpu/drm/i915/display/intel_dp_link_caps.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dp_link_caps.h + create mode 100644 drivers/gpu/drm/i915/display/tests/Makefile + create mode 100644 drivers/gpu/drm/i915/display/tests/intel_dp_link_test.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_panic.c + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_panic.h + delete mode 100644 drivers/gpu/drm/i915/i915_panic.c + delete mode 100644 drivers/gpu/drm/i915/i915_panic.h + create mode 100644 drivers/gpu/drm/imagination/pvr_check.h + create mode 100644 drivers/gpu/drm/panel/panel-anbernic-td4310.c + create mode 100644 drivers/gpu/drm/panel/panel-chipone-icna35xx.c + create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili7807s.c + create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9488.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt36536.c + create mode 100644 drivers/gpu/drm/panel/panel-renesas-r63419.c + create mode 100644 drivers/gpu/drm/tests/drm_kunit_edid.c + create mode 100644 drivers/gpu/drm/tyr/fw.rs + create mode 100644 drivers/gpu/drm/tyr/fw/parser.rs + create mode 100644 drivers/gpu/drm/tyr/mmu.rs + create mode 100644 drivers/gpu/drm/tyr/mmu/address_space.rs + create mode 100644 drivers/gpu/drm/tyr/slot.rs + create mode 100644 drivers/gpu/drm/tyr/vm.rs + create mode 100644 drivers/gpu/drm/xe/.kunitconfig-display + create mode 100644 drivers/gpu/drm/xe/abi/xe_driver_klvs_abi.h + create mode 100644 drivers/gpu/drm/xe/display/tests/Makefile + create mode 100644 drivers/gpu/drm/xe/tests/xe_guc_klv_helpers_kunit.c + create mode 100644 drivers/gpu/drm/xe/tests/xe_rtp_tables_test.c + create mode 100644 drivers/gpu/drm/xe/tests/xe_sriov_packet_kunit.c + create mode 100644 drivers/gpu/drm/xe/xe_pci_error.c + create mode 100644 drivers/gpu/drm/xe/xe_pci_error.h + create mode 100644 drivers/gpu/host1x/hw/host1x10.c + create mode 100644 drivers/gpu/host1x/hw/host1x10.h + create mode 100644 drivers/gpu/host1x/hw/host1x10_hardware.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x10_common.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x10_hypervisor.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x10_uclass.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x10_vm.h + create mode 100644 drivers/gpu/nova-core/.gitignore + delete mode 100644 drivers/gpu/nova-core/bitfield.rs + create mode 100644 drivers/gpu/nova-core/fb/regs.rs + create mode 100644 drivers/gpu/nova-core/firmware/tlv.rs + create mode 100644 drivers/gpu/nova-core/gsp/hal/ga102.rs + create mode 100644 drivers/gpu/nova-core/gsp/regs.rs + create mode 100644 drivers/gpu/nova-core/nova_core_exports.c + create mode 100644 drivers/gpu/nova-core/vgpu.rs + create mode 100644 drivers/gpu/nova-core/vgpu/hal.rs + create mode 100644 drivers/gpu/nova-core/vgpu/hal/gb202.rs + create mode 100644 drivers/gpu/nova-core/vgpu/hal/tu102.rs + create mode 100644 drivers/gpu/tests/.kunitconfig +$ 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. +$ git am -3 ../patches/0001-drm-Fix-up-merge-with-sched-entity-reverts.patch +Applying: drm: Fix up merge with sched entity reverts +Using index info to reconstruct a base tree... +M drivers/gpu/drm/scheduler/sched_entity.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/scheduler/sched_entity.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/scheduler/sched_entity.c +Recorded preimage for 'drivers/gpu/drm/scheduler/sched_entity.c' +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +hint: When you have resolved this problem, run "git am --continue". +hint: If you prefer to skip this patch, run "git am --skip" instead. +hint: To restore the original branch and stop patching, run "git am --abort". +hint: Disable this message with "git config advice.mergeConflict false" +Patch failed at 0001 drm: Fix up merge with sched entity reverts +$ git am -3 ../patches/0001-drm-Fix-up-mismerge-with-dc_disable_dangling_timing_.patch +Applying: drm: Fix up mismerge with dc_disable_dangling_timing_generators +Using index info to reconstruct a base tree... +M drivers/gpu/drm/amd/display/dc/core/dc.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging drm-exynos/for-linux-next (3a8660878839f Linux 6.18-rc1) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (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 +Merge made by the 'ort' strategy. + drivers/gpu/drm/drm_mode_config.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +$ 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 +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 54 +++++++++++++++++++--- + 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 | 49 ++++++++++---------- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 6 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 27 ++++++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 3 ++ + 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 | 2 +- + .../amd/display/amdgpu_dm/amdgpu_dm_backlight.c | 8 ++-- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 13 ++++++ + drivers/gpu/drm/radeon/atombios_crtc.c | 5 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 23 +++++---- + 16 files changed, 160 insertions(+), 74 deletions(-) +$ 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 +Auto-merging Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml +Auto-merging Documentation/devicetree/bindings/iommu/arm,smmu.yaml +Auto-merging drivers/gpu/drm/msm/adreno/adreno_gpu.c +Auto-merging drivers/gpu/drm/msm/msm_gem.c +Auto-merging drivers/gpu/drm/msm/msm_gem_vma.c +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 +- + 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 +- + include/uapi/drm/msm_drm.h | 6 +- + 49 files changed, 1456 insertions(+), 833 deletions(-) + create mode 100644 drivers/gpu/drm/msm/adreno/adreno_gen7_17_0_snapshot.h +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 (a1c1dbd0f047b drm/xe: don't WARN on kernel job timeout when device already wedged) +$ 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/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_guc_pc.c +Auto-merging drivers/gpu/drm/xe/xe_oa.c +Auto-merging drivers/gpu/drm/xe/xe_ras.c +Merge made by the 'ort' strategy. + 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/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/tests/xe_migrate.c | 3 +- + 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 | 7 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 80 +++ + 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_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 | 273 +++++++--- + 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_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 | 14 +- + 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 +- + include/drm/drm_device.h | 1 + + include/drm/drm_ras.h | 5 + + include/uapi/drm/drm_ras.h | 15 + + 79 files changed, 4296 insertions(+), 590 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 (8c3c7f132f146 fbdev: omapfb: panel-dsi-cm: initialize lock before registering display) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/core/fb_io_fops.c +Auto-merging include/linux/font.h +Merge made by the 'ort' strategy. + drivers/video/fbdev/Kconfig | 3 +- + drivers/video/fbdev/atafb.c | 291 ++++++++++++++++++++- + drivers/video/fbdev/aty/aty128fb.c | 40 +-- + drivers/video/fbdev/aty/atyfb_base.c | 47 ++-- + drivers/video/fbdev/au1100fb.c | 2 +- + drivers/video/fbdev/clps711x-fb.c | 2 - + drivers/video/fbdev/core/fb_io_fops.c | 16 ++ + drivers/video/fbdev/core/fb_sys_fops.c | 16 ++ + drivers/video/fbdev/kyro/fbdev.c | 24 +- + drivers/video/fbdev/matrox/matroxfb_base.c | 30 +-- + drivers/video/fbdev/maxinefb.c | 15 +- + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 6 +- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 2 - + drivers/video/fbdev/nvidia/nvidia.c | 19 +- + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 8 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 9 +- + drivers/video/fbdev/platinumfb.c | 36 ++- + drivers/video/fbdev/pvr2fb.c | 4 +- + drivers/video/fbdev/pxa168fb.c | 1 - + drivers/video/fbdev/pxa3xx-gcu.c | 4 +- + drivers/video/fbdev/pxafb.c | 1 - + drivers/video/fbdev/s3c-fb.c | 4 +- + drivers/video/fbdev/sa1100fb.c | 4 +- + drivers/video/fbdev/savage/savagefb_driver.c | 16 +- + drivers/video/fbdev/ssd1307fb.c | 72 ++++- + drivers/video/fbdev/sstfb.c | 1 + + drivers/video/fbdev/tdfxfb.c | 157 ++++++++++- + drivers/video/fbdev/udlfb.c | 22 +- + drivers/video/fbdev/uvesafb.c | 2 + + drivers/video/fbdev/via/viafbdev.c | 3 +- + drivers/video/sticore.c | 22 +- + include/linux/font.h | 4 +- + include/video/maxinefb.h | 4 +- + 33 files changed, 712 insertions(+), 175 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 e94002ce32ebe] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git + Date: Thu Aug 20 13:40:22 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 (2b366b833f52a ALSA: hda/conexant: Simplify headset plugin type handling) +$ 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 +Merge made by the 'ort' strategy. + drivers/firewire/.kunitconfig | 1 + + drivers/firewire/Kconfig | 15 + + drivers/firewire/core-card.c | 32 +- + drivers/firewire/core-topology.c | 62 ++-- + drivers/firewire/node-tree-test.c | 607 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 687 insertions(+), 30 deletions(-) + create mode 100644 drivers/firewire/node-tree-test.c +Merging sound-asoc/for-next (2792cc1b80b76 Merge remote-tracking branch 'asoc/for-7.3' into asoc-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Merge made by the 'ort' strategy. +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 +Auto-merging kernel/params.c +Auto-merging rust/macros/lib.rs +Auto-merging rust/macros/module.rs +Merge made by the 'ort' strategy. + arch/xtensa/platforms/iss/simdisk.c | 38 ++++++-- + include/linux/module.h | 4 - + kernel/module/dups.c | 173 ++++++++++++++++-------------------- + kernel/module/kallsyms.c | 24 +++-- + kernel/module/main.c | 29 ++++-- + kernel/module/procfs.c | 2 +- + kernel/module/stats.c | 2 +- + kernel/params.c | 16 ++-- + rust/kernel/module_param.rs | 27 +++++- + rust/macros/lib.rs | 1 + + rust/macros/module.rs | 1 + + samples/rust/rust_minimal.rs | 10 ++- + scripts/module.lds.S | 5 -- + 13 files changed, 196 insertions(+), 136 deletions(-) +Merging input/next (9a29ee801f525 Input: rmi4 - use platform data instead of query, when available) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Already up to date. +Merging block/for-next (a33221f7ab120 Merge branch 'for-7.3/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git block/for-next +Auto-merging MAINTAINERS +Auto-merging block/bdev.c +Auto-merging block/fops.c +Auto-merging drivers/block/ublk_drv.c +Auto-merging drivers/nvme/host/rdma.c +Auto-merging drivers/nvme/target/rdma.c +Auto-merging fs/aio.c +Auto-merging fs/buffer.c +Auto-merging fs/erofs/zdata.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/iomap/direct-io.c +Auto-merging fs/iomap/ioend.c +Auto-merging include/linux/blk_types.h +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/io_uring_types.h +Auto-merging include/linux/iomap.h +Auto-merging include/linux/list.h +Auto-merging io_uring/io_uring.c +Auto-merging io_uring/rsrc.c +Auto-merging io_uring/rsrc.h +Auto-merging kernel/exit.c +Auto-merging kernel/sched/core.c +Auto-merging mm/madvise.c +Auto-merging mm/page-writeback.c +Auto-merging mm/swap_state.c +Auto-merging mm/vmscan.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/configfs-nvmet | 352 ++++++ + Documentation/ABI/stable/sysfs-nvme | 453 ++++++++ + Documentation/ABI/testing/sysfs-nvme | 13 - + Documentation/admin-guide/blockdev/zoned_loop.rst | 15 +- + Documentation/block/biovecs.rst | 8 +- + MAINTAINERS | 4 + + block/bdev.c | 1 - + block/bfq-cgroup.c | 4 +- + block/bio-integrity-auto.c | 10 +- + block/bio-integrity-fs.c | 6 +- + block/bio.c | 206 +++- + block/blk-cgroup-rwstat.c | 5 +- + block/blk-cgroup.c | 80 +- + block/blk-cgroup.h | 25 +- + block/blk-core.c | 6 +- + block/blk-iocost.c | 21 +- + block/blk-iolatency.c | 13 +- + block/blk-map.c | 4 +- + block/blk-merge.c | 8 +- + block/blk-mq-dma.c | 2 +- + block/blk-mq.c | 1 + + block/blk-stat.c | 2 +- + block/blk-throttle.h | 2 - + block/blk-zoned.c | 30 - + block/blk.h | 2 +- + block/fops.c | 28 +- + block/genhd.c | 1 + + block/ioctl.c | 60 +- + block/kyber-iosched.c | 2 +- + block/mq-deadline.c | 25 +- + drivers/block/loop.c | 48 +- + drivers/block/mtip32xx/mtip32xx.c | 7 + + drivers/block/mtip32xx/mtip32xx.h | 2 + + drivers/block/nbd.c | 257 +++-- + drivers/block/null_blk/main.c | 106 +- + drivers/block/null_blk/zoned.c | 10 +- + drivers/block/swim3.c | 1 + + drivers/block/ublk_drv.c | 378 +++--- + drivers/block/zloop.c | 42 +- + drivers/md/dm-io-rewind.c | 10 +- + drivers/md/dm-pcache/segment.c | 4 +- + drivers/md/md-bitmap.c | 22 +- + drivers/md/md-bitmap.h | 12 +- + drivers/md/md-linear.c | 1 + + drivers/md/md-llbitmap.c | 754 ++++++++++-- + drivers/md/md.c | 178 ++- + drivers/md/md.h | 15 +- + drivers/md/raid0.c | 1 + + drivers/md/raid1-10.c | 8 +- + drivers/md/raid1.c | 139 +-- + drivers/md/raid10.c | 227 ++-- + drivers/md/raid10.h | 2 +- + drivers/md/raid5-ppl.c | 4 +- + drivers/md/raid5.c | 318 ++++-- + drivers/nvdimm/btt.c | 2 +- + drivers/nvme/common/auth.c | 13 +- + drivers/nvme/host/Makefile | 1 + + drivers/nvme/host/apple.c | 66 +- + drivers/nvme/host/auth.c | 3 +- + drivers/nvme/host/core.c | 52 +- + drivers/nvme/host/fabrics.c | 4 +- + drivers/nvme/host/fc.c | 8 +- + drivers/nvme/host/ioctl.c | 121 +- + drivers/nvme/host/multipath.c | 64 +- + drivers/nvme/host/nvme.h | 67 +- + drivers/nvme/host/pci.c | 31 +- + drivers/nvme/host/rdma.c | 160 ++- + drivers/nvme/host/sysfs.c | 4 +- + drivers/nvme/host/tcp.c | 73 +- + drivers/nvme/host/zns.c | 11 +- + drivers/nvme/target/admin-cmd.c | 14 +- + drivers/nvme/target/configfs.c | 10 +- + drivers/nvme/target/core.c | 56 +- + drivers/nvme/target/debugfs.c | 103 ++ + drivers/nvme/target/debugfs.h | 5 + + drivers/nvme/target/fabrics-cmd-auth.c | 17 +- + drivers/nvme/target/fabrics-cmd.c | 2 +- + drivers/nvme/target/fc.c | 2 +- + drivers/nvme/target/nvmet.h | 9 + + drivers/nvme/target/passthru.c | 9 + + drivers/nvme/target/pci-epf.c | 12 +- + drivers/nvme/target/pr.c | 37 +- + drivers/nvme/target/rdma.c | 31 +- + drivers/nvme/target/tcp.c | 19 +- + drivers/nvme/target/zns.c | 15 +- + drivers/s390/block/Makefile | 2 + + drivers/s390/block/dasd.c | 246 +++- + drivers/s390/block/dasd_3990_erp.c | 1 + + drivers/s390/block/dasd_devmap.c | 90 +- + drivers/s390/block/dasd_eckd.c | 1270 ++++++++++++++++++--- + drivers/s390/block/dasd_eckd.h | 68 +- + drivers/s390/block/dasd_erp.c | 11 +- + drivers/s390/block/dasd_int.h | 149 ++- + fs/aio.c | 2 +- + fs/btrfs/misc.h | 2 +- + fs/buffer.c | 3 + + fs/erofs/zdata.c | 11 +- + fs/fs-writeback.c | 2 +- + fs/iomap/direct-io.c | 1 + + fs/iomap/ioend.c | 5 +- + fs/xfs/xfs_aops.c | 19 +- + include/linux/bio-integrity.h | 3 + + include/linux/bio.h | 43 +- + include/linux/blk-cgroup.h | 23 +- + include/linux/blk_plug.h | 95 ++ + include/linux/blk_types.h | 1 + + include/linux/blkdev.h | 86 +- + include/linux/bvec.h | 14 +- + include/linux/io_uring_types.h | 13 +- + include/linux/iomap.h | 5 +- + include/linux/list.h | 9 + + include/linux/nvme.h | 4 +- + include/linux/uio.h | 10 +- + include/uapi/linux/blkdev.h | 1 + + include/uapi/linux/io_uring/zcrx.h | 7 + + include/uapi/linux/ublk_cmd.h | 5 +- + io_uring/eventfd.c | 8 +- + io_uring/eventfd.h | 2 +- + io_uring/futex.c | 32 +- + io_uring/futex.h | 1 + + io_uring/io-wq.c | 14 +- + io_uring/io_uring.c | 17 +- + io_uring/io_uring.h | 3 +- + io_uring/kbuf.c | 1 + + io_uring/memmap.c | 39 +- + io_uring/net.c | 81 +- + io_uring/opdef.c | 2 +- + io_uring/poll.c | 23 +- + io_uring/query.c | 2 +- + io_uring/rsrc.c | 2 +- + io_uring/rsrc.h | 2 + + io_uring/rw.c | 24 +- + io_uring/rw.h | 1 + + io_uring/sqpoll.c | 7 +- + io_uring/tw.c | 2 +- + io_uring/uring_cmd.c | 10 +- + io_uring/waitid.c | 2 +- + io_uring/zcrx.c | 400 +++++-- + io_uring/zcrx.h | 15 +- + kernel/exit.c | 1 - + kernel/sched/core.c | 1 - + lib/iov_iter.c | 11 +- + mm/madvise.c | 2 +- + mm/page-writeback.c | 1 - + mm/readahead.c | 2 +- + mm/swap_state.c | 2 +- + mm/vmscan.c | 2 +- + net/ceph/messenger.c | 4 +- + tools/testing/selftests/ublk/Makefile | 4 + + tools/testing/selftests/ublk/batch.c | 2 +- + tools/testing/selftests/ublk/kublk.c | 210 +++- + tools/testing/selftests/ublk/kublk.h | 43 +- + tools/testing/selftests/ublk/test_batch_04.sh | 44 + + tools/testing/selftests/ublk/test_loop_08.sh | 25 + + tools/testing/selftests/ublk/test_params_01.sh | 114 ++ + 155 files changed, 6470 insertions(+), 1845 deletions(-) + create mode 100644 Documentation/ABI/stable/configfs-nvmet + create mode 100644 Documentation/ABI/stable/sysfs-nvme + delete mode 100644 Documentation/ABI/testing/sysfs-nvme + create mode 100644 include/linux/blk_plug.h + create mode 100755 tools/testing/selftests/ublk/test_batch_04.sh + create mode 100755 tools/testing/selftests/ublk/test_loop_08.sh + create mode 100755 tools/testing/selftests/ublk/test_params_01.sh +$ 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 b5ed1f7033fc8] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Thu Aug 20 13:40:33 2026 +0100 +$ git am -3 ../patches/0001-fs-Fix-up-semantic-conflict-with-bio_iov_iter_get_pa.patch +Applying: fs: Fix up semantic conflict with bio_iov_iter_get_pages +$ git reset HEAD^ +Unstaged changes after reset: +M fs/iomap/direct-io.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master c173295d3b7a0] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Thu Aug 20 13:40:33 2026 +0100 +$ git am -3 ../patches/0001-io_uring-Add-missing-include-for-ITER_SOURCE-and-ITE.patch +Applying: io_uring: Add missing include for ITER_SOURCE and ITER_DEST +Using index info to reconstruct a base tree... +M include/linux/io_uring_types.h +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +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 +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/st/stih407-family.dtsi +Merge made by the 'ort' strategy. + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 4 +- + .../devicetree/bindings/mmc/mmc-card.yaml | 23 +++- + .../bindings/mmc/nvidia,tegra20-sdhci.yaml | 6 + + .../devicetree/bindings/mmc/qcom,sdhci-msm.yaml | 95 ++++++++++----- + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 1 + + Documentation/devicetree/bindings/mmc/sdhci-st.txt | 110 ----------------- + .../devicetree/bindings/mmc/st,sdhci.yaml | 105 +++++++++++++++++ + .../devicetree/bindings/mmc/ti,omap2420-mmc.yaml | 60 ++++++++++ + Documentation/devicetree/bindings/mmc/ti-omap.txt | 26 ---- + MAINTAINERS | 7 ++ + arch/arm/boot/dts/st/stih407-family.dtsi | 4 +- + arch/arm/boot/dts/st/stih410-b2260.dts | 4 +- + arch/arm/boot/dts/st/stih418-b2199.dts | 4 +- + arch/arm/boot/dts/st/stih418.dtsi | 2 +- + drivers/misc/cardreader/rtsx_usb.c | 26 +++- + drivers/mmc/core/block.c | 5 + + drivers/mmc/core/sd.c | 9 +- + drivers/mmc/host/alcor.c | 3 +- + drivers/mmc/host/bcm2835.c | 37 +++--- + drivers/mmc/host/cavium-octeon.c | 10 +- + drivers/mmc/host/cqhci-core.c | 17 ++- + drivers/mmc/host/cqhci.h | 3 +- + drivers/mmc/host/dw_mmc-pltfm.h | 1 - + drivers/mmc/host/dw_mmc.c | 1 + + drivers/mmc/host/dw_mmc.h | 2 + + drivers/mmc/host/litex_mmc.c | 131 +++++---------------- + drivers/mmc/host/meson-mx-sdio.c | 5 +- + drivers/mmc/host/moxart-mmc.c | 40 +++---- + drivers/mmc/host/mtk-sd.c | 2 +- + drivers/mmc/host/mvsdio.c | 4 +- + drivers/mmc/host/omap_hsmmc.c | 15 +-- + drivers/mmc/host/owl-mmc.c | 5 +- + drivers/mmc/host/pxamci.c | 3 +- + drivers/mmc/host/rtsx_usb_sdmmc.c | 13 +- + drivers/mmc/host/sdhci-brcmstb.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- + drivers/mmc/host/sdhci-esdhc-mcf.c | 24 ++-- + drivers/mmc/host/sdhci-msm.c | 6 +- + drivers/mmc/host/sdhci-of-arasan.c | 2 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 3 +- + drivers/mmc/host/sdhci-of-ma35d1.c | 1 + + drivers/mmc/host/sdhci-pci-core.c | 2 +- + drivers/mmc/host/sdhci-pci-gli.c | 2 +- + drivers/mmc/host/sdhci-tegra.c | 32 ++++- + drivers/mmc/host/sdhci_am654.c | 2 +- + drivers/mmc/host/sh_mmcif.c | 8 +- + drivers/mmc/host/via-sdmmc.c | 12 +- + drivers/mmc/host/wbsd.c | 6 +- + include/linux/rtsx_usb.h | 3 + + include/linux/soc/pxa/cpu.h | 58 +-------- + 50 files changed, 488 insertions(+), 460 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-st.txt + create mode 100644 Documentation/devicetree/bindings/mmc/st,sdhci.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/ti-omap.txt +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 +Auto-merging Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/mfd/cros_ec_dev.c +Auto-merging drivers/mfd/cs42l43-i2c.c +Auto-merging drivers/mfd/cs42l43-sdw.c +Auto-merging drivers/mfd/motorola-cpcap.c +Auto-merging drivers/mfd/ocelot-spi.c +Auto-merging drivers/mfd/sm501.c +Auto-merging drivers/thermal/db8500_thermal.c +Auto-merging include/linux/mfd/ucb1x00.h +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/Makefile | 2 +- + .../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/vendor-prefixes.yaml | 2 + + MAINTAINERS | 13 + + arch/arm/mach-ux500/cpu-db8500.c | 6 +- + drivers/clk/ux500/clk-prcmu.c | 20 +- + drivers/clk/ux500/u8500_of_clk.c | 2 +- + drivers/cpuidle/cpuidle-ux500.c | 6 +- + 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/platform/chrome/cros_ec_proto.c | 30 +- + drivers/regulator/db8500-prcmu.c | 12 +- + drivers/thermal/db8500_thermal.c | 10 +- + drivers/watchdog/db8500_wdt.c | 22 +- + 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/platform_data/cros_ec_proto.h | 2 + + sound/soc/ux500/ux500_msp_dai.c | 2 +- + 71 files changed, 887 insertions(+), 1133 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mfd/omap-usb-tll.txt + create mode 100644 Documentation/devicetree/bindings/mfd/ti,usbhs-tll.yaml + create mode 100644 drivers/mfd/rohm-pwrbutton.c + create mode 100644 drivers/mfd/rohm-pwrbutton.h + delete mode 100644 include/linux/mfd/dbx500-prcmu.h +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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/leds/backlight/88pm860x.txt | 1 + + .../bindings/leds/backlight/awinic,aw99706.yaml | 2 +- + .../bindings/leds/backlight/silergy,sy7758.yaml | 52 +++++ + MAINTAINERS | 2 +- + 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 +++++++++++++++++++++ + 11 files changed, 350 insertions(+), 26 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/silergy,sy7758.yaml + create mode 100644 drivers/video/backlight/sy7758.c +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 +Auto-merging Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/power/reset/pwr-mlxbf.c +Auto-merging drivers/power/supply/bd71828-power.c +Auto-merging drivers/power/supply/bq24190_charger.c +Auto-merging drivers/power/supply/bq25890_charger.c +Auto-merging drivers/power/supply/cpcap-charger.c +Auto-merging drivers/power/supply/cros_peripheral_charger.c +Auto-merging drivers/power/supply/cros_usbpd-charger.c +Auto-merging drivers/power/supply/max14656_charger_detector.c +Auto-merging drivers/power/supply/max17040_battery.c +Auto-merging drivers/power/supply/max17042_battery.c +Auto-merging drivers/power/supply/max77759_charger.c +Auto-merging drivers/power/supply/max8971_charger.c +Auto-merging drivers/power/supply/mp2629_charger.c +Auto-merging drivers/power/supply/pm8916_lbc.c +Auto-merging drivers/power/supply/rt9467-charger.c +Auto-merging drivers/power/supply/rt9471.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-power | 2 +- + .../devicetree/bindings/power/reset/qcom,pon.yaml | 20 +- + .../bindings/power/supply/maxim,max17042.yaml | 4 +- + .../bindings/power/supply/maxim,max8903.yaml | 53 + + .../bindings/power/supply/sgmicro,sgm41542.yaml | 96 ++ + .../bindings/power/supply/ti,bq25630.yaml | 55 + + MAINTAINERS | 6 + + drivers/power/reset/Kconfig | 12 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/mcf-rcm-reset.c | 126 +++ + drivers/power/reset/piix4-poweroff.c | 1 + + drivers/power/reset/pwr-mlxbf.c | 2 - + drivers/power/reset/reboot-mode.c | 30 +- + drivers/power/reset/syscon-reboot.c | 4 +- + drivers/power/supply/88pm860x_battery.c | 10 +- + drivers/power/supply/88pm860x_charger.c | 5 +- + drivers/power/supply/Kconfig | 16 + + drivers/power/supply/Makefile | 2 + + drivers/power/supply/ab8500_btemp.c | 5 +- + drivers/power/supply/ab8500_charger.c | 5 +- + drivers/power/supply/ab8500_fg.c | 32 +- + drivers/power/supply/act8945a_charger.c | 4 +- + drivers/power/supply/axp20x_ac_power.c | 5 +- + drivers/power/supply/axp20x_usb_power.c | 5 +- + drivers/power/supply/axp288_charger.c | 3 +- + drivers/power/supply/axp288_fuel_gauge.c | 2 +- + drivers/power/supply/bd71828-power.c | 20 +- + drivers/power/supply/bd99954-charger.h | 23 +- + drivers/power/supply/bq24190_charger.c | 18 +- + drivers/power/supply/bq24257_charger.c | 20 +- + drivers/power/supply/bq24735-charger.c | 6 +- + drivers/power/supply/bq25630_charger.c | 1075 +++++++++++++++++++ + drivers/power/supply/bq256xx_charger.c | 41 +- + drivers/power/supply/bq257xx_charger.c | 530 ++++++++- + drivers/power/supply/bq25890_charger.c | 12 + + drivers/power/supply/bq27xxx_battery.c | 6 +- + drivers/power/supply/charger-manager.c | 54 +- + drivers/power/supply/cpcap-battery.c | 6 +- + drivers/power/supply/cpcap-charger.c | 6 +- + drivers/power/supply/cros_peripheral_charger.c | 13 +- + drivers/power/supply/cros_usbpd-charger.c | 17 +- + drivers/power/supply/cw2015_battery.c | 1 + + drivers/power/supply/da9150-fg.c | 4 +- + drivers/power/supply/generic-adc-battery.c | 2 +- + drivers/power/supply/isp1704_charger.c | 1 + + drivers/power/supply/lp8727_charger.c | 4 +- + drivers/power/supply/lp8788-charger.c | 2 +- + drivers/power/supply/ltc2941-battery-gauge.c | 2 +- + drivers/power/supply/max14656_charger_detector.c | 4 +- + drivers/power/supply/max17040_battery.c | 32 +- + drivers/power/supply/max17042_battery.c | 375 ++++++- + drivers/power/supply/max77759_charger.c | 4 +- + drivers/power/supply/max8903_charger.c | 430 +++++++- + drivers/power/supply/max8971_charger.c | 2 +- + drivers/power/supply/mp2629_charger.c | 4 +- + drivers/power/supply/mt6360_charger.c | 3 +- + drivers/power/supply/mt6370-charger.c | 4 +- + drivers/power/supply/pf1550-charger.c | 5 +- + drivers/power/supply/pm8916_lbc.c | 6 +- + drivers/power/supply/power_supply_core.c | 169 ++- + drivers/power/supply/power_supply_leds.c | 88 +- + drivers/power/supply/power_supply_sysfs.c | 4 + + drivers/power/supply/qcom_battmgr.c | 17 +- + drivers/power/supply/qcom_smbb.c | 5 +- + drivers/power/supply/qcom_smbx.c | 3 +- + drivers/power/supply/rk817_charger.c | 12 +- + drivers/power/supply/rn5t618_power.c | 5 +- + drivers/power/supply/rt9455_charger.c | 25 +- + drivers/power/supply/rt9467-charger.c | 3 +- + drivers/power/supply/rt9471.c | 52 +- + drivers/power/supply/sbs-battery.c | 15 +- + drivers/power/supply/sbs-charger.c | 2 +- + drivers/power/supply/sc2731_charger.c | 2 + + drivers/power/supply/sc27xx_fuel_gauge.c | 8 +- + drivers/power/supply/sgm41542_charger.c | 1127 ++++++++++++++++++++ + drivers/power/supply/surface-rt-ec.c | 2 +- + drivers/power/supply/tps65090-charger.c | 6 +- + drivers/power/supply/tps65217_charger.c | 6 +- + drivers/power/supply/twl4030_charger.c | 22 +- + drivers/power/supply/twl6030_charger.c | 4 +- + drivers/power/supply/ucs1002_power.c | 16 +- + include/linux/mfd/bq257xx.h | 14 + + include/linux/power/max17042_battery.h | 2 + + include/linux/power_supply.h | 36 +- + tools/testing/selftests/power_supply/helpers.sh | 8 +- + .../power_supply/test_power_supply_properties.sh | 3 +- + 86 files changed, 4448 insertions(+), 446 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/sgmicro,sgm41542.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/ti,bq25630.yaml + create mode 100644 drivers/power/reset/mcf-rcm-reset.c + create mode 100644 drivers/power/supply/bq25630_charger.c + create mode 100644 drivers/power/supply/sgm41542_charger.c +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 (4ec11f14d1d6f apparmor: fix deadlock in complain-mode change_hat) +$ git merge -m Merge branch 'apparmor-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Merge made by the 'ort' strategy. + security/apparmor/Kconfig | 14 +- + security/apparmor/Makefile | 2 +- + security/apparmor/af_inet.c | 565 ++++++++++++++++++++++++++++++ + security/apparmor/af_unix.c | 44 ++- + security/apparmor/apparmorfs.c | 281 +++++++++++---- + security/apparmor/audit.c | 40 ++- + security/apparmor/capability.c | 2 +- + security/apparmor/domain.c | 157 ++++++--- + security/apparmor/file.c | 15 +- + security/apparmor/include/af_inet.h | 36 ++ + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/apparmorfs.h | 3 + + security/apparmor/include/audit.h | 10 +- + security/apparmor/include/capability.h | 3 +- + security/apparmor/include/cred.h | 22 +- + security/apparmor/include/file.h | 2 +- + security/apparmor/include/label.h | 31 +- + security/apparmor/include/lib.h | 6 +- + security/apparmor/include/match.h | 18 +- + security/apparmor/include/net.h | 9 +- + security/apparmor/include/path.h | 3 + + security/apparmor/include/perms.h | 19 +- + security/apparmor/include/policy.h | 17 +- + security/apparmor/include/policy_unpack.h | 4 +- + security/apparmor/include/procattr.h | 2 + + security/apparmor/include/task.h | 20 +- + security/apparmor/label.c | 95 +++-- + security/apparmor/lib.c | 53 ++- + security/apparmor/lsm.c | 282 +++++++++------ + security/apparmor/match.c | 35 +- + security/apparmor/mount.c | 279 ++++++--------- + security/apparmor/net.c | 47 +-- + security/apparmor/policy.c | 30 +- + security/apparmor/policy_compat.c | 14 +- + security/apparmor/policy_unpack.c | 30 +- + security/apparmor/task.c | 27 ++ + 36 files changed, 1607 insertions(+), 611 deletions(-) + create mode 100644 security/apparmor/af_inet.c + create mode 100644 security/apparmor/include/af_inet.h +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 (9ab8748961671 tpm: atmel: depend on X86) +$ git merge -m Merge branch 'for-next-tpm' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd-tpm/for-next-tpm +Merge made by the 'ort' strategy. + drivers/char/tpm/Kconfig | 3 +-- + drivers/char/tpm/st33zp24/st33zp24.c | 5 +---- + drivers/char/tpm/tpm_i2c_nuvoton.c | 8 ++++---- + drivers/char/tpm/tpm_tis_i2c_cr50.c | 4 +--- + security/keys/trusted-keys/trusted_tpm1.c | 2 +- + 5 files changed, 8 insertions(+), 14 deletions(-) +Merging tpmdd-keys/for-next-keys (d239c5a8828cb 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 (36cac4b5101f8 mailbox: imx: Don't force-thread the primary handler) +$ 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 (14a6d09db0c71 Merge remote-tracking branch 'spi/for-7.3' into spi-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. +Merging tip/master (57e0daeacc1da Merge branch into tip/master: 'locking/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 MAINTAINERS +Auto-merging arch/x86/kernel/setup.c +Auto-merging kernel/liveupdate/kexec_handover.c +Auto-merging mm/hugetlb.c +Auto-merging mm/memblock.c +Auto-merging mm/mm_init.c +Auto-merging tools/testing/memblock/internal.h +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/x86/boot/compressed/kaslr.c | 2 + + arch/x86/include/asm/Kbuild | 1 + + arch/x86/include/asm/setup.h | 2 - + arch/x86/kernel/setup.c | 1 + + include/asm-generic/kexec_handover.h | 12 + + include/linux/kexec_handover.h | 31 +- + include/linux/kho/abi/kexec_handover.h | 9 +- + include/linux/kho_radix_tree.h | 60 ++- + include/linux/liveupdate.h | 22 + + include/linux/memblock.h | 23 +- + kernel/liveupdate/Makefile | 1 - + kernel/liveupdate/kexec_handover.c | 525 +++++++++++++++++++----- + kernel/liveupdate/kexec_handover_debug.c | 25 -- + kernel/liveupdate/kexec_handover_internal.h | 9 - + kernel/liveupdate/luo_file.c | 69 ++++ + kernel/liveupdate/luo_internal.h | 17 + + mm/hugetlb.c | 9 +- + mm/memblock.c | 154 +++++-- + mm/mm_init.c | 29 +- + tools/testing/memblock/internal.h | 5 + + tools/testing/memblock/linux/kexec_handover.h | 9 + + tools/testing/memblock/linux/kho/abi/memblock.h | 10 + + tools/testing/memblock/linux/libfdt.h | 9 + + 24 files changed, 781 insertions(+), 254 deletions(-) + create mode 100644 include/asm-generic/kexec_handover.h + delete mode 100644 kernel/liveupdate/kexec_handover_debug.c + create mode 100644 tools/testing/memblock/linux/kexec_handover.h + create mode 100644 tools/testing/memblock/linux/kho/abi/memblock.h + create mode 100644 tools/testing/memblock/linux/libfdt.h +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 +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/setup.c +Auto-merging init/Kconfig +Auto-merging init/main.c +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/bootconfig.rst | 81 ++ + Documentation/trace/boottime-trace.rst | 18 +- + Documentation/trace/eprobetrace.rst | 7 +- + Documentation/trace/fprobe.rst | 2 +- + Documentation/trace/fprobetrace.rst | 10 + + Documentation/trace/kprobetrace.rst | 11 + + MAINTAINERS | 1 + + Makefile | 27 +- + arch/x86/Kconfig | 1 + + arch/x86/kernel/setup.c | 14 +- + include/asm-generic/kprobes.h | 4 +- + include/linux/bootconfig.h | 14 + + init/Kconfig | 36 + + init/main.c | 52 +- + kernel/trace/Kconfig | 12 + + kernel/trace/fprobe.c | 13 +- + kernel/trace/trace.c | 8 +- + kernel/trace/trace_boot.c | 97 ++ + kernel/trace/trace_dynevent.c | 5 + + kernel/trace/trace_eprobe.c | 2 + + kernel/trace/trace_fprobe.c | 12 +- + kernel/trace/trace_kprobe.c | 27 +- + kernel/trace/trace_probe.c | 1207 ++++++++++++++------ + kernel/trace/trace_probe.h | 288 +++-- + kernel/trace/trace_probe_kernel.h | 2 +- + kernel/trace/trace_probe_tmpl.h | 27 +- + kernel/trace/trace_uprobe.c | 5 +- + lib/Makefile | 16 + + lib/bootconfig.c | 139 ++- + lib/embedded-cmdline.S | 16 + + samples/trace_events/trace-events-sample.c | 40 +- + samples/trace_events/trace-events-sample.h | 34 +- + tools/bootconfig/Makefile | 4 +- + tools/bootconfig/scripts/ftrace2bconf.sh | 2 + + tools/testing/selftests/ftrace/ftracetest | 3 + + .../ftrace/test.d/dynevent/btf_probe_event.tc | 51 + + .../test.d/dynevent/btf_typecast_accepted.tc | 103 ++ + .../test.d/dynevent/eprobes_syntax_errors.tc | 12 +- + .../ftrace/test.d/dynevent/fprobe_syntax_errors.tc | 16 +- + .../ftrace/test.d/dynevent/tprobe_syntax_errors.tc | 4 +- + .../ftrace/test.d/kprobe/kprobe_module.tc | 6 + + .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 16 +- + .../ftrace/test.d/kprobe/uprobe_syntax_errors.tc | 5 + + 43 files changed, 1914 insertions(+), 536 deletions(-) + create mode 100644 lib/embedded-cmdline.S + create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/btf_probe_event.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/btf_typecast_accepted.tc +$ 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 +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging include/linux/srcu.h +Auto-merging mm/slab_common.c +Auto-merging rust/helpers/helpers.c +Auto-merging rust/kernel/sync.rs +Merge made by the 'ort' strategy. + .../Expedited-Grace-Periods.rst | 2 +- + .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 2 +- + .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 2 +- + .../RCU/Design/Requirements/Requirements.rst | 2 +- + Documentation/RCU/rcu_dereference.rst | 4 +- + Documentation/admin-guide/kernel-parameters.txt | 14 + + MAINTAINERS | 3 + + include/linux/rcu_segcblist.h | 16 +- + include/linux/rcupdate.h | 29 +- + include/linux/rcupdate_trace.h | 19 +- + include/linux/rcupdate_wait.h | 2 +- + include/linux/rcutiny.h | 36 +- + include/linux/rcutree.h | 29 +- + include/linux/srcu.h | 29 +- + include/linux/srcutiny.h | 13 + + include/linux/srcutree.h | 24 ++ + include/trace/events/rcu.h | 5 +- + kernel/rcu/Kconfig | 1 - + kernel/rcu/rcu.h | 20 +- + kernel/rcu/rcu_segcblist.c | 139 +++++--- + kernel/rcu/rcu_segcblist.h | 8 +- + kernel/rcu/rcuscale.c | 84 ++++- + kernel/rcu/rcutorture.c | 374 ++++++++++++++------- + kernel/rcu/srcutiny.c | 14 +- + kernel/rcu/srcutree.c | 57 ++-- + kernel/rcu/tasks.h | 62 ++-- + kernel/rcu/tiny.c | 4 +- + kernel/rcu/tree.c | 195 +++++++---- + kernel/rcu/tree.h | 14 +- + kernel/rcu/tree_exp.h | 24 +- + kernel/rcu/tree_nocb.h | 126 +++++-- + kernel/rcu/tree_plugin.h | 93 ++++- + kernel/rcu/tree_stall.h | 64 ++-- + kernel/torture.c | 7 +- + mm/slab_common.c | 6 +- + rust/helpers/helpers.c | 1 + + rust/helpers/srcu.c | 35 ++ + rust/kernel/sync.rs | 2 + + rust/kernel/sync/srcu.rs | 171 ++++++++++ + 39 files changed, 1251 insertions(+), 481 deletions(-) + create mode 100644 rust/helpers/srcu.c + create mode 100644 rust/kernel/sync/srcu.rs +Merging paulmck/non-rcu/next (e39a12053df09 Merge branches 'hazptr.2026.08.05a', 'hrtimer_sleeper.2026.08.05a' and 'scftorture.2026.07.23a' into HEAD) +$ git merge -m Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging fs/aio.c +Auto-merging include/linux/hrtimer.h +Auto-merging init/main.c +Auto-merging io_uring/rw.c +Auto-merging kernel/scftorture.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/time/hrtimer.c +Auto-merging kernel/torture.c +Auto-merging net/core/pktgen.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 96 +++ + fs/aio.c | 2 +- + include/linux/hazptr.h | 323 +++++++ + include/linux/hrtimer.h | 10 +- + include/linux/torture.h | 6 +- + include/linux/wait.h | 2 +- + init/main.c | 2 + + io_uring/rw.c | 2 +- + kernel/Makefile | 2 +- + kernel/futex/requeue.c | 2 +- + kernel/futex/waitwake.c | 8 +- + kernel/hazptr.c | 284 +++++++ + kernel/locking/rtmutex.c | 2 +- + kernel/rcu/Kconfig.debug | 21 + + kernel/rcu/Makefile | 1 + + kernel/rcu/hazptrtorture.c | 946 +++++++++++++++++++++ + kernel/rcu/refscale.c | 43 + + kernel/rcu/update.c | 3 +- + kernel/scftorture.c | 3 +- + kernel/sched/core.c | 2 + + kernel/time/hrtimer.c | 17 +- + kernel/time/sleep_timeout.c | 4 +- + kernel/torture.c | 38 +- + net/core/pktgen.c | 4 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +- + .../selftests/rcutorture/configs/hazptr/CFLIST | 2 + + .../selftests/rcutorture/configs/hazptr/CFcommon | 2 + + .../selftests/rcutorture/configs/hazptr/NOPREEMPT | 19 + + .../rcutorture/configs/hazptr/NOPREEMPT.boot | 1 + + .../selftests/rcutorture/configs/hazptr/PREEMPT | 16 + + .../rcutorture/configs/hazptr/ver_functions.sh | 40 + + 31 files changed, 1878 insertions(+), 31 deletions(-) + create mode 100644 include/linux/hazptr.h + create mode 100644 kernel/hazptr.c + create mode 100644 kernel/rcu/hazptrtorture.c + create mode 100644 tools/testing/selftests/rcutorture/configs/hazptr/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/hazptr/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/hazptr/NOPREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/hazptr/NOPREEMPT.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/hazptr/PREEMPT + create mode 100644 tools/testing/selftests/rcutorture/configs/hazptr/ver_functions.sh +Merging kvm/next (a204badd8432f Merge branch 'kvm-chainsaw' into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/hyperv.c +Auto-merging arch/x86/kvm/irq.c +Auto-merging arch/x86/kvm/mmu/mmu.c +CONFLICT (content): Merge conflict in arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/mmu/paging_tmpl.h +Auto-merging arch/x86/kvm/mmu/spte.c +Auto-merging arch/x86/kvm/pmu.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Resolved 'arch/x86/kvm/mmu/mmu.c' using previous resolution. +Resolved 'arch/x86/kvm/x86.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e65ec8ff783c1] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/kvm_host.h | 655 +--- + arch/x86/kvm/Makefile | 4 +- + arch/x86/kvm/cpuid.c | 1 + + arch/x86/kvm/fpu.h | 26 + + arch/x86/kvm/hyperv.c | 7 +- + arch/x86/kvm/hyperv.h | 3 +- + arch/x86/kvm/ioapic.c | 1 + + arch/x86/kvm/ioapic.h | 12 + + arch/x86/kvm/irq.c | 7 + + arch/x86/kvm/irq.h | 6 + + arch/x86/kvm/lapic.h | 8 + + arch/x86/kvm/mmu.h | 121 +- + arch/x86/kvm/mmu/mmu.c | 541 +-- + arch/x86/kvm/mmu/mmu_internal.h | 66 - + arch/x86/kvm/mmu/paging_tmpl.h | 88 +- + arch/x86/kvm/mmu/spte.c | 4 +- + arch/x86/kvm/mmu/spte.h | 69 +- + arch/x86/kvm/mmu/tdp_mmu.c | 3 +- + arch/x86/kvm/msrs.c | 2745 ++++++++++++++ + arch/x86/kvm/msrs.h | 156 + + arch/x86/kvm/mtrr.c | 2 +- + arch/x86/kvm/pmu.c | 12 + + arch/x86/kvm/regs.c | 874 +++++ + arch/x86/kvm/regs.h | 60 + + arch/x86/kvm/svm/nested.c | 14 +- + arch/x86/kvm/svm/svm.c | 6 +- + arch/x86/kvm/tss.h | 7 + + arch/x86/kvm/vmx/nested.c | 16 +- + arch/x86/kvm/vmx/vmx.c | 26 +- + arch/x86/kvm/x86.c | 3762 +------------------- + arch/x86/kvm/x86.h | 462 ++- + tools/testing/selftests/kvm/Makefile.kvm | 1 + + tools/testing/selftests/kvm/include/x86/pmu.h | 6 + + .../testing/selftests/kvm/include/x86/processor.h | 10 + + tools/testing/selftests/kvm/include/x86/svm_util.h | 5 +- + tools/testing/selftests/kvm/include/x86/vmx.h | 4 +- + tools/testing/selftests/kvm/lib/x86/memstress.c | 19 +- + tools/testing/selftests/kvm/lib/x86/processor.c | 45 +- + tools/testing/selftests/kvm/lib/x86/svm.c | 6 +- + tools/testing/selftests/kvm/lib/x86/vmx.c | 6 +- + tools/testing/selftests/kvm/x86/aperfmperf_test.c | 9 +- + .../selftests/kvm/x86/evmcs_smm_controls_test.c | 5 +- + tools/testing/selftests/kvm/x86/hyperv_evmcs.c | 6 +- + tools/testing/selftests/kvm/x86/hyperv_svm_test.c | 6 +- + tools/testing/selftests/kvm/x86/kvm_buslock_test.c | 9 +- + .../selftests/kvm/x86/nested_close_kvm_test.c | 12 +- + .../selftests/kvm/x86/nested_dirty_log_test.c | 8 +- + .../selftests/kvm/x86/nested_emulation_test.c | 4 +- + .../selftests/kvm/x86/nested_exceptions_test.c | 9 +- + .../selftests/kvm/x86/nested_invalid_cr3_test.c | 10 +- + .../selftests/kvm/x86/nested_tdp_fault_test.c | 9 +- + .../selftests/kvm/x86/nested_tsc_adjust_test.c | 10 +- + .../selftests/kvm/x86/nested_tsc_scaling_test.c | 10 +- + .../selftests/kvm/x86/nested_vmsave_vmload_test.c | 6 +- + tools/testing/selftests/kvm/x86/smm_test.c | 8 +- + tools/testing/selftests/kvm/x86/state_test.c | 11 +- + tools/testing/selftests/kvm/x86/svm_int_ctl_test.c | 5 +- + .../selftests/kvm/x86/svm_lbr_nested_state.c | 6 +- + .../selftests/kvm/x86/svm_nested_clear_efer_svme.c | 7 +- + .../selftests/kvm/x86/svm_nested_pat_test.c | 8 +- + .../selftests/kvm/x86/svm_nested_shutdown_test.c | 5 +- + .../kvm/x86/svm_nested_soft_inject_test.c | 6 +- + .../selftests/kvm/x86/svm_nested_vmcb12_gpa.c | 13 +- + .../selftests/kvm/x86/svm_pmu_host_guest_test.c | 215 ++ + tools/testing/selftests/kvm/x86/svm_vmcall_test.c | 5 +- + .../selftests/kvm/x86/triple_fault_event_test.c | 9 +- + .../selftests/kvm/x86/vmx_apic_access_test.c | 5 +- + .../selftests/kvm/x86/vmx_apicv_updates_test.c | 4 +- + .../kvm/x86/vmx_invalid_nested_guest_state.c | 6 +- + .../selftests/kvm/x86/vmx_nested_la57_state_test.c | 5 +- + .../selftests/kvm/x86/vmx_preemption_timer_test.c | 5 +- + 71 files changed, 5273 insertions(+), 5029 deletions(-) + create mode 100644 arch/x86/kvm/msrs.c + create mode 100644 arch/x86/kvm/msrs.h + create mode 100644 arch/x86/kvm/regs.c + create mode 100644 tools/testing/selftests/kvm/x86/svm_pmu_host_guest_test.c +$ git am -3 ../patches/kvm-x86-static-cpu-has +Applying: Signed-off-by: Mark Brown <broonie@kernel.org> +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kvm/msrs.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master e542121a80884] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git + Date: Thu Aug 20 13:56:40 2026 +0100 +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 +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging arch/arm64/include/asm/cpufeature.h +Auto-merging arch/arm64/kernel/cpu_errata.c +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kernel/pi/idreg-override.c +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/hyp/nvhe/hyp-main.c +Auto-merging arch/arm64/kvm/mmu.c +Auto-merging arch/arm64/kvm/vgic/vgic-its.c +Auto-merging arch/arm64/kvm/vgic/vgic-v3.c +Auto-merging arch/arm64/kvm/vgic/vgic.c +Auto-merging arch/arm64/tools/cpucaps +CONFLICT (content): Merge conflict in arch/arm64/tools/cpucaps +Auto-merging arch/arm64/tools/sysreg +Auto-merging include/kvm/arm_vgic.h +Auto-merging include/uapi/linux/kvm.h +CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Resolved 'arch/arm64/tools/cpucaps' using previous resolution. +Resolved 'include/uapi/linux/kvm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5bfcdef290354] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 11 + + Documentation/virt/kvm/devices/vcpu.rst | 11 +- + arch/arm64/include/asm/cpufeature.h | 1 + + arch/arm64/include/asm/kvm_arm.h | 27 +- + arch/arm64/include/asm/kvm_asm.h | 4 +- + arch/arm64/include/asm/kvm_emulate.h | 107 +++++++- + arch/arm64/include/asm/kvm_host.h | 14 +- + arch/arm64/include/asm/kvm_nested.h | 20 ++ + arch/arm64/include/asm/kvm_pkvm.h | 8 +- + arch/arm64/include/asm/vncr_mapping.h | 2 +- + arch/arm64/include/uapi/asm/kvm.h | 1 + + arch/arm64/kernel/asm-offsets.c | 1 - + arch/arm64/kernel/cpu_errata.c | 17 +- + arch/arm64/kernel/cpufeature.c | 18 +- + arch/arm64/kernel/image-vars.h | 2 + + arch/arm64/kernel/pi/idreg-override.c | 10 + + arch/arm64/kvm/arch_timer.c | 15 +- + arch/arm64/kvm/arm.c | 26 +- + arch/arm64/kvm/at.c | 2 - + arch/arm64/kvm/config.c | 27 +- + arch/arm64/kvm/emulate-nested.c | 18 +- + arch/arm64/kvm/handle_exit.c | 40 ++- + arch/arm64/kvm/hyp/exception.c | 34 +-- + arch/arm64/kvm/hyp/include/hyp/switch.h | 42 ++-- + arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 11 + + arch/arm64/kvm/hyp/include/nvhe/clock.h | 8 +- + arch/arm64/kvm/hyp/nvhe/clock.c | 4 +- + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 11 +- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 271 ++++++++++++++++++--- + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 7 + + arch/arm64/kvm/hyp/nvhe/pkvm.c | 15 +- + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 5 +- + arch/arm64/kvm/hyp/nvhe/timer-sr.c | 10 +- + arch/arm64/kvm/hyp/nvhe/trace.c | 4 +- + arch/arm64/kvm/hyp/vgic-v3-sr.c | 43 +--- + arch/arm64/kvm/hyp/vhe/switch.c | 62 +++-- + arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 21 +- + arch/arm64/kvm/mmu.c | 9 +- + arch/arm64/kvm/nested.c | 190 ++++++++++----- + arch/arm64/kvm/pkvm.c | 34 +-- + arch/arm64/kvm/pmu-emul.c | 54 +++- + arch/arm64/kvm/psci.c | 30 +-- + arch/arm64/kvm/reset.c | 60 +---- + arch/arm64/kvm/sys_regs.c | 152 ++++++++++-- + arch/arm64/kvm/sys_regs.h | 19 ++ + arch/arm64/kvm/vgic-sys-reg-v3.c | 8 +- + arch/arm64/kvm/vgic/vgic-init.c | 8 +- + arch/arm64/kvm/vgic/vgic-its.c | 26 +- + arch/arm64/kvm/vgic/vgic-v3-nested.c | 2 +- + arch/arm64/kvm/vgic/vgic-v3.c | 105 +++++--- + arch/arm64/kvm/vgic/vgic-v5.c | 5 +- + arch/arm64/kvm/vgic/vgic.c | 7 +- + arch/arm64/kvm/vgic/vgic.h | 19 +- + arch/arm64/tools/cpucaps | 3 + + arch/arm64/tools/gen-sysreg.awk | 8 +- + arch/arm64/tools/sysreg | 44 +++- + include/kvm/arm_arch_timer.h | 34 ++- + include/kvm/arm_pmu.h | 4 + + include/kvm/arm_psci.h | 27 ++ + include/kvm/arm_vgic.h | 4 +- + include/uapi/linux/kvm.h | 1 + + tools/testing/selftests/kvm/Makefile.kvm | 1 + + .../testing/selftests/kvm/arm64/debug-exceptions.c | 41 ++++ + tools/testing/selftests/kvm/arm64/get-reg-list.c | 3 + + .../selftests/kvm/arm64/stage2_block_transitions.c | 226 +++++++++++++++++ + 65 files changed, 1578 insertions(+), 476 deletions(-) + create mode 100644 tools/testing/selftests/kvm/arm64/stage2_block_transitions.c +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 +Auto-merging MAINTAINERS +Auto-merging arch/s390/kvm/gmap/gmap.c +Auto-merging arch/s390/kvm/s390/gaccess.c +Auto-merging arch/s390/kvm/s390/pv.c +Auto-merging arch/s390/kvm/s390/s390.c +Auto-merging arch/s390/kvm/s390/vsie.c +Merge made by the 'ort' strategy. + MAINTAINERS | 8 +- + arch/s390/include/asm/kvm_host.h | 723 +-------------------------- + arch/s390/include/asm/kvm_host_s390.h | 729 ++++++++++++++++++++++++++++ + arch/s390/include/asm/kvm_host_s390_types.h | 349 +++++++++++++ + arch/s390/include/asm/kvm_host_types.h | 347 +------------ + arch/s390/kvm/Makefile | 11 +- + arch/s390/kvm/gmap/Makefile | 5 + + arch/s390/kvm/{ => gmap}/dat.c | 4 + + arch/s390/kvm/{ => gmap}/dat.h | 21 +- + arch/s390/kvm/{ => gmap}/faultin.c | 3 +- + arch/s390/kvm/{ => gmap}/faultin.h | 6 +- + arch/s390/kvm/{ => gmap}/gmap.c | 19 +- + arch/s390/kvm/{ => gmap}/gmap.h | 25 +- + arch/s390/kvm/gmap/kvm_mmu.c | 133 +++++ + arch/s390/kvm/gmap/kvm_mmu.h | 18 + + arch/s390/kvm/gmap/trace_gmap.h | 47 ++ + arch/s390/kvm/s390/Makefile | 14 + + arch/s390/kvm/{ => s390}/diag.c | 21 +- + arch/s390/kvm/{ => s390}/gaccess.c | 2 +- + arch/s390/kvm/{ => s390}/gaccess.h | 2 +- + arch/s390/kvm/{ => s390}/guestdbg.c | 2 +- + arch/s390/kvm/{ => s390}/intercept.c | 2 +- + arch/s390/kvm/{ => s390}/interrupt.c | 2 +- + arch/s390/kvm/{ => s390}/pci.c | 2 +- + arch/s390/kvm/{ => s390}/pci.h | 0 + arch/s390/kvm/{ => s390}/priv.c | 2 +- + arch/s390/kvm/{ => s390}/pv.c | 2 +- + arch/s390/kvm/{kvm-s390.c => s390/s390.c} | 131 +---- + arch/s390/kvm/{kvm-s390.h => s390/s390.h} | 10 +- + arch/s390/kvm/{ => s390}/sigp.c | 2 +- + arch/s390/kvm/{ => s390}/trace-s390.h | 0 + arch/s390/kvm/{ => s390}/trace.h | 40 +- + arch/s390/kvm/{ => s390}/vsie.c | 21 +- + arch/s390/tools/gen_facilities.c | 14 +- + drivers/s390/crypto/vfio_ap_ops.c | 158 ++++-- + 35 files changed, 1580 insertions(+), 1295 deletions(-) + create mode 100644 arch/s390/include/asm/kvm_host_s390.h + create mode 100644 arch/s390/include/asm/kvm_host_s390_types.h + create mode 100644 arch/s390/kvm/gmap/Makefile + rename arch/s390/kvm/{ => gmap}/dat.c (99%) + rename arch/s390/kvm/{ => gmap}/dat.h (98%) + rename arch/s390/kvm/{ => gmap}/faultin.c (98%) + rename arch/s390/kvm/{ => gmap}/faultin.h (96%) + rename arch/s390/kvm/{ => gmap}/gmap.c (99%) + rename arch/s390/kvm/{ => gmap}/gmap.h (96%) + create mode 100644 arch/s390/kvm/gmap/kvm_mmu.c + create mode 100644 arch/s390/kvm/gmap/kvm_mmu.h + create mode 100644 arch/s390/kvm/gmap/trace_gmap.h + create mode 100644 arch/s390/kvm/s390/Makefile + rename arch/s390/kvm/{ => s390}/diag.c (96%) + rename arch/s390/kvm/{ => s390}/gaccess.c (99%) + rename arch/s390/kvm/{ => s390}/gaccess.h (99%) + rename arch/s390/kvm/{ => s390}/guestdbg.c (99%) + rename arch/s390/kvm/{ => s390}/intercept.c (99%) + rename arch/s390/kvm/{ => s390}/interrupt.c (99%) + rename arch/s390/kvm/{ => s390}/pci.c (99%) + rename arch/s390/kvm/{ => s390}/pci.h (100%) + rename arch/s390/kvm/{ => s390}/priv.c (99%) + rename arch/s390/kvm/{ => s390}/pv.c (99%) + rename arch/s390/kvm/{kvm-s390.c => s390/s390.c} (98%) + rename arch/s390/kvm/{kvm-s390.h => s390/s390.h} (98%) + rename arch/s390/kvm/{ => s390}/sigp.c (99%) + rename arch/s390/kvm/{ => s390}/trace-s390.h (100%) + rename arch/s390/kvm/{ => s390}/trace.h (95%) + rename arch/s390/kvm/{ => s390}/vsie.c (98%) +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 +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/riscv/include/asm/csr.h +Auto-merging arch/riscv/include/asm/processor.h +Auto-merging arch/riscv/kvm/isa.c +Auto-merging arch/riscv/kvm/main.c +Auto-merging arch/riscv/kvm/vcpu_onereg.c +Auto-merging arch/riscv/kvm/vcpu_vector.c +CONFLICT (content): Merge conflict in arch/riscv/kvm/vcpu_vector.c +Resolved 'arch/riscv/kvm/vcpu_vector.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1c63c30f06198] Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 7 +- + arch/riscv/include/asm/csr.h | 1 + + arch/riscv/include/asm/kvm_aia.h | 3 + + arch/riscv/include/asm/kvm_gstage.h | 9 +- + arch/riscv/include/asm/kvm_host.h | 10 ++ + arch/riscv/include/asm/kvm_vcpu_insn.h | 4 +- + arch/riscv/include/asm/kvm_vcpu_sbi.h | 4 + + arch/riscv/include/asm/kvm_vcpu_vector.h | 24 +++ + arch/riscv/include/asm/processor.h | 8 + + arch/riscv/include/asm/simd.h | 16 +- + arch/riscv/include/asm/vector.h | 5 + + arch/riscv/include/uapi/asm/kvm.h | 13 ++ + arch/riscv/kernel/kernel_mode_vector.c | 88 +++++++--- + arch/riscv/kvm/aia.c | 42 +++++ + arch/riscv/kvm/aia_aplic.c | 3 +- + arch/riscv/kvm/aia_device.c | 6 + + arch/riscv/kvm/aia_imsic.c | 18 +- + arch/riscv/kvm/gstage.c | 82 ++++++++- + arch/riscv/kvm/isa.c | 2 + + arch/riscv/kvm/main.c | 114 ++++++++++--- + arch/riscv/kvm/mmu.c | 108 +++++++++++- + arch/riscv/kvm/nacl.c | 2 +- + arch/riscv/kvm/tlb.c | 117 ++++++++++--- + arch/riscv/kvm/trace.h | 81 ++++++++- + arch/riscv/kvm/vcpu.c | 34 ++++ + arch/riscv/kvm/vcpu_config.c | 2 + + arch/riscv/kvm/vcpu_exit.c | 20 ++- + arch/riscv/kvm/vcpu_insn.c | 17 +- + arch/riscv/kvm/vcpu_onereg.c | 68 +++++++- + arch/riscv/kvm/vcpu_pmu.c | 16 +- + arch/riscv/kvm/vcpu_sbi.c | 30 ++++ + arch/riscv/kvm/vcpu_sbi_fwft.c | 207 ++++++++++++++++++++++- + arch/riscv/kvm/vcpu_sbi_v01.c | 52 +++--- + arch/riscv/kvm/vcpu_vector.c | 26 ++- + tools/testing/selftests/kvm/riscv/get-reg-list.c | 90 ++++++++++ + 35 files changed, 1170 insertions(+), 159 deletions(-) +Merging kvm-x86/next (1b731e5ded480 Merge branch 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging MAINTAINERS +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/x86/kvm/hyperv.c +Auto-merging arch/x86/kvm/lapic.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/mmu/paging_tmpl.h +Auto-merging arch/x86/kvm/msrs.c +Auto-merging arch/x86/kvm/svm/avic.c +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/svm.h +Auto-merging arch/x86/kvm/vmx/main.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/vmx/x86_ops.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/xen.c +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Auto-merging tools/testing/selftests/kvm/x86/sev_init2_tests.c +Auto-merging virt/kvm/guest_memfd.c +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 15 +- + MAINTAINERS | 14 + + arch/powerpc/kvm/book3s_pr.c | 11 +- + arch/x86/include/asm/cpufeatures.h | 10 + + arch/x86/include/asm/kvm-x86-nested-ops.h | 36 ++ + arch/x86/include/asm/kvm-x86-ops.h | 17 +- + arch/x86/include/asm/kvm_host.h | 227 ++----------- + arch/x86/kvm/Kconfig | 3 +- + arch/x86/kvm/cpuid.c | 38 +-- + arch/x86/kvm/emulate.c | 49 ++- + arch/x86/kvm/hyperv.c | 95 +++--- + arch/x86/kvm/hyperv.h | 117 ++++++- + arch/x86/kvm/irq.h | 20 ++ + arch/x86/kvm/lapic.c | 13 +- + arch/x86/kvm/lapic.h | 33 ++ + arch/x86/kvm/mmu.h | 11 +- + arch/x86/kvm/mmu/mmu.c | 134 ++++---- + arch/x86/kvm/mmu/paging_tmpl.h | 2 +- + arch/x86/kvm/mmu/tdp_iter.h | 7 + + arch/x86/kvm/mmu/tdp_mmu.c | 20 +- + arch/x86/kvm/msrs.c | 21 +- + arch/x86/kvm/msrs.h | 5 +- + arch/x86/kvm/pmu.c | 12 +- + arch/x86/kvm/pmu.h | 4 +- + arch/x86/kvm/regs.c | 3 +- + arch/x86/kvm/regs.h | 38 +++ + arch/x86/kvm/smm.c | 4 + + arch/x86/kvm/svm/avic.c | 96 ++++-- + arch/x86/kvm/svm/nested.c | 21 +- + arch/x86/kvm/svm/sev.c | 242 ++++++++++---- + arch/x86/kvm/svm/svm.c | 110 +++---- + arch/x86/kvm/svm/svm.h | 24 +- + arch/x86/kvm/tss.h | 7 + + arch/x86/kvm/vmx/main.c | 24 +- + arch/x86/kvm/vmx/nested.c | 89 ++--- + arch/x86/kvm/vmx/nested.h | 6 +- + arch/x86/kvm/vmx/pmu_intel.c | 1 - + arch/x86/kvm/vmx/tdx.c | 16 +- + arch/x86/kvm/vmx/vmx.c | 193 ++++++----- + arch/x86/kvm/vmx/x86_ops.h | 4 +- + arch/x86/kvm/x86.c | 135 ++++++-- + arch/x86/kvm/x86.h | 10 +- + arch/x86/kvm/xen.c | 73 +++-- + arch/x86/kvm/xen.h | 13 - + include/linux/kvm_host.h | 38 ++- + tools/testing/selftests/kvm/Makefile.kvm | 14 +- + tools/testing/selftests/kvm/arch_timer.c | 20 +- + .../selftests/kvm/arm64/arch_timer_edge_cases.c | 2 +- + tools/testing/selftests/kvm/arm64/vgic_irq.c | 14 +- + .../testing/selftests/kvm/arm64/vgic_lpi_stress.c | 8 +- + tools/testing/selftests/kvm/demand_paging_test.c | 2 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 4 +- + tools/testing/selftests/kvm/dirty_log_test.c | 15 +- + .../testing/selftests/kvm/hardware_disable_test.c | 109 +++---- + tools/testing/selftests/kvm/include/kvm_syscalls.h | 55 ++++ + tools/testing/selftests/kvm/include/kvm_util.h | 21 ++ + tools/testing/selftests/kvm/include/proc_util.h | 11 + + tools/testing/selftests/kvm/include/test_util.h | 26 +- + tools/testing/selftests/kvm/include/x86/evmcs.h | 46 +-- + .../selftests/kvm/include/x86/kvm_util_arch.h | 4 +- + .../testing/selftests/kvm/include/x86/processor.h | 54 ++- + tools/testing/selftests/kvm/include/x86/vmx.h | 69 ++-- + tools/testing/selftests/kvm/irq_test.c | 362 +++++++++++++++++++++ + tools/testing/selftests/kvm/irqfd_test.c | 4 +- + tools/testing/selftests/kvm/kvm_page_table_test.c | 6 +- + tools/testing/selftests/kvm/lib/assert.c | 10 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 52 ++- + tools/testing/selftests/kvm/lib/memstress.c | 12 +- + tools/testing/selftests/kvm/lib/proc_util.c | 54 +++ + tools/testing/selftests/kvm/lib/test_util.c | 41 ++- + tools/testing/selftests/kvm/lib/userfaultfd_util.c | 7 +- + tools/testing/selftests/kvm/lib/x86/processor.c | 14 + + tools/testing/selftests/kvm/lib/x86/svm.c | 62 ++-- + tools/testing/selftests/kvm/lib/x86/ucall.c | 32 +- + tools/testing/selftests/kvm/lib/x86/vmx.c | 2 +- + tools/testing/selftests/kvm/memslot_perf_test.c | 4 +- + tools/testing/selftests/kvm/mmu_stress_test.c | 19 +- + .../testing/selftests/kvm/pre_fault_memory_test.c | 4 +- + tools/testing/selftests/kvm/riscv/sbi_pmu_test.c | 4 +- + tools/testing/selftests/kvm/rseq_test.c | 16 +- + tools/testing/selftests/kvm/s390/memop.c | 4 +- + .../testing/selftests/kvm/set_memory_region_test.c | 6 +- + tools/testing/selftests/kvm/steal_time.c | 39 +-- + tools/testing/selftests/kvm/vm_types_test.c | 48 +++ + .../selftests/kvm/x86/evmcs_smm_controls_test.c | 5 +- + .../testing/selftests/kvm/x86/fix_hypercall_test.c | 1 - + tools/testing/selftests/kvm/x86/hyperv_clock.c | 4 +- + tools/testing/selftests/kvm/x86/hyperv_evmcs.c | 2 +- + tools/testing/selftests/kvm/x86/hyperv_ipi.c | 32 +- + tools/testing/selftests/kvm/x86/hyperv_tlb_flush.c | 30 +- + .../testing/selftests/kvm/x86/pmu_counters_test.c | 231 +++++++------ + .../selftests/kvm/x86/pmu_event_filter_test.c | 4 +- + .../kvm/x86/private_mem_conversions_test.c | 4 +- + .../selftests/kvm/x86/private_mem_kvm_exits_test.c | 7 +- + .../selftests/kvm/x86/recalc_apic_map_test.c | 5 +- + .../kvm/x86/save_restore_pf_stress_test.c | 288 ++++++++++++++++ + tools/testing/selftests/kvm/x86/set_sregs_test.c | 81 +++-- + tools/testing/selftests/kvm/x86/sev_dbg_test.c | 2 +- + tools/testing/selftests/kvm/x86/sev_init2_tests.c | 4 - + .../testing/selftests/kvm/x86/sev_migrate_tests.c | 4 +- + tools/testing/selftests/kvm/x86/smm_test.c | 5 +- + tools/testing/selftests/kvm/x86/sync_regs_test.c | 5 +- + tools/testing/selftests/kvm/x86/tsc_scaling_sync.c | 4 +- + .../kvm/x86/vmx_invalid_nested_guest_state.c | 124 +++++-- + tools/testing/selftests/kvm/x86/xapic_ipi_test.c | 33 +- + tools/testing/selftests/kvm/x86/xen_shinfo_test.c | 10 +- + virt/kvm/Kconfig | 6 +- + virt/kvm/guest_memfd.c | 73 ++--- + virt/kvm/guest_memfd.h | 34 ++ + virt/kvm/kvm_main.c | 22 +- + virt/kvm/kvm_mm.h | 27 -- + 111 files changed, 2887 insertions(+), 1497 deletions(-) + create mode 100644 arch/x86/include/asm/kvm-x86-nested-ops.h + create mode 100644 tools/testing/selftests/kvm/include/proc_util.h + create mode 100644 tools/testing/selftests/kvm/irq_test.c + create mode 100644 tools/testing/selftests/kvm/lib/proc_util.c + create mode 100644 tools/testing/selftests/kvm/vm_types_test.c + create mode 100644 tools/testing/selftests/kvm/x86/save_restore_pf_stress_test.c + create mode 100644 virt/kvm/guest_memfd.h +$ 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 (7e2f2a377ac9f workqueue: Use raise_softirq() to trigger softirq in irq_work handler) +$ 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. + Documentation/core-api/workqueue.rst | 2 +- + kernel/workqueue.c | 338 +++++++++++++++++++++++++---------- + tools/workqueue/wq_dump.py | 16 +- + tools/workqueue/wq_monitor.py | 6 +- + 4 files changed, 252 insertions(+), 110 deletions(-) +Merging sched-ext/for-next (4fb8d6379d2c7 sched_ext: Fix nonexistent field in sched-ext.rst example) +$ 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 include/linux/cgroup.h +Auto-merging init/init_task.c +Auto-merging kernel/Kconfig.preempt +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/rcu/tree_exp.h +Auto-merging kernel/rcu/tree_stall.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/sched.h +Merge made by the 'ort' strategy. + Documentation/scheduler/sched-ext.rst | 19 +- + include/linux/cgroup.h | 26 + + include/linux/sched/ext.h | 61 +- + include/trace/events/sched_ext.h | 28 + + init/init_task.c | 1 + + kernel/Kconfig.preempt | 1 + + kernel/cgroup/cgroup.c | 93 +- + kernel/rcu/tree.c | 3 + + kernel/rcu/tree_exp.h | 5 +- + kernel/rcu/tree_stall.h | 13 +- + kernel/sched/build_policy.c | 3 + + kernel/sched/core.c | 49 +- + kernel/sched/ext/arena.c | 16 +- + kernel/sched/ext/cid.c | 730 +++- + kernel/sched/ext/cid.h | 72 +- + kernel/sched/ext/ext.c | 4071 ++++++++++---------- + kernel/sched/ext/idle.c | 117 +- + kernel/sched/ext/inlines.h | 138 + + kernel/sched/ext/internal.h | 827 +++- + kernel/sched/ext/sub.c | 2681 +++++++++++++ + kernel/sched/ext/sub.h | 232 ++ + kernel/sched/ext/types.h | 88 +- + kernel/sched/idle.c | 8 +- + kernel/sched/sched.h | 40 +- + tools/sched_ext/include/scx/cid.bpf.h | 77 + + tools/sched_ext/include/scx/common.bpf.h | 32 +- + tools/sched_ext/include/scx/compat.bpf.h | 42 +- + tools/sched_ext/include/scx/compat.h | 51 +- + tools/sched_ext/include/scx/enum_defs.autogen.h | 69 +- + tools/sched_ext/include/scx/enums.autogen.bpf.h | 9 +- + tools/sched_ext/include/scx/enums.autogen.h | 3 +- + tools/sched_ext/scx_central.c | 2 +- + tools/sched_ext/scx_cpu0.c | 4 +- + tools/sched_ext/scx_flatcg.bpf.c | 22 +- + tools/sched_ext/scx_flatcg.c | 6 +- + tools/sched_ext/scx_pair.bpf.c | 138 +- + tools/sched_ext/scx_pair.c | 2 +- + tools/sched_ext/scx_qmap.bpf.c | 1024 ++++- + tools/sched_ext/scx_qmap.c | 336 +- + tools/sched_ext/scx_qmap.h | 153 +- + tools/sched_ext/scx_sdt.c | 4 +- + tools/sched_ext/scx_simple.c | 4 +- + tools/sched_ext/scx_userland.c | 13 +- + .../testing/selftests/sched_ext/allowed_cpus.bpf.c | 49 +- + .../selftests/sched_ext/ddsp_bogus_dsq_fail.bpf.c | 20 +- + .../selftests/sched_ext/ddsp_vtimelocal_fail.bpf.c | 13 +- + tools/testing/selftests/sched_ext/exit.c | 1 + + tools/testing/selftests/sched_ext/numa.bpf.c | 28 +- + tools/testing/selftests/sched_ext/prog_run.c | 36 +- + 49 files changed, 8856 insertions(+), 2604 deletions(-) + create mode 100644 kernel/sched/ext/inlines.h + create mode 100644 kernel/sched/ext/sub.c + create mode 100644 kernel/sched/ext/sub.h +Merging drivers-x86/for-next (54745d563114b platform/x86: think-lmi: Fix current password length check) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c +Auto-merging drivers/platform/x86/amd/pmc/pmc.c +Auto-merging drivers/platform/x86/asus-armoury.h +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/platform/x86/intel/speed_select_if/isst_tpmi_core.c +Auto-merging drivers/platform/x86/lenovo/thinkpad_acpi.c +Auto-merging include/linux/amd-pmf-io.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/amdpmf-interface | 73 +++ + .../ABI/testing/sysfs-driver-lenovo-yb9-kbdock | 19 + + .../ABI/testing/sysfs-driver-uniwill-laptop | 25 + + .../admin-guide/laptops/thinkpad-acpi.rst | 24 + + .../admin-guide/laptops/uniwill-laptop.rst | 27 + + Documentation/arch/x86/amd_hsmp.rst | 35 +- + MAINTAINERS | 17 +- + arch/x86/include/uapi/asm/amd_hsmp.h | 222 ++++++- + arch/x86/platform/olpc/olpc-xo15-sci.c | 5 - + drivers/char/sonypi.c | 2 - + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c | 13 +- + drivers/platform/arm64/qcom-hamoa-ec.c | 4 +- + drivers/platform/mellanox/mlxbf-bootctl.c | 1 + + drivers/platform/mellanox/mlxbf-pmc.c | 10 +- + drivers/platform/surface/surface_acpi_notify.c | 6 +- + drivers/platform/surface/surface_aggregator_hub.c | 9 +- + .../platform/surface/surface_aggregator_tabletsw.c | 9 +- + drivers/platform/surface/surfacepro3_button.c | 8 +- + drivers/platform/x86/Kconfig | 1 - + drivers/platform/x86/acer-wmi.c | 4 +- + drivers/platform/x86/amd/Kconfig | 11 + + drivers/platform/x86/amd/Makefile | 1 + + drivers/platform/x86/amd/amd_halo_led.c | 315 ++++++++++ + drivers/platform/x86/amd/hsmp/acpi.c | 221 ++++++- + drivers/platform/x86/amd/hsmp/hsmp.c | 304 ++++++++- + drivers/platform/x86/amd/hsmp/hsmp.h | 19 +- + drivers/platform/x86/amd/hsmp/hwmon.c | 3 + + drivers/platform/x86/amd/hsmp/plat.c | 38 +- + drivers/platform/x86/amd/pmc/mp1_stb.c | 83 ++- + drivers/platform/x86/amd/pmc/pmc-quirks.c | 8 + + drivers/platform/x86/amd/pmc/pmc.c | 9 +- + drivers/platform/x86/amd/pmf/Kconfig | 10 + + drivers/platform/x86/amd/pmf/Makefile | 4 +- + drivers/platform/x86/amd/pmf/core.c | 261 +++----- + drivers/platform/x86/amd/pmf/metrics.c | 330 ++++++++++ + drivers/platform/x86/amd/pmf/pmf.h | 270 +++++++- + drivers/platform/x86/amd/pmf/spc.c | 72 +-- + drivers/platform/x86/amd/pmf/tee-if.c | 13 +- + drivers/platform/x86/amd/pmf/util.c | 153 +++++ + drivers/platform/x86/asus-armoury.c | 66 +- + drivers/platform/x86/asus-armoury.h | 150 +++++ + drivers/platform/x86/asus-laptop.c | 9 +- + drivers/platform/x86/asus-nb-wmi.c | 1 + + drivers/platform/x86/asus-wireless.c | 11 +- + drivers/platform/x86/asus-wmi.c | 30 +- + drivers/platform/x86/dell/dell-smbios-base.c | 6 +- + drivers/platform/x86/dell/dell-smbios-smm.c | 8 +- + drivers/platform/x86/dell/dell-smbios-wmi.c | 105 ++-- + drivers/platform/x86/dell/dell-smbios.h | 4 +- + drivers/platform/x86/dell/dell-wmi-base.c | 19 +- + drivers/platform/x86/dell/dell-wmi-ddv.c | 22 +- + drivers/platform/x86/dell/dell-wmi-privacy.c | 4 +- + .../x86/dell/dell-wmi-sysman/biosattr-interface.c | 1 - + .../x86/dell/dell-wmi-sysman/dell-wmi-sysman.h | 2 +- + drivers/platform/x86/eeepc-laptop.c | 7 +- + drivers/platform/x86/fujitsu-laptop.c | 18 +- + drivers/platform/x86/fujitsu-tablet.c | 13 +- + drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 18 +- + drivers/platform/x86/hp/hp-bioscfg/bioscfg.h | 8 + + .../platform/x86/hp/hp-bioscfg/enum-attributes.c | 15 +- + .../platform/x86/hp/hp-bioscfg/int-attributes.c | 6 +- + .../x86/hp/hp-bioscfg/order-list-attributes.c | 14 +- + .../x86/hp/hp-bioscfg/passwdobj-attributes.c | 19 +- + .../platform/x86/hp/hp-bioscfg/spmobj-attributes.c | 4 +- + .../platform/x86/hp/hp-bioscfg/string-attributes.c | 6 +- + drivers/platform/x86/hp/hp-wmi.c | 421 ++++++++++--- + drivers/platform/x86/huawei-wmi.c | 99 +++ + drivers/platform/x86/intel/int1092/intel_sar.c | 32 +- + drivers/platform/x86/intel/ishtp_eclite.c | 5 +- + drivers/platform/x86/intel/pmc/core.c | 2 +- + .../x86/intel/speed_select_if/isst_tpmi_core.c | 80 ++- + drivers/platform/x86/lenovo/Kconfig | 14 + + drivers/platform/x86/lenovo/Makefile | 1 + + drivers/platform/x86/lenovo/ideapad-laptop.c | 2 +- + drivers/platform/x86/lenovo/think-lmi.c | 19 +- + drivers/platform/x86/lenovo/thinkpad_acpi.c | 131 +++- + drivers/platform/x86/lenovo/yb9-kbdock.c | 323 ++++++++++ + drivers/platform/x86/lenovo/ymc.c | 27 +- + drivers/platform/x86/lg-laptop.c | 652 ++++++++++++------- + drivers/platform/x86/msi-ec.c | 82 +++ + drivers/platform/x86/msi-wmi.c | 97 ++- + drivers/platform/x86/oxpec.c | 7 + + drivers/platform/x86/panasonic-laptop.c | 15 +- + drivers/platform/x86/redmi-wmi.c | 26 +- + drivers/platform/x86/samsung-galaxybook.c | 1 + + drivers/platform/x86/sony-laptop.c | 5 +- + drivers/platform/x86/topstar-laptop.c | 2 - + drivers/platform/x86/toshiba_acpi.c | 6 +- + drivers/platform/x86/toshiba_bluetooth.c | 6 +- + drivers/platform/x86/toshiba_haps.c | 4 +- + drivers/platform/x86/uniwill/uniwill-acpi.c | 692 +++++++++++++++++++-- + drivers/platform/x86/uniwill/uniwill-wmi.h | 2 + + drivers/platform/x86/xo15-ebook.c | 8 +- + drivers/power/supply/surface_battery.c | 11 +- + drivers/power/supply/surface_charger.c | 7 +- + include/linux/amd-pmf-io.h | 11 +- + include/linux/platform_data/x86/asus-wmi.h | 5 + + include/uapi/linux/amd-pmf.h | 204 ++++++ + tools/platform/x86/amd/Makefile | 60 ++ + tools/platform/x86/amd/test-pmf.c | 142 +++++ + 100 files changed, 5355 insertions(+), 1051 deletions(-) + create mode 100644 Documentation/ABI/testing/amdpmf-interface + create mode 100644 Documentation/ABI/testing/sysfs-driver-lenovo-yb9-kbdock + create mode 100644 drivers/platform/x86/amd/amd_halo_led.c + create mode 100644 drivers/platform/x86/amd/pmf/metrics.c + create mode 100644 drivers/platform/x86/amd/pmf/util.c + create mode 100644 drivers/platform/x86/lenovo/yb9-kbdock.c + create mode 100644 include/uapi/linux/amd-pmf.h + create mode 100644 tools/platform/x86/amd/Makefile + create mode 100644 tools/platform/x86/amd/test-pmf.c +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 +Auto-merging drivers/hsi/controllers/omap_ssi_port.c +Merge made by the 'ort' strategy. + drivers/hsi/clients/nokia-modem.c | 5 +---- + drivers/hsi/controllers/omap_ssi_core.c | 14 ++++++++++---- + drivers/hsi/controllers/omap_ssi_port.c | 6 ------ + 3 files changed, 11 insertions(+), 14 deletions(-) +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 +Auto-merging MAINTAINERS +Auto-merging drivers/leds/leds-gpio.c +Auto-merging drivers/leds/leds-is31fl319x.c +Auto-merging drivers/leds/rgb/leds-pwm-multicolor.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/leds/adi,ltc3220.yaml | 133 +++++ + .../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 +++- + .../devicetree/bindings/regulator/tps65217.txt | 78 --- + Documentation/leds/leds-st1202.rst | 9 +- + MAINTAINERS | 8 + + 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 +- + include/linux/leds.h | 6 + + 27 files changed, 1567 insertions(+), 440 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/adi,ltc3220.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/regulator/tps65217.txt + create mode 100644 drivers/leds/leds-ltc3220.c +Merging ipmi/for-next (ae84a25365770 ipmi:msghandler: Cancel work cleanly on an error) +$ 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 | 4 ++ + 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, 85 insertions(+), 24 deletions(-) +Merging driver-core/driver-core-next (3b5ea0f078e1b rust: pci: expose the allocated interrupt type) +$ 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 (e1e6e541c5c9c Merge tag 'thunderbolt-for-v7.3-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-next) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/devicetree/bindings/usb/qcom,snps-dwc3.yaml +Auto-merging drivers/net/thunderbolt/main.c +Auto-merging drivers/power/supply/power_supply_core.c +Auto-merging include/linux/power_supply.h +Auto-merging rust/kernel/usb.rs +Merge made by the 'ort' strategy. + Documentation/ABI/obsolete/sysfs-bus-usb | 2 +- + .../ABI/testing/configfs-thunderbolt_stream | 15 + + .../ABI/testing/configfs-usb-gadget-uac1_legacy | 3 - + Documentation/ABI/testing/sysfs-bus-usb | 2 +- + Documentation/admin-guide/thunderbolt.rst | 4 +- + .../devicetree/bindings/usb/aspeed,dwc3.yaml | 93 +++ + .../devicetree/bindings/usb/cdns,usb3.yaml | 3 + + .../devicetree/bindings/usb/generic-ehci.yaml | 7 + + .../devicetree/bindings/usb/generic-ohci.yaml | 5 + + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 6 +- + .../devicetree/bindings/usb/qcom,snps-dwc3.yaml | 9 + + .../devicetree/bindings/usb/renesas,usbhs.yaml | 1 + + .../devicetree/bindings/usb/ti,tps6598x.yaml | 6 +- + Documentation/translations/zh_CN/usb/CREDITS | 147 +++-- + Documentation/translations/zh_CN/usb/acm.rst | 62 +- + .../translations/zh_CN/usb/authorization.rst | 79 ++- + Documentation/translations/zh_CN/usb/chipidea.rst | 63 +- + Documentation/translations/zh_CN/usb/dwc3.rst | 37 +- + Documentation/translations/zh_CN/usb/ehci.rst | 249 ++++---- + Documentation/translations/zh_CN/usb/index.rst | 18 +- + Documentation/translations/zh_CN/usb/usbmon.rst | 332 +++++------ + Documentation/usb/functionfs.rst | 80 +++ + Documentation/usb/gadget-testing.rst | 3 - + drivers/media/usb/as102/as102_usb_drv.c | 75 +-- + drivers/net/thunderbolt/main.c | 4 +- + drivers/net/usb/pegasus.c | 54 +- + drivers/net/usb/pegasus.h | 3 - + drivers/net/wireless/ath/ath9k/hif_usb.c | 12 +- + drivers/net/wireless/ath/ath9k/hif_usb.h | 2 +- + drivers/target/target_core_fabric_configfs.c | 8 + + drivers/thunderbolt/debugfs.c | 28 +- + drivers/thunderbolt/dma_test.c | 4 +- + drivers/thunderbolt/domain.c | 30 +- + drivers/thunderbolt/nhi.c | 55 +- + drivers/thunderbolt/nhi.h | 21 +- + drivers/thunderbolt/nhi_regs.h | 4 + + drivers/thunderbolt/pci.c | 54 +- + drivers/thunderbolt/stream.c | 268 +++++++-- + drivers/thunderbolt/switch.c | 11 +- + drivers/thunderbolt/tb.c | 21 + + drivers/thunderbolt/tb.h | 1 + + drivers/thunderbolt/tunnel.c | 13 +- + drivers/thunderbolt/xdomain.c | 4 + + drivers/usb/atm/xusbatm.c | 6 +- + drivers/usb/c67x00/c67x00-sched.c | 4 +- + drivers/usb/cdns3/cdns3-plat.c | 4 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 2 +- + drivers/usb/class/usbtmc.c | 2 - + drivers/usb/core/config.c | 2 +- + drivers/usb/core/devices.c | 7 +- + drivers/usb/core/devio.c | 15 +- + drivers/usb/core/driver.c | 12 +- + drivers/usb/core/hub.c | 17 +- + drivers/usb/dwc2/core_intr.c | 3 +- + drivers/usb/dwc2/gadget.c | 11 +- + drivers/usb/dwc3/core.c | 99 +++- + drivers/usb/dwc3/core.h | 7 +- + drivers/usb/dwc3/dwc3-am62.c | 13 +- + drivers/usb/dwc3/dwc3-qcom.c | 2 +- + drivers/usb/dwc3/dwc3-xilinx.c | 18 +- + drivers/usb/dwc3/gadget.c | 16 +- + drivers/usb/dwc3/host.c | 5 +- + drivers/usb/gadget/configfs.c | 8 +- + drivers/usb/gadget/function/f_fs.c | 163 +++++- + drivers/usb/gadget/function/f_mass_storage.c | 3 - + drivers/usb/gadget/function/f_midi2.c | 2 + + drivers/usb/gadget/function/f_tcm.c | 25 +- + drivers/usb/gadget/function/f_uac1.c | 13 +- + drivers/usb/gadget/function/f_uac1_legacy.c | 56 -- + drivers/usb/gadget/function/f_uac2.c | 13 +- + drivers/usb/gadget/function/f_uvc.c | 7 +- + drivers/usb/gadget/function/u_audio.c | 36 +- + drivers/usb/gadget/function/u_fs.h | 8 +- + drivers/usb/gadget/function/u_uac1_legacy.h | 3 - + drivers/usb/gadget/function/uvc_video.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 17 +- + drivers/usb/gadget/legacy/nokia.c | 2 +- + drivers/usb/gadget/udc/Kconfig | 2 +- + drivers/usb/gadget/udc/aspeed_udc.c | 50 +- + drivers/usb/gadget/udc/at91_udc.c | 20 +- + drivers/usb/gadget/udc/fsl_qe_udc.c | 8 +- + drivers/usb/gadget/udc/pch_udc.c | 1 - + drivers/usb/gadget/udc/r8a66597-udc.c | 1 - + drivers/usb/gadget/udc/snps_udc_plat.c | 5 +- + drivers/usb/host/fsl-mph-dr-of.c | 7 +- + drivers/usb/host/ohci-dbg.c | 9 +- + drivers/usb/host/xhci-caps.h | 41 +- + drivers/usb/host/xhci-dbgtty.c | 25 +- + drivers/usb/host/xhci-debugfs.c | 3 +- + drivers/usb/host/xhci-histb.c | 2 +- + drivers/usb/host/xhci-hub.c | 6 +- + drivers/usb/host/xhci-mem.c | 7 +- + drivers/usb/host/xhci-mtk.c | 4 +- + drivers/usb/host/xhci-pci.c | 4 +- + drivers/usb/host/xhci-plat.c | 2 +- + drivers/usb/host/xhci-ring.c | 496 ++++++++-------- + drivers/usb/host/xhci-tegra.c | 5 +- + drivers/usb/host/xhci.c | 43 +- + drivers/usb/host/xhci.h | 21 +- + drivers/usb/misc/cypress_cy7c63.c | 8 +- + drivers/usb/misc/usb-ljca.c | 3 + + drivers/usb/misc/usbtest.c | 1 + + drivers/usb/misc/uss720.c | 1 + + drivers/usb/mtu3/mtu3_core.c | 11 +- + drivers/usb/mtu3/mtu3_host.c | 26 + + drivers/usb/mtu3/mtu3_plat.c | 3 +- + drivers/usb/musb/Kconfig | 1 - + drivers/usb/musb/musb_host.c | 14 +- + drivers/usb/phy/phy-fsl-usb.c | 52 +- + drivers/usb/phy/phy-fsl-usb.h | 6 +- + drivers/usb/renesas_usbhs/common.c | 6 +- + drivers/usb/serial/digi_acceleport.c | 325 +++++------ + drivers/usb/serial/keyspan_pda.c | 1 - + drivers/usb/serial/metro-usb.c | 31 +- + drivers/usb/serial/option.c | 20 +- + drivers/usb/serial/pl2303.c | 108 +++- + drivers/usb/serial/pl2303.h | 2 +- + drivers/usb/serial/spcp8x5.c | 6 +- + drivers/usb/typec/altmodes/Kconfig | 1 + + drivers/usb/typec/altmodes/displayport.c | 18 +- + drivers/usb/typec/altmodes/thunderbolt.c | 6 + + drivers/usb/typec/class.c | 71 +++ + drivers/usb/typec/hd3ss3220.c | 2 +- + drivers/usb/typec/mux/tusb1046.c | 1 + + drivers/usb/typec/tcpm/tcpci.c | 12 +- + drivers/usb/typec/tcpm/tcpm.c | 636 ++++++++++++++++----- + drivers/usb/typec/tipd/core.c | 85 ++- + drivers/usb/typec/tipd/tps6598x.h | 10 +- + drivers/usb/typec/ucsi/debugfs.c | 5 +- + drivers/usb/typec/ucsi/ucsi.c | 21 +- + drivers/usb/typec/ucsi/ucsi.h | 1 + + drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c | 15 +- + include/linux/thunderbolt.h | 10 +- + include/linux/usb.h | 3 +- + include/linux/usb/pd.h | 53 +- + include/linux/usb/tcpci.h | 1 + + include/linux/usb/typec.h | 1 + + include/target/target_core_fabric.h | 2 + + include/uapi/linux/usb/functionfs.h | 24 + + rust/kernel/usb.rs | 35 +- + 140 files changed, 3136 insertions(+), 1765 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/aspeed,dwc3.yaml +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 (8b0b29fdcb479 serial: imx: serialize imx_uart_ports[] lifetime) +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8390-tungsten-smarc.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8395-genio-common.dtsi +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +Auto-merging drivers/tty/serial/8250/8250_of.c +Auto-merging drivers/tty/serial/amba-pl011.c +Auto-merging drivers/tty/serial/qcom_geni_serial.c +Auto-merging drivers/tty/serial/sc16is7xx.c +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/tty/vt/vt_ioctl.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/serial/8250.yaml | 8 +- + .../devicetree/bindings/serial/maxim,max310x.yaml | 92 +- + .../bindings/serial/snps-dw-apb-uart.yaml | 2 + + MAINTAINERS | 6 - + .../boot/dts/mediatek/mt6795-sony-xperia-m5.dts | 1 + + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 1 + + .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts | 2 + + arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 2 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 1 + + .../boot/dts/mediatek/mt8192-asurada-hayato-r1.dts | 4 + + arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8365-evk.dts | 2 + + .../boot/dts/mediatek/mt8390-genio-common.dtsi | 2 + + .../boot/dts/mediatek/mt8390-grinn-genio-sbc.dtsi | 2 + + .../boot/dts/mediatek/mt8390-tungsten-smarc.dtsi | 2 + + .../boot/dts/mediatek/mt8395-genio-common.dtsi | 1 + + arch/powerpc/configs/ppc6xx_defconfig | 1 - + drivers/tty/Kconfig | 9 - + drivers/tty/Makefile | 2 - + drivers/tty/amiserial.c | 14 +- + drivers/tty/goldfish.c | 23 +- + drivers/tty/hvc/Kconfig | 2 +- + drivers/tty/ipwireless/Makefile | 9 - + drivers/tty/ipwireless/hardware.c | 1770 -------------------- + drivers/tty/ipwireless/hardware.h | 63 - + drivers/tty/ipwireless/main.c | 356 ---- + drivers/tty/ipwireless/main.h | 66 - + drivers/tty/ipwireless/network.c | 517 ------ + drivers/tty/ipwireless/network.h | 54 - + drivers/tty/ipwireless/setup_protocol.h | 109 -- + drivers/tty/ipwireless/tty.c | 627 ------- + drivers/tty/ipwireless/tty.h | 46 - + drivers/tty/serdev/core.c | 4 +- + drivers/tty/serial/8250/8250.h | 11 +- + drivers/tty/serial/8250/8250_bcm7271.c | 4 +- + drivers/tty/serial/8250/8250_core.c | 71 +- + drivers/tty/serial/8250/8250_dw.c | 2 +- + drivers/tty/serial/8250/8250_early.c | 19 +- + drivers/tty/serial/8250/8250_exar.c | 53 +- + drivers/tty/serial/8250/8250_hub6.c | 8 + + drivers/tty/serial/8250/8250_mtk.c | 7 +- + drivers/tty/serial/8250/8250_mxpcie.c | 627 +++++++ + drivers/tty/serial/8250/8250_of.c | 12 + + drivers/tty/serial/8250/8250_pci.c | 245 +-- + drivers/tty/serial/8250/8250_platform.c | 1 + + drivers/tty/serial/8250/8250_pnp.c | 309 ++-- + drivers/tty/serial/8250/8250_port.c | 321 +++- + drivers/tty/serial/8250/8250_rsa.c | 40 +- + drivers/tty/serial/8250/Kconfig | 10 + + drivers/tty/serial/8250/Makefile | 1 + + drivers/tty/serial/amba-pl011.c | 48 +- + drivers/tty/serial/bcm63xx_uart.c | 11 +- + drivers/tty/serial/cpm_uart.c | 9 +- + drivers/tty/serial/earlycon.c | 17 +- + drivers/tty/serial/imx.c | 39 +- + drivers/tty/serial/kgdboc.c | 2 +- + drivers/tty/serial/ma35d1_serial.c | 12 +- + drivers/tty/serial/max3100.c | 1 + + drivers/tty/serial/max310x.c | 101 +- + drivers/tty/serial/men_z135_uart.c | 7 +- + drivers/tty/serial/mpc52xx_uart.c | 8 + + drivers/tty/serial/mvebu-uart.c | 12 +- + drivers/tty/serial/pch_uart.c | 11 +- + drivers/tty/serial/qcom_geni_serial.c | 660 +++++--- + drivers/tty/serial/rp2.c | 2 +- + drivers/tty/serial/rsci.c | 3 - + drivers/tty/serial/sc16is7xx.c | 9 +- + drivers/tty/serial/serial_core.c | 167 +- + drivers/tty/serial/serial_mctrl_gpio.c | 3 - + drivers/tty/serial/sh-sci.c | 2 - + drivers/tty/serial/sprd_serial.c | 5 +- + drivers/tty/tty_io.c | 6 +- + drivers/tty/tty_jobctrl.c | 41 +- + drivers/tty/vt/vc_screen.c | 6 +- + drivers/tty/vt/vt_ioctl.c | 2 + + include/linux/goldfish.h | 24 - + include/linux/serial_8250.h | 17 +- + include/linux/serial_core.h | 9 + + include/trace/events/qcom_geni_serial.h | 7 +- + include/uapi/linux/serial.h | 1 + + include/uapi/linux/serial_core.h | 3 + + 81 files changed, 2061 insertions(+), 4726 deletions(-) + delete mode 100644 drivers/tty/ipwireless/Makefile + delete mode 100644 drivers/tty/ipwireless/hardware.c + delete mode 100644 drivers/tty/ipwireless/hardware.h + delete mode 100644 drivers/tty/ipwireless/main.c + delete mode 100644 drivers/tty/ipwireless/main.h + delete mode 100644 drivers/tty/ipwireless/network.c + delete mode 100644 drivers/tty/ipwireless/network.h + delete mode 100644 drivers/tty/ipwireless/setup_protocol.h + delete mode 100644 drivers/tty/ipwireless/tty.c + delete mode 100644 drivers/tty/ipwireless/tty.h + create mode 100644 drivers/tty/serial/8250/8250_mxpcie.c +Merging char-misc/char-misc-next (8992f32c57607 Merge tag 'coresight-next-v7.3' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/coresight/linux into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging .mailmap +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/hwmon/index.rst +Auto-merging MAINTAINERS +Auto-merging drivers/android/binder/process.rs +Auto-merging drivers/android/binder/rust_binder_main.rs +Auto-merging drivers/char/hw_random/imx-rngc.c +Auto-merging drivers/char/hw_random/omap-rng.c +Auto-merging drivers/char/hw_random/xgene-rng.c +Auto-merging drivers/char/tpm/tpm_i2c_nuvoton.c +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/iio/accel/kionix-kx022a.c +Auto-merging drivers/iio/adc/ad7173.c +Auto-merging drivers/iio/adc/ade9000.c +Auto-merging drivers/iio/dac/rohm-bd79703.c +Auto-merging drivers/iio/frequency/adf4377.c +Auto-merging drivers/iio/health/max30102.c +Auto-merging drivers/iio/pressure/bmp280-core.c +Auto-merging drivers/iio/pressure/rohm-bm1390.c +Auto-merging drivers/misc/fastrpc.c +Auto-merging drivers/misc/pci_endpoint_test.c +CONFLICT (modify/delete): drivers/misc/sgi-xp/xpc_uv.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/misc/sgi-xp/xpc_uv.c left in tree. +Auto-merging drivers/nvmem/core.c +Auto-merging drivers/nvmem/internals.h +Auto-merging drivers/power/supply/ab8500_btemp.c +Auto-merging drivers/power/supply/ab8500_charger.c +Auto-merging drivers/power/supply/ab8500_fg.c +Auto-merging drivers/power/supply/axp20x_ac_power.c +Auto-merging drivers/power/supply/axp20x_usb_power.c +Auto-merging drivers/power/supply/axp288_fuel_gauge.c +Auto-merging drivers/power/supply/cpcap-battery.c +Auto-merging drivers/power/supply/cpcap-charger.c +Auto-merging drivers/power/supply/generic-adc-battery.c +Auto-merging drivers/power/supply/lp8788-charger.c +Auto-merging drivers/power/supply/max17040_battery.c +Auto-merging drivers/power/supply/mp2629_charger.c +Auto-merging drivers/power/supply/mt6370-charger.c +Auto-merging drivers/power/supply/qcom_smbx.c +Auto-merging drivers/power/supply/rn5t618_power.c +Auto-merging drivers/power/supply/sc27xx_fuel_gauge.c +Auto-merging drivers/power/supply/twl4030_charger.c +Auto-merging drivers/power/supply/twl6030_charger.c +Auto-merging drivers/thermal/qcom/qcom-spmi-adc-tm5.c +Auto-merging lib/vsprintf.c +Auto-merging rust/bindings/bindings_helper.h +Auto-merging rust/helpers/helpers.c +Auto-merging rust/kernel/miscdevice.rs +Auto-merging rust/kernel/sync/poll.rs +CONFLICT (content): Merge conflict in rust/kernel/sync/poll.rs +Auto-merging rust/kernel/task.rs +CONFLICT (content): Merge conflict in rust/kernel/task.rs +Auto-merging rust/uapi/uapi_helper.h +CONFLICT (content): Merge conflict in rust/uapi/uapi_helper.h +Auto-merging sound/soc/samsung/aries_wm8994.c +Auto-merging sound/soc/stm/stm32_adfsdm.c +Resolved 'rust/kernel/sync/poll.rs' using previous resolution. +Resolved 'rust/kernel/task.rs' using previous resolution. +Resolved 'rust/uapi/uapi_helper.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/misc/sgi-xp/xpc_uv.c +rm 'drivers/misc/sgi-xp/xpc_uv.c' +$ git commit --no-edit -v -a +[master 261c482f9a30e] Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 2 + + Documentation/ABI/testing/sysfs-bus-iio | 31 +- + Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192 | 2 +- + Documentation/ABI/testing/sysfs-bus-iio-flow | 21 + + Documentation/ABI/testing/sysfs-bus-iio-frequency | 11 + + .../ABI/testing/sysfs-bus-iio-frequency-adf4350 | 10 - + Documentation/ABI/testing/sysfs-class-issei | 73 + + .../testing/sysfs-devices-platform-stratix10-rsu | 58 + + Documentation/ABI/testing/sysfs-platform-dfl-port | 2 +- + Documentation/devicetree/bindings/iio/adc/adc.yaml | 41 + + .../devicetree/bindings/iio/adc/adi,ad4080.yaml | 2 + + .../devicetree/bindings/iio/adc/adi,ltc2378.yaml | 170 ++ + .../devicetree/bindings/iio/adc/avia-hx711.yaml | 21 + + .../bindings/iio/adc/mediatek,mt6359-auxadc.yaml | 3 +- + .../bindings/iio/adc/rockchip-saradc.yaml | 4 +- + .../devicetree/bindings/iio/adc/ti,ads112c14.yaml | 219 ++ + .../bindings/iio/adc/xlnx,versal-sysmon.yaml | 154 ++ + .../bindings/iio/chemical/sensirion,scd30.yaml | 3 +- + .../devicetree/bindings/iio/dac/adi,ad3530r.yaml | 16 +- + .../devicetree/bindings/iio/dac/adi,ad5686.yaml | 86 +- + .../devicetree/bindings/iio/dac/adi,ad5696.yaml | 79 +- + .../devicetree/bindings/iio/dac/adi,ad5791.yaml | 4 +- + .../bindings/iio/dac/microchip,mcp47a1.yaml | 50 + + .../bindings/iio/flow/sensirion,slf3s.yaml | 55 + + .../bindings/iio/frequency/adi,adf41513.yaml | 227 +++ + .../bindings/iio/imu/invensense,icm42600.yaml | 20 +- + .../iio/magnetometer/qstcorp,qmc5883l.yaml | 52 + + .../bindings/iio/magnetometer/qstcorp,qmc6308.yaml | 47 + + .../bindings/iio/proximity/st,vl53l0x.yaml | 2 +- + .../bindings/iio/temperature/ti,tmp117.yaml | 16 +- + .../bindings/interconnect/qcom,maili-rpmh.yaml | 127 ++ + .../bindings/interconnect/qcom,osm-l3.yaml | 2 + + .../bindings/interconnect/qcom,sc8280xp-rpmh.yaml | 101 +- + .../bindings/interconnect/qcom,x1e80100-rpmh.yaml | 72 + + .../devicetree/bindings/misc/qcom,fastrpc.yaml | 4 + + .../bindings/nvmem/airoha,smc-efuses.yaml | 67 + + .../bindings/nvmem/microchip,lan9662-otpc.yaml | 1 + + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/devicetree/bindings/w1/omap-hdq.txt | 22 - + Documentation/devicetree/bindings/w1/ti,hdq.yaml | 70 + + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/issei/index.rst | 16 + + Documentation/driver-api/issei/issei.rst | 135 ++ + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/socfpga-hwmon.rst | 34 + + Documentation/iio/adf41513.rst | 199 ++ + Documentation/iio/index.rst | 1 + + Documentation/misc-devices/amd-sbi.rst | 74 + + Documentation/userspace-api/ntsync.rst | 33 +- + Documentation/w1/masters/omap-hdq.rst | 2 +- + MAINTAINERS | 119 +- + drivers/accessibility/speakup/fakekey.c | 4 +- + drivers/accessibility/speakup/genmap.c | 3 +- + drivers/accessibility/speakup/i18n.c | 2 +- + drivers/accessibility/speakup/keyhelp.c | 27 +- + drivers/accessibility/speakup/kobjects.c | 14 +- + drivers/accessibility/speakup/main.c | 75 +- + drivers/accessibility/speakup/selection.c | 2 +- + drivers/accessibility/speakup/speakup.h | 10 +- + drivers/accessibility/speakup/speakup_acnt.h | 3 + + drivers/accessibility/speakup/speakup_decpc.c | 2 +- + drivers/accessibility/speakup/speakup_dtlk.h | 5 +- + drivers/accessibility/speakup/speakup_soft.c | 5 +- + drivers/accessibility/speakup/spk_types.h | 2 +- + drivers/accessibility/speakup/synth.c | 4 +- + drivers/accessibility/speakup/utils.h | 2 +- + drivers/android/Kconfig | 2 +- + drivers/android/binder/allocation.rs | 4 +- + drivers/android/binder/debug.rs | 76 + + drivers/android/binder/defs.rs | 8 +- + drivers/android/binder/freeze.rs | 125 +- + drivers/android/binder/netlink.rs | 117 ++ + drivers/android/binder/node.rs | 87 +- + drivers/android/binder/node/wrapper.rs | 2 +- + drivers/android/binder/page_range.rs | 8 +- + drivers/android/binder/process.rs | 226 ++- + drivers/android/binder/rust_binder_main.rs | 39 +- + drivers/android/binder/rust_binderfs.c | 3 + + drivers/android/binder/thread.rs | 296 +-- + drivers/android/binder/trace.rs | 4 +- + drivers/android/binder/transaction.rs | 131 +- + drivers/base/cacheinfo.c | 9 +- + drivers/bus/mhi/ep/main.c | 56 +- + drivers/bus/mhi/host/init.c | 4 +- + drivers/bus/mhi/host/main.c | 6 + + drivers/bus/mhi/host/pci_generic.c | 5 + + drivers/bus/mhi/host/pm.c | 71 +- + drivers/cdx/cdx.c | 7 +- + drivers/char/powernv-op-panel.c | 2 - + drivers/char/ppdev.c | 10 +- + drivers/char/tlclk.c | 36 +- + drivers/char/virtio_console.c | 196 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 5 +- + drivers/char/xillybus/xillybus_of.c | 5 +- + drivers/char/xillybus/xillybus_pcie.c | 5 +- + drivers/comedi/drivers/aio_iiro_16.c | 3 + + drivers/comedi/drivers/c6xdigio.c | 6 +- + drivers/comedi/drivers/das6402.c | 10 +- + drivers/comedi/drivers/dt2811.c | 7 +- + drivers/comedi/drivers/ni_at_a2150.c | 13 +- + drivers/comedi/drivers/ni_atmio.c | 14 +- + drivers/comedi/drivers/ni_atmio16d.c | 3 + + drivers/comedi/drivers/ni_pcimio.c | 5 +- + drivers/comedi/drivers/pcl711.c | 3 +- + drivers/comedi/drivers/pcl816.c | 3 +- + drivers/comedi/drivers/pcl818.c | 3 +- + drivers/comedi/drivers/pcmmio.c | 3 + + drivers/comedi/drivers/pcmuio.c | 5 +- + drivers/comedi/drivers/quatech_daqp_cs.c | 4 +- + drivers/counter/stm32-timer-cnt.c | 10 +- + drivers/counter/ti-ecap-capture.c | 2 +- + drivers/counter/ti-eqep.c | 2 +- + drivers/eisa/eisa-bus.c | 3 +- + drivers/extcon/extcon-adc-jack.c | 1 + + drivers/firmware/stratix10-rsu.c | 421 +++- + drivers/firmware/stratix10-svc.c | 139 +- + drivers/fpga/altera-cvp.c | 10 +- + drivers/fpga/dfl-fme-perf.c | 2 + + drivers/fpga/stratix10-soc.c | 21 +- + drivers/fpga/xilinx-pr-decoupler.c | 20 +- + drivers/fpga/zynq-fpga.c | 1 - + drivers/gpib/agilent_82350b/agilent_82350b.c | 9 +- + drivers/gpib/cb7210/cb7210.c | 8 +- + drivers/gpib/cec/cec_gpib.c | 4 +- + drivers/gpib/common/gpib_os.c | 21 +- + drivers/gpib/common/iblib.c | 3 - + drivers/gpib/fmh_gpib/fmh_gpib.c | 2 +- + drivers/gpib/hp_82341/hp_82341.c | 4 +- + drivers/gpib/include/amccs5933.h | 10 +- + drivers/gpib/ines/ines_gpib.c | 21 +- + drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 13 +- + drivers/gpib/tnt4882/mite.h | 4 +- + drivers/gpib/tnt4882/tnt4882_gpib.c | 4 +- + drivers/greybus/manifest.c | 2 + + drivers/hwmon/Kconfig | 12 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/iio_hwmon.c | 1 + + drivers/hwmon/ntc_thermistor.c | 1 + + drivers/hwmon/sbtsi_temp.c | 152 +- + drivers/hwmon/socfpga-hwmon.c | 579 ++++++ + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 15 +- + drivers/hwtracing/coresight/coresight-etm4x-cfg.c | 2 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 59 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 6 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 12 +- + drivers/hwtracing/ptt/hisi_ptt.c | 25 +- + drivers/iio/Kconfig | 1 + + drivers/iio/Makefile | 1 + + drivers/iio/TODO | 13 +- + drivers/iio/accel/adxl345_spi.c | 4 +- + drivers/iio/accel/adxl355_core.c | 3 +- + drivers/iio/accel/adxl355_spi.c | 4 +- + drivers/iio/accel/adxl367.c | 2 +- + drivers/iio/accel/adxl367_spi.c | 2 +- + drivers/iio/accel/adxl372_spi.c | 4 +- + drivers/iio/accel/adxl380_spi.c | 8 +- + drivers/iio/accel/bma180.c | 4 +- + drivers/iio/accel/bma220_core.c | 3 +- + drivers/iio/accel/bma220_spi.c | 2 +- + drivers/iio/accel/bma400_core.c | 3 +- + drivers/iio/accel/bma400_spi.c | 2 +- + drivers/iio/accel/bmc150-accel-core.c | 6 +- + drivers/iio/accel/bmc150-accel-spi.c | 18 +- + drivers/iio/accel/bmi088-accel-spi.c | 6 +- + drivers/iio/accel/dmard09.c | 7 + + drivers/iio/accel/fxls8962af-core.c | 2 + + drivers/iio/accel/fxls8962af-spi.c | 4 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 68 +- + drivers/iio/accel/kionix-kx022a.c | 2 +- + drivers/iio/accel/kxsd9-spi.c | 2 +- + drivers/iio/accel/mma7455_spi.c | 4 +- + drivers/iio/accel/mma9551.c | 4 +- + drivers/iio/accel/mma9553.c | 5 +- + drivers/iio/accel/msa311.c | 2 +- + drivers/iio/accel/mxc4005.c | 5 +- + drivers/iio/accel/sca3000.c | 8 +- + drivers/iio/accel/sca3300.c | 4 +- + drivers/iio/accel/st_accel_spi.c | 40 +- + drivers/iio/accel/stk8312.c | 17 +- + drivers/iio/accel/stk8ba50.c | 14 +- + drivers/iio/adc/88pm886-gpadc.c | 2 +- + drivers/iio/adc/Kconfig | 78 +- + drivers/iio/adc/Makefile | 6 + + drivers/iio/adc/ad4000.c | 62 +- + drivers/iio/adc/ad4030.c | 14 +- + drivers/iio/adc/ad4080.c | 40 +- + drivers/iio/adc/ad4130.c | 12 +- + drivers/iio/adc/ad4134.c | 2 +- + drivers/iio/adc/ad4170-4.c | 6 +- + drivers/iio/adc/ad4851.c | 18 +- + drivers/iio/adc/ad7091r8.c | 6 +- + drivers/iio/adc/ad7124.c | 4 +- + drivers/iio/adc/ad7173.c | 26 +- + drivers/iio/adc/ad7191.c | 2 +- + drivers/iio/adc/ad7192.c | 10 +- + drivers/iio/adc/ad7266.c | 4 +- + drivers/iio/adc/ad7280a.c | 2 +- + drivers/iio/adc/ad7292.c | 2 +- + drivers/iio/adc/ad7298.c | 2 +- + drivers/iio/adc/ad7380.c | 36 +- + drivers/iio/adc/ad7476.c | 60 +- + drivers/iio/adc/ad7606_spi.c | 22 +- + drivers/iio/adc/ad7766.c | 12 +- + drivers/iio/adc/ad7768-1.c | 8 +- + drivers/iio/adc/ad7779.c | 6 +- + drivers/iio/adc/ad7780.c | 8 +- + drivers/iio/adc/ad7791.c | 10 +- + drivers/iio/adc/ad7793.c | 18 +- + drivers/iio/adc/ad7887.c | 2 +- + drivers/iio/adc/ad7923.c | 14 +- + drivers/iio/adc/ad7944.c | 6 +- + drivers/iio/adc/ad7949.c | 6 +- + drivers/iio/adc/ad9467.c | 14 +- + drivers/iio/adc/ade9000.c | 4 +- + drivers/iio/adc/at91_adc.c | 4 +- + drivers/iio/adc/envelope-detector.c | 1 + + drivers/iio/adc/hi8435.c | 2 +- + drivers/iio/adc/hx711.c | 98 +- + drivers/iio/adc/ltc2378.c | 857 ++++++++ + drivers/iio/adc/max1027.c | 12 +- + drivers/iio/adc/max1118.c | 6 +- + drivers/iio/adc/max11205.c | 4 +- + drivers/iio/adc/max11410.c | 2 +- + drivers/iio/adc/max1241.c | 9 +- + drivers/iio/adc/max14001.c | 4 +- + drivers/iio/adc/mcp320x.c | 26 +- + drivers/iio/adc/mcp3564.c | 24 +- + drivers/iio/adc/mcp3911.c | 14 +- + drivers/iio/adc/mt6323-auxadc.c | 313 +++ + drivers/iio/adc/rcar-gyroadc.c | 14 +- + drivers/iio/adc/rohm-bd79112.c | 2 +- + drivers/iio/adc/rtq6056.c | 4 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 12 +- + drivers/iio/adc/ti-adc081c.c | 6 +- + drivers/iio/adc/ti-adc0832.c | 8 +- + drivers/iio/adc/ti-adc084s021.c | 8 +- + drivers/iio/adc/ti-adc108s102.c | 2 +- + drivers/iio/adc/ti-adc12138.c | 6 +- + drivers/iio/adc/ti-adc128s052.c | 24 +- + drivers/iio/adc/ti-adc161s626.c | 4 +- + drivers/iio/adc/ti-ads1015.c | 46 +- + drivers/iio/adc/ti-ads1018.c | 4 +- + drivers/iio/adc/ti-ads112c14.c | 1454 ++++++++++++++ + drivers/iio/adc/ti-ads124s08.c | 4 +- + drivers/iio/adc/ti-ads1298.c | 2 +- + drivers/iio/adc/ti-ads131e08.c | 6 +- + drivers/iio/adc/ti-ads131m02.c | 10 +- + drivers/iio/adc/ti-ads7950.c | 24 +- + drivers/iio/adc/ti-ads8688.c | 4 +- + drivers/iio/adc/ti-lmp92064.c | 2 +- + drivers/iio/adc/ti-tlc4541.c | 4 +- + drivers/iio/adc/ti-tsc2046.c | 25 +- + drivers/iio/adc/versal-sysmon-core.c | 1052 ++++++++++ + drivers/iio/adc/versal-sysmon-i2c.c | 134 ++ + drivers/iio/adc/versal-sysmon.c | 92 + + drivers/iio/adc/versal-sysmon.h | 120 ++ + drivers/iio/addac/ad74115.c | 2 +- + drivers/iio/addac/ad74413r.c | 2 +- + drivers/iio/afe/iio-rescale.c | 1 + + drivers/iio/amplifiers/ad8366.c | 26 +- + drivers/iio/amplifiers/ada4250.c | 2 +- + drivers/iio/buffer/industrialio-buffer-cb.c | 1 + + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 42 +- + drivers/iio/buffer/industrialio-hw-consumer.c | 1 + + drivers/iio/chemical/bme680_i2c.c | 7 +- + drivers/iio/chemical/bme680_spi.c | 9 +- + drivers/iio/chemical/ccs811.c | 4 +- + drivers/iio/chemical/ens160_core.c | 2 +- + drivers/iio/chemical/ens160_spi.c | 2 +- + drivers/iio/chemical/scd30_core.c | 12 +- + drivers/iio/chemical/scd30_i2c.c | 4 +- + drivers/iio/chemical/scd30_serial.c | 4 +- + drivers/iio/chemical/sgp30.c | 3 + + drivers/iio/chemical/sps30_i2c.c | 4 +- + drivers/iio/chemical/sps30_serial.c | 4 +- + .../iio/common/hid-sensors/hid-sensor-attributes.c | 81 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 7 +- + .../iio/common/hid-sensors/hid-sensor-trigger.h | 2 +- + .../iio/common/inv_sensors/inv_sensors_timestamp.c | 107 +- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 4 +- + drivers/iio/dac/Kconfig | 61 +- + drivers/iio/dac/Makefile | 2 + + drivers/iio/dac/ad3530r.c | 359 +++- + drivers/iio/dac/ad5064.c | 32 +- + drivers/iio/dac/ad5360.c | 16 +- + drivers/iio/dac/ad5380.c | 32 +- + drivers/iio/dac/ad5446-spi.c | 62 +- + drivers/iio/dac/ad5449.c | 14 +- + drivers/iio/dac/ad5504.c | 4 +- + drivers/iio/dac/ad5624r_spi.c | 12 +- + drivers/iio/dac/ad5686-spi.c | 163 +- + drivers/iio/dac/ad5686.c | 311 ++- + drivers/iio/dac/ad5686.h | 63 +- + drivers/iio/dac/ad5696-i2c.c | 32 +- + drivers/iio/dac/ad5706r.c | 2 +- + drivers/iio/dac/ad5755.c | 10 +- + drivers/iio/dac/ad5758.c | 2 +- + drivers/iio/dac/ad5761.c | 8 +- + drivers/iio/dac/ad5764.c | 8 +- + drivers/iio/dac/ad5766.c | 4 +- + drivers/iio/dac/ad5770r.c | 2 +- + drivers/iio/dac/ad5791.c | 10 +- + drivers/iio/dac/ad7293.c | 2 +- + drivers/iio/dac/ad7303.c | 2 +- + drivers/iio/dac/ad8460.c | 1 + + drivers/iio/dac/ad8801.c | 4 +- + drivers/iio/dac/ad9739a.c | 2 +- + drivers/iio/dac/dpot-dac.c | 1 + + drivers/iio/dac/ltc1660.c | 4 +- + drivers/iio/dac/ltc2632.c | 44 +- + drivers/iio/dac/ltc2664.c | 4 +- + drivers/iio/dac/ltc2688.c | 2 +- + drivers/iio/dac/max22007.c | 2 +- + drivers/iio/dac/max5522.c | 31 +- + drivers/iio/dac/mcf54415_dac.c | 180 ++ + drivers/iio/dac/mcp47a1.c | 166 ++ + drivers/iio/dac/mcp4821.c | 12 +- + drivers/iio/dac/mcp4922.c | 8 +- + drivers/iio/dac/rohm-bd79703.c | 8 +- + drivers/iio/dac/ti-dac082s085.c | 12 +- + drivers/iio/dac/ti-dac7311.c | 6 +- + drivers/iio/dac/ti-dac7612.c | 2 +- + drivers/iio/filter/admv8818.c | 2 +- + drivers/iio/flow/Kconfig | 22 + + drivers/iio/flow/Makefile | 7 + + drivers/iio/flow/slf3s.c | 542 +++++ + drivers/iio/frequency/Kconfig | 10 + + drivers/iio/frequency/Makefile | 1 + + drivers/iio/frequency/ad9523.c | 3 +- + drivers/iio/frequency/adf41513.c | 1246 ++++++++++++ + drivers/iio/frequency/adf4350.c | 4 +- + drivers/iio/frequency/adf4371.c | 4 +- + drivers/iio/frequency/adf4377.c | 85 +- + drivers/iio/frequency/admv1013.c | 2 +- + drivers/iio/frequency/admv1014.c | 2 +- + drivers/iio/frequency/adrf6780.c | 2 +- + drivers/iio/gyro/adis16080.c | 4 +- + drivers/iio/gyro/adis16136.c | 8 +- + drivers/iio/gyro/adis16260.c | 12 +- + drivers/iio/gyro/adxrs290.c | 5 +- + drivers/iio/gyro/adxrs450.c | 4 +- + drivers/iio/gyro/bmg160_spi.c | 7 +- + drivers/iio/gyro/fxas21002c_spi.c | 2 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 57 +- + drivers/iio/gyro/st_gyro_spi.c | 18 +- + drivers/iio/health/afe4403.c | 6 +- + drivers/iio/health/afe4404.c | 4 +- + drivers/iio/health/max30100.c | 4 +- + drivers/iio/health/max30102.c | 4 +- + drivers/iio/humidity/hdc3020.c | 3 +- + drivers/iio/humidity/hid-sensor-humidity.c | 35 +- + drivers/iio/humidity/hts221_buffer.c | 5 +- + drivers/iio/humidity/hts221_spi.c | 2 +- + drivers/iio/iio_core_trigger.h | 2 +- + drivers/iio/imu/Kconfig | 1 + + drivers/iio/imu/Makefile | 1 + + drivers/iio/imu/adis16400.c | 30 +- + drivers/iio/imu/adis16460.c | 2 +- + drivers/iio/imu/adis16475.c | 54 +- + drivers/iio/imu/adis16480.c | 44 +- + drivers/iio/imu/adis16550.c | 89 +- + drivers/iio/imu/bmi160/bmi160_core.c | 2 +- + drivers/iio/imu/bmi160/bmi160_spi.c | 4 +- + drivers/iio/imu/bmi270/bmi270_core.c | 2 +- + drivers/iio/imu/bmi270/bmi270_spi.c | 5 +- + drivers/iio/imu/bmi323/bmi323_core.c | 4 +- + drivers/iio/imu/bmi323/bmi323_spi.c | 2 +- + drivers/iio/imu/fxos8700_core.c | 2 +- + drivers/iio/imu/fxos8700_spi.c | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 10 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 18 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 45 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h | 3 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 12 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 16 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 6 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 20 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c | 3 +- + drivers/iio/imu/inv_icm42607/Kconfig | 30 + + drivers/iio/imu/inv_icm42607/Makefile | 13 + + drivers/iio/imu/inv_icm42607/inv_icm42607.h | 421 ++++ + drivers/iio/imu/inv_icm42607/inv_icm42607_accel.c | 316 +++ + drivers/iio/imu/inv_icm42607/inv_icm42607_core.c | 702 +++++++ + drivers/iio/imu/inv_icm42607/inv_icm42607_gyro.c | 313 +++ + drivers/iio/imu/inv_icm42607/inv_icm42607_i2c.c | 97 + + drivers/iio/imu/inv_icm42607/inv_icm42607_spi.c | 107 + + drivers/iio/imu/inv_icm42607/inv_icm42607_temp.c | 99 + + drivers/iio/imu/inv_icm42607/inv_icm42607_temp.h | 38 + + drivers/iio/imu/inv_icm45600/inv_icm45600.h | 2 +- + drivers/iio/imu/inv_icm45600/inv_icm45600_buffer.c | 7 +- + drivers/iio/imu/inv_icm45600/inv_icm45600_core.c | 2 +- + drivers/iio/imu/inv_icm45600/inv_icm45600_i2c.c | 2 +- + drivers/iio/imu/inv_icm45600/inv_icm45600_spi.c | 16 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_magn.c | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 34 +- + drivers/iio/imu/smi240.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 5 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_fusion.c | 5 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 48 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 4 +- + drivers/iio/industrialio-backend.c | 8 +- + drivers/iio/industrialio-core.c | 52 +- + drivers/iio/inkern.c | 54 +- + drivers/iio/light/adux1020.c | 4 +- + drivers/iio/light/apds9160.c | 7 +- + drivers/iio/light/apds9300.c | 4 +- + drivers/iio/light/apds9306.c | 3 +- + drivers/iio/light/apds9960.c | 4 +- + drivers/iio/light/bh1745.c | 3 +- + drivers/iio/light/cm32181.c | 2 +- + drivers/iio/light/cm3323.c | 17 +- + drivers/iio/light/cm3605.c | 5 +- + drivers/iio/light/gp2ap002.c | 5 +- + drivers/iio/light/hid-sensor-als.c | 74 +- + drivers/iio/light/hid-sensor-prox.c | 49 +- + drivers/iio/light/isl29028.c | 22 +- + drivers/iio/light/ltr390.c | 3 +- + drivers/iio/light/ltr501.c | 5 +- + drivers/iio/light/opt3001.c | 543 ++--- + drivers/iio/light/opt4060.c | 2 +- + drivers/iio/light/rpr0521.c | 10 +- + drivers/iio/light/si1145.c | 4 +- + drivers/iio/light/st_uvis25_core.c | 5 +- + drivers/iio/light/st_uvis25_spi.c | 2 +- + drivers/iio/light/stk3310.c | 5 +- + drivers/iio/light/tcs3472.c | 317 ++- + drivers/iio/light/tsl2563.c | 2 +- + drivers/iio/light/tsl2583.c | 44 +- + drivers/iio/light/tsl2772.c | 7 +- + drivers/iio/light/vcnl4000.c | 16 +- + drivers/iio/light/vcnl4035.c | 23 +- + drivers/iio/light/veml6030.c | 4 +- + drivers/iio/light/vl6180.c | 2 +- + drivers/iio/magnetometer/Kconfig | 22 + + drivers/iio/magnetometer/Makefile | 3 + + drivers/iio/magnetometer/ak8974.c | 11 +- + drivers/iio/magnetometer/bmc150_magn.c | 50 +- + drivers/iio/magnetometer/bmc150_magn_spi.c | 6 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 73 +- + drivers/iio/magnetometer/hmc5843_spi.c | 6 +- + drivers/iio/magnetometer/mmc5983.c | 2 +- + drivers/iio/magnetometer/qmc5883l.c | 516 +++++ + drivers/iio/magnetometer/qmc6308.c | 601 ++++++ + drivers/iio/magnetometer/rm3100-core.c | 4 +- + drivers/iio/magnetometer/st_magn_spi.c | 12 +- + drivers/iio/multiplexer/iio-mux.c | 1 + + drivers/iio/orientation/hid-sensor-incl-3d.c | 55 +- + drivers/iio/orientation/hid-sensor-rotation.c | 48 +- + .../iio/position/hid-sensor-custom-intel-hinge.c | 19 +- + drivers/iio/potentiometer/max5481.c | 8 +- + drivers/iio/potentiometer/max5487.c | 6 +- + drivers/iio/potentiometer/mcp41010.c | 12 +- + drivers/iio/potentiometer/mcp4131.c | 128 +- + drivers/iio/potentiometer/x9250.c | 4 +- + drivers/iio/potentiostat/lmp91000.c | 1 + + drivers/iio/pressure/abp2030pa.c | 1 - + drivers/iio/pressure/abp2030pa_spi.c | 2 +- + drivers/iio/pressure/bmp280-core.c | 34 +- + drivers/iio/pressure/bmp280-spi.c | 14 +- + drivers/iio/pressure/dlhl60d.c | 4 +- + drivers/iio/pressure/hid-sensor-press.c | 57 +- + drivers/iio/pressure/hsc030pa_spi.c | 2 +- + drivers/iio/pressure/mpl115.c | 11 +- + drivers/iio/pressure/mpl115_spi.c | 2 +- + drivers/iio/pressure/mprls0025pa_spi.c | 2 +- + drivers/iio/pressure/ms5611_spi.c | 4 +- + drivers/iio/pressure/rohm-bm1390.c | 25 +- + drivers/iio/pressure/st_pressure_spi.c | 24 +- + drivers/iio/pressure/zpa2326.c | 5 +- + drivers/iio/pressure/zpa2326_spi.c | 2 +- + drivers/iio/proximity/as3935.c | 6 +- + drivers/iio/proximity/d3323aa.c | 2 +- + drivers/iio/proximity/hx9023s.c | 2 +- + drivers/iio/proximity/irsd200.c | 2 +- + drivers/iio/proximity/mb1232.c | 4 +- + drivers/iio/proximity/srf04.c | 4 +- + drivers/iio/proximity/sx_common.c | 2 +- + drivers/iio/proximity/vcnl3020.c | 6 +- + drivers/iio/proximity/vl53l0x-i2c.c | 4 +- + drivers/iio/proximity/vl53l1x-i2c.c | 43 +- + drivers/iio/resolver/ad2s1200.c | 20 +- + drivers/iio/resolver/ad2s1210.c | 32 +- + drivers/iio/resolver/ad2s90.c | 2 +- + drivers/iio/temperature/hid-sensor-temperature.c | 34 +- + drivers/iio/temperature/ltc2983.c | 12 +- + drivers/iio/temperature/max31856.c | 2 +- + drivers/iio/temperature/max31865.c | 2 +- + drivers/iio/temperature/maxim_thermocouple.c | 18 +- + drivers/iio/temperature/tmp007.c | 4 +- + drivers/iio/temperature/tmp117.c | 13 + + drivers/iio/test/iio-test-format.c | 97 +- + drivers/iio/test/iio-test-rescale.c | 2 +- + drivers/input/joystick/adc-joystick.c | 1 + + drivers/input/keyboard/adc-keys.c | 1 + + drivers/input/touchscreen/colibri-vf50-ts.c | 1 + + drivers/input/touchscreen/resistive-adc-touch.c | 1 + + drivers/interconnect/core.c | 7 +- + drivers/interconnect/debugfs-client.c | 2 + + drivers/interconnect/qcom/Kconfig | 12 +- + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/icc-rpm.c | 7 +- + drivers/interconnect/qcom/icc-rpm.h | 8 +- + drivers/interconnect/qcom/maili.c | 2091 ++++++++++++++++++++ + drivers/interconnect/qcom/osm-l3.c | 16 +- + drivers/interconnect/qcom/sc8280xp.c | 356 ++++ + drivers/interconnect/qcom/x1e80100.c | 485 +++++ + drivers/ipack/devices/ipoctal.c | 60 +- + drivers/mailbox/mailbox-mchp-ipc-sbi.c | 2 + + drivers/misc/Kconfig | 67 +- + drivers/misc/Makefile | 5 +- + drivers/misc/ad525x_dpot-i2c.c | 53 +- + drivers/misc/ad525x_dpot-spi.c | 59 +- + drivers/misc/ad525x_dpot.c | 177 +- + drivers/misc/ad525x_dpot.h | 3 + + drivers/misc/amd-sbi/Kconfig | 13 + + drivers/misc/amd-sbi/Makefile | 3 + + drivers/misc/amd-sbi/rmi-core.c | 4 + + drivers/misc/amd-sbi/rmi-i2c.c | 6 +- + drivers/misc/amd-sbi/tsi-core.c | 207 ++ + drivers/misc/amd-sbi/tsi-core.h | 29 + + drivers/misc/amd-sbi/tsi.c | 234 +++ + drivers/misc/apds9802als.c | 2 +- + drivers/misc/bcm-vk/bcm_vk_dev.c | 17 +- + drivers/misc/bcm-vk/bcm_vk_msg.c | 24 +- + drivers/misc/bh1770glc.c | 6 +- + drivers/misc/cardreader/alcor_pci.c | 2 +- + drivers/misc/cardreader/rtsx_pcr.c | 2 + + drivers/misc/cb710/core.c | 5 +- + drivers/misc/ds1682.c | 6 +- + drivers/misc/eeprom/Kconfig | 93 - + drivers/misc/eeprom/Makefile | 5 - + drivers/misc/eeprom/idt_89hpesx.c | 202 +- + drivers/misc/eeprom/max6875.c | 2 +- + drivers/misc/enclosure.c | 4 +- + drivers/misc/fastrpc.c | 260 ++- + drivers/misc/gehc-achc.c | 4 +- + drivers/misc/genwqe/card_base.c | 88 +- + drivers/misc/genwqe/card_utils.c | 2 +- + drivers/misc/hi6421v600-irq.c | 7 +- + drivers/misc/hisi_hikey_usb.c | 274 --- + drivers/misc/hmc6352.c | 2 +- + drivers/misc/hpilo.c | 13 +- + drivers/misc/ibmasm/Makefile | 16 - + drivers/misc/ibmasm/command.c | 173 -- + drivers/misc/ibmasm/dot_command.c | 138 -- + drivers/misc/ibmasm/dot_command.h | 64 - + drivers/misc/ibmasm/event.c | 163 -- + drivers/misc/ibmasm/heartbeat.c | 88 - + drivers/misc/ibmasm/i2o.h | 63 - + drivers/misc/ibmasm/ibmasm.h | 209 -- + drivers/misc/ibmasm/ibmasmfs.c | 604 ------ + drivers/misc/ibmasm/lowlevel.c | 75 - + drivers/misc/ibmasm/lowlevel.h | 123 -- + drivers/misc/ibmasm/module.c | 224 --- + drivers/misc/ibmasm/r_heartbeat.c | 86 - + drivers/misc/ibmasm/remote.c | 273 --- + drivers/misc/ibmasm/remote.h | 257 --- + drivers/misc/ibmasm/uart.c | 58 - + drivers/misc/ibmvmc.c | 21 +- + drivers/misc/ics932s401.c | 2 +- + drivers/misc/isl29003.c | 4 +- + drivers/misc/isl29020.c | 2 +- + drivers/misc/issei/Kconfig | 29 + + drivers/misc/issei/Makefile | 15 + + drivers/misc/issei/cdev.c | 446 +++++ + drivers/misc/issei/cdev.h | 16 + + drivers/misc/issei/dma.c | 154 ++ + drivers/misc/issei/dma.h | 69 + + drivers/misc/issei/fw_client.c | 240 +++ + drivers/misc/issei/fw_client.h | 45 + + drivers/misc/issei/ham.c | 169 ++ + drivers/misc/issei/ham.h | 20 + + drivers/misc/issei/host_client.c | 519 +++++ + drivers/misc/issei/host_client.h | 75 + + drivers/misc/issei/hw_heci.c | 550 +++++ + drivers/misc/issei/hw_heci.h | 47 + + drivers/misc/issei/hw_heci_regs.h | 35 + + drivers/misc/issei/hw_msg.h | 163 ++ + drivers/misc/issei/issei_dev.h | 163 ++ + drivers/misc/issei/main.c | 296 +++ + drivers/misc/issei/pci_heci.c | 151 ++ + drivers/misc/keba/cp500.c | 17 +- + drivers/misc/keba/lan9252.c | 4 +- + drivers/misc/lan966x_pci.c | 1 + + drivers/misc/lattice-ecp3-config.c | 4 +- + drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 8 +- + drivers/misc/lis3lv02d/lis3lv02d_spi.c | 2 +- + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c | 2 +- + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 4 +- + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c | 4 +- + drivers/misc/mei/gsc-me.c | 4 +- + drivers/misc/mei/mei_lb.c | 4 +- + drivers/misc/mei/pci-csc.c | 2 +- + drivers/misc/mei/pci-me.c | 166 +- + drivers/misc/mei/pci-txe.c | 6 +- + drivers/misc/mei/platform-vsc.c | 2 +- + drivers/misc/mei/vsc-tp.c | 10 +- + drivers/misc/mrvl_cn10k_dpi.c | 6 +- + drivers/misc/nsm.c | 7 +- + drivers/misc/ntsync.c | 3 + + drivers/misc/ocxl/pci.c | 2 +- + drivers/misc/open-dice.c | 53 +- + drivers/misc/pch_phub.c | 59 +- + drivers/misc/pci_endpoint_test.c | 16 +- + drivers/misc/phantom.c | 6 +- + drivers/misc/pvpanic/pvpanic-mmio.c | 8 +- + drivers/misc/pvpanic/pvpanic-pci.c | 4 +- + drivers/misc/qcom-coincell.c | 4 +- + drivers/misc/rp1/rp1_pci.c | 29 +- + drivers/misc/sgi-gru/Makefile | 6 - + drivers/misc/sgi-gru/gru.h | 76 - + drivers/misc/sgi-gru/gru_instructions.h | 726 ------- + drivers/misc/sgi-gru/grufault.c | 903 --------- + drivers/misc/sgi-gru/grufile.c | 540 ----- + drivers/misc/sgi-gru/gruhandles.c | 192 -- + drivers/misc/sgi-gru/gruhandles.h | 517 ----- + drivers/misc/sgi-gru/grukdump.c | 223 --- + drivers/misc/sgi-gru/grukservices.c | 1157 ----------- + drivers/misc/sgi-gru/grukservices.h | 201 -- + drivers/misc/sgi-gru/grulib.h | 153 -- + drivers/misc/sgi-gru/grumain.c | 969 --------- + drivers/misc/sgi-gru/gruprocfs.c | 308 --- + drivers/misc/sgi-gru/grutables.h | 659 ------ + drivers/misc/sgi-gru/grutlbpurge.c | 316 --- + drivers/misc/sgi-xp/Makefile | 13 - + drivers/misc/sgi-xp/xp.h | 341 ---- + drivers/misc/sgi-xp/xp_main.c | 261 --- + drivers/misc/sgi-xp/xp_uv.c | 151 -- + drivers/misc/sgi-xp/xpc.h | 732 ------- + drivers/misc/sgi-xp/xpc_channel.c | 1011 ---------- + drivers/misc/sgi-xp/xpc_main.c | 1309 ------------ + drivers/misc/sgi-xp/xpc_partition.c | 545 ----- + drivers/misc/sgi-xp/xpc_uv.c | 1727 ---------------- + drivers/misc/sgi-xp/xpnet.c | 599 ------ + drivers/misc/sram.c | 2 +- + drivers/misc/ti_fpc202.c | 2 +- + drivers/misc/tps6594-esm.c | 2 +- + drivers/misc/tps6594-pfsm.c | 2 +- + drivers/misc/tsl2550.c | 2 +- + drivers/misc/vcpu_stall_detector.c | 4 +- + drivers/misc/vmw_vmci/vmci_event.c | 4 +- + drivers/misc/vmw_vmci/vmci_guest.c | 4 +- + drivers/misc/xilinx_sdfec.c | 78 +- + drivers/nvmem/Kconfig | 110 +- + drivers/nvmem/Makefile | 7 + + drivers/nvmem/airoha-smc-efuses.c | 125 ++ + drivers/{misc/eeprom => nvmem}/at24.c | 0 + drivers/{misc/eeprom => nvmem}/at25.c | 0 + drivers/nvmem/brcm_nvram.c | 15 +- + drivers/nvmem/core.c | 213 +- + drivers/{misc/eeprom => nvmem}/ee1004.c | 0 + drivers/{misc/eeprom => nvmem}/eeprom_93xx46.c | 0 + drivers/nvmem/internals.h | 10 +- + drivers/nvmem/lan9662-otpc.c | 12 +- + drivers/nvmem/layouts/u-boot-env.c | 5 +- + drivers/{misc/eeprom => nvmem}/m24lr.c | 0 + drivers/nvmem/nintendo-otp.c | 9 +- + drivers/nvmem/rockchip-otp.c | 9 +- + drivers/parport/parport_pc.c | 204 +- + drivers/parport/parport_serial.c | 280 +-- + drivers/pci/endpoint/functions/pci-epf-mhi.c | 10 + + drivers/phy/motorola/phy-cpcap-usb.c | 1 + + drivers/power/supply/ab8500_btemp.c | 1 + + drivers/power/supply/ab8500_charger.c | 1 + + drivers/power/supply/ab8500_fg.c | 1 + + drivers/power/supply/axp20x_ac_power.c | 1 + + drivers/power/supply/axp20x_battery.c | 1 + + drivers/power/supply/axp20x_usb_power.c | 1 + + drivers/power/supply/axp288_fuel_gauge.c | 1 + + drivers/power/supply/cpcap-battery.c | 1 + + drivers/power/supply/cpcap-charger.c | 1 + + drivers/power/supply/da9150-charger.c | 1 + + drivers/power/supply/generic-adc-battery.c | 1 + + drivers/power/supply/ingenic-battery.c | 1 + + drivers/power/supply/intel_dc_ti_battery.c | 1 + + drivers/power/supply/lego_ev3_battery.c | 1 + + drivers/power/supply/lp8788-charger.c | 1 + + drivers/power/supply/max17040_battery.c | 1 + + drivers/power/supply/mp2629_charger.c | 1 + + drivers/power/supply/mt6370-charger.c | 1 + + drivers/power/supply/qcom_smbx.c | 1 + + drivers/power/supply/rn5t618_power.c | 1 + + drivers/power/supply/rx51_battery.c | 1 + + drivers/power/supply/sc27xx_fuel_gauge.c | 1 + + drivers/power/supply/twl4030_charger.c | 1 + + drivers/power/supply/twl4030_madc_battery.c | 1 + + drivers/power/supply/twl6030_charger.c | 1 + + drivers/staging/iio/adc/ad7816.c | 6 +- + drivers/staging/iio/addac/adt7316-spi.c | 13 +- + drivers/staging/iio/addac/adt7316.c | 5 +- + drivers/staging/iio/frequency/ad9832.c | 24 +- + drivers/staging/iio/frequency/ad9834.c | 30 +- + drivers/staging/iio/frequency/dds.h | 50 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 1 + + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 1 + + drivers/thermal/renesas/rzg3s_thermal.c | 1 + + drivers/thermal/thermal-generic-adc.c | 1 + + drivers/uio/uio.c | 7 +- + drivers/uio/uio_fsl_elbc_gpcm.c | 60 +- + drivers/uio/uio_sercos3.c | 1 + + drivers/w1/masters/ds2482.c | 12 + + drivers/w1/slaves/w1_ds28e17.c | 8 + + drivers/w1/w1.c | 5 + + .../dt-bindings/iio/adc/mediatek,mt6323-auxadc.h | 24 + + include/dt-bindings/interconnect/qcom,maili-rpmh.h | 171 ++ + include/linux/firmware/intel/stratix10-smc.h | 63 +- + .../linux/firmware/intel/stratix10-svc-client.h | 12 +- + include/linux/greybus/greybus_id.h | 4 +- + include/linux/iio/common/inv_sensors_timestamp.h | 40 +- + include/linux/iio/types.h | 21 + + include/linux/kstrtox.h | 3 + + include/linux/math64.h | 18 + + include/linux/mhi.h | 17 +- + include/linux/mhi_ep.h | 2 + + include/linux/misc/tsi.h | 72 + + include/linux/most.h | 37 +- + include/uapi/linux/iio/types.h | 1 + + include/uapi/linux/issei.h | 69 + + include/uapi/misc/amd-apml.h | 23 + + include/uapi/misc/fastrpc.h | 29 + + lib/kstrtox.c | 115 +- + lib/kstrtox.h | 17 +- + lib/math/div64.c | 15 + + lib/math/test_mul_u64_u64_div_u64.c | 1 + + lib/test-kstrtox.c | 182 ++ + lib/vsprintf.c | 2 +- + rust/bindings/bindings_helper.h | 3 + + rust/helpers/helpers.c | 1 + + rust/helpers/net/genetlink.c | 46 + + rust/kernel/miscdevice.rs | 2 +- + rust/kernel/{net.rs => net/mod.rs} | 2 + + rust/kernel/net/netlink.rs | 337 ++++ + rust/kernel/sync/poll.rs | 75 +- + rust/kernel/task.rs | 7 + + rust/uapi/uapi_helper.h | 1 + + .../cmd_graph/savedcmd_parser/savedcmd_parser.py | 2 +- + .../sbom/tests/cmd_graph/test_savedcmd_parser.py | 25 + + sound/soc/codecs/audio-iio-aux.c | 1 + + sound/soc/samsung/aries_wm8994.c | 1 + + sound/soc/samsung/midas_wm1811.c | 1 + + sound/soc/stm/stm32_adfsdm.c | 1 + + tools/iio/iio_event_monitor.c | 2 + + tools/testing/selftests/drivers/ntsync/ntsync.c | 133 +- + 744 files changed, 27984 insertions(+), 21199 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-flow + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-frequency + create mode 100644 Documentation/ABI/testing/sysfs-class-issei + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ltc2378.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads112c14.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/xlnx,versal-sysmon.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/microchip,mcp47a1.yaml + create mode 100644 Documentation/devicetree/bindings/iio/flow/sensirion,slf3s.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,adf41513.yaml + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/qstcorp,qmc5883l.yaml + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/qstcorp,qmc6308.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,maili-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/airoha,smc-efuses.yaml + delete mode 100644 Documentation/devicetree/bindings/w1/omap-hdq.txt + create mode 100644 Documentation/devicetree/bindings/w1/ti,hdq.yaml + create mode 100644 Documentation/driver-api/issei/index.rst + create mode 100644 Documentation/driver-api/issei/issei.rst + create mode 100644 Documentation/hwmon/socfpga-hwmon.rst + create mode 100644 Documentation/iio/adf41513.rst + create mode 100644 drivers/android/binder/debug.rs + create mode 100644 drivers/android/binder/netlink.rs + create mode 100644 drivers/hwmon/socfpga-hwmon.c + create mode 100644 drivers/iio/adc/ltc2378.c + create mode 100644 drivers/iio/adc/mt6323-auxadc.c + create mode 100644 drivers/iio/adc/ti-ads112c14.c + create mode 100644 drivers/iio/adc/versal-sysmon-core.c + create mode 100644 drivers/iio/adc/versal-sysmon-i2c.c + create mode 100644 drivers/iio/adc/versal-sysmon.c + create mode 100644 drivers/iio/adc/versal-sysmon.h + create mode 100644 drivers/iio/dac/mcf54415_dac.c + create mode 100644 drivers/iio/dac/mcp47a1.c + create mode 100644 drivers/iio/flow/Kconfig + create mode 100644 drivers/iio/flow/Makefile + create mode 100644 drivers/iio/flow/slf3s.c + create mode 100644 drivers/iio/frequency/adf41513.c + create mode 100644 drivers/iio/imu/inv_icm42607/Kconfig + create mode 100644 drivers/iio/imu/inv_icm42607/Makefile + create mode 100644 drivers/iio/imu/inv_icm42607/inv_icm42607.h + create mode 100644 drivers/iio/imu/inv_icm42607/inv_icm42607_accel.c + create mode 100644 drivers/iio/imu/inv_icm42607/inv_icm42607_core.c + create mode 100644 drivers/iio/imu/inv_icm42607/inv_icm42607_gyro.c + create mode 100644 drivers/iio/imu/inv_icm42607/inv_icm42607_i2c.c + create mode 100644 drivers/iio/imu/inv_icm42607/inv_icm42607_spi.c + create mode 100644 drivers/iio/imu/inv_icm42607/inv_icm42607_temp.c + create mode 100644 drivers/iio/imu/inv_icm42607/inv_icm42607_temp.h + create mode 100644 drivers/iio/magnetometer/qmc5883l.c + create mode 100644 drivers/iio/magnetometer/qmc6308.c + create mode 100644 drivers/interconnect/qcom/maili.c + create mode 100644 drivers/misc/amd-sbi/tsi-core.c + create mode 100644 drivers/misc/amd-sbi/tsi-core.h + create mode 100644 drivers/misc/amd-sbi/tsi.c + delete mode 100644 drivers/misc/hisi_hikey_usb.c + delete mode 100644 drivers/misc/ibmasm/Makefile + delete mode 100644 drivers/misc/ibmasm/command.c + delete mode 100644 drivers/misc/ibmasm/dot_command.c + delete mode 100644 drivers/misc/ibmasm/dot_command.h + delete mode 100644 drivers/misc/ibmasm/event.c + delete mode 100644 drivers/misc/ibmasm/heartbeat.c + delete mode 100644 drivers/misc/ibmasm/i2o.h + delete mode 100644 drivers/misc/ibmasm/ibmasm.h + delete mode 100644 drivers/misc/ibmasm/ibmasmfs.c + delete mode 100644 drivers/misc/ibmasm/lowlevel.c + delete mode 100644 drivers/misc/ibmasm/lowlevel.h + delete mode 100644 drivers/misc/ibmasm/module.c + delete mode 100644 drivers/misc/ibmasm/r_heartbeat.c + delete mode 100644 drivers/misc/ibmasm/remote.c + delete mode 100644 drivers/misc/ibmasm/remote.h + delete mode 100644 drivers/misc/ibmasm/uart.c + create mode 100644 drivers/misc/issei/Kconfig + create mode 100644 drivers/misc/issei/Makefile + create mode 100644 drivers/misc/issei/cdev.c + create mode 100644 drivers/misc/issei/cdev.h + create mode 100644 drivers/misc/issei/dma.c + create mode 100644 drivers/misc/issei/dma.h + create mode 100644 drivers/misc/issei/fw_client.c + create mode 100644 drivers/misc/issei/fw_client.h + create mode 100644 drivers/misc/issei/ham.c + create mode 100644 drivers/misc/issei/ham.h + create mode 100644 drivers/misc/issei/host_client.c + create mode 100644 drivers/misc/issei/host_client.h + create mode 100644 drivers/misc/issei/hw_heci.c + create mode 100644 drivers/misc/issei/hw_heci.h + create mode 100644 drivers/misc/issei/hw_heci_regs.h + create mode 100644 drivers/misc/issei/hw_msg.h + create mode 100644 drivers/misc/issei/issei_dev.h + create mode 100644 drivers/misc/issei/main.c + create mode 100644 drivers/misc/issei/pci_heci.c + delete mode 100644 drivers/misc/sgi-gru/Makefile + delete mode 100644 drivers/misc/sgi-gru/gru.h + delete mode 100644 drivers/misc/sgi-gru/gru_instructions.h + delete mode 100644 drivers/misc/sgi-gru/grufault.c + delete mode 100644 drivers/misc/sgi-gru/grufile.c + delete mode 100644 drivers/misc/sgi-gru/gruhandles.c + delete mode 100644 drivers/misc/sgi-gru/gruhandles.h + delete mode 100644 drivers/misc/sgi-gru/grukdump.c + delete mode 100644 drivers/misc/sgi-gru/grukservices.c + delete mode 100644 drivers/misc/sgi-gru/grukservices.h + delete mode 100644 drivers/misc/sgi-gru/grulib.h + delete mode 100644 drivers/misc/sgi-gru/grumain.c + delete mode 100644 drivers/misc/sgi-gru/gruprocfs.c + delete mode 100644 drivers/misc/sgi-gru/grutables.h + delete mode 100644 drivers/misc/sgi-gru/grutlbpurge.c + delete mode 100644 drivers/misc/sgi-xp/Makefile + delete mode 100644 drivers/misc/sgi-xp/xp.h + delete mode 100644 drivers/misc/sgi-xp/xp_main.c + delete mode 100644 drivers/misc/sgi-xp/xp_uv.c + delete mode 100644 drivers/misc/sgi-xp/xpc.h + delete mode 100644 drivers/misc/sgi-xp/xpc_channel.c + delete mode 100644 drivers/misc/sgi-xp/xpc_main.c + delete mode 100644 drivers/misc/sgi-xp/xpc_partition.c + delete mode 100644 drivers/misc/sgi-xp/xpc_uv.c + delete mode 100644 drivers/misc/sgi-xp/xpnet.c + create mode 100644 drivers/nvmem/airoha-smc-efuses.c + rename drivers/{misc/eeprom => nvmem}/at24.c (100%) + rename drivers/{misc/eeprom => nvmem}/at25.c (100%) + rename drivers/{misc/eeprom => nvmem}/ee1004.c (100%) + rename drivers/{misc/eeprom => nvmem}/eeprom_93xx46.c (100%) + rename drivers/{misc/eeprom => nvmem}/m24lr.c (100%) + create mode 100644 include/dt-bindings/iio/adc/mediatek,mt6323-auxadc.h + create mode 100644 include/dt-bindings/interconnect/qcom,maili-rpmh.h + create mode 100644 include/linux/misc/tsi.h + create mode 100644 include/uapi/linux/issei.h + create mode 100644 rust/helpers/net/genetlink.c + rename rust/kernel/{net.rs => net/mod.rs} (85%) + create mode 100644 rust/kernel/net/netlink.rs +$ 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` +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/android/binder/netlink.rs +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master d9537063c0441] Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git + Date: Thu Aug 20 13:57:28 2026 +0100 +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 +Auto-merging MAINTAINERS +Auto-merging drivers/phy/freescale/Kconfig +Auto-merging drivers/phy/freescale/phy-fsl-lynx-10g.c +Auto-merging drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 1 + + .../phy/qcom,glymur-qmp-gen5x8-pcie-phy.yaml | 177 +++++ + .../bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml | 21 + + .../bindings/phy/qcom,m31-eusb2-phy.yaml | 1 + + .../bindings/phy/qcom,qcs615-qmp-usb3dp-phy.yaml | 49 +- + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + + .../bindings/phy/qcom,sa8775p-dwmac-sgmii-phy.yaml | 11 + + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 8 + + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 2 + + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 3 + + .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 2 + + .../bindings/phy/rockchip-inno-csi-dphy.yaml | 10 + + .../bindings/phy/spacemit,k3-combo-phy.yaml | 68 ++ + MAINTAINERS | 2 + + drivers/phy/freescale/Kconfig | 1 + + drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 186 +++-- + drivers/phy/freescale/phy-fsl-lynx-10g.c | 2 +- + drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 3 + + drivers/phy/mediatek/Makefile | 1 + + drivers/phy/mediatek/phy-mtk-mipi-dsi-mt8196.c | 201 +++++ + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 1 + + drivers/phy/mediatek/phy-mtk-mipi-dsi.h | 2 +- + drivers/phy/phy-can-transceiver.c | 2 +- + drivers/phy/qualcomm/Kconfig | 10 + + drivers/phy/qualcomm/Makefile | 1 + + drivers/phy/qualcomm/phy-qcom-qmp-com-aon-v10.h | 15 + + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 459 ++++++++++- + drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v10.h | 15 + + .../phy/qualcomm/phy-qcom-qmp-dp-qserdes-com-v8.h | 52 -- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-multiphy.c | 743 ++++++++++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 864 ++++++++++++++++++++- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-aon-v10.h | 13 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v10.h | 18 + + .../phy/qualcomm/phy-qcom-qmp-pcs-pcie-v10_60.h | 26 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v7.h | 24 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v10.h | 19 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v10.h | 36 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v10_60.h | 23 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-com-v10.h | 89 +++ + .../phy/qualcomm/phy-qcom-qmp-qserdes-com-v10_60.h | 55 ++ + drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v8.h | 13 +- + .../qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v8.h | 37 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v10.h | 91 +++ + .../qualcomm/phy-qcom-qmp-qserdes-txrx-v10_60.h | 109 +++ + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 139 ++++ + drivers/phy/qualcomm/phy-qcom-qmp-usb-legacy.c | 36 +- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 36 +- + drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 79 +- + drivers/phy/qualcomm/phy-qcom-qmp.h | 10 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 14 + + drivers/phy/qualcomm/phy-qcom-sgmii-eth.c | 37 +- + drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 26 +- + drivers/phy/renesas/phy-rcar-gen2.c | 1 - + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 31 +- + drivers/phy/rockchip/phy-rockchip-inno-csidphy.c | 27 +- + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 71 +- + drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c | 2 +- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 287 +++---- + drivers/phy/spacemit/Kconfig | 16 + + drivers/phy/spacemit/Makefile | 2 + + drivers/phy/spacemit/phy-k3-combo.c | 252 ++++++ + drivers/phy/spacemit/phy-k3-common.c | 391 ++++++++++ + drivers/phy/spacemit/phy-k3-common.h | 27 + + drivers/phy/starfive/phy-jh7110-dphy-rx.c | 5 +- + drivers/phy/starfive/phy-jh7110-dphy-tx.c | 5 +- + drivers/phy/sunplus/phy-sunplus-usb2.c | 6 +- + 66 files changed, 4608 insertions(+), 359 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/qcom,glymur-qmp-gen5x8-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/spacemit,k3-combo-phy.yaml + create mode 100644 drivers/phy/mediatek/phy-mtk-mipi-dsi-mt8196.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-com-aon-v10.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v10.h + delete mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-dp-qserdes-com-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcie-multiphy.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-aon-v10.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v10.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v10_60.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v7.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v10.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v10.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v10_60.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v10.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v10_60.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v10.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v10_60.h + create mode 100644 drivers/phy/spacemit/phy-k3-combo.c + create mode 100644 drivers/phy/spacemit/phy-k3-common.c + create mode 100644 drivers/phy/spacemit/phy-k3-common.h +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 +Auto-merging drivers/soundwire/bus.c +Auto-merging drivers/soundwire/cadence_master.c +Auto-merging drivers/soundwire/intel_ace2x.c +Auto-merging drivers/soundwire/mipi_disco.c +Auto-merging drivers/soundwire/stream.c +Auto-merging include/linux/soundwire/sdw.h +Merge made by the 'ort' strategy. + .../bindings/soundwire/qcom,soundwire.yaml | 20 +++++------ + drivers/soundwire/bus.c | 7 ++-- + drivers/soundwire/bus.h | 10 +++--- + drivers/soundwire/cadence_master.c | 35 ++++++++++++++---- + drivers/soundwire/cadence_master.h | 1 + + drivers/soundwire/dmi-quirks.c | 42 +++++++++++++++++++++- + drivers/soundwire/intel_ace2x.c | 20 +++++++++-- + drivers/soundwire/intel_auxdevice.c | 1 + + drivers/soundwire/mipi_disco.c | 6 ++++ + drivers/soundwire/qcom.c | 24 +++++++++++-- + drivers/soundwire/stream.c | 17 ++++++--- + include/linux/soundwire/sdw.h | 14 ++++++++ + 12 files changed, 164 insertions(+), 33 deletions(-) +Merging extcon/extcon-next (254f49634ee16 Linux 7.1-rc1) +$ 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 +Auto-merging arch/s390/pci/pci.c +Auto-merging arch/s390/pci/pci_event.c +Auto-merging drivers/vfio/pci/vfio_pci_core.c +Merge made by the 'ort' strategy. + arch/s390/include/asm/pci.h | 32 + + arch/s390/pci/pci.c | 1 + + arch/s390/pci/pci_event.c | 137 ++-- + drivers/vfio/pci/vfio_pci_config.c | 1 + + drivers/vfio/pci/vfio_pci_core.c | 13 +- + drivers/vfio/pci/vfio_pci_intrs.c | 3 +- + drivers/vfio/pci/vfio_pci_priv.h | 9 + + drivers/vfio/pci/vfio_pci_zdev.c | 62 +- + include/uapi/linux/vfio.h | 21 + + include/uapi/linux/vfio_zdev.h | 2 + + tools/testing/selftests/kselftest_harness.h | 2 +- + .../selftests/vfio/lib/drivers/igb/e1000_82575.h | 1 + + .../selftests/vfio/lib/drivers/igb/e1000_defines.h | 1 + + .../selftests/vfio/lib/drivers/igb/e1000_regs.h | 1 + + tools/testing/selftests/vfio/lib/drivers/igb/igb.c | 585 +++++++++++++++ + .../selftests/vfio/lib/drivers/nv_falcon/hw.h | 352 +++++++++ + .../vfio/lib/drivers/nv_falcon/nv_falcon.c | 783 +++++++++++++++++++++ + .../selftests/vfio/lib/include/libvfio/assert.h | 18 + + .../vfio/lib/include/libvfio/vfio_pci_device.h | 29 + + tools/testing/selftests/vfio/lib/iommu.c | 12 +- + tools/testing/selftests/vfio/lib/iova_allocator.c | 4 +- + tools/testing/selftests/vfio/lib/libvfio.mk | 3 + + tools/testing/selftests/vfio/lib/sysfs.c | 3 +- + tools/testing/selftests/vfio/lib/vfio_pci_device.c | 74 +- + tools/testing/selftests/vfio/lib/vfio_pci_driver.c | 22 +- + .../vfio/vfio_pci_device_init_perf_test.c | 4 +- + .../testing/selftests/vfio/vfio_pci_driver_test.c | 57 +- + 27 files changed, 2113 insertions(+), 119 deletions(-) + create mode 120000 tools/testing/selftests/vfio/lib/drivers/igb/e1000_82575.h + create mode 120000 tools/testing/selftests/vfio/lib/drivers/igb/e1000_defines.h + create mode 120000 tools/testing/selftests/vfio/lib/drivers/igb/e1000_regs.h + create mode 100644 tools/testing/selftests/vfio/lib/drivers/igb/igb.c + create mode 100644 tools/testing/selftests/vfio/lib/drivers/nv_falcon/hw.h + create mode 100644 tools/testing/selftests/vfio/lib/drivers/nv_falcon/nv_falcon.c +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 (c6eb4dc5964fd staging: rtl8723bs: add blank line after declaration) +$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/staging/rtl8723bs/core/rtw_ieee80211.c +Auto-merging drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +Auto-merging drivers/staging/rtl8723bs/core/rtw_wlan_util.c +CONFLICT (content): Merge conflict in drivers/staging/rtl8723bs/core/rtw_wlan_util.c +Auto-merging drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +Resolved 'drivers/staging/rtl8723bs/core/rtw_wlan_util.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d95a3476a869c] Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git +$ git diff -M --stat --summary HEAD^.. + drivers/staging/axis-fifo/axis-fifo.c | 9 +- + drivers/staging/fbtft/fb_upd161704.c | 2 +- + drivers/staging/fbtft/fbtft-sysfs.c | 2 +- + drivers/staging/greybus/audio_codec.c | 5 +- + drivers/staging/greybus/audio_codec.h | 4 +- + drivers/staging/greybus/audio_gb.c | 32 +- + drivers/staging/greybus/audio_manager_sysfs.c | 2 +- + drivers/staging/greybus/audio_module.c | 27 +- + drivers/staging/greybus/authentication.c | 2 - + drivers/staging/greybus/hid.c | 2 +- + drivers/staging/greybus/loopback.c | 26 -- + drivers/staging/greybus/power_supply.c | 4 +- + drivers/staging/greybus/uart.c | 2 +- + drivers/staging/greybus/vibrator.c | 2 +- + drivers/staging/most/dim2/dim2.c | 14 +- + drivers/staging/most/video/video.c | 10 +- + drivers/staging/nvec/nvec.c | 4 +- + drivers/staging/nvec/nvec_power.c | 2 +- + drivers/staging/octeon/ethernet-rx.c | 20 +- + drivers/staging/octeon/ethernet-rx.h | 2 +- + drivers/staging/octeon/ethernet-tx.c | 19 +- + drivers/staging/octeon/ethernet-tx.h | 2 +- + drivers/staging/octeon/ethernet.c | 66 ++- + drivers/staging/rtl8723bs/core/rtw_ap.c | 182 ++------ + drivers/staging/rtl8723bs/core/rtw_cmd.c | 251 +++++----- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 11 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 12 +- + drivers/staging/rtl8723bs/core/rtw_io.c | 7 - + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 30 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 269 +++++------ + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 513 +++++++++++---------- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 32 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 47 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 48 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 85 ++-- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 130 +++--- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 26 +- + drivers/staging/rtl8723bs/hal/HalPhyRf.c | 12 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 58 +-- + drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 38 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 10 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 14 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 15 +- + drivers/staging/rtl8723bs/hal/hal_intf.c | 14 +- + drivers/staging/rtl8723bs/hal/hal_sdio.c | 6 +- + drivers/staging/rtl8723bs/hal/odm.c | 2 +- + drivers/staging/rtl8723bs/hal/odm.h | 7 - + drivers/staging/rtl8723bs/hal/odm_DIG.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_DIG.h | 5 - + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 3 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 250 +++++----- + drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 7 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 113 +---- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 8 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 67 +-- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 10 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 11 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 83 ++-- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 2 +- + drivers/staging/rtl8723bs/include/drv_types.h | 9 +- + drivers/staging/rtl8723bs/include/hal_com_reg.h | 10 +- + drivers/staging/rtl8723bs/include/hal_data.h | 122 ----- + drivers/staging/rtl8723bs/include/hal_intf.h | 8 +- + drivers/staging/rtl8723bs/include/hal_pg.h | 6 - + drivers/staging/rtl8723bs/include/ieee80211.h | 30 +- + drivers/staging/rtl8723bs/include/ioctl_cfg80211.h | 4 +- + .../rtl8723bs/include/osdep_service_linux.h | 3 - + drivers/staging/rtl8723bs/include/rtl8192c_recv.h | 3 - + drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 22 +- + drivers/staging/rtl8723bs/include/rtw_ap.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_cmd.h | 144 +++--- + drivers/staging/rtl8723bs/include/rtw_event.h | 4 - + drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 61 ++- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 64 +-- + drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 6 +- + drivers/staging/rtl8723bs/include/rtw_qos.h | 4 - + drivers/staging/rtl8723bs/include/rtw_security.h | 20 +- + drivers/staging/rtl8723bs/include/rtw_xmit.h | 4 +- + drivers/staging/rtl8723bs/include/sta_info.h | 2 +- + drivers/staging/rtl8723bs/include/wifi.h | 83 +--- + drivers/staging/rtl8723bs/include/wlan_bssdef.h | 92 ++-- + drivers/staging/rtl8723bs/include/xmit_osdep.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 146 +++--- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 30 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 24 +- + drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 4 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 12 +- + drivers/staging/sm750fb/Kconfig | 1 + + drivers/staging/sm750fb/ddk750_chip.c | 27 -- + drivers/staging/sm750fb/ddk750_chip.h | 7 - + drivers/staging/sm750fb/ddk750_power.c | 14 - + drivers/staging/sm750fb/ddk750_power.h | 5 - + drivers/staging/sm750fb/sm750.c | 26 +- + drivers/staging/sm750fb/sm750.h | 20 +- + drivers/staging/sm750fb/sm750_accel.h | 44 +- + drivers/staging/sm750fb/sm750_hw.c | 28 +- + 99 files changed, 1564 insertions(+), 2179 deletions(-) +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 +Auto-merging MAINTAINERS +Auto-merging drivers/crypto/atmel-aes.c +Auto-merging drivers/nvme/target/pci-epf.c +Auto-merging drivers/pci/endpoint/functions/pci-epf-mhi.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/altr,msgdma.yaml | 2 +- + .../devicetree/bindings/dma/mediatek,uart-dma.yaml | 1 + + .../devicetree/bindings/dma/qcom,bam-dma.yaml | 2 +- + .../bindings/dma/xilinx/xlnx,axi-dma.yaml | 13 +- + Documentation/driver-api/dmaengine/client.rst | 9 + + MAINTAINERS | 4 +- + drivers/crypto/atmel-aes.c | 10 +- + drivers/dma/arm-dma350.c | 9 + + drivers/dma/dmaengine.c | 9 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 2 +- + drivers/dma/dw-edma/dw-edma-core.c | 583 +++++++++++++-------- + drivers/dma/dw-edma/dw-edma-core.h | 113 +++- + drivers/dma/dw-edma/dw-edma-pcie.c | 264 ++++++---- + drivers/dma/dw-edma/dw-edma-v0-core.c | 382 +++++++++----- + drivers/dma/dw-edma/dw-hdma-v0-core.c | 265 ++++++---- + drivers/dma/dw-edma/dw-hdma-v0-regs.h | 3 +- + drivers/dma/fsl-edma-main.c | 2 + + drivers/dma/fsl-edma-trace.h | 4 +- + drivers/dma/fsl_raid.c | 58 +- + drivers/dma/fsl_raid.h | 4 +- + drivers/dma/hisi_dma.c | 2 +- + drivers/dma/idxd/defaults.c | 12 +- + drivers/dma/mediatek/mtk-uart-apdma.c | 2 +- + drivers/dma/pl330.c | 19 +- + drivers/dma/qcom/bam_dma.c | 1 + + drivers/dma/qcom/hidma_ll.c | 6 +- + drivers/dma/tegra210-adma.c | 12 +- + drivers/dma/ti/k3-udma.c | 2 +- + drivers/dma/xilinx/xilinx_dma.c | 66 ++- + drivers/dma/xilinx/zynqmp_dma.c | 6 +- + drivers/nvme/target/pci-epf.c | 33 +- + drivers/pci/endpoint/functions/pci-epf-mhi.c | 52 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 8 +- + include/linux/dma/edma.h | 51 +- + include/linux/dmaengine.h | 151 +++++- + 35 files changed, 1388 insertions(+), 774 deletions(-) +Merging cgroup/for-next (e0c62cce00d19 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-v1/cpusets.rst +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/sched.h +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging tools/testing/selftests/cgroup/lib/include/cgroup_util.h +Auto-merging tools/testing/selftests/cgroup/test_zswap.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v1/cpusets.rst | 42 +- + Documentation/admin-guide/cgroup-v1/memcg_test.rst | 2 +- + Documentation/admin-guide/cgroup-v2.rst | 50 +- + include/linux/cgroup-defs.h | 2 +- + include/linux/cgroup.h | 2 +- + include/linux/sched.h | 5 - + kernel/cgroup/cgroup.c | 2 +- + kernel/cgroup/cpuset-internal.h | 12 +- + kernel/cgroup/cpuset-v1.c | 13 +- + kernel/cgroup/cpuset.c | 573 +++++++++++++-------- + tools/cgroup/iocost_monitor.py | 10 +- + .../selftests/cgroup/lib/include/cgroup_util.h | 1 + + tools/testing/selftests/cgroup/test_core.c | 14 +- + tools/testing/selftests/cgroup/test_cpu.c | 47 +- + tools/testing/selftests/cgroup/test_cpuset.c | 249 ++++++++- + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 24 +- + .../testing/selftests/cgroup/test_cpuset_v1_hp.sh | 2 +- + tools/testing/selftests/cgroup/test_freezer.c | 2 +- + .../testing/selftests/cgroup/test_hugetlb_memcg.c | 10 +- + tools/testing/selftests/cgroup/test_kill.c | 2 +- + tools/testing/selftests/cgroup/test_kmem.c | 2 +- + tools/testing/selftests/cgroup/test_memcontrol.c | 2 +- + tools/testing/selftests/cgroup/test_pids.c | 2 +- + tools/testing/selftests/cgroup/test_zswap.c | 2 +- + 24 files changed, 758 insertions(+), 314 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 (30733f28c0347 Merge patch series "scsi: lpfc: Remove all strlcat() uses") +$ 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 MAINTAINERS +Auto-merging drivers/ata/pata_buddha.c +Auto-merging drivers/scsi/hosts.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/ufs/core/ufs-rpmb.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging include/linux/mod_devicetable.h +CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h +Auto-merging include/scsi/scsi_host.h +Auto-merging kernel/dma/mapping.c +Resolved 'include/linux/mod_devicetable.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f9a7e992ab645] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/ufs/qcom,sm8650-ufshc.yaml | 3 + + .../devicetree/bindings/ufs/ufs-common.yaml | 58 + + Documentation/scsi/index.rst | 1 + + Documentation/scsi/leapraid.rst | 110 + + MAINTAINERS | 12 +- + drivers/ata/pata_buddha.c | 8 +- + drivers/s390/scsi/Makefile | 2 + + drivers/s390/scsi/zfcp_dbf.c | 80 +- + drivers/s390/scsi/zfcp_dbf.h | 34 +- + drivers/s390/scsi/zfcp_ext.h | 7 +- + drivers/s390/scsi/zfcp_fsf.h | 4 +- + drivers/s390/scsi/zfcp_qdio.c | 1 + + drivers/s390/scsi/zfcp_sysfs.c | 19 +- + drivers/scsi/Kconfig | 1 + + drivers/scsi/Makefile | 23 + + drivers/scsi/a2091.c | 6 +- + drivers/scsi/aha1542.c | 2 +- + drivers/scsi/dc395x.c | 6 - + drivers/scsi/device_handler/Makefile | 3 + + drivers/scsi/device_handler/scsi_dh_alua.c | 5 +- + drivers/scsi/fnic/Makefile | 1 + + drivers/scsi/fnic/fcpio.h | 35 + + drivers/scsi/fnic/fdls_disc.c | 978 ++- + drivers/scsi/fnic/fdls_fc.h | 7 + + drivers/scsi/fnic/fip.c | 119 +- + drivers/scsi/fnic/fip.h | 2 +- + drivers/scsi/fnic/fnic.h | 94 +- + drivers/scsi/fnic/fnic_debugfs.c | 99 +- + drivers/scsi/fnic/fnic_fcs.c | 199 +- + drivers/scsi/fnic/fnic_fdls.h | 48 +- + drivers/scsi/fnic/fnic_io.h | 24 +- + drivers/scsi/fnic/fnic_isr.c | 28 +- + drivers/scsi/fnic/fnic_main.c | 214 +- + drivers/scsi/fnic/fnic_nvme.c | 2268 +++++ + drivers/scsi/fnic/fnic_nvme.h | 214 + + drivers/scsi/fnic/fnic_res.c | 31 +- + drivers/scsi/fnic/fnic_res.h | 32 +- + drivers/scsi/fnic/fnic_scsi.c | 251 +- + drivers/scsi/fnic/fnic_stats.h | 28 + + drivers/scsi/fnic/fnic_trace.c | 3 +- + drivers/scsi/fnic/vnic_dev.c | 2 +- + drivers/scsi/fnic/vnic_devcmd.h | 2 +- + drivers/scsi/g_NCR5380.c | 2 +- + drivers/scsi/gvp11.c | 17 +- + drivers/scsi/hosts.c | 25 +- + drivers/scsi/ibmvscsi/Makefile | 2 + + drivers/scsi/ibmvscsi/{ibmvfc.c => ibmvfc-core.c} | 825 +- + drivers/scsi/ibmvscsi/ibmvfc-nvme.c | 573 ++ + drivers/scsi/ibmvscsi/ibmvfc-nvme.h | 49 + + drivers/scsi/ibmvscsi/ibmvfc.h | 219 +- + drivers/scsi/isci/scu_task_context.h | 14 - + drivers/scsi/leapraid/Kconfig | 14 + + drivers/scsi/leapraid/Makefile | 10 + + drivers/scsi/leapraid/leapraid.h | 2048 +++++ + drivers/scsi/leapraid/leapraid_app.c | 803 ++ + drivers/scsi/leapraid/leapraid_func.c | 8626 ++++++++++++++++++++ + drivers/scsi/leapraid/leapraid_func.h | 1486 ++++ + drivers/scsi/leapraid/leapraid_os.c | 2468 ++++++ + drivers/scsi/leapraid/leapraid_transport.c | 1403 ++++ + 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_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/Makefile | 2 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 8 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 20 + + drivers/scsi/mpt3sas/mpt3sas_config.c | 36 + + drivers/scsi/mpt3sas/mpt3sas_hwmon.c | 191 + + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 8 +- + drivers/scsi/qla2xxx/qla_attr.c | 63 +- + drivers/scsi/qla2xxx/qla_bsg.c | 622 +- + drivers/scsi/qla2xxx/qla_bsg.h | 34 + + drivers/scsi/qla2xxx/qla_dbg.c | 37 +- + drivers/scsi/qla2xxx/qla_def.h | 148 +- + drivers/scsi/qla2xxx/qla_dfs.c | 8 +- + drivers/scsi/qla2xxx/qla_edif.c | 101 +- + drivers/scsi/qla2xxx/qla_fw.h | 144 +- + drivers/scsi/qla2xxx/qla_fw29.h | 830 ++ + drivers/scsi/qla2xxx/qla_gbl.h | 40 +- + drivers/scsi/qla2xxx/qla_gs.c | 176 +- + drivers/scsi/qla2xxx/qla_init.c | 930 ++- + drivers/scsi/qla2xxx/qla_inline.h | 295 +- + drivers/scsi/qla2xxx/qla_iocb.c | 1419 +++- + drivers/scsi/qla2xxx/qla_isr.c | 748 +- + drivers/scsi/qla2xxx/qla_mbx.c | 501 +- + drivers/scsi/qla2xxx/qla_mid.c | 78 +- + drivers/scsi/qla2xxx/qla_nvme.c | 307 +- + drivers/scsi/qla2xxx/qla_nvme.h | 4 +- + drivers/scsi/qla2xxx/qla_nx.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 316 +- + drivers/scsi/qla2xxx/qla_sup.c | 782 +- + drivers/scsi/qla2xxx/qla_target.c | 34 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 48 +- + drivers/scsi/qla2xxx/qla_version.h | 10 +- + drivers/scsi/qla4xxx/ql4_os.c | 6 +- + drivers/scsi/scsi_lib.c | 5 +- + drivers/scsi/scsi_scan.c | 52 +- + drivers/scsi/scsi_sysfs.c | 7 +- + drivers/scsi/sd.c | 55 +- + drivers/scsi/smartpqi/smartpqi_init.c | 204 +- + drivers/scsi/storvsc_drv.c | 32 + + drivers/scsi/virtio_scsi.c | 18 +- + drivers/scsi/zorro7xx.c | 16 +- + drivers/scsi/zorro_esp.c | 2 +- + drivers/ufs/core/Makefile | 2 + + drivers/ufs/core/ufs-debugfs.c | 10 +- + drivers/ufs/core/ufs-mcq.c | 14 +- + drivers/ufs/core/ufs-rpmb.c | 8 +- + drivers/ufs/core/ufs-sysfs.c | 1 + + drivers/ufs/core/ufs-txeq.c | 73 +- + drivers/ufs/core/ufs_bsg.c | 41 +- + drivers/ufs/core/ufshcd.c | 158 +- + drivers/ufs/host/Makefile | 2 + + drivers/ufs/host/ufs-mediatek.c | 16 +- + drivers/ufs/host/ufs-mediatek.h | 4 +- + drivers/ufs/host/ufs-qcom.c | 11 +- + drivers/ufs/host/ufshcd-pltfrm.c | 154 + + include/scsi/scsi_host.h | 24 +- + include/uapi/linux/cciss_ioctl.h | 1 + + include/ufs/ufs.h | 6 + + include/ufs/ufshcd.h | 45 +- + include/ufs/ufshci.h | 12 + + kernel/dma/mapping.c | 3 + + 129 files changed, 30596 insertions(+), 2934 deletions(-) + create mode 100644 Documentation/scsi/leapraid.rst + create mode 100644 drivers/scsi/fnic/fnic_nvme.c + create mode 100644 drivers/scsi/fnic/fnic_nvme.h + rename drivers/scsi/ibmvscsi/{ibmvfc.c => ibmvfc-core.c} (87%) + create mode 100644 drivers/scsi/ibmvscsi/ibmvfc-nvme.c + create mode 100644 drivers/scsi/ibmvscsi/ibmvfc-nvme.h + create mode 100644 drivers/scsi/leapraid/Kconfig + create mode 100644 drivers/scsi/leapraid/Makefile + create mode 100644 drivers/scsi/leapraid/leapraid.h + create mode 100644 drivers/scsi/leapraid/leapraid_app.c + create mode 100644 drivers/scsi/leapraid/leapraid_func.c + create mode 100644 drivers/scsi/leapraid/leapraid_func.h + create mode 100644 drivers/scsi/leapraid/leapraid_os.c + create mode 100644 drivers/scsi/leapraid/leapraid_transport.c + create mode 100644 drivers/scsi/mpt3sas/mpt3sas_hwmon.c + create mode 100644 drivers/scsi/qla2xxx/qla_fw29.h +$ git am -3 ../patches/device-id-zorro +Applying: foofof +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/device-id/zorro.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 36b9a86c8c12e] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git + Date: Thu Aug 20 13:58:01 2026 +0100 +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 lib/iov_iter.c +Auto-merging net/vmw_vsock/virtio_transport_common.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 - + .../crypto/virtio/virtio_crypto_akcipher_algs.c | 6 +- + .../crypto/virtio/virtio_crypto_skcipher_algs.c | 3 +- + drivers/nvdimm/nd_virtio.c | 263 ++++++++++++++++---- + drivers/nvdimm/pmem.c | 53 +++-- + drivers/nvdimm/region_devs.c | 5 +- + drivers/nvdimm/virtio_pmem.c | 65 ++++- + drivers/nvdimm/virtio_pmem.h | 22 +- + drivers/vdpa/alibaba/eni_vdpa.c | 1 + + drivers/vdpa/mlx5/core/mr.c | 2 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 27 ++- + drivers/vdpa/octeon_ep/octep_vdpa_main.c | 5 +- + drivers/vdpa/solidrun/snet_ctrl.c | 4 +- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 29 ++- + drivers/vdpa/vdpa_user/vduse_dev.c | 265 ++++++++++++++++----- + drivers/vdpa/virtio_pci/vp_vdpa.c | 12 +- + drivers/vhost/iotlb.c | 6 +- + drivers/vhost/net.c | 3 +- + drivers/vhost/vhost.c | 15 ++ + drivers/vhost/vsock.c | 80 +++++-- + drivers/virtio/virtio.c | 41 ++-- + drivers/virtio/virtio_balloon.c | 102 +++++--- + drivers/virtio/virtio_dma_buf.c | 2 +- + drivers/virtio/virtio_mem.c | 10 +- + drivers/virtio/virtio_mmio.c | 13 +- + drivers/virtio/virtio_pci_common.c | 2 +- + drivers/virtio/virtio_ring.c | 8 + + drivers/virtio/virtio_rtc_driver.c | 14 +- + include/linux/libnvdimm.h | 9 + + include/linux/virtio.h | 1 + + include/linux/virtio_dma_buf.h | 2 +- + include/uapi/linux/vduse.h | 28 +++ + include/uapi/linux/virtio_ids.h | 1 + + lib/iov_iter.c | 1 + + net/vmw_vsock/virtio_transport_common.c | 13 + + tools/virtio/vhost_net_test.c | 5 - + tools/virtio/virtio-trace/trace-agent-ctl.c | 2 +- + tools/virtio/vringh_test.c | 2 +- + 38 files changed, 865 insertions(+), 259 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 +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/qcom/eliza.dtsi +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging include/linux/firmware/xlnx-zynqmp.h +Merge made by the 'ort' strategy. + .../bindings/remoteproc/amd,bram-rproc.yaml | 105 ++++++ + .../remoteproc/amlogic,meson-mx-ao-arc.yaml | 2 +- + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 82 ++--- + .../remoteproc/qcom,kaanapali-soccp-pas.yaml | 156 +++++++++ + .../bindings/remoteproc/qcom,milos-pas.yaml | 29 +- + .../bindings/remoteproc/qcom,nord-pas.yaml | 173 ++++++++++ + .../bindings/remoteproc/qcom,pas-common.yaml | 28 +- + .../bindings/remoteproc/qcom,qcs404-pas.yaml | 22 +- + .../bindings/remoteproc/qcom,sa8775p-pas.yaml | 22 +- + .../bindings/remoteproc/qcom,sc7180-pas.yaml | 28 ++ + .../bindings/remoteproc/qcom,sc8280xp-pas.yaml | 28 ++ + .../bindings/remoteproc/qcom,sdx55-pas.yaml | 24 +- + .../bindings/remoteproc/qcom,shikra-pas.yaml | 20 ++ + .../bindings/remoteproc/qcom,sm6115-pas.yaml | 28 ++ + .../bindings/remoteproc/qcom,sm6350-pas.yaml | 28 ++ + .../bindings/remoteproc/qcom,sm6375-pas.yaml | 28 ++ + .../bindings/remoteproc/qcom,sm8150-pas.yaml | 28 ++ + .../bindings/remoteproc/qcom,sm8350-pas.yaml | 28 ++ + .../bindings/remoteproc/qcom,sm8550-pas.yaml | 55 +++ + .../bindings/remoteproc/ti,am3352-wkup-m3.yaml | 89 +++++ + .../bindings/remoteproc/ti,pru-consumer.yaml | 1 - + .../bindings/remoteproc/wkup_m3_rproc.txt | 52 --- + Documentation/staging/rpmsg.rst | 1 - + MAINTAINERS | 3 +- + arch/arm64/boot/dts/qcom/eliza.dtsi | 2 +- + drivers/firmware/xilinx/zynqmp.c | 93 +++++ + drivers/hwspinlock/hwspinlock_core.c | 2 +- + drivers/remoteproc/Kconfig | 13 +- + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/amd_mbv_bram_rproc.c | 213 ++++++++++++ + drivers/remoteproc/da8xx_remoteproc.c | 2 +- + drivers/remoteproc/imx_dsp_rproc.c | 41 +-- + drivers/remoteproc/imx_rproc.c | 40 +-- + drivers/remoteproc/ingenic_rproc.c | 4 +- + drivers/remoteproc/keystone_remoteproc.c | 6 +- + drivers/remoteproc/mtk_scp.c | 13 +- + drivers/remoteproc/omap_remoteproc.c | 2 +- + drivers/remoteproc/qcom_common.c | 4 +- + drivers/remoteproc/qcom_common.h | 6 + + drivers/remoteproc/qcom_q6v5.c | 79 +++-- + drivers/remoteproc/qcom_q6v5.h | 4 + + drivers/remoteproc/qcom_q6v5_adsp.c | 7 +- + drivers/remoteproc/qcom_q6v5_mss.c | 24 +- + drivers/remoteproc/qcom_q6v5_pas.c | 373 +++++++++++++++++---- + drivers/remoteproc/qcom_sysmon.c | 21 +- + drivers/remoteproc/qcom_wcnss.c | 45 +-- + drivers/remoteproc/rcar_rproc.c | 41 +-- + drivers/remoteproc/remoteproc_core.c | 173 ++++++---- + drivers/remoteproc/remoteproc_internal.h | 54 +++ + drivers/remoteproc/remoteproc_sysfs.c | 1 - + drivers/remoteproc/st_remoteproc.c | 31 +- + drivers/remoteproc/stm32_rproc.c | 42 +-- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 8 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 204 +++++------ + drivers/rpmsg/qcom_glink_native.c | 5 +- + drivers/rpmsg/qcom_glink_smem.c | 7 + + drivers/rpmsg/qcom_smd.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 11 +- + drivers/rpmsg/rpmsg_core.c | 6 +- + drivers/soc/qcom/mdt_loader.c | 27 +- + include/linux/firmware/qcom/qcom_pas.h | 12 + + include/linux/firmware/xlnx-zynqmp.h | 12 + + include/linux/remoteproc.h | 55 +-- + include/linux/rsc_table.h | 46 +-- + include/linux/soc/qcom/mdt_loader.h | 10 +- + 65 files changed, 2084 insertions(+), 718 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/amd,bram-rproc.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,nord-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/ti,am3352-wkup-m3.yaml + delete mode 100644 Documentation/devicetree/bindings/remoteproc/wkup_m3_rproc.txt + create mode 100644 drivers/remoteproc/amd_mbv_bram_rproc.c +Merging gpio-brgl/gpio/for-next (146cc263e457f Merge tag 'v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into gpio/for-next) +$ 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 +Already up to date. +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 +Auto-merging Documentation/devicetree/bindings/pinctrl/samsung,pinctrl.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/pinctrl/Kconfig +Auto-merging drivers/pinctrl/intel/pinctrl-tigerlake.c +Auto-merging drivers/pinctrl/meson/pinctrl-meson.c +Auto-merging drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +Auto-merging drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c +Auto-merging drivers/pinctrl/pinctrl-eic7700.c +Auto-merging drivers/pinctrl/pinctrl-mcp23s08.c +Auto-merging drivers/pinctrl/tegra/pinctrl-tegra264.c +Merge made by the 'ort' strategy. + .../bindings/pinctrl/airoha,an7563-pinctrl.yaml | 350 +++ + .../bindings/pinctrl/airoha,an7583-pinctrl.yaml | 65 +- + .../bindings/pinctrl/airoha,en7523-pinctrl.yaml | 378 +++ + .../bindings/pinctrl/airoha,en7581-pinctrl.yaml | 17 +- + .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 2 + + .../pinctrl/aspeed,ast2700-soc1-pinctrl.yaml | 1 + + .../bindings/pinctrl/mediatek,mt6858-pinctrl.yaml | 190 ++ + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 5 + + .../bindings/pinctrl/microchip,pic32-pinctrl.txt | 60 - + .../pinctrl/microchip,pic32mzda-pinctrl.yaml | 109 + + .../pinctrl/nvidia,tegra264-pinmux-main.yaml | 6 +- + .../bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml | 90 +- + .../bindings/pinctrl/qcom,maili-tlmm.yaml | 120 + + .../pinctrl/qcom,milos-lpass-lpi-pinctrl.yaml | 18 +- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 3 + + .../bindings/pinctrl/rockchip,pinctrl.yaml | 1 + + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 1 + + .../bindings/pinctrl/samsung,pinctrl.yaml | 1 + + .../devicetree/bindings/pinctrl/ti,da850-pupd.txt | 55 - + .../devicetree/bindings/pinctrl/ti,da850-pupd.yaml | 74 + + .../bindings/pinctrl/ti,dra7-iodelay.yaml | 83 + + .../devicetree/bindings/pinctrl/ti,iodelay.txt | 47 - + Documentation/driver-api/pin-control.rst | 2 +- + MAINTAINERS | 7 + + arch/arm64/boot/dts/mediatek/mt6858-pinfunc.h | 1335 ++++++++++ + drivers/pinctrl/Kconfig | 6 +- + drivers/pinctrl/actions/pinctrl-owl.c | 2 +- + drivers/pinctrl/airoha/Kconfig | 42 +- + drivers/pinctrl/airoha/Makefile | 7 + + drivers/pinctrl/airoha/airoha-common.h | 147 ++ + drivers/pinctrl/airoha/pinctrl-airoha.c | 2669 ++------------------ + drivers/pinctrl/airoha/pinctrl-an7563.c | 1115 ++++++++ + drivers/pinctrl/airoha/pinctrl-an7581.c | 1487 +++++++++++ + drivers/pinctrl/airoha/pinctrl-an7583.c | 1517 +++++++++++ + drivers/pinctrl/airoha/pinctrl-en7523.c | 1157 +++++++++ + drivers/pinctrl/aspeed/pinctrl-aspeed-g7-soc1.c | 6 +- + drivers/pinctrl/bcm/Kconfig | 2 + + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 1 - + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 9 +- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 7 +- + drivers/pinctrl/intel/pinctrl-intel.c | 2 +- + drivers/pinctrl/intel/pinctrl-tigerlake.c | 32 + + drivers/pinctrl/mediatek/Kconfig | 80 +- + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/mtk-eint.c | 27 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 11 +- + drivers/pinctrl/mediatek/pinctrl-mt2701.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mt2712.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mt6397.c | 5 + + drivers/pinctrl/mediatek/pinctrl-mt6795.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mt6797.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mt6858.c | 1409 +++++++++++ + drivers/pinctrl/mediatek/pinctrl-mt6878.c | 2 + + drivers/pinctrl/mediatek/pinctrl-mt6893.c | 2 + + drivers/pinctrl/mediatek/pinctrl-mt7620.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mt7621.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mt7622.c | 5 + + drivers/pinctrl/mediatek/pinctrl-mt7623.c | 5 + + drivers/pinctrl/mediatek/pinctrl-mt7629.c | 5 + + drivers/pinctrl/mediatek/pinctrl-mt76x8.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mt7981.c | 5 + + drivers/pinctrl/mediatek/pinctrl-mt7986.c | 21 +- + drivers/pinctrl/mediatek/pinctrl-mt7988.c | 5 + + drivers/pinctrl/mediatek/pinctrl-mt8127.c | 5 + + drivers/pinctrl/mediatek/pinctrl-mt8135.c | 5 + + drivers/pinctrl/mediatek/pinctrl-mt8167.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mt8173.c | 5 + + drivers/pinctrl/mediatek/pinctrl-mt8183.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mt8186.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mt8188.c | 2 + + drivers/pinctrl/mediatek/pinctrl-mt8189.c | 2 + + drivers/pinctrl/mediatek/pinctrl-mt8192.c | 2 + + drivers/pinctrl/mediatek/pinctrl-mt8195.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mt8196.c | 2 + + drivers/pinctrl/mediatek/pinctrl-mt8365.c | 3 + + drivers/pinctrl/mediatek/pinctrl-mt8516.c | 4 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 7 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 22 +- + drivers/pinctrl/mediatek/pinctrl-mtk-mt6858.h | 2378 +++++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtmips.c | 4 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-rt2880.c | 4 + + drivers/pinctrl/mediatek/pinctrl-rt305x.c | 4 + + drivers/pinctrl/mediatek/pinctrl-rt3883.c | 4 + + drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 14 +- + drivers/pinctrl/meson/pinctrl-meson.c | 8 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 5 +- + drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 191 +- + drivers/pinctrl/nxp/pinctrl-s32cc.c | 49 +- + drivers/pinctrl/pinctrl-aw9523.c | 2 +- + drivers/pinctrl/pinctrl-eic7700.c | 3 + + drivers/pinctrl/pinctrl-generic-mux.c | 2 +- + drivers/pinctrl/pinctrl-generic.c | 25 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 5 +- + drivers/pinctrl/pinctrl-ocelot.c | 2 +- + drivers/pinctrl/pinctrl-rockchip.c | 508 +++- + drivers/pinctrl/pinctrl-rockchip.h | 9 +- + drivers/pinctrl/pinctrl-rp1.c | 2 +- + drivers/pinctrl/pinctrl-stmfx.c | 4 +- + drivers/pinctrl/pinctrl-sx150x.c | 23 +- + drivers/pinctrl/pinctrl-tb10x.c | 2 +- + drivers/pinctrl/pinctrl-upboard.c | 21 + + drivers/pinctrl/qcom/Kconfig.msm | 10 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-maili.c | 1625 ++++++++++++ + drivers/pinctrl/qcom/pinctrl-milos-lpass-lpi.c | 40 + + drivers/pinctrl/qcom/pinctrl-msm.c | 67 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 + + drivers/pinctrl/qcom/pinctrl-x1e80100.c | 4 +- + drivers/pinctrl/qcom/tlmm-test.c | 3 - + drivers/pinctrl/realtek/pinctrl-rtd1625.c | 4 +- + drivers/pinctrl/renesas/pinctrl-rza2.c | 26 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 132 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + drivers/pinctrl/spacemit/pinctrl-k1.c | 10 +- + drivers/pinctrl/spear/pinctrl-plgpio.c | 2 +- + drivers/pinctrl/tegra/pinctrl-tegra264.c | 24 +- + 118 files changed, 15233 insertions(+), 2904 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/airoha,an7563-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/airoha,en7523-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt6858-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/microchip,pic32-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/microchip,pic32mzda-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,maili-tlmm.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/ti,da850-pupd.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/ti,da850-pupd.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/ti,dra7-iodelay.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/ti,iodelay.txt + create mode 100644 arch/arm64/boot/dts/mediatek/mt6858-pinfunc.h + create mode 100644 drivers/pinctrl/airoha/airoha-common.h + create mode 100644 drivers/pinctrl/airoha/pinctrl-an7563.c + create mode 100644 drivers/pinctrl/airoha/pinctrl-an7581.c + create mode 100644 drivers/pinctrl/airoha/pinctrl-an7583.c + create mode 100644 drivers/pinctrl/airoha/pinctrl-en7523.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt6858.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt6858.h + create mode 100644 drivers/pinctrl/qcom/pinctrl-maili.c +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 (e77f165d26f72 kbuild: unset sub_make_done before calling kselftest build system) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git livepatching/for-next +Auto-merging Makefile +Merge made by the 'ort' strategy. + Makefile | 4 ++-- + kernel/livepatch/core.c | 34 ++++++++++++++++++++++------------ + 2 files changed, 24 insertions(+), 14 deletions(-) +Merging rtc/rtc-next (da5e8713aee51 rtc: st-lpc: get IRQ via platform_get_irq()) +$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + drivers/rtc/rtc-ab-eoz9.c | 1 + + drivers/rtc/rtc-brcmstb-waketimer.c | 1 + + drivers/rtc/rtc-ds1343.c | 4 ++-- + drivers/rtc/rtc-mv.c | 41 ++++++++----------------------------- + drivers/rtc/rtc-pcf8563.c | 4 +++- + 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 +++---- + 9 files changed, 25 insertions(+), 48 deletions(-) +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 +Auto-merging drivers/nvdimm/btt.c +Auto-merging fs/dax.c +Merge made by the 'ort' strategy. + drivers/dax/dax-private.h | 2 - + drivers/dax/fsdev.c | 154 ++++++++++++++++++++++++++----------- + drivers/dax/super.c | 54 +++++++++++-- + drivers/nvdimm/btt.c | 8 ++ + drivers/nvdimm/btt.h | 2 +- + drivers/nvdimm/label.c | 17 +++- + fs/dax.c | 12 +-- + include/linux/nd.h | 8 +- + tools/testing/nvdimm/test/ndtest.c | 3 +- + tools/testing/nvdimm/test/nfit.c | 3 +- + 10 files changed, 194 insertions(+), 69 deletions(-) +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 (a4ffc59238be8 mshv: add bounds check on vp_index in mshv_intercept_isr()) +$ 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 +Merge made by the 'ort' strategy. + drivers/auxdisplay/charlcd.c | 21 ++++++++++++++------- + drivers/auxdisplay/ht16k33.c | 5 +---- + drivers/auxdisplay/panel.c | 37 ------------------------------------- + 3 files changed, 15 insertions(+), 48 deletions(-) +Merging kgdb/kgdb/for-next (fdbdd0ccb30af kdb: remove redundant check for scancode 0xe0) +$ git merge -m Merge branch 'kgdb/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'hmm' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (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 memblock/for-next (b3c1ec1a9ad84 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +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 +Auto-merging drivers/acpi/apei/ghes.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-cxl | 15 +- + Documentation/ABI/testing/sysfs-bus-nvdimm | 3 +- + Documentation/driver-api/cxl/linux/dax-driver.rst | 4 +- + drivers/acpi/apei/ghes.c | 66 +- + drivers/cxl/core/core.h | 7 +- + drivers/cxl/core/features.c | 23 +- + drivers/cxl/core/mbox.c | 27 +- + drivers/cxl/core/mce.c | 27 +- + drivers/cxl/core/memdev.c | 2 +- + drivers/cxl/core/pmem.c | 10 +- + drivers/cxl/core/port.c | 43 +- + drivers/cxl/core/ras.c | 7 +- + drivers/cxl/core/ras_rch.c | 27 +- + drivers/cxl/core/region.c | 61 +- + drivers/cxl/core/trace.h | 10 +- + drivers/cxl/cxl.h | 11 +- + drivers/cxl/cxlmem.h | 4 +- + drivers/cxl/pci.c | 14 +- + drivers/cxl/pmem.c | 2 +- + include/cxl/event.h | 21 +- + include/cxl/mailbox.h | 2 + + tools/testing/cxl/test/Kbuild | 2 + + tools/testing/cxl/test/accel.c | 66 ++ + tools/testing/cxl/test/cxl.c | 833 ++++++++++++++++------ + tools/testing/cxl/test/hmem_test.c | 3 +- + tools/testing/cxl/test/mem.c | 15 +- + tools/testing/cxl/test/mock.h | 2 + + 27 files changed, 923 insertions(+), 384 deletions(-) + create mode 100644 tools/testing/cxl/test/accel.c +Merging zstd/zstd-next (65d1f5507ed2c zstd: Import upstream v1.5.7) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (f56c000d6f5e0 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 +Merge made by the 'ort' strategy. + arch/x86/platform/efi/quirks.c | 9 +---- + drivers/firmware/efi/Kconfig | 2 +- + drivers/firmware/efi/apple-properties.c | 5 ++- + drivers/firmware/efi/runtime-wrappers.c | 70 ++++++++++++++++++++++++++++----- + fs/efivarfs/super.c | 30 +++++++++++--- + include/linux/efi.h | 8 ++-- + tools/objtool/noreturns.h | 1 + + 7 files changed, 96 insertions(+), 29 deletions(-) +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 +Merge made by the 'ort' strategy. + fs/unicode/utf8-core.c | 30 +++++------------------------- + include/linux/unicode.h | 3 --- + 2 files changed, 5 insertions(+), 28 deletions(-) +Merging slab/slab/for-next (e7f630142df2a Merge branch 'slab/for-7.3/kfree_rcu_nolock' into slab/for-next) +$ git merge -m Merge branch 'slab/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/mm/allocation-profiling.rst +Auto-merging include/linux/memcontrol.h +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/types.h +Auto-merging include/trace/events/rcu.h +Auto-merging mm/memcontrol.c +Auto-merging mm/slab.h +Auto-merging mm/slab_common.c +CONFLICT (content): Merge conflict in mm/slab_common.c +Auto-merging mm/slub.c +Resolved 'mm/slab_common.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9443ced4df017] Merge branch 'slab/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-slab | 18 +- + Documentation/admin-guide/kernel-parameters.txt | 5 + + Documentation/mm/allocation-profiling.rst | 7 + + include/linux/memcontrol.h | 13 - + include/linux/rcupdate.h | 32 +- + include/linux/slab.h | 19 +- + include/linux/types.h | 10 + + include/trace/events/rcu.h | 2 +- + lib/tests/slub_kunit.c | 190 +++++-- + mm/kfence/core.c | 12 - + mm/kfence/kfence.h | 3 - + mm/kfence/kfence_test.c | 2 +- + mm/memcontrol.c | 37 +- + mm/mempool.c | 35 +- + mm/slab.h | 243 +++++++-- + mm/slab_common.c | 111 +++- + mm/slub.c | 672 ++++++++++++++---------- + 17 files changed, 945 insertions(+), 466 deletions(-) +$ git am -3 ../patches/0001-drm-panthor-I-love-Werror.patch +Applying: drm/panthor: I love -Werror +Using index info to reconstruct a base tree... +M drivers/gpu/drm/panthor/panthor_mmu.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/panthor/panthor_mmu.c +No changes -- Patch already applied. +$ git am -3 ../patches/0001-rust-poll-fix-compilation-error-due-to-kvfree_call_r.patch +Applying: From: "Vlastimil Babka (SUSE)" <vbabka@kernel.org> Subject: rust: poll: fix compilation error due to kvfree_call_rcu changes Date: Wed, 05 Aug 2026 18:28:45 +0200 +$ git reset HEAD^ +Unstaged changes after reset: +M rust/kernel/sync/poll.rs +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 2016b929b6c1f] Merge branch 'slab/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git + Date: Thu Aug 20 13:58:45 2026 +0100 +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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/LSM/landlock.rst | 106 +- + Documentation/security/landlock.rst | 38 +- + Documentation/trace/events-landlock.rst | 326 ++++ + Documentation/trace/index.rst | 1 + + Documentation/userspace-api/landlock.rst | 62 +- + MAINTAINERS | 3 + + include/linux/landlock.h | 56 + + include/trace/events/landlock.h | 965 ++++++++++++ + include/uapi/linux/landlock.h | 22 +- + samples/landlock/sandboxer.c | 16 +- + security/landlock/Kconfig | 5 + + security/landlock/Makefile | 12 +- + security/landlock/access.h | 6 +- + security/landlock/audit.c | 639 +------- + security/landlock/audit.h | 57 +- + security/landlock/cred.c | 14 +- + security/landlock/cred.h | 29 +- + security/landlock/domain.c | 472 +++++- + security/landlock/domain.h | 163 +- + security/landlock/errata/abi-1.h | 23 + + security/landlock/fs.c | 259 +++- + security/landlock/fs.h | 40 +- + security/landlock/id.h | 6 +- + security/landlock/limits.h | 2 +- + security/landlock/log.c | 587 +++++++ + security/landlock/log.h | 86 ++ + security/landlock/net.c | 38 +- + security/landlock/ruleset.c | 550 +------ + security/landlock/ruleset.h | 270 ++-- + security/landlock/syscalls.c | 129 +- + security/landlock/task.c | 87 +- + security/landlock/trace.c | 185 +++ + security/landlock/trace.h | 44 + + security/landlock/tsync.c | 24 +- + security/landlock/tsync.h | 4 +- + tools/testing/selftests/landlock/audit.h | 35 - + tools/testing/selftests/landlock/base_test.c | 104 +- + tools/testing/selftests/landlock/common.h | 47 + + tools/testing/selftests/landlock/config | 2 + + tools/testing/selftests/landlock/fs_test.c | 738 ++++++++- + tools/testing/selftests/landlock/net_test.c | 590 ++++++- + tools/testing/selftests/landlock/ptrace_test.c | 402 +++++ + .../selftests/landlock/scoped_abstract_unix_test.c | 264 ++++ + .../selftests/landlock/scoped_signal_test.c | 404 +++++ + tools/testing/selftests/landlock/trace.h | 639 ++++++++ + tools/testing/selftests/landlock/trace_fs_test.c | 496 ++++++ + tools/testing/selftests/landlock/trace_test.c | 1620 ++++++++++++++++++++ + tools/testing/selftests/landlock/true.c | 10 + + tools/testing/selftests/landlock/tsync_test.c | 96 +- + 49 files changed, 9257 insertions(+), 1516 deletions(-) + create mode 100644 Documentation/trace/events-landlock.rst + create mode 100644 include/linux/landlock.h + create mode 100644 include/trace/events/landlock.h + create mode 100644 security/landlock/log.c + create mode 100644 security/landlock/log.h + create mode 100644 security/landlock/trace.c + create mode 100644 security/landlock/trace.h + create mode 100644 tools/testing/selftests/landlock/trace.h + create mode 100644 tools/testing/selftests/landlock/trace_fs_test.c + create mode 100644 tools/testing/selftests/landlock/trace_test.c +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 +Auto-merging arch/s390/Kconfig +Auto-merging fs/pipe.c +Auto-merging init/Kconfig +Auto-merging kernel/pid.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/topology.c +Auto-merging lib/Kconfig.debug +Auto-merging tools/testing/selftests/net/config +Merge made by the 'ort' strategy. + arch/m68k/configs/amcore_defconfig | 2 +- + arch/m68k/configs/stmark2_defconfig | 2 +- + arch/s390/Kconfig | 4 +- + arch/x86/kernel/cpu/bus_lock.c | 2 +- + fs/pipe.c | 2 +- + fs/proc/Kconfig | 3 +- + fs/proc/Makefile | 2 +- + fs/proc/internal.h | 2 +- + include/linux/sysctl.h | 133 +++-- + include/linux/utsname.h | 2 +- + init/Kconfig | 3 - + kernel/delayacct.c | 2 +- + kernel/pid.c | 31 -- + kernel/reboot.c | 29 ++ + kernel/sched/core.c | 8 +- + kernel/sched/topology.c | 4 +- + kernel/sysctl.c | 542 +++++++++++---------- + kernel/time/jiffies.c | 31 +- + kernel/utsname_sysctl.c | 4 +- + lib/Kconfig.debug | 2 +- + lib/test_sysctl.c | 2 +- + net/mpls/Kconfig | 2 +- + tools/testing/selftests/net/config | 2 +- + tools/testing/selftests/net/packetdrill/config | 2 +- + .../testing/selftests/wireguard/qemu/kernel.config | 2 +- + 25 files changed, 459 insertions(+), 361 deletions(-) +$ 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 +Merge made by the 'ort' strategy. + arch/x86/include/asm/elf.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/perf/imc-pmu.c +Auto-merging arch/x86/events/amd/uncore.c +Auto-merging arch/x86/events/intel/core.c +Auto-merging arch/x86/events/intel/uncore.c +Auto-merging drivers/devfreq/event/rockchip-dfi.c +Auto-merging drivers/fpga/dfl-fme-perf.c +Auto-merging drivers/hwtracing/ptt/hisi_ptt.c +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/perf/alibaba_uncore_drw_pmu.c +Auto-merging drivers/perf/arm-cmn.c +Auto-merging drivers/perf/arm_cspmu/arm_cspmu.c +Auto-merging drivers/perf/arm_pmu.c +Auto-merging drivers/perf/arm_spe_pmu.c +Auto-merging drivers/perf/cxl_pmu.c +Auto-merging drivers/perf/dwc_pcie_pmu.c +Auto-merging drivers/perf/fsl_imx8_ddr_perf.c +Auto-merging drivers/perf/fsl_imx9_ddr_perf.c +Auto-merging drivers/perf/fujitsu_uncore_pmu.c +Auto-merging drivers/perf/hisilicon/hisi_uncore_pmu.c +Auto-merging drivers/perf/marvell_cn10k_ddr_pmu.c +Auto-merging drivers/perf/qcom_l2_pmu.c +Auto-merging drivers/perf/qcom_l3_pmu.c +Auto-merging drivers/perf/starfive_starlink_pmu.c +Auto-merging drivers/perf/xgene_pmu.c +Auto-merging kernel/events/core.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 3 + + arch/arm/mach-imx/mmdc.c | 2 +- + arch/arm/mm/cache-l2x0-pmu.c | 2 +- + arch/arm/mm/dma-mapping.c | 4 +- + arch/powerpc/kernel/cacheinfo.c | 3 +- + arch/powerpc/perf/hv-24x7.c | 2 +- + arch/powerpc/perf/hv-gpci.c | 2 +- + arch/powerpc/perf/imc-pmu.c | 2 +- + arch/powerpc/sysdev/msi_bitmap.c | 2 +- + arch/x86/events/amd/iommu.c | 2 +- + arch/x86/events/amd/power.c | 2 +- + arch/x86/events/amd/uncore.c | 2 +- + arch/x86/events/intel/core.c | 2 +- + arch/x86/events/intel/uncore.c | 2 +- + drivers/base/cpu.c | 2 +- + drivers/crypto/ccp/ccp-dev-v3.c | 2 +- + drivers/crypto/ccp/ccp-dev-v5.c | 2 +- + drivers/devfreq/event/rockchip-dfi.c | 2 +- + drivers/devfreq/hisi_uncore_freq.c | 2 +- + drivers/firmware/psci/psci_checker.c | 15 +- + drivers/fpga/dfl-fme-perf.c | 2 +- + drivers/hwtracing/ptt/hisi_ptt.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.c | 3 +- + .../media/platform/samsung/s5p-mfc/s5p_mfc_opr.c | 2 +- + drivers/pci/pci-sysfs.c | 7 +- + drivers/perf/alibaba_uncore_drw_pmu.c | 2 +- + drivers/perf/amlogic/meson_ddr_pmu_core.c | 2 +- + drivers/perf/arm-cci.c | 2 +- + drivers/perf/arm-ccn.c | 2 +- + drivers/perf/arm-cmn.c | 2 +- + drivers/perf/arm-ni.c | 2 +- + drivers/perf/arm_cspmu/arm_cspmu.c | 2 +- + drivers/perf/arm_dmc620_pmu.c | 4 +- + drivers/perf/arm_dsu_pmu.c | 2 +- + drivers/perf/arm_pmu.c | 2 +- + drivers/perf/arm_smmuv3_pmu.c | 2 +- + drivers/perf/arm_spe_pmu.c | 2 +- + drivers/perf/cxl_pmu.c | 2 +- + drivers/perf/dwc_pcie_pmu.c | 2 +- + drivers/perf/fsl_imx8_ddr_perf.c | 2 +- + drivers/perf/fsl_imx9_ddr_perf.c | 2 +- + drivers/perf/fujitsu_uncore_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_pcie_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_pmu.c | 2 +- + drivers/perf/marvell_cn10k_ddr_pmu.c | 2 +- + drivers/perf/marvell_cn10k_tad_pmu.c | 2 +- + drivers/perf/marvell_pem_pmu.c | 2 +- + drivers/perf/nvidia_t410_c2c_pmu.c | 2 +- + drivers/perf/nvidia_t410_cmem_latency_pmu.c | 2 +- + drivers/perf/qcom_l2_pmu.c | 2 +- + drivers/perf/qcom_l3_pmu.c | 2 +- + drivers/perf/starfive_starlink_pmu.c | 2 +- + drivers/perf/thunderx2_pmu.c | 2 +- + drivers/perf/xgene_pmu.c | 2 +- + include/asm-generic/bitops/le.h | 18 +- + include/linux/bitmap.h | 15 +- + include/linux/bits.h | 6 +- + include/linux/cpumask.h | 19 -- + include/linux/nodemask.h | 15 +- + kernel/events/core.c | 2 +- + lib/Kconfig.debug | 13 ++ + lib/Makefile | 1 + + lib/bitmap-str.c | 9 +- + lib/bitmap.c | 30 +-- + lib/find_bit_benchmark.c | 17 ++ + lib/region_alloc_benchmark.c | 217 +++++++++++++++++++++ + lib/test_bitmap.c | 39 ++++ + tools/include/linux/bits.h | 6 +- + 68 files changed, 402 insertions(+), 138 deletions(-) + create mode 100644 lib/region_alloc_benchmark.c +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 (a39ac4651e3b9 power: sequencing: pcie-m2: Match WCN6855 and WCN7851 UART BT variants by subdevice ID) +$ 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 +Merge made by the 'ort' strategy. + include/uapi/linux/capability.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +$ git am -3 ../patches/0001-sign-file-Fix-up-merge-issue.patch +Applying: sign-file: Fix up merge issue +Using index info to reconstruct a base tree... +M scripts/sign-file.c +Falling back to patching base and 3-way merge... +Auto-merging scripts/sign-file.c +No changes -- Patch already applied. +Merging ipe/next (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 +Merge made by the 'ort' strategy. + kernel/kcsan/core.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) +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. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..3c3b61a2807a --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20260820 |