 |
index : kernel/git/next/linux-next.git | |
| The linux-next integration testing tree | Linux Next Group |
| aboutsummaryrefslogtreecommitdiffstats |
diff options
| -rw-r--r-- | Next/SHA1s | 429 | ||||
| -rw-r--r-- | Next/Trees | 429 | ||||
| -rw-r--r-- | Next/merge.log | 7889 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 8748 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 0000000000000..095e63f142aae --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,429 @@ +Name SHA1 +---- ---- +origin d2c9a99135da931377240942d44f3dea104cedb8 +ext4-fixes 981fcc5674e67158d24d23e841523eccba19d0e7 +vfs-brauner-fixes 24dddc384fb9aec2d7eea5463ca6dac98a3b3854 +fscrypt-current dc59e4fea9d83f03bad6bddf3fa2e52491777482 +fsverity-current dc59e4fea9d83f03bad6bddf3fa2e52491777482 +btrfs-fixes 6c893b948351d42cfc3761cc746ab5b3d03ee7f3 +vfs-fixes 49c5d168a3a8f4eb27d44a2a22b7e8a856ca601f +erofs-fixes 1006b2f57f77325bfbf5bd36685efe60334fa360 +nfsd-fixes e5248a7426030db1e126363f72afdb3b71339a5c +v9fs-fixes 028ef9c96e96197026887c0f092424679298aae8 +overlayfs-fixes 4549871118cf616eecdd2d939f78e3b9e1dddc48 +fscrypt 2d0afaac9137e95e504bd3ad3512a9044745536b +btrfs 0542d886e45d5b1ac54c37f5d303c71e8683471e +ceph 1397040896280b7a6a6213e874ee4f6146bc9cd9 +cifs e46f394ecbb7a7b644e89acfb14809b358868af2 +configfs 6363844fdbbb76afe1d44d678fe0746390204a5f +ecryptfs 95ce5ffd54cf66098f91892f98606c3bd33846fe +dlm e61113cfcaf71cbdf4c17e3d086d8fb7f92c62bf +erofs dc59e4fea9d83f03bad6bddf3fa2e52491777482 +exfat 274a0462058cd62db36500d19d4fb7ca49e64826 +ext3 42093d1948d2de3991a8b20ac5d12df13b941aad +ext4 c143957520c6c9b5cd72e0de8b52b814f0c576fe +f2fs dc59e4fea9d83f03bad6bddf3fa2e52491777482 +fsverity dc59e4fea9d83f03bad6bddf3fa2e52491777482 +fuse 7d87a5a284bb34edb3f4e7e312ef403b3385a7b7 +gfs2 5f80d9113360c08111ae7471f662f3f89f23ce32 +jfs dad98c5b2a05ef744af4c884c97066a3c8cdad61 +ksmbd f363a0fb134a3eb9e47368b1edbd251fd76be84b +nfs dc59e4fea9d83f03bad6bddf3fa2e52491777482 +nfs-anna 284ea3fb4f6715201e1d9ef3474c25e817ad70e9 +nfsd 95682da196b42b0dfadda7798c62c0f36b4cb99f +ntfs 5ec75546dc71a6290dbef69f0fcc7aa94d4a478e +ntfs3 dc59e4fea9d83f03bad6bddf3fa2e52491777482 +orangefs e61bc5e4d87433c8759e7dc92bb640ef71a8970c +overlayfs 1f6ee9be92f8df85a8c9a5a78c20fd39c0c21a95 +ubifs 11efa98bcc0d00271e8f66c7c940c284f973f39d +v9fs aa88278693cbfaf7a2acf961379973fbb63b165c +v9fs-ericvh 028ef9c96e96197026887c0f092424679298aae8 +xfs e4281086ae6caf006b6ef0670479eb5f96880fb9 +zonefs 3a8389d42bdf4213730f4067f8bfa78bae6564ef +vfs-brauner cf6f88615485a68df77092de1f90f88708a32fa6 +vfs 4dda01b67c8662c5d0c53034974cb8280c575a5d +mm-hotfixes f548f2851b9323e7d0834d0c655a46644beeda64 +fs-current 8a82654c6dc4139654abd7ef8769159e24bb733c +kbuild-current dc59e4fea9d83f03bad6bddf3fa2e52491777482 +clang-fixes 175db11786bde9061db526bf1ac5107d915f5163 +arc-current 7aaa8047eafd0bd628065b15757d9b48c5f9c07d +arm-current 009b6c6486b94a3aff566b017256b598dc96bf18 +arm64-fixes a52d6c7160f7e2f8c56adf29146385b8f2868d3d +arm-soc-fixes 9c648f3554920721d8878807cd794fe2d7f989e8 +davinci-current dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drivers-memory-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current dc5200f6b1ada318463dd141b041ec9f044b2bf5 +powerpc-fixes 5200f5f493f79f14bbdc349e402a40dfb32f23c8 +s390-fixes 2995ccec260caa9e85b3301a4aba1e66ed80ad74 +net d335dcc6f521571d57117b8deeebc940836e5450 +bpf d2c9a99135da931377240942d44f3dea104cedb8 +ipsec 226f4a490d1a938fc838d8f8c46a4eca864c0d78 +netfilter 0469d460a598d03fc85ebd97f99640e6c579e2a2 +ipvs fe9f4ee6c61a1410afd73bf011de5ae618004796 +wireless dc59e4fea9d83f03bad6bddf3fa2e52491777482 +ath e8d85672dd7e2523f774caafba8f858384e18df7 +iwlwifi 093305d801fae6ff9b8bb531fd78b579794c4f80 +wpan 8ce4f287524c74a118b0af1eebd4b24a8efca57a +rdma-fixes bb27fcc67c429d97f785c92c35a6c5adebb05d7f +sound-current 5720deab6da70d0676cee8a580f6146ef85a3ab9 +sound-asoc-fixes 83245e7a436c04e511378af14dd81fd188b41541 +regmap-fixes 32117bb6198f956d2464411408f6eb8ec400be6f +regulator-fixes bbe4a1f9099056cf5adbb95aeb4d1601d80f7b8c +spi-fixes 6b448abe08f9b53e2c6da1c1e5ab8283f0ec77e5 +pci-current 34db32102439d948e0c9aea060e48f979aae827d +driver-core.current 667d0fb32149f023b8b34a1f6f3d384556eafb5a +tty.current dc59e4fea9d83f03bad6bddf3fa2e52491777482 +usb.current 07acd41f72eec827963b239565925af2bcb3a54b +usb-serial-fixes 6bfc8d01ac4068eced509f8fc74d0cd205e4dcec +phy dc59e4fea9d83f03bad6bddf3fa2e52491777482 +staging.current dc59e4fea9d83f03bad6bddf3fa2e52491777482 +iio-fixes fd354554af1d2b33232ca6c8a3d79ed82413d715 +watchdog-fixes 36e05e134ee44f9fbfcebcbcdadb5f765fccd9f0 +counter-current dc59e4fea9d83f03bad6bddf3fa2e52491777482 +char-misc.current bc4a9828897871ff3e5a1f8a1d346decbf4ee95e +soundwire-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +thunderbolt-fixes db79679595326fd3f6bd1e6fd0cefc3ba016039a +input-current 536394ec81419b67d9f4f0028812c4372397be1b +crypto-current 6ea0ce3a19f9c37a014099e2b0a46b27fa164564 +libcrypto-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +vfio-fixes e242e974e812e7a47e3088860c80d9492fac314f +kselftest-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +dmaengine-fixes 867621ba203027338b525af6729719c544135336 +backlight-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mtd-fixes 16f7ec8d5dc100eafd2c8e06cd30340a30b104a1 +mfd-fixes d5d2d7a8d8be18681a0864f58e3875f1c639e11c +v4l-dvb-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +reset-fixes 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 +mips-fixes 0880884b36d1230a80a0322abc9b9c7b26942b65 +at91-fixes 765aaba18413a66f6c8fe8416336ca9b3dd98a79 +omap-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +kvm-fixes 098e32cba334da0f3fa8cfd4e022ae7c72341400 +kvms390-fixes 4cb62e371ffadd8be14febb0f9aba8c4d69570af +kvm-arm-fixes d098bb75d14fde2f12155f1a95ec0168160867ce +hwmon-fixes fe87b8dc67f1b2c64e76a66e78468c533d3c44ca +nvdimm-fixes a8aec14230322ed8f1e8042b6d656c1631d41163 +cxl-fixes d90f236f8b9e354848bd226f581db27755ab901d +dma-mapping-fixes 8cd9520d35a6c38db6567e97dd93b1f11f185dc6 +drivers-x86-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +samsung-krzk-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-samsung-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-qcom-fixes 437a8d2aa1aa442c4a176fdf4700a9b3bb0c8794 +devicetree-fixes b39a6b2e9d5bd6a3153aed4c7440172b8f6a739e +dt-krzk-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +scsi-fixes 5d5221f8a4064a256b9499485a9f8c6f530f21dc +drm-fixes acd7c71ba8d83808fa8d704196f3d53f7d58cf50 +drm-intel-fixes 2084503f2d087bf956198e7f6eb25b03a7049cb2 +mmc-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +rtc-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +gnss-fixes 5d6919055dec134de3c40167a490f33c74c12581 +hyperv-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +risc-v-fixes bc7b086a45521a986a49045907f017e3e46c763e +riscv-dt-fixes 0df8aa2b9aec5cd21e8c71d9cc1227e57bea43b3 +riscv-soc-fixes 75ef233975589d9a8c88bc8822a7c725c71ff650 +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx dc59e4fea9d83f03bad6bddf3fa2e52491777482 +gpio-brgl-fixes 9777530157e7b82fd994327ff878c4245dadc931 +gpio-intel-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-intel-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +auxdisplay-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +kunit-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +memblock-fixes 2ebce860bdd7ae5e13002811bc9bbbf33fcfc221 +renesas-fixes 8a78d1c454b3cc7b66d52582474e8b3732833352 +perf-current 558ef39aeb9a089a6be9dda8413b0b9d42e843ea +efi-fixes d8809f6931065cbbf3554647a50a65a471ab5983 +battery-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +iommufd-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +rust-fixes 608045a91d9176d66b2114d0006bc8b57dff2ca9 +w1-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pmdomain-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +i2c-andi-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +i2c-rust-fixes 4eb422482ca5d924d7212ad2ca1cb7ea6f5b524d +sparc-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +clk-fixes f29a24c94705496254dd9ce7ea8a31efb6eb4358 +thead-clk-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +tenstorrent-clk-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +fustini-config-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +pwrseq-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +thead-dt-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +ftrace-fixes 1650a1b6cb1ae6cb99bb4fce21b30ebdf9fc238e +ring-buffer-fixes 057caace5214da3b457bbd295e1a2ad34d3685ea +trace-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +tracefs-fixes 07004a8c4b572171934390148ee48c4175c77eed +spacemit-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +tip-fixes ea9a328fbc5bbb5b77af9504ea28bd28ea2709bc +slab-fixes 67ea9d353d0ba12bdbc9183ff568dead9e949b80 +kexec-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +liveupdate-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drm-msm-fixes db339b6bc9f234b4883eb02946ea01d8d9faa11c +uml-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +fwctl-fixes 4549871118cf616eecdd2d939f78e3b9e1dddc48 +devsec-tsm-fixes c3fd16c3b98ed726294feab2f94f876290bf7b61 +drm-rust-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +tenstorrent-dt-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +nfc-fixes e87faad807329d1348595dbcea3444acd7bb0ca6 +drm-misc-fixes 63bbf9ac5dde2ba85e7b39d0a0b7d540e6252ba4 +rust dc59e4fea9d83f03bad6bddf3fa2e52491777482 +rust-interop 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b +rust-alloc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init dc59e4fea9d83f03bad6bddf3fa2e52491777482 +rust-timekeeping ddb1444d3335129ae87d9796ab1debf41c0ee51b +rust-xarray c455f19bbe6104debd980bb15515faf716bd81b8 +rust-analyzer 5f45afb8ab04d934fc0601a202f95267ebc20059 +mm-stable 039892c35f9d8f5ea00d7c2ed1c25224f28b11d7 +mm-nonmm-stable dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mm-unstable cfb8731f5396cafde2d60a2e7d9d27cdb4505f45 +mm-nonmm-unstable 2ee1282ed36ff65ff425a4c6d3121bd701dcd547 +kbuild dc59e4fea9d83f03bad6bddf3fa2e52491777482 +clang-format 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +perf f6e5090f63b0a9f4c4c42c82348ade4132495ee7 +compiler-attributes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +dma-mapping 7318301e060e3f1207a34f2fca6cd86770dd9160 +asm-generic adbbd9714f8058730f93c8df5c5bf1679456424b +alpha d58041d2c63e09a1c9083e0e9f4151e487c4e16a +arm 75ca78c7d982a0b7c658722fa9eb2ce70e180307 +arm64 36fa5ffa60344bcc59fb3f50b33af8187e6b8753 +arm-perf 5936245125f78d896fdb1bbc2ae79213e28a6579 +arm-soc 972ea78305bddb6a1db0586357914f125e913ffe +amlogic 4336e970ec6890fbd424128c352564a9c1dd514a +asahi-soc 31f24e4f6b1ac06d5d5fd712f787bd2353852460 +at91 6d892f8d5cd9f20cfef5e9d59b0cde53c30daec6 +bmc 40ae2e16214adcd59481a8d799af03be7b0f5e08 +broadcom f705b0c80bab155e9ffc6b796408ab16c9abf206 +cix a0cffbd8878c55b12dc4555f883adf3372cecd91 +davinci dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drivers-memory 1527acf2295cf2d6e11e3e9b121d63709667e6e7 +fsl c99d8ac7b355cbbdbb3f4d8b9a9b46de05a6fee9 +imx-mxs d0c222c2e2ce577d801bdf129dc6c078f29e22df +mediatek eb3e990db356964d64f5cc258d30776c0363f9e9 +mvebu 3ea0dabfa4500104c5c6eebecfa4d23aeb847611 +omap f338cc54e10ab25633a97953e0a6b2265ba65c2c +qcom ba3ccc2ed7614dee722bb5db322db208b6467950 +renesas 30d3a7db7471001c926c20333e07e54749fd3572 +reset d373605cd514837d8a6de3d00c786d4bae6dbaf8 +rockchip b143af2d0da7b01f82f8ea795a0623effab394e7 +samsung-krzk 5346a27fed4d8f0d781b0035ab066f6684cc641e +scmi edb4db149ba0ad5b017ec26513a62bce6567c5e4 +sophgo f7337210bede62fc7c6230ef58013dddf7e0a921 +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit 51ed53630915c9cc290036fe4f430849e23bbf8e +stm32 fba4a31a7f3b6b29b01c83180f83e7ed4c398738 +sunxi 5508b1e45bba27d96e4bd6a8500b66e6311d5ab8 +tee a3067938fd192b116b6dfb325b654300a6d1b461 +tegra 3e854b92cc4852d6c9724572f84158f778bb0463 +tenstorrent-dt 33583baeb1ba7d328e6a9775d889036900b74cdb +fustini-config fb266bbe9aef17d547db468a1a7187b59ed33e9a +thead-dt 3a5791956edbfa84d7256224167941931cbc46e7 +ti 1b98f483adfd99bf7008dc334ae72fc608d47a77 +xilinx f608bce703fc31a2cdf67abe1de882d5bbc45142 +socfpga 0764f42a8ba90cc390070dd48dbc0afde5146f86 +clk 92010229c4b38897f1319d260162d2f96925ed17 +clk-imx b3dcc8c608fbb6352bd94932ba935f2078c9090d +clk-renesas 91fb4643954379f8493dba649d520c23f0d1f4e6 +thead-clk baf4fc7c03bd0f68c768cfe27829674bd060c6b4 +tenstorrent-clk 23c8ebc952849b3ba47d04d0ec95daf5cc136061 +csky abb81e5ce7d995baa41556b8125fa59e28ba3be8 +loongarch 262a3b4fa1792d40728c69995924e11cf761f5cf +m68k dc5200f6b1ada318463dd141b041ec9f044b2bf5 +m68knommu dc59e4fea9d83f03bad6bddf3fa2e52491777482 +microblaze 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +mips dc59e4fea9d83f03bad6bddf3fa2e52491777482 +openrisc aca063c9024522e4e5b9a9d1927433f6a01785a3 +parisc-hd dc59e4fea9d83f03bad6bddf3fa2e52491777482 +powerpc 42f252f5a646866a95f025863c8b201042494ba1 +risc-v 798246e5edfb3aa0b2d6dca46f41014d0b99b209 +riscv-dt 82ab962ef6c2a3571e3d590b30c023118c92b776 +riscv-soc dfceff38cea2b80c6871459c30a8cb96fecc533b +s390 eb3690e410086649d90fdd32813ebb57a8941603 +sh b0aa5e4b087b686575f1b31ce54048b4d059b7b8 +sparc 5b2a3b1a98fb47c593144c2770e012d463952b70 +uml 254f49634ee16a731174d2ae34bc50bd5f45e731 +xtensa a7c958e8721eb2724ee2e2ef13129bc67e1c8a75 +fs-next 503423f5072e7d227b060621805fc3072455773b +printk 080d60fffa8e0d285871cde8395438006a9b5b0c +pci bcabbbd29c53a5b07eff29f8861d045b2c709c26 +pstore 24b8f8dcb9a139a36cf48bfbe935e8dc1f33ed79 +hid 194a48576843858afcd9c00ed4f105ec2b398e6c +i2c 8cd9520d35a6c38db6567e97dd93b1f11f185dc6 +i2c-andi 04e9bf1648f846976b543e91c1838a712433772a +i2c-rust c0260c740d20751c8498865a9c5dc18b69c3d267 +i3c 678e9409dd78d5c080607df15c6f346c7edb03d0 +dmi 1afafbaf749d8e8ec53f8e38efdc731131902b5b +hwmon-staging a810e1aa11bf6f4fb1bfc2b94bc7541615379209 +jc_docs 2933b82083e758fe6cfff570143541d4dba672c3 +v4l-dvb 8dac27bfa2f994ecb11f01a63641527d17d48fc1 +v4l-dvb-next adc218676eef25575469234709c2d87185ca223a +pm da2e2fd83f1ef6160bfe2b863bbb904b44263dc4 +cpufreq-arm d87cb889dc7ab1f2deecadf2a5e9023184bd7900 +cpupower dc59e4fea9d83f03bad6bddf3fa2e52491777482 +devfreq c096be11c2a9d4acca8e75f1f8edeb744aceb521 +pmdomain dc59e4fea9d83f03bad6bddf3fa2e52491777482 +opp dc59e4fea9d83f03bad6bddf3fa2e52491777482 +thermal 968098b4ca5219b0d2e0a981aed1dacfbd5adc69 +rdma c3fd3966f7dd871e47f9bcd8fe90d6e23e4cdb1a +net-next 6fb33632323a396c9dc2bb9bea483e013e547d57 +bpf-next 0b58988cacfc91604c4b5be2c3295f8aac0ee3d0 +ipsec-next 355f808d8a11fa69b19dfd8811bc87d97830f5d6 +mlx5-next ddbddbf8aee54bee038149187270c93a45478473 +netfilter-next f456c1922c49e6be5ce407ddb74a6e61af5b65cf +ipvs-next 805185b7c7a1069e407b6f7b3bc98e44d415f484 +bluetooth 7ea67149af719895ddf003cb8e9d2b287ef0a223 +wireless-next dc59e4fea9d83f03bad6bddf3fa2e52491777482 +ath-next 913998f903fb1432c0046c33003db38a9e8bedb1 +iwlwifi-next a6136ca2dd9773d6bcd45e8290403536c9c71054 +wpan-next a6bfdfcc6711d1d5a92e98644359dedc67c0c858 +wpan-staging a6bfdfcc6711d1d5a92e98644359dedc67c0c858 +mtd d276783e490d73536135f90f96c5875f263481ab +nand d5a5c9eb2ee9ff5b4cc0be15ac7f4879d4c2f247 +spi-nor df415c5e1de0f1aeefacb4e6252ff98d38c04437 +crypto 6ea0ce3a19f9c37a014099e2b0a46b27fa164564 +libcrypto dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drm dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drm-exynos 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc 903f8773ee96c5dc5fb9aec65227f39fd3e7a1dc +amdgpu 50be7c9b5d5ea55fd40bb411cf324cec99ec7417 +drm-intel 8e27f752037e72ccee9c4a7c4a6202ecf3daf603 +drm-msm 9a967125427e03c7ebc24d7ad26e9307e8403d4e +drm-msm-lumag 8de061ca149c94871e41d91a5b2e442ecc26a572 +drm-xe 820de07bba7b7c97e0f52e1d66bf6147a25ab67f +drm-rust a73a398a68ca9b9e5116a617562471f16b8310c4 +drm-nova 93296e9d9528f0d87f2cf3fee494599060a0f14a +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev dc59e4fea9d83f03bad6bddf3fa2e52491777482 +regmap 5663b89570d1204b87242911bef7ffe5b51eb425 +sound c0933934d5d96fc641e8d0025f9099e554a7b47a +ieee1394 dc59e4fea9d83f03bad6bddf3fa2e52491777482 +sound-asoc dbde3bfa3d31eb57c505ca3f577f118f8cf695c5 +modules 36d6b929bb0c7cc1cc742d9b5805537d3b651094 +input c8f174900926d3b58cd048ac33b4cbb3de419bfe +block 39dffa2bee1ba8ed84b6befed3678a1040764ff2 +device-mapper 55c99f2d901c783c49dddd98f7c05d98ad834ce9 +libata 21e7b9710a24bd7688c02f136923c89bee2fda5a +pcmcia b3c26ea81ccc522e77ed0b1707add61fc9206216 +mmc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mfd f658393698772d1f4f85b784814030e7af0ade64 +backlight dc59e4fea9d83f03bad6bddf3fa2e52491777482 +battery a888754e51e915731c8974c4d6d62709facb35d3 +regulator f23ae9e1ee8639f752be3307ed4d97fb1d7915cd +security 149b192e376d746bf7b8e1e02541c2256c3b17f0 +apparmor dda61023f976d7ab3bc7c8b46d26d6d23424f890 +integrity 35d6f5e788dae0dcc4c42d1280360f19aef9ab52 +selinux ae3d476caeba0bb7779334b1ce9d9a795ed602d2 +smack b78fede1c69a090d377bf80417ce1f7f7f314534 +tomoyo 110ef9f94f84d425ab55d09b2d70ed12ceffdf08 +tpmdd-tpm 4ece5759c1a29fd711b7b1d1a3b81078547697fd +tpmdd-keys 51cb1aa1250c36269474b8b6ca6b6319e170f5a5 +watchdog bc54a071a02dc396af9a61a7055b646194cb23d4 +iommu dd8a3c6cd531dca5917111a94fa3074077f6ba5a +audit e46c818d8fa664f57628fae93fe24f51e34d28c3 +devicetree 0108f362e410693f056da2569f8adf2c9705393d +dt-krzk dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mailbox 36cac4b5101f8ecbc851356df175b99543c84ec6 +spi a1766c1c03f8261b26eb7516a4d9941dd70c27a6 +tip a9fd77297985fbcca735665bd59359b687179bb4 +kexec af78cec42d1b0113993e427139f0ab2f34b047ee +liveupdate af78cec42d1b0113993e427139f0ab2f34b047ee +clockevents a9ac745bc320cbdc2ed3c851eb78f91f22ff975b +edac 1129f95c19e50823398822a775c9adc141113196 +ftrace 0e372d9db612ba8d30483565b90b3a6a7846da2f +rcu e853c1b28580ea93fda3cd729e440a3fc16fa647 +paulmck 48f7a50c027dd2abb9e7b8a6ecc8e531d87f2c21 +kvm a204badd8432f93b7e862e7dac6db0fe3d65f370 +kvm-arm 1ee27dacbe5dc4def481794d899d67b0d4570094 +kvms390 babe08404e1993697a523e60bc0f9d096ffe1ef8 +kvm-ppc 5200f5f493f79f14bbdc349e402a40dfb32f23c8 +kvm-riscv 52738352a6f29279e15285fcb7b50241ef867e27 +kvm-x86 50406d35f5635e1cc523e61409d57e851b5f5df8 +xen-tip fcd245ea7528d50fddffc0fd1308941a9180f5b3 +percpu 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +workqueues ecf5aad9a4417fece80890f27a9899db90c9c457 +sched-ext 57194a3172ba0123e8f37c4574a8e2863ab67622 +drivers-x86 dc59e4fea9d83f03bad6bddf3fa2e52491777482 +chrome-platform d1ceb2b2324717fa30b44d56ef0c52813e239569 +chrome-platform-firmware dd06eb60e86a1ab6d3bd4f641100f47b6f7342b6 +hsi 254f49634ee16a731174d2ae34bc50bd5f45e731 +leds-lj 7ddc04d1bd08f80ffc1e2fb97f3fc6cacab0ffc0 +ipmi 6d920a75df9a83ab096b3cde7a643b656e4fdfeb +driver-core e7e09a8546a9e41a164378979471a4b4bd166bc7 +usb dc59e4fea9d83f03bad6bddf3fa2e52491777482 +thunderbolt d49d71ebec8f03eee2514304279a05a4952fadf7 +usb-serial dc59e4fea9d83f03bad6bddf3fa2e52491777482 +tty dc59e4fea9d83f03bad6bddf3fa2e52491777482 +char-misc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +coresight 98495b5a4d77dd22e106f462b76e1093a55b29a7 +fastrpc 17ec912dc87bf6b9aba3a85f6a94e99f999d6511 +fpga 43a1974da6bc7ce8f4d1dc1d03d56997428c29c3 +icc 94fe92d2f662b990da2ef9788bbe3bdcfe086731 +iio fef4337eb2888c758c7058e1723903204f012a26 +nfc ed85d4cbbfaa4e630c5aa0d607348b42620d976b +phy-next dc59e4fea9d83f03bad6bddf3fa2e52491777482 +soundwire 90af3209742db61a7f9d7d054a16165818cfc6d8 +extcon 254f49634ee16a731174d2ae34bc50bd5f45e731 +gnss 5d6919055dec134de3c40167a490f33c74c12581 +vfio 785562e31dbcd85ca583cf58c446e63aa8a5af08 +w1 487eca6535cab91944ade06a155e9d789591a1e5 +spmi 3443eec9c55d128064c83225a9111f1a1a37277a +staging dc59e4fea9d83f03bad6bddf3fa2e52491777482 +counter-next dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mux 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +dmaengine 0d3e3376b289cdaff5b3b6c1581999926ff1000f +cgroup ec98784b247b2c0544673710720a0f9fb76e269d +scsi cf1af0ccca54d5547cc31bf476c6a07cf658ad29 +scsi-mkp 57a6ed0b41677ccc5e28cc0976e495c1dfa33747 +vhost 1f673033c02735bb38ee2f16f1c86f042f4de9d4 +rpmsg 8ca01dbc70b5856b8ad40f5178d6cbf13898896f +gpio-brgl edbcefc9b0d5925f8be4227fc180a92cd49d126e +gpio-intel dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl 94cb9e8f270797e489633cfa53d2d44afecb8bef +pinctrl-intel dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-renesas 5a653cedec948423fc8a0180c90b8d05c2239d9d +pinctrl-samsung dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-qcom 251b53103a2e5770658ae106c490cdd2b7512c3a +pwm 898ab0f30e008e411ce93ddf81c4099abd9d4e46 +ktest 932cdaf3e273a2727e77af97f79f12577174c5a0 +kselftest dc59e4fea9d83f03bad6bddf3fa2e52491777482 +kunit dc59e4fea9d83f03bad6bddf3fa2e52491777482 +kunit-next 643ec8ff7d8ed15881bd05d71de24208ce0dadcb +livepatching 0839c8963b7b28d25350bd5ea69bacde794124ab +rtc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +nvdimm 86e411b6ec277dbb8ac1f1d855dc337181a62a29 +at24 dc59e4fea9d83f03bad6bddf3fa2e52491777482 +ntb dc59e4fea9d83f03bad6bddf3fa2e52491777482 +seccomp 41fa04327384148b0e2e828c9be9862c5240e9fa +slimbus c922423ce66bcee6c61d1b5aadea09b29ca81400 +nvmem a3122a19f00b75a8b98b96efb4e25e3e0bfb7365 +hyperv a4ffc59238be84dd1c26bf1c001543e832674fc6 +auxdisplay dc59e4fea9d83f03bad6bddf3fa2e52491777482 +kgdb fdbdd0ccb30af18d3b29e714ac8d5ab6163279e0 +hmm 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +cfi 254f49634ee16a731174d2ae34bc50bd5f45e731 +mhi 32845111e8ea6ef5e837b6d25080e69e99bd4561 +memblock 717cd4552ae422269f844aa19ce0125462c9c0b0 +cxl bdc0a9797abd91556f73d1c8cdae878853521699 +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi 48a428215782321b56956974f23593e40ce84b7a +unicode bcfee135d584714c2130031c7e28aafa91057b9a +slab ea0c7a9244594f1d71268e8636a8601217e4839d +random bb9ff576fdff48c242876f55098a3ee20a29df5d +landlock 22b5f1fe549c53fa04c7fca4e4b571415aa28d24 +sysctl f63a9df7e3f9f842945d292a19d9938924f066f9 +execve 9bf092c97b86af63694d9902b9e14047214ba76d +bitmap 7646c6d93895c70cf40c0539fe745b9f25b26f0e +hte 005b25ad11717139ca5c14c9f06c2a60855c2afd +kspp c2606fb910d7cade63ee7e9c28e6a4225d0383f6 +nolibc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +iommufd dc59e4fea9d83f03bad6bddf3fa2e52491777482 +turbostat 1c996a37fd244d19e5dbb715328c1676e28ef607 +pwrseq 1656f4f2eb45d9f18515ac00657a2494719fa065 +capabilities-next 071588136007482d70fd2667b827036bc60b1f8f +ipe 028ef9c96e96197026887c0f092424679298aae8 +kcsan 07a1a6562ce29e2e0c134a57882d6e52e8758492 +crc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +keys-next 965e9a2cf23b066d8bdeb690dff9cd7089c5f667 +fwctl dc59e4fea9d83f03bad6bddf3fa2e52491777482 +devsec-tsm 3177779ae17db4c66c851f799505fb95c7530c03 +hisilicon 6cdd694551d6a11fb03d154fd7e15ab2f9b3f1f9 +device-id 995832b2cebe6969d1b42635db698803ee31294d +kthread fa39ec4f89f2637ed1cdbcde3656825951787668 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 0000000000000..ef300c6c0ed55 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,429 @@ +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://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +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 +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 +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 0000000000000..771edb57d48cd --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7889 @@ +$ date -R +Fri, 03 Jul 2026 12:41:22 +0100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 79% (3658/4626)
Updating files: 80% (3701/4626)
Updating files: 81% (3748/4626)
Updating files: 82% (3794/4626)
Updating files: 83% (3840/4626)
Updating files: 84% (3886/4626)
Updating files: 85% (3933/4626)
Updating files: 86% (3979/4626)
Updating files: 87% (4025/4626)
Updating files: 88% (4071/4626)
Updating files: 89% (4118/4626)
Updating files: 90% (4164/4626)
Updating files: 91% (4210/4626)
Updating files: 92% (4256/4626)
Updating files: 93% (4303/4626)
Updating files: 94% (4349/4626)
Updating files: 95% (4395/4626)
Updating files: 96% (4441/4626)
Updating files: 97% (4488/4626)
Updating files: 98% (4534/4626)
Updating files: 99% (4580/4626)
Updating files: 100% (4626/4626)
Updating files: 100% (4626/4626), done. +HEAD is now at 4a50a141f05a8 Merge tag 'bootconfig-fixes-v7.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace +Merging origin/master (d2c9a99135da9 Merge tag 'device-id-rework' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 4a50a141f05a8..d2c9a99135da9 +Fast-forward (no commit created; -m option ignored) + .mailmap | 1 + + Documentation/ABI/testing/debugfs-vfio | 26 + + Documentation/hwmon/ltc4283.rst | 4 +- + MAINTAINERS | 20 +- + arch/arm/mach-omap2/board-generic.c | 1 - + arch/arm64/net/bpf_jit_comp.c | 4 +- + arch/loongarch/kvm/main.c | 1 + + arch/loongarch/net/bpf_jit.c | 5 +- + arch/mips/include/asm/cdmm.h | 2 +- + arch/mips/lantiq/xway/dcdc.c | 1 - + arch/mips/lantiq/xway/gptu.c | 1 - + arch/mips/lantiq/xway/vmmc.c | 1 - + arch/mips/pci/pci-rt2880.c | 1 - + arch/mips/ralink/timer.c | 1 - + arch/parisc/include/asm/hardware.h | 4 +- + arch/parisc/include/asm/parisc-device.h | 1 + + arch/parisc/include/asm/ptrace.h | 1 + + arch/powerpc/net/bpf_jit_comp.c | 4 +- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 1 - + arch/powerpc/platforms/86xx/common.c | 1 - + arch/powerpc/sysdev/fsl_lbc.c | 1 - + arch/powerpc/sysdev/fsl_pmc.c | 1 - + arch/riscv/net/bpf_jit_comp64.c | 2 +- + arch/riscv/net/bpf_jit_core.c | 3 +- + arch/s390/include/asm/ccwdev.h | 2 +- + arch/sh/drivers/platform_early.c | 2 +- + arch/sparc/crypto/crop_devid.c | 2 +- + arch/sparc/kernel/of_device_32.c | 1 - + arch/sparc/kernel/of_device_64.c | 1 - + arch/sparc/kernel/of_device_common.c | 1 - + arch/x86/include/asm/cpu_device_id.h | 5 +- + arch/x86/include/asm/nospec-branch.h | 4 + + arch/x86/kernel/cpu/bugs.c | 50 +- + arch/x86/kvm/svm/svm.c | 1 - + arch/x86/kvm/vmx/vmx.c | 1 - + arch/x86/net/bpf_jit_comp.c | 5 +- + drivers/accel/ethosu/ethosu_drv.c | 1 - + drivers/accel/qaic/qaic_timesync.c | 1 - + drivers/accel/qaic/sahara.c | 1 - + drivers/ata/ahci_platform.c | 1 - + drivers/ata/ahci_sunxi.c | 1 - + drivers/ata/libata-core.c | 21 + + drivers/ata/libata-scsi.c | 9 +- + drivers/ata/libata.h | 9 + + drivers/ata/pata_buddha.c | 1 - + drivers/ata/pata_ep93xx.c | 1 - + drivers/ata/pata_imx.c | 1 - + drivers/ata/pata_pxa.c | 1 + + drivers/ata/sata_gemini.c | 2 +- + drivers/auxdisplay/arm-charlcd.c | 1 - + drivers/auxdisplay/hd44780.c | 1 - + drivers/auxdisplay/lcd2s.c | 1 - + drivers/auxdisplay/max6959.c | 1 - + drivers/auxdisplay/seg-led-gpio.c | 1 - + drivers/block/floppy.c | 2 +- + drivers/bluetooth/hci_h5.c | 1 - + drivers/bluetooth/hci_qca.c | 1 - + drivers/bus/mhi/ep/main.c | 1 - + drivers/bus/mhi/host/init.c | 1 - + drivers/cache/hisi_soc_hha.c | 1 - + drivers/cdx/controller/cdx_controller.c | 1 - + drivers/char/hw_random/airoha-trng.c | 1 - + drivers/char/hw_random/atmel-rng.c | 1 - + drivers/char/hw_random/ba431-rng.c | 1 - + drivers/char/hw_random/bcm74110-rng.c | 1 - + drivers/char/hw_random/exynos-trng.c | 1 - + drivers/char/hw_random/histb-rng.c | 1 - + drivers/char/hw_random/imx-rngc.c | 1 - + drivers/char/hw_random/ingenic-trng.c | 1 - + drivers/char/hw_random/iproc-rng200.c | 1 - + drivers/char/hw_random/pasemi-rng.c | 1 - + drivers/char/hw_random/pic32-rng.c | 1 - + drivers/char/hw_random/powernv-rng.c | 1 - + drivers/char/hw_random/xgene-rng.c | 1 - + drivers/char/hw_random/xilinx-trng.c | 1 - + drivers/char/hw_random/xiphera-trng.c | 1 - + drivers/clk/aspeed/clk-ast2600.c | 1 - + drivers/clk/aspeed/clk-ast2700.c | 1 - + drivers/clk/clk-axi-clkgen.c | 1 - + drivers/clk/clk-bm1880.c | 1 - + drivers/clk/clk-cdce706.c | 1 - + drivers/clk/clk-eyeq.c | 1 - + drivers/clk/clk-renesas-pcie.c | 1 - + drivers/clk/clk-si521xx.c | 1 - + drivers/clk/clk-versaclock5.c | 1 - + drivers/clk/imx/clk-imx8mp-audiomix.c | 1 - + drivers/clk/mediatek/clk-mt2701-g3d.c | 1 - + drivers/clk/mediatek/clk-mt2701.c | 1 - + drivers/clk/mediatek/clk-mt2712.c | 1 - + drivers/clk/mediatek/clk-mt6765.c | 1 - + drivers/clk/mediatek/clk-mt6779-aud.c | 1 - + drivers/clk/mediatek/clk-mt7622-eth.c | 1 - + drivers/clk/mediatek/clk-mt7622-hif.c | 1 - + drivers/clk/mediatek/clk-mt7622.c | 1 - + drivers/clk/mediatek/clk-mt7629-hif.c | 1 - + drivers/clk/mediatek/clk-mt7981-apmixed.c | 1 - + drivers/clk/mediatek/clk-mt7981-eth.c | 1 - + drivers/clk/mediatek/clk-mt7981-infracfg.c | 1 - + drivers/clk/mediatek/clk-mt7981-topckgen.c | 1 - + drivers/clk/mediatek/clk-mt7986-apmixed.c | 1 - + drivers/clk/mediatek/clk-mt7986-eth.c | 1 - + drivers/clk/mediatek/clk-mt7986-infracfg.c | 1 - + drivers/clk/mediatek/clk-mt7986-topckgen.c | 1 - + drivers/clk/mediatek/clk-mt8167-aud.c | 1 - + drivers/clk/mediatek/clk-mt8167-img.c | 1 - + drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 1 - + drivers/clk/mediatek/clk-mt8167-mm.c | 1 - + drivers/clk/mediatek/clk-mt8167-vdec.c | 1 - + drivers/clk/mediatek/clk-mt8173-mm.c | 1 - + drivers/clk/mediatek/clk-mt8183.c | 1 - + drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c | 1 - + drivers/clk/mediatek/clk-mt8188-apmixedsys.c | 1 - + drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c | 1 - + drivers/clk/mediatek/clk-mt8188-topckgen.c | 1 - + drivers/clk/mediatek/clk-mt8188-vdo0.c | 1 - + drivers/clk/mediatek/clk-mt8188-vdo1.c | 1 - + drivers/clk/mediatek/clk-mt8188-venc.c | 1 - + drivers/clk/mediatek/clk-mt8188-wpe.c | 1 - + drivers/clk/mediatek/clk-mt8192-cam.c | 1 - + drivers/clk/mediatek/clk-mt8192-img.c | 1 - + drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c | 1 - + drivers/clk/mediatek/clk-mt8192-ipe.c | 1 - + drivers/clk/mediatek/clk-mt8192-mdp.c | 1 - + drivers/clk/mediatek/clk-mt8192-mfg.c | 1 - + drivers/clk/mediatek/clk-mt8192-msdc.c | 1 - + drivers/clk/mediatek/clk-mt8192-scp_adsp.c | 1 - + drivers/clk/mediatek/clk-mt8192-vdec.c | 1 - + drivers/clk/mediatek/clk-mt8192-venc.c | 1 - + drivers/clk/mediatek/clk-mt8192.c | 1 - + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 1 - + drivers/clk/mediatek/clk-mt8195-topckgen.c | 1 - + drivers/clk/mediatek/clk-mt8365.c | 1 - + drivers/clk/mediatek/clk-mt8516-aud.c | 1 - + drivers/clk/meson/a1-peripherals.c | 1 - + drivers/clk/meson/a1-pll.c | 1 - + drivers/clk/meson/axg.c | 1 - + drivers/clk/meson/gxbb.c | 1 - + drivers/clk/qcom/cambistmclkcc-kaanapali.c | 1 - + drivers/clk/qcom/cambistmclkcc-sm8750.c | 1 - + drivers/clk/qcom/camcc-kaanapali.c | 1 - + drivers/clk/qcom/camcc-milos.c | 1 - + drivers/clk/qcom/camcc-qcs615.c | 1 - + drivers/clk/qcom/camcc-sa8775p.c | 1 - + drivers/clk/qcom/camcc-sc7180.c | 1 - + drivers/clk/qcom/camcc-sc7280.c | 1 - + drivers/clk/qcom/camcc-sc8180x.c | 1 - + drivers/clk/qcom/camcc-sc8280xp.c | 1 - + drivers/clk/qcom/camcc-sdm845.c | 1 - + drivers/clk/qcom/camcc-sm4450.c | 1 - + drivers/clk/qcom/camcc-sm6350.c | 1 - + drivers/clk/qcom/camcc-sm7150.c | 1 - + drivers/clk/qcom/camcc-sm8150.c | 1 - + drivers/clk/qcom/camcc-sm8250.c | 1 - + drivers/clk/qcom/camcc-sm8450.c | 1 - + drivers/clk/qcom/camcc-sm8550.c | 1 - + drivers/clk/qcom/camcc-sm8650.c | 1 - + drivers/clk/qcom/camcc-sm8750.c | 1 - + drivers/clk/qcom/camcc-x1e80100.c | 1 - + drivers/clk/qcom/camcc-x1p42100.c | 1 - + drivers/clk/qcom/dispcc-eliza.c | 1 - + drivers/clk/qcom/dispcc-glymur.c | 1 - + drivers/clk/qcom/dispcc-kaanapali.c | 1 - + drivers/clk/qcom/dispcc-milos.c | 1 - + drivers/clk/qcom/dispcc-qcm2290.c | 1 - + drivers/clk/qcom/dispcc-qcs615.c | 1 - + drivers/clk/qcom/dispcc-sc7180.c | 1 - + drivers/clk/qcom/dispcc-sc7280.c | 1 - + drivers/clk/qcom/dispcc-sc8280xp.c | 1 - + drivers/clk/qcom/dispcc-sdm845.c | 1 - + drivers/clk/qcom/dispcc-sm4450.c | 1 - + drivers/clk/qcom/dispcc-sm6115.c | 1 - + drivers/clk/qcom/dispcc-sm6125.c | 1 - + drivers/clk/qcom/dispcc-sm6350.c | 1 - + drivers/clk/qcom/dispcc-sm6375.c | 1 - + drivers/clk/qcom/dispcc-sm7150.c | 1 - + drivers/clk/qcom/dispcc-sm8250.c | 1 - + drivers/clk/qcom/dispcc-sm8450.c | 1 - + drivers/clk/qcom/dispcc-sm8550.c | 1 - + drivers/clk/qcom/dispcc-sm8750.c | 1 - + drivers/clk/qcom/dispcc-x1e80100.c | 1 - + drivers/clk/qcom/dispcc0-sa8775p.c | 1 - + drivers/clk/qcom/dispcc1-sa8775p.c | 1 - + drivers/clk/qcom/ecpricc-qdu1000.c | 1 - + drivers/clk/qcom/gcc-eliza.c | 1 - + drivers/clk/qcom/gcc-glymur.c | 1 - + drivers/clk/qcom/gcc-hawi.c | 1 - + drivers/clk/qcom/gcc-ipq5018.c | 1 - + drivers/clk/qcom/gcc-ipq5332.c | 1 - + drivers/clk/qcom/gcc-kaanapali.c | 1 - + drivers/clk/qcom/gcc-milos.c | 1 - + drivers/clk/qcom/gcc-nord.c | 1 - + drivers/clk/qcom/gcc-qcs615.c | 1 - + drivers/clk/qcom/gcc-qcs8300.c | 1 - + drivers/clk/qcom/gcc-sa8775p.c | 1 - + drivers/clk/qcom/gcc-sdx75.c | 1 - + drivers/clk/qcom/gcc-sm4450.c | 1 - + drivers/clk/qcom/gcc-sm7150.c | 1 - + drivers/clk/qcom/gcc-sm8650.c | 1 - + drivers/clk/qcom/gcc-sm8750.c | 1 - + drivers/clk/qcom/gcc-x1e80100.c | 1 - + drivers/clk/qcom/gpucc-glymur.c | 1 - + drivers/clk/qcom/gpucc-kaanapali.c | 1 - + drivers/clk/qcom/gpucc-milos.c | 1 - + drivers/clk/qcom/gpucc-msm8998.c | 1 - + drivers/clk/qcom/gpucc-qcm2290.c | 1 - + drivers/clk/qcom/gpucc-qcs615.c | 1 - + drivers/clk/qcom/gpucc-sa8775p.c | 1 - + drivers/clk/qcom/gpucc-sar2130p.c | 1 - + drivers/clk/qcom/gpucc-sc7180.c | 1 - + drivers/clk/qcom/gpucc-sc7280.c | 1 - + drivers/clk/qcom/gpucc-sc8280xp.c | 1 - + drivers/clk/qcom/gpucc-sdm660.c | 1 - + drivers/clk/qcom/gpucc-sdm845.c | 1 - + drivers/clk/qcom/gpucc-sm4450.c | 1 - + drivers/clk/qcom/gpucc-sm6115.c | 1 - + drivers/clk/qcom/gpucc-sm6125.c | 1 - + drivers/clk/qcom/gpucc-sm6350.c | 1 - + drivers/clk/qcom/gpucc-sm6375.c | 1 - + drivers/clk/qcom/gpucc-sm8150.c | 1 - + drivers/clk/qcom/gpucc-sm8250.c | 1 - + drivers/clk/qcom/gpucc-sm8350.c | 1 - + drivers/clk/qcom/gpucc-sm8450.c | 1 - + drivers/clk/qcom/gpucc-sm8550.c | 1 - + drivers/clk/qcom/gpucc-sm8650.c | 1 - + drivers/clk/qcom/gpucc-sm8750.c | 1 - + drivers/clk/qcom/gpucc-x1e80100.c | 1 - + drivers/clk/qcom/gpucc-x1p42100.c | 1 - + drivers/clk/qcom/gxclkctl-kaanapali.c | 1 - + drivers/clk/qcom/ipq-cmn-pll.c | 1 - + drivers/clk/qcom/lpasscc-sc8280xp.c | 1 - + drivers/clk/qcom/lpasscc-sm6115.c | 1 - + drivers/clk/qcom/mmcc-apq8084.c | 1 - + drivers/clk/qcom/mmcc-msm8960.c | 1 - + drivers/clk/qcom/mmcc-msm8974.c | 1 - + drivers/clk/qcom/mmcc-msm8994.c | 1 - + drivers/clk/qcom/mmcc-msm8996.c | 1 - + drivers/clk/qcom/mmcc-msm8998.c | 1 - + drivers/clk/qcom/mmcc-sdm660.c | 1 - + drivers/clk/qcom/negcc-nord.c | 1 - + drivers/clk/qcom/nwgcc-nord.c | 1 - + drivers/clk/qcom/segcc-nord.c | 1 - + drivers/clk/qcom/tcsrcc-eliza.c | 1 - + drivers/clk/qcom/tcsrcc-glymur.c | 1 - + drivers/clk/qcom/tcsrcc-hawi.c | 1 - + drivers/clk/qcom/tcsrcc-nord.c | 1 - + drivers/clk/qcom/tcsrcc-sm8650.c | 1 - + drivers/clk/qcom/tcsrcc-sm8750.c | 1 - + drivers/clk/qcom/tcsrcc-x1e80100.c | 1 - + drivers/clk/qcom/videocc-glymur.c | 1 - + drivers/clk/qcom/videocc-kaanapali.c | 1 - + drivers/clk/qcom/videocc-milos.c | 1 - + drivers/clk/qcom/videocc-qcs615.c | 1 - + drivers/clk/qcom/videocc-sa8775p.c | 1 - + drivers/clk/qcom/videocc-sm7150.c | 1 - + drivers/clk/qcom/videocc-sm8450.c | 1 - + drivers/clk/qcom/videocc-sm8550.c | 1 - + drivers/clk/qcom/videocc-sm8750.c | 1 - + drivers/clk/qcom/videocc-x1p42100.c | 1 - + drivers/clk/renesas/clk-vbattb.c | 1 - + drivers/clk/renesas/renesas-cpg-mssr.c | 1 - + drivers/clk/renesas/rzg2l-cpg.c | 1 - + drivers/clk/renesas/rzv2h-cpg.c | 1 - + drivers/clk/samsung/clk-exynos-audss.c | 1 - + drivers/clk/samsung/clk-exynos-clkout.c | 1 - + drivers/clk/samsung/clk-exynos2200.c | 1 - + drivers/clk/samsung/clk-exynos3250.c | 1 - + drivers/clk/samsung/clk-exynos4.c | 1 - + drivers/clk/samsung/clk-exynos4412-isp.c | 1 - + drivers/clk/samsung/clk-exynos5-subcmu.c | 1 - + drivers/clk/samsung/clk-exynos5250.c | 1 - + drivers/clk/samsung/clk-exynos5420.c | 1 - + drivers/clk/samsung/clk-exynos5433.c | 1 - + drivers/clk/samsung/clk-exynos7870.c | 1 - + drivers/clk/samsung/clk-exynos7885.c | 1 - + drivers/clk/samsung/clk-exynos850.c | 1 - + drivers/clk/samsung/clk-exynos8895.c | 1 - + drivers/clk/samsung/clk-exynos990.c | 1 - + drivers/clk/samsung/clk-exynosautov9.c | 1 - + drivers/clk/samsung/clk-exynosautov920.c | 1 - + drivers/clk/samsung/clk-fsd.c | 1 - + drivers/clk/samsung/clk-gs101.c | 1 - + drivers/clk/samsung/clk-s5pv210-audss.c | 1 - + drivers/clk/samsung/clk.c | 1 - + drivers/clk/sprd/ums512-clk.c | 1 - + drivers/clk/starfive/clk-starfive-jh7100-audio.c | 1 - + drivers/clk/starfive/clk-starfive-jh7100.c | 1 - + drivers/clk/tegra/clk-device.c | 1 - + drivers/clk/xilinx/xlnx_vcu.c | 1 - + drivers/counter/interrupt-cnt.c | 1 - + drivers/counter/stm32-lptimer-cnt.c | 1 - + drivers/counter/stm32-timer-cnt.c | 1 - + drivers/counter/ti-ecap-capture.c | 1 - + drivers/counter/ti-eqep.c | 1 - + drivers/cpufreq/amd_freq_sensitivity.c | 1 - + drivers/cpufreq/armada-37xx-cpufreq.c | 1 - + drivers/crypto/atmel-aes.c | 1 - + drivers/crypto/atmel-sha.c | 1 - + drivers/crypto/atmel-tdes.c | 1 - + drivers/crypto/hifn_795x.c | 1 - + drivers/crypto/img-hash.c | 1 - + .../crypto/intel/keembay/keembay-ocs-hcu-core.c | 1 - + drivers/crypto/qce/core.c | 1 - + drivers/crypto/starfive/jh7110-cryp.c | 1 - + drivers/crypto/talitos.c | 1 - + drivers/crypto/tegra/tegra-se-main.c | 1 - + drivers/crypto/ti/dthev2-common.c | 1 - + drivers/crypto/xilinx/zynqmp-aes-gcm.c | 1 - + drivers/devfreq/hisi_uncore_freq.c | 1 - + drivers/devfreq/imx8m-ddrc.c | 1 - + drivers/dma/amd/qdma/qdma.c | 1 - + drivers/dma/ep93xx_dma.c | 1 - + drivers/dma/qcom/hidma.c | 1 - + drivers/dma/sf-pdma/sf-pdma.c | 1 - + drivers/dma/xgene-dma.c | 1 - + drivers/dma/xilinx/xdma.c | 1 - + drivers/dpll/zl3073x/dpll.c | 1 - + drivers/edac/fsl_ddr_edac.c | 1 - + drivers/edac/mpc85xx_edac.c | 1 - + drivers/edac/pnd2_edac.c | 1 - + drivers/edac/sb_edac.c | 1 - + drivers/extcon/extcon-intel-cht-wc.c | 1 - + drivers/extcon/extcon-intel-mrfld.c | 1 - + drivers/extcon/extcon-max14526.c | 1 - + drivers/extcon/extcon-max3355.c | 1 - + drivers/extcon/extcon-qcom-spmi-misc.c | 1 - + drivers/extcon/extcon-usb-gpio.c | 1 - + drivers/firewire/core-device.c | 1 - + drivers/firewire/net.c | 1 - + drivers/firewire/sbp2.c | 1 - + drivers/firmware/google/cbmem.c | 2 +- + drivers/firmware/google/coreboot_table.c | 2 +- + drivers/firmware/google/framebuffer-coreboot.c | 2 +- + drivers/firmware/google/memconsole-coreboot.c | 2 +- + drivers/firmware/google/vpd.c | 2 +- + drivers/firmware/qemu_fw_cfg.c | 1 - + drivers/fpga/altera-freeze-bridge.c | 1 - + drivers/fpga/altera-pr-ip-core-plat.c | 1 - + drivers/fpga/ice40-spi.c | 1 - + drivers/fpga/intel-m10-bmc-sec-update.c | 1 - + drivers/fpga/lattice-sysconfig-spi.c | 1 - + drivers/fpga/xilinx-selectmap.c | 1 - + drivers/fpga/xilinx-spi.c | 1 - + drivers/fsi/fsi-master-i2cr.c | 1 - + drivers/fsi/fsi-scom.c | 1 - + drivers/fsi/i2cr-scom.c | 1 - + drivers/gpib/eastwood/fluke_gpib.c | 1 - + drivers/gpio/gpio-74xx-mmio.c | 1 - + drivers/gpio/gpio-adnp.c | 1 - + drivers/gpio/gpio-aggregator.c | 1 - + drivers/gpio/gpio-altera-a10sr.c | 1 - + drivers/gpio/gpio-altera.c | 1 - + drivers/gpio/gpio-ath79.c | 1 - + drivers/gpio/gpio-bcm-kona.c | 1 - + drivers/gpio/gpio-by-pinctrl.c | 1 - + drivers/gpio/gpio-cros-ec.c | 1 - + drivers/gpio/gpio-dwapb.c | 1 - + drivers/gpio/gpio-en7523.c | 1 - + drivers/gpio/gpio-ge.c | 1 - + drivers/gpio/gpio-graniterapids.c | 1 - + drivers/gpio/gpio-hisi.c | 1 - + drivers/gpio/gpio-idt3243x.c | 1 - + drivers/gpio/gpio-latch.c | 1 - + drivers/gpio/gpio-line-mux.c | 1 - + drivers/gpio/gpio-ltc4283.c | 1 - + drivers/gpio/gpio-max7360.c | 1 - + drivers/gpio/gpio-max77759.c | 1 - + drivers/gpio/gpio-mb86s7x.c | 1 - + drivers/gpio/gpio-mlxbf2.c | 1 - + drivers/gpio/gpio-mmio.c | 1 - + drivers/gpio/gpio-mockup.c | 1 - + drivers/gpio/gpio-mpc8xxx.c | 1 - + drivers/gpio/gpio-mpfs.c | 1 - + drivers/gpio/gpio-nomadik.c | 1 - + drivers/gpio/gpio-pca953x.c | 1 - + drivers/gpio/gpio-pcf857x.c | 1 - + drivers/gpio/gpio-qixis-fpga.c | 1 - + drivers/gpio/gpio-realtek-otto.c | 1 - + drivers/gpio/gpio-shared-proxy.c | 1 - + drivers/gpio/gpio-sim.c | 1 - + drivers/gpio/gpio-sl28cpld.c | 1 - + drivers/gpio/gpio-sloppy-logic-analyzer.c | 1 - + drivers/gpio/gpio-sprd.c | 1 - + drivers/gpio/gpio-tn48m.c | 1 - + drivers/gpio/gpio-virtuser.c | 1 - + drivers/gpio/gpio-wcd934x.c | 1 - + drivers/gpio/gpio-xgene-sb.c | 1 - + drivers/gpio/gpio-xra1403.c | 1 - + drivers/gpio/gpio-zevio.c | 1 - + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 1 - + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 1 - + drivers/gpu/drm/bridge/inno-hdmi.c | 1 - + drivers/gpu/drm/bridge/ssd2825.c | 1 - + drivers/gpu/drm/bridge/tc358762.c | 1 - + drivers/gpu/drm/bridge/tc358764.c | 1 - + drivers/gpu/drm/bridge/th1520-dw-hdmi.c | 1 - + drivers/gpu/drm/drm_panel_backlight_quirks.c | 1 - + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 1 - + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 1 - + drivers/gpu/drm/imagination/pvr_drv.c | 1 - + drivers/gpu/drm/imx/dc/dc-cf.c | 1 - + drivers/gpu/drm/imx/dc/dc-de.c | 1 - + drivers/gpu/drm/imx/dc/dc-drv.c | 1 - + drivers/gpu/drm/imx/dc/dc-ed.c | 1 - + drivers/gpu/drm/imx/dc/dc-fg.c | 1 - + drivers/gpu/drm/imx/dc/dc-fl.c | 1 - + drivers/gpu/drm/imx/dc/dc-fw.c | 1 - + drivers/gpu/drm/imx/dc/dc-lb.c | 1 - + drivers/gpu/drm/imx/dc/dc-pe.c | 1 - + drivers/gpu/drm/imx/dc/dc-tc.c | 1 - + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 1 - + drivers/gpu/drm/mediatek/mtk_cec.c | 1 - + drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 1 - + drivers/gpu/drm/meson/meson_dw_mipi_dsi.c | 1 - + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 1 - + drivers/gpu/drm/panel/panel-arm-versatile.c | 1 - + drivers/gpu/drm/panel/panel-auo-a030jtn01.c | 1 - + drivers/gpu/drm/panel/panel-boe-td4320.c | 1 - + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 1 - + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 1 - + drivers/gpu/drm/panel/panel-himax-hx83112b.c | 1 - + drivers/gpu/drm/panel/panel-himax-hx83121a.c | 1 - + drivers/gpu/drm/panel/panel-himax-hx8394.c | 1 - + drivers/gpu/drm/panel/panel-hydis-hv101hd1.c | 1 - + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 1 - + drivers/gpu/drm/panel/panel-ilitek-ili9806e-dsi.c | 1 - + drivers/gpu/drm/panel/panel-lg-ld070wx3.c | 1 - + drivers/gpu/drm/panel/panel-motorola-mot.c | 1 - + drivers/gpu/drm/panel/panel-novatek-nt35532.c | 1 - + drivers/gpu/drm/panel/panel-novatek-nt37801.c | 1 - + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 1 - + drivers/gpu/drm/panel/panel-raydium-rm67200.c | 1 - + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 1 - + drivers/gpu/drm/panel/panel-renesas-r61307.c | 1 - + drivers/gpu/drm/panel/panel-renesas-r69328.c | 1 - + drivers/gpu/drm/panel/panel-samsung-ltl106hl02.c | 1 - + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 1 - + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 1 - + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 1 - + .../drm/panel/panel-samsung-s6e88a0-ams427ap24.c | 1 - + .../gpu/drm/panel/panel-samsung-s6e8fc0-m1906f9.c | 1 - + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 1 - + drivers/gpu/drm/panel/panel-summit.c | 1 - + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 1 - + drivers/gpu/drm/panel/panel-visionox-rm692e5.c | 1 - + drivers/gpu/drm/renesas/rcar-du/rcar_dw_hdmi.c | 1 - + drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c | 1 - + drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c | 1 - + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 1 - + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 1 - + drivers/gpu/drm/sprd/sprd_drm.c | 1 - + drivers/gpu/drm/sti/sti_hda.c | 1 - + drivers/gpu/drm/stm/drv.c | 1 - + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 1 - + drivers/gpu/drm/sun4i/sun6i_drc.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 1 - + drivers/gpu/drm/tiny/sharp-memory.c | 1 - + drivers/gpu/drm/vc4/vc4_dpi.c | 1 - + drivers/gpu/drm/vc4/vc4_txp.c | 1 - + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 1 - + drivers/hid/intel-ish-hid/ishtp/bus.h | 2 +- + drivers/hsi/controllers/omap_ssi_port.c | 1 - + drivers/hte/hte-tegra194-test.c | 1 - + drivers/hwmon/Kconfig | 3 + + drivers/hwmon/adcxx.c | 1 - + drivers/hwmon/adt7410.c | 1 - + drivers/hwmon/adt7462.c | 1 - + drivers/hwmon/adt7475.c | 1 - + drivers/hwmon/as370-hwmon.c | 1 - + drivers/hwmon/aspeed-g6-pwm-tach.c | 5 +- + drivers/hwmon/asus_atk0110.c | 3 + + drivers/hwmon/axi-fan-control.c | 1 - + drivers/hwmon/cros_ec_hwmon.c | 1 - + drivers/hwmon/gxp-fan-ctrl.c | 1 - + drivers/hwmon/iio_hwmon.c | 1 - + drivers/hwmon/intel-m10-bmc-hwmon.c | 1 - + drivers/hwmon/jc42.c | 1 - + drivers/hwmon/lan966x-hwmon.c | 1 - + drivers/hwmon/lm70.c | 1 - + drivers/hwmon/lm75.c | 1 - + drivers/hwmon/ltc2947-core.c | 1 - + drivers/hwmon/ltc4282.c | 1 - + drivers/hwmon/ltc4283.c | 1 - + drivers/hwmon/ltq-cputemp.c | 1 - + drivers/hwmon/max197.c | 1 - + drivers/hwmon/mc13783-adc.c | 1 - + drivers/hwmon/mr75203.c | 1 - + drivers/hwmon/ntc_thermistor.c | 1 - + drivers/hwmon/occ/common.c | 34 +- + drivers/hwmon/occ/common.h | 1 + + drivers/hwmon/occ/p9_sbe.c | 1 - + drivers/hwmon/pmbus/adm1275.c | 20 +- + drivers/hwmon/pmbus/adp1050.c | 1 - + drivers/hwmon/pmbus/e50sn12051.c | 1 - + drivers/hwmon/pmbus/lt3074.c | 1 - + drivers/hwmon/pmbus/max17616.c | 1 - + drivers/hwmon/pmbus/max20830.c | 1 - + drivers/hwmon/pmbus/mp2975.c | 1 - + drivers/hwmon/pmbus/pmbus_core.c | 37 +- + drivers/hwmon/pmbus/stef48h28.c | 1 - + drivers/hwmon/pwm-fan.c | 1 - + drivers/hwmon/sch5627.c | 1 - + drivers/hwmon/sch5636.c | 1 - + drivers/hwmon/sl28cpld-hwmon.c | 1 - + drivers/hwmon/smpro-hwmon.c | 1 - + drivers/hwmon/sparx5-temp.c | 1 - + drivers/hwmon/tmp102.c | 1 - + drivers/hwmon/tmp108.c | 1 - + drivers/hwmon/w83627hf.c | 4 + + drivers/hwmon/w83793.c | 1 + + drivers/hwtracing/coresight/ultrasoc-smb.c | 1 - + drivers/i2c/busses/i2c-amd-asf-plat.c | 1 - + drivers/i2c/busses/i2c-gxp.c | 1 - + drivers/i2c/busses/i2c-hisi.c | 1 - + drivers/i2c/busses/i2c-rtl9300.c | 1 - + drivers/i2c/busses/i2c-rzv2m.c | 1 - + drivers/i2c/i2c-core.h | 1 + + drivers/iio/accel/adxl313_i2c.c | 1 - + drivers/iio/accel/adxl313_spi.c | 1 - + drivers/iio/accel/adxl355_core.c | 1 - + drivers/iio/accel/adxl355_i2c.c | 1 - + drivers/iio/accel/adxl355_spi.c | 1 - + drivers/iio/accel/adxl367.c | 1 - + drivers/iio/accel/adxl367_i2c.c | 1 - + drivers/iio/accel/adxl367_spi.c | 1 - + drivers/iio/accel/adxl372_i2c.c | 1 - + drivers/iio/accel/adxl372_spi.c | 1 - + drivers/iio/accel/adxl380_i2c.c | 1 - + drivers/iio/accel/adxl380_spi.c | 1 - + drivers/iio/accel/bma180.c | 1 - + drivers/iio/accel/bma220_core.c | 1 - + drivers/iio/accel/bma220_i2c.c | 1 - + drivers/iio/accel/bma220_spi.c | 1 - + drivers/iio/accel/bma400_i2c.c | 1 - + drivers/iio/accel/bma400_spi.c | 1 - + drivers/iio/accel/bmc150-accel-i2c.c | 1 - + drivers/iio/accel/bmc150-accel-spi.c | 1 - + drivers/iio/accel/bmi088-accel-i2c.c | 1 - + drivers/iio/accel/dmard06.c | 1 - + drivers/iio/accel/fxls8962af-core.c | 1 - + drivers/iio/accel/fxls8962af-i2c.c | 1 - + drivers/iio/accel/fxls8962af-spi.c | 1 - + drivers/iio/accel/hid-sensor-accel-3d.c | 1 - + drivers/iio/accel/kxcjk-1013.c | 1 - + drivers/iio/accel/kxsd9-i2c.c | 1 - + drivers/iio/accel/kxsd9-spi.c | 1 - + drivers/iio/accel/mma7660.c | 1 - + drivers/iio/accel/mma8452.c | 1 - + drivers/iio/accel/mma9551.c | 1 - + drivers/iio/accel/mma9553.c | 1 - + drivers/iio/accel/msa311.c | 1 - + drivers/iio/accel/mxc4005.c | 1 - + drivers/iio/accel/mxc6255.c | 1 - + drivers/iio/accel/st_accel_i2c.c | 1 - + drivers/iio/accel/st_accel_spi.c | 1 - + drivers/iio/accel/stk8ba50.c | 1 - + drivers/iio/adc/88pm886-gpadc.c | 1 - + drivers/iio/adc/ad4000.c | 1 - + drivers/iio/adc/ad4080.c | 1 - + drivers/iio/adc/ad4134.c | 1 - + drivers/iio/adc/ad4691.c | 1 - + drivers/iio/adc/ad4851.c | 1 - + drivers/iio/adc/ad7124.c | 1 - + drivers/iio/adc/ad7173.c | 1 - + drivers/iio/adc/ad7191.c | 1 - + drivers/iio/adc/ad7192.c | 1 - + drivers/iio/adc/ad7280a.c | 1 - + drivers/iio/adc/ad7292.c | 1 - + drivers/iio/adc/ad7298.c | 1 - + drivers/iio/adc/ad7405.c | 1 - + drivers/iio/adc/ad7606_par.c | 1 - + drivers/iio/adc/ad7625.c | 1 - + drivers/iio/adc/ad7779.c | 1 - + drivers/iio/adc/adi-axi-adc.c | 1 - + drivers/iio/adc/at91-sama5d2_adc.c | 1 - + drivers/iio/adc/axp20x_adc.c | 1 - + drivers/iio/adc/bcm_iproc_adc.c | 1 - + drivers/iio/adc/berlin2-adc.c | 1 - + drivers/iio/adc/cpcap-adc.c | 1 - + drivers/iio/adc/envelope-detector.c | 1 - + drivers/iio/adc/fsl-imx25-gcq.c | 1 - + drivers/iio/adc/hi8435.c | 1 - + drivers/iio/adc/hx711.c | 1 - + drivers/iio/adc/imx7d_adc.c | 1 - + drivers/iio/adc/imx8qxp-adc.c | 1 - + drivers/iio/adc/imx93_adc.c | 1 - + drivers/iio/adc/ingenic-adc.c | 1 - + drivers/iio/adc/intel_dc_ti_adc.c | 1 - + drivers/iio/adc/intel_mrfld_adc.c | 1 - + drivers/iio/adc/lpc18xx_adc.c | 1 - + drivers/iio/adc/lpc32xx_adc.c | 1 - + drivers/iio/adc/ltc2496.c | 1 - + drivers/iio/adc/ltc2497.c | 1 - + drivers/iio/adc/max1027.c | 1 - + drivers/iio/adc/max11100.c | 1 - + drivers/iio/adc/max1118.c | 1 - + drivers/iio/adc/max1363.c | 1 - + drivers/iio/adc/max14001.c | 1 - + drivers/iio/adc/max34408.c | 1 - + drivers/iio/adc/max77541-adc.c | 1 - + drivers/iio/adc/max9611.c | 1 - + drivers/iio/adc/mcp320x.c | 1 - + drivers/iio/adc/mcp3422.c | 1 - + drivers/iio/adc/mcp3911.c | 1 - + drivers/iio/adc/mp2629_adc.c | 1 - + drivers/iio/adc/mt6359-auxadc.c | 1 - + drivers/iio/adc/mt6360-adc.c | 1 - + drivers/iio/adc/mt6370-adc.c | 1 - + drivers/iio/adc/mt6577_auxadc.c | 1 - + drivers/iio/adc/nau7802.c | 1 - + drivers/iio/adc/nct7201.c | 1 - + drivers/iio/adc/npcm_adc.c | 1 - + drivers/iio/adc/nxp-sar-adc.c | 1 - + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 1 - + drivers/iio/adc/qcom-spmi-adc5-gen3.c | 1 - + drivers/iio/adc/qcom-spmi-adc5.c | 1 - + drivers/iio/adc/qcom-spmi-rradc.c | 1 - + drivers/iio/adc/qcom-spmi-vadc.c | 1 - + drivers/iio/adc/rohm-bd79112.c | 1 - + drivers/iio/adc/rohm-bd79124.c | 1 - + drivers/iio/adc/rtq6056.c | 1 - + drivers/iio/adc/rzg2l_adc.c | 1 - + drivers/iio/adc/rzn1-adc.c | 1 - + drivers/iio/adc/rzt2h_adc.c | 1 - + drivers/iio/adc/sd_adc_modulator.c | 1 - + drivers/iio/adc/sophgo-cv1800b-adc.c | 1 - + drivers/iio/adc/spear_adc.c | 1 - + drivers/iio/adc/stm32-adc.c | 1 - + drivers/iio/adc/sun20i-gpadc-iio.c | 1 - + drivers/iio/adc/ti-adc081c.c | 1 - + drivers/iio/adc/ti-adc0832.c | 1 - + drivers/iio/adc/ti-adc084s021.c | 1 - + drivers/iio/adc/ti-adc108s102.c | 1 - + drivers/iio/adc/ti-adc128s052.c | 1 - + drivers/iio/adc/ti-adc161s626.c | 1 - + drivers/iio/adc/ti-ads1018.c | 1 - + drivers/iio/adc/ti-ads124s08.c | 1 - + drivers/iio/adc/ti-ads131m02.c | 1 - + drivers/iio/adc/ti-ads8688.c | 1 - + drivers/iio/adc/ti-tlc4541.c | 1 - + drivers/iio/adc/twl4030-madc.c | 1 - + drivers/iio/adc/twl6030-gpadc.c | 1 - + drivers/iio/adc/vf610_adc.c | 1 - + drivers/iio/adc/xilinx-ams.c | 1 - + drivers/iio/adc/xilinx-xadc-core.c | 1 - + drivers/iio/addac/ad74413r.c | 1 - + drivers/iio/afe/iio-rescale.c | 1 - + drivers/iio/amplifiers/ad8366.c | 1 - + drivers/iio/amplifiers/adl8113.c | 1 - + drivers/iio/amplifiers/hmc425a.c | 1 - + drivers/iio/cdc/ad7150.c | 1 - + drivers/iio/chemical/ams-iaq-core.c | 1 - + drivers/iio/chemical/atlas-ezo-sensor.c | 1 - + drivers/iio/chemical/atlas-sensor.c | 1 - + drivers/iio/chemical/bme680_spi.c | 1 - + drivers/iio/chemical/mhz19b.c | 1 - + drivers/iio/chemical/pms7003.c | 1 - + drivers/iio/chemical/scd30_i2c.c | 1 - + drivers/iio/chemical/scd30_serial.c | 1 - + drivers/iio/chemical/sgp30.c | 1 - + drivers/iio/chemical/sps30_i2c.c | 1 - + drivers/iio/chemical/sps30_serial.c | 1 - + drivers/iio/chemical/sunrise_co2.c | 1 - + drivers/iio/chemical/vz89x.c | 1 - + .../iio/common/cros_ec_sensors/cros_ec_lid_angle.c | 1 - + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 1 - + drivers/iio/common/ssp_sensors/ssp_dev.c | 1 - + drivers/iio/dac/ad3530r.c | 1 - + drivers/iio/dac/ad3552r-hs.c | 1 - + drivers/iio/dac/ad5446-i2c.c | 1 - + drivers/iio/dac/ad5446-spi.c | 1 - + drivers/iio/dac/ad5592r.c | 1 - + drivers/iio/dac/ad5593r.c | 1 - + drivers/iio/dac/ad5686-spi.c | 1 - + drivers/iio/dac/ad5696-i2c.c | 1 - + drivers/iio/dac/ad5706r.c | 1 - + drivers/iio/dac/ad5758.c | 1 - + drivers/iio/dac/ad7293.c | 1 - + drivers/iio/dac/ad7303.c | 1 - + drivers/iio/dac/ad8460.c | 1 - + drivers/iio/dac/ad9739a.c | 1 - + drivers/iio/dac/adi-axi-dac.c | 1 - + drivers/iio/dac/dpot-dac.c | 1 - + drivers/iio/dac/lpc18xx_dac.c | 1 - + drivers/iio/dac/ltc2664.c | 1 - + drivers/iio/dac/ltc2688.c | 1 - + drivers/iio/dac/max22007.c | 1 - + drivers/iio/dac/max5522.c | 1 - + drivers/iio/dac/mcp4725.c | 1 - + drivers/iio/dac/mcp4728.c | 1 - + drivers/iio/dac/mcp47feb02.c | 1 - + drivers/iio/dac/mcp4821.c | 1 - + drivers/iio/dac/stm32-dac-core.c | 1 - + drivers/iio/dac/stm32-dac.c | 1 - + drivers/iio/dac/ti-dac082s085.c | 1 - + drivers/iio/dac/ti-dac5571.c | 1 - + drivers/iio/dac/vf610_dac.c | 1 - + drivers/iio/filter/admv8818.c | 1 - + drivers/iio/frequency/adf4350.c | 1 - + drivers/iio/frequency/admfm2000.c | 1 - + drivers/iio/frequency/admv1013.c | 1 - + drivers/iio/frequency/admv1014.c | 1 - + drivers/iio/frequency/adrf6780.c | 1 - + drivers/iio/gyro/bmg160_i2c.c | 1 - + drivers/iio/gyro/fxas21002c_i2c.c | 1 - + drivers/iio/gyro/fxas21002c_spi.c | 1 - + drivers/iio/gyro/hid-sensor-gyro-3d.c | 1 - + drivers/iio/gyro/st_gyro_i2c.c | 1 - + drivers/iio/gyro/st_gyro_spi.c | 1 - + drivers/iio/health/max30102.c | 1 - + drivers/iio/humidity/dht11.c | 1 - + drivers/iio/humidity/ens210.c | 1 - + drivers/iio/humidity/hdc100x.c | 1 - + drivers/iio/humidity/hid-sensor-humidity.c | 1 - + drivers/iio/humidity/hts221_i2c.c | 1 - + drivers/iio/humidity/htu21.c | 1 - + drivers/iio/humidity/si7020.c | 1 - + drivers/iio/imu/adis16475.c | 1 - + drivers/iio/imu/adis16480.c | 1 - + drivers/iio/imu/adis16550.c | 1 - + drivers/iio/imu/bmi160/bmi160_i2c.c | 1 - + drivers/iio/imu/bmi160/bmi160_spi.c | 1 - + drivers/iio/imu/bmi270/bmi270_i2c.c | 1 - + drivers/iio/imu/bmi270/bmi270_spi.c | 1 - + drivers/iio/imu/bmi323/bmi323_i2c.c | 1 - + drivers/iio/imu/bmi323/bmi323_spi.c | 1 - + drivers/iio/imu/bno055/bno055_i2c.c | 1 - + drivers/iio/imu/bno055/bno055_ser_core.c | 1 - + drivers/iio/imu/fxos8700_i2c.c | 1 - + drivers/iio/imu/fxos8700_spi.c | 1 - + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 1 - + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 1 - + drivers/iio/imu/inv_icm45600/inv_icm45600_i2c.c | 1 - + drivers/iio/imu/inv_icm45600/inv_icm45600_i3c.c | 1 - + drivers/iio/imu/inv_icm45600/inv_icm45600_spi.c | 1 - + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 1 - + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 1 - + drivers/iio/imu/kmx61.c | 1 - + drivers/iio/imu/smi330/smi330_i2c.c | 1 - + drivers/iio/imu/smi330/smi330_spi.c | 1 - + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 1 - + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 1 - + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 1 - + drivers/iio/light/al3000a.c | 1 - + drivers/iio/light/al3010.c | 1 - + drivers/iio/light/al3320a.c | 1 - + drivers/iio/light/apds9999.c | 1 - + drivers/iio/light/bh1780.c | 1 - + drivers/iio/light/cm32181.c | 1 - + drivers/iio/light/cm3232.c | 1 - + drivers/iio/light/cm3605.c | 1 - + drivers/iio/light/cros_ec_light_prox.c | 1 - + drivers/iio/light/gp2ap020a00f.c | 1 - + drivers/iio/light/hid-sensor-als.c | 1 - + drivers/iio/light/hid-sensor-prox.c | 1 - + drivers/iio/light/isl29018.c | 1 - + drivers/iio/light/jsa1212.c | 1 - + drivers/iio/light/ltr501.c | 1 - + drivers/iio/light/ltrf216a.c | 1 - + drivers/iio/light/max44000.c | 1 - + drivers/iio/light/opt3001.c | 1 - + drivers/iio/light/rpr0521.c | 1 - + drivers/iio/light/si1133.c | 1 - + drivers/iio/light/st_uvis25_i2c.c | 1 - + drivers/iio/light/st_uvis25_spi.c | 1 - + drivers/iio/light/stk3310.c | 1 - + drivers/iio/light/tsl2563.c | 1 - + drivers/iio/light/us5182d.c | 1 - + drivers/iio/light/veml3328.c | 1 - + drivers/iio/light/veml6046x00.c | 1 - + drivers/iio/light/vl6180.c | 1 - + drivers/iio/magnetometer/ak8974.c | 1 - + drivers/iio/magnetometer/ak8975.c | 1 - + drivers/iio/magnetometer/bmc150_magn_i2c.c | 1 - + drivers/iio/magnetometer/bmc150_magn_spi.c | 1 - + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 1 - + drivers/iio/magnetometer/mmc35240.c | 1 - + drivers/iio/magnetometer/mmc5633.c | 1 - + drivers/iio/magnetometer/mmc5983.c | 1 - + drivers/iio/magnetometer/si7210.c | 1 - + drivers/iio/magnetometer/st_magn_i2c.c | 1 - + drivers/iio/magnetometer/st_magn_spi.c | 1 - + drivers/iio/magnetometer/tlv493d.c | 1 - + drivers/iio/magnetometer/yamaha-yas530.c | 1 - + drivers/iio/multiplexer/iio-mux.c | 1 - + drivers/iio/orientation/hid-sensor-incl-3d.c | 1 - + drivers/iio/orientation/hid-sensor-rotation.c | 1 - + .../iio/position/hid-sensor-custom-intel-hinge.c | 1 - + drivers/iio/potentiometer/ad5272.c | 1 - + drivers/iio/potentiometer/ds1803.c | 1 - + drivers/iio/potentiometer/max5432.c | 1 - + drivers/iio/potentiometer/max5481.c | 1 - + drivers/iio/potentiometer/max5487.c | 1 - + drivers/iio/potentiometer/mcp4018.c | 1 - + drivers/iio/potentiometer/mcp41010.c | 1 - + drivers/iio/potentiometer/mcp4131.c | 1 - + drivers/iio/potentiometer/mcp4531.c | 1 - + drivers/iio/potentiostat/lmp91000.c | 1 - + drivers/iio/pressure/abp2030pa_i2c.c | 1 - + drivers/iio/pressure/abp2030pa_spi.c | 1 - + drivers/iio/pressure/adp810.c | 1 - + drivers/iio/pressure/cros_ec_baro.c | 1 - + drivers/iio/pressure/hid-sensor-press.c | 1 - + drivers/iio/pressure/hp206c.c | 1 - + drivers/iio/pressure/hsc030pa.c | 1 - + drivers/iio/pressure/hsc030pa_i2c.c | 1 - + drivers/iio/pressure/hsc030pa_spi.c | 1 - + drivers/iio/pressure/icp10100.c | 1 - + drivers/iio/pressure/mprls0025pa.c | 1 - + drivers/iio/pressure/mprls0025pa_i2c.c | 1 - + drivers/iio/pressure/mprls0025pa_spi.c | 1 - + drivers/iio/pressure/ms5611_i2c.c | 1 - + drivers/iio/pressure/ms5611_spi.c | 1 - + drivers/iio/pressure/ms5637.c | 1 - + drivers/iio/pressure/sdp500.c | 1 - + drivers/iio/pressure/st_pressure_i2c.c | 1 - + drivers/iio/pressure/st_pressure_spi.c | 1 - + drivers/iio/pressure/zpa2326_i2c.c | 1 - + drivers/iio/pressure/zpa2326_spi.c | 1 - + drivers/iio/proximity/as3935.c | 1 - + drivers/iio/proximity/cros_ec_mkbp_proximity.c | 1 - + drivers/iio/proximity/d3323aa.c | 1 - + drivers/iio/proximity/hx9023s.c | 1 - + drivers/iio/proximity/isl29501.c | 1 - + drivers/iio/proximity/mb1232.c | 1 - + drivers/iio/proximity/ping.c | 1 - + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 1 - + drivers/iio/proximity/srf04.c | 1 - + drivers/iio/proximity/sx9310.c | 1 - + drivers/iio/proximity/sx9324.c | 1 - + drivers/iio/proximity/sx9360.c | 1 - + drivers/iio/proximity/vl53l1x-i2c.c | 1 - + drivers/iio/resolver/ad2s1200.c | 1 - + drivers/iio/temperature/hid-sensor-temperature.c | 1 - + drivers/iio/temperature/ltc2983.c | 1 - + drivers/iio/temperature/max31856.c | 1 - + drivers/iio/temperature/max31865.c | 1 - + drivers/iio/temperature/maxim_thermocouple.c | 1 - + drivers/iio/temperature/mcp9600.c | 1 - + drivers/iio/temperature/mlx90614.c | 1 - + drivers/iio/temperature/mlx90632.c | 1 - + drivers/iio/temperature/mlx90635.c | 1 - + drivers/iio/temperature/tmp006.c | 1 - + drivers/iio/temperature/tmp007.c | 1 - + drivers/iio/temperature/tsys01.c | 1 - + drivers/iio/trigger/stm32-lptimer-trigger.c | 1 - + drivers/iio/trigger/stm32-timer-trigger.c | 1 - + drivers/input/keyboard/adp5585-keys.c | 1 - + drivers/input/keyboard/adp5588-keys.c | 1 - + drivers/input/keyboard/charlieplex_keypad.c | 1 - + drivers/input/keyboard/clps711x-keypad.c | 1 - + drivers/input/keyboard/ep93xx_keypad.c | 1 - + drivers/input/keyboard/max7360-keypad.c | 1 - + drivers/input/keyboard/pinephone-keyboard.c | 1 - + drivers/input/misc/ariel-pwrbutton.c | 1 - + drivers/input/misc/da9063_onkey.c | 1 - + drivers/input/misc/gpio_decoder.c | 1 - + drivers/input/misc/iqs269a.c | 1 - + drivers/input/misc/iqs626a.c | 1 - + drivers/input/misc/iqs7222.c | 1 - + drivers/input/misc/mma8450.c | 1 - + drivers/input/misc/rt5120-pwrkey.c | 1 - + drivers/input/misc/sc27xx-vibra.c | 1 - + drivers/input/misc/twl4030-pwrbutton.c | 1 - + drivers/input/serio/sun4i-ps2.c | 1 - + drivers/input/touchscreen/cyttsp5.c | 1 - + drivers/input/touchscreen/himax_hx852x.c | 1 - + drivers/input/touchscreen/hynitron_cstxxx.c | 1 - + drivers/input/touchscreen/ili210x.c | 1 - + drivers/input/touchscreen/iqs5xx.c | 1 - + drivers/input/touchscreen/msg2638.c | 1 - + drivers/input/touchscreen/resistive-adc-touch.c | 1 - + drivers/input/touchscreen/tsc2007_core.c | 1 - + drivers/interconnect/mediatek/mt8183.c | 1 - + drivers/interconnect/mediatek/mt8195.c | 1 - + drivers/interconnect/mediatek/mt8196.c | 1 - + drivers/interconnect/qcom/msm8909.c | 1 - + drivers/interconnect/qcom/msm8937.c | 1 - + drivers/interconnect/qcom/msm8939.c | 1 - + drivers/interconnect/qcom/msm8953.c | 1 - + drivers/interconnect/qcom/msm8976.c | 1 - + drivers/interconnect/qcom/msm8996.c | 1 - + drivers/interconnect/qcom/qcm2290.c | 1 - + drivers/interconnect/qcom/qcs404.c | 1 - + drivers/interconnect/qcom/qdu1000.c | 1 - + drivers/interconnect/qcom/sa8775p.c | 1 - + drivers/interconnect/qcom/sc7180.c | 1 - + drivers/interconnect/qcom/sc7280.c | 1 - + drivers/interconnect/qcom/sc8180x.c | 1 - + drivers/interconnect/qcom/sc8280xp.c | 1 - + drivers/interconnect/qcom/sdm660.c | 1 - + drivers/interconnect/qcom/sdm670.c | 1 - + drivers/interconnect/qcom/sdm845.c | 1 - + drivers/interconnect/qcom/sdx55.c | 1 - + drivers/interconnect/qcom/sdx65.c | 1 - + drivers/interconnect/qcom/shikra.c | 1 - + drivers/interconnect/qcom/sm6115.c | 1 - + drivers/interconnect/qcom/sm6350.c | 1 - + drivers/interconnect/qcom/sm7150.c | 1 - + drivers/interconnect/qcom/sm8150.c | 1 - + drivers/interconnect/qcom/sm8250.c | 1 - + drivers/interconnect/qcom/sm8350.c | 1 - + drivers/interconnect/qcom/sm8450.c | 1 - + drivers/interconnect/qcom/sm8550.c | 1 - + drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c | 1 - + drivers/irqchip/irq-imx-intmux.c | 1 - + drivers/irqchip/irq-lan966x-oic.c | 1 - + drivers/irqchip/irq-sl28cpld.c | 1 - + drivers/irqchip/irq-stm32mp-exti.c | 1 - + drivers/leds/flash/leds-rt8515.c | 1 - + drivers/leds/leds-aw200xx.c | 1 - + drivers/leds/leds-bd2606mvv.c | 1 - + drivers/leds/leds-cht-wcove.c | 1 - + drivers/leds/leds-cr0014114.c | 1 - + drivers/leds/leds-cros_ec.c | 1 - + drivers/leds/leds-el15203000.c | 1 - + drivers/leds/leds-gpio.c | 1 - + drivers/leds/leds-is31fl319x.c | 1 - + drivers/leds/leds-lm36274.c | 1 - + drivers/leds/leds-lm3692x.c | 1 - + drivers/leds/leds-lm3697.c | 1 - + drivers/leds/leds-lp50xx.c | 1 - + drivers/leds/leds-lt3593.c | 1 - + drivers/leds/leds-max5970.c | 1 - + drivers/leds/leds-mlxcpld.c | 1 - + drivers/leds/leds-nic78bx.c | 1 - + drivers/leds/leds-pca995x.c | 1 - + drivers/leds/leds-regulator.c | 1 - + drivers/leds/leds-spi-byte.c | 1 - + drivers/leds/leds-sun50i-a100.c | 1 - + drivers/leds/rgb/leds-group-multicolor.c | 1 - + drivers/leds/rgb/leds-mt6370-rgb.c | 1 - + drivers/leds/rgb/leds-pwm-multicolor.c | 1 - + drivers/mailbox/mailbox-mpfs.c | 1 - + drivers/mailbox/platform_mhu.c | 1 - + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 1 - + drivers/media/firewire/firedtv-fw.c | 1 - + drivers/media/i2c/adv7180.c | 1 - + drivers/media/i2c/cvs/core.c | 1 - + drivers/media/i2c/gc0308.c | 1 - + drivers/media/i2c/gc05a2.c | 1 - + drivers/media/i2c/gc08a3.c | 1 - + drivers/media/i2c/lm3560.c | 1 - + drivers/media/i2c/mt9m114.c | 1 - + drivers/media/i2c/mt9p031.c | 1 - + drivers/media/i2c/mt9v032.c | 1 - + drivers/media/i2c/ov2680.c | 1 - + drivers/media/i2c/ov5640.c | 1 - + drivers/media/i2c/ov5670.c | 1 - + drivers/media/i2c/ov5675.c | 1 - + drivers/media/i2c/ov64a40.c | 1 - + drivers/media/i2c/ov7251.c | 1 - + drivers/media/i2c/ov7670.c | 1 - + drivers/media/i2c/ov8865.c | 1 - + drivers/media/i2c/t4ka3.c | 1 - + drivers/media/i2c/tvp514x.c | 1 - + drivers/media/i2c/video-i2c.c | 1 - + .../media/platform/arm/mali-c55/mali-c55-core.c | 1 - + drivers/media/platform/chips-media/coda/imx-vdoa.c | 1 - + .../media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 1 - + .../media/platform/microchip/microchip-csi2dc.c | 1 - + drivers/media/platform/qcom/venus/vdec.c | 1 - + drivers/media/platform/qcom/venus/venc.c | 1 - + drivers/media/platform/renesas/rcar-fcp.c | 1 - + .../media/platform/renesas/rzg2l-cru/rzg2l-core.c | 1 - + drivers/media/platform/st/sti/hva/hva-v4l2.c | 1 - + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 1 - + .../platform/sunxi/sun8i-rotate/sun8i_rotate.c | 1 - + drivers/media/platform/ti/vpe/vip.c | 1 + + drivers/media/rc/ir-spi.c | 1 - + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/memory/stm32_omm.c | 1 - + drivers/memory/tegra/tegra186-emc.c | 1 - + drivers/memory/tegra/tegra186.c | 1 - + drivers/memory/tegra/tegra210-emc-core.c | 1 - + drivers/mfd/adp5585.c | 1 - + drivers/mfd/atmel-hlcdc.c | 1 - + drivers/mfd/atmel-smc.c | 1 - + drivers/mfd/cros_ec_dev.c | 1 - + drivers/mfd/cs42l43-i2c.c | 1 - + drivers/mfd/cs42l43-sdw.c | 1 - + drivers/mfd/hi655x-pmic.c | 1 - + drivers/mfd/intel-lpss-acpi.c | 1 - + drivers/mfd/intel-lpss-pci.c | 1 - + drivers/mfd/intel_soc_pmic_bxtwc.c | 1 - + drivers/mfd/intel_soc_pmic_crc.c | 1 - + drivers/mfd/kempld-core.c | 1 - + drivers/mfd/lochnagar-i2c.c | 1 - + drivers/mfd/lp873x.c | 1 - + drivers/mfd/lp87565.c | 1 - + drivers/mfd/max14577.c | 1 - + drivers/mfd/max7360.c | 1 - + drivers/mfd/max77759.c | 1 - + drivers/mfd/max77843.c | 1 - + drivers/mfd/mc13xxx-spi.c | 1 - + drivers/mfd/motorola-cpcap.c | 1 - + drivers/mfd/ocelot-spi.c | 1 - + drivers/mfd/rt5033.c | 1 - + drivers/mfd/rt5120.c | 1 - + drivers/mfd/rz-mtu3.c | 1 - + drivers/mfd/sec-acpm.c | 1 - + drivers/mfd/sec-i2c.c | 1 - + drivers/mfd/simple-mfd-i2c.c | 1 - + drivers/mfd/tps6594-i2c.c | 1 - + drivers/mfd/tps6594-spi.c | 1 - + drivers/mfd/upboard-fpga.c | 1 - + drivers/mfd/wm831x-core.c | 1 - + drivers/misc/eeprom/at24.c | 1 - + drivers/misc/eeprom/ee1004.c | 1 - + drivers/misc/eeprom/eeprom_93xx46.c | 1 - + drivers/misc/eeprom/idt_89hpesx.c | 1 - + drivers/misc/hisi_hikey_usb.c | 1 - + drivers/misc/pvpanic/pvpanic-mmio.c | 1 - + drivers/misc/pvpanic/pvpanic.c | 1 - + drivers/misc/smpro-errmon.c | 1 - + drivers/misc/smpro-misc.c | 1 - + drivers/mmc/host/litex_mmc.c | 1 - + drivers/mmc/host/owl-mmc.c | 1 - + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 - + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 1 - + drivers/mmc/host/sdhci-npcm.c | 1 - + drivers/mmc/host/sdhci-of-ma35d1.c | 1 - + drivers/mmc/host/sh_mmcif.c | 1 - + drivers/mmc/host/sunxi-mmc.c | 1 - + drivers/mtd/nand/raw/brcmnand/brcmstb_nand.c | 1 - + drivers/mux/adgs1408.c | 1 - + drivers/mux/gpio.c | 1 - + drivers/net/can/spi/hi311x.c | 1 - + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 1 - + drivers/net/dsa/microchip/ksz8863_smi.c | 1 - + drivers/net/dsa/mt7530-mmio.c | 1 - + drivers/net/dsa/ocelot/seville_vsc9953.c | 1 - + drivers/net/ethernet/airoha/airoha_eth.c | 129 ++- + drivers/net/ethernet/airoha/airoha_eth.h | 9 + + drivers/net/ethernet/airoha/airoha_ppe.c | 39 +- + drivers/net/ethernet/airoha/airoha_regs.h | 9 +- + drivers/net/ethernet/calxeda/xgmac.c | 1 - + .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 18 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 8 - + drivers/net/ethernet/ezchip/nps_enet.c | 1 - + drivers/net/ethernet/faraday/ftmac100.c | 1 - + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 1 - + drivers/net/ethernet/freescale/enetc/enetc.c | 7 + + drivers/net/ethernet/freescale/enetc/enetc_ierb.c | 1 - + drivers/net/ethernet/freescale/fman/fman.c | 4 +- + drivers/net/ethernet/freescale/gianfar.c | 16 +- + drivers/net/ethernet/ibm/emac/tah.c | 1 - + drivers/net/ethernet/ibm/emac/zmii.c | 1 - + drivers/net/ethernet/marvell/mvmdio.c | 1 - + .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 47 +- + .../ethernet/mellanox/mlx5/core/steering/hws/bwc.c | 1 + + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c | 1 - + drivers/net/ethernet/mellanox/mlxsw/i2c.c | 1 - + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 1 - + drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 11 +- + drivers/net/ethernet/microchip/lan743x_main.c | 2 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 4 +- + .../net/ethernet/stmicro/stmmac/dwmac-nuvoton.c | 1 - + drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c | 1 - + .../net/ethernet/stmicro/stmmac/dwmac-spacemit.c | 1 - + .../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 1 - + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 1 + + drivers/net/ethernet/wangxun/libwx/wx_type.h | 1 + + drivers/net/ethernet/xscale/ptp_ixp46x.c | 1 - + drivers/net/ieee802154/mrf24j40.c | 1 - + drivers/net/ipa/ipa_smp2p.c | 30 +- + drivers/net/mdio/mdio-i2c.c | 59 +- + drivers/net/mdio/mdio-realtek-rtl9300.c | 1 - + drivers/net/mhi_net.c | 1 - + drivers/net/netdevsim/ethtool.c | 6 + + drivers/net/netdevsim/netdev.c | 2 + + drivers/net/netdevsim/netdevsim.h | 2 + + drivers/net/phy/sfp.c | 15 +- + drivers/net/pse-pd/pse_core.c | 6 +- + drivers/net/usb/gl620a.c | 6 +- + drivers/net/virtio_net.c | 3 + + drivers/net/wan/fsl_qmc_hdlc.c | 1 - + drivers/net/wireless/ath/ath9k/ahb.c | 1 - + .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 1 - + drivers/net/wireless/intersil/p54/p54spi.c | 1 - + drivers/net/wireless/ti/wl1251/sdio.c | 1 - + drivers/net/wireless/ti/wl12xx/main.c | 1 - + drivers/net/wireless/ti/wl18xx/main.c | 1 - + drivers/net/wwan/iosm/iosm_ipc_mux_codec.c | 40 +- + drivers/net/wwan/mhi_wwan_ctrl.c | 1 - + drivers/net/wwan/mhi_wwan_mbim.c | 1 - + drivers/net/wwan/qcom_bam_dmux.c | 1 - + drivers/net/wwan/rpmsg_wwan_ctrl.c | 1 - + drivers/nfc/microread/mei.c | 1 - + drivers/nfc/pn544/mei.c | 1 - + drivers/nfc/s3fwrn5/uart.c | 1 - + drivers/nvmem/an8855-efuse.c | 1 - + drivers/nvmem/apple-efuses.c | 1 - + drivers/nvmem/brcm_nvram.c | 1 - + drivers/nvmem/layerscape-sfp.c | 1 - + drivers/nvmem/lpc18xx_eeprom.c | 1 - + drivers/nvmem/max77759-nvmem.c | 1 - + drivers/nvmem/mtk-efuse.c | 1 - + drivers/nvmem/nintendo-otp.c | 1 - + drivers/nvmem/qfprom.c | 1 - + drivers/nvmem/qoriq-efuse.c | 1 - + drivers/nvmem/rcar-efuse.c | 1 - + drivers/nvmem/sec-qfprom.c | 1 - + drivers/nvmem/sunplus-ocotp.c | 1 - + drivers/nvmem/u-boot-env.c | 1 - + drivers/nvmem/uniphier-efuse.c | 1 - + drivers/of/device.c | 1 - + drivers/pci/controller/cadence/pcie-sg2042.c | 1 - + drivers/pci/controller/dwc/pci-exynos.c | 1 - + drivers/pci/controller/dwc/pci-meson.c | 1 - + drivers/pci/controller/dwc/pcie-intel-gw.c | 1 - + drivers/pci/controller/dwc/pcie-keembay.c | 1 - + drivers/pci/controller/dwc/pcie-spacemit-k1.c | 1 - + drivers/pci/controller/dwc/pcie-stm32.c | 1 - + drivers/pci/pwrctrl/generic.c | 1 - + drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c | 1 - + drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 1 - + drivers/perf/arm-ccn.c | 1 - + drivers/perf/fujitsu_uncore_pmu.c | 1 - + drivers/perf/hisilicon/hisi_uncore_mn_pmu.c | 1 - + drivers/perf/hisilicon/hisi_uncore_noc_pmu.c | 1 - + drivers/perf/hisilicon/hisi_uncore_uc_pmu.c | 1 - + drivers/perf/riscv_pmu_legacy.c | 1 - + drivers/perf/riscv_pmu_sbi.c | 1 - + drivers/perf/starfive_starlink_pmu.c | 1 - + drivers/phy/allwinner/phy-sun50i-usb3.c | 1 - + drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c | 1 - + drivers/phy/amlogic/phy-meson-axg-pcie.c | 1 - + drivers/phy/amlogic/phy-meson-gxl-usb2.c | 1 - + drivers/phy/amlogic/phy-meson8b-usb2.c | 1 - + drivers/phy/cadence/cdns-dphy-rx.c | 1 - + drivers/phy/hisilicon/phy-hi3670-pcie.c | 1 - + drivers/phy/hisilicon/phy-hi6220-usb.c | 1 - + drivers/phy/intel/phy-intel-keembay-usb.c | 1 - + drivers/phy/marvell/phy-mmp3-hsic.c | 1 - + drivers/phy/marvell/phy-mmp3-usb.c | 1 - + drivers/phy/marvell/phy-mvebu-sata.c | 1 - + drivers/phy/mediatek/phy-mtk-ufs.c | 1 - + drivers/phy/phy-eyeq5-eth.c | 1 - + drivers/phy/phy-snps-eusb2.c | 1 - + drivers/phy/qualcomm/phy-ath79-usb.c | 1 - + drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c | 1 - + drivers/phy/rockchip/phy-rockchip-usbdp.c | 1 - + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 1 - + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 1 - + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 1 - + drivers/pinctrl/bcm/pinctrl-bcm4908.c | 1 - + drivers/pinctrl/bcm/pinctrl-bcm63xx.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx-scmi.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx23.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx25.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx27.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx28.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx35.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx50.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx51.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx53.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6dl.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6q.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6sl.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6sll.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6sx.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx7ulp.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx8dxl.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx8mq.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx8qxp.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx8ulp.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx91.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx93.c | 1 - + drivers/pinctrl/freescale/pinctrl-vf610.c | 1 - + drivers/pinctrl/intel/pinctrl-alderlake.c | 1 - + drivers/pinctrl/intel/pinctrl-broxton.c | 1 - + drivers/pinctrl/intel/pinctrl-cannonlake.c | 1 - + drivers/pinctrl/intel/pinctrl-cedarfork.c | 1 - + drivers/pinctrl/intel/pinctrl-denverton.c | 1 - + drivers/pinctrl/intel/pinctrl-elkhartlake.c | 1 - + drivers/pinctrl/intel/pinctrl-emmitsburg.c | 1 - + drivers/pinctrl/intel/pinctrl-geminilake.c | 1 - + drivers/pinctrl/intel/pinctrl-intel-platform.c | 1 - + drivers/pinctrl/intel/pinctrl-jasperlake.c | 1 - + drivers/pinctrl/intel/pinctrl-lakefield.c | 1 - + drivers/pinctrl/intel/pinctrl-lewisburg.c | 1 - + drivers/pinctrl/intel/pinctrl-merrifield.c | 1 - + drivers/pinctrl/intel/pinctrl-meteorlake.c | 1 - + drivers/pinctrl/intel/pinctrl-meteorpoint.c | 1 - + drivers/pinctrl/intel/pinctrl-moorefield.c | 1 - + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 1 - + drivers/pinctrl/intel/pinctrl-tigerlake.c | 1 - + drivers/pinctrl/microchip/pinctrl-mpfs-iomux0.c | 1 - + drivers/pinctrl/microchip/pinctrl-mpfs-mssio.c | 1 - + drivers/pinctrl/microchip/pinctrl-pic64gx-gpio2.c | 1 - + drivers/pinctrl/nuvoton/pinctrl-ma35d1.c | 1 - + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 1 - + drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 1 - + drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 1 - + drivers/pinctrl/pinctrl-as3722.c | 1 - + drivers/pinctrl/pinctrl-cy8c95x0.c | 1 - + drivers/pinctrl/pinctrl-da850-pupd.c | 1 - + drivers/pinctrl/pinctrl-digicolor.c | 1 - + drivers/pinctrl/pinctrl-eic7700.c | 1 - + drivers/pinctrl/pinctrl-eyeq5.c | 1 - + drivers/pinctrl/pinctrl-ingenic.c | 1 - + drivers/pinctrl/pinctrl-loongson2.c | 1 - + drivers/pinctrl/pinctrl-lpc18xx.c | 1 - + drivers/pinctrl/pinctrl-max77620.c | 1 - + drivers/pinctrl/pinctrl-mcp23s08.c | 1 - + drivers/pinctrl/pinctrl-mcp23s08_i2c.c | 1 - + drivers/pinctrl/pinctrl-mcp23s08_spi.c | 1 - + drivers/pinctrl/pinctrl-microchip-sgpio.c | 1 - + drivers/pinctrl/pinctrl-mlxbf3.c | 1 - + drivers/pinctrl/pinctrl-pistachio.c | 1 - + drivers/pinctrl/pinctrl-scmi.c | 1 - + drivers/pinctrl/pinctrl-th1520.c | 1 - + drivers/pinctrl/pinctrl-tps6594.c | 1 - + drivers/pinctrl/qcom/pinctrl-ipq5018.c | 1 - + drivers/pinctrl/spear/pinctrl-spear1310.c | 1 - + drivers/pinctrl/spear/pinctrl-spear1340.c | 1 - + drivers/pinctrl/spear/pinctrl-spear300.c | 1 - + drivers/pinctrl/spear/pinctrl-spear310.c | 1 - + drivers/pinctrl/spear/pinctrl-spear320.c | 1 - + drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c | 1 - + drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 1 - + .../pinctrl/starfive/pinctrl-starfive-jh7110-aon.c | 1 - + .../pinctrl/starfive/pinctrl-starfive-jh7110-sys.c | 1 - + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 1 - + drivers/pinctrl/tegra/pinctrl-tegra234.c | 1 - + drivers/pinctrl/tegra/pinctrl-tegra238.c | 1 - + drivers/pinctrl/tegra/pinctrl-tegra264.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-nx1.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 1 - + drivers/platform/chrome/cros_ec_chardev.c | 1 - + drivers/platform/chrome/cros_ec_debugfs.c | 1 - + drivers/platform/chrome/cros_ec_lightbar.c | 1 - + drivers/platform/chrome/cros_ec_sensorhub.c | 1 - + drivers/platform/chrome/cros_ec_sysfs.c | 1 - + drivers/platform/chrome/cros_ec_vbc.c | 1 - + drivers/platform/chrome/cros_kbd_led_backlight.c | 1 - + drivers/platform/chrome/cros_usbpd_logger.c | 1 - + drivers/platform/chrome/cros_usbpd_notify.c | 1 - + drivers/platform/chrome/wilco_ec/core.c | 1 - + drivers/platform/chrome/wilco_ec/debugfs.c | 1 - + drivers/platform/chrome/wilco_ec/telemetry.c | 1 - + drivers/platform/goldfish/goldfish_pipe.c | 1 - + drivers/platform/x86/asus-tf103c-dock.c | 1 - + drivers/platform/x86/intel/atomisp2/led.c | 1 - + drivers/platform/x86/intel/atomisp2/pm.c | 1 - + drivers/platform/x86/intel/bxtwc_tmu.c | 1 - + drivers/platform/x86/intel/ehl_pse_io.c | 1 - + drivers/platform/x86/intel/plr_tpmi.c | 1 - + drivers/platform/x86/intel/pmc/pwrm_telemetry.c | 1 - + drivers/platform/x86/intel/punit_ipc.c | 1 - + drivers/platform/x86/intel_scu_pltdrv.c | 1 - + drivers/platform/x86/msi-ec.c | 1 + + drivers/platform/x86/nvidia-wmi-ec-backlight.c | 1 - + drivers/platform/x86/quickstart.c | 1 - + drivers/platform/x86/uniwill/uniwill-wmi.c | 1 - + drivers/platform/x86/x86-android-tablets/dmi.c | 1 - + .../x86/x86-android-tablets/x86-android-tablets.h | 1 + + drivers/pmdomain/actions/owl-sps.c | 1 - + drivers/pmdomain/imx/imx93-pd.c | 1 - + .../pmdomain/marvell/pxa1908-power-controller.c | 1 - + drivers/pnp/pnpacpi/core.c | 1 - + drivers/power/reset/brcm-kona-reset.c | 1 - + drivers/power/reset/ep93xx-restart.c | 1 - + drivers/power/reset/gpio-poweroff.c | 1 - + drivers/power/reset/ltc2952-poweroff.c | 1 - + drivers/power/reset/macsmc-reboot.c | 1 - + drivers/power/reset/ocelot-reset.c | 1 - + drivers/power/reset/pwr-mlxbf.c | 1 - + drivers/power/reset/qemu-virt-ctrl.c | 1 - + drivers/power/reset/sc27xx-poweroff.c | 1 - + drivers/power/reset/spacemit-p1-reboot.c | 1 - + drivers/power/reset/tdx-ec-poweroff.c | 1 - + drivers/power/reset/tps65086-restart.c | 1 - + drivers/power/sequencing/pwrseq-pcie-m2.c | 1 - + drivers/power/sequencing/pwrseq-qcom-wcn.c | 1 - + drivers/power/supply/adp5061.c | 1 - + drivers/power/supply/bd71828-power.c | 1 - + drivers/power/supply/bd99954-charger.c | 1 - + drivers/power/supply/bq24190_charger.c | 1 - + drivers/power/supply/chagall-battery.c | 1 - + drivers/power/supply/cpcap-charger.c | 1 - + drivers/power/supply/cros_charge-control.c | 1 - + drivers/power/supply/cros_peripheral_charger.c | 1 - + drivers/power/supply/cros_usbpd-charger.c | 1 - + drivers/power/supply/lego_ev3_battery.c | 1 - + drivers/power/supply/max14656_charger_detector.c | 1 - + drivers/power/supply/max17042_battery.c | 1 - + drivers/power/supply/max77759_charger.c | 1 - + drivers/power/supply/max8971_charger.c | 1 - + drivers/power/supply/max8998_charger.c | 1 - + drivers/power/supply/mp2629_charger.c | 1 - + drivers/power/supply/olpc_battery.c | 1 - + drivers/power/supply/pm8916_bms_vm.c | 1 - + drivers/power/supply/pm8916_lbc.c | 1 - + drivers/power/supply/rt5033_charger.c | 1 - + drivers/power/supply/rt9467-charger.c | 1 - + drivers/power/supply/rt9471.c | 1 - + drivers/power/supply/rt9756.c | 1 - + drivers/power/supply/s2mu005-battery.c | 1 - + drivers/power/supply/ug3105_battery.c | 1 - + drivers/pps/clients/pps-gpio.c | 1 - + drivers/pps/generators/pps_gen_tio.c | 1 - + drivers/ptp/ptp_dte.c | 1 - + drivers/pwm/pwm-adp5585.c | 1 - + drivers/pwm/pwm-airoha.c | 1 - + drivers/pwm/pwm-apple.c | 1 - + drivers/pwm/pwm-berlin.c | 1 - + drivers/pwm/pwm-ep93xx.c | 1 - + drivers/pwm/pwm-gpio.c | 1 - + drivers/pwm/pwm-intel-lgm.c | 1 - + drivers/pwm/pwm-keembay.c | 1 - + drivers/pwm/pwm-lpc18xx-sct.c | 1 - + drivers/pwm/pwm-lpss-platform.c | 1 - + drivers/pwm/pwm-max7360.c | 1 - + drivers/pwm/pwm-pxa.c | 1 - + drivers/pwm/pwm-sifive.c | 1 - + drivers/pwm/pwm-sl28cpld.c | 1 - + drivers/pwm/pwm-sprd.c | 1 - + drivers/pwm/pwm-sunplus.c | 1 - + drivers/pwm/pwm-vt8500.c | 1 - + drivers/regulator/adp5055-regulator.c | 1 - + drivers/regulator/bd71828-regulator.c | 1 - + drivers/regulator/max77541-regulator.c | 1 - + drivers/regulator/max77675-regulator.c | 1 - + drivers/regulator/mt6370-regulator.c | 1 - + drivers/regulator/pv88080-regulator.c | 1 - + drivers/regulator/rt4803.c | 1 - + drivers/regulator/rt5739.c | 1 - + drivers/regulator/rt6190-regulator.c | 1 - + drivers/regulator/rt8092.c | 1 - + drivers/regulator/rtq2208-regulator.c | 1 - + drivers/regulator/tps6287x-regulator.c | 1 - + drivers/regulator/tps65218-regulator.c | 1 - + drivers/regulator/tps65912-regulator.c | 1 - + drivers/regulator/vexpress-regulator.c | 1 - + drivers/reset/reset-ath79.c | 1 - + drivers/reset/reset-axs10x.c | 1 - + drivers/reset/reset-bcm6345.c | 1 - + drivers/reset/reset-eyeq.c | 1 - + drivers/reset/reset-gpio.c | 1 - + drivers/reset/reset-sunplus.c | 1 - + drivers/reset/reset-tn48m.c | 1 - + drivers/reset/starfive/reset-starfive-jh7100.c | 1 - + drivers/rtc/rtc-88pm886.c | 1 - + drivers/rtc/rtc-cpcap.c | 1 - + drivers/rtc/rtc-cros-ec.c | 1 - + drivers/rtc/rtc-ds1307.c | 1 - + drivers/rtc/rtc-ep93xx.c | 1 - + drivers/rtc/rtc-fsl-ftm-alarm.c | 1 - + drivers/rtc/rtc-ftrtc010.c | 1 - + drivers/rtc/rtc-lpc24xx.c | 1 - + drivers/rtc/rtc-m48t86.c | 1 - + drivers/rtc/rtc-mc13xxx.c | 1 - + drivers/rtc/rtc-moxart.c | 1 - + drivers/rtc/rtc-msc313.c | 1 - + drivers/rtc/rtc-mt6397.c | 1 - + drivers/rtc/rtc-mt7622.c | 1 - + drivers/rtc/rtc-mxc_v2.c | 1 - + drivers/rtc/rtc-r7301.c | 1 - + drivers/rtc/rtc-rzn1.c | 1 - + drivers/rtc/rtc-sh.c | 1 - + drivers/rtc/rtc-ssd202d.c | 1 - + drivers/rtc/rtc-tegra.c | 1 - + drivers/rtc/rtc-ti-k3.c | 1 - + drivers/rtc/rtc-tps6594.c | 1 - + drivers/s390/crypto/ap_bus.c | 2 +- + drivers/s390/crypto/vfio_ap_drv.c | 2 +- + drivers/s390/crypto/zcrypt_cex4.c | 2 +- + drivers/siox/siox-bus-gpio.c | 1 - + drivers/soc/fsl/qe/qe.c | 1 - + drivers/soc/qcom/qcom_pd_mapper.c | 1 - + drivers/soc/renesas/rzn1_irqmux.c | 1 - + drivers/soc/sophgo/sg2044-topsys.c | 1 - + drivers/soc/tegra/fuse/fuse-tegra.c | 1 - + drivers/soc/tegra/fuse/tegra-apbmisc.c | 1 - + drivers/soc/ti/smartreflex.c | 1 - + drivers/soundwire/bus.c | 1 - + drivers/soundwire/bus_type.c | 1 - + drivers/soundwire/cadence_master.c | 1 - + drivers/soundwire/debugfs.c | 1 - + drivers/soundwire/generic_bandwidth_allocation.c | 1 - + drivers/soundwire/mipi_disco.c | 1 - + drivers/soundwire/stream.c | 1 - + drivers/soundwire/sysfs_slave.c | 1 - + drivers/soundwire/sysfs_slave_dpn.c | 1 - + drivers/spi/spi-atcspi200.c | 1 - + drivers/spi/spi-cs42l43.c | 1 - + drivers/spi/spi-gpio.c | 1 - + drivers/spi/spi-hisi-sfc-v3xx.c | 1 - + drivers/spi/spi-loongson-pci.c | 1 - + drivers/spi/spi-loongson-plat.c | 1 - + drivers/spi/spi-loopback-test.c | 1 - + .../spi/spi-offload-trigger-adi-util-sigma-delta.c | 1 - + drivers/spi/spi-offload-trigger-pwm.c | 1 - + drivers/spi/spi-pxa2xx-platform.c | 1 - + drivers/spi/spi-realtek-rtl-snand.c | 1 - + drivers/spi/spi-realtek-rtl.c | 1 - + drivers/spi/spi-sc18is602.c | 1 - + drivers/spi/spi-wpcm-fiu.c | 1 - + drivers/spi/spi.c | 1 - + drivers/spi/spidev.c | 1 - + drivers/spmi/spmi-apple-controller.c | 1 - + drivers/staging/greybus/arche-apb-ctrl.c | 1 - + drivers/staging/iio/frequency/ad9832.c | 1 - + drivers/staging/iio/frequency/ad9834.c | 1 - + drivers/thermal/loongson2_thermal.c | 1 - + drivers/thermal/renesas/rzg2l_thermal.c | 1 - + drivers/tty/goldfish.c | 1 - + drivers/tty/serial/8250/8250_dfl.c | 1 - + drivers/tty/serial/8250/8250_dw.c | 1 - + drivers/tty/serial/8250/8250_em.c | 1 - + drivers/tty/serial/8250/8250_keba.c | 1 - + drivers/tty/serial/8250/8250_loongson.c | 1 - + drivers/tty/serial/8250/8250_ni.c | 1 - + drivers/tty/serial/max3100.c | 1 - + drivers/tty/serial/max310x.c | 1 - + drivers/tty/serial/sc16is7xx.c | 1 - + drivers/tty/serial/sc16is7xx_i2c.c | 1 - + drivers/tty/serial/sc16is7xx_spi.c | 1 - + drivers/tty/serial/sccnxp.c | 1 - + drivers/tty/serial/tegra-utc.c | 1 - + drivers/uio/uio_pdrv_genirq.c | 1 - + drivers/usb/dwc2/core.h | 1 + + drivers/usb/gadget/udc/renesas_usbf.c | 1 - + drivers/usb/misc/usb-ljca.c | 1 - + drivers/usb/typec/mux/tusb1046.c | 1 - + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 1 - + .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 1 - + .../typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c | 1 - + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c | 1 - + drivers/usb/typec/tcpm/tcpci_mt6370.c | 1 - + drivers/usb/typec/tcpm/tcpci_rt1711h.c | 1 - + drivers/usb/typec/ucsi/cros_ec_ucsi.c | 1 - + drivers/vdpa/vdpa.c | 1 - + drivers/vdpa/vdpa_user/vduse_dev.c | 1 - + drivers/vfio/debugfs.c | 1 + + drivers/vfio/pci/mlx5/cmd.h | 15 +- + drivers/vfio/pci/vfio_pci.c | 30 +- + drivers/vfio/pci/vfio_pci_core.c | 101 +- + drivers/vfio/vfio_main.c | 8 +- + drivers/video/backlight/apple_dwi_bl.c | 1 - + drivers/video/backlight/da9052_bl.c | 1 - + drivers/video/backlight/hx8357.c | 1 - + drivers/video/backlight/ktd2801-backlight.c | 1 - + drivers/video/backlight/mp3309c.c | 1 - + drivers/video/backlight/mt6370-backlight.c | 1 - + drivers/video/backlight/rave-sp-backlight.c | 1 - + drivers/video/backlight/rt4831-backlight.c | 1 - + .../fbdev/omap2/omapfb/displays/encoder-opa362.c | 1 - + .../fbdev/omap2/omapfb/displays/encoder-tfp410.c | 1 - + .../omap2/omapfb/displays/encoder-tpd12s015.c | 1 - + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 1 - + drivers/virt/coco/arm-cca-guest/arm-cca-guest.c | 2 +- + drivers/virt/coco/tdx-guest/tdx-guest.c | 1 - + drivers/virt/coco/tdx-host/tdx-host.c | 1 - + drivers/w1/masters/amd_axi_w1.c | 1 - + drivers/w1/masters/ds2490.c | 1 - + drivers/w1/masters/mxc_w1.c | 1 - + drivers/w1/masters/sgi_w1.c | 1 - + drivers/w1/masters/w1-gpio.c | 1 - + drivers/watchdog/at91rm9200_wdt.c | 1 - + drivers/watchdog/cros_ec_wdt.c | 1 - + drivers/watchdog/davinci_wdt.c | 1 - + drivers/watchdog/ftwdt010_wdt.c | 1 - + drivers/watchdog/gpio_wdt.c | 1 - + drivers/watchdog/gunyah_wdt.c | 1 - + drivers/watchdog/imgpdc_wdt.c | 1 - + drivers/watchdog/keembay_wdt.c | 1 - + drivers/watchdog/max63xx_wdt.c | 1 - + drivers/watchdog/max77620_wdt.c | 1 - + drivers/watchdog/meson_wdt.c | 1 - + drivers/watchdog/moxart_wdt.c | 1 - + drivers/watchdog/msc313e_wdt.c | 1 - + drivers/watchdog/mt7621_wdt.c | 1 - + drivers/watchdog/nic7018_wdt.c | 1 - + drivers/watchdog/omap_wdt.c | 1 - + drivers/watchdog/pseries-wdt.c | 1 - + drivers/watchdog/realtek_otto_wdt.c | 1 - + drivers/watchdog/rt2880_wdt.c | 1 - + drivers/watchdog/rti_wdt.c | 1 - + drivers/watchdog/sbsa_gwdt.c | 1 - + drivers/watchdog/sl28cpld_wdt.c | 1 - + drivers/watchdog/sunplus_wdt.c | 1 - + drivers/watchdog/ts72xx_wdt.c | 1 - + drivers/watchdog/twl4030_wdt.c | 1 - + drivers/watchdog/xilinx_wwdt.c | 1 - + include/linux/acpi.h | 2 +- + include/linux/amba/bus.h | 2 +- + include/linux/auxiliary_bus.h | 2 +- + include/linux/bcma/bcma.h | 2 +- + include/linux/bpf_lsm.h | 4 + + include/linux/cdx/cdx_bus.h | 2 +- + include/linux/device-id/acpi.h | 32 + + include/linux/device-id/amba.h | 19 + + include/linux/device-id/ap.h | 20 + + include/linux/device-id/apr.h | 21 + + include/linux/device-id/auxiliary.h | 17 + + include/linux/device-id/bcma.h | 25 + + include/linux/device-id/ccw.h | 27 + + include/linux/device-id/cdx.h | 40 + + include/linux/device-id/coreboot.h | 20 + + include/linux/device-id/css.h | 17 + + include/linux/device-id/dfl.h | 34 + + include/linux/device-id/dmi.h | 58 ++ + include/linux/device-id/eisa.h | 21 + + include/linux/device-id/fsl_mc.h | 22 + + include/linux/device-id/hda.h | 17 + + include/linux/device-id/hid.h | 22 + + include/linux/device-id/hv_vmbus.h | 18 + + include/linux/device-id/i2c.h | 19 + + include/linux/device-id/i3c.h | 26 + + include/linux/device-id/ieee1394.h | 27 + + include/linux/device-id/input.h | 62 ++ + include/linux/device-id/ipack.h | 17 + + include/linux/device-id/isapnp.h | 16 + + include/linux/device-id/ishtp.h | 24 + + include/linux/device-id/mcb.h | 15 + + include/linux/device-id/mdio.h | 35 + + include/linux/device-id/mei_cl.h | 31 + + include/linux/device-id/mhi.h | 24 + + include/linux/device-id/mips_cdmm.h | 17 + + include/linux/device-id/of.h | 15 + + include/linux/device-id/parisc.h | 21 + + include/linux/device-id/pci.h | 54 ++ + include/linux/device-id/pcmcia.h | 48 + + include/linux/device-id/platform.h | 17 + + include/linux/device-id/pnp.h | 26 + + include/linux/device-id/rio.h | 28 + + include/linux/device-id/rpmsg.h | 19 + + include/linux/device-id/sdio.h | 21 + + include/linux/device-id/sdw.h | 18 + + include/linux/device-id/serio.h | 18 + + include/linux/device-id/slim.h | 23 + + include/linux/device-id/spi.h | 19 + + include/linux/device-id/spmi.h | 17 + + include/linux/device-id/ssam.h | 28 + + include/linux/device-id/ssb.h | 24 + + include/linux/device-id/tb.h | 37 + + include/linux/device-id/tee_client.h | 18 + + include/linux/device-id/typec.h | 26 + + include/linux/device-id/ulpi.h | 16 + + include/linux/device-id/usb.h | 111 +++ + include/linux/device-id/vchiq.h | 9 + + include/linux/device-id/vio.h | 11 + + include/linux/device-id/virtio.h | 16 + + include/linux/device-id/wmi.h | 19 + + include/linux/device-id/x86_cpu.h | 44 + + include/linux/device-id/zorro.h | 19 + + include/linux/device/driver.h | 2 + + include/linux/dfl.h | 2 +- + include/linux/dmi.h | 2 +- + include/linux/eisa.h | 2 +- + include/linux/filter.h | 15 +- + include/linux/firewire.h | 3 +- + include/linux/fsl/mc.h | 2 +- + include/linux/hid.h | 2 +- + include/linux/hyperv.h | 2 +- + include/linux/i2c.h | 2 +- + include/linux/i3c/device.h | 2 +- + include/linux/input.h | 2 +- + include/linux/intel-ish-client-if.h | 2 +- + include/linux/ipack.h | 2 +- + include/linux/isapnp.h | 2 +- + include/linux/mcb.h | 2 +- + include/linux/mei_cl_bus.h | 2 +- + include/linux/mhi.h | 1 + + include/linux/mmc/sdio_func.h | 2 +- + include/linux/mod_devicetable.h | 1014 ++------------------ + include/linux/of.h | 2 +- + include/linux/of_platform.h | 4 +- + include/linux/pci-epf.h | 2 +- + include/linux/pci.h | 2 +- + include/linux/phy.h | 2 +- + include/linux/platform_data/x86/int3472.h | 2 +- + include/linux/platform_data/x86/soc.h | 2 +- + include/linux/platform_device.h | 2 +- + include/linux/pnp.h | 2 +- + include/linux/raspberrypi/vchiq_bus.h | 2 +- + include/linux/rio.h | 2 +- + include/linux/rpmsg.h | 2 +- + include/linux/serio.h | 2 +- + include/linux/slimbus.h | 2 +- + include/linux/soc/qcom/apr.h | 2 +- + include/linux/soundwire/sdw.h | 2 +- + include/linux/spi/spi.h | 4 +- + include/linux/ssb/ssb.h | 2 +- + include/linux/surface_aggregator/device.h | 2 +- + include/linux/tee_drv.h | 2 +- + include/linux/thunderbolt.h | 2 +- + include/linux/ulpi/driver.h | 2 +- + include/linux/usb.h | 2 +- + include/linux/usb/serial.h | 1 + + include/linux/usb/typec_altmode.h | 2 +- + include/linux/vfio_pci_core.h | 18 +- + include/linux/virtio.h | 2 +- + include/linux/wmi.h | 2 +- + include/linux/zorro.h | 2 +- + include/net/tcp_ao.h | 1 + + include/pcmcia/ds.h | 2 +- + include/sound/hda_codec.h | 2 +- + include/sound/hdaudio.h | 1 + + kernel/bpf/bpf_inode_storage.c | 9 + + kernel/bpf/core.c | 68 +- + kernel/bpf/disasm.c | 5 +- + kernel/bpf/dispatcher.c | 2 +- + kernel/bpf/verifier.c | 34 +- + kernel/fork.c | 9 +- + net/batman-adv/distributed-arp-table.c | 28 +- + net/batman-adv/gateway_client.c | 3 +- + net/batman-adv/main.c | 3 + + net/batman-adv/mesh-interface.c | 1 + + net/batman-adv/routing.c | 3 +- + net/bridge/br_if.c | 3 + + net/bridge/br_stp.c | 3 +- + net/core/netpoll.c | 9 +- + net/core/sock_map.c | 20 + + net/dsa/tag.c | 12 +- + net/dsa/tag_ar9331.c | 10 +- + net/dsa/tag_brcm.c | 39 +- + net/dsa/tag_dsa.c | 15 +- + net/dsa/tag_gswip.c | 8 +- + net/dsa/tag_hellcreek.c | 9 +- + net/dsa/tag_ksz.c | 44 +- + net/dsa/tag_lan9303.c | 2 + + net/dsa/tag_mtk.c | 8 +- + net/dsa/tag_mxl-gsw1xx.c | 3 + + net/dsa/tag_mxl862xx.c | 3 + + net/dsa/tag_netc.c | 18 +- + net/dsa/tag_ocelot.c | 4 +- + net/dsa/tag_ocelot_8021q.c | 20 +- + net/dsa/tag_qca.c | 14 +- + net/dsa/tag_rtl4_a.c | 8 +- + net/dsa/tag_rtl8_4.c | 24 +- + net/dsa/tag_rzn1_a5psw.c | 8 +- + net/dsa/tag_sja1105.c | 42 +- + net/dsa/tag_trailer.c | 16 +- + net/dsa/tag_vsc73xx_8021q.c | 1 + + net/dsa/tag_xrs700x.c | 12 +- + net/dsa/tag_yt921x.c | 7 +- + net/dsa/user.c | 7 +- + net/ipv4/tcp_ao.c | 5 +- + net/ipv4/tcp_ipv4.c | 4 +- + net/ipv4/tcp_output.c | 8 +- + net/ipv6/ip6_fib.c | 17 +- + net/ipv6/seg6.c | 3 + + net/netfilter/ipset/ip_set_core.c | 8 +- + net/netfilter/nf_conntrack_expect.c | 3 +- + net/netfilter/nf_conntrack_netlink.c | 11 +- + net/netfilter/nf_conntrack_sip.c | 7 +- + net/netfilter/nfnetlink_cthelper.c | 2 + + net/netfilter/nfnetlink_queue.c | 170 ++++ + net/netfilter/nft_fib.c | 9 + + net/netfilter/nft_fib_netdev.c | 29 +- + net/netfilter/nft_payload.c | 270 ++++++ + net/netfilter/nft_set_pipapo.c | 34 +- + net/netfilter/nft_set_pipapo.h | 8 + + net/qrtr/mhi.c | 1 - + net/rfkill/rfkill-gpio.c | 1 - + net/sched/act_bpf.c | 2 +- + net/sched/sch_dualpi2.c | 6 +- + net/sched/sch_hhf.c | 27 + + net/sched/sch_multiq.c | 2 +- + net/sched/sch_taprio.c | 2 +- + net/sched/sch_teql.c | 123 ++- + net/sctp/protocol.c | 3 +- + net/sctp/sm_make_chunk.c | 5 +- + net/sctp/sm_statefuns.c | 36 +- + net/sctp/socket.c | 9 +- + net/tipc/bcast.c | 22 +- + net/tipc/bcast.h | 2 +- + net/tipc/node.c | 15 +- + security/bpf/hooks.c | 3 + + sound/atmel/ac97c.c | 1 - + sound/firewire/isight.c | 1 - + sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c | 1 - + sound/hda/codecs/side-codecs/cs35l41_hda_spi.c | 1 - + sound/hda/codecs/side-codecs/tas2781_hda_i2c.c | 1 - + sound/hda/codecs/side-codecs/tas2781_hda_spi.c | 1 - + sound/hda/core/hda_bus_type.c | 1 - + sound/soc/atmel/sam9x5_wm8731.c | 1 - + sound/soc/codecs/adau1372-i2c.c | 1 - + sound/soc/codecs/adau1372-spi.c | 1 - + sound/soc/codecs/adau1372.c | 1 - + sound/soc/codecs/adau1761-i2c.c | 1 - + sound/soc/codecs/adau1761-spi.c | 1 - + sound/soc/codecs/adau1781-i2c.c | 1 - + sound/soc/codecs/adau1781-spi.c | 1 - + sound/soc/codecs/adau1977-i2c.c | 1 - + sound/soc/codecs/adau1977-spi.c | 1 - + sound/soc/codecs/adau7118-hw.c | 1 - + sound/soc/codecs/ak4104.c | 1 - + sound/soc/codecs/audio-iio-aux.c | 1 - + sound/soc/codecs/cs4234.c | 1 - + sound/soc/codecs/cs4270.c | 1 - + sound/soc/codecs/cs42l42-sdw.c | 1 - + sound/soc/codecs/cs42l43.c | 1 - + sound/soc/codecs/cs42xx8-i2c.c | 1 - + sound/soc/codecs/cs42xx8-spi.c | 1 - + sound/soc/codecs/cs4349.c | 1 - + sound/soc/codecs/es8316.c | 1 - + sound/soc/codecs/es8323.c | 1 - + sound/soc/codecs/es9356.c | 1 - + sound/soc/codecs/max98357a.c | 1 - + sound/soc/codecs/max98373-i2c.c | 1 - + sound/soc/codecs/max98373-sdw.c | 1 - + sound/soc/codecs/max98388.c | 1 - + sound/soc/codecs/mt6351.c | 1 - + sound/soc/codecs/mt6358.c | 1 - + sound/soc/codecs/pcm3168a-i2c.c | 1 - + sound/soc/codecs/rt1017-sdca-sdw.c | 1 - + sound/soc/codecs/rt1308-sdw.c | 1 - + sound/soc/codecs/rt1316-sdw.c | 1 - + sound/soc/codecs/rt1318-sdw.c | 1 - + sound/soc/codecs/rt1320-sdw.c | 1 - + sound/soc/codecs/rt700-sdw.c | 1 - + sound/soc/codecs/rt711-sdca-sdw.c | 1 - + sound/soc/codecs/rt711-sdw.c | 1 - + sound/soc/codecs/rt712-sdca-dmic.c | 1 - + sound/soc/codecs/rt712-sdca-sdw.c | 1 - + sound/soc/codecs/rt715-sdca-sdw.c | 1 - + sound/soc/codecs/rt715-sdw.c | 1 - + sound/soc/codecs/rt721-sdca-sdw.c | 1 - + sound/soc/codecs/rt722-sdca-sdw.c | 1 - + sound/soc/codecs/rt9123.c | 1 - + sound/soc/codecs/rt9123p.c | 1 - + sound/soc/codecs/rtq9124.c | 1 - + sound/soc/codecs/rtq9128.c | 1 - + sound/soc/codecs/sdw-mockup.c | 1 - + sound/soc/codecs/simple-amplifier.c | 1 - + sound/soc/codecs/sma1303.c | 1 - + sound/soc/codecs/src4xxx-i2c.c | 1 - + sound/soc/codecs/uda1334.c | 1 - + sound/soc/codecs/wm8510.c | 1 - + sound/soc/codecs/wm8523.c | 1 - + sound/soc/codecs/wm8524.c | 1 - + sound/soc/codecs/wm8580.c | 1 - + sound/soc/codecs/wm8711.c | 1 - + sound/soc/codecs/wm8728.c | 1 - + sound/soc/codecs/wm8731-i2c.c | 1 - + sound/soc/codecs/wm8731-spi.c | 1 - + sound/soc/codecs/wm8737.c | 1 - + sound/soc/codecs/wm8753.c | 1 - + sound/soc/codecs/wm8770.c | 1 - + sound/soc/codecs/wm8776.c | 1 - + sound/soc/fsl/fsl_aud2htx.c | 1 - + sound/soc/fsl/mpc5200_psc_ac97.c | 1 - + .../soc/generic/audio-graph-card2-custom-sample.c | 1 - + sound/soc/jz4740/jz4740-i2s.c | 1 - + sound/soc/mediatek/mt8365/mt8365-mt6357.c | 1 - + sound/soc/qcom/apq8096.c | 1 - + sound/soc/qcom/sc7280.c | 1 - + sound/soc/qcom/storm.c | 1 - + sound/soc/sdca/sdca_class.c | 1 - + sound/soc/sof/sof-client-ipc-flood-test.c | 1 - + sound/soc/sof/sof-client-ipc-kernel-injector.c | 1 - + sound/soc/sof/sof-client-ipc-msg-injector.c | 1 - + sound/soc/sunxi/sun50i-codec-analog.c | 1 - + sound/soc/sunxi/sun50i-dmic.c | 1 - + sound/soc/tegra/tegra186_asrc.c | 1 - + sound/soc/tegra/tegra186_dspk.c | 1 - + sound/soc/tegra/tegra20_spdif.c | 1 - + sound/soc/tegra/tegra210_adx.c | 1 - + sound/soc/tegra/tegra210_amx.c | 1 - + sound/soc/tegra/tegra210_dmic.c | 1 - + sound/soc/tegra/tegra210_i2s.c | 1 - + sound/soc/tegra/tegra210_mixer.c | 1 - + sound/soc/tegra/tegra210_mvc.c | 1 - + sound/soc/tegra/tegra210_ope.c | 1 - + sound/soc/ti/omap-dmic.c | 1 - + sound/soc/ti/omap-mcpdm.c | 1 - + tools/testing/cxl/test/mem.c | 1 - + .../selftests/bpf/prog_tests/sockmap_strp.c | 31 + + .../selftests/bpf/progs/refcounted_kptr_fail.c | 34 + + .../selftests/bpf/progs/sockmap_parse_prog.c | 22 - + .../selftests/bpf/progs/test_sockmap_strp.c | 7 + + .../testing/selftests/bpf/progs/verifier_unpriv.c | 19 + + tools/testing/selftests/drivers/net/hw/tso.py | 16 +- + tools/testing/selftests/net/lib/py/utils.py | 4 +- + tools/testing/selftests/vfio/Makefile | 2 - + tools/testing/selftests/vfio/lib/libvfio.mk | 2 + + 1789 files changed, 3476 insertions(+), 3136 deletions(-) + create mode 100644 include/linux/device-id/acpi.h + create mode 100644 include/linux/device-id/amba.h + create mode 100644 include/linux/device-id/ap.h + create mode 100644 include/linux/device-id/apr.h + create mode 100644 include/linux/device-id/auxiliary.h + create mode 100644 include/linux/device-id/bcma.h + create mode 100644 include/linux/device-id/ccw.h + create mode 100644 include/linux/device-id/cdx.h + create mode 100644 include/linux/device-id/coreboot.h + create mode 100644 include/linux/device-id/css.h + create mode 100644 include/linux/device-id/dfl.h + create mode 100644 include/linux/device-id/dmi.h + create mode 100644 include/linux/device-id/eisa.h + create mode 100644 include/linux/device-id/fsl_mc.h + create mode 100644 include/linux/device-id/hda.h + create mode 100644 include/linux/device-id/hid.h + create mode 100644 include/linux/device-id/hv_vmbus.h + create mode 100644 include/linux/device-id/i2c.h + create mode 100644 include/linux/device-id/i3c.h + create mode 100644 include/linux/device-id/ieee1394.h + create mode 100644 include/linux/device-id/input.h + create mode 100644 include/linux/device-id/ipack.h + create mode 100644 include/linux/device-id/isapnp.h + create mode 100644 include/linux/device-id/ishtp.h + create mode 100644 include/linux/device-id/mcb.h + create mode 100644 include/linux/device-id/mdio.h + create mode 100644 include/linux/device-id/mei_cl.h + create mode 100644 include/linux/device-id/mhi.h + create mode 100644 include/linux/device-id/mips_cdmm.h + create mode 100644 include/linux/device-id/of.h + create mode 100644 include/linux/device-id/parisc.h + create mode 100644 include/linux/device-id/pci.h + create mode 100644 include/linux/device-id/pcmcia.h + create mode 100644 include/linux/device-id/platform.h + create mode 100644 include/linux/device-id/pnp.h + create mode 100644 include/linux/device-id/rio.h + create mode 100644 include/linux/device-id/rpmsg.h + create mode 100644 include/linux/device-id/sdio.h + create mode 100644 include/linux/device-id/sdw.h + create mode 100644 include/linux/device-id/serio.h + create mode 100644 include/linux/device-id/slim.h + create mode 100644 include/linux/device-id/spi.h + create mode 100644 include/linux/device-id/spmi.h + create mode 100644 include/linux/device-id/ssam.h + create mode 100644 include/linux/device-id/ssb.h + create mode 100644 include/linux/device-id/tb.h + create mode 100644 include/linux/device-id/tee_client.h + create mode 100644 include/linux/device-id/typec.h + create mode 100644 include/linux/device-id/ulpi.h + create mode 100644 include/linux/device-id/usb.h + create mode 100644 include/linux/device-id/vchiq.h + create mode 100644 include/linux/device-id/vio.h + create mode 100644 include/linux/device-id/virtio.h + create mode 100644 include/linux/device-id/wmi.h + create mode 100644 include/linux/device-id/x86_cpu.h + create mode 100644 include/linux/device-id/zorro.h +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 (24dddc384fb9a Merge patch series "iomap: consolidate bio submission") +$ git merge -m Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + fs/afs/callback.c | 17 +-- + fs/afs/cell.c | 27 +++- + fs/afs/cmservice.c | 7 +- + fs/afs/dir.c | 40 +++-- + fs/afs/dynroot.c | 2 +- + fs/afs/fs_operation.c | 2 +- + fs/afs/inode.c | 15 +- + fs/afs/internal.h | 3 +- + fs/afs/super.c | 5 +- + fs/afs/symlink.c | 4 +- + fs/afs/vl_list.c | 24 ++- + fs/afs/volume.c | 2 +- + fs/bpf_fs_kfuncs.c | 23 +-- + fs/cachefiles/namei.c | 4 +- + fs/exec.c | 2 +- + fs/exfat/iomap.c | 5 +- + fs/fat/dir.c | 44 +++++- + fs/fhandle.c | 2 +- + fs/freevxfs/vxfs_bmap.c | 3 +- + fs/fuse/file.c | 14 +- + fs/iomap/bio.c | 15 +- + fs/iomap/buffered-io.c | 16 +- + fs/iomap/direct-io.c | 7 +- + fs/iomap/ioend.c | 8 +- + fs/minix/minix.h | 2 +- + fs/namei.c | 4 + + fs/netfs/buffered_read.c | 2 +- + fs/netfs/buffered_write.c | 2 +- + fs/netfs/direct_write.c | 18 +-- + fs/netfs/internal.h | 12 ++ + fs/netfs/locking.c | 95 ++++++++++++ + fs/netfs/write_collect.c | 10 ++ + fs/netfs/write_issue.c | 55 +++---- + fs/ntfs/aops.c | 6 +- + fs/ntfs3/inode.c | 5 +- + fs/orangefs/dir.c | 7 +- + fs/overlayfs/copy_up.c | 12 +- + fs/overlayfs/inode.c | 4 +- + fs/proc/generic.c | 9 +- + fs/xfs/xfs_aops.c | 3 +- + fs/xfs/xfs_super.c | 3 + + include/linux/iomap.h | 2 + + include/linux/netfs.h | 13 +- + lib/iov_iter.c | 20 ++- + lib/scatterlist.c | 1 + + lib/tests/kunit_iov_iter.c | 5 +- + tools/testing/selftests/filesystems/.gitignore | 1 + + tools/testing/selftests/filesystems/Makefile | 4 + + .../selftests/filesystems/idmapped_tmpfile.c | 168 +++++++++++++++++++++ + 50 files changed, 580 insertions(+), 176 deletions(-) + create mode 100644 tools/testing/selftests/filesystems/idmapped_tmpfile.c +Merging fscrypt-current/for-current (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging btrfs-fixes/next-fixes (6c893b948351d 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. + fs/btrfs/file-item.c | 26 +++++++++++++++++++++++++- + fs/btrfs/free-space-cache.c | 3 +++ + fs/btrfs/ioctl.c | 18 ++++++++++++------ + fs/btrfs/lzo.c | 15 ++++++++++++--- + fs/btrfs/print-tree.c | 8 ++++---- + fs/btrfs/props.c | 16 +++++++++++++--- + fs/btrfs/relocation.c | 15 +++++++-------- + fs/btrfs/tree-checker.c | 6 ++++++ + 8 files changed, 82 insertions(+), 25 deletions(-) +Merging vfs-fixes/fixes (49c5d168a3a8f udf: fix nls leak on udf_fill_super() failure) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging fs/udf/super.c +Merge made by the 'ort' strategy. +Merging erofs-fixes/fixes (1006b2f57f773 erofs: use more informative s_id for file-backed mounts) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Merge made by the 'ort' strategy. + fs/erofs/super.c | 17 ++++------------- + 1 file changed, 4 insertions(+), 13 deletions(-) +Merging nfsd-fixes/nfsd-fixes (e5248a7426030 svcrdma: wake sq waiters when the transport closes) +$ 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 (2d0afaac9137e fscrypt: Remove workaround for bug in gcc 7 and earlier) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Merge made by the 'ort' strategy. + fs/crypto/crypto.c | 40 ++++++++------------------------------ + fs/crypto/fscrypt_private.h | 5 +---- + fs/crypto/keyring.c | 21 +++++++++----------- + fs/crypto/keysetup.c | 26 ++++++++++--------------- + fs/crypto/policy.c | 17 ++-------------- + include/uapi/linux/fscrypt.h | 1 - + tools/include/uapi/linux/fscrypt.h | 1 - + 7 files changed, 30 insertions(+), 81 deletions(-) +Merging btrfs/for-next (0542d886e45d5 Merge branch 'for-next-current-v7.1-20260630' into for-next-20260630) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. +Merging ceph/master (1397040896280 selftests: ceph: wire up Ceph reset kselftests and documentation) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Auto-merging MAINTAINERS +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/filesystems/ceph/Makefile | 7 + + tools/testing/selftests/filesystems/ceph/README | 84 +++ + .../filesystems/ceph/reset_corner_cases.sh | 646 +++++++++++++++++++ + .../selftests/filesystems/ceph/reset_stress.sh | 694 +++++++++++++++++++++ + .../selftests/filesystems/ceph/run_validation.sh | 350 +++++++++++ + tools/testing/selftests/filesystems/ceph/settings | 1 + + .../filesystems/ceph/validate_consistency.py | 297 +++++++++ + 9 files changed, 2081 insertions(+) + create mode 100644 tools/testing/selftests/filesystems/ceph/Makefile + create mode 100644 tools/testing/selftests/filesystems/ceph/README + create mode 100755 tools/testing/selftests/filesystems/ceph/reset_corner_cases.sh + create mode 100755 tools/testing/selftests/filesystems/ceph/reset_stress.sh + create mode 100755 tools/testing/selftests/filesystems/ceph/run_validation.sh + create mode 100644 tools/testing/selftests/filesystems/ceph/settings + create mode 100755 tools/testing/selftests/filesystems/ceph/validate_consistency.py +Merging cifs/for-next (e46f394ecbb7a smb/client: refresh allocation after EOF-extending fallocate) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/smb/client/cifsfs.c | 10 +++- + fs/smb/client/cifsfs.h | 8 +-- + fs/smb/client/dir.c | 3 + + fs/smb/client/file.c | 1 + + fs/smb/client/inode.c | 48 ++++++--------- + fs/smb/client/readdir.c | 10 ++-- + fs/smb/client/smb2ops.c | 147 +++++++++++++++++++++++++++++++++++++++++----- + fs/smb/client/smb2pdu.c | 27 +++++++-- + fs/smb/client/smb2proto.h | 3 + + fs/smb/common/fscc.h | 5 ++ + fs/smb/server/smb2pdu.h | 4 -- + 11 files changed, 204 insertions(+), 62 deletions(-) +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 (95ce5ffd54cf6 ecryptfs: use kasprintf in ecryptfs_crypto_api_algify_cipher_name) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Already up to date. +Merging dlm/next (e61113cfcaf71 dlm: init per node debugfs before add to node hash) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging erofs/dev (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (274a0462058cd exfat: fix mmap data loss when extending valid_size over a shared mapping) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Auto-merging fs/exfat/iomap.c +Merge made by the 'ort' strategy. + fs/exfat/file.c | 218 ++++++++++++++++++++++++++++++++++++++++++++++--------- + fs/exfat/iomap.c | 22 +++++- + 2 files changed, 204 insertions(+), 36 deletions(-) +Merging ext3/for_next (42093d1948d2d Pull fanotify pidfd reporting for threads and dead tasks.) +$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (c143957520c6c ext4: validate donor file superblock early in EXT4_IOC_MOVE_EXT) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/for-next (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 (7d87a5a284bb3 fuse-uring: clear ent->fuse_req in commit_fetch error path) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (5f80d9113360c Merge tag 'gfs2-for-7.2' 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 (f363a0fb134a3 ksmbd: fix app-instance durable supersede session UAF) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + Documentation/filesystems/smb/ksmbd.rst | 4 +- + fs/smb/server/ksmbd_work.h | 7 ++ + fs/smb/server/oplock.c | 109 +++++++++++++++++++++++++++----- + fs/smb/server/server.c | 14 ++++ + fs/smb/server/smb2misc.c | 18 ++++-- + fs/smb/server/smb2pdu.c | 17 +++-- + fs/smb/server/smbacl.c | 15 ++++- + fs/smb/server/vfs.c | 14 ++-- + fs/smb/server/vfs_cache.c | 79 +++++++++++++++++------ + 9 files changed, 216 insertions(+), 61 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (284ea3fb4f671 NFS: Use common error handling code in nfs_alloc_server()) +$ 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 (95682da196b42 lockd: Use "%*phN" to dprintk() a cookie) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Merge made by the 'ort' strategy. + fs/lockd/svclock.c | 42 +------- + fs/lockd/svcsubs.c | 53 +++++---- + fs/nfs/callback.c | 4 +- + fs/nfs_common/nfslocalio.c | 16 ++- + fs/nfsd/filecache.c | 143 +++++++++++++------------ + fs/nfsd/flexfilelayoutxdr.c | 20 ++-- + fs/nfsd/localio.c | 8 +- + fs/nfsd/netns.h | 28 +++-- + fs/nfsd/nfs2acl.c | 21 ++-- + fs/nfsd/nfs3acl.c | 17 +-- + fs/nfsd/nfs4callback.c | 109 +++++++++++++++---- + fs/nfsd/nfs4layouts.c | 39 ++++--- + fs/nfsd/nfs4proc.c | 60 ++++++++--- + fs/nfsd/nfs4recover.c | 48 ++++++--- + fs/nfsd/nfs4state.c | 177 ++++++++++++++++++++++--------- + fs/nfsd/nfs4xdr.c | 22 +++- + fs/nfsd/nfsctl.c | 20 ++-- + fs/nfsd/nfsfh.c | 8 +- + fs/nfsd/nfssvc.c | 22 ++-- + fs/nfsd/state.h | 4 +- + fs/nfsd/trace.h | 18 ++-- + fs/nfsd/vfs.c | 48 +++++---- + include/linux/sunrpc/bc_xprt.h | 5 + + include/linux/sunrpc/svc_rdma_pcl.h | 4 +- + 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/sunrpc_syms.c | 1 + + net/sunrpc/svc.c | 45 ++++++-- + 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_transport.c | 69 ++++++++---- + 42 files changed, 922 insertions(+), 413 deletions(-) +$ 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 (5ec75546dc71a ntfs: fix WARN_ON for resident attribute in ntfs_map_runlist_nolock()) +$ 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 fs/ntfs/aops.c +Merge made by the 'ort' strategy. + fs/ntfs/aops.c | 17 +++++++++++++++- + fs/ntfs/attrib.c | 35 +++++++++++++++++++++----------- + fs/ntfs/inode.c | 9 ++++++++ + fs/ntfs/mft.c | 8 ++++++-- + fs/ntfs/namei.c | 62 ++++++++++++++++++++++++++++---------------------------- + 5 files changed, 85 insertions(+), 46 deletions(-) +Merging ntfs3/master (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Already up to date. +Merging orangefs/for-next (e61bc5e4d8743 bufmap: manage as folios, V2.) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (1f6ee9be92f8d ovl: make fsync after metadata copy-up opt-in mount option) +$ git merge -m Merge branch 'overlayfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (11efa98bcc0d0 ubi: ubi.h: fix kernel-doc warnings) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging drivers/mtd/ubi/ubi.h +Merge made by the 'ort' strategy. + drivers/mtd/ubi/ubi.h | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 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 (e4281086ae6ca xfs: simplify __xfs_buf_ioend) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_dquot_buf.c | 14 ++- + fs/xfs/scrub/agheader_repair.c | 2 +- + fs/xfs/xfs_buf.c | 190 ++++++++++++++++++++++------------------- + fs/xfs/xfs_buf.h | 2 +- + fs/xfs/xfs_buf_item.c | 3 +- + fs/xfs/xfs_inode.c | 3 +- + fs/xfs/xfs_log_recover.c | 6 +- + fs/xfs/xfs_qm.c | 5 +- + 8 files changed, 124 insertions(+), 101 deletions(-) +Merging zonefs/for-next (3a8389d42bdf4 zonefs: handle integer overflow in zonefs_fname_to_fno) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging vfs-brauner/vfs.all (cf6f88615485a Merge branch 'vfs-7.3.errno' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging MAINTAINERS +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/erofs/super.c +Auto-merging fs/ntfs/namei.c +Auto-merging fs/smb/client/cifsfs.h +Auto-merging fs/smb/client/dir.c +Auto-merging fs/smb/client/inode.c +Auto-merging fs/smb/server/smb2pdu.c +Auto-merging fs/smb/server/vfs.c +Auto-merging fs/xfs/xfs_buf.c +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 2 +- + Documentation/filesystems/overlayfs.rst | 16 + + Documentation/filesystems/porting.rst | 8 + + Documentation/filesystems/vfs.rst | 2 +- + MAINTAINERS | 5 - + block/bdev.c | 113 +++- + drivers/base/devtmpfs.c | 2 +- + drivers/block/rnbd/rnbd-srv.c | 4 +- + drivers/char/misc_minor_kunit.c | 25 +- + drivers/crypto/ccp/sev-dev.c | 12 +- + drivers/target/target_core_alua.c | 11 +- + drivers/target/target_core_pr.c | 4 +- + fs/9p/vfs_inode.c | 5 +- + fs/9p/vfs_inode_dotl.c | 4 +- + fs/Kconfig | 1 - + fs/Makefile | 1 - + fs/affs/affs.h | 2 +- + fs/affs/namei.c | 4 +- + fs/afs/dir.c | 6 +- + fs/autofs/root.c | 2 +- + fs/bad_inode.c | 2 +- + fs/bfs/dir.c | 2 +- + fs/bpf_fs_kfuncs.c | 37 ++ + fs/btrfs/dev-replace.c | 65 ++- + fs/btrfs/inode.c | 4 +- + fs/btrfs/ioctl.c | 4 +- + fs/btrfs/volumes.c | 116 +++- + fs/btrfs/volumes.h | 6 +- + fs/ceph/dir.c | 3 +- + fs/coda/dir.c | 9 +- + fs/coredump.c | 11 +- + fs/cramfs/inode.c | 2 +- + fs/ecryptfs/inode.c | 2 +- + fs/efivarfs/inode.c | 2 +- + fs/efs/Kconfig | 16 - + fs/efs/Makefile | 8 - + fs/efs/dir.c | 105 ---- + fs/efs/efs.h | 144 ----- + fs/efs/file.c | 42 -- + fs/efs/inode.c | 315 ---------- + fs/efs/namei.c | 120 ---- + fs/efs/super.c | 368 ------------ + fs/efs/symlink.c | 50 -- + fs/erofs/super.c | 35 +- + fs/exfat/namei.c | 2 +- + fs/ext2/namei.c | 4 +- + fs/ext4/extents-test.c | 9 +- + fs/ext4/mballoc-test.c | 9 +- + fs/ext4/namei.c | 4 +- + fs/ext4/super.c | 12 +- + fs/f2fs/namei.c | 4 +- + fs/f2fs/super.c | 6 +- + fs/fat/namei_msdos.c | 5 +- + fs/fat/namei_vfat.c | 2 +- + fs/fs_struct.c | 103 +++- + fs/fuse/dir.c | 10 +- + fs/gfs2/inode.c | 7 +- + fs/hfs/dir.c | 4 +- + fs/hfsplus/dir.c | 4 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/namei.c | 6 +- + fs/hugetlbfs/inode.c | 4 +- + fs/inode.c | 23 +- + fs/internal.h | 1 + + fs/iomap/buffered-io.c | 6 +- + fs/iomap/direct-io.c | 293 +++++++++- + fs/iomap/ioend.c | 21 +- + fs/jffs2/dir.c | 6 +- + fs/jfs/namei.c | 4 +- + fs/kernel_read_file.c | 9 +- + fs/minix/namei.c | 4 +- + fs/namei.c | 30 +- + fs/namespace.c | 25 +- + fs/nfs/blocklayout/dev.c | 15 +- + fs/nfs/dir.c | 6 +- + fs/nfs/internal.h | 2 +- + fs/nilfs2/namei.c | 4 +- + fs/ntfs/namei.c | 4 +- + fs/ntfs3/namei.c | 4 +- + fs/nullfs.c | 14 +- + fs/ocfs2/dlmfs/dlmfs.c | 5 +- + fs/ocfs2/namei.c | 5 +- + fs/ocfs2/super.c | 1 - + fs/omfs/dir.c | 4 +- + fs/orangefs/namei.c | 5 +- + fs/overlayfs/dir.c | 18 +- + fs/overlayfs/inode.c | 26 +- + fs/overlayfs/overlayfs.h | 1 + + fs/overlayfs/super.c | 2 +- + fs/overlayfs/xattrs.c | 1 + + fs/posix_acl.c | 2 - + fs/proc/array.c | 4 +- + fs/proc/base.c | 8 +- + fs/proc_namespace.c | 4 +- + fs/ramfs/inode.c | 4 +- + fs/romfs/super.c | 2 +- + fs/smb/client/cifsfs.h | 2 +- + fs/smb/client/dir.c | 2 +- + fs/smb/client/inode.c | 7 + + fs/smb/server/mgmt/share_config.c | 4 +- + fs/smb/server/smb2pdu.c | 4 +- + fs/smb/server/vfs.c | 9 +- + fs/super.c | 639 ++++++++++++++------- + fs/ubifs/dir.c | 4 +- + fs/udf/namei.c | 4 +- + fs/ufs/namei.c | 5 +- + fs/vboxsf/dir.c | 4 +- + fs/xfs/xfs_buf.c | 2 +- + fs/xfs/xfs_iops.c | 7 +- + fs/xfs/xfs_super.c | 10 +- + include/linux/blk_types.h | 2 +- + include/linux/blkdev.h | 12 +- + include/linux/efs_vh.h | 54 -- + include/linux/fs.h | 4 +- + include/linux/fs/super.h | 8 + + include/linux/fs/super_types.h | 4 +- + include/linux/fs_struct.h | 34 ++ + include/linux/init_task.h | 1 + + include/linux/net.h | 1 + + include/linux/sched.h | 1 + + include/linux/sched/task.h | 1 + + include/linux/types.h | 2 + + include/uapi/asm-generic/errno.h | 2 +- + include/uapi/linux/efs_fs_sb.h | 63 -- + init/init_task.c | 1 + + init/initramfs.c | 14 +- + init/initramfs_test.c | 220 +++---- + init/main.c | 10 +- + ipc/mqueue.c | 7 +- + kernel/exit.c | 2 +- + kernel/fork.c | 53 +- + kernel/kcmp.c | 2 +- + kernel/umh.c | 6 +- + mm/shmem.c | 2 +- + net/socket.c | 25 + + net/unix/af_unix.c | 17 +- + tools/testing/selftests/bpf/bpf_experimental.h | 3 + + .../testing/selftests/bpf/prog_tests/sock_xattr.c | 67 +++ + .../testing/selftests/bpf/progs/sock_read_xattr.c | 54 ++ + tools/testing/selftests/filesystems/.gitignore | 1 + + tools/testing/selftests/filesystems/Makefile | 2 +- + .../selftests/filesystems/overlayfs/.gitignore | 1 + + .../selftests/filesystems/overlayfs/Makefile | 2 + + .../filesystems/overlayfs/idmapped_mounts.c | 501 ++++++++++++++++ + .../filesystems/overlayfs/set_layers_via_fds.c | 16 +- + tools/testing/selftests/filesystems/ustat_test.c | 135 +++++ + tools/testing/selftests/proc/proc-pidns.c | 1 + + 147 files changed, 2511 insertions(+), 1980 deletions(-) + delete mode 100644 fs/efs/Kconfig + delete mode 100644 fs/efs/Makefile + delete mode 100644 fs/efs/dir.c + delete mode 100644 fs/efs/efs.h + delete mode 100644 fs/efs/file.c + delete mode 100644 fs/efs/inode.c + delete mode 100644 fs/efs/namei.c + delete mode 100644 fs/efs/super.c + delete mode 100644 fs/efs/symlink.c + delete mode 100644 include/linux/efs_vh.h + delete mode 100644 include/uapi/linux/efs_fs_sb.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/sock_xattr.c + create mode 100644 tools/testing/selftests/bpf/progs/sock_read_xattr.c + create mode 100644 tools/testing/selftests/filesystems/overlayfs/idmapped_mounts.c + create mode 100644 tools/testing/selftests/filesystems/ustat_test.c +$ 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 (f548f2851b932 MAINTAINERS: add Usama as a THP reviewer) +$ 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 +Merge made by the 'ort' strategy. + .mailmap | 1 + + Documentation/ABI/testing/sysfs-kernel-mm-damon | 174 ++++++++++++------------ + MAINTAINERS | 3 +- + arch/m68k/include/asm/page_mm.h | 2 + + arch/x86/kernel/sys_x86_64.c | 14 +- + drivers/dax/bus.c | 7 +- + fs/fat/fat.h | 4 +- + fs/fat/fat_test.c | 4 +- + include/linux/damon.h | 2 - + include/trace/events/memory-failure.h | 6 +- + kernel/cgroup/cpuset.c | 2 +- + lib/test_hmm.c | 2 +- + mm/damon/core.c | 8 +- + mm/damon/lru_sort.c | 2 - + mm/damon/modules-common.c | 2 - + mm/damon/modules-common.h | 2 - + mm/damon/ops-common.c | 2 - + mm/damon/ops-common.h | 2 - + mm/damon/paddr.c | 2 - + mm/damon/reclaim.c | 2 - + mm/damon/sysfs-common.c | 2 - + mm/damon/sysfs-common.h | 2 - + mm/damon/sysfs-schemes.c | 2 - + mm/damon/sysfs.c | 2 - + mm/damon/tests/core-kunit.h | 4 - + mm/damon/tests/sysfs-kunit.h | 2 - + mm/damon/tests/vaddr-kunit.h | 4 - + mm/damon/vaddr.c | 2 - + mm/huge_memory.c | 12 +- + mm/memremap.c | 1 + + mm/migrate.c | 6 +- + mm/mm_init.c | 15 +- + mm/page_vma_mapped.c | 33 +++-- + 33 files changed, 166 insertions(+), 164 deletions(-) +Merging fs-current (8a82654c6dc41 Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + fs/afs/callback.c | 17 +-- + fs/afs/cell.c | 27 +++- + fs/afs/cmservice.c | 7 +- + fs/afs/dir.c | 40 +++-- + fs/afs/dynroot.c | 2 +- + fs/afs/fs_operation.c | 2 +- + fs/afs/inode.c | 15 +- + fs/afs/internal.h | 3 +- + fs/afs/super.c | 5 +- + fs/afs/symlink.c | 4 +- + fs/afs/vl_list.c | 24 ++- + fs/afs/volume.c | 2 +- + fs/bpf_fs_kfuncs.c | 23 +-- + fs/btrfs/file-item.c | 26 +++- + fs/btrfs/free-space-cache.c | 3 + + fs/btrfs/ioctl.c | 18 ++- + fs/btrfs/lzo.c | 15 +- + fs/btrfs/print-tree.c | 8 +- + fs/btrfs/props.c | 16 +- + fs/btrfs/relocation.c | 15 +- + fs/btrfs/tree-checker.c | 6 + + fs/cachefiles/namei.c | 4 +- + fs/erofs/super.c | 17 +-- + fs/exec.c | 2 +- + fs/exfat/iomap.c | 5 +- + fs/fat/dir.c | 44 +++++- + fs/fhandle.c | 2 +- + fs/freevxfs/vxfs_bmap.c | 3 +- + fs/fuse/file.c | 14 +- + fs/iomap/bio.c | 15 +- + fs/iomap/buffered-io.c | 16 +- + fs/iomap/direct-io.c | 7 +- + fs/iomap/ioend.c | 8 +- + fs/minix/minix.h | 2 +- + fs/namei.c | 4 + + fs/netfs/buffered_read.c | 2 +- + fs/netfs/buffered_write.c | 2 +- + fs/netfs/direct_write.c | 18 +-- + fs/netfs/internal.h | 12 ++ + fs/netfs/locking.c | 95 ++++++++++++ + fs/netfs/write_collect.c | 10 ++ + fs/netfs/write_issue.c | 55 +++---- + fs/ntfs/aops.c | 6 +- + fs/ntfs3/inode.c | 5 +- + fs/orangefs/dir.c | 7 +- + fs/overlayfs/copy_up.c | 12 +- + fs/overlayfs/inode.c | 4 +- + fs/proc/generic.c | 9 +- + fs/xfs/xfs_aops.c | 3 +- + fs/xfs/xfs_super.c | 3 + + include/linux/iomap.h | 2 + + include/linux/netfs.h | 13 +- + lib/iov_iter.c | 20 ++- + lib/scatterlist.c | 1 + + lib/tests/kunit_iov_iter.c | 5 +- + tools/testing/selftests/filesystems/.gitignore | 1 + + tools/testing/selftests/filesystems/Makefile | 4 + + .../selftests/filesystems/idmapped_tmpfile.c | 168 +++++++++++++++++++++ + 59 files changed, 666 insertions(+), 214 deletions(-) + create mode 100644 tools/testing/selftests/filesystems/idmapped_tmpfile.c +Merging kbuild-current/kbuild-fixes-for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (7aaa8047eafd0 Linux 7.0-rc6) +$ 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 (009b6c6486b94 ARM: 9476/1: mm: fix kexec and hibernation with CONFIG_CPU_TTBR0_PAN) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (a52d6c7160f7e selftests/arm64: fix spelling errors in comments) +$ 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 +Merge made by the 'ort' strategy. + Documentation/arch/arm64/cpu-hotplug.rst | 28 +++++++++------- + arch/arm64/include/asm/tlbbatch.h | 10 ++---- + arch/arm64/include/asm/tlbflush.h | 49 +++++----------------------- + arch/arm64/kernel/acpi.c | 2 ++ + arch/arm64/kernel/fpsimd.c | 10 ++++-- + arch/arm64/kernel/process.c | 35 -------------------- + arch/arm64/kernel/smp.c | 28 ++++++++-------- + arch/arm64/mm/mmu.c | 11 +++++-- + arch/arm64/tools/sysreg | 2 +- + tools/testing/selftests/arm64/gcs/libc-gcs.c | 2 +- + tools/testing/selftests/arm64/pauth/pac.c | 2 +- + 11 files changed, 61 insertions(+), 118 deletions(-) +Merging arm-soc-fixes/arm/fixes (9c648f3554920 Merge tag 'v7.1-rockchip-arm32fixe' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip 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 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 (dc5200f6b1ada m68k: Correct CONFIG_MVME16x macro name in #endif comment) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (5200f5f493f79 Linux 7.1-rc4) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (2995ccec260ca s390/monwriter: Reject buffer reuse with different data length) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + drivers/s390/char/monwriter.c | 3 +++ + drivers/s390/crypto/pkey_api.c | 11 +---------- + 2 files changed, 4 insertions(+), 10 deletions(-) +Merging net/main (d335dcc6f5215 gue: validate REMCSUM private option length) +$ 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. + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 21 ++++++++++----------- + drivers/net/usb/net1080.c | 2 +- + include/net/gue.h | 2 +- + 3 files changed, 12 insertions(+), 13 deletions(-) +Merging bpf/master (d2c9a99135da9 Merge tag 'device-id-rework' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux) +$ 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 (226f4a490d1a9 xfrm: nat_keepalive: avoid double free on send error) +$ 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/core/dev.c | 10 ++++++++-- + net/xfrm/xfrm_device.c | 12 ++++++++++-- + net/xfrm/xfrm_nat_keepalive.c | 15 +++++++++------ + 3 files changed, 27 insertions(+), 10 deletions(-) +Merging netfilter/main (0469d460a598d Merge tag 'nf-26-06-30' of https://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 (fe9f4ee6c61a1 Merge branch 'net-avoid-nested-up-notifier-events') +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (e8d85672dd7e2 wifi: ath11k: fix NULL pointer dereference in ath11k_hal_srng_access_begin) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath11k/qmi.c | 11 ++++++++--- + drivers/net/wireless/ath/ath6kl/txrx.c | 2 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 7 +------ + 3 files changed, 10 insertions(+), 10 deletions(-) +Merging iwlwifi/fixes (093305d801fae wifi: iwlwifi: pcie: simplify the resume flow if fast resume is not used) +$ 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 (bb27fcc67c429 RDMA/siw: publish QP after initialization) +$ 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/cma.c | 2 +- + drivers/infiniband/core/mad.c | 30 ++++++++++++++++++++++ + drivers/infiniband/core/verbs.c | 6 ++--- + drivers/infiniband/hw/erdma/erdma_qp.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 2 +- + drivers/infiniband/hw/irdma/verbs.c | 22 ++++++++-------- + drivers/infiniband/hw/mana/wr.c | 2 +- + drivers/infiniband/hw/mlx5/wr.c | 16 +++++++----- + drivers/infiniband/sw/siw/siw_verbs.c | 44 +++++++++++++++++--------------- + 9 files changed, 82 insertions(+), 44 deletions(-) +Merging sound-current/for-linus (5720deab6da70 Merge tag 'asoc-fix-v7.2-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/sound/codecs/tas675x.rst | 11 ++++++----- + MAINTAINERS | 1 + + sound/hda/codecs/realtek/alc269.c | 1 + + sound/soc/amd/yc/acp6x-mach.c | 7 +++++++ + sound/soc/codecs/lpass-va-macro.c | 7 ++++++- + sound/soc/codecs/tas675x.c | 14 +++++++------- + sound/soc/renesas/rcar/adg.c | 29 ++++++++++++++++++++++++++++- + sound/soc/renesas/rcar/src.c | 2 ++ + sound/soc/sof/sof-client-probes-ipc3.c | 23 +++++++++++++++++++---- + sound/soc/sof/sof-client-probes-ipc4.c | 11 ++++++++++- + sound/usb/usx2y/us144mkii.c | 17 +++++++++++------ + sound/usb/usx2y/us144mkii_capture.c | 2 +- + 12 files changed, 99 insertions(+), 26 deletions(-) +Merging sound-asoc-fixes/for-linus (83245e7a436c0 ASoC: rsnd: src: Add missing scu_supply clock to suspend/resume) +$ 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 (32117bb6198f9 Merge remote-tracking branch 'regmap/for-7.1' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. +Merging regulator-fixes/for-linus (bbe4a1f909905 Merge remote-tracking branch 'regulator/for-7.1' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. +Merging spi-fixes/for-linus (6b448abe08f9b Merge remote-tracking branch 'spi/for-7.1' into spi-linus) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging drivers/spi/spi-rzv2h-rspi.c +Auto-merging drivers/spi/spi.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 4 +++- + drivers/spi/spi-dw-core.c | 2 +- + drivers/spi/spi-dw-dma.c | 3 ++- + drivers/spi/spi-rzv2h-rspi.c | 4 ++-- + drivers/spi/spi-sh-msiof.c | 10 ++++++---- + drivers/spi/spi.c | 3 +++ + 6 files changed, 17 insertions(+), 9 deletions(-) +Merging pci-current/for-linus (34db32102439d MAINTAINERS: Drop Karthikeyan Mitran from Mobiveil PCIe entry) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + 1 file changed, 1 deletion(-) +Merging driver-core.current/driver-core-linus (667d0fb32149f driver core: add missing kernel-doc for union members) +$ 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 +Merge made by the 'ort' strategy. + include/linux/device.h | 2 ++ + 1 file changed, 2 insertions(+) +Merging tty.current/tty-linus (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (07acd41f72eec Merge tag 'usb-serial-7.2-rc2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-bus-pci-drivers-xhci_hcd | 2 +- + MAINTAINERS | 1 + + drivers/usb/atm/ueagle-atm.c | 36 +++++++++++-- + drivers/usb/cdns3/cdnsp-mem.c | 2 + + drivers/usb/class/cdc-acm.c | 3 ++ + drivers/usb/common/ulpi.c | 23 ++++---- + drivers/usb/core/quirks.c | 6 +++ + drivers/usb/dwc3/dwc3-meson-g12a.c | 14 +++-- + drivers/usb/gadget/composite.c | 5 +- + drivers/usb/gadget/function/f_fs.c | 9 ++-- + drivers/usb/host/xhci-dbgcap.c | 60 ++++++++++++++++++++- + drivers/usb/host/xhci-dbgcap.h | 3 ++ + drivers/usb/misc/idmouse.c | 45 ++++++++-------- + drivers/usb/misc/iowarrior.c | 61 ++++++++++------------ + drivers/usb/misc/ldusb.c | 38 +++++++------- + drivers/usb/misc/legousbtower.c | 37 ++++++------- + drivers/usb/misc/usbio.c | 4 ++ + drivers/usb/mtu3/mtu3_gadget.c | 1 + + drivers/usb/serial/digi_acceleport.c | 43 +++++++++++---- + drivers/usb/serial/keyspan_pda.c | 2 +- + drivers/usb/serial/option.c | 16 ++++++ + drivers/usb/storage/usb.c | 2 +- + drivers/usb/typec/tcpm/tcpm.c | 5 ++ + drivers/usb/typec/ucsi/displayport.c | 4 +- + drivers/usb/typec/ucsi/ucsi_ccg.c | 2 +- + 25 files changed, 282 insertions(+), 142 deletions(-) +Merging usb-serial-fixes/usb-linus (6bfc8d01ac406 USB: serial: keyspan_pda: fix information leak) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'staging-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (fd354554af1d2 iio: adc: ad7779: add missing 'select IIO_TRIGGERED_BUFFER' to Kconfig) +$ 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/lpc32xx_adc.c +Auto-merging drivers/iio/adc/spear_adc.c +Auto-merging drivers/iio/adc/ti-ads124s08.c +Auto-merging drivers/iio/dac/mcp47feb02.c +Auto-merging drivers/iio/orientation/hid-sensor-rotation.c +Merge made by the 'ort' strategy. + drivers/hid/hid-sensor-hub.c | 77 +++++++++++++++++++++++-- + drivers/iio/accel/bmc150-accel-core.c | 2 + + drivers/iio/accel/kxsd9.c | 5 +- + drivers/iio/adc/Kconfig | 3 + + drivers/iio/adc/lpc32xx_adc.c | 4 +- + drivers/iio/adc/spear_adc.c | 3 +- + drivers/iio/adc/ti-ads1119.c | 6 +- + drivers/iio/adc/ti-ads124s08.c | 3 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 23 ++++++-- + drivers/iio/dac/mcp47feb02.c | 37 +++++++----- + drivers/iio/imu/adis_trigger.c | 2 +- + drivers/iio/imu/bmi160/bmi160_core.c | 3 +- + drivers/iio/light/Kconfig | 3 + + drivers/iio/light/gp2ap002.c | 2 +- + drivers/iio/orientation/hid-sensor-rotation.c | 40 ++++++++++++- + drivers/iio/pressure/mpl115.c | 4 +- + drivers/iio/temperature/Makefile | 2 +- + include/linux/hid-sensor-hub.h | 25 ++++++++ + 18 files changed, 201 insertions(+), 43 deletions(-) +Merging watchdog-fixes/watchdog (36e05e134ee44 watchdog: ni903x_wdt: Check ACPI_COMPANION() against NULL) +$ git merge -m Merge branch 'watchdog' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-fixes/watchdog +Merge made by the 'ort' strategy. + drivers/watchdog/ni903x_wdt.c | 7 ++++++- + drivers/watchdog/s32g_wdt.c | 3 +-- + 2 files changed, 7 insertions(+), 3 deletions(-) +Merging counter-current/counter-current (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (bc4a982889787 rust_binder: clear freeze listener on node removal) +$ 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 +Merge made by the 'ort' strategy. + drivers/android/binder.c | 31 ++++++++++---- + drivers/android/binder/allocation.rs | 5 ++- + drivers/android/binder/error.rs | 13 +++--- + drivers/android/binder/freeze.rs | 11 ++++- + drivers/android/binder/node.rs | 10 +++-- + drivers/android/binder/process.rs | 18 +++++++- + drivers/android/binder/rust_binder_events.c | 7 +++- + drivers/android/binder/stats.rs | 4 +- + drivers/android/binder/thread.rs | 65 ++++++++++++++++++++--------- + drivers/android/binder/transaction.rs | 15 ++++--- + 10 files changed, 124 insertions(+), 55 deletions(-) +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 (db79679595326 thunderbolt: Bound the DROM dual link port number before indexing sw->ports) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Merge made by the 'ort' strategy. + drivers/thunderbolt/eeprom.c | 9 ++++++++- + drivers/thunderbolt/stream.c | 2 +- + drivers/thunderbolt/tb.c | 2 +- + 3 files changed, 10 insertions(+), 3 deletions(-) +Merging input-current/for-linus (536394ec81419 Input: maple_keyb - set driver data before registering input device) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/joystick/maplecontrol.c | 3 ++- + drivers/input/keyboard/maple_keyb.c | 4 ++-- + drivers/input/mouse/maplemouse.c | 9 ++++++--- + 3 files changed, 10 insertions(+), 6 deletions(-) +Merging crypto-current/master (6ea0ce3a19f9c crypto: tegra - fix refcount leak in tegra_se_host1x_submit()) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (867621ba20302 dmaengine: qcom: bam_dma: Fix command element mask field for BAM v1.6.0+) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. + drivers/dma/idxd/cdev.c | 4 +++- + drivers/dma/idxd/init.c | 36 +++++------------------------------- + drivers/dma/sun6i-dma.c | 11 ++++------- + drivers/dma/switchtec_dma.c | 2 +- + include/linux/dma/qcom_bam_dma.h | 21 ++++++++++++++++----- + 5 files changed, 29 insertions(+), 45 deletions(-) +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 (16f7ec8d5dc10 mtd: nand: mtk-ecc: stop on ECC idle timeouts) +$ git merge -m Merge branch 'mtd/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/mtd_virt_concat.c | 4 ++-- + drivers/mtd/mtdpart.c | 8 ++++++++ + drivers/mtd/mtdswap.c | 5 ++++- + drivers/mtd/nand/ecc-mtk.c | 24 +++++++++++++++++++----- + drivers/mtd/nand/raw/Kconfig | 1 + + drivers/mtd/nand/raw/ingenic/ingenic_ecc.c | 7 ++++++- + drivers/mtd/nand/raw/ndfc.c | 2 +- + drivers/mtd/nand/spi/core.c | 2 +- + 8 files changed, 42 insertions(+), 11 deletions(-) +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 +Merge made by the 'ort' strategy. + drivers/reset/reset-imx7.c | 6 ++++++ + drivers/reset/reset-sunxi.c | 4 +++- + drivers/reset/spacemit/reset-spacemit-k3.c | 2 +- + include/dt-bindings/reset/altr,rst-mgr-s10.h | 2 +- + 4 files changed, 11 insertions(+), 3 deletions(-) +Merging mips-fixes/mips-fixes (0880884b36d12 MIPS: configs: Enable the current Ingenic USB PHY symbol) +$ git merge -m Merge branch 'mips-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Merge made by the 'ort' strategy. + arch/mips/configs/cu1000-neo_defconfig | 2 +- + arch/mips/configs/cu1830-neo_defconfig | 2 +- + arch/mips/configs/gcw0_defconfig | 2 +- + arch/mips/dec/platform.c | 6 +++++- + arch/mips/include/asm/irq_work.h | 9 +++++++++ + arch/mips/include/asm/smp.h | 2 ++ + arch/mips/loongson64/smp.c | 10 ++++++++++ + arch/mips/mm/init.c | 5 +++-- + arch/mips/vdso/elf.S | 3 +++ + 9 files changed, 35 insertions(+), 6 deletions(-) + create mode 100644 arch/mips/include/asm/irq_work.h +Merging at91-fixes/at91-fixes (765aaba18413a ARM: dts: microchip: sam9x7: fix GMAC clock configuration) +$ 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 (098e32cba334d x86/apic: KVM: Use cpu_physical_id() to get APIC ID of running vCPU for AVIC) +$ 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 (4cb62e371ffad KVM: s390: pci: Fix GISC refcount leak on AIF enable failure) +$ 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/kvm/pci.c | 1 + + 1 file changed, 1 insertion(+) +Merging kvm-arm-fixes/fixes (d098bb75d14fd KVM: arm64: account pKVM reclaim against the VM mm) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm-fixes/fixes +Auto-merging MAINTAINERS +Auto-merging arch/arm64/include/asm/kvm_nested.h +Auto-merging arch/arm64/kvm/at.c +Auto-merging arch/arm64/kvm/hyp/include/hyp/switch.h +Auto-merging arch/arm64/kvm/nested.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/arm64/include/asm/kvm_nested.h | 8 ++ + arch/arm64/kvm/at.c | 8 -- + arch/arm64/kvm/emulate-nested.c | 41 +++++--- + arch/arm64/kvm/hyp/include/hyp/switch.h | 11 ++- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 3 +- + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 3 +- + arch/arm64/kvm/inject_fault.c | 18 +--- + arch/arm64/kvm/nested.c | 164 ++++++++++++++++---------------- + arch/arm64/kvm/pkvm.c | 2 +- + arch/arm64/kvm/vgic/vgic.c | 20 ++-- + 11 files changed, 151 insertions(+), 128 deletions(-) +Merging hwmon-fixes/hwmon (fe87b8dc67f1b hwmon: (aspeed-g6-pwm-tach) Guard fan RPM calculation against divide-by-zero) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (a8aec14230322 nvdimm/bus: Fix potential use after free in asynchronous initialization) +$ git merge -m Merge branch 'libnvdimm-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (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 (8cd9520d35a6c Linux 7.1) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (437a8d2aa1aa4 pinctrl: qcom: sc8280xp: Add missing wakeup entries for GPIO143/151) +$ 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-msm.c | 8 ++++---- + drivers/pinctrl/qcom/pinctrl-sc8280xp.c | 21 +++++++++++---------- + 2 files changed, 15 insertions(+), 14 deletions(-) +Merging devicetree-fixes/dt/linus (b39a6b2e9d5bd dt-bindings: mfd: khadas,mcu: Drop type reference from "fan-supply") +$ 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 (5d5221f8a4064 scsi: devinfo: Broaden Promise VTrak E310/E610 identification) +$ 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 (acd7c71ba8d83 Merge tag 'drm-misc-fixes-2026-07-02' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Auto-merging drivers/gpu/drm/imagination/pvr_drv.c +Merge made by the 'ort' strategy. + drivers/accel/amdxdna/aie2_ctx.c | 68 +++++++++---- + drivers/accel/amdxdna/amdxdna_ctx.h | 1 + + drivers/accel/amdxdna/amdxdna_iommu.c | 43 +++++--- + drivers/accel/amdxdna/amdxdna_pci_drv.c | 38 ++++---- + drivers/accel/amdxdna/amdxdna_pci_drv.h | 1 + + drivers/dma-buf/dma-fence-unwrap.c | 3 + + drivers/dma-buf/dma-fence.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 13 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 12 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 46 +++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 8 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 17 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 58 +++++------ + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 9 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 13 +-- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 78 ++++++++++----- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 69 ++++++++----- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 24 +++-- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 3 - + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 11 +-- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 6 ++ + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/mes_v12_1.c | 2 + + drivers/gpu/drm/amd/amdgpu/psp_v15_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 56 +++++++++++ + drivers/gpu/drm/amd/amdgpu/soc24.c | 28 ++++++ + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 15 +-- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 12 +-- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 10 ++ + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 25 ++++- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 16 +-- + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.h | 62 ++++++------ + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 15 ++- + .../drm/amd/display/dc/dce/dce_stream_encoder.h | 3 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 5 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_log.c | 30 +++--- + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 2 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 26 +++-- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 11 ++- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 15 +-- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 6 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 14 ++- + drivers/gpu/drm/arm/malidp_drv.c | 22 +++-- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 4 +- + drivers/gpu/drm/i915/display/intel_bios.c | 36 +++++-- + drivers/gpu/drm/i915/display/intel_hdcp.c | 12 ++- + drivers/gpu/drm/i915/display/intel_vrr.c | 4 + + drivers/gpu/drm/i915/i915_active.c | 7 +- + drivers/gpu/drm/imagination/pvr_context.c | 18 ++-- + drivers/gpu/drm/imagination/pvr_drv.c | 19 ++-- + drivers/gpu/drm/imagination/pvr_queue.c | 6 +- + drivers/gpu/drm/imagination/pvr_queue.h | 2 +- + drivers/gpu/drm/imagination/pvr_vm.c | 6 +- + drivers/gpu/drm/panthor/panthor_device.c | 4 + + drivers/gpu/drm/panthor/panthor_device.h | 17 ++-- + drivers/gpu/drm/panthor/panthor_fw.c | 6 +- + drivers/gpu/drm/panthor/panthor_gpu.c | 3 +- + drivers/gpu/drm/panthor/panthor_mmu.c | 9 +- + drivers/gpu/drm/panthor/panthor_pwr.c | 10 +- + drivers/gpu/drm/panthor/panthor_sched.c | 108 ++++++++++++--------- + drivers/gpu/drm/virtio/virtgpu_vq.c | 3 +- + drivers/gpu/drm/xe/display/xe_display_bo.c | 3 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 3 +- + drivers/gpu/drm/xe/tests/xe_rtp_test.c | 103 ++++++++------------ + drivers/gpu/drm/xe/xe_drm_client.c | 12 ++- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 4 +- + drivers/gpu/drm/xe/xe_guc_relay.c | 13 ++- + drivers/gpu/drm/xe/xe_guc_submit.c | 9 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 20 ++-- + drivers/gpu/drm/xe/xe_hw_engine_types.h | 8 ++ + drivers/gpu/drm/xe/xe_oa.c | 7 ++ + drivers/gpu/drm/xe/xe_oa_types.h | 3 + + drivers/gpu/drm/xe/xe_pt.c | 67 ++++++++++--- + drivers/gpu/drm/xe/xe_reg_whitelist.c | 102 ++++++++++++++++--- + drivers/gpu/drm/xe/xe_reg_whitelist.h | 4 + + drivers/gpu/drm/xe/xe_rtp.c | 31 +++--- + drivers/gpu/drm/xe/xe_rtp.h | 24 ++++- + drivers/gpu/drm/xe/xe_rtp_types.h | 10 ++ + drivers/gpu/drm/xe/xe_svm.c | 6 +- + drivers/gpu/drm/xe/xe_svm.h | 15 ++- + drivers/gpu/drm/xe/xe_tuning.c | 45 ++++----- + drivers/gpu/drm/xe/xe_userptr.c | 2 +- + drivers/gpu/drm/xe/xe_wa.c | 89 +++++++++-------- + include/drm/display/drm_dp_helper.h | 1 + + include/drm/drm_fixed.h | 3 +- + include/drm/drm_ras.h | 2 + + 115 files changed, 1228 insertions(+), 643 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (2084503f2d087 drm/i915/bios: range check LFP Data Block panel_type2) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (5d6919055dec1 Linux 7.1-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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging risc-v-fixes/fixes (bc7b086a45521 riscv: probes: save original sp in rethook trampoline) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'ort' strategy. + arch/riscv/Kconfig | 3 ++- + arch/riscv/kernel/asm-offsets.c | 4 ++-- + arch/riscv/kernel/entry.S | 8 ++++---- + arch/riscv/kernel/probes/rethook_trampoline.S | 3 +++ + arch/riscv/kernel/smpboot.c | 5 ++--- + arch/riscv/kernel/vdso/note.S | 3 +++ + drivers/acpi/riscv/rimt.c | 7 ++++--- + lib/raid/raid6/riscv/recov_rvv.c | 1 + + lib/raid/raid6/riscv/rvv.c | 1 + + scripts/sorttable.c | 11 ++++++++--- + 10 files changed, 30 insertions(+), 16 deletions(-) +Merging riscv-dt-fixes/riscv-dt-fixes (0df8aa2b9aec5 riscv: dts: microchip: fix icicle i2c pinctrl configuration) +$ git merge -m Merge branch 'riscv-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (75ef233975589 soc: microchip: mpfs-sys-controller: fix resource leak on probe error) +$ 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 (9777530157e7b pinctrl: meson: restore non-sleeping GPIO access) +$ 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 +Auto-merging drivers/gpio/gpio-shared-proxy.c +CONFLICT (content): Merge conflict in drivers/gpio/gpio-shared-proxy.c +Resolved 'drivers/gpio/gpio-shared-proxy.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b330bdab6b879] Merge branch 'gpio/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpio/gpio-f7188x.c | 6 ++- + drivers/gpio/gpio-htc-egpio.c | 6 ++- + drivers/gpio/gpio-mt7621.c | 27 +++++++------ + drivers/gpio/gpio-mvebu.c | 5 ++- + drivers/gpio/gpio-shared-proxy.c | 76 +++++++++++++---------------------- + drivers/gpio/gpio-timberdale.c | 2 +- + drivers/gpio/gpiolib-shared.c | 9 +---- + drivers/gpio/gpiolib-shared.h | 28 +------------ + drivers/pinctrl/meson/pinctrl-meson.c | 2 +- + 9 files changed, 61 insertions(+), 100 deletions(-) +Merging gpio-intel-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'kunit-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging memblock-fixes/fixes (2ebce860bdd7a mm/mm_init: handle alloc_percpu failure in free_area_init_core_hotplug) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Auto-merging mm/mm_init.c +Merge made by the 'ort' strategy. + include/linux/memory_hotplug.h | 2 +- + mm/memory_hotplug.c | 3 ++- + mm/mm_init.c | 19 +++++++++++++------ + 3 files changed, 16 insertions(+), 8 deletions(-) +Merging renesas-fixes/fixes (8a78d1c454b3c Merge branch 'renesas-pinctrl-fixes-for-v7.1' into renesas-fixes) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Merge made by the 'ort' strategy. +Merging perf-current/perf-tools (558ef39aeb9a0 Merge tag 'dmaengine-7.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine) +$ 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 (254f49634ee16 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (608045a91d917 rust: allow `suspicious_runtime_symbol_definitions` lint for Rust >= 1.98) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Merge made by the 'ort' strategy. + init/Kconfig | 3 +++ + rust/bindings/lib.rs | 4 ++++ + rust/uapi/lib.rs | 4 ++++ + 3 files changed, 11 insertions(+) +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 (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (f29a24c947054 Merge tag 'qcom-clk-fixes-for-7.1' 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 (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'thead-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk-fixes/thead-clk-fixes +Already up to date. +Merging 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 (254f49634ee16 Linux 7.1-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 (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux spacemit-fixes/fixes +Already up to date. +Merging tip-fixes/tip/urgent (ea9a328fbc5bb Merge branch into tip/master: 'x86/urgent') +$ git merge -m Merge branch 'tip/urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Merge made by the 'ort' strategy. + arch/x86/kernel/cpu/resctrl/monitor.c | 5 +++++ + drivers/irqchip/irq-gic-v3-its.c | 6 ++---- + drivers/irqchip/irq-riscv-imsic-early.c | 15 ++++++------- + drivers/irqchip/irq-ts4800.c | 10 +++++++++ + fs/resctrl/monitor.c | 37 +++++++++++++++++++-------------- + kernel/futex/requeue.c | 6 ------ + 6 files changed, 46 insertions(+), 33 deletions(-) +Merging slab-fixes/slab/for-next-fixes (67ea9d353d0ba mm/slub: hold cpus_read_lock around flush_rcu_sheaves_on_cache()) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (db339b6bc9f23 dt-bindings: display/msm: Fix typo in clock-names property) +$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes +Already up to date. +Merging uml-fixes/fixes (254f49634ee16 Linux 7.1-rc1) +$ 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 (4549871118cf6 Linux 7.1-rc7) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-fixes/for-linux-next-fixes +Already up to date. +Merging tenstorrent-dt-fixes/tenstorrent-dt-fixes (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 (e87faad807329 nfc: nci: fix out-of-bounds write in nci_target_auto_activated()) +$ git merge -m Merge branch 'for-linus' of https://codeberg.org/linux-nfc/linux.git nfc-fixes/for-linus +Merge made by the 'ort' strategy. + net/nfc/digital_technology.c | 2 ++ + net/nfc/llcp_commands.c | 18 ++++++++++++++++-- + net/nfc/llcp_core.c | 29 +++++++++++++++++++++-------- + net/nfc/llcp_sock.c | 14 +++++++++++--- + net/nfc/nci/data.c | 10 +++++----- + net/nfc/nci/ntf.c | 32 ++++++++++++++++++++++++++++---- + net/nfc/nci/rsp.c | 28 ++++++++++++++++++++++++++-- + 7 files changed, 109 insertions(+), 24 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (63bbf9ac5dde2 accel/amdxdna: Fix use-after-free in amdxdna_gem_dmabuf_mmap()) +$ 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 | 1 + + 1 file changed, 1 insertion(+) +Merging rust/rust-next (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (039892c35f9d8 tools/include: include stdint.h for SIZE_MAX in overflow.h) +$ 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 .mailmap +Auto-merging MAINTAINERS +Auto-merging include/linux/damon.h +Auto-merging mm/damon/ops-common.c +Auto-merging mm/damon/sysfs-schemes.c +Merge made by the 'ort' strategy. + .mailmap | 4 ++ + MAINTAINERS | 3 +- + fs/proc/page.c | 2 +- + include/linux/damon.h | 11 +++- + include/linux/fs.h | 5 ++ + include/linux/page_ext.h | 19 ++++-- + mm/compaction.c | 7 +-- + mm/damon/ops-common.c | 1 + + mm/damon/sysfs-schemes.c | 17 +++--- + mm/filemap.c | 2 +- + mm/madvise.c | 3 +- + mm/mincore.c | 3 +- + mm/shrinker.c | 13 +++- + mm/shrinker_debug.c | 10 ++-- + samples/damon/mtier.c | 3 + + tools/include/linux/overflow.h | 1 + + tools/testing/selftests/mm/hmm-tests.c | 1 + + tools/testing/selftests/mm/ksft_process_madv.sh | 2 +- + tools/testing/selftests/mm/pagemap_ioctl.c | 12 ++-- + tools/virtio/asm/percpu_types.h | 7 +++ + tools/virtio/linux/completion.h | 9 +++ + tools/virtio/linux/device.h | 1 + + tools/virtio/linux/dma-mapping.h | 1 + + tools/virtio/linux/mod_devicetable.h | 14 +++++ + tools/virtio/linux/virtio_features.h | 79 +++++++++++++++++++++++++ + 25 files changed, 187 insertions(+), 43 deletions(-) + create mode 100644 tools/virtio/asm/percpu_types.h + create mode 100644 tools/virtio/linux/completion.h + create mode 100644 tools/virtio/linux/mod_devicetable.h + create mode 100644 tools/virtio/linux/virtio_features.h +Merging mm-nonmm-stable/mm-nonmm-stable (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm-unstable/mm-unstable (cfb8731f5396c mm: fix CONFIG_STACK_GROWSUP typo in tools/testing/vma/include/dup.h) +$ git merge -m Merge branch 'mm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-unstable/mm-unstable +Auto-merging MAINTAINERS +Auto-merging arch/riscv/Kconfig +Auto-merging mm/mm_init.c +Merge made by the 'ort' strategy. + CREDITS | 4 + + Documentation/ABI/testing/sysfs-kernel-mm-damon | 40 +++ + Documentation/admin-guide/kernel-parameters.txt | 7 +- + Documentation/admin-guide/mm/damon/usage.rst | 8 +- + Documentation/admin-guide/sysctl/vm.rst | 80 +++++ + Documentation/core-api/maple_tree.rst | 21 +- + Documentation/core-api/mm-api.rst | 1 + + Documentation/driver-api/basics.rst | 3 + + Documentation/mm/damon/design.rst | 18 +- + Documentation/mm/page_owner.rst | 77 ++++- + MAINTAINERS | 21 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/pgtable.h | 4 +- + arch/arm64/include/asm/vmalloc.h | 6 +- + arch/arm64/mm/hugetlbpage.c | 10 + + arch/csky/abiv1/inc/abi/cacheflush.h | 7 +- + arch/loongarch/Kconfig | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 2 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 7 +- + arch/powerpc/mm/hugetlbpage.c | 13 +- + arch/powerpc/platforms/Kconfig.cputype | 2 +- + arch/riscv/Kconfig | 2 +- + arch/riscv/include/asm/pgtable.h | 8 +- + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/pgtable.h | 2 +- + arch/sparc/include/asm/pgtable_64.h | 4 - + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/pgtable.h | 2 +- + drivers/base/arch_numa.c | 4 - + fs/proc/task_mmu.c | 3 +- + include/asm-generic/fixmap.h | 4 +- + include/asm-generic/getorder.h | 4 +- + 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/linux/cpuset.h | 4 +- + include/linux/damon.h | 15 +- + include/linux/gfp_types.h | 5 +- + include/linux/huge_mm.h | 2 +- + include/linux/hugetlb.h | 33 +- + include/linux/hugetlb_cgroup.h | 2 +- + include/linux/leafops.h | 28 +- + include/linux/lockdep.h | 3 + + include/linux/lockdep_types.h | 3 +- + include/linux/maple_tree.h | 10 +- + include/linux/migrate.h | 6 +- + include/linux/migrate_mode.h | 1 + + include/linux/mm.h | 46 ++- + include/linux/mm_inline.h | 4 +- + include/linux/mm_types.h | 1 + + include/linux/mmzone.h | 43 ++- + include/linux/oom.h | 2 +- + include/linux/page-flags.h | 14 - + include/linux/page_owner.h | 7 +- + include/linux/percpu-refcount.h | 5 +- + include/linux/pfn.h | 2 +- + include/linux/pgtable.h | 39 +-- + include/linux/radix-tree.h | 5 +- + include/linux/sched.h | 1 + + include/linux/swap.h | 9 +- + include/linux/swapops.h | 6 +- + include/linux/vmalloc.h | 4 +- + include/linux/vmpressure.h | 48 ++- + include/linux/writeback.h | 2 +- + include/trace/events/damon.h | 8 +- + include/trace/events/migrate.h | 11 +- + include/trace/events/pagemap.h | 8 + + kernel/cgroup/cpuset.c | 2 +- + kernel/locking/lockdep.c | 58 +++- + lib/Kconfig.debug | 28 -- + lib/Makefile | 1 - + lib/maple_tree.c | 353 ++++++++++++++------- + lib/percpu-refcount.c | 2 +- + lib/test_hmm.c | 2 +- + mm/Kconfig | 2 +- + mm/Kconfig.debug | 28 ++ + mm/Makefile | 1 + + {lib => mm}/alloc_tag.c | 0 + mm/cma.c | 3 +- + mm/damon/core.c | 278 ++++++++-------- + mm/damon/paddr.c | 9 +- + mm/damon/stat.c | 2 +- + mm/damon/sysfs-schemes.c | 28 +- + mm/damon/sysfs.c | 125 +++++--- + mm/damon/tests/core-kunit.h | 144 +++++++-- + mm/damon/vaddr.c | 12 +- + mm/debug_vm_pgtable.c | 12 +- + mm/filemap.c | 36 ++- + mm/hmm.c | 4 +- + mm/huge_memory.c | 17 +- + mm/hugetlb.c | 268 ++++++++-------- + mm/hugetlb_cma.c | 140 ++++++-- + mm/hugetlb_cma.h | 8 +- + mm/hugetlb_vmemmap.c | 137 +++----- + mm/hugetlb_vmemmap.h | 5 - + mm/internal.h | 29 +- + mm/kasan/hw_tags.c | 2 +- + mm/kmemleak.c | 91 ++++-- + mm/ksm.c | 17 +- + mm/madvise.c | 6 +- + mm/memcontrol-v1.c | 292 +++++++++++++++++ + mm/memcontrol-v1.h | 6 - + mm/memcontrol.c | 4 +- + mm/memory-failure.c | 108 +++++-- + mm/memory.c | 11 +- + mm/mempolicy.c | 21 +- + mm/migrate.c | 68 ++-- + mm/migrate_device.c | 34 +- + mm/mincore.c | 11 +- + mm/mlock.c | 2 +- + mm/mm_init.c | 86 ++--- + mm/mmzone.c | 5 +- + mm/mprotect.c | 21 +- + mm/page_alloc.c | 81 ++--- + mm/page_owner.c | 311 ++++++++++++++---- + mm/percpu-vm.c | 48 ++- + mm/percpu.c | 20 +- + mm/rmap.c | 9 +- + mm/shmem.c | 13 +- + mm/show_mem.c | 9 +- + mm/slab.h | 2 +- + mm/sparse-vmemmap.c | 26 +- + mm/sparse.c | 50 +-- + mm/swap.c | 21 +- + mm/swap.h | 4 +- + mm/swap_state.c | 2 - + mm/swapfile.c | 16 +- + mm/userfaultfd.c | 10 +- + mm/vmalloc.c | 275 ++++++++++++---- + mm/vmpressure.c | 301 +----------------- + mm/vmscan.c | 14 +- + mm/vmstat.c | 2 +- + mm/zsmalloc.c | 230 +++++++++++--- + samples/damon/Kconfig | 2 +- + samples/damon/mtier.c | 14 +- + samples/damon/prcl.c | 11 +- + samples/damon/wsse.c | 11 +- + scripts/gdb/linux/page_owner.py | 4 +- + tools/mm/.gitignore | 1 + + tools/mm/Makefile | 4 +- + tools/mm/page_owner_filter.c | 310 ++++++++++++++++++ + tools/mm/page_owner_sort.c | 87 ++++- + tools/testing/radix-tree/maple.c | 4 +- + 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 | 77 ++++- + tools/testing/selftests/damon/sysfs_refresh.py | 75 +++++ + ..._update_schemes_tried_regions_wss_estimation.py | 2 +- + tools/testing/selftests/mm/Makefile | 4 + + tools/testing/selftests/mm/hwpoison-panic.sh | 255 +++++++++++++++ + tools/testing/selftests/mm/pkey-helpers.h | 4 +- + tools/testing/selftests/mm/pkey-powerpc.h | 2 +- + tools/testing/selftests/mm/pkey_sighandler_tests.c | 81 ++--- + tools/testing/selftests/mm/pkey_util.c | 86 +++++ + tools/testing/selftests/mm/protection_keys.c | 95 +----- + tools/testing/selftests/mm/uffd-common.c | 9 +- + tools/testing/vma/include/dup.h | 2 +- + 164 files changed, 4013 insertions(+), 1929 deletions(-) + rename {lib => mm}/alloc_tag.c (100%) + create mode 100644 tools/mm/page_owner_filter.c + create mode 100755 tools/testing/selftests/damon/sysfs_refresh.py + create mode 100755 tools/testing/selftests/mm/hwpoison-panic.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 (604ad02caddab ocfs2: fix hung task in orphan recovery) +$ git merge -m Merge branch 'mm-nonmm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/kernel/entry.S +Auto-merging lib/Kconfig.debug +Auto-merging mm/sparse-vmemmap.c +Merge made by the 'ort' strategy. + Documentation/accounting/delay-accounting.rst | 43 ++++ + arch/riscv/include/asm/cacheflush.h | 15 +- + arch/riscv/include/asm/pgtable.h | 13 +- + arch/riscv/kernel/entry.S | 11 +- + arch/riscv/mm/init.c | 6 + + drivers/media/v4l2-core/v4l2-vp9.c | 30 +-- + fs/fat/misc.c | 4 + + fs/ocfs2/cluster/heartbeat.c | 43 ++-- + fs/ocfs2/cluster/nodemanager.c | 19 +- + fs/ocfs2/cluster/nodemanager.h | 2 + + fs/ocfs2/dir.c | 20 +- + fs/ocfs2/namei.c | 17 +- + fs/ramfs/file-nommu.c | 3 + + include/linux/nmi.h | 4 +- + ipc/ipc_sysctl.c | 2 +- + kernel/params.c | 4 +- + kernel/resource.c | 2 +- + kernel/signal.c | 36 +--- + kernel/watchdog.c | 16 +- + lib/Kconfig.debug | 17 ++ + lib/idr.c | 55 +++-- + lib/kstrtox.c | 37 ++-- + lib/math/tests/Makefile | 1 + + lib/math/tests/polynomial_kunit.c | 270 ++++++++++++++++++++++++ + lib/string.c | 3 +- + lib/test_ida.c | 14 ++ + 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 +- + mm/sparse-vmemmap.c | 8 + + tools/accounting/delaytop.c | 286 ++++++++++++++++++++++---- + tools/accounting/getdelays.c | 5 + + tools/include/linux/compiler.h | 2 +- + 34 files changed, 835 insertions(+), 224 deletions(-) + create mode 100644 lib/math/tests/polynomial_kunit.c +$ git reset --hard HEAD^ +HEAD is now at c2ba419b97b74 Merge branch 'mm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +Merging next-20260702 version of mm-nonmm-unstable +$ git merge -m next-20260702/mm-nonmm-unstable 2ee1282ed36ff65ff425a4c6d3121bd701dcd547 +Auto-merging .mailmap +Auto-merging Documentation/ABI/testing/sysfs-kernel-mm-damon +Auto-merging MAINTAINERS +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/kernel/entry.S +Auto-merging include/linux/damon.h +Auto-merging kernel/cgroup/cpuset.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/bootconfig.c +CONFLICT (content): Merge conflict in lib/bootconfig.c +Auto-merging lib/test_hmm.c +Auto-merging mm/damon/core.c +Auto-merging mm/damon/ops-common.c +Auto-merging mm/damon/paddr.c +Auto-merging mm/damon/sysfs-schemes.c +Auto-merging mm/damon/sysfs.c +Auto-merging mm/damon/tests/core-kunit.h +Auto-merging mm/damon/vaddr.c +Auto-merging mm/huge_memory.c +Auto-merging mm/mm_init.c +Auto-merging mm/sparse-vmemmap.c +Resolved 'lib/bootconfig.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9a1f67f21db20] next-20260702/mm-nonmm-unstable +$ git diff -M --stat --summary HEAD^.. + arch/riscv/include/asm/cacheflush.h | 15 +- + arch/riscv/include/asm/pgtable.h | 13 +- + arch/riscv/kernel/entry.S | 11 +- + arch/riscv/mm/init.c | 6 + + drivers/media/v4l2-core/v4l2-vp9.c | 30 ++-- + fs/fat/misc.c | 4 + + fs/ocfs2/cluster/heartbeat.c | 43 ++++-- + fs/ocfs2/cluster/nodemanager.c | 19 ++- + fs/ocfs2/cluster/nodemanager.h | 2 + + fs/ocfs2/namei.c | 6 +- + fs/ramfs/file-nommu.c | 3 + + include/linux/nmi.h | 4 +- + ipc/ipc_sysctl.c | 2 +- + kernel/params.c | 4 +- + kernel/resource.c | 2 +- + kernel/signal.c | 36 ++--- + kernel/watchdog.c | 16 +-- + lib/Kconfig | 6 - + lib/Kconfig.debug | 26 ++++ + lib/idr.c | 55 ++++---- + lib/math/tests/Makefile | 1 + + lib/math/tests/polynomial_kunit.c | 270 ++++++++++++++++++++++++++++++++++++ + lib/random32.c | 184 ++---------------------- + lib/string.c | 3 +- + lib/test_ida.c | 14 ++ + lib/tests/Makefile | 1 + + lib/tests/random32_kunit.c | 181 ++++++++++++++++++++++++ + 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 +- + mm/sparse-vmemmap.c | 8 ++ + tools/accounting/delaytop.c | 2 +- + tools/include/linux/compiler.h | 2 +- + 34 files changed, 704 insertions(+), 336 deletions(-) + create mode 100644 lib/math/tests/polynomial_kunit.c + create mode 100644 lib/tests/random32_kunit.c +Merging kbuild/kbuild-for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (f6e5090f63b0a perf tests: Include error output for skipped tests in JUnit XML) +$ git merge -m Merge branch 'perf-tools-next' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Merge made by the 'ort' strategy. + tools/perf/Makefile.perf | 7 +- + 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/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-ftrace.c | 14 +- + tools/perf/builtin-inject.c | 9 +- + tools/perf/builtin-kvm.c | 14 +- + tools/perf/builtin-kwork.c | 8 +- + tools/perf/builtin-lock.c | 4 +- + tools/perf/builtin-record.c | 95 +- + tools/perf/builtin-report.c | 6 +- + tools/perf/builtin-sched.c | 46 +- + tools/perf/builtin-script.c | 16 +- + tools/perf/builtin-stat.c | 103 +- + tools/perf/builtin-timechart.c | 212 +- + tools/perf/builtin-top.c | 104 +- + tools/perf/builtin-trace.c | 65 +- + .../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 + + .../pmu-events/arch/x86/arrowlake/pipeline.json | 129 +- + .../pmu-events/arch/x86/emeraldrapids/cache.json | 9 + + .../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/pipeline.json | 27 +- + .../arch/x86/lunarlake/uncore-memory.json | 208 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 12 +- + .../pmu-events/arch/x86/pantherlake/counter.json | 5 + + .../pmu-events/arch/x86/pantherlake/pipeline.json | 29 +- + .../arch/x86/pantherlake/uncore-interconnect.json | 10 + + .../arch/x86/pantherlake/uncore-memory.json | 221 +- + tools/perf/python/perf.pyi | 672 ++++++ + tools/perf/python/perf_live.py | 59 + + tools/perf/scripts/python/powerpc-hcalls.py | 137 +- + tools/perf/tests/backward-ring-buffer.c | 26 +- + tools/perf/tests/builtin-test.c | 181 +- + 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 | 45 +- + tools/perf/tests/shell/inject_aslr.sh | 10 +- + tools/perf/tests/shell/jitdump-python.sh | 69 +- + tools/perf/tests/shell/kvm.sh | 61 +- + .../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 | 32 +- + tools/perf/tests/shell/pipe_test.sh | 4 +- + tools/perf/tests/shell/record.sh | 173 +- + tools/perf/tests/shell/record_lbr.sh | 50 +- + tools/perf/tests/shell/record_offcpu.sh | 14 +- + tools/perf/tests/shell/stat_all_metrics.sh | 77 +- + tools/perf/tests/shell/stat_bpf_counters.sh | 28 +- + tools/perf/tests/shell/stat_metrics_values.sh | 9 +- + tools/perf/tests/shell/test_brstack.sh | 99 +- + 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/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/noploop.c | 17 +- + tools/perf/tests/workloads/thloop.c | 16 +- + tools/perf/ui/browsers/annotate.c | 2 +- + tools/perf/ui/browsers/hists.c | 22 +- + tools/perf/util/Build | 1 - + tools/perf/util/amd-sample-raw.c | 2 +- + tools/perf/util/annotate-data.c | 2 +- + tools/perf/util/annotate.c | 10 +- + tools/perf/util/aslr.c | 1 + + tools/perf/util/auxtrace.c | 14 +- + tools/perf/util/block-info.c | 4 +- + 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 +- + tools/perf/util/bpf_trace_augment.c | 8 +- + tools/perf/util/cgroup.c | 26 +- + tools/perf/util/cs-etm.c | 5 +- + tools/perf/util/data-convert-bt.c | 2 +- + tools/perf/util/data.c | 27 +- + tools/perf/util/data.h | 4 +- + tools/perf/util/evlist.c | 494 ++-- + tools/perf/util/evlist.h | 273 ++- + tools/perf/util/evsel.c | 39 +- + tools/perf/util/evsel.h | 42 +- + tools/perf/util/expr.c | 2 +- + tools/perf/util/header.c | 69 +- + tools/perf/util/header.h | 2 +- + tools/perf/util/intel-pt.c | 8 +- + 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/map.h | 9 +- + tools/perf/util/metricgroup.c | 38 +- + 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 | 2503 +++++++++++++++++--- + 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 | 5 + + tools/perf/util/sideband_evlist.c | 40 +- + tools/perf/util/sort.c | 2 +- + tools/perf/util/stat-display.c | 6 +- + tools/perf/util/stat-shadow.c | 24 +- + tools/perf/util/stat.c | 22 +- + tools/perf/util/stream.c | 4 +- + tools/perf/util/synthetic-events.c | 11 +- + tools/perf/util/time-utils.c | 12 +- + tools/perf/util/top.c | 4 +- + 157 files changed, 6165 insertions(+), 1862 deletions(-) + create mode 100644 tools/perf/pmu-events/arch/x86/pantherlake/uncore-interconnect.json + create mode 100644 tools/perf/python/perf.pyi + create mode 100755 tools/perf/python/perf_live.py + create mode 100644 tools/perf/tests/shell/lib/perf_record.sh +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 (7318301e060e3 dma: map_benchmark: turn dma_sg_map_param buf into a flexible array) +$ git merge -m Merge branch 'dma-mapping-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next +Already up to date. +Merging asm-generic/master (adbbd9714f805 scripts: headers_install.sh: Remove config leak ignore machinery) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic asm-generic/master +Already up to date. +Merging alpha/alpha-next (d58041d2c63e0 MAINTAINERS: Add Magnus Lindholm as maintainer for alpha port) +$ git merge -m Merge branch 'alpha-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next +Already up to date. +Merging arm/for-next (75ca78c7d982a 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/probes/kprobes/test-core.c | 14 +++----------- + 1 file changed, 3 insertions(+), 11 deletions(-) +Merging arm64/for-next/core (36fa5ffa60344 arm64: mm: Defer read-only remap of data/bss linear alias) +$ 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 (972ea78305bdd 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 | 200 +++++++++++++++++++++++++++++++++ + 1 file changed, 200 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (4336e970ec689 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. + .../soc/amlogic/amlogic,meson-gx-clk-measure.yaml | 2 + + arch/arm64/boot/dts/amlogic/amlogic-a9.dtsi | 140 +++++++++++ + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 5 + + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 5 + + drivers/soc/amlogic/meson-clk-measure.c | 272 +++++++++++++++++++++ + 5 files changed, 424 insertions(+) +Merging asahi-soc/asahi-soc/for-next (31f24e4f6b1ac Merge branch 'apple-soc/dt-7.2' 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 (6d892f8d5cd9f Merge branch 'clk-microchip-fixes' into at91-next) +$ git merge -m Merge branch 'at91-next' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging bmc/for-next (40ae2e16214ad Merge branch 'nuvoton/arm/dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/nuvoton/nuvoton-common-npcm7xx.dtsi | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) +Merging broadcom/next (f705b0c80bab1 arm: dts: bcm2711: Fix typo in gpio-line-names) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. +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 (1527acf2295cf memory: stm32_omm: initialize ret in stm32_omm_set_amcr) +$ 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 +Auto-merging drivers/memory/stm32_omm.c +Merge made by the 'ort' strategy. + drivers/memory/stm32_omm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fsl/soc_fsl (c99d8ac7b355c bus: fsl-mc: wait for the MC firmware to complete its boot) +$ git merge -m Merge branch 'soc_fsl' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git fsl/soc_fsl +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/irqchip/Makefile +Auto-merging drivers/irqchip/irq-gic-its-msi-parent.c +Auto-merging drivers/soc/fsl/qe/qe.c +Auto-merging include/linux/fsl/mc.h +Merge made by the 'ort' strategy. +Merging imx-mxs/for-next (d0c222c2e2ce5 Merge branches 'imx/dt', 'imx/dt64' and 'imx/soc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 12 + + .../bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml | 39 + + arch/arm/boot/dts/nxp/imx/imx7d-pico.dtsi | 23 + + arch/arm/mach-imx/avic.c | 2 + + arch/arm/mach-imx/common.h | 7 - + arch/arm/mach-imx/src.c | 3 + + arch/arm/mach-imx/system.c | 8 - + arch/arm64/boot/dts/freescale/Makefile | 16 + + .../boot/dts/freescale/imx8mm-var-som-symphony.dts | 12 + + arch/arm64/boot/dts/freescale/imx8mp-ab2.dts | 4 + + .../boot/dts/freescale/imx8mp-evk-flexcan2.dtso | 15 + + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 23 +- + arch/arm64/boot/dts/freescale/imx8mp-frdm.dts | 2 + + ...imx8mp-tqma8mpqs-mb-smarc-2-lvds-g133han01.dtso | 81 ++ + ...8mp-tqma8mpqs-mb-smarc-2-lvds0-tm070jvhg33.dtso | 43 + + ...8mp-tqma8mpqs-mb-smarc-2-lvds1-tm070jvhg33.dtso | 43 + + .../dts/freescale/imx8mp-tqma8mpqs-mb-smarc-2.dts | 380 +++++++ + .../arm64/boot/dts/freescale/imx8mp-tqma8mpqs.dtsi | 1178 ++++++++++++++++++++ + .../boot/dts/freescale/imx8mp-var-som-symphony.dts | 389 ++++++- + arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 22 + + .../freescale/imx93-11x11-evk-dy1212w-4856.dtso | 81 ++ + .../boot/dts/freescale/imx93-kontron-osm-s.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx93.dtsi | 39 +- + arch/arm64/boot/dts/freescale/imx94.dtsi | 5 +- + arch/arm64/boot/dts/freescale/imx943.dtsi | 5 +- + .../boot/dts/freescale/imx95-toradex-smarc.dtsi | 1 + + drivers/firmware/imx/sm-misc.c | 3 + + 28 files changed, 2426 insertions(+), 26 deletions(-) + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-flexcan2.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-tqma8mpqs-mb-smarc-2-lvds-g133han01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-tqma8mpqs-mb-smarc-2-lvds0-tm070jvhg33.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-tqma8mpqs-mb-smarc-2-lvds1-tm070jvhg33.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-tqma8mpqs-mb-smarc-2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-tqma8mpqs.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-11x11-evk-dy1212w-4856.dtso +Merging mediatek/for-next (eb3e990db3569 arm64: dts: mediatek: mt8188-geralt: Add supply for SPI NOR flash) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 + + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 110 ++++++++++++------------ + arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi | 1 + + 3 files changed, 58 insertions(+), 55 deletions(-) +Merging mvebu/for-next (3ea0dabfa4500 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. + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 1 + + 1 file changed, 1 insertion(+) +Merging omap/for-next (f338cc54e10ab Merge branch 'omap-for-v7.3/drivers' into tmp/omap-next-20260629.131449) +$ 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. + arch/arm/boot/dts/ti/davinci/da850-lcdk.dts | 2 +- + arch/arm/boot/dts/ti/omap/Makefile | 4 + + .../dts/ti/omap/am335x-icev2-prueth-overlay.dtso | 156 +++++++++++++++++++++ + arch/arm/boot/dts/ti/omap/am33xx-l4.dtsi | 13 +- + arch/arm/boot/dts/ti/omap/am3517-evm.dts | 2 +- + arch/arm/boot/dts/ti/omap/am4372.dtsi | 11 ++ + arch/arm/boot/dts/ti/omap/am437x-idk-evm.dts | 103 +++++++++++++- + arch/arm/boot/dts/ti/omap/am437x-l4.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/am57-pruss.dtsi | 11 ++ + arch/arm/boot/dts/ti/omap/am571x-idk.dts | 8 +- + arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts | 2 +- + arch/arm/boot/dts/ti/omap/am572x-idk.dts | 10 +- + arch/arm/boot/dts/ti/omap/am574x-idk.dts | 10 +- + arch/arm/boot/dts/ti/omap/am57xx-idk-common.dtsi | 61 ++++++++ + arch/arm/boot/dts/ti/omap/dm814x.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/dm816x.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/dra7-l4.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap2430.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap3.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap4-l4.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap4-panda-es.dts | 2 +- + arch/arm/boot/dts/ti/omap/omap4-var-som-om44.dtsi | 14 ++ + arch/arm/boot/dts/ti/omap/omap5-l4.dtsi | 6 +- + arch/arm/configs/multi_v7_defconfig | 2 + + arch/arm/configs/omap2plus_defconfig | 11 ++ + arch/arm/mach-omap2/omap_hwmod.c | 26 ++-- + arch/arm/mach-omap2/sleep44xx.S | 5 +- + 27 files changed, 438 insertions(+), 35 deletions(-) + create mode 100644 arch/arm/boot/dts/ti/omap/am335x-icev2-prueth-overlay.dtso +Merging qcom/for-next (ba3ccc2ed7614 Merge branches 'arm64-fixes-for-7.2', 'arm64-for-7.3', 'clk-fixes-for-7.2' and 'drivers-for-7.3' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging drivers/clk/qcom/dispcc-eliza.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 500 ++++--- + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 1 + + Documentation/devicetree/bindings/sram/sram.yaml | 1 + + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/glymur.dtsi | 509 ++++++- + arch/arm64/boot/dts/qcom/hamoa.dtsi | 4 + + arch/arm64/boot/dts/qcom/ipq5018.dtsi | 10 + + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 10 + + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 10 + + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 10 + + arch/arm64/boot/dts/qcom/lemans-evk.dts | 176 ++- + arch/arm64/boot/dts/qcom/milos.dtsi | 23 + + arch/arm64/boot/dts/qcom/monaco-arduino-monza.dts | 54 + + arch/arm64/boot/dts/qcom/monaco.dtsi | 1 + + arch/arm64/boot/dts/qcom/purwa.dtsi | 2 + + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 3 +- + arch/arm64/boot/dts/qcom/qcs8550-rb5gen2.dts | 1573 ++++++++++++++++++++ + .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 2 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 2 +- + arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 4 +- + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 4 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 26 +- + arch/arm64/boot/dts/qcom/sm8650.dtsi | 4 +- + drivers/clk/qcom/dispcc-eliza.c | 2 +- + drivers/soc/qcom/Kconfig | 12 +- + 26 files changed, 2599 insertions(+), 349 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-rb5gen2.dts +Merging renesas/next (30d3a7db74710 Merge branch '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. + arch/arm/boot/dts/renesas/r8a7740.dtsi | 12 +- + .../arm/boot/dts/renesas/r9a06g032-rzn1d400-eb.dts | 25 + + arch/arm/boot/dts/renesas/r9a06g032.dtsi | 84 ++++ + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 10 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 9 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 2 +- + .../arm64/boot/dts/renesas/r8a77965-salvator-x.dts | 4 + + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 4 + + arch/arm64/boot/dts/renesas/r8a77965-ulcb.dts | 4 + + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 17 + + arch/arm64/boot/dts/renesas/r8a78000.dtsi | 32 ++ + arch/arm64/boot/dts/renesas/r9a08g046.dtsi | 69 +++ + arch/arm64/boot/dts/renesas/r9a08g046l48-smarc.dts | 78 +++ + arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 523 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 114 ++++- + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 20 +- + arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 20 +- + .../boot/dts/renesas/r9a09g077m44-rzt2h-evk.dts | 144 ++++-- + .../boot/dts/renesas/r9a09g087m44-rzn2h-evk.dts | 144 ++++-- + arch/arm64/boot/dts/renesas/rzg3e-smarc-som.dtsi | 44 ++ + .../boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 14 + + 29 files changed, 1270 insertions(+), 119 deletions(-) +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 (b143af2d0da7b Merge branch 'v7.3-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 20 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/rockchip/Makefile | 4 + + arch/arm64/boot/dts/rockchip/px30-cobra.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/px30-pp1516.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 2 +- + .../boot/dts/rockchip/rk3528-hinlink-h28k.dts | 318 ++++++ + .../boot/dts/rockchip/rk3568-9tripod-x3568-v4.dts | 60 +- + arch/arm64/boot/dts/rockchip/rk3576.dtsi | 28 + + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 14 +- + .../boot/dts/rockchip/rk3588-vicharak-axon.dts | 917 +++++++++++++++ + .../boot/dts/rockchip/rk3588-vicharak-vaaman2.dts | 544 +++++++++ + .../boot/dts/rockchip/rk3588-youyeetoo-yy3588.dts | 1190 ++++++++++++++++++++ + drivers/clk/rockchip/clk-rk3588.c | 8 +- + 16 files changed, 3095 insertions(+), 24 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3528-hinlink-h28k.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-vicharak-axon.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-vicharak-vaaman2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-youyeetoo-yy3588.dts +Merging samsung-krzk/for-next (5346a27fed4d8 Merge branches 'next/drivers', 'next/dt', 'next/dt64' and 'next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + .../soc/samsung/samsung,exynos-sysreg.yaml | 1 + + arch/arm/boot/dts/samsung/exynos5250-manta.dts | 41 +++++++++++++++++++++- + arch/arm/mach-s3c/map-base.h | 2 +- + arch/arm64/boot/dts/exynos/exynosautov920.dtsi | 6 ++++ + drivers/soc/samsung/exynos-pmu.c | 4 +-- + include/linux/serial_s3c.h | 4 +-- + 6 files changed, 52 insertions(+), 6 deletions(-) +Merging scmi/for-linux-next (edb4db149ba0a Merge branch 'for-next/ffa/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + drivers/firmware/arm_ffa/driver.c | 29 +++++++++++++++++++++-------- + 1 file changed, 21 insertions(+), 8 deletions(-) +Merging sophgo/for-next (f7337210bede6 Merge branch 'dt/riscv' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. +Merging sophgo-soc/soc-for-next (c8754c7deab4c soc: sophgo: cv1800: rtcsys: New driver (handling RTC only)) +$ git merge -m Merge branch 'soc-for-next' of https://github.com/sophgo/linux.git sophgo-soc/soc-for-next +Already up to date. +Merging spacemit/for-next (51ed53630915c clk: spacemit: k3: fix USB2 bus clock) +$ 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 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging stm32/stm32-next (fba4a31a7f3b6 arm64: dts: st: Fix SAI addresses on stm32mp251) +$ git merge -m Merge branch 'stm32-next' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (5508b1e45bba2 Merge branches 'sunxi/config-for-7.3' and '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 +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 6 + + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/allwinner/Makefile | 1 + + arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi | 10 ++ + .../allwinner/sun50i-a133-helperboard-core.dtsi | 197 +++++++++++++++++++++ + .../boot/dts/allwinner/sun50i-a133-helperboard.dts | 148 ++++++++++++++++ + arch/arm64/configs/defconfig | 1 + + 8 files changed, 366 insertions(+) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a133-helperboard-core.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a133-helperboard.dts +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 +Auto-merging .mailmap +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 1 + + MAINTAINERS | 6 +++--- + drivers/tee/optee/ffa_abi.c | 3 +++ + drivers/tee/qcomtee/call.c | 7 ++++++- + 4 files changed, 13 insertions(+), 4 deletions(-) +Merging tegra/for-next (3e854b92cc485 Merge branch for-7.2/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 +Auto-merging drivers/gpu/drm/tegra/sor.c +Auto-merging drivers/soc/tegra/fuse/tegra-apbmisc.c +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 24 ++++++++++++------------ + arch/arm64/boot/dts/nvidia/tegra264.dtsi | 4 ++-- + drivers/gpu/drm/tegra/sor.c | 6 ++---- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 2 +- + include/soc/tegra/pmc.h | 5 ++++- + 5 files changed, 21 insertions(+), 20 deletions(-) +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 (fb266bbe9aef1 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 +Auto-merging arch/riscv/configs/defconfig +Merge made by the 'ort' strategy. + arch/riscv/configs/defconfig | 2 ++ + 1 file changed, 2 insertions(+) +Merging thead-dt/thead-dt-for-next (3a5791956edbf riscv: dts: thead: Enable wifi on the BeagleV-Ahead) +$ 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 (1b98f483adfd9 Merge branches 'ti-drivers-soc-next' and 'ti-k3-maintainer-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 + + drivers/firmware/ti_sci.c | 4 ++++ + 2 files changed, 5 insertions(+) +Merging xilinx/for-next (f608bce703fc3 arm64: versal-net: Switch Versal NET to firmware clock interface) +$ git merge -m Merge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/xlnx,versal-clk.yaml | 89 ++---- + .../devicetree/bindings/clock/xlnx,zynqmp-clk.yaml | 68 ++++ + .../firmware/xilinx/xlnx,zynqmp-firmware.yaml | 15 +- + arch/arm/boot/dts/xilinx/zynq-ebaz4205.dts | 1 - + arch/arm/boot/dts/xilinx/zynq-zc702.dts | 2 - + arch/arm/boot/dts/xilinx/zynq-zc706.dts | 2 - + arch/arm64/boot/dts/xilinx/versal-net-clk.dtsi | 351 +++++++++++++++------ + arch/arm64/boot/dts/xilinx/xlnx-versal-clk.h | 123 ++++++++ + arch/arm64/boot/dts/xilinx/xlnx-versal-net-clk.h | 74 +++++ + arch/arm64/boot/dts/xilinx/xlnx-versal-net-power.h | 38 +++ + .../arm64/boot/dts/xilinx/xlnx-versal-net-resets.h | 53 ++++ + arch/arm64/boot/dts/xilinx/xlnx-versal-power.h | 55 ++++ + arch/arm64/boot/dts/xilinx/xlnx-versal-resets.h | 106 +++++++ + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 1 - + .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 1 - + .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 4 - + .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 2 - + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 1 - + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 2 - + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 1 - + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 1 - + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 2 - + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 1 - + 23 files changed, 798 insertions(+), 195 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/xlnx,zynqmp-clk.yaml + create mode 100644 arch/arm64/boot/dts/xilinx/xlnx-versal-clk.h + create mode 100644 arch/arm64/boot/dts/xilinx/xlnx-versal-net-clk.h + create mode 100644 arch/arm64/boot/dts/xilinx/xlnx-versal-net-power.h + create mode 100644 arch/arm64/boot/dts/xilinx/xlnx-versal-net-resets.h + create mode 100644 arch/arm64/boot/dts/xilinx/xlnx-versal-power.h + create mode 100644 arch/arm64/boot/dts/xilinx/xlnx-versal-resets.h +Merging socfpga/for-next (0764f42a8ba90 arm64: dts: socfpga: agilex5: update channel interrupts for gmac1 and gmac2) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git socfpga/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/altera.yaml | 6 + + .../bindings/net/altr,socfpga-stmmac.yaml | 46 +++++- + arch/arm64/boot/dts/intel/Makefile | 1 + + arch/arm64/boot/dts/intel/keembay-soc.dtsi | 2 +- + arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi | 112 ++++++++++++++- + arch/arm64/boot/dts/intel/socfpga_agilex72.dtsi | 156 +++++++++++++++++++++ + .../boot/dts/intel/socfpga_agilex72_socdk.dts | 27 ++++ + 7 files changed, 341 insertions(+), 9 deletions(-) + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex72.dtsi + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex72_socdk.dts +Merging clk/clk-next (92010229c4b38 Merge branches 'clk-microchip' and 'clk-qcom' into clk-next) +$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (b3dcc8c608fbb clk: imx: Add audio PLL debugfs for K-divider control) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'ort' strategy. + drivers/clk/imx/clk-imx8mm.c | 6 +++ + drivers/clk/imx/clk-pll14xx.c | 119 +++++++++++++++++++++++++++++++++++++++++- + drivers/clk/imx/clk.h | 1 + + 3 files changed, 125 insertions(+), 1 deletion(-) +Merging clk-renesas/renesas-clk (91fb464395437 dt-bindings: clock: renesas,versaclock7: Update maintainer) +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/clk/renesas/renesas-cpg-mssr.c +Auto-merging drivers/clk/renesas/rzv2h-cpg.c +Merge made by the 'ort' strategy. + .../bindings/clock/renesas,rzv2h-cpg.yaml | 6 + + .../bindings/clock/renesas,versaclock7.yaml | 2 +- + MAINTAINERS | 6 +- + drivers/clk/renesas/Kconfig | 6 + + drivers/clk/renesas/Makefile | 1 + + 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/rzv2h-cpg-lib.c | 217 ++++++++++++ + drivers/clk/renesas/rzv2h-cpg.c | 203 ----------- + .../dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h | 2 + + .../dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h | 2 + + include/linux/clk/renesas.h | 34 +- + 14 files changed, 904 insertions(+), 223 deletions(-) + create mode 100644 drivers/clk/renesas/rzv2h-cpg-lib.c +Merging thead-clk/thead-clk-for-next (baf4fc7c03bd0 clk: thead: th1520-ap: Support CPU frequency scaling) +$ git merge -m Merge branch 'thead-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk/thead-clk-for-next +Already up to date. +Merging 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 +Merge made by the 'ort' strategy. + arch/csky/kernel/entry.S | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging loongarch/loongarch-next (262a3b4fa1792 selftests/bpf: Test jited inline of bpf_get_smp_processor_id() for LoongArch) +$ git merge -m Merge branch 'loongarch-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (dc5200f6b1ada m68k: Correct CONFIG_MVME16x macro name in #endif comment) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'mips-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (aca063c902452 openrisc: Fix jump_label smp syncing) +$ git merge -m Merge branch 'for-next' of https://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Already up to date. +Merging powerpc/next (42f252f5a6468 powerpc/fadump: define MIN_RMA in bytes rather than MB) +$ 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 (798246e5edfb3 riscv: acpi: Enable ARCH_HAS_ACPI_TABLE_UPGRADE) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/Kconfig +CONFLICT (content): Merge conflict in arch/riscv/Kconfig +Resolved 'arch/riscv/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master db947e73968de] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/acpi.h | 2 ++ + arch/riscv/kernel/acpi.c | 5 +++++ + arch/riscv/kernel/efi.c | 5 +++++ + arch/riscv/kernel/reset.c | 7 +++++++ + arch/riscv/kernel/setup.c | 2 ++ + drivers/acpi/tables.c | 1 + + 7 files changed, 23 insertions(+) +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 +Auto-merging Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml +Auto-merging Documentation/devicetree/bindings/timer/sifive,clint.yaml +Merge made by the 'ort' strategy. + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../devicetree/bindings/riscv/canaan.yaml | 8 +- + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + arch/riscv/boot/dts/canaan/Makefile | 2 + + arch/riscv/boot/dts/canaan/k230-canmv.dts | 343 +++++++++++++++++++++ + arch/riscv/boot/dts/canaan/k230-evb.dts | 39 +++ + arch/riscv/boot/dts/canaan/k230-pinctrl.h | 18 ++ + arch/riscv/boot/dts/canaan/k230.dtsi | 167 ++++++++++ + 8 files changed, 578 insertions(+), 1 deletion(-) + create mode 100644 arch/riscv/boot/dts/canaan/k230-canmv.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230-evb.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230-pinctrl.h + create mode 100644 arch/riscv/boot/dts/canaan/k230.dtsi +Merging riscv-soc/riscv-soc-for-next (dfceff38cea2b Merge branches 'riscv-soc-drivers-for-next' and 'cache-for-next' into riscv-soc-for-next) +$ git merge -m Merge branch 'riscv-soc-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Merge made by the 'ort' strategy. +Merging s390/for-next (eb3690e410086 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. +Merging sh/for-next (b0aa5e4b087b6 sh: Fix fallout from ZERO_PAGE consolidation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (5b2a3b1a98fb4 sparc: Remove remaining defconfig references to the pktcdvd driver) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (254f49634ee16 Linux 7.1-rc1) +$ 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 (503423f5072e7 Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging MAINTAINERS +Auto-merging fs/ocfs2/namei.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/sched.h +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 2 +- + Documentation/filesystems/overlayfs.rst | 16 + + Documentation/filesystems/porting.rst | 8 + + Documentation/filesystems/smb/ksmbd.rst | 4 +- + Documentation/filesystems/vfs.rst | 2 +- + MAINTAINERS | 6 +- + block/bdev.c | 113 +++- + drivers/base/devtmpfs.c | 2 +- + drivers/block/rnbd/rnbd-srv.c | 4 +- + drivers/char/misc_minor_kunit.c | 25 +- + drivers/crypto/ccp/sev-dev.c | 12 +- + drivers/mtd/ubi/ubi.h | 9 +- + drivers/target/target_core_alua.c | 11 +- + drivers/target/target_core_pr.c | 4 +- + fs/9p/vfs_inode.c | 5 +- + fs/9p/vfs_inode_dotl.c | 4 +- + fs/Kconfig | 1 - + fs/Makefile | 1 - + fs/affs/affs.h | 2 +- + fs/affs/namei.c | 4 +- + fs/afs/dir.c | 6 +- + fs/autofs/root.c | 2 +- + fs/bad_inode.c | 2 +- + fs/bfs/dir.c | 2 +- + fs/bpf_fs_kfuncs.c | 37 ++ + fs/btrfs/dev-replace.c | 65 +- + fs/btrfs/inode.c | 4 +- + fs/btrfs/ioctl.c | 4 +- + fs/btrfs/volumes.c | 116 +++- + fs/btrfs/volumes.h | 6 +- + fs/ceph/dir.c | 3 +- + fs/coda/dir.c | 9 +- + fs/coredump.c | 11 +- + fs/cramfs/inode.c | 2 +- + fs/crypto/crypto.c | 40 +- + fs/crypto/fscrypt_private.h | 5 +- + fs/crypto/keyring.c | 21 +- + fs/crypto/keysetup.c | 26 +- + fs/crypto/policy.c | 17 +- + fs/ecryptfs/inode.c | 2 +- + fs/efivarfs/inode.c | 2 +- + fs/efs/Kconfig | 16 - + fs/efs/Makefile | 8 - + fs/efs/dir.c | 105 ---- + fs/efs/efs.h | 144 ----- + fs/efs/file.c | 42 -- + fs/efs/inode.c | 315 ---------- + fs/efs/namei.c | 120 ---- + fs/efs/super.c | 368 ----------- + fs/efs/symlink.c | 50 -- + fs/erofs/super.c | 35 +- + fs/exfat/file.c | 218 ++++++- + fs/exfat/iomap.c | 22 +- + fs/exfat/namei.c | 2 +- + fs/ext2/namei.c | 4 +- + fs/ext4/extents-test.c | 9 +- + fs/ext4/mballoc-test.c | 9 +- + fs/ext4/namei.c | 4 +- + fs/ext4/super.c | 12 +- + fs/f2fs/namei.c | 4 +- + fs/f2fs/super.c | 6 +- + fs/fat/namei_msdos.c | 5 +- + fs/fat/namei_vfat.c | 2 +- + fs/fs_struct.c | 103 ++- + fs/fuse/dir.c | 10 +- + fs/gfs2/inode.c | 7 +- + fs/hfs/dir.c | 4 +- + fs/hfsplus/dir.c | 4 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/namei.c | 6 +- + fs/hugetlbfs/inode.c | 4 +- + fs/inode.c | 23 +- + fs/internal.h | 1 + + fs/iomap/buffered-io.c | 6 +- + fs/iomap/direct-io.c | 293 ++++++++- + fs/iomap/ioend.c | 21 +- + fs/jffs2/dir.c | 6 +- + fs/jfs/namei.c | 4 +- + fs/kernel_read_file.c | 9 +- + fs/lockd/svclock.c | 42 +- + fs/lockd/svcsubs.c | 53 +- + fs/minix/namei.c | 4 +- + fs/namei.c | 30 +- + fs/namespace.c | 25 +- + fs/nfs/blocklayout/dev.c | 15 +- + fs/nfs/callback.c | 4 +- + fs/nfs/dir.c | 6 +- + fs/nfs/internal.h | 2 +- + fs/nfs_common/nfslocalio.c | 16 +- + fs/nfsd/filecache.c | 143 +++-- + fs/nfsd/flexfilelayoutxdr.c | 20 +- + fs/nfsd/localio.c | 8 +- + fs/nfsd/netns.h | 28 +- + fs/nfsd/nfs2acl.c | 21 +- + fs/nfsd/nfs3acl.c | 17 +- + fs/nfsd/nfs4callback.c | 109 +++- + fs/nfsd/nfs4layouts.c | 39 +- + fs/nfsd/nfs4proc.c | 60 +- + fs/nfsd/nfs4recover.c | 48 +- + fs/nfsd/nfs4state.c | 177 ++++-- + fs/nfsd/nfs4xdr.c | 22 +- + fs/nfsd/nfsctl.c | 20 +- + fs/nfsd/nfsfh.c | 8 +- + fs/nfsd/nfssvc.c | 22 +- + fs/nfsd/state.h | 4 +- + fs/nfsd/trace.h | 18 +- + fs/nfsd/vfs.c | 48 +- + fs/nilfs2/namei.c | 4 +- + fs/ntfs/aops.c | 17 +- + fs/ntfs/attrib.c | 35 +- + fs/ntfs/inode.c | 9 + + fs/ntfs/mft.c | 8 +- + fs/ntfs/namei.c | 66 +- + fs/ntfs3/namei.c | 4 +- + fs/nullfs.c | 14 +- + fs/ocfs2/dlmfs/dlmfs.c | 5 +- + fs/ocfs2/namei.c | 5 +- + fs/ocfs2/super.c | 1 - + fs/omfs/dir.c | 4 +- + fs/orangefs/namei.c | 5 +- + fs/overlayfs/dir.c | 18 +- + fs/overlayfs/inode.c | 26 +- + fs/overlayfs/overlayfs.h | 1 + + fs/overlayfs/super.c | 2 +- + fs/overlayfs/xattrs.c | 1 + + fs/posix_acl.c | 2 - + fs/proc/array.c | 4 +- + fs/proc/base.c | 8 +- + fs/proc_namespace.c | 4 +- + fs/ramfs/inode.c | 4 +- + fs/romfs/super.c | 2 +- + fs/smb/client/cifsfs.c | 10 +- + fs/smb/client/cifsfs.h | 10 +- + fs/smb/client/dir.c | 5 +- + fs/smb/client/file.c | 1 + + fs/smb/client/inode.c | 55 +- + fs/smb/client/readdir.c | 10 +- + fs/smb/client/smb2ops.c | 147 ++++- + fs/smb/client/smb2pdu.c | 27 +- + fs/smb/client/smb2proto.h | 3 + + fs/smb/common/fscc.h | 5 + + fs/smb/server/ksmbd_work.h | 7 + + fs/smb/server/mgmt/share_config.c | 4 +- + fs/smb/server/oplock.c | 109 +++- + fs/smb/server/server.c | 14 + + fs/smb/server/smb2misc.c | 18 +- + fs/smb/server/smb2pdu.c | 21 +- + fs/smb/server/smb2pdu.h | 4 - + fs/smb/server/smbacl.c | 15 +- + fs/smb/server/vfs.c | 23 +- + fs/smb/server/vfs_cache.c | 79 ++- + fs/super.c | 639 +++++++++++++------ + fs/ubifs/dir.c | 4 +- + fs/udf/namei.c | 4 +- + fs/ufs/namei.c | 5 +- + fs/vboxsf/dir.c | 4 +- + fs/xfs/libxfs/xfs_dquot_buf.c | 14 +- + fs/xfs/scrub/agheader_repair.c | 2 +- + fs/xfs/xfs_buf.c | 192 +++--- + fs/xfs/xfs_buf.h | 2 +- + fs/xfs/xfs_buf_item.c | 3 +- + fs/xfs/xfs_inode.c | 3 +- + fs/xfs/xfs_iops.c | 7 +- + fs/xfs/xfs_log_recover.c | 6 +- + fs/xfs/xfs_qm.c | 5 +- + fs/xfs/xfs_super.c | 10 +- + include/linux/blk_types.h | 2 +- + include/linux/blkdev.h | 12 +- + include/linux/efs_vh.h | 54 -- + include/linux/fs.h | 4 +- + include/linux/fs/super.h | 8 + + include/linux/fs/super_types.h | 4 +- + include/linux/fs_struct.h | 34 + + include/linux/init_task.h | 1 + + include/linux/net.h | 1 + + include/linux/sched.h | 1 + + include/linux/sched/task.h | 1 + + include/linux/sunrpc/bc_xprt.h | 5 + + include/linux/sunrpc/svc_rdma_pcl.h | 4 +- + include/linux/types.h | 2 + + include/uapi/asm-generic/errno.h | 2 +- + include/uapi/linux/efs_fs_sb.h | 63 -- + include/uapi/linux/fscrypt.h | 1 - + init/init_task.c | 1 + + init/initramfs.c | 14 +- + init/initramfs_test.c | 220 ++++--- + init/main.c | 10 +- + ipc/mqueue.c | 7 +- + kernel/exit.c | 2 +- + kernel/fork.c | 53 +- + kernel/kcmp.c | 2 +- + kernel/umh.c | 6 +- + mm/shmem.c | 2 +- + net/socket.c | 25 + + 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/sunrpc_syms.c | 1 + + net/sunrpc/svc.c | 45 +- + 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_transport.c | 69 +- + net/unix/af_unix.c | 17 +- + tools/include/uapi/linux/fscrypt.h | 1 - + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/bpf/bpf_experimental.h | 3 + + .../testing/selftests/bpf/prog_tests/sock_xattr.c | 67 ++ + .../testing/selftests/bpf/progs/sock_read_xattr.c | 54 ++ + tools/testing/selftests/filesystems/.gitignore | 1 + + tools/testing/selftests/filesystems/Makefile | 2 +- + tools/testing/selftests/filesystems/ceph/Makefile | 7 + + tools/testing/selftests/filesystems/ceph/README | 84 +++ + .../filesystems/ceph/reset_corner_cases.sh | 646 +++++++++++++++++++ + .../selftests/filesystems/ceph/reset_stress.sh | 694 +++++++++++++++++++++ + .../selftests/filesystems/ceph/run_validation.sh | 350 +++++++++++ + tools/testing/selftests/filesystems/ceph/settings | 1 + + .../filesystems/ceph/validate_consistency.py | 297 +++++++++ + .../selftests/filesystems/overlayfs/.gitignore | 1 + + .../selftests/filesystems/overlayfs/Makefile | 2 + + .../filesystems/overlayfs/idmapped_mounts.c | 501 +++++++++++++++ + .../filesystems/overlayfs/set_layers_via_fds.c | 16 +- + tools/testing/selftests/filesystems/ustat_test.c | 135 ++++ + tools/testing/selftests/proc/proc-pidns.c | 1 + + 233 files changed, 6383 insertions(+), 2783 deletions(-) + delete mode 100644 fs/efs/Kconfig + delete mode 100644 fs/efs/Makefile + delete mode 100644 fs/efs/dir.c + delete mode 100644 fs/efs/efs.h + delete mode 100644 fs/efs/file.c + delete mode 100644 fs/efs/inode.c + delete mode 100644 fs/efs/namei.c + delete mode 100644 fs/efs/super.c + delete mode 100644 fs/efs/symlink.c + delete mode 100644 include/linux/efs_vh.h + delete mode 100644 include/uapi/linux/efs_fs_sb.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/sock_xattr.c + create mode 100644 tools/testing/selftests/bpf/progs/sock_read_xattr.c + create mode 100644 tools/testing/selftests/filesystems/ceph/Makefile + create mode 100644 tools/testing/selftests/filesystems/ceph/README + create mode 100755 tools/testing/selftests/filesystems/ceph/reset_corner_cases.sh + create mode 100755 tools/testing/selftests/filesystems/ceph/reset_stress.sh + create mode 100755 tools/testing/selftests/filesystems/ceph/run_validation.sh + create mode 100644 tools/testing/selftests/filesystems/ceph/settings + create mode 100755 tools/testing/selftests/filesystems/ceph/validate_consistency.py + create mode 100644 tools/testing/selftests/filesystems/overlayfs/idmapped_mounts.c + create mode 100644 tools/testing/selftests/filesystems/ustat_test.c +Merging printk/for-next (080d60fffa8e0 Merge branch 'for-7.3' 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. + lib/tests/test_ratelimit.c | 29 +++++++++++++++++++---------- + lib/vsprintf.c | 4 ++++ + 2 files changed, 23 insertions(+), 10 deletions(-) +Merging pci/next (bcabbbd29c53a Merge branch 'pci/controller/rzg3s-host') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging MAINTAINERS +Auto-merging drivers/pci/controller/dwc/pci-meson.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 25 +++ + .../devicetree/bindings/pci/qcom,hawi-pcie.yaml | 196 +++++++++++++++++ + .../devicetree/bindings/pci/qcom,pcie-ipq9574.yaml | 15 ++ + .../bindings/pci/renesas,r9a08g045-pcie.yaml | 34 ++- + MAINTAINERS | 1 + + drivers/pci/controller/dwc/Kconfig | 2 + + drivers/pci/controller/dwc/pci-imx6.c | 25 ++- + drivers/pci/controller/dwc/pci-meson.c | 2 +- + drivers/pci/controller/dwc/pcie-qcom.c | 38 ++++ + drivers/pci/controller/pci-host-common.c | 29 +-- + drivers/pci/controller/pcie-rzg3s-host.c | 233 +++++++++++++++++++-- + 11 files changed, 547 insertions(+), 53 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/qcom,hawi-pcie.yaml +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 (194a485768438 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. + drivers/hid/Kconfig | 9 + + drivers/hid/bpf/hid_bpf_dispatch.c | 5 +- + drivers/hid/hid-appleir.c | 45 ++- + drivers/hid/hid-core.c | 14 + + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-letsketch.c | 36 ++- + drivers/hid/hid-lg-g15.c | 16 ++ + drivers/hid/hid-logitech-dj.c | 9 +- + drivers/hid/hid-multitouch.c | 32 ++- + drivers/hid/hid-nintendo.c | 1 - + drivers/hid/hid-picolcd_core.c | 3 +- + drivers/hid/hid-roccat-kone.c | 65 ++++- + drivers/hid/hid-sony.c | 245 ++++++++-------- + drivers/hid/hid-steelseries.c | 313 ++++++++++++++++++++- + drivers/hid/wacom_wac.c | 8 +- + tools/testing/selftests/hid/Makefile | 2 +- + tools/testing/selftests/hid/hid_bpf.c | 36 ++- + tools/testing/selftests/hid/progs/hid.c | 15 + + .../testing/selftests/hid/tests/test_multitouch.py | 114 ++++++++ + 19 files changed, 799 insertions(+), 171 deletions(-) +Merging i2c/i2c/for-next (8cd9520d35a6c Linux 7.1) +$ git merge -m Merge branch 'i2c/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Already up to date. +$ git am -3 ../patches/0001-i2c-Fix-up-the-rest-of-the-merge.patch +Applying: i2c: Fix up the rest of the merge +Using index info to reconstruct a base tree... +M drivers/i2c/i2c-core-base.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/i2c/i2c-core-base.c +No changes -- Patch already applied. +Merging i2c-andi/i2c/i2c-next (04e9bf1648f84 i2c: nomadik: Use generic definitions for bus frequencies) +$ 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 +Auto-merging drivers/i2c/busses/i2c-amd-asf-plat.c +Merge made by the 'ort' strategy. + .../bindings/i2c/altr,softip-i2c-v1.0.yaml | 62 ++++ + .../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 | 64 ++++ + 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-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-qcom-geni.c | 328 ++++++++++----------- + drivers/i2c/i2c-core-acpi.c | 6 +- + 15 files changed, 522 insertions(+), 265 deletions(-) + 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 +Merging i2c-rust/rust-i2c-next (c0260c740d207 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 (678e9409dd78d i3c: mipi-i3c-hci: Use named initializers for platform_device_id's .driver_data) +$ git merge -m Merge branch 'i3c/next' of https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (1afafbaf749d8 firmware/dmi: Include product_family info to modalias) +$ git merge -m Merge branch 'dmi-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (a810e1aa11bf6 hwmon: (cros_ec) Implement custom kelvin to celsius conversions) +$ git merge -m Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/cros_ec_hwmon.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/hwmon/adi,adm1275.yaml | 43 ++- + .../bindings/hwmon/amphenol,chipcap2.yaml | 6 + + .../bindings/hwmon/pmbus/silergy,sq24860.yaml | 74 ++++ + .../bindings/hwmon/pmbus/ti,lm25066.yaml | 20 + + .../devicetree/bindings/hwmon/ti,ina2xx.yaml | 3 + + Documentation/hwmon/adm1275.rst | 24 ++ + Documentation/hwmon/chipcap2.rst | 2 + + Documentation/hwmon/coretemp.rst | 4 +- + Documentation/hwmon/index.rst | 2 + + Documentation/hwmon/sq24860.rst | 96 +++++ + Documentation/hwmon/tvs-mpfs.rst | 53 +++ + MAINTAINERS | 1 + + drivers/hwmon/Kconfig | 13 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/chipcap2.c | 25 +- + drivers/hwmon/coretemp.c | 2 +- + drivers/hwmon/cros_ec_hwmon.c | 12 +- + drivers/hwmon/ina2xx.c | 20 + + drivers/hwmon/pmbus/Kconfig | 33 +- + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/adm1275.c | 142 ++++++- + drivers/hwmon/pmbus/lm25066.c | 37 ++ + drivers/hwmon/pmbus/sq24860.c | 430 +++++++++++++++++++++ + drivers/hwmon/pmbus/xdpe1a2g7b.c | 11 + + drivers/hwmon/tvs-mpfs.c | 390 +++++++++++++++++++ + drivers/hwmon/xgene-hwmon.c | 4 - + 26 files changed, 1418 insertions(+), 31 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/silergy,sq24860.yaml + create mode 100644 Documentation/hwmon/sq24860.rst + create mode 100644 Documentation/hwmon/tvs-mpfs.rst + create mode 100644 drivers/hwmon/pmbus/sq24860.c + create mode 100644 drivers/hwmon/tvs-mpfs.c +Merging jc_docs/docs-next (2933b82083e75 Documentation: locking.rst: update deprecated function) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 +- + Documentation/admin-guide/media/bttv.rst | 2 +- + Documentation/admin-guide/mm/pagemap.rst | 8 +- + Documentation/conf.py | 4 +- + Documentation/core-api/SMP.rst | 11 + + Documentation/core-api/index.rst | 1 + + Documentation/dev-tools/container.rst | 6 +- + Documentation/kernel-hacking/locking.rst | 8 +- + Documentation/mm/hmm.rst | 4 +- + Documentation/mm/process_addrs.rst | 2 +- + .../translations/pt_BR/process/4.Coding.rst | 440 +++++++++++++++++++++ + .../translations/pt_BR/process/5.Posting.rst | 376 ++++++++++++++++++ + .../pt_BR/process/development-process.rst | 2 + + .../pt_BR/process/maintainer-netdev.rst | 23 +- + tools/lib/python/kdoc/kdoc_output.py | 2 +- + 15 files changed, 867 insertions(+), 28 deletions(-) + create mode 100644 Documentation/core-api/SMP.rst + create mode 100644 Documentation/translations/pt_BR/process/4.Coding.rst + create mode 100644 Documentation/translations/pt_BR/process/5.Posting.rst +Merging v4l-dvb/next (8dac27bfa2f99 media: dt-bindings: rc: Sync keymap list with latest list) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/media/rc.yaml | 4 +-- + drivers/media/cec/core/cec-adap.c | 2 +- + drivers/media/cec/core/cec-core.c | 2 -- + drivers/media/cec/core/cec-pin.c | 8 +++--- + drivers/media/cec/platform/meson/ao-cec-g12a.c | 1 + + drivers/media/cec/platform/stm32/stm32-cec.c | 19 +++++++++----- + .../extron-da-hd-4k-plus/extron-da-hd-4k-plus.c | 3 ++- + drivers/media/i2c/ov9282.c | 1 - + .../media/platform/renesas/rzg2l-cru/rzg2l-cru.h | 2 -- + 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 +-- + include/media/media-entity.h | 1 + + include/media/rc-map.h | 2 -- + 20 files changed, 61 insertions(+), 48 deletions(-) + rename drivers/media/rc/keymaps/{rc-videomate-m1f.c => rc-videomate-k100.c} (97%) +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 (da2e2fd83f1ef Merge branch 'pnp' 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 +Merge made by the 'ort' strategy. + drivers/acpi/acpi_tad.c | 2 +- + drivers/acpi/acpica/acutils.h | 2 -- + drivers/acpi/acpica/utnonansi.c | 16 ---------------- + drivers/pnp/system.c | 6 +++--- + include/acpi/platform/aclinuxex.h | 1 + + 5 files changed, 5 insertions(+), 22 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (d87cb889dc7ab cpufreq: apple-soc: Fix OPP table cleanup) +$ 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 +Merge made by the 'ort' strategy. + drivers/cpufreq/apple-soc-cpufreq.c | 36 ++++++++++++++---------------------- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/qcom-cpufreq-nvmem.c | 8 ++++++++ + 3 files changed, 23 insertions(+), 22 deletions(-) +Merging cpupower/cpupower (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'cpupower' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (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 (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (968098b4ca521 thermal/drivers/qcom/tsens: Disable wakeup interrupt setup on automotive targets) +$ 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 (c3fd3966f7dd8 RDMA/mlx5: Remove kernel-doc warning in umr.c) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Merge made by the 'ort' strategy. + Documentation/infiniband/user_mad.rst | 2 +- + drivers/infiniband/core/iwpm_msg.c | 2 +- + drivers/infiniband/core/nldev.c | 29 ++++++++++++++++++++++++--- + drivers/infiniband/core/uverbs_std_types_mr.c | 6 ++++-- + drivers/infiniband/hw/mlx5/umr.c | 2 +- + include/uapi/rdma/rdma_netlink.h | 5 +++++ + 6 files changed, 38 insertions(+), 8 deletions(-) +Merging net-next/main (6fb33632323a3 Merge branch 'tools-ynl-pyynl-pull-the-family-resolution-logic-into-the-lib') +$ 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 MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging include/linux/net.h +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5f9618618bce7] Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/netlink/specs/rt-addr.yaml | 4 + + MAINTAINERS | 5 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/mm/mem.c | 6 - + drivers/net/bonding/bond_3ad.c | 24 +- + drivers/net/bonding/bond_netlink.c | 109 +- + drivers/net/bonding/bond_options.c | 8 +- + drivers/net/dsa/b53/b53_priv.h | 3 +- + drivers/net/dsa/microchip/ksz8.c | 2 +- + drivers/net/dsa/qca/qca8k-leds.c | 3 + + drivers/net/dsa/realtek/rtl8366rb.c | 268 +- + drivers/net/dsa/realtek/rtl83xx.c | 26 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 931 ++++- + .../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/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/marvell/mvneta.c | 18 + + drivers/net/ethernet/marvell/mvneta_bm.c | 72 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 2 + + 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 | 9 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 43 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c | 1 + + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 2 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 2 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- + .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 7 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 9 +- + drivers/net/netconsole.c | 2 +- + drivers/net/phy/mdio_device.c | 2 +- + drivers/net/phy/phylink.c | 15 +- + drivers/net/usb/rtl8150.c | 4 +- + include/linux/net.h | 23 + + include/net/bond_3ad.h | 4 +- + include/net/bonding.h | 8 +- + include/net/fib_rules.h | 4 +- + include/net/ip_fib.h | 3 +- + include/net/netns/ipv4.h | 1 + + include/net/udp.h | 2 +- + include/uapi/linux/if_addr.h | 1 + + net/batman-adv/bat_iv_ogm.c | 12 +- + net/batman-adv/bat_v_elp.c | 9 +- + net/batman-adv/bat_v_ogm.c | 33 +- + net/batman-adv/bridge_loop_avoidance.c | 9 +- + net/batman-adv/hard-interface.c | 165 +- + net/batman-adv/hard-interface.h | 10 +- + net/batman-adv/main.c | 9 - + net/batman-adv/main.h | 3 - + net/batman-adv/mesh-interface.c | 13 +- + net/batman-adv/netlink.c | 4 +- + net/batman-adv/originator.c | 4 - + net/batman-adv/tp_meter.c | 215 +- + net/batman-adv/tvlv.c | 86 +- + net/batman-adv/types.h | 28 +- + net/core/fib_rules.c | 82 +- + net/core/netpoll.c | 2 +- + net/ipv4/fib_frontend.c | 66 +- + net/ipv4/fib_rules.c | 20 +- + net/ipv4/fib_trie.c | 3 +- + net/ipv4/igmp.c | 2 + + net/ipv4/raw.c | 41 +- + net/ipv4/udp.c | 39 +- + net/ipv6/addrconf.c | 1 + + net/ipv6/fib6_rules.c | 17 +- + net/ipv6/mcast.c | 1 + + net/ipv6/udp.c | 19 +- + net/vmw_vsock/virtio_transport_common.c | 49 +- + 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/tests/ethtool.py | 7 +- + tools/testing/selftests/bpf/prog_tests/test_xsk.c | 4 +- + tools/testing/selftests/drivers/net/hw/toeplitz.py | 22 + + tools/testing/selftests/net/getsockopt_iter.c | 97 + + tools/testing/selftests/net/lib.sh | 19 +- + tools/testing/selftests/net/rtnetlink.py | 101 +- + 95 files changed, 2200 insertions(+), 7979 deletions(-) + 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 + create mode 100644 tools/net/ynl/pyynl/lib/specdir.py +Merging bpf-next/for-next (0b58988cacfc9 Documentation/bpf: make it clear that kfuncs should be non-static) +$ 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 kernel/bpf/verifier.c +Merge made by the 'ort' strategy. + Documentation/bpf/kfuncs.rst | 23 +- + include/linux/bpf.h | 4 +- + include/linux/bpf_verifier.h | 5 + + include/uapi/linux/bpf.h | 28 ++- + kernel/bpf/bpf_lsm.c | 1 - + kernel/bpf/fixups.c | 2 +- + kernel/bpf/verifier.c | 53 ++++- + kernel/trace/bpf_trace.c | 55 +++++ + net/core/filter.c | 12 +- + tools/bpf/bpftool/Makefile | 2 +- + tools/bpf/bpftool/link.c | 133 +++++++++++ + tools/bpf/bpftool/map.c | 12 +- + tools/bpf/bpftool/struct_ops.c | 4 + + tools/include/linux/btf_ids.h | 78 ++++++- + tools/include/uapi/linux/bpf.h | 28 ++- + tools/lib/bpf/btf.c | 10 +- + tools/lib/bpf/btf_dump.c | 4 +- + tools/lib/bpf/btf_relocate.c | 8 +- + tools/lib/bpf/elf.c | 2 +- + tools/lib/bpf/gen_loader.c | 16 +- + tools/lib/bpf/libbpf.c | 88 ++++---- + tools/lib/bpf/nlattr.c | 2 +- + tools/lib/bpf/relo_core.c | 22 +- + tools/lib/bpf/usdt.c | 33 +-- + tools/testing/selftests/bpf/network_helpers.c | 4 +- + tools/testing/selftests/bpf/network_helpers.h | 5 + + .../selftests/bpf/prog_tests/fill_link_info.c | 242 +++++++++++++++++++++ + tools/testing/selftests/bpf/prog_tests/mptcp.c | 13 +- + .../selftests/bpf/prog_tests/resolve_btfids.c | 169 +++++++++----- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 68 ++++++ + .../selftests/bpf/prog_tests/test_map_uninit.c | 68 ++++++ + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 3 + + tools/testing/selftests/bpf/progs/btf_data.c | 10 + + tools/testing/selftests/bpf/progs/map_kptr.c | 12 + + tools/testing/selftests/bpf/progs/mptcpify.c | 2 +- + .../selftests/bpf/progs/sockmap_verdict_prog.c | 14 +- + .../selftests/bpf/progs/test_fill_link_info.c | 6 + + tools/testing/selftests/bpf/progs/test_tc_peer.c | 22 ++ + .../selftests/bpf/progs/verifier_spill_fill.c | 26 +++ + .../testing/selftests/bpf/progs/verifier_var_off.c | 110 ++++++++++ + 40 files changed, 1193 insertions(+), 206 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_map_uninit.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 (355f808d8a11f Merge branch 'xfrm: XFRM_MSG_MIGRATE_STATE new netlink message') +$ 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 (ddbddbf8aee54 net/mlx5: Add sd_group_size bits for SD management) +$ 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 (f456c1922c49e vsock/virtio: rewrite MSG_ZEROCOPY flag handling) +$ 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 (805185b7c7a10 Merge tag 'net-7.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (7ea67149af719 Bluetooth: L2CAP: fix tx ident leak for commands without a response) +$ 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/Makefile | 2 + + drivers/bluetooth/bpa10x.c | 8 +- + drivers/bluetooth/btintel_pcie.c | 102 +++++++++++----------- + drivers/bluetooth/btnxpuart.c | 6 ++ + drivers/bluetooth/btqca.c | 25 +----- + drivers/bluetooth/btusb.c | 92 ++++++++++++-------- + drivers/bluetooth/hci_ldisc.c | 14 ++- + include/net/bluetooth/hci.h | 5 +- + include/net/bluetooth/hci_core.h | 1 + + include/net/bluetooth/hci_sync.h | 4 +- + include/net/bluetooth/l2cap.h | 10 ++- + net/bluetooth/6lowpan.c | 84 +++++------------- + net/bluetooth/Makefile | 2 + + net/bluetooth/af_bluetooth.c | 24 ++---- + net/bluetooth/bnep/Makefile | 2 + + net/bluetooth/bnep/core.c | 27 ++++-- + net/bluetooth/hci_conn.c | 21 +---- + net/bluetooth/hci_core.c | 3 + + net/bluetooth/hci_debugfs.c | 12 +-- + net/bluetooth/hci_event.c | 5 +- + net/bluetooth/hci_sync.c | 181 ++++++++++++++++++++++++++++----------- + net/bluetooth/hidp/Makefile | 2 + + net/bluetooth/iso.c | 44 ++++++---- + net/bluetooth/l2cap_core.c | 140 +++++++++++++++++++++++------- + net/bluetooth/l2cap_sock.c | 108 +++++++++++------------ + net/bluetooth/mgmt.c | 5 ++ + net/bluetooth/msft.c | 2 +- + net/bluetooth/rfcomm/Makefile | 2 + + net/bluetooth/rfcomm/sock.c | 1 + + net/bluetooth/sco.c | 15 +++- + net/bluetooth/smp.c | 27 ++---- + 31 files changed, 566 insertions(+), 410 deletions(-) +Merging wireless-next/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (913998f903fb1 wifi: ath12k: correct monitor destination ring size) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath12k/ahb.c | 1 - + drivers/net/wireless/ath/ath12k/ahb.h | 2 +- + drivers/net/wireless/ath/ath12k/core.c | 7 +- + drivers/net/wireless/ath/ath12k/debugfs.c | 14 +- + drivers/net/wireless/ath/ath12k/dp.c | 14 +- + drivers/net/wireless/ath/ath12k/dp.h | 3 +- + drivers/net/wireless/ath/ath12k/dp_mon.c | 70 +------ + drivers/net/wireless/ath/ath12k/dp_mon.h | 4 +- + drivers/net/wireless/ath/ath12k/hal.c | 42 ++-- + drivers/net/wireless/ath/ath12k/hal.h | 13 +- + drivers/net/wireless/ath/ath12k/mac.c | 9 +- + drivers/net/wireless/ath/ath12k/pci.c | 12 +- + drivers/net/wireless/ath/ath12k/qmi.c | 214 +++++++++++---------- + drivers/net/wireless/ath/ath12k/qmi.h | 26 --- + drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c | 66 +++---- + .../net/wireless/ath/ath12k/wifi7/hal_qcc2072.c | 4 +- + .../net/wireless/ath/ath12k/wifi7/hal_qcn9274.c | 13 +- + .../net/wireless/ath/ath12k/wifi7/hal_wcn7850.c | 13 +- + drivers/net/wireless/ath/ath12k/wifi7/hw.c | 61 ++++-- + drivers/net/wireless/ath/ath12k/wmi.c | 47 +++-- + drivers/net/wireless/ath/ath12k/wmi.h | 7 + + kernel/irq/manage.c | 1 + + 22 files changed, 350 insertions(+), 293 deletions(-) +Merging iwlwifi-next/next (a6136ca2dd977 wifi: iwlwifi: bump maximum core version for BZ/SC/DR to 106) +$ 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 (d276783e490d7 mtd: maps: correct CONFIG_MTD_COMPLEX_MAPPINGS macro name in comment) +$ git merge -m Merge branch 'mtd/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + drivers/mtd/chips/cfi_cmdset_0001.c | 6 ++++++ + drivers/mtd/maps/map_funcs.c | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) +Merging nand/nand/next (d5a5c9eb2ee9f mtd: spinand: fmsh: add support for FM25G{01,02}B) +$ 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. + drivers/mtd/nand/raw/pl35x-nand-controller.c | 20 ++-- + drivers/mtd/nand/spi/Makefile | 2 +- + drivers/mtd/nand/spi/core.c | 1 + + drivers/mtd/nand/spi/fmsh.c | 95 +++++++++++++++++++ + drivers/mtd/nand/spi/heyangtek.c | 132 +++++++++++++++++++++++++++ + include/linux/mtd/spinand.h | 1 + + 6 files changed, 243 insertions(+), 8 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 (6ea0ce3a19f9c crypto: tegra - fix refcount leak in tegra_se_host1x_submit()) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Already up to date. +Merging drm/drm-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Already up to date. +$ git am -3 ../patches/0001-drm-Fix-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... +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 (903f8773ee96c drm/panel: visionox-vtdr6130: switch to devm panel calls and drop remove) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging .mailmap +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/accel/amdxdna/amdxdna_gem.c +Auto-merging drivers/accel/ethosu/ethosu_drv.c +Auto-merging drivers/dma-buf/dma-fence-unwrap.c +Auto-merging drivers/dma-buf/dma-fence.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/bridge/inno-hdmi.c +Auto-merging drivers/gpu/drm/bridge/ssd2825.c +Auto-merging drivers/gpu/drm/bridge/tc358762.c +Auto-merging drivers/gpu/drm/i915/i915_active.c +Auto-merging drivers/gpu/drm/imagination/pvr_drv.c +Auto-merging drivers/gpu/drm/panel/panel-himax-hx83121a.c +Auto-merging drivers/gpu/drm/panthor/panthor_device.h +Auto-merging drivers/gpu/drm/panthor/panthor_mmu.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_vq.c +Auto-merging drivers/gpu/drm/xe/xe_svm.c +Auto-merging drivers/gpu/drm/xe/xe_userptr.c +Merge made by the 'ort' strategy. + .mailmap | 1 + + Documentation/admin-guide/cgroup-v2.rst | 6 + + .../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/renesas,r63419.yaml | 98 ++ + .../bindings/display/panel/samsung,atna33xc20.yaml | 2 + + .../display/rockchip/rockchip,analogix-dp.yaml | 47 +- + .../devicetree/bindings/gpu/img,powervr-rogue.yaml | 3 +- + .../devicetree/bindings/gpu/img,powervr-sgx.yaml | 3 +- + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + Documentation/gpu/automated_testing.rst | 3 +- + Documentation/gpu/drm-kms-helpers.rst | 6 + + Documentation/gpu/drm-kms.rst | 12 + + Documentation/gpu/todo.rst | 50 +- + MAINTAINERS | 17 +- + 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_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/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/firmware/Kconfig | 28 +- + drivers/gpu/buddy.c | 105 ++- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 115 ++- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 9 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 4 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 32 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 2 +- + 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 | 2 +- + drivers/gpu/drm/bridge/display-connector.c | 38 +- + drivers/gpu/drm/bridge/fsl-ldb.c | 2 +- + 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/inno-hdmi.c | 2 +- + drivers/gpu/drm/bridge/ite-it6263.c | 2 +- + drivers/gpu/drm/bridge/ite-it6505.c | 2 +- + drivers/gpu/drm/bridge/ite-it66121.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 2 +- + drivers/gpu/drm/bridge/lvds-codec.c | 2 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 2 +- + drivers/gpu/drm/bridge/of-display-mode-bridge.c | 2 +- + drivers/gpu/drm/bridge/panel.c | 2 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 2 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 2 +- + drivers/gpu/drm/bridge/sii902x.c | 6 +- + drivers/gpu/drm/bridge/ssd2825.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-dp.c | 8 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 3 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 2 +- + drivers/gpu/drm/bridge/tc358762.c | 2 +- + drivers/gpu/drm/bridge/tc358767.c | 4 +- + drivers/gpu/drm/bridge/tc358768.c | 2 +- + drivers/gpu/drm/bridge/tc358775.c | 2 +- + drivers/gpu/drm/bridge/ti-dlpc3433.c | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 3 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +- + drivers/gpu/drm/bridge/ti-tdp158.c | 2 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 2 +- + drivers/gpu/drm/clients/drm_log.c | 10 +- + drivers/gpu/drm/display/drm_bridge_connector.c | 41 +- + drivers/gpu/drm/display/drm_hdmi_state_helper.c | 68 +- + drivers/gpu/drm/drm_atomic.c | 80 ++ + 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_bridge.c | 124 ++- + 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 | 4 +- + drivers/gpu/drm/drm_dumb_buffers.c | 1 - + drivers/gpu/drm/drm_edid.c | 80 +- + 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_mode_config.c | 189 +++- + drivers/gpu/drm/drm_panic.c | 6 +- + drivers/gpu/drm/drm_print.c | 4 +- + drivers/gpu/drm/drm_writeback.c | 6 + + drivers/gpu/drm/gma500/psb_drv.c | 56 +- + 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 | 92 +- + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 110 +-- + drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 70 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 43 +- + drivers/gpu/drm/i915/display/intel_plane.c | 2 +- + drivers/gpu/drm/i915/i915_active.c | 2 +- + drivers/gpu/drm/imagination/pvr_drv.c | 2 +- + drivers/gpu/drm/imx/ipuv3/parallel-display.c | 2 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +- + drivers/gpu/drm/lima/lima_device.c | 12 +- + drivers/gpu/drm/loongson/lsdc_drv.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dp.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 2 +- + 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/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/nouveau/nouveau_drm.c | 35 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 11 +- + 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 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 31 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +- + drivers/gpu/drm/panel/Kconfig | 56 ++ + drivers/gpu/drm/panel/Makefile | 5 + + drivers/gpu/drm/panel/panel-anbernic-td4310.c | 257 ++++++ + drivers/gpu/drm/panel/panel-chipone-icna35xx.c | 422 +++++++++ + drivers/gpu/drm/panel/panel-edp.c | 19 + + drivers/gpu/drm/panel/panel-himax-hx83121a.c | 39 +- + drivers/gpu/drm/panel/panel-ilitek-ili7807s.c | 285 ++++++ + drivers/gpu/drm/panel/panel-ilitek-ili9488.c | 289 ++++++ + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 522 ++++------- + drivers/gpu/drm/panel/panel-renesas-r63419.c | 350 ++++++++ + drivers/gpu/drm/panel/panel-visionox-vtdr6130.c | 42 +- + drivers/gpu/drm/panthor/panthor_device.h | 3 + + drivers/gpu/drm/panthor/panthor_drv.c | 14 +- + drivers/gpu/drm/panthor/panthor_gem.c | 18 + + drivers/gpu/drm/panthor/panthor_gem.h | 2 + + drivers/gpu/drm/panthor/panthor_mmu.c | 259 ++++-- + drivers/gpu/drm/qxl/qxl_drv.c | 15 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 20 +- + drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c | 2 +- + drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 2 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 2 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 31 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 2 +- + drivers/gpu/drm/rockchip/dw_dp-rockchip.c | 15 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 227 +++-- + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 111 ++- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 2 +- + 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 | 2 +- + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 46 +- + drivers/gpu/drm/scheduler/sched_entity.c | 11 +- + 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 | 346 +++---- + drivers/gpu/drm/stm/lvds.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- + drivers/gpu/drm/sysfb/Kconfig | 7 +- + drivers/gpu/drm/sysfb/simpledrm.c | 109 ++- + drivers/gpu/drm/tegra/drm.c | 2 + + drivers/gpu/drm/tegra/dsi.c | 126 ++- + drivers/gpu/drm/tegra/dsi.h | 10 + + drivers/gpu/drm/tests/Makefile | 3 +- + drivers/gpu/drm/tests/drm_bridge_test.c | 973 +++++++++++++++++++- + 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_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 | 2 +- + drivers/gpu/drm/ttm/ttm_pool.c | 37 +- + drivers/gpu/drm/v3d/Kconfig | 1 + + drivers/gpu/drm/v3d/v3d_drv.c | 20 +- + drivers/gpu/drm/v3d/v3d_drv.h | 36 +- + drivers/gpu/drm/v3d/v3d_sched.c | 66 +- + drivers/gpu/drm/v3d/v3d_submit.c | 770 ++++++++-------- + drivers/gpu/drm/vc4/vc4_dsi.c | 2 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- + 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/xe_bo.c | 2 +- + drivers/gpu/drm/xe/xe_device.c | 4 +- + drivers/gpu/drm/xe/xe_sched_job.c | 2 +- + drivers/gpu/drm/xe/xe_svm.c | 2 +- + drivers/gpu/drm/xe/xe_userptr.c | 2 +- + drivers/gpu/drm/xe/xe_vm.c | 4 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +- + include/drm/bridge/analogix_dp.h | 13 +- + include/drm/bridge/dw_dp.h | 1 + + include/drm/display/drm_dp.h | 13 +- + 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 | 37 +- + include/drm/drm_colorop.h | 2 + + include/drm/drm_connector.h | 118 +++ + include/drm/drm_crtc.h | 16 + + include/drm/drm_debugfs.h | 2 +- + include/drm/drm_drv.h | 6 - + include/drm/drm_gem.h | 3 - + include/drm/drm_gem_shmem_helper.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_plane.h | 16 + + include/drm/drm_print.h | 2 +- + include/linux/dma-fence-unwrap.h | 6 +- + include/linux/dma-fence.h | 4 +- + include/linux/font.h | 3 + + include/linux/gpu_buddy.h | 15 + + include/linux/sysfb.h | 4 +- + include/uapi/drm/drm_mode.h | 1 + + include/uapi/drm/ethosu_accel.h | 60 +- + include/uapi/drm/panthor_drm.h | 26 +- + kernel/cgroup/dmem.c | 15 + + lib/fonts/fonts.c | 31 + + 261 files changed, 9843 insertions(+), 3192 deletions(-) + 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/renesas,r63419.yaml + create mode 100644 drivers/accel/ethosu/ethosu_perfmon.c + 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-renesas-r63419.c + create mode 100644 drivers/gpu/drm/tests/drm_kunit_edid.c +$ 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... +No changes -- Patch already applied. +Merging amdgpu/drm-next (50be7c9b5d5ea drm/amdgpu: Do not fiddle with the idle workers too much) + 01992b121fb65 ("drm/amd/pm: fix amdgpu_pm_info power display units") + 0b2fa33b42359 ("drm/amdgpu: Only set bo->moved when the BO was actually moved") + 1f7a795fb9f81 ("drm/amdgpu: Rename moved state to needs_update") + 27213b776a666 ("drm/amdgpu: Fix AMDGPU_GTT_MAX_TRANSFER_SIZE for non-4K systems") + 30af09db33696 ("drm/amdgpu/mes11: set doorbell offset for suspending userq") + 323a09e56c1d5 ("drm/amd/display: set MSA MISC1 bit 6 when using VSC SDP for DCE 11.x") + 3e41d26c70b0a ("drm/amdgpu: fix division by zero with invalid uvd dimensions") + 45510cf662dcf ("drm/amd/display: detect_link_and_local_sink: DP alt mode timeout path leaks prev_sink reference") + 4623b958dd6da ("drm/amdgpu: Fix kernel panic during driver load failure") + 4d7c25208ca61 ("drm/amdgpu/gfx8: drop unecessary BUG_ON()") + 5676593d08998 ("drm/amdgpu/gfx9.4.3: replace BUG_ON() with WARN_ON()") + 5b58a2c120063 ("drm/amdgpu/mes12: set doorbell offset for suspending userq") + 60b048c93f7a3 ("drm/amdkfd: Use kvcalloc to allocate arrays") + 6244eae229663 ("drm/amdgpu: reject mapping a reserved doorbell to a new queue") + 631849ff5d603 ("drm/amdgpu: fix check in amdgpu_hmm_invalidate_gfx") + 64142f9d51aff ("drm/amd/display: Fix DCN42 null registers & register masks") + 680adf5faeeab ("drm/amdgpu/jpeg: fix jpeg_v5_0_1_is_idle detection") + 6a5786e191fdc ("drm/amd/pm: make pp_features read-only when scpm is enabled") + 6c1f4f7ff0844 ("drm/amdgpu/gfx12: fix EOP interrupt routing for KQ and userq") + 6c2abd0ec09e8 ("drm/amdkfd: clamp v9 CRIU control stack checkpoint copy to BO size") + 88e589cc811ba ("drm/amdgpu/gfx11: fix EOP interrupt routing for KQ and userq") + 8d144a0eb0953 ("drm/amdgpu/sdma5.0: replace BUG_ON() with WARN_ON()") + 9723a8bed3aa2 ("drm/amdgpu/sdma7.0: replace BUG_ON() with WARN_ON()") + 98073e4328d7a ("drm/amdgpu: fix resource leak on ACP reset timeout") + 991e0516a8072 ("drm/amd/display: use kvzalloc to allocate struct dc") + 9e0896fa6f7db ("drm/amd/display: avoid large stack allocation in commit_planes_do_stream_update_sequence") + a24019f6480fa ("drm/amd/display: Handle struct drm_plane_state.ignore_damage_clips") + a928d8d81ec5c ("drm/amdgpu: add support for GC IP version 11.7.1") + ac6f00beb6582 ("drm/amdgpu/gfx10: replace BUG_ON() with WARN_ON()") + ae658afc7f47f ("drm/amdgpu/sdma5.2: replace BUG_ON() with WARN_ON()") + b71604f8685b0 ("drm/amdgpu/gfx9: replace BUG_ON() with WARN_ON()") + bc434335ab3c0 ("drm/amdgpu: add the doorbell index input for suspending userq") + c0cae35661868 ("drm/amdkfd: Guard m->cp_hqd_eop_control setting by q->eop_ring_buffer_size") + c17a508a7d652 ("drm/amdgpu/sdma6.0: replace BUG_ON() with WARN_ON()") + c4f230b51cf2d ("drm/amdgpu/sdma7.1: replace BUG_ON() with WARN_ON()") + cbe408dba5817 ("drm/amdgpu/vce: fix integer overflow in image size") + cd8650d7a91ee ("drm/amdgpu: invoke pm_genpd_remove() before freeing genpd") + cf591e67c0955 ("drm/amdgpu: add support for GC IP version 11.7.0") + d0a775e5d70b3 ("drm/amd/display: guard against overflow in HDCP message dump") + d871e99879cb5 ("drm/amdgpu: fix aperture mapping leak") + daa62107452d2 ("drm/amdgpu/gfx11: replace BUG_ON() with WARN_ON()") + dac8aa629a45e ("drm/amd/display: Remove DCCG registers not needed in DCN42") + dbb02b4755f8c ("drm/amdgpu/vcn4: avoid rereading IB param length") + e4d99e04b2e9b ("drm/amdgpu/gfx12.1: replace BUG_ON() with WARN_ON()") + e9df8e9d04e05 ("drm/amdgpu/jpeg: fix jpeg_v4_0_3_is_idle detection") + f45bbf0f62f26 ("drm/amd/pm: fix smu13 power limit range calculation") + f952076f76d62 ("drm/amdgpu/gfx12: replace BUG_ON() with WARN_ON()") + fa4f86a148271 ("drm/amdgpu/sdma4.4.2: replace BUG_ON() with WARN_ON()") + feaa5039f6c12 ("drm/amdgpu: flush pending RCU callbacks on module unload") + fed5bdbfe1d4a ("drm/amdgpu/soc24: reset dGPU if suspend got aborted") +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_v12_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_v12_1.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc21.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc24.c +Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.h +Auto-merging drivers/gpu/drm/amd/display/dc/link/link_detection.c +Auto-merging drivers/gpu/drm/amd/include/mes_v11_api_def.h +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +Auto-merging drivers/gpu/drm/drm_connector.c +Auto-merging drivers/gpu/drm/drm_displayid_internal.h +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging include/drm/drm_connector.h +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4dac529c9a2c0] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 52 +- + 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_amdkfd.c | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 28 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.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_cper.c | 116 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cper.h | 8 - + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 67 +- + 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 | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 188 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 312 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 284 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ip.c | 151 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 486 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 107 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 15 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 23 - + 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_ta.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 860 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 368 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 188 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 8 + + 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.h | 77 + + 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 | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 263 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 26 - + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 165 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 76 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 299 +- + 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 | 7 - + 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 | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 334 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 251 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 4 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 232 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 1093 +-- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 125 - + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 88 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 92 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.c | 3 - + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 147 +- + drivers/gpu/drm/amd/amdgpu/mes_userqueue.h | 9 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 240 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 267 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_1.c | 25 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 231 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 6 - + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 62 - + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 196 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 18 - + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 18 - + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 18 - + drivers/gpu/drm/amd/amdgpu/si.c | 7 - + drivers/gpu/drm/amd/amdgpu/soc15.c | 9 - + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 61 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 12 - + drivers/gpu/drm/amd/amdgpu/soc24.c | 11 - + drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 40 - + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 585 +- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 28 - + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 45 - + 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 | 22 - + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 24 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 223 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 224 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.h | 4 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 16 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 14 - + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 25 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 76 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 8 +- + 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 | 6 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 7222 +------------------- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 79 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_audio.c | 323 + + .../amdgpu_dm_audio.h} | 47 +- + .../amd/display/amdgpu_dm/amdgpu_dm_backlight.c | 726 ++ + .../amd/display/amdgpu_dm/amdgpu_dm_backlight.h | 75 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 183 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.h | 8 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 1 + + .../amd/display/amdgpu_dm/amdgpu_dm_connector.c | 3601 ++++++++++ + .../amd/display/amdgpu_dm/amdgpu_dm_connector.h | 162 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 102 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 6 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 22 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h | 6 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 78 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c | 943 +++ + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.h | 68 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 115 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 12 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 66 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.h | 20 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 1548 ++++- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 27 + + .../display/amdgpu_dm/amdgpu_dm_kunit_helpers.h | 1 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 189 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 25 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 133 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 51 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 327 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.h | 61 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 51 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 5 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_quirks.c | 2 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 10 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 7 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 16 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h | 13 + + .../drm/amd/display/amdgpu_dm/tests/.kunitconfig | 6 + + .../gpu/drm/amd/display/amdgpu_dm/tests/Makefile | 18 + + .../display/amdgpu_dm/tests/amdgpu_dm_audio_test.c | 490 ++ + .../amdgpu_dm/tests/amdgpu_dm_backlight_test.c | 1242 ++++ + .../display/amdgpu_dm/tests/amdgpu_dm_color_test.c | 64 +- + .../amdgpu_dm/tests/amdgpu_dm_colorop_test.c | 140 +- + .../amdgpu_dm/tests/amdgpu_dm_connector_test.c | 2158 ++++++ + .../display/amdgpu_dm/tests/amdgpu_dm_crc_test.c | 122 + + .../display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c | 523 ++ + .../display/amdgpu_dm/tests/amdgpu_dm_dmub_test.c | 582 ++ + .../display/amdgpu_dm/tests/amdgpu_dm_hdcp_test.c | 297 +- + .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 634 ++ + .../display/amdgpu_dm/tests/amdgpu_dm_irq_test.c | 909 +++ + .../display/amdgpu_dm/tests/amdgpu_dm_ism_test.c | 39 +- + .../amdgpu_dm/tests/amdgpu_dm_kunit_helpers.c | 142 + + .../amdgpu_dm/tests/amdgpu_dm_kunit_test_helpers.h | 32 + + .../amdgpu_dm/tests/amdgpu_dm_mst_types_test.c | 1092 +++ + .../display/amdgpu_dm/tests/amdgpu_dm_plane_test.c | 1228 ++++ + .../amdgpu_dm/tests/amdgpu_dm_pp_smu_test.c | 2454 +++++++ + .../display/amdgpu_dm/tests/amdgpu_dm_psr_test.c | 518 +- + .../amdgpu_dm/tests/amdgpu_dm_quirks_test.c | 103 + + .../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 | 949 +++ + .../display/amdgpu_dm/tests/amdgpu_dm_wb_test.c | 392 ++ + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 57 +- + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h | 9 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 293 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 174 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 44 +- + drivers/gpu/drm/amd/display/dc/dc.h | 238 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 41 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 43 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_helper.c | 226 - + drivers/gpu/drm/amd/display/dc/dc_stream.h | 29 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 67 +- + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c | 59 +- + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 9 +- + .../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 + + .../display/dc/dio/dcn31/dcn31_dio_link_encoder.c | 4 + + .../display/dc/dio/dcn31/dcn31_dio_link_encoder.h | 2 + + 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 +- + .../display/dc/dml2_0/dml21/dml21_wrapper_fpu.c | 8 +- + .../dml21/inc/bounding_boxes/dcn42b_soc_bb.h | 40 +- + .../dml2_0/dml21/inc/dml_top_soc_parameter_types.h | 13 + + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 41 +- + .../dml2_0/dml21/src/dml2_core/dml2_core_factory.c | 2 - + .../dml21/src/dml2_core/dml2_core_shared_types.h | 2 - + .../dml21/src/inc/dml2_internal_shared_types.h | 1 - + .../drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 5 - + .../drm/amd/display/dc/dwb/dcn30/dcn30_cm_common.h | 4 + + .../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 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 86 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.h | 21 + + .../drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c | 8 +- + .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c | 2 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 2 +- + .../gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.c | 6 + + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 8 +- + .../drm/amd/display/dc/hwss/dce60/dce60_hwseq.c | 8 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 62 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 76 +- + .../drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 10 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 36 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 3 - + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 341 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 12 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 2 + + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 327 +- + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.h | 5 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 82 + + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 12 + + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/link_service.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 19 - + .../drm/amd/display/dc/inc/soc_and_ip_translator.h | 14 - + .../gpu/drm/amd/display/dc/link/link_detection.c | 2 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 7 +- + .../drm/amd/display/dc/link/protocols/link_ddc.c | 20 +- + .../drm/amd/display/dc/link/protocols/link_ddc.h | 2 + + .../display/dc/link/protocols/link_dp_capability.c | 14 +- + .../dc/link/protocols/link_dp_panel_replay.c | 3 +- + .../dc/link/protocols/link_edp_panel_control.c | 8 +- + .../gpu/drm/amd/display/dc/mpc/dcn20/dcn20_mpc.c | 4 - + .../gpu/drm/amd/display/dc/opp/dcn20/dcn20_opp.c | 51 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c | 5 - + .../gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.c | 5 - + .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c | 5 - + .../drm/amd/display/dc/optc/dcn314/dcn314_optc.c | 5 - + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 5 - + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 5 - + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 5 - + .../drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.c | 258 +- + .../drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.h | 22 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 1 - + .../display/dc/resource/dcn302/dcn302_resource.c | 1 - + .../display/dc/resource/dcn303/dcn303_resource.c | 1 - + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 5 +- + .../display/dc/resource/dcn314/dcn314_resource.c | 4 +- + .../display/dc/resource/dcn315/dcn315_resource.c | 5 +- + .../display/dc/resource/dcn316/dcn316_resource.c | 5 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 1 - + .../display/dc/resource/dcn321/dcn321_resource.c | 1 - + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 6 +- + .../display/dc/resource/dcn351/dcn351_resource.c | 6 +- + .../amd/display/dc/resource/dcn36/dcn36_resource.c | 6 +- + .../amd/display/dc/resource/dcn42/dcn42_resource.c | 5 +- + .../display/dc/resource/dcn42b/dcn42b_resource.c | 6 +- + .../amd/display/dc/soc_and_ip_translator/Makefile | 3 + + .../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 + + .../soc_and_ip_translator/soc_and_ip_translator.c | 5 +- + drivers/gpu/drm/amd/display/dc/sspl/spl_debug.h | 4 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 289 +- + .../drm/amd/display/include/ddc_service_types.h | 1 + + drivers/gpu/drm/amd/display/include/gpio_types.h | 48 + + drivers/gpu/drm/amd/display/modules/power/Makefile | 2 +- + drivers/gpu/drm/amd/display/modules/power/power.c | 12 +- + .../gpu/drm/amd/display/modules/power/power_abm.c | 14 +- + .../drm/amd/display/modules/power/power_replay.c | 9 +- + drivers/gpu/drm/amd/include/amd_shared.h | 3 - + .../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 | 5 +- + 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_pm.c | 116 +- + 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 | 17 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 34 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 37 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 2 - + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 6 - + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 4 - + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v15_0.h | 4 - + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 8 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 82 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 94 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 7 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 653 -- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 7 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 85 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 9 +- + drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c | 85 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 140 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 13 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c | 3 - + .../drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.c | 2 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c | 76 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.h | 2 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1_v13_0.c | 14 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_sys.c | 19 + + drivers/gpu/drm/amd/ras/ras_mgr/ras_sys.h | 3 + + drivers/gpu/drm/amd/ras/rascore/ras.h | 5 + + drivers/gpu/drm/amd/ras/rascore/ras_aca_v1_0.c | 13 +- + drivers/gpu/drm/amd/ras/rascore/ras_core.c | 15 + + drivers/gpu/drm/amd/ras/rascore/ras_eeprom.c | 3 + + drivers/gpu/drm/amd/ras/rascore/ras_eeprom_fw.c | 2 +- + drivers/gpu/drm/amd/ras/rascore/ras_mp1.c | 19 +- + drivers/gpu/drm/amd/ras/rascore/ras_mp1.h | 3 + + drivers/gpu/drm/amd/ras/rascore/ras_mp1_v13_0.c | 13 + + drivers/gpu/drm/amd/ras/rascore/ras_process.c | 5 +- + drivers/gpu/drm/amd/ras/rascore/ras_umc.c | 32 +- + drivers/gpu/drm/amd/ras/rascore/ras_umc.h | 6 + + drivers/gpu/drm/amd/ras/rascore/ras_umc_v12_0.h | 2 + + drivers/gpu/drm/radeon/r600_dpm.c | 21 +- + include/uapi/drm/amdgpu_drm.h | 21 + + 376 files changed, 33042 insertions(+), 21336 deletions(-) + 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_sa.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_audio.c + rename drivers/gpu/drm/amd/display/{modules/power/power_helpers.c => amdgpu_dm/amdgpu_dm_audio.h} (50%) + 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_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_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_dmub_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/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 +$ 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 (8e27f752037e7 drm/i915/ltphy: Fix SSC Enablement bit in PORT_CLOCK_CTL) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_bios.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_plane.c +Auto-merging drivers/gpu/drm/i915/display/intel_vrr.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Merge made by the 'ort' strategy. + .../gpu/intel-display/dp-link-training.rst | 8 + + Documentation/gpu/intel-display/index.rst | 1 + + drivers/gpu/drm/drm_modes.c | 23 + + drivers/gpu/drm/i915/Makefile | 5 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 15 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 4 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 5 +- + drivers/gpu/drm/i915/display/intel_alpm.c | 15 +- + drivers/gpu/drm/i915/display/intel_bios.c | 62 +- + drivers/gpu/drm/i915/display/intel_bw.c | 168 ++- + drivers/gpu/drm/i915/display/intel_cdclk.c | 54 +- + 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_cursor.c | 2 +- + 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 | 29 +- + drivers/gpu/drm/i915/display/intel_de.c | 40 +- + drivers/gpu/drm/i915/display/intel_display.c | 170 +-- + drivers/gpu/drm/i915/display/intel_display.h | 7 + + drivers/gpu/drm/i915/display/intel_display_core.h | 14 +- + .../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 | 3 +- + .../gpu/drm/i915/display/intel_display_driver.c | 131 ++- + .../gpu/drm/i915/display/intel_display_driver.h | 9 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 19 + + 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 | 185 +++- + 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 | 46 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 57 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 15 +- + 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 | 496 ++------- + drivers/gpu/drm/i915/display/intel_dp.h | 16 +- + drivers/gpu/drm/i915/display/intel_dp_link_caps.c | 675 ++++++++++++ + drivers/gpu/drm/i915/display/intel_dp_link_caps.h | 47 + + .../gpu/drm/i915/display/intel_dp_link_training.c | 1093 +++++++++++++++----- + .../gpu/drm/i915/display/intel_dp_link_training.h | 15 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 8 +- + drivers/gpu/drm/i915/display/intel_dp_test.c | 7 +- + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 6 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 32 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 5 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 148 +-- + drivers/gpu/drm/i915/display/intel_gmbus.h | 22 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 71 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 2 + + drivers/gpu/drm/i915/display/intel_initial_plane.c | 2 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 4 +- + drivers/gpu/drm/i915/display/intel_lt_phy.c | 20 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 5 +- + 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 | 52 +- + drivers/gpu/drm/i915/display/intel_plane.h | 5 +- + drivers/gpu/drm/i915/display/intel_psr.c | 267 ++--- + 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_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/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/gvt/edid.c | 14 +- + drivers/gpu/drm/i915/i915_driver.c | 123 +-- + drivers/gpu/drm/i915/i915_panic.c | 35 - + drivers/gpu/drm/i915/i915_panic.h | 9 - + drivers/gpu/drm/xe/Makefile | 1 + + drivers/gpu/drm/xe/display/xe_display.c | 244 ++--- + drivers/gpu/drm/xe/display/xe_display.h | 10 +- + drivers/gpu/drm/xe/display/xe_panic.c | 26 +- + drivers/gpu/drm/xe/xe_device.c | 4 +- + include/drm/drm_modes.h | 1 + + include/drm/intel/display_parent_interface.h | 4 +- + include/drm/intel/mchbar_regs.h | 2 - + 91 files changed, 3696 insertions(+), 1995 deletions(-) + create mode 100644 Documentation/gpu/intel-display/dp-link-training.rst + 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/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 +Merging drm-msm/msm-next (9a967125427e0 drm/msm/adreno: add Adreno 810 GPU support) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (8de061ca149c9 drm/msm: Restore second parameter name in purge() and evict()) +$ 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 (820de07bba7b7 drm/xe: Add tile_count to xe_probed_info) + 15739920b71ef ("drm/xe/rtp: Keep track of non-OA nonpriv slots") + 1714d360fc5ae ("drm/xe/pf: Don't attempt to process FAST_REQ or EVENT relays") + 173202a5a3a9e ("drm/xe: Remove redundant exec_queue_suspended() check in submit_exec_queue()") + 3a3c3e56db292 ("drm/xe/rtp: Save OA nonpriv registers to register save/restore lists") + 3e493f88c8408 ("drm/xe/display: skip FORCE_WC and vm_bound check for external dma-bufs") + 4c7b9c6ece324 ("drm/xe/pt: prevent invalid cursor access for purged BOs") + 5ff004fdc7377 ("drm/xe/rtp: Add struct types for RTP tables") + 645f1a2589bd4 ("drm/xe/rtp: Ensure locking/ref counting for OA whitelists") + 6f73bf8fffa72 ("drm/xe/rtp: (De-)whitelist OA registers for all hwe's for a gt") + 80ccbd97ffee8 ("drm/xe/userptr: Hold notifier_lock for write on inject test path") + 90511bdcfda97 ("drm/xe/rtp: Add RING_FORCE_TO_NONPRIV_DENY to OA whitelists") + a57011eff45e7 ("drm/xe/rtp: Fix build error with clang < 21 and non-const initializers") + a889e9b06bfdb ("drm/xe: wedge from the timeout handler only after releasing the queue") + aeaa7d2bb0172 ("drm/xe/rtp: Toggle 'deny' bit to (de-)whitelist OA regs") + b9297d19d9df5 ("drm/xe/pt: Fix NULL pointer dereference in xe_pt_zap_ptes_entry()") + c3ff77d7235cc ("drm/xe/rtp: Generalize whitelist_apply_to_hwe") + c4508edb2c723 ("drm/xe: Return error on non-migratable faults requiring devmem") + c478244a9e2d1 ("drm/xe/rtp: Maintain OA whitelists separately") + c9a8e7daa0afe ("drm/xe: fix NPD in bo_meminfo()") + e459a3bdeb117 ("drm/xe/hw_engine: Fix double-free of managed BO in error path") + ed382e3b07fae ("drm/xe/userptr: Drop bogus static from finish in force_invalidate") + f6c23e4589bdc ("drm/xe/oa: Fix offset alignment for MERT WHITELIST_OA_MERT_MMIO_TRG") + f8e6874f46f19 ("drm/xe/oa: (De-)whitelist OA registers on OA stream open/release") +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe/drm-xe-next +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/tests/xe_rtp_test.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/tests/xe_rtp_test.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_drm_client.c +Auto-merging drivers/gpu/drm/xe/xe_drm_ras.c +Auto-merging drivers/gpu/drm/xe/xe_guc_submit.c +Auto-merging drivers/gpu/drm/xe/xe_guc_tlb_inval.c +Auto-merging drivers/gpu/drm/xe/xe_hw_engine.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_hw_engine.c +Auto-merging drivers/gpu/drm/xe/xe_hw_error.c +Auto-merging drivers/gpu/drm/xe/xe_oa.c +Auto-merging drivers/gpu/drm/xe/xe_pt.c +Auto-merging drivers/gpu/drm/xe/xe_reg_whitelist.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_reg_whitelist.c +Auto-merging drivers/gpu/drm/xe/xe_reg_whitelist.h +Auto-merging drivers/gpu/drm/xe/xe_rtp.c +Auto-merging drivers/gpu/drm/xe/xe_rtp.h +Auto-merging drivers/gpu/drm/xe/xe_rtp_types.h +Auto-merging drivers/gpu/drm/xe/xe_svm.c +Auto-merging drivers/gpu/drm/xe/xe_tuning.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_tuning.c +Auto-merging drivers/gpu/drm/xe/xe_userptr.c +Auto-merging drivers/gpu/drm/xe/xe_wa.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_wa.c +Auto-merging kernel/events/core.c +Recorded preimage for 'drivers/gpu/drm/xe/tests/xe_rtp_test.c' +Recorded preimage for 'drivers/gpu/drm/xe/xe_hw_engine.c' +Recorded preimage for 'drivers/gpu/drm/xe/xe_reg_whitelist.c' +Recorded preimage for 'drivers/gpu/drm/xe/xe_tuning.c' +Recorded preimage for 'drivers/gpu/drm/xe/xe_wa.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/xe/tests/xe_rtp_test.c'. +Recorded resolution for 'drivers/gpu/drm/xe/xe_hw_engine.c'. +Recorded resolution for 'drivers/gpu/drm/xe/xe_reg_whitelist.c'. +Recorded resolution for 'drivers/gpu/drm/xe/xe_tuning.c'. +Recorded resolution for 'drivers/gpu/drm/xe/xe_wa.c'. +[master 9dea607a7a2b1] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-driver-intel-xe-hwmon | 7 + + drivers/gpu/drm/xe/Kconfig.profile | 71 ++++-- + drivers/gpu/drm/xe/Makefile | 1 + + drivers/gpu/drm/xe/tests/Makefile | 1 + + 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_wa_test.c | 3 - + drivers/gpu/drm/xe/xe_debugfs.c | 1 - + drivers/gpu/drm/xe/xe_device.c | 30 ++- + drivers/gpu/drm/xe/xe_device.h | 17 +- + drivers/gpu/drm/xe/xe_device_types.h | 10 +- + drivers/gpu/drm/xe/xe_drm_client.c | 5 +- + drivers/gpu/drm/xe/xe_drm_ras.c | 41 ++-- + drivers/gpu/drm/xe/xe_eu_stall.c | 5 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 2 - + drivers/gpu/drm/xe/xe_execlist.c | 7 - + drivers/gpu/drm/xe/xe_ggtt.c | 8 +- + drivers/gpu/drm/xe/xe_gt.c | 14 +- + drivers/gpu/drm/xe/xe_gt_mcr.c | 19 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 18 +- + drivers/gpu/drm/xe/xe_guc_tlb_inval.c | 6 - + drivers/gpu/drm/xe/xe_hw_engine.c | 218 ++++++++--------- + drivers/gpu/drm/xe/xe_hw_error.c | 23 +- + drivers/gpu/drm/xe/xe_i2c.c | 3 - + drivers/gpu/drm/xe/xe_lrc.c | 8 +- + 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_pci.c | 176 +++++++++----- + drivers/gpu/drm/xe/xe_pci_error.c | 122 ++++++++++ + drivers/gpu/drm/xe/xe_pci_error.h | 13 ++ + drivers/gpu/drm/xe/xe_pci_types.h | 1 + + drivers/gpu/drm/xe/xe_pcode.c | 8 +- + drivers/gpu/drm/xe/xe_pcode.h | 2 +- + drivers/gpu/drm/xe/xe_pt.c | 20 +- + drivers/gpu/drm/xe/xe_pxp.c | 35 ++- + drivers/gpu/drm/xe/xe_query.c | 7 +- + drivers/gpu/drm/xe/xe_ras.c | 260 +++++++++++++++++++++ + drivers/gpu/drm/xe/xe_ras.h | 5 + + drivers/gpu/drm/xe/xe_ras_types.h | 51 ++++ + 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_step.c | 38 +-- + drivers/gpu/drm/xe/xe_step.h | 8 +- + 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 | 4 + + drivers/gpu/drm/xe/xe_tile.c | 4 +- + drivers/gpu/drm/xe/xe_tuning.c | 3 +- + drivers/gpu/drm/xe/xe_tuning.h | 6 + + drivers/gpu/drm/xe/xe_vm_madvise.c | 19 +- + drivers/gpu/drm/xe/xe_wa.c | 15 +- + drivers/gpu/drm/xe/xe_wa.h | 7 + + drivers/gpu/drm/xe/xe_wa_oob.rules | 1 + + include/drm/intel/pciids.h | 5 +- + include/linux/perf_event.h | 31 ++- + include/uapi/drm/xe_drm.h | 11 +- + kernel/events/core.c | 18 ++ + 65 files changed, 1435 insertions(+), 436 deletions(-) + create mode 100644 drivers/gpu/drm/xe/tests/xe_rtp_tables_test.c + create mode 100644 drivers/gpu/drm/xe/xe_pci_error.c + create mode 100644 drivers/gpu/drm/xe/xe_pci_error.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 (a73a398a68ca9 gpu: nova-core: remove local bitfield macro) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/for-linux-next +Merge made by the 'ort' strategy. + Documentation/gpu/nova/core/fsp.rst | 142 ++++++ + Documentation/gpu/nova/index.rst | 1 + + drivers/gpu/Makefile | 58 ++- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/nova/Makefile | 4 +- + drivers/gpu/drm/tyr/regs.rs | 14 +- + drivers/gpu/nova-core/.gitignore | 1 + + drivers/gpu/nova-core/Makefile | 4 +- + drivers/gpu/nova-core/bitfield.rs | 329 ------------ + drivers/gpu/nova-core/falcon.rs | 195 ++++--- + drivers/gpu/nova-core/falcon/fsp.rs | 44 +- + drivers/gpu/nova-core/falcon/gsp.rs | 32 +- + drivers/gpu/nova-core/falcon/hal.rs | 14 +- + drivers/gpu/nova-core/falcon/hal/ga102.rs | 29 +- + drivers/gpu/nova-core/falcon/hal/tu102.rs | 24 +- + drivers/gpu/nova-core/fb.rs | 4 +- + drivers/gpu/nova-core/fb/hal/gb202.rs | 28 +- + drivers/gpu/nova-core/fb/hal/gh100.rs | 31 +- + drivers/gpu/nova-core/fb/regs.rs | 25 + + drivers/gpu/nova-core/firmware.rs | 25 +- + drivers/gpu/nova-core/firmware/booter.rs | 25 +- + drivers/gpu/nova-core/firmware/fwsec.rs | 19 +- + drivers/gpu/nova-core/firmware/fwsec/bootloader.rs | 16 +- + drivers/gpu/nova-core/fsp.rs | 103 ++-- + drivers/gpu/nova-core/gpu.rs | 136 +++-- + drivers/gpu/nova-core/gsp.rs | 38 +- + drivers/gpu/nova-core/gsp/boot.rs | 54 +- + drivers/gpu/nova-core/gsp/cmdq.rs | 3 +- + drivers/gpu/nova-core/gsp/commands.rs | 13 +- + drivers/gpu/nova-core/gsp/fw.rs | 19 +- + drivers/gpu/nova-core/gsp/fw/commands.rs | 42 +- + drivers/gpu/nova-core/gsp/hal.rs | 27 +- + drivers/gpu/nova-core/gsp/hal/gh100.rs | 52 +- + drivers/gpu/nova-core/gsp/hal/tu102.rs | 118 +++-- + drivers/gpu/nova-core/gsp/regs.rs | 11 + + drivers/gpu/nova-core/gsp/sequencer.rs | 31 +- + drivers/gpu/nova-core/mctp.rs | 86 ++-- + drivers/gpu/nova-core/nova_core.rs | 5 +- + drivers/gpu/nova-core/nova_core_exports.c | 15 + + drivers/gpu/nova-core/regs.rs | 70 ++- + drivers/gpu/nova-core/vbios.rs | 64 +-- + rust/kernel/drm/device.rs | 2 +- + rust/kernel/drm/gem/mod.rs | 2 +- + rust/kernel/drm/gem/shmem.rs | 558 ++++++++++++++++++++- + rust/kernel/drm/gpuvm/mod.rs | 12 +- + rust/kernel/drm/gpuvm/sm_ops.rs | 4 +- + rust/kernel/faux.rs | 18 +- + 47 files changed, 1518 insertions(+), 1031 deletions(-) + create mode 100644 Documentation/gpu/nova/core/fsp.rst + 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/gsp/regs.rs + create mode 100644 drivers/gpu/nova-core/nova_core_exports.c +$ git am -3 ../patches/0001-drm-nova-Fix-up-merge-issue.patch +Applying: drm: nova: Fix up merge issue +Using index info to reconstruct a base tree... +M drivers/gpu/nova-core/gsp/cmdq.rs +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/nova-core/gsp/cmdq.rs +No changes -- Patch already applied. +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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +$ 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 b58880152852c] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git + Date: Fri Jul 3 16:20:45 2026 +0100 +Merging regmap/for-next (5663b89570d12 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. + 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 +++----- + 4 files changed, 8 insertions(+), 14 deletions(-) +Merging sound/for-next (c0933934d5d96 ALSA: hda: Force resume if acomp notified during system suspend) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging include/sound/hda_codec.h +Auto-merging sound/hda/codecs/realtek/alc269.c +Merge made by the 'ort' strategy. + include/sound/hda_codec.h | 1 + + sound/core/pcm_native.c | 2 + + sound/hda/codecs/hdmi/hdmi.c | 4 +- + sound/hda/codecs/helpers/razer_blade16_2025.c | 820 ++++++++++++++++++++++++++ + sound/hda/codecs/realtek/alc269.c | 21 + + sound/hda/common/codec.c | 5 +- + sound/hda/controllers/intel.c | 11 + + sound/hda/core/controller.c | 10 +- + sound/hda/core/stream.c | 40 +- + sound/usb/card.c | 70 ++- + sound/usb/mixer_quirks.c | 20 + + sound/usb/quirks-table.h | 67 +++ + 12 files changed, 1026 insertions(+), 45 deletions(-) + create mode 100644 sound/hda/codecs/helpers/razer_blade16_2025.c +Merging ieee1394/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging sound-asoc/for-next (dbde3bfa3d31e 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 +Auto-merging sound/soc/codecs/rt1320-sdw.c +Auto-merging sound/soc/codecs/rt700-sdw.c +Auto-merging sound/soc/codecs/sma1303.c +Auto-merging sound/soc/fsl/mpc5200_psc_ac97.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/cirrus,cs35l36.yaml | 240 ++++++ + .../devicetree/bindings/sound/cs35l36.txt | 168 ----- + .../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 - + include/sound/soc_sdw_utils.h | 31 +- + include/sound/sof/dai.h | 1 + + sound/soc/amd/acp/acp-sdw-legacy-mach.c | 2 +- + sound/soc/amd/acp/acp-sdw-sof-mach.c | 2 +- + sound/soc/au1x/psc-ac97.c | 4 +- + sound/soc/codecs/Kconfig | 30 +- + sound/soc/codecs/es8328.c | 5 + + sound/soc/codecs/es8389.c | 236 +++++- + sound/soc/codecs/es8389.h | 11 +- + sound/soc/codecs/hdac_hda.c | 4 +- + sound/soc/codecs/hdac_hdmi.c | 10 +- + sound/soc/codecs/max98090.c | 1 + + sound/soc/codecs/rt1320-sdw.c | 816 +++++++++++++++++---- + sound/soc/codecs/rt1320-sdw.h | 12 + + sound/soc/codecs/rt5677.c | 17 + + sound/soc/codecs/rt700-sdw.c | 6 +- + sound/soc/codecs/sma1303.c | 2 + + sound/soc/codecs/tlv320aic26.c | 6 + + sound/soc/fsl/fsl_asrc.c | 10 +- + sound/soc/fsl/fsl_audmix.c | 35 +- + sound/soc/fsl/fsl_easrc.c | 36 +- + sound/soc/fsl/fsl_esai.c | 16 +- + sound/soc/fsl/fsl_spdif.c | 8 +- + sound/soc/fsl/fsl_ssi.c | 13 +- + sound/soc/fsl/fsl_xcvr.c | 29 +- + sound/soc/fsl/imx-audio-rpmsg.c | 25 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 69 +- + sound/soc/fsl/mpc5200_dma.c | 56 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 34 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 1 + + sound/soc/intel/atom/sst-atom-controls.c | 67 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 59 +- + 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/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/utils.c | 45 +- + sound/soc/intel/boards/sof_sdw.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/mt8173/mt8173-rt5650.c | 2 +- + sound/soc/meson/Makefile | 2 + + sound/soc/meson/aiu-encoder-i2s.c | 281 +++++-- + sound/soc/meson/aiu-formatter-i2s.c | 104 +++ + sound/soc/meson/aiu.c | 32 +- + sound/soc/meson/aiu.h | 4 + + sound/soc/meson/g12a-toacodec.c | 2 +- + sound/soc/meson/g12a-tohdmitx.c | 2 +- + sound/soc/meson/gx-formatter.c | 282 +++++++ + sound/soc/meson/gx-formatter.h | 56 ++ + sound/soc/meson/gx-interface.h | 48 ++ + sound/soc/meson/t9015.c | 6 +- + sound/soc/renesas/fsi.c | 9 +- + sound/soc/samsung/aries_wm8994.c | 1 + + sound/soc/samsung/i2s.c | 25 +- + sound/soc/samsung/spdif.c | 8 +- + sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c | 4 +- + sound/soc/sdw_utils/soc_sdw_utils.c | 7 +- + sound/soc/sof/ipc4-topology.c | 2 + + sound/soc/sof/topology.c | 12 +- + sound/soc/ti/j721e-evm.c | 4 +- + 75 files changed, 2612 insertions(+), 933 deletions(-) + 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/mediatek,mtk-btcvsd-snd.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mtk-btcvsd-snd.txt + 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 +Merging modules/modules-next (36d6b929bb0c7 rust: module_param: add missing newline to pr_warn_once) +$ git merge -m Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Already up to date. +Merging input/next (c8f174900926d Input: sur40 - fix MAX_CONTACTS value based on PixelSense specification) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging Documentation/devicetree/bindings/input/microchip,cap11xx.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/imagis,isa1200.yaml | 141 ++++++ + .../bindings/input/microchip,cap11xx.yaml | 92 +++- + .../devicetree/bindings/input/syna,rmi4.yaml | 11 +- + drivers/input/keyboard/cap11xx.c | 275 +++++++---- + drivers/input/misc/Kconfig | 12 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/isa1200.c | 533 +++++++++++++++++++++ + drivers/input/mouse/synaptics.c | 1 + + drivers/input/touchscreen/mms114.c | 245 +++++----- + drivers/input/touchscreen/sur40.c | 4 +- + 10 files changed, 1085 insertions(+), 230 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/imagis,isa1200.yaml + create mode 100644 drivers/input/misc/isa1200.c +Merging block/for-next (39dffa2bee1ba Merge branch 'io_uring-7.2' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git block/for-next +Merge made by the 'ort' strategy. + block/blk-mq.c | 3 ++- + block/blk-wbt.c | 21 ++++++++++++++++++++- + block/blk-zoned.c | 42 ++++++++++++++++++++++++++++-------------- + block/blk.h | 4 ++-- + block/genhd.c | 2 +- + drivers/block/ublk_drv.c | 13 ++++++++++++- + include/linux/io_uring_types.h | 2 ++ + io_uring/io-wq.c | 5 +++++ + io_uring/io_uring.c | 2 ++ + io_uring/memmap.c | 2 +- + io_uring/msg_ring.c | 34 +++++++++++++++++++++++++++------- + io_uring/sqpoll.c | 7 ++++++- + io_uring/uring_cmd.c | 4 ++-- + 13 files changed, 110 insertions(+), 31 deletions(-) +$ git am -3 ../patches/0001-Revert-block-remove-bio_last_bvec_all.patch +Applying: Revert "block: remove bio_last_bvec_all" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/block/biovecs.rst +M include/linux/bio.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 307a8ee4f2158] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Fri Jul 3 16:20:56 2026 +0100 +Merging device-mapper/for-next (55c99f2d901c7 dm-zoned-metadata: Use strscpy() to copy device name) +$ 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 (21e7b9710a24b ata: Use named initializers for pci_device_id arrays) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (f658393698772 MAINTAINERS: Add a mailing list entry to MFD) +$ git merge -m Merge branch 'for-mfd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging MAINTAINERS +Auto-merging drivers/mfd/cs42l43-i2c.c +Auto-merging drivers/mfd/cs42l43-sdw.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/Makefile | 2 +- + .../bindings/mfd/marvell,88pm886-a1.yaml | 2 +- + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 1 + + .../devicetree/bindings/mfd/syscon-common.yaml | 34 ++++++ + Documentation/devicetree/bindings/mfd/syscon.yaml | 116 ------------------- + MAINTAINERS | 11 ++ + drivers/mfd/88pm886.c | 21 +++- + drivers/mfd/Kconfig | 1 - + drivers/mfd/axp20x.c | 2 +- + drivers/mfd/cs42l43-i2c.c | 2 - + drivers/mfd/cs42l43-sdw.c | 7 -- + drivers/mfd/cs42l43.c | 15 +-- + drivers/mfd/ipaq-micro.c | 2 +- + drivers/mfd/mt6397-core.c | 3 + + drivers/mfd/rohm-bd71828.c | 125 +++++++++++++++------ + drivers/mfd/rohm-bd718x7.c | 123 ++++++++++++++------ + drivers/mfd/si476x-cmd.c | 1 - + drivers/mfd/si476x-i2c.c | 46 +++----- + include/linux/mfd/88pm886.h | 5 + + include/linux/mfd/cs42l43.h | 2 - + include/linux/mfd/si476x-core.h | 5 +- + include/linux/mfd/si476x-platform.h | 2 - + 22 files changed, 286 insertions(+), 242 deletions(-) +Merging backlight/for-backlight-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-backlight-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (a888754e51e91 Documentation: ABI: sysfs-class-reboot-mode-reboot_modes: fix doc warnings) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (f23ae9e1ee863 Merge remote-tracking branch 'regulator/for-7.3' into regulator-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging drivers/regulator/adp5055-regulator.c +Auto-merging drivers/regulator/max77675-regulator.c +Auto-merging drivers/regulator/pv88080-regulator.c +Auto-merging drivers/regulator/rtq2208-regulator.c +Auto-merging drivers/regulator/tps6287x-regulator.c +Merge made by the 'ort' strategy. + .../regulator/qcom,sdm845-refgen-regulator.yaml | 31 +++++- + .../bindings/regulator/richtek,rtq2208.yaml | 4 +- + drivers/regulator/88pg86x.c | 4 +- + drivers/regulator/act8865-regulator.c | 2 +- + drivers/regulator/ad5398.c | 4 +- + drivers/regulator/adp5055-regulator.c | 4 +- + drivers/regulator/as3722-regulator.c | 1 - + drivers/regulator/aw37503-regulator.c | 4 +- + drivers/regulator/da9121-regulator.c | 20 ++-- + drivers/regulator/da9210-regulator.c | 4 +- + drivers/regulator/da9211-regulator.c | 18 ++-- + 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 | 2 +- + 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/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/rtq2208-regulator.c | 7 +- + 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/tps6594-regulator.c | 19 +++- + include/linux/mfd/max14577-private.h | 3 + + 60 files changed, 387 insertions(+), 147 deletions(-) +Merging security/next (149b192e376d7 lsm: clarify security_task_prctl() hook documentation) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Merge made by the 'ort' strategy. + security/security.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging apparmor/apparmor-next (dda61023f976d apparmor: fix alternate loaders ability to load compressed policy) +$ 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/af_unix.c | 1 + + security/apparmor/apparmorfs.c | 129 +++++++++++++++++++++++++++++- + security/apparmor/domain.c | 1 + + security/apparmor/include/apparmorfs.h | 3 + + security/apparmor/include/capability.h | 1 + + security/apparmor/include/path.h | 3 + + security/apparmor/include/policy.h | 4 +- + security/apparmor/include/policy_unpack.h | 4 +- + security/apparmor/include/procattr.h | 2 + + security/apparmor/include/task.h | 5 ++ + security/apparmor/policy.c | 8 +- + security/apparmor/policy_unpack.c | 24 +++++- + 12 files changed, 174 insertions(+), 11 deletions(-) +Merging integrity/next-integrity (35d6f5e788dae doc: security: Add documentation of exporting and deleting IMA measurements) +$ 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 (ae3d476caeba0 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. + security/selinux/avc.c | 3 +-- + security/selinux/hooks.c | 44 +++++++++++++++++++++++++++++------------- + security/selinux/selinuxfs.c | 19 ++++++++++++------ + security/selinux/ss/policydb.c | 11 ++++++++--- + security/selinux/ss/services.c | 18 ++++++++--------- + 5 files changed, 62 insertions(+), 33 deletions(-) +Merging smack/next (b78fede1c69a0 smack: simplify write handlers of sysfs entries) +$ git merge -m Merge branch 'next' of https://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + security/smack/smack_lsm.c | 2 +- + security/smack/smackfs.c | 81 +++++++++++++--------------------------------- + 2 files changed, 23 insertions(+), 60 deletions(-) +Merging tomoyo/master (110ef9f94f84d apparmor: temporarily disable in syzbot kernels.) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Auto-merging fs/namespace.c +Auto-merging kernel/locking/lockdep.c +Auto-merging lib/Kconfig.debug +Auto-merging net/core/dev.c +Auto-merging net/socket.c +Merge made by the 'ort' strategy. + drivers/block/loop.c | 87 ++++++++++++++++++++- + fs/namespace.c | 5 ++ + include/linux/netdevice.h | 15 ++++ + include/net/dst.h | 22 +++++- + include/net/sock.h | 8 +- + kernel/locking/lockdep.c | 2 + + kernel/softirq.c | 4 + + kernel/workqueue.c | 4 + + lib/Kconfig.debug | 7 ++ + net/bridge/br_nf_core.c | 1 + + net/core/dev.c | 188 ++++++++++++++++++++++++++++++++++++++++++++++ + net/core/dst.c | 85 +++++++++++++++++++++ + net/core/lock_debug.c | 1 + + net/socket.c | 32 ++++++-- + security/apparmor/Kconfig | 1 + + 15 files changed, 449 insertions(+), 13 deletions(-) +Merging tpmdd-tpm/for-next-tpm (4ece5759c1a29 tpm: tpm_i2c_nuvoton: disable IRQ on wait timeout) +$ 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/tpm_i2c_nuvoton.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging tpmdd-keys/for-next-keys (51cb1aa1250c3 Merge tag 'loongarch-7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson) +$ 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 (bc54a071a02dc dt-bindings: watchdog: Document Qualcomm Maili watchdog) +$ git merge -m Merge branch 'watchdog-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog/watchdog-next +Auto-merging drivers/watchdog/cros_ec_wdt.c +Auto-merging drivers/watchdog/max63xx_wdt.c +Auto-merging drivers/watchdog/max77620_wdt.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml | 1 + + Documentation/watchdog/watchdog-parameters.rst | 4 ++-- + drivers/watchdog/cros_ec_wdt.c | 4 ++-- + drivers/watchdog/max63xx_wdt.c | 14 +++++++------- + drivers/watchdog/max77620_wdt.c | 6 +++--- + 5 files changed, 15 insertions(+), 14 deletions(-) +Merging iommu/next (dd8a3c6cd531d Merge branches 'apple/dart', 'arm/smmu/updates', 'arm/smmu/bindings', 'rockchip', 'verisilicon', 'riscv', 'intel/vt-d', 'amd/amd-vi' and 'core' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Already up to date. +Merging audit/next (e46c818d8fa66 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. + include/asm-generic/audit_change_attr.h | 3 +++ + include/asm-generic/audit_read.h | 31 +++++++++++++++++++++++++++++++ + include/asm-generic/audit_write.h | 3 +++ + kernel/audit.c | 10 +++++----- + 4 files changed, 42 insertions(+), 5 deletions(-) +Merging devicetree/for-next (0108f362e4106 dt-bindings: sram: qcom,imem: Narrow allowed reboot modes) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/regulator/richtek,rtq2208.yaml +Merge made by the 'ort' strategy. + .../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 +++++++++++++++++++++ + .../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 +- + .../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/display/msm/dsi-controller-main.yaml | 20 ++-- + .../bindings/display/samsung/samsung,fimd.yaml | 4 +- + .../bindings/i2c/samsung,s3c2410-i2c.yaml | 2 +- + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 2 +- + .../bindings/interconnect/samsung,exynos-bus.yaml | 14 +-- + .../devicetree/bindings/leds/qcom,pm8058-led.yaml | 4 +- + .../devicetree/bindings/leds/skyworks,aat1290.yaml | 6 +- + .../devicetree/bindings/media/cec/cec-gpio.yaml | 2 +- + .../bindings/mmc/samsung,exynos-dw-mshc.yaml | 2 +- + .../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/samsung,pinctrl.yaml | 2 +- + .../bindings/power/renesas,rcar-sysc.yaml | 2 +- + .../bindings/power/reset/restart-handler.yaml | 8 +- + .../bindings/regulator/maxim,max77802.yaml | 4 +- + .../bindings/regulator/richtek,rtq2208.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 +- + .../devicetree/bindings/sound/qcom,q6asm-dais.yaml | 2 +- + .../devicetree/bindings/sram/qcom,imem.yaml | 20 ++++ + .../bindings/thermal/samsung,exynos-thermal.yaml | 4 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 12 +-- + .../devicetree/bindings/usb/qcom,snps-dwc3.yaml | 12 +-- + 65 files changed, 237 insertions(+), 169 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/xen.txt + create mode 100644 Documentation/devicetree/bindings/arm/xen.yaml +Merging dt-krzk/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/for-next (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 (a1766c1c03f82 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 +Auto-merging drivers/spi/spi-atcspi200.c +Merge made by the 'ort' strategy. + .../bindings/spi/cavium,octeon-3010-spi.yaml | 61 ++++++++++++++++++++++ + .../devicetree/bindings/spi/spi-octeon.txt | 33 ------------ + .../devicetree/bindings/spi/st,stm32-qspi.yaml | 3 ++ + drivers/spi/spi-atcspi200.c | 5 +- + drivers/spi/spi-bcm-qspi.c | 6 ++- + drivers/spi/spi-bcm63xx-hsspi.c | 6 ++- + drivers/spi/spi-bcm63xx.c | 5 +- + drivers/spi/spi-bcmbca-hsspi.c | 6 ++- + drivers/spi/spi-fsl-dspi.c | 21 ++++++-- + drivers/spi/spi-npcm-fiu.c | 15 +++--- + drivers/spi/spi-nxp-fspi.c | 31 +++++++---- + drivers/spi/spi-qpic-snand.c | 6 ++- + 12 files changed, 140 insertions(+), 58 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/cavium,octeon-3010-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-octeon.txt +Merging tip/master (a9fd77297985f Merge branch into tip/master: 'x86/msr') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging include/linux/cpuset.h +Auto-merging include/linux/sched.h +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/events/core.c +Auto-merging kernel/irq/manage.c +Merge made by the 'ort' strategy. + .../interrupt-controller/realtek,rtl-intc.yaml | 5 +- + arch/x86/events/core.c | 3 +- + arch/x86/events/intel/core.c | 60 +- + arch/x86/events/intel/ds.c | 13 - + arch/x86/events/intel/lbr.c | 14 +- + arch/x86/events/intel/uncore.c | 227 ++-- + arch/x86/events/intel/uncore.h | 39 +- + arch/x86/events/intel/uncore_discovery.c | 21 +- + arch/x86/events/intel/uncore_discovery.h | 6 +- + arch/x86/events/intel/uncore_nhmex.c | 3 +- + arch/x86/events/intel/uncore_snb.c | 82 +- + arch/x86/events/intel/uncore_snbep.c | 77 +- + arch/x86/events/perf_event.h | 4 +- + arch/x86/hyperv/hv_apic.c | 12 +- + arch/x86/include/asm/linkage.h | 2 +- + arch/x86/include/asm/microcode.h | 2 - + arch/x86/include/asm/processor.h | 1 + + arch/x86/include/asm/resctrl.h | 5 +- + arch/x86/kernel/alternative.c | 12 +- + arch/x86/kernel/apic/apic.c | 39 +- + arch/x86/kernel/cpu/amd.c | 34 +- + arch/x86/kernel/cpu/centaur.c | 35 +- + arch/x86/kernel/cpu/common.c | 12 +- + arch/x86/kernel/cpu/hygon.c | 5 +- + arch/x86/kernel/cpu/intel.c | 43 +- + arch/x86/kernel/cpu/mce/amd.c | 87 +- + arch/x86/kernel/cpu/mce/core.c | 2 +- + arch/x86/kernel/cpu/mce/p5.c | 16 +- + arch/x86/kernel/cpu/mce/winchip.c | 10 +- + arch/x86/kernel/cpu/microcode/intel.c | 36 - + arch/x86/kernel/cpu/resctrl/core.c | 7 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 27 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 12 +- + arch/x86/kernel/cpu/transmeta.c | 9 +- + arch/x86/kernel/cpu/zhaoxin.c | 12 +- + arch/x86/kernel/fpu/core.c | 18 +- + arch/x86/kernel/tsc.c | 6 +- + arch/x86/kernel/tsc_msr.c | 15 +- + arch/x86/lib/msr-smp.c | 8 +- + arch/x86/mm/ident_map.c | 2 +- + arch/x86/pci/mmconfig-shared.c | 8 +- + arch/x86/platform/olpc/olpc-xo1-sci.c | 11 +- + arch/x86/ras/Kconfig | 23 - + drivers/edac/ie31200_edac.c | 10 +- + drivers/edac/mce_amd.c | 8 +- + drivers/hwmon/hwmon-vid.c | 11 +- + drivers/irqchip/irq-realtek-rtl.c | 152 ++- + drivers/ras/Kconfig | 24 +- + include/asm-generic/vdso/vsyscall.h | 4 +- + include/linux/cpuset.h | 6 + + include/linux/sched.h | 4 +- + include/vdso/datapage.h | 6 +- + include/vdso/helpers.h | 4 +- + include/vdso/processor.h | 4 +- + include/vdso/vsyscall.h | 4 +- + kernel/cgroup/cpuset.c | 22 + + kernel/events/core.c | 41 +- + kernel/irq/irqdomain.c | 8 +- + kernel/irq/manage.c | 6 +- + kernel/sched/core.c | 5 +- + kernel/sched/deadline.c | 6 +- + kernel/sched/debug.c | 92 +- + kernel/sched/fair.c | 1224 +++++++++++--------- + kernel/sched/pelt.c | 6 +- + kernel/sched/psi.c | 2 +- + kernel/sched/rt.c | 3 +- + kernel/sched/sched.h | 49 +- + kernel/smp.c | 26 +- + kernel/time/hrtimer.c | 7 - + .../selftests/rseq/rseq-x86-thread-pointer.h | 4 +- + 70 files changed, 1598 insertions(+), 1205 deletions(-) + delete mode 100644 arch/x86/ras/Kconfig +$ git am -3 ../patches/0001-vdso-Merge-fixup-with-mm.patch +Applying: vdso: Merge fixup with mm +Using index info to reconstruct a base tree... +M kernel/time/namespace_vdso.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging kexec/kexec-next (af78cec42d1b0 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 +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/riscv/mm/init.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 16 ++-- + arch/arm64/kernel/machine_kexec_file.c | 40 +++------- + arch/arm64/mm/init.c | 5 +- + arch/loongarch/kernel/machine_kexec_file.c | 40 +++------- + arch/powerpc/include/asm/kexec_ranges.h | 1 - + arch/powerpc/kexec/crash.c | 5 +- + arch/powerpc/kexec/ranges.c | 101 +----------------------- + arch/riscv/kernel/machine_kexec_file.c | 39 +++------ + arch/riscv/mm/init.c | 5 +- + arch/x86/kernel/crash.c | 89 +++------------------ + drivers/of/fdt.c | 9 ++- + drivers/of/kexec.c | 9 +++ + include/linux/crash_core.h | 9 +++ + include/linux/crash_reserve.h | 4 +- + include/linux/kexec.h | 2 +- + kernel/crash_core.c | 89 ++++++++++++++++++++- + kernel/kexec_file.c | 27 +++++++ + 17 files changed, 208 insertions(+), 282 deletions(-) +Merging liveupdate/next (af78cec42d1b0 Merge branch 'crashkernel-cma' into kexec-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git liveupdate/next +Already up to date. +Merging clockevents/timers/drivers/next (a9ac745bc320c clocksource: move NXP timer selection to drivers/clocksource) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (1129f95c19e50 Merge 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 MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +- + drivers/edac/debugfs.c | 65 +------------------------------------------- + drivers/edac/edac_mc_sysfs.c | 2 +- + include/linux/edac.h | 3 -- + 4 files changed, 3 insertions(+), 70 deletions(-) +Merging ftrace/for-next (0e372d9db612b Merge trace/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Merge made by the 'ort' strategy. +$ git am -3 ../patches/0001-ftrace-Fix-semantic-conflict-with-mm-tree.patch +Applying: ftrace: Fix semantic conflict with mm tree +Using index info to reconstruct a base tree... +M kernel/trace/trace_printk.c +Falling back to patching base and 3-way merge... +Auto-merging kernel/trace/trace_printk.c +No changes -- Patch already applied. +Merging rcu/next (e853c1b28580e Merge branches 'rcutorture.2026.05.24' and 'misc.2026.05.24' into rcu-merge.2026.05.24) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux rcu/next +Already up to date. +Merging paulmck/non-rcu/next (48f7a50c027dd stop_machine: Fix the documentation for a NULL cpus argument) +$ git merge -m Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Already up to date. +Merging kvm/next (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/kvm/mmu/mmu.c +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/vmx.c +Merge made by the 'ort' strategy. + 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 +Merging kvm-arm/next (1ee27dacbe5dc Merge branch kvm-arm64/nv-mmu-7.2 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (babe08404e199 KVM: s390: Return failure in case of failure in kvm_s390_set_cmma_bits()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-ppc/topic/ppc-kvm (5200f5f493f79 Linux 7.1-rc4) +$ git merge -m Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (52738352a6f29 riscv: kvm: Use endian-specific __lelong for NACL shared memory) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Already up to date. +Merging kvm-x86/next (50406d35f5635 Merge tag 'kvm-x86-selftests_l2_stacks-7.3' of https://github.com/kvm-x86/linux into HEAD) +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Already up to date. +$ git am -3 ../patches/0001-KVM-selftests-Fix-up-semantic-changes.patch +Applying: KVM: selftests: Fix up semantic changes +Using index info to reconstruct a base tree... +M tools/testing/selftests/kvm/lib/kvm_util.c +Falling back to patching base and 3-way merge... +Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c +No changes -- Patch already applied. +Merging xen-tip/linux-next (fcd245ea7528d x86/Xen: correct commentary and parameter naming of xen_exchange_memory()) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Merge made by the 'ort' strategy. + arch/x86/xen/mmu_pv.c | 15 ++++--- + drivers/xen/gntalloc.c | 19 +++++--- + drivers/xen/gntdev.c | 8 +++- + drivers/xen/pvcalls-front.c | 88 ++++++++++++++++++++++++++++++++----- + drivers/xen/xen-front-pgdir-shbuf.c | 12 +++-- + drivers/xen/xenbus/xenbus_xs.c | 6 +++ + include/xen/interface/xen-mca.h | 4 +- + include/xen/interface/xen.h | 8 ++-- + 8 files changed, 124 insertions(+), 36 deletions(-) +Merging percpu/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (ecf5aad9a4417 workqueue: annotate racy PWQ_STAT_CPU_TIME update in wq_worker_tick()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + kernel/workqueue.c | 134 ++++++++++++++++++++++++++++++++++++++---- + tools/workqueue/wq_dump.py | 10 ++-- + tools/workqueue/wq_monitor.py | 6 +- + 3 files changed, 129 insertions(+), 21 deletions(-) +Merging sched-ext/for-next (57194a3172ba0 Merge branch 'for-7.3' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Merge made by the 'ort' strategy. + include/linux/sched/ext.h | 4 +- + kernel/rcu/tree.c | 3 + + kernel/rcu/tree_exp.h | 5 +- + kernel/rcu/tree_stall.h | 13 +- + kernel/sched/build_policy.c | 2 + + kernel/sched/ext/arena.c | 13 +- + kernel/sched/ext/ext.c | 1354 +++++------------------------- + kernel/sched/ext/internal.h | 209 ++++- + kernel/sched/ext/sub.c | 668 +++++++++++++++ + kernel/sched/ext/sub.h | 161 ++++ + tools/sched_ext/include/scx/common.bpf.h | 5 +- + tools/sched_ext/include/scx/compat.bpf.h | 17 - + tools/sched_ext/include/scx/compat.h | 10 +- + tools/sched_ext/scx_cpu0.c | 2 +- + tools/sched_ext/scx_flatcg.bpf.c | 5 +- + tools/sched_ext/scx_sdt.c | 2 +- + tools/sched_ext/scx_simple.c | 2 +- + tools/sched_ext/scx_userland.c | 2 +- + 18 files changed, 1293 insertions(+), 1184 deletions(-) + create mode 100644 kernel/sched/ext/sub.c + create mode 100644 kernel/sched/ext/sub.h +Merging drivers-x86/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +$ git am -3 ../patches/0001-hid-Fix-up-mismerge.patch +Applying: hid: Fix up mismerge +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hid/hid-asus.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 4a1b56708d6d8] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git + Date: Fri Jul 3 16:21:35 2026 +0100 +Merging chrome-platform/for-next (d1ceb2b232471 platform/chrome: sensorhub: Fix memory overread in ring handler) +$ 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 +Auto-merging drivers/platform/chrome/cros_ec_chardev.c +Auto-merging drivers/platform/chrome/cros_ec_debugfs.c +Auto-merging drivers/platform/chrome/cros_ec_lightbar.c +Auto-merging drivers/platform/chrome/cros_ec_sensorhub.c +Auto-merging drivers/platform/chrome/cros_ec_sysfs.c +Auto-merging drivers/platform/chrome/cros_ec_vbc.c +Auto-merging drivers/platform/chrome/cros_kbd_led_backlight.c +Auto-merging drivers/platform/chrome/cros_usbpd_logger.c +Auto-merging drivers/platform/chrome/cros_usbpd_notify.c +Auto-merging drivers/platform/chrome/wilco_ec/core.c +Auto-merging drivers/platform/chrome/wilco_ec/debugfs.c +Auto-merging drivers/platform/chrome/wilco_ec/telemetry.c +Merge made by the 'ort' strategy. + drivers/platform/chrome/chromeos_of_hw_prober.c | 2 +- + drivers/platform/chrome/cros_ec_chardev.c | 4 ++-- + drivers/platform/chrome/cros_ec_debugfs.c | 4 ++-- + drivers/platform/chrome/cros_ec_lightbar.c | 4 ++-- + drivers/platform/chrome/cros_ec_sensorhub.c | 4 ++-- + drivers/platform/chrome/cros_ec_sensorhub_ring.c | 17 ++++++++++++++++- + 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 ++-- + 15 files changed, 47 insertions(+), 26 deletions(-) +Merging chrome-platform-firmware/for-firmware-next (dd06eb60e86a1 docs: ABI: testing: Fix typo) +$ git merge -m Merge branch 'for-firmware-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-firmware-gsmi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hsi/for-next (254f49634ee16 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds-lj/for-leds-next (7ddc04d1bd08f leds: trigger: netdev: Extend speeds up to 100G) +$ 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 drivers/leds/rgb/leds-pwm-multicolor.c +Merge made by the 'ort' strategy. + drivers/leds/rgb/leds-pwm-multicolor.c | 2 ++ + drivers/leds/trigger/ledtrig-netdev.c | 46 +++++++++++++++++++++++++++++++++- + include/linux/leds.h | 4 +++ + 3 files changed, 51 insertions(+), 1 deletion(-) +Merging ipmi/for-next (6d920a75df9a8 ipmi: si: Fix NULL pointer dereference after failed registration) +$ 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/ipmb_dev_int.c | 5 +++-- + drivers/char/ipmi/ipmi_msghandler.c | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging driver-core/driver-core-next (e7e09a8546a9e driver core: fix path of /sys/module in comment) +$ 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 +Merge made by the 'ort' strategy. + drivers/base/module.c | 2 +- + fs/debugfs/file.c | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging usb/usb-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (d49d71ebec8f0 thunderbolt: xdomain: Notify peers after enumeration) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Auto-merging drivers/net/thunderbolt/main.c +Auto-merging drivers/thunderbolt/stream.c +Auto-merging drivers/thunderbolt/tb.c +Auto-merging include/linux/thunderbolt.h +Merge made by the 'ort' strategy. + drivers/net/thunderbolt/main.c | 4 ++-- + drivers/thunderbolt/dma_test.c | 4 ++-- + drivers/thunderbolt/domain.c | 4 +--- + drivers/thunderbolt/nhi.c | 2 ++ + drivers/thunderbolt/pci.c | 28 +++++++++++++++++++++++----- + drivers/thunderbolt/stream.c | 4 ++-- + drivers/thunderbolt/switch.c | 11 ++++++++++- + drivers/thunderbolt/tb.c | 21 +++++++++++++++++++++ + drivers/thunderbolt/tb.h | 1 + + drivers/thunderbolt/xdomain.c | 4 ++++ + include/linux/thunderbolt.h | 8 +++++++- + 11 files changed, 75 insertions(+), 16 deletions(-) +Merging usb-serial/usb-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +$ git am -3 ../patches/0001-bus-mhi-Fix-up-interaction-with-net-next-tree.patch +Applying: bus: mhi: Fix up interaction with net-next tree +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 coresight/next (98495b5a4d77d coresight: ultrasoc-smb: Fix OOB write in smb_sync_perf_buffer()) +$ 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 (17ec912dc87bf Merge branches 'fastrpc-fixes' and 'fastrpc-for-7.3' into fastrpc-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/misc/fastrpc.c | 46 ++++++++++++++++++++++++++++------------------ + 2 files changed, 29 insertions(+), 19 deletions(-) +Merging fpga/for-next (43a1974da6bc7 fpga: microchip-spi: fix zero header_size OOB read in mpf_ops_parse_header()) +$ 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 (94fe92d2f662b 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 (fef4337eb2888 iio: temperature: tmp117: add TI TMP119 support) +$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/iio/accel/adxl355_spi.c +Auto-merging drivers/iio/accel/adxl367_spi.c +Auto-merging drivers/iio/accel/adxl372_spi.c +Auto-merging drivers/iio/accel/adxl380_spi.c +Auto-merging drivers/iio/accel/bma220_spi.c +Auto-merging drivers/iio/accel/bma400_spi.c +Auto-merging drivers/iio/accel/bmc150-accel-core.c +Auto-merging drivers/iio/accel/bmc150-accel-spi.c +Auto-merging drivers/iio/accel/fxls8962af-core.c +Auto-merging drivers/iio/accel/fxls8962af-spi.c +Auto-merging drivers/iio/accel/hid-sensor-accel-3d.c +Auto-merging drivers/iio/accel/kxsd9-spi.c +Auto-merging drivers/iio/accel/st_accel_spi.c +Auto-merging drivers/iio/accel/stk8ba50.c +CONFLICT (content): Merge conflict in drivers/iio/accel/stk8ba50.c +Auto-merging drivers/iio/adc/Kconfig +Auto-merging drivers/iio/adc/ad4000.c +Auto-merging drivers/iio/adc/ad4080.c +Auto-merging drivers/iio/adc/ad4134.c +Auto-merging drivers/iio/adc/ad4851.c +Auto-merging drivers/iio/adc/ad7124.c +Auto-merging drivers/iio/adc/ad7173.c +Auto-merging drivers/iio/adc/ad7191.c +Auto-merging drivers/iio/adc/ad7192.c +Auto-merging drivers/iio/adc/ad7280a.c +Auto-merging drivers/iio/adc/ad7292.c +Auto-merging drivers/iio/adc/ad7298.c +Auto-merging drivers/iio/adc/hi8435.c +Auto-merging drivers/iio/adc/hx711.c +Auto-merging drivers/iio/adc/max1027.c +Auto-merging drivers/iio/adc/max1118.c +Auto-merging drivers/iio/adc/max14001.c +Auto-merging drivers/iio/adc/mcp320x.c +Auto-merging drivers/iio/adc/mcp3911.c +Auto-merging drivers/iio/adc/rohm-bd79112.c +Auto-merging drivers/iio/adc/rtq6056.c +Auto-merging drivers/iio/adc/ti-adc0832.c +Auto-merging drivers/iio/adc/ti-adc084s021.c +Auto-merging drivers/iio/adc/ti-adc108s102.c +Auto-merging drivers/iio/adc/ti-adc128s052.c +Auto-merging drivers/iio/adc/ti-adc161s626.c +Auto-merging drivers/iio/adc/ti-ads1018.c +Auto-merging drivers/iio/adc/ti-ads124s08.c +Auto-merging drivers/iio/adc/ti-ads131m02.c +Auto-merging drivers/iio/adc/ti-ads8688.c +Auto-merging drivers/iio/adc/ti-tlc4541.c +Auto-merging drivers/iio/amplifiers/ad8366.c +Auto-merging drivers/iio/chemical/bme680_spi.c +Auto-merging drivers/iio/dac/ad3530r.c +Auto-merging drivers/iio/dac/ad5446-spi.c +Auto-merging drivers/iio/dac/ad5706r.c +Auto-merging drivers/iio/dac/ad5758.c +Auto-merging drivers/iio/dac/ad7293.c +Auto-merging drivers/iio/dac/ad7303.c +Auto-merging drivers/iio/dac/ad9739a.c +Auto-merging drivers/iio/dac/ltc2664.c +Auto-merging drivers/iio/dac/ltc2688.c +Auto-merging drivers/iio/dac/max22007.c +Auto-merging drivers/iio/dac/max5522.c +Auto-merging drivers/iio/dac/mcp4821.c +Auto-merging drivers/iio/dac/ti-dac082s085.c +Auto-merging drivers/iio/filter/admv8818.c +Auto-merging drivers/iio/frequency/adf4350.c +Auto-merging drivers/iio/frequency/admv1013.c +Auto-merging drivers/iio/frequency/admv1014.c +Auto-merging drivers/iio/frequency/adrf6780.c +Auto-merging drivers/iio/gyro/fxas21002c_spi.c +Auto-merging drivers/iio/gyro/hid-sensor-gyro-3d.c +Auto-merging drivers/iio/gyro/st_gyro_spi.c +Auto-merging drivers/iio/humidity/hid-sensor-humidity.c +Auto-merging drivers/iio/imu/adis16475.c +Auto-merging drivers/iio/imu/adis16480.c +Auto-merging drivers/iio/imu/bmi160/bmi160_spi.c +Auto-merging drivers/iio/imu/bmi270/bmi270_spi.c +Auto-merging drivers/iio/imu/bmi323/bmi323_spi.c +Auto-merging drivers/iio/imu/fxos8700_spi.c +Auto-merging drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c +Auto-merging drivers/iio/imu/inv_icm45600/inv_icm45600_spi.c +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c +Auto-merging drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c +Auto-merging drivers/iio/light/hid-sensor-als.c +Auto-merging drivers/iio/light/hid-sensor-prox.c +Auto-merging drivers/iio/light/opt3001.c +Auto-merging drivers/iio/light/st_uvis25_spi.c +Auto-merging drivers/iio/magnetometer/bmc150_magn_spi.c +Auto-merging drivers/iio/magnetometer/mmc5983.c +Auto-merging drivers/iio/magnetometer/st_magn_spi.c +Auto-merging drivers/iio/orientation/hid-sensor-incl-3d.c +Auto-merging drivers/iio/orientation/hid-sensor-rotation.c +Auto-merging drivers/iio/position/hid-sensor-custom-intel-hinge.c +Auto-merging drivers/iio/potentiometer/max5481.c +Auto-merging drivers/iio/potentiometer/max5487.c +Auto-merging drivers/iio/potentiometer/mcp41010.c +Auto-merging drivers/iio/potentiometer/mcp4131.c +Auto-merging drivers/iio/pressure/abp2030pa_spi.c +Auto-merging drivers/iio/pressure/hid-sensor-press.c +Auto-merging drivers/iio/pressure/hsc030pa_spi.c +Auto-merging drivers/iio/pressure/mprls0025pa_spi.c +Auto-merging drivers/iio/pressure/ms5611_spi.c +Auto-merging drivers/iio/pressure/st_pressure_spi.c +Auto-merging drivers/iio/pressure/zpa2326_spi.c +Auto-merging drivers/iio/proximity/as3935.c +Auto-merging drivers/iio/proximity/vl53l1x-i2c.c +Auto-merging drivers/iio/resolver/ad2s1200.c +Auto-merging drivers/iio/temperature/hid-sensor-temperature.c +Auto-merging drivers/iio/temperature/ltc2983.c +Auto-merging drivers/iio/temperature/max31856.c +Auto-merging drivers/iio/temperature/max31865.c +Auto-merging drivers/iio/temperature/maxim_thermocouple.c +Auto-merging drivers/staging/iio/frequency/ad9832.c +Auto-merging drivers/staging/iio/frequency/ad9834.c +Auto-merging lib/vsprintf.c +Resolved 'drivers/iio/accel/stk8ba50.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 58ed4d2605cc8] Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 10 +- + Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192 | 2 +- + Documentation/ABI/testing/sysfs-bus-iio-frequency | 11 + + .../ABI/testing/sysfs-bus-iio-frequency-adf4350 | 10 - + .../devicetree/bindings/iio/adc/avia-hx711.yaml | 21 + + .../devicetree/bindings/iio/dac/adi,ad5686.yaml | 72 +- + .../devicetree/bindings/iio/dac/adi,ad5696.yaml | 73 +- + .../bindings/iio/frequency/adi,adf41513.yaml | 227 ++++ + .../iio/magnetometer/qstcorp,qmc5883l.yaml | 52 + + .../bindings/iio/temperature/ti,tmp117.yaml | 16 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/iio/adf41513.rst | 199 ++++ + Documentation/iio/index.rst | 1 + + MAINTAINERS | 18 +- + drivers/iio/TODO | 13 +- + drivers/iio/accel/adxl345_spi.c | 4 +- + drivers/iio/accel/adxl355_spi.c | 4 +- + drivers/iio/accel/adxl367_spi.c | 2 +- + drivers/iio/accel/adxl372_spi.c | 4 +- + drivers/iio/accel/adxl380_spi.c | 8 +- + drivers/iio/accel/bma220_spi.c | 2 +- + 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/fxls8962af-core.c | 2 + + drivers/iio/accel/fxls8962af-spi.c | 4 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 6 +- + drivers/iio/accel/kxsd9-spi.c | 2 +- + drivers/iio/accel/mma7455_spi.c | 4 +- + 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 | 12 +- + drivers/iio/accel/stk8ba50.c | 9 +- + drivers/iio/adc/Kconfig | 3 +- + drivers/iio/adc/ad4000.c | 62 +- + drivers/iio/adc/ad4030.c | 14 +- + drivers/iio/adc/ad4080.c | 22 +- + 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/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 | 2 +- + drivers/iio/adc/hi8435.c | 2 +- + drivers/iio/adc/hx711.c | 98 +- + 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 | 8 +- + 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/rohm-bd79112.c | 2 +- + drivers/iio/adc/rtq6056.c | 4 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 12 +- + drivers/iio/adc/ti-adc0832.c | 8 +- + drivers/iio/adc/ti-adc084s021.c | 2 +- + 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-ads1018.c | 4 +- + 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/addac/ad74115.c | 2 +- + drivers/iio/amplifiers/ad8366.c | 26 +- + drivers/iio/amplifiers/ada4250.c | 2 +- + drivers/iio/chemical/bme680_spi.c | 2 +- + drivers/iio/chemical/ens160_spi.c | 2 +- + drivers/iio/chemical/scd30_core.c | 6 +- + drivers/iio/dac/ad3530r.c | 8 +- + 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.c | 40 +- + drivers/iio/dac/ad5686.h | 4 + + 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/ad8801.c | 4 +- + drivers/iio/dac/ad9739a.c | 2 +- + 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/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/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/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 | 6 +- + drivers/iio/gyro/st_gyro_spi.c | 18 +- + drivers/iio/health/afe4403.c | 2 +- + drivers/iio/humidity/hid-sensor-humidity.c | 6 +- + drivers/iio/humidity/hts221_spi.c | 2 +- + drivers/iio/iio_core_trigger.h | 2 +- + drivers/iio/imu/adis16400.c | 30 +- + drivers/iio/imu/adis16460.c | 2 +- + drivers/iio/imu/adis16475.c | 54 +- + drivers/iio/imu/adis16480.c | 40 +- + drivers/iio/imu/bmi160/bmi160_spi.c | 4 +- + drivers/iio/imu/bmi270/bmi270_spi.c | 4 +- + drivers/iio/imu/bmi323/bmi323_core.c | 2 +- + drivers/iio/imu/bmi323/bmi323_spi.c | 2 +- + drivers/iio/imu/fxos8700_spi.c | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 14 +- + drivers/iio/imu/inv_icm45600/inv_icm45600_spi.c | 16 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 34 +- + drivers/iio/imu/smi240.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 48 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 4 +- + drivers/iio/industrialio-core.c | 49 +- + drivers/iio/light/hid-sensor-als.c | 6 +- + drivers/iio/light/hid-sensor-prox.c | 4 +- + drivers/iio/light/opt3001.c | 381 +++--- + drivers/iio/light/st_uvis25_spi.c | 2 +- + drivers/iio/light/tcs3472.c | 317 ++++- + drivers/iio/magnetometer/Kconfig | 11 + + drivers/iio/magnetometer/Makefile | 2 + + drivers/iio/magnetometer/bmc150_magn.c | 50 +- + drivers/iio/magnetometer/bmc150_magn_spi.c | 6 +- + drivers/iio/magnetometer/hmc5843_spi.c | 6 +- + drivers/iio/magnetometer/mmc5983.c | 2 +- + drivers/iio/magnetometer/qmc5883l.c | 516 ++++++++ + drivers/iio/magnetometer/st_magn_spi.c | 12 +- + drivers/iio/orientation/hid-sensor-incl-3d.c | 6 +- + drivers/iio/orientation/hid-sensor-rotation.c | 6 +- + .../iio/position/hid-sensor-custom-intel-hinge.c | 6 +- + 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/pressure/abp2030pa_spi.c | 2 +- + drivers/iio/pressure/bmp280-core.c | 32 +- + drivers/iio/pressure/bmp280-spi.c | 14 +- + drivers/iio/pressure/hid-sensor-press.c | 6 +- + drivers/iio/pressure/hsc030pa_spi.c | 2 +- + drivers/iio/pressure/mpl115_spi.c | 2 +- + drivers/iio/pressure/mprls0025pa_spi.c | 2 +- + drivers/iio/pressure/ms5611_spi.c | 4 +- + drivers/iio/pressure/st_pressure_spi.c | 24 +- + drivers/iio/pressure/zpa2326_spi.c | 2 +- + drivers/iio/proximity/as3935.c | 2 +- + drivers/iio/proximity/vl53l1x-i2c.c | 39 +- + drivers/iio/resolver/ad2s1200.c | 4 +- + drivers/iio/resolver/ad2s1210.c | 2 +- + drivers/iio/resolver/ad2s90.c | 2 +- + drivers/iio/temperature/hid-sensor-temperature.c | 6 +- + drivers/iio/temperature/ltc2983.c | 10 +- + drivers/iio/temperature/max31856.c | 2 +- + drivers/iio/temperature/max31865.c | 2 +- + drivers/iio/temperature/maxim_thermocouple.c | 18 +- + drivers/iio/temperature/tmp117.c | 13 + + drivers/iio/test/iio-test-format.c | 97 +- + drivers/iio/test/iio-test-rescale.c | 2 +- + drivers/staging/iio/adc/ad7816.c | 6 +- + drivers/staging/iio/addac/adt7316-spi.c | 13 +- + drivers/staging/iio/frequency/ad9832.c | 4 +- + drivers/staging/iio/frequency/ad9834.c | 8 +- + include/linux/iio/types.h | 20 + + include/linux/kstrtox.h | 3 + + include/linux/math64.h | 18 + + 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 +- + 232 files changed, 4615 insertions(+), 1403 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-frequency + 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/iio/adf41513.rst + create mode 100644 drivers/iio/frequency/adf41513.c + create mode 100644 drivers/iio/magnetometer/qmc5883l.c +Merging nfc/for-next (ed85d4cbbfaa4 nfc: llcp: bound SNL TLV parsing to the skb and add length checks) +$ git merge -m Merge branch 'for-next' of https://codeberg.org/linux-nfc/linux.git nfc/for-next +Auto-merging MAINTAINERS +Auto-merging net/nfc/nci/rsp.c +CONFLICT (content): Merge conflict in net/nfc/nci/rsp.c +Resolved 'net/nfc/nci/rsp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 65dcf7b331642] Merge branch 'for-next' of https://codeberg.org/linux-nfc/linux.git +$ git diff -M --stat --summary HEAD^.. + net/nfc/nci/rsp.c | 9 +++++++++ + 1 file changed, 9 insertions(+) +Merging phy-next/next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (90af3209742db soundwire: dmi-quirks: Disable ghost Realtek on Asus Expertbook) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + .../bindings/soundwire/qcom,soundwire.yaml | 20 ++++++++++---------- + drivers/soundwire/dmi-quirks.c | 7 +++++++ + drivers/soundwire/qcom.c | 9 ++++++--- + 3 files changed, 23 insertions(+), 13 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 (5d6919055dec1 Linux 7.1-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 (785562e31dbcd vfio: selftests: Ensure libvfio output dirs are always created) +$ git merge -m Merge branch 'next' of https://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (487eca6535cab w1: ds28e17: reject an oversize length on an I2C block read) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/w1/omap-hdq.txt | 22 ------- + Documentation/devicetree/bindings/w1/ti,hdq.yaml | 70 +++++++++++++++++++++++ + drivers/w1/masters/ds2482.c | 8 +++ + drivers/w1/slaves/w1_ds28e17.c | 8 +++ + 4 files changed, 86 insertions(+), 22 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/w1/omap-hdq.txt + create mode 100644 Documentation/devicetree/bindings/w1/ti,hdq.yaml +Merging spmi/spmi-next (3443eec9c55d1 spmi: use kzalloc_flex in main allocation) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging counter-next/counter-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'counter-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (59b723cd2adba Linux 6.12-rc6) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (0d3e3376b289c dmaengine: pl330: remove debugfs file on teardown) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging drivers/crypto/atmel-aes.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/mediatek,uart-dma.yaml | 1 + + .../bindings/dma/xilinx/xlnx,axi-dma.yaml | 13 +- + Documentation/driver-api/dmaengine/client.rst | 9 ++ + drivers/crypto/atmel-aes.c | 10 +- + drivers/dma/dmaengine.c | 2 + + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 2 +- + drivers/dma/dw-edma/dw-edma-core.c | 41 ++++-- + drivers/dma/hisi_dma.c | 2 +- + drivers/dma/mediatek/mtk-uart-apdma.c | 2 +- + drivers/dma/pl330.c | 19 ++- + drivers/dma/tegra210-adma.c | 12 +- + drivers/dma/xilinx/xilinx_dma.c | 64 +++++---- + 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/dmaengine.h | 149 +++++++++++++++++++-- + 17 files changed, 282 insertions(+), 143 deletions(-) +Merging cgroup/for-next (ec98784b247b2 Merge branch 'for-7.3' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging kernel/cgroup/cpuset.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 34 +++++++++++++-- + include/linux/cgroup-defs.h | 2 +- + include/linux/cgroup.h | 2 +- + kernel/cgroup/cpuset.c | 49 +++++++++++++--------- + tools/cgroup/iocost_monitor.py | 10 ++--- + .../selftests/cgroup/lib/include/cgroup_util.h | 1 + + tools/testing/selftests/cgroup/test_cpu.c | 43 ++++++++++++++++--- + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 11 ++++- + 8 files changed, 115 insertions(+), 37 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 (57a6ed0b41677 scsi: bfa: Reduce kernel stack usage in bfa_fcs_lport_fdmi_build_portattr_block()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/scsi_lib.c +Merge made by the 'ort' strategy. + drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- + drivers/scsi/scsi_lib.c | 8 -------- + drivers/scsi/scsi_priv.h | 1 + + drivers/xen/xen-scsiback.c | 30 +++++++++++++++++++++++------- + include/scsi/scsi_device.h | 1 - + 5 files changed, 25 insertions(+), 17 deletions(-) +Merging vhost/linux-next (1f673033c0273 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 drivers/vdpa/vdpa_user/vduse_dev.c +Merge made by the 'ort' strategy. + drivers/vdpa/vdpa_user/vduse_dev.c | 136 +++++++++++++++++++++++++++++++++---- + include/uapi/linux/vduse.h | 29 +++++++- + 2 files changed, 150 insertions(+), 15 deletions(-) +Merging rpmsg/for-next (8ca01dbc70b58 Merge branch 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 82 +++++------ + .../remoteproc/qcom,kaanapali-soccp-pas.yaml | 156 +++++++++++++++++++++ + .../bindings/remoteproc/qcom,milos-pas.yaml | 26 +++- + .../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 | 28 ++++ + drivers/firmware/xilinx/zynqmp.c | 93 ++++++++++++ + drivers/remoteproc/imx_dsp_rproc.c | 41 ++---- + drivers/remoteproc/imx_rproc.c | 40 +----- + drivers/remoteproc/keystone_remoteproc.c | 2 +- + drivers/remoteproc/omap_remoteproc.c | 2 +- + drivers/remoteproc/qcom_common.h | 6 + + drivers/remoteproc/qcom_q6v5.c | 3 +- + drivers/remoteproc/qcom_q6v5_pas.c | 86 ++++++++++++ + drivers/remoteproc/qcom_sysmon.c | 19 +++ + drivers/remoteproc/rcar_rproc.c | 41 +----- + drivers/remoteproc/remoteproc_internal.h | 54 +++++++ + drivers/remoteproc/st_remoteproc.c | 31 +--- + drivers/remoteproc/stm32_rproc.c | 39 +----- + drivers/remoteproc/xlnx_r5_remoteproc.c | 138 +++--------------- + include/linux/firmware/xlnx-zynqmp.h | 12 ++ + 31 files changed, 843 insertions(+), 368 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml +Merging gpio-brgl/gpio/for-next (edbcefc9b0d59 gpio: nomadik: drop "chip registered" log on probe success) +$ git merge -m Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging drivers/gpio/gpio-mvebu.c +Auto-merging drivers/gpio/gpio-nomadik.c +Merge made by the 'ort' strategy. + .../bindings/gpio/realtek,rtd1625-gpio.yaml | 71 +++ + drivers/gpio/Kconfig | 14 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-amd-fch.c | 22 +- + drivers/gpio/gpio-mvebu.c | 40 +- + drivers/gpio/gpio-nomadik.c | 64 +-- + drivers/gpio/gpio-pca9570.c | 2 +- + drivers/gpio/gpio-rockchip.c | 16 +- + drivers/gpio/gpio-rtd1625.c | 611 +++++++++++++++++++++ + drivers/gpio/gpio-tb10x.c | 5 +- + drivers/gpio/gpiolib-kunit.c | 280 +++++++++- + 11 files changed, 1041 insertions(+), 85 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/realtek,rtd1625-gpio.yaml + create mode 100644 drivers/gpio/gpio-rtd1625.c +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 (94cb9e8f27079 pinctrl: s32cc: implement GPIO functionality) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../pinctrl/aspeed,ast2700-soc1-pinctrl.yaml | 1 + + .../bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml | 90 ++- + MAINTAINERS | 7 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g7-soc1.c | 6 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 7 +- + drivers/pinctrl/nxp/Kconfig | 3 +- + drivers/pinctrl/nxp/pinctrl-s32.h | 35 +- + drivers/pinctrl/nxp/pinctrl-s32cc.c | 768 ++++++++++++++++++--- + drivers/pinctrl/nxp/pinctrl-s32g2.c | 47 +- + drivers/pinctrl/pinctrl-tb10x.c | 2 +- + 11 files changed, 856 insertions(+), 111 deletions(-) +Merging pinctrl-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/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 +Merge made by the 'ort' strategy. + drivers/pinctrl/renesas/pinctrl-rza2.c | 26 +++++++++++--------------- + 1 file changed, 11 insertions(+), 15 deletions(-) +Merging pinctrl-samsung/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pinctrl-qcom/pinctrl-qcom/for-next (251b53103a2e5 pinctrl: qcom: Add the tlmm driver for Maili platform) +$ 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 +Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c +Merge made by the 'ort' strategy. + .../bindings/pinctrl/qcom,maili-tlmm.yaml | 120 ++ + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 3 + + drivers/pinctrl/qcom/Kconfig.msm | 10 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-maili.c | 1625 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-msm.c | 9 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 + + drivers/pinctrl/qcom/tlmm-test.c | 3 - + 8 files changed, 1763 insertions(+), 9 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,maili-tlmm.yaml + create mode 100644 drivers/pinctrl/qcom/pinctrl-maili.c +Merging pwm/pwm/for-next (898ab0f30e008 pwm: rzg2l-gpt: Add missing newlines to dev_err_probe() messages) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (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 (643ec8ff7d8ed kunit: Add example of test suite that can be skipped at runtime) +$ git merge -m Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + include/kunit/test.h | 1 + + lib/kunit/debugfs.c | 28 ++++++++++++++++++++-------- + lib/kunit/kunit-example-test.c | 29 +++++++++++++++++++++++++++++ + lib/kunit/test.c | 17 ++++++++++++++++- + rust/kernel/kunit.rs | 1 + + 5 files changed, 67 insertions(+), 9 deletions(-) +Merging livepatching/for-next (0839c8963b7b2 Merge tag 'livepatching-for-7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git livepatching/for-next +Already up to date. +Merging rtc/rtc-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (86e411b6ec277 MAINTAINERS: nvdimm: Include maintainer profile) +$ git merge -m Merge branch 'libnvdimm-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'at24/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (41fa043273841 selftests/seccomp: Add hard-coded __NR_uprobe for x86_64) +$ git merge -m Merge branch 'for-next/seccomp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging slimbus/for-next (c922423ce66bc slimbus: qcom-ngd-ctrl: Use the unified QMI service ID instead of defining it locally) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. + drivers/slimbus/qcom-ngd-ctrl.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging nvmem/for-next (a3122a19f00b7 nvmem: layouts: u-boot-env: check earlier for ethaddr length) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging drivers/nvmem/nintendo-otp.c +Merge made by the 'ort' strategy. + .../bindings/nvmem/airoha,smc-efuses.yaml | 67 +++++++++++ + .../bindings/nvmem/microchip,lan9662-otpc.yaml | 1 + + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 4 + + drivers/nvmem/Kconfig | 22 +++- + drivers/nvmem/Makefile | 2 + + drivers/nvmem/airoha-smc-efuses.c | 125 +++++++++++++++++++++ + drivers/nvmem/core.c | 4 + + drivers/nvmem/lan9662-otpc.c | 12 +- + drivers/nvmem/layouts/u-boot-env.c | 5 +- + drivers/nvmem/nintendo-otp.c | 9 +- + drivers/nvmem/rockchip-otp.c | 9 +- + 11 files changed, 236 insertions(+), 24 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/airoha,smc-efuses.yaml + create mode 100644 drivers/nvmem/airoha-smc-efuses.c +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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Already up to date. +Merging kgdb/kgdb/for-next (fdbdd0ccb30af kdb: remove redundant check for scancode 0xe0) +$ git merge -m Merge branch 'kgdb/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'hmm' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (254f49634ee16 Linux 7.1-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 (32845111e8ea6 bus: mhi: host: pci_generic: Fix the physical function check) +$ 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 (717cd4552ae42 Merge branch 'numa_memblks-redundant-work' 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 +Auto-merging arch/riscv/mm/init.c +Auto-merging drivers/base/arch_numa.c +Auto-merging mm/hugetlb.c +Auto-merging mm/mm_init.c +Merge made by the 'ort' strategy. + arch/arm/mm/kasan_init.c | 6 ---- + arch/arm64/mm/kasan_init.c | 3 -- + arch/loongarch/kernel/numa.c | 1 - + arch/loongarch/mm/kasan_init.c | 3 -- + arch/powerpc/mm/kasan/init_book3e_64.c | 3 -- + arch/powerpc/mm/kasan/init_book3s_64.c | 3 -- + arch/riscv/mm/init.c | 2 -- + arch/riscv/mm/kasan_init.c | 3 -- + arch/x86/mm/amdtopology.c | 1 - + arch/x86/mm/numa.c | 1 - + drivers/acpi/numa/srat.c | 2 -- + drivers/base/arch_numa.c | 4 --- + drivers/of/of_numa.c | 5 +-- + mm/hugetlb.c | 7 ++-- + mm/memblock.c | 4 +-- + mm/mm_init.c | 63 +++------------------------------- + mm/numa_memblks.c | 41 ++++++++++------------ + 17 files changed, 27 insertions(+), 125 deletions(-) +Merging cxl/next (bdc0a9797abd9 Merge branch 'for-7.3/cxl-type2-support' into cxl-for-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Merge made by the 'ort' strategy. + Documentation/driver-api/cxl/linux/dax-driver.rst | 4 +- + drivers/cxl/core/core.h | 2 + + drivers/cxl/core/mbox.c | 65 +--------------------- + drivers/cxl/core/mce.c | 27 +++++---- + drivers/cxl/core/memdev.c | 67 +++++++++++++++++++++++ + drivers/cxl/core/pci.c | 1 + + drivers/cxl/core/port.c | 1 + + drivers/cxl/core/region.c | 43 +++++---------- + drivers/cxl/core/regs.c | 1 + + drivers/cxl/cxl.h | 8 +-- + drivers/cxl/cxlmem.h | 4 +- + drivers/cxl/cxlpci.h | 12 ---- + drivers/cxl/pci.c | 7 +-- + include/cxl/cxl.h | 2 + + include/cxl/pci.h | 22 ++++++++ + 15 files changed, 132 insertions(+), 134 deletions(-) + create mode 100644 include/cxl/pci.h +Merging zstd/zstd-next (65d1f5507ed2c zstd: Import upstream v1.5.7) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (48a4282157823 efi/capsule-loader: fix incorrect sizeof in phys array reallocation) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (bcfee135d5847 utf8: Remove unused utf8_normalize) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Auto-merging fs/unicode/utf8-core.c +Merge made by the 'ort' strategy. + fs/unicode/utf8-core.c | 22 ---------------------- + include/linux/unicode.h | 3 --- + 2 files changed, 25 deletions(-) +Merging slab/slab/for-next (ea0c7a9244594 docs: ABI: sysfs-kernel-slab: mark cpu_partial attributes deprecated) +$ 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 +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-kernel-slab | 18 ++++++---- + Documentation/admin-guide/kernel-parameters.txt | 5 +++ + mm/mempool.c | 35 +++++++++++++------ + mm/slub.c | 46 ++++++------------------- + 4 files changed, 51 insertions(+), 53 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. +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 (22b5f1fe549c5 selftests/landlock: Add test for TCP fast open) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Merge made by the 'ort' strategy. + security/landlock/net.c | 8 +++ + tools/testing/selftests/landlock/net_test.c | 94 +++++++++++++++++++++++++++++ + 2 files changed, 102 insertions(+) +Merging sysctl/sysctl-next (f63a9df7e3f9f sysctl: fix uninitialized variable in proc_do_large_bitmap) +$ git merge -m Merge branch 'sysctl-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (9bf092c97b86a sched: update task_struct->comm comment) +$ git merge -m Merge branch 'for-next/execve' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (7646c6d93895c psci: simplify hotplug_tests()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Merge made by the 'ort' strategy. + drivers/firmware/psci/psci_checker.c | 15 ++------------- + include/linux/bitmap.h | 4 ++-- + include/linux/bits.h | 6 +++--- + tools/include/linux/bits.h | 6 +++--- + 4 files changed, 10 insertions(+), 21 deletions(-) +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 (c2606fb910d7c Merge branch 'for-next/hardening' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Merge made by the 'ort' strategy. +Merging nolibc/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (1656f4f2eb45d power: sequencing: pcie-m2: Add QCA2066 (QCNFA765) BT serdev 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 +Auto-merging drivers/power/sequencing/pwrseq-pcie-m2.c +Merge made by the 'ort' strategy. + drivers/power/sequencing/pwrseq-pcie-m2.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging capabilities-next/caps-next (0715881360074 ipc: don't audit capability check in ipc_permissions()) +$ git merge -m Merge branch 'caps-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Already up to date. +$ git am -3 ../patches/0001-sign-file-Fix-up-merge-issue.patch +Applying: sign-file: Fix up merge issue +Using index info to reconstruct a base tree... +M scripts/sign-file.c +Falling back to patching base and 3-way merge... +Auto-merging scripts/sign-file.c +No changes -- Patch already applied. +Merging ipe/next (028ef9c96e961 Linux 7.0) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next +Already up to date. +Merging kcsan/next (07a1a6562ce29 kcsan: Silence -Wmaybe-uninitialized when calling __kcsan_check_access()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next +Already up to date. +Merging crc/crc-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'crc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next +Already up to date. +Merging keys-next/keys-next (965e9a2cf23b0 pkcs7: Change a pr_warn() to pr_warn_once()) +$ git merge -m Merge branch 'keys-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys-next/keys-next +Already up to date. +Merging fwctl/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl/for-next +Already up to date. +Merging devsec-tsm/next (3177779ae17db virt: coco: change tsm_class to a const struct) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next +Already up to date. +Merging hisilicon/for-next (6cdd694551d6a 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 0000000000000..4832a2e46c357 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20260703 |
generated by cgit 1.3-korg (git 2.53.0) at 2026-07-04 09:19:00 +0000