diff options
| -rw-r--r-- | Next/SHA1s | 430 | ||||
| -rw-r--r-- | Next/Trees | 431 | ||||
| -rw-r--r-- | Next/merge.log | 10167 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 11029 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..7342af145389 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,430 @@ +Name SHA1 +---- ---- +origin fce2dfa773ced15f27dd27cd0b482a7473cdcf2a +ext4-fixes 981fcc5674e67158d24d23e841523eccba19d0e7 +vfs-brauner-fixes 24dddc384fb9aec2d7eea5463ca6dac98a3b3854 +fscrypt-current dc59e4fea9d83f03bad6bddf3fa2e52491777482 +fsverity-current dc59e4fea9d83f03bad6bddf3fa2e52491777482 +btrfs-fixes 6c893b948351d42cfc3761cc746ab5b3d03ee7f3 +vfs-fixes 49c5d168a3a8f4eb27d44a2a22b7e8a856ca601f +erofs-fixes 1572282de6d3377ca8605d48c50df3a8c08468e9 +nfsd-fixes 92ea163c773cb4d0d5eaf103ed80c49d6758b96f +v9fs-fixes 028ef9c96e96197026887c0f092424679298aae8 +overlayfs-fixes 4549871118cf616eecdd2d939f78e3b9e1dddc48 +fscrypt 2d0afaac9137e95e504bd3ad3512a9044745536b +btrfs 2e35e224edd823bf477b5ea05deeaeb3bdbe0081 +ceph 1397040896280b7a6a6213e874ee4f6146bc9cd9 +cifs fce2dfa773ced15f27dd27cd0b482a7473cdcf2a +configfs 6363844fdbbb76afe1d44d678fe0746390204a5f +ecryptfs 95ce5ffd54cf66098f91892f98606c3bd33846fe +dlm e61113cfcaf71cbdf4c17e3d086d8fb7f92c62bf +erofs dc59e4fea9d83f03bad6bddf3fa2e52491777482 +exfat 13a315afaeb67e38f1ec76deeac19fb5f9e4b402 +ext3 04267552014fe275493c5347913456a8a09470b5 +ext4 c143957520c6c9b5cd72e0de8b52b814f0c576fe +f2fs 6429f3bf6dc33cba42055260f905559c43976eeb +fsverity dc59e4fea9d83f03bad6bddf3fa2e52491777482 +fuse 7d87a5a284bb34edb3f4e7e312ef403b3385a7b7 +gfs2 5f80d9113360c08111ae7471f662f3f89f23ce32 +jfs dad98c5b2a05ef744af4c884c97066a3c8cdad61 +ksmbd 39ccf3cdc6790ee29b4c5411dfff94ebdf5dbafc +nfs a13c140cc289c0b7b3770bce5b3ad42ab35074aa +nfs-anna 27934d02cbeb8a957dd11c985a579e58d30c5270 +nfsd c83cc1e5e8d2b1a57015946f53e4fe6af10cf227 +ntfs 9e3ca21f5d941783c871b4fbad02ba7662654950 +ntfs3 349a7959ffd7a2592830ead72e098d0e909df814 +orangefs e61bc5e4d87433c8759e7dc92bb640ef71a8970c +overlayfs 1f6ee9be92f8df85a8c9a5a78c20fd39c0c21a95 +ubifs 11efa98bcc0d00271e8f66c7c940c284f973f39d +v9fs aa88278693cbfaf7a2acf961379973fbb63b165c +v9fs-ericvh 028ef9c96e96197026887c0f092424679298aae8 +xfs 59c462b0f5cfa107794228051724b34ae9334168 +zonefs 3a8389d42bdf4213730f4067f8bfa78bae6564ef +vfs-brauner b148f6ef8f3b0306ccff2644529a65ff19a11f03 +vfs 4dda01b67c8662c5d0c53034974cb8280c575a5d +mm-hotfixes 3566356c5b2ea34cf7551c59e97a03d02bb93624 +fs-current 7f6f78211933ee1c47d0c236bc0d2d8b2a590691 +kbuild-current dc59e4fea9d83f03bad6bddf3fa2e52491777482 +clang-fixes 175db11786bde9061db526bf1ac5107d915f5163 +arc-current 76f38ad1b39cf0321f7ecb7ea37b46f61a0f3d75 +arm-current 009b6c6486b94a3aff566b017256b598dc96bf18 +arm64-fixes f797f51a185ffdc1e3f915afed55f308b376842f +arm-soc-fixes add11ea55f2d26d798c058fe4d67fb2941e77523 +davinci-current dc59e4fea9d83f03bad6bddf3fa2e52491777482 +realtek-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drivers-memory-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current dc5200f6b1ada318463dd141b041ec9f044b2bf5 +powerpc-fixes a2c02aa0c6ca3ec9fab6f1c99912a440c7b8bfdb +s390-fixes 49145bce539117db4b6e9e83c0e5ef528e361050 +net 2c72eb6286347d05a885412fb076993bd5286b53 +bpf 3d84d674e3a5a33ce5eaa14b92bc839c3821a348 +ipsec 21697720ff43b8dfa25b8e8d9ca7f56f4597fc80 +netfilter 2c7c88a412aa6d09cd04b414211b4ef8553b5309 +ipvs 2c7c88a412aa6d09cd04b414211b4ef8553b5309 +wireless a0d82fb8505326cbc53dc9a0c08f97d11197bb30 +ath a1a21995c2e1cc2ca6b2226cfe4f5f018370182a +iwlwifi a426d3227c669ef0ad9855b311a68129f10ac8bf +wpan 8ce4f287524c74a118b0af1eebd4b24a8efca57a +rdma-fixes 3cda0dfe8c651dcbb9e38977905d3d3b1750c4ab +sound-current ac1e8d01f4ea0d4a5739c6f40b07484c6385cfbb +sound-asoc-fixes 0b604e886ece11b71c4daaeccc512c784b89b014 +regmap-fixes 63d441e937b7c5bfadb878203ef5045e29cfff39 +regulator-fixes d38f8bd771c4999b797d7074b348cf201414bd34 +spi-fixes e919ca35a6e84b5adf085da9ffa1544c01d4ce1e +pci-current 34db32102439d948e0c9aea060e48f979aae827d +driver-core.current 667d0fb32149f023b8b34a1f6f3d384556eafb5a +tty.current af071d9e07e57cfff239e8d09d2f3b05ebc9c667 +usb.current 71132cedd1ecbc4032d76e9928c18a10f7e39b80 +usb-serial-fixes fad0fd120e29041b3e6cdf41bb12e3184fb524a2 +phy dc59e4fea9d83f03bad6bddf3fa2e52491777482 +staging.current a13c140cc289c0b7b3770bce5b3ad42ab35074aa +iio-fixes a41000ba3a230bed1e422f283486ff8f77fe0d30 +watchdog-fixes bcfcd7619f277842430d197556463b401b839ee9 +counter-current dc59e4fea9d83f03bad6bddf3fa2e52491777482 +char-misc.current a13c140cc289c0b7b3770bce5b3ad42ab35074aa +soundwire-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +thunderbolt-fixes db79679595326fd3f6bd1e6fd0cefc3ba016039a +input-current adea84ee6cdea611146c4251d3c1616f5a09feca +crypto-current 8173f7e2ce67e6ca1d4763f3da14e5b01ce77456 +libcrypto-fixes e073f1238ecaea366f53e98724c40b31856da56a +vfio-fixes e242e974e812e7a47e3088860c80d9492fac314f +kselftest-fixes c5c413534d40eb4c982f1794e62813f926aba747 +dmaengine-fixes 867621ba203027338b525af6729719c544135336 +backlight-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mtd-fixes 2b533e775aec580cf60074417f4ca00ac9cf3580 +mfd-fixes d5d2d7a8d8be18681a0864f58e3875f1c639e11c +v4l-dvb-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +reset-fixes 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 +mips-fixes a13c140cc289c0b7b3770bce5b3ad42ab35074aa +at91-fixes 765aaba18413a66f6c8fe8416336ca9b3dd98a79 +omap-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +kvm-fixes 25f744ffa0c8e799e06250ce2e618367b166b0d4 +kvms390-fixes 3e3aa6da87d30a0064a17b836685cd43c90a3572 +kvm-arm-fixes 8d187d4b33c262c0f3e44842553521151d8629e8 +hwmon-fixes f151d0143ac4e086f92f52328ebdbdc50933d8ef +nvdimm-fixes a8aec14230322ed8f1e8042b6d656c1631d41163 +cxl-fixes d90f236f8b9e354848bd226f581db27755ab901d +dma-mapping-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drivers-x86-fixes 78bf392ba77dd8b2a25656e489449d2f91cfd1eb +samsung-krzk-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-samsung-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-qcom-fixes 437a8d2aa1aa442c4a176fdf4700a9b3bb0c8794 +devicetree-fixes b39a6b2e9d5bd6a3153aed4c7440172b8f6a739e +dt-krzk-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +scsi-fixes e166bafc483e927150cb9b5f286c9191ea0df84e +drm-fixes 5d1238c7ac366e2d7d02a665d92867310449ac94 +drm-intel-fixes 612978b83f45bf7018815209db5395d759db6f26 +mmc-fixes e27c946b589c53520409a0956b33d52ef7a0898f +rtc-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +gnss-fixes a13c140cc289c0b7b3770bce5b3ad42ab35074aa +hyperv-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +risc-v-fixes 5caae1deee89a6582c761d5dcd4b924b744426cc +riscv-dt-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +riscv-soc-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx dc59e4fea9d83f03bad6bddf3fa2e52491777482 +gpio-brgl-fixes 9dc325327babe7f159e84cbe9380a45342da0585 +gpio-intel-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl-intel-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +auxdisplay-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +kunit-fixes 5142c56651578abc346d6c17f3fb919b9ffbb317 +memblock-fixes 2ebce860bdd7ae5e13002811bc9bbbf33fcfc221 +renesas-fixes 6fa6ee724d8dadf392139e242ac936b5da730c4b +perf-current 558ef39aeb9a089a6be9dda8413b0b9d42e843ea +efi-fixes d8809f6931065cbbf3554647a50a65a471ab5983 +battery-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +iommufd-fixes c3b8ee84a965058b41275069d4696f37a8b14bf6 +rust-fixes a19bda861b3a79e25417462539df8b0d77c6b322 +w1-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pmdomain-fixes a4876f11aa1d076802676e23f8af500706e780e3 +i2c-andi-fixes deb35336b5bfed5db9231b5348bc1514db930797 +i2c-rust-fixes 4eb422482ca5d924d7212ad2ca1cb7ea6f5b524d +sparc-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +clk-fixes 8cdeaa50eae8dad34885515f62559ee83e7e8dda +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 601ddaceb861be7eb557278109966320a6f3478c +tracefs-fixes 07004a8c4b572171934390148ee48c4175c77eed +spacemit-fixes eb525edd48907795c0d4e498ff57ad168070b289 +tip-fixes 3d2378ed6c8ffdae7d5f852eb9559b09266f78a3 +slab-fixes d9e6a7623938968e3752b67e37eaff097e559a54 +kexec-fixes ada2e5a44e99113e08ad9b7b71396c6c572204da +liveupdate-fixes 0b27b476044118b39e9869a9c34f525320026b52 +drm-msm-fixes e2332abed2a4d3caa59052095dc16e4ce44791ea +uml-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +fwctl-fixes 4549871118cf616eecdd2d939f78e3b9e1dddc48 +devsec-tsm-fixes c3fd16c3b98ed726294feab2f94f876290bf7b61 +drm-rust-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +tenstorrent-dt-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +nfc-fixes e87faad807329d1348595dbcea3444acd7bb0ca6 +drm-misc-fixes faebb7ba1ac65fa5810b640df02ce04e509fdc11 +rust 7059bdf4f04a3e14f4fafb3ac35fdca913e3e21a +rust-interop 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b +rust-alloc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init 0c20f77a26b89bc911d31cd79f1abe1a7ae57f60 +rust-timekeeping ddb1444d3335129ae87d9796ab1debf41c0ee51b +rust-xarray c455f19bbe6104debd980bb15515faf716bd81b8 +rust-analyzer 5f45afb8ab04d934fc0601a202f95267ebc20059 +mm-stable 0e35b9b6ec0ffcc5e23cbdec09f5c622ad532b53 +mm-nonmm-stable 0e35b9b6ec0ffcc5e23cbdec09f5c622ad532b53 +mm-unstable e5492213654050379e78ec6f9acfd6c9fe00f334 +mm-nonmm-unstable 8ce79abc8a1252636f6f7ac0e89fa3bca309db34 +kbuild 4859c0d5918e28f6d4844e33022e791c55dbf373 +clang-format 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +perf 3f7909fa921e38b7aba8566b03ca5e0754a8fa8b +compiler-attributes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +dma-mapping 0188616c057d3eba8d8a4af62a59b5e7f2362571 +asm-generic adbbd9714f8058730f93c8df5c5bf1679456424b +alpha d58041d2c63e09a1c9083e0e9f4151e487c4e16a +arm 75ca78c7d982a0b7c658722fa9eb2ce70e180307 +arm64 a13c140cc289c0b7b3770bce5b3ad42ab35074aa +arm-perf 5936245125f78d896fdb1bbc2ae79213e28a6579 +arm-soc 900d72f1052c1028d6e8c1f182529a403ba50a72 +amlogic 4336e970ec6890fbd424128c352564a9c1dd514a +asahi-soc 297f9bd201933d2414976c069722b68b95476fcf +at91 6d892f8d5cd9f20cfef5e9d59b0cde53c30daec6 +bmc 40ae2e16214adcd59481a8d799af03be7b0f5e08 +broadcom f705b0c80bab155e9ffc6b796408ab16c9abf206 +cix a0cffbd8878c55b12dc4555f883adf3372cecd91 +davinci dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drivers-memory 8111c7f3723f414b7f655a3880775cbbd0e9de8e +fsl 3300a285c28529ca1a178f01b4cc046fd3547dbd +imx-mxs d089adef10f380cbdf65cbb87a59a9aab86cb0d2 +mediatek b1ccec7cca55821b3eed9b471bcea7da97247bad +mvebu 3ea0dabfa4500104c5c6eebecfa4d23aeb847611 +omap ba251bb5ce2db9228a4c1ca9aef787c368121af7 +qcom 64a28053710d050b72f8f8aaa9e75654fac0f2d5 +realtek 3c778f0c9fa36b6b9a26bd2146df24ed4e830ba4 +renesas f9592c355314cb76e76078dfc58ea747e382ea15 +reset d373605cd514837d8a6de3d00c786d4bae6dbaf8 +rockchip 70d6721bd79c8e38064967cab3dc744e77d3cd05 +samsung-krzk 4a7924bcff476f8eab2960432c6fd2b8597fb17c +scmi f6ce093c482b9cf18e3ff25f9e0268c6eda4a955 +sophgo f7337210bede62fc7c6230ef58013dddf7e0a921 +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit ab092591e4d9d6f51282d3815372350b861e5744 +stm32 fba4a31a7f3b6b29b01c83180f83e7ed4c398738 +sunxi 36078904c9908a8ad674ef5b3d31cf8d90828e6a +tee a3067938fd192b116b6dfb325b654300a6d1b461 +tegra f98a7877ab4a8b76a61b781d97966281c108571b +tenstorrent-dt 33583baeb1ba7d328e6a9775d889036900b74cdb +fustini-config fd52109054693750f38d6fae134cffd1ac8c9c74 +thead-dt 3a5791956edbfa84d7256224167941931cbc46e7 +ti 1b98f483adfd99bf7008dc334ae72fc608d47a77 +xilinx 50a8e96a1513760418e7f2e5bc51a7e48fc2b82e +socfpga 39ea7cb4019245ce488ea547b3ec68a3d7d57aef +clk 8cdeaa50eae8dad34885515f62559ee83e7e8dda +clk-imx b3dcc8c608fbb6352bd94932ba935f2078c9090d +clk-renesas 2df26b8663b6f315d0e9364927c8503280fe3dd3 +thead-clk b2ee00d0bf4cca5dd02702fc339d2b523191966f +tenstorrent-clk 23c8ebc952849b3ba47d04d0ec95daf5cc136061 +csky abb81e5ce7d995baa41556b8125fa59e28ba3be8 +loongarch 8227805754a68791baadc90280d1610353c4b698 +m68k dc5200f6b1ada318463dd141b041ec9f044b2bf5 +m68knommu d13e97dad566448c38b82ffd6807f61346b7536e +microblaze 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +mips 27c61f8565a438b2d1dea6f6a47af0e6dc12c112 +openrisc aca063c9024522e4e5b9a9d1927433f6a01785a3 +parisc-hd dc59e4fea9d83f03bad6bddf3fa2e52491777482 +powerpc 8cdeaa50eae8dad34885515f62559ee83e7e8dda +risc-v 1d8304bdd65f78a061e1f57be596c2776faf083a +riscv-dt 82ab962ef6c2a3571e3d590b30c023118c92b776 +riscv-soc 8cdeaa50eae8dad34885515f62559ee83e7e8dda +s390 8b313d717bcf4f944fb46fe4ed4d8680bdbc5648 +sh b0aa5e4b087b686575f1b31ce54048b4d059b7b8 +sparc 5b2a3b1a98fb47c593144c2770e012d463952b70 +uml 254f49634ee16a731174d2ae34bc50bd5f45e731 +xtensa a7c958e8721eb2724ee2e2ef13129bc67e1c8a75 +fs-next 070f41f072722437b7edda13037a400459630a5e +printk 703a9d76a45dd97b19b2432fc1ba4beb4d67a94f +pci 41d034327abe154679c927a9efd8744af6f290a1 +pstore 24b8f8dcb9a139a36cf48bfbe935e8dc1f33ed79 +hid 194a48576843858afcd9c00ed4f105ec2b398e6c +i2c 8cd9520d35a6c38db6567e97dd93b1f11f185dc6 +i2c-andi c844ed7266c9d9d2663f34cfa32d4f66ea3a9119 +i2c-rust c0260c740d20751c8498865a9c5dc18b69c3d267 +i3c eeedacd0866eec6e9dad2f082a5b828b895a5ed0 +dmi 1afafbaf749d8e8ec53f8e38efdc731131902b5b +hwmon-staging ca078d004cf58137bcf8cb24a8b271397431ba58 +jc_docs be828e6819ed139b699bf7feb00a546cb7806266 +v4l-dvb a52e6f7923c17a672135b485ffd96fbd72f46267 +v4l-dvb-next adc218676eef25575469234709c2d87185ca223a +pm ca2b8f92568b7c34b3a12371c32a2df3702cf55a +cpufreq-arm 6a9e0e0f7592313ace66303cf5eca68e04c10f30 +cpupower 5100bd356cd315112c4e27e66e4f0129800eabd2 +devfreq c096be11c2a9d4acca8e75f1f8edeb744aceb521 +pmdomain 8247e08d2196cf2c8ce1c87c0ada726bce831a14 +opp ce46fede7792cedd247e34b48bc8a02eb90c7848 +thermal 968098b4ca5219b0d2e0a981aed1dacfbd5adc69 +rdma e952e079d226209a132110acc1de96a099701292 +net-next ce6b4d3216b63f902bb8e9695ee6c10c83415f65 +bpf-next 9a3a07d06e7d74f4aecc51396c771149336ac55d +ipsec-next 355f808d8a11fa69b19dfd8811bc87d97830f5d6 +mlx5-next bee40a7d0bd1263934f99054db037cdd4a33fd86 +netfilter-next f6f3b36c15ed44de1fbb44e645e4fae8c4a4453e +ipvs-next f6f3b36c15ed44de1fbb44e645e4fae8c4a4453e +bluetooth bd8bee79e1fa8db2d587733f8b6fd9597b04d6e3 +wireless-next ac798f757d6475dc6fee2ec899980d6740714596 +ath-next f78703024c71ac60033139b42d040981efe083bb +iwlwifi-next 905f57aefde4f4092a411c8a55856182fb1c7598 +wpan-next a6bfdfcc6711d1d5a92e98644359dedc67c0c858 +wpan-staging a6bfdfcc6711d1d5a92e98644359dedc67c0c858 +mtd d276783e490d73536135f90f96c5875f263481ab +nand adfc275b317c02cd043b0cf28b8cfb7459b041f0 +spi-nor df415c5e1de0f1aeefacb4e6252ff98d38c04437 +crypto df373d39c6f038d176af303ae72f02c7c70b953d +libcrypto dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drm a1c81cb05273077219fa809424330fdaa4346d5b +drm-exynos 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc 6143359440d41d4c571435c9cd2fbaf9f8dc2788 +amdgpu 8e1f8214cbba2ccda3f3c625df0a67dcfd9b1356 +drm-intel 67e955e073c6ff9167828444913a864a14275463 +drm-msm e2332abed2a4d3caa59052095dc16e4ce44791ea +drm-msm-lumag 8de061ca149c94871e41d91a5b2e442ecc26a572 +drm-xe 53a7115f9862f30ee748c1e1c5e6398ffa092672 +drm-rust ce2d97f714c8a37cac506a41e52da45b09555b81 +drm-nova 93296e9d9528f0d87f2cf3fee494599060a0f14a +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev dc59e4fea9d83f03bad6bddf3fa2e52491777482 +regmap 8979c222ebebb34066a2cf390c7746f69d4ebea7 +sound 4392569d95e6a794780fc33ce168744c67cb162e +ieee1394 dc59e4fea9d83f03bad6bddf3fa2e52491777482 +sound-asoc d721340cd338e2f6307c26fe664cfe9e967f78d5 +modules 2600d43b235b029d0ba4f2d3cc71e2137114fde3 +input 3ed4ba919eb35860ee1867e2851ee3e6f9fe37f5 +block 1a5c200b36e4fb7275fd5f51dc52c0502c235e36 +device-mapper 22eb919f1b7900e2af0e952b1f1bee522f612b4a +libata 1393f2c98fb42495269d14b65b1f68b047d65fb7 +pcmcia b3c26ea81ccc522e77ed0b1707add61fc9206216 +mmc 5608386899d9de8030980bce3d05bded28f9bfb8 +mfd 6384e5c5e0bcfbc9a915d70cb3925e0022d7b337 +backlight 4b3f5baf67dea91452b5b114dcb19139feba71dd +battery a888754e51e915731c8974c4d6d62709facb35d3 +regulator e370243ea76704d90e3f79ecef9041425f3edac1 +security 0cee720cfd51402cfcb14d96cb326a36c13b823a +apparmor c431011ab65fd4ef205e3ce8cfc4b031c67768d9 +integrity 1da739feb31b4fecae465ebf87ba44a97e44101b +selinux f47f45c7f1ca2fe66a3f7277acf0738ad715aec3 +smack a7c44fd9f80e37763acf9cd3c87a58058d206427 +tomoyo 58717b2a1365d06c8c64b72aa948541b53fe31eb +tpmdd-tpm 4ece5759c1a29fd711b7b1d1a3b81078547697fd +tpmdd-keys 51cb1aa1250c36269474b8b6ca6b6319e170f5a5 +watchdog 94794a448352339042085d98f82f33941c63d0d8 +iommu 750356af88d6178156ce776df17c10a9035fcc9c +audit 1715cd1303c703e73115e2f7bac7e01b9ca84049 +devicetree bcef80df6d6f4d616ee0bfbfe8e9acd44517a15e +dt-krzk dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mailbox 36cac4b5101f8ecbc851356df175b99543c84ec6 +spi 97a74f7b0a6a08e3279b9868280cb0b7d2c82e1e +tip b94f4faa5968ae9eff8bec1af0d53c4ea2a058ba +kexec af78cec42d1b0113993e427139f0ab2f34b047ee +liveupdate fc1b1fca6c3097b94d15e7dbe786f9095e0487fb +clockevents a9ac745bc320cbdc2ed3c851eb78f91f22ff975b +edac 5adf9141e58007e7939349c215f92717ad39f01d +ftrace 030bb1d8bb0773053df6518ed635f27005fd5e43 +rcu e853c1b28580ea93fda3cd729e440a3fc16fa647 +paulmck c2d939be90724b234a55e633ba0aff60f78f352f +kvm a204badd8432f93b7e862e7dac6db0fe3d65f370 +kvm-arm cb9360ae6549120975f20887840fb33d47c13898 +kvms390 babe08404e1993697a523e60bc0f9d096ffe1ef8 +kvm-ppc 8cdeaa50eae8dad34885515f62559ee83e7e8dda +kvm-riscv 8d9c9b135b5c23de9811a8426257cbd2fa024a99 +kvm-x86 6bc96b971766fbbbbdd9fb2642cedacaf02da957 +xen-tip fcd245ea7528d50fddffc0fd1308941a9180f5b3 +percpu 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +workqueues c5a3a03816ddba2ebf73fd7cbec3c5169424ea04 +sched-ext 1ed374f61d7ce64a8e35def02e223304cd4a52cb +drivers-x86 2b3a5dabe89e330413af403246b648c1890f368f +chrome-platform 9a3f43b30373c61477d0d3ab52946c05f9492bf9 +chrome-platform-firmware dd06eb60e86a1ab6d3bd4f641100f47b6f7342b6 +hsi 254f49634ee16a731174d2ae34bc50bd5f45e731 +leds-lj 96fa4d69958cf90740d756d1e45cdb02cface41b +ipmi 6d920a75df9a83ab096b3cde7a643b656e4fdfeb +driver-core 2b74f1f2024486c7a81915528b6aa7f8f5daa021 +usb b60af0b9e752aa77f29daac026dd2314cc2a0bb0 +thunderbolt d49d71ebec8f03eee2514304279a05a4952fadf7 +usb-serial 091738d09786ae4da789b5297cb4dae3024d1c13 +tty facd005eee65df088cd73733741fbcf8d989fc5e +char-misc 775553d19b163446c38c5ff24dd0a01065376932 +coresight 98495b5a4d77dd22e106f462b76e1093a55b29a7 +fastrpc 17ec912dc87bf6b9aba3a85f6a94e99f999d6511 +fpga b5ba63e247075087ab8a6a087622c762dc4172e9 +icc e11872288b4b33c0e90da6987d6006bb49fecbc9 +iio 2e2f2de7532cbbc2269de8be20ec709606c6e79b +nfc ed85d4cbbfaa4e630c5aa0d607348b42620d976b +phy-next dc59e4fea9d83f03bad6bddf3fa2e52491777482 +soundwire 6409292ab5f7d1a60a6f8948bd6dcd8633c36dfe +extcon 254f49634ee16a731174d2ae34bc50bd5f45e731 +gnss a13c140cc289c0b7b3770bce5b3ad42ab35074aa +vfio 785562e31dbcd85ca583cf58c446e63aa8a5af08 +w1 169ae5e65e5aaf213b6a578f6478a9fd2e523606 +spmi 8cdeaa50eae8dad34885515f62559ee83e7e8dda +staging 64276d9bfe4d1fdd5cf2636f1065f7ea55c2defb +counter-next dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mux 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +dmaengine 338c853b7c3b422fefda195b9b8010e40611c96f +cgroup 6486f6d8f5455bc7fa898d5ee432f8c0f7f9ec20 +scsi cf1af0ccca54d5547cc31bf476c6a07cf658ad29 +scsi-mkp aec9f1f18ffdda04b4d68ddadbc3d893eb3a9cbb +vhost 1f673033c02735bb38ee2f16f1c86f042f4de9d4 +rpmsg f041a428881dc576d8f2cd5f1ae4dc671624369f +gpio-brgl fbd35c8cc6c6e817385f2bfa07fa4227370a3010 +gpio-intel dc59e4fea9d83f03bad6bddf3fa2e52491777482 +pinctrl a7c4e636e400e3d919b078ece1a6101dd9ebfe8c +pinctrl-intel ed1608d5e3c4432c1dcba709668b90f44228c10c +pinctrl-renesas 5a653cedec948423fc8a0180c90b8d05c2239d9d +pinctrl-samsung d441836c9d704d0f3db5dbf44df87af2ba7a9d26 +pinctrl-qcom 82c3edf8701154e2768973ebd4c0d2f3bd29621e +pwm 7f1565db53367d302aa06b802a96205b9a0ce923 +ktest 932cdaf3e273a2727e77af97f79f12577174c5a0 +kselftest 20f01a5565ce79923b75a2ac8e8ef2a1d7adf517 +kunit dc59e4fea9d83f03bad6bddf3fa2e52491777482 +kunit-next 34b5c0132952c3d176bf5a169c8f7093ecb8c4e8 +livepatching 0839c8963b7b28d25350bd5ea69bacde794124ab +rtc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +nvdimm 6191eeb6c70b41f7bc71967055adab5ef93274dc +at24 dc59e4fea9d83f03bad6bddf3fa2e52491777482 +ntb dc59e4fea9d83f03bad6bddf3fa2e52491777482 +seccomp 41fa04327384148b0e2e828c9be9862c5240e9fa +slimbus c922423ce66bcee6c61d1b5aadea09b29ca81400 +nvmem 2a3ed29b053137a91af7963038d437657065e57e +hyperv a4ffc59238be84dd1c26bf1c001543e832674fc6 +auxdisplay 95545ddcb3cfb390c59429b1c18aaf187d6768ba +kgdb fdbdd0ccb30af18d3b29e714ac8d5ab6163279e0 +hmm 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +cfi dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mhi 34c66fc4c223ae693ce550068ab5f48f3e3fe604 +memblock 1a6e6a79b8df153f9ec702aa4d5407333eeff917 +cxl 5ca04f3ba91f1773bbd5da6d9c654ccc1ba7831d +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi 4953e0a8a149d68e3e02b2e7713513bffdb7a746 +unicode bcfee135d584714c2130031c7e28aafa91057b9a +slab 56aa9b819edce4acfa879728af56534c951d1818 +random bb9ff576fdff48c242876f55098a3ee20a29df5d +landlock 55f82176ef8dde632ea3eb94a6224950ed809d7c +sysctl dccde188b7fc11155f3a8d5c3aa19abc4954a0aa +execve 9bf092c97b86af63694d9902b9e14047214ba76d +bitmap fc6926b0ead4b46fee932c7839f616ef8d2d5565 +hte 005b25ad11717139ca5c14c9f06c2a60855c2afd +kspp 3421b9b056a6576d0ebac1030eafb48ad0544092 +nolibc 070cf03f5ec454eec9c42827ee9f3c0b3fad09f1 +iommufd b737ad0b96a6ef19e1bdb680973f479386c11f7c +turbostat 1c996a37fd244d19e5dbb715328c1676e28ef607 +pwrseq 162ea02941a936f8899f3dbe10607b1d5af1b07b +capabilities-next 071588136007482d70fd2667b827036bc60b1f8f +ipe 028ef9c96e96197026887c0f092424679298aae8 +kcsan 07a1a6562ce29e2e0c134a57882d6e52e8758492 +crc dc59e4fea9d83f03bad6bddf3fa2e52491777482 +keys-next 965e9a2cf23b066d8bdeb690dff9cd7089c5f667 +fwctl dc59e4fea9d83f03bad6bddf3fa2e52491777482 +devsec-tsm 3177779ae17db4c66c851f799505fb95c7530c03 +hisilicon a5db65458a911daa6f8927264366dab501715dc0 +device-id 995832b2cebe6969d1b42635db698803ee31294d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..5cfae71682b5 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,431 @@ +Trees included into this release: + +Name Url +---- --- +origin https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +ext4-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#fixes +vfs-brauner-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.fixes +fscrypt-current https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +btrfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +erofs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +nfsd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +v9fs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +overlayfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes +fscrypt https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +btrfs https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph https://github.com/ceph/ceph-client.git#master +cifs git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git#configfs-next +ecryptfs https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +dlm https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +erofs https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs https://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd https://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 +realtek-fixes https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git#fixes +drivers-memory-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +sophgo-fixes https://github.com/sophgo/linux.git#fixes +sophgo-soc-fixes https://github.com/sophgo/linux.git#soc-fixes +m68k-current https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +net https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/#master +ipsec https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +ath https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-current +iwlwifi https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#fixes +wpan https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-linus +tty.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +watchdog-fixes https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#watchdog +counter-current https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +libcrypto-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-fixes +vfio-fixes https://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +dmaengine-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git://linuxtv.org/media-ci/media-pending.git#fixes +reset-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux#reset/fixes +mips-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#fixes +kvm-fixes git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +kvm-arm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#fixes +hwmon-fixes https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +dma-mapping-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-fixes +drivers-x86-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +pinctrl-qcom-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pinctrl-qcom/for-current +devicetree-fixes https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes +drm-intel-fixes https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next-fixes +mmc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +risc-v-fixes https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +auxdisplay-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +kunit-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +memblock-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +renesas-fixes https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git#perf-tools +efi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +battery-fixes https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +iommufd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes https://github.com/Rust-for-Linux/linux.git#rust-fixes +w1-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +i2c-andi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-fixes +i2c-rust-fixes https://github.com/ikrtn/rust-for-linux#rust-i2c-fixes +sparc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus +clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-fixes +thead-clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-fixes +tenstorrent-clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-clk-fixes +fustini-config-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#riscv-config-fixes +pwrseq-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current +thead-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-fixes +ftrace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ftrace/fixes +ring-buffer-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ring-buffer/fixes +trace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#trace/fixes +tracefs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#tracefs/fixes +spacemit-fixes https://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux#fixes +tip-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#tip/urgent +slab-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next-fixes +kexec-fixes https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#kexec-fixes +liveupdate-fixes https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#fixes +drm-msm-fixes https://gitlab.freedesktop.org/drm/msm.git#msm-fixes +uml-fixes https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +fwctl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-rc +devsec-tsm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#fixes +drm-rust-fixes https://gitlab.freedesktop.org/drm/rust/kernel.git#for-linux-next-fixes +tenstorrent-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-dt-fixes +nfc-fixes https://codeberg.org/linux-nfc/linux.git#for-linus +drm-misc-fixes https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes +rust https://github.com/Rust-for-Linux/linux.git#rust-next +rust-interop https://github.com/Rust-for-Linux/linux.git#interop-next +rust-alloc https://github.com/Rust-for-Linux/linux.git#alloc-next +rust-io https://github.com/Rust-for-Linux/linux.git#io-next +rust-pin-init https://github.com/Rust-for-Linux/linux.git#pin-init-next +rust-timekeeping https://github.com/Rust-for-Linux/linux.git#timekeeping-next +rust-xarray https://github.com/Rust-for-Linux/linux.git#xarray-next +rust-analyzer https://github.com/Rust-for-Linux/linux.git#rust-analyzer-next +mm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-unstable +mm-nonmm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-unstable +kbuild https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-for-next +clang-format https://github.com/ojeda/linux.git#clang-format +perf https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-for-next +asm-generic https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#master +alpha https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git#alpha-next +arm https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#for-next +arm64 https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +at91 https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +bmc https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git#for-next +broadcom https://github.com/Broadcom/stblinux.git#next +cix https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git#for-next +davinci https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +fsl https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git#soc_fsl +imx-mxs https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git#for-next +mediatek https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next +mvebu https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#for-next +qcom https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +realtek https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git#for-next +renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux#reset/next +rockchip https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sophgo https://github.com/sophgo/linux.git#for-next +sophgo-soc https://github.com/sophgo/linux.git#soc-for-next +spacemit https://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux#for-next +stm32 https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git#next +tegra https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +tenstorrent-dt https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-dt-for-next +fustini-config https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#riscv-config-for-next +thead-dt https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-for-next +ti https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx https://github.com/Xilinx/linux-xlnx.git#for-next +socfpga https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git#for-next +clk https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +thead-clk https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-for-next +tenstorrent-clk https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-clk-for-next +csky https://github.com/c-sky/csky-linux.git#linux-next +loongarch https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git://git.monstr.eu/linux-2.6-microblaze.git#next +mips https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc https://github.com/openrisc/linux.git#for-next +parisc-hd https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +risc-v https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +sparc https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-next +uml https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa https://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +printk https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i2c-andi https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-next +i2c-rust https://github.com/ikrtn/rust-for-linux#rust-i2c-next +i3c https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git://git.lwn.net/linux.git#docs-next +v4l-dvb git://linuxtv.org/media-ci/media-pending.git#next +v4l-dvb-next git://linuxtv.org/mchehab/media-next.git#master +pm https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +pmdomain https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +opp https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +rdma https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +ath-next https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-next +iwlwifi-next https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#next +wpan-next https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +libcrypto https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-next +drm https://gitlab.freedesktop.org/drm/kernel.git#drm-next +drm-exynos https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next +amdgpu https://gitlab.freedesktop.org/agd5f/linux.git#drm-next +drm-intel https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next +drm-msm https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +drm-xe https://gitlab.freedesktop.org/drm/xe/kernel.git#drm-xe-next +drm-rust https://gitlab.freedesktop.org/drm/rust/kernel.git#for-linux-next +drm-nova https://gitlab.freedesktop.org/drm/nova.git#nova-next +etnaviv https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git#modules-next +input https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git#for-next +device-mapper https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#for-next +pcmcia https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +selinux https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack https://github.com/cschaufler/smack-next#next +tomoyo git://git.code.sf.net/p/tomoyo/tomoyo.git#master +tpmdd-tpm https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#for-next-tpm +tpmdd-keys https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#for-next-keys +watchdog https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#watchdog-next +iommu https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git#next +audit https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#for-next +spi https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +kexec https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#kexec-next +liveupdate https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#next +clockevents https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git#timers/drivers/next +edac https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +ftrace https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux#next +paulmck https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#non-rcu/next +kvm git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-ppc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +kvm-riscv https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 https://github.com/kvm-x86/linux.git#next +xen-tip https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sched-ext https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git#for-next +drivers-x86 https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +chrome-platform-firmware https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next +hsi https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds-lj https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi https://github.com/cminyard/linux-ipmi.git#for-next +driver-core https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-next +usb https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +coresight https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +nfc https://codeberg.org/linux-nfc/linux.git#for-next +phy-next https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio https://github.com/awilliam/linux-vfio.git#next +w1 https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +spmi https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-next +staging https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux https://gitlab.com/peda-linux/mux.git#for-next +dmaengine https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio-brgl https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pinctrl-qcom https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pinctrl-qcom/for-next +pwm https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#pwm/for-next +ktest https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git#for-next +rtc https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb https://github.com/jonmason/ntb.git#ntb-next +seccomp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +slimbus https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +hyperv https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#for-next +kgdb https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd https://github.com/terrelln/linux.git#zstd-next +efi https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next +random https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +sysctl https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git#sysctl-next +execve https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap https://github.com/norov/linux.git#bitmap-for-next +hte https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +nolibc https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git#for-next +iommufd https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +turbostat https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +pwrseq https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next +capabilities-next https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git#caps-next +ipe https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git#next +kcsan https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git#next +crc https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#crc-next +keys-next https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +fwctl https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-next +devsec-tsm https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#next +hisilicon https://github.com/hisilicon/linux-hisi.git#for-next +device-id https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#device-id-rework +kthread https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#for-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..893463f08104 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,10167 @@ +$ date -R +Fri, 17 Jul 2026 13:00:40 +0100 +$ git checkout master +Switched to branch 'master' +$ git reset --hard stable +HEAD is now at 37e2f878a7a66 Merge tag 'linux_kselftest-kunit-fixes-7.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest +Merging origin/master (fce2dfa773ced Merge tag 'v7.2-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 37e2f878a7a66..fce2dfa773ced +Fast-forward (no commit created; -m option ignored) + 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/ffa.c | 44 ++-- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 3 +- + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 3 +- + arch/arm64/kvm/hyp/pgtable.c | 15 +- + arch/arm64/kvm/inject_fault.c | 18 +- + arch/arm64/kvm/mmio.c | 7 +- + arch/arm64/kvm/nested.c | 164 ++++++------- + arch/arm64/kvm/pkvm.c | 2 +- + arch/arm64/kvm/vgic/vgic-its.c | 2 + + arch/arm64/kvm/vgic/vgic.c | 20 +- + arch/s390/kvm/dat.c | 2 + + arch/s390/kvm/gmap.c | 7 +- + arch/s390/kvm/kvm-s390.c | 6 +- + arch/s390/kvm/pci.c | 12 +- + arch/x86/kvm/irq.c | 4 +- + arch/x86/kvm/lapic.c | 8 +- + arch/x86/kvm/svm/sev.c | 6 +- + arch/x86/kvm/svm/svm.c | 7 +- + arch/x86/kvm/trace.h | 2 +- + arch/x86/kvm/vmx/nested.c | 89 ++++--- + arch/x86/kvm/vmx/tdx.c | 6 +- + arch/x86/kvm/vmx/vmx.h | 7 + + drivers/cpufreq/cpufreq.c | 3 + + drivers/cpufreq/intel_pstate.c | 6 +- + drivers/firmware/arm_ffa/driver.c | 25 +- + drivers/pmdomain/imx/imx8m-blk-ctrl.c | 46 +++- + drivers/pmdomain/imx/imx93-blk-ctrl.c | 60 ++++- + drivers/pmdomain/mediatek/mtk-pm-domains.c | 40 +++- + fs/erofs/ishare.c | 8 +- + fs/erofs/super.c | 19 +- + fs/erofs/zmap.c | 3 +- + fs/smb/client/cifsfs.c | 10 +- + fs/smb/client/smb1maperror.c | 24 +- + fs/smb/client/smb1maperror_test.c | 1 + + fs/smb/client/smb2maperror.c | 12 +- + fs/smb/client/smb2maperror_test.c | 1 + + fs/smb/client/smb2misc.c | 34 ++- + fs/smb/client/smb2ops.c | 183 +++++++++++++-- + fs/smb/client/smb2pdu.c | 19 ++ + fs/smb/client/smb2proto.h | 3 + + fs/smb/common/fscc.h | 5 + + fs/smb/server/smb2pdu.h | 4 - + fs/xfs/libxfs/xfs_defer.c | 2 +- + fs/xfs/scrub/cow_repair.c | 179 +++++++-------- + fs/xfs/scrub/dirtree.c | 16 +- + fs/xfs/scrub/dqiterate.c | 2 +- + fs/xfs/scrub/inode_repair.c | 4 +- + fs/xfs/scrub/rgsuper.c | 14 +- + fs/xfs/scrub/rtbitmap.c | 2 +- + fs/xfs/scrub/rtrefcount.c | 2 +- + fs/xfs/scrub/rtrmap.c | 8 +- + fs/xfs/scrub/scrub.h | 6 +- + fs/xfs/scrub/trace.h | 35 --- + fs/xfs/scrub/xfarray.c | 3 +- + fs/xfs/xfs_bmap_util.c | 89 +++++++ + fs/xfs/xfs_bmap_util.h | 4 + + fs/xfs/xfs_log_cil.c | 2 +- + fs/xfs/xfs_log_recover.c | 26 ++- + fs/xfs/xfs_reflink.c | 36 +++ + fs/xfs/xfs_sysfs.c | 28 ++- + fs/xfs/xfs_sysfs.h | 2 + + fs/xfs/xfs_trace.h | 41 ++++ + fs/xfs/xfs_zone_alloc.c | 8 + + include/dt-bindings/power/fsl,imx93-power.h | 1 + + include/linux/arm_ffa.h | 9 +- + security/landlock/net.c | 8 + + security/landlock/ruleset.h | 4 +- + security/landlock/task.c | 9 +- + tools/testing/selftests/kvm/Makefile.kvm | 1 + + tools/testing/selftests/kvm/arm64/mmio_sign_ext.c | 255 +++++++++++++++++++++ + .../testing/selftests/kvm/x86/sev_migrate_tests.c | 47 ++++ + tools/testing/selftests/landlock/net_test.c | 97 ++++++++ + .../selftests/landlock/scoped_signal_test.c | 67 ++++-- + virt/kvm/kvm_main.c | 16 +- + 79 files changed, 1506 insertions(+), 526 deletions(-) + create mode 100644 tools/testing/selftests/kvm/arm64/mmio_sign_ext.c +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 +Already up to date. +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. +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 (1572282de6d33 erofs: hide "cache_strategy=" for plain filesystems) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (92ea163c773cb NFSD: Prevent post-shutdown use-after-free in NFSD_CMD_UNLOCK_FILESYSTEM) +$ 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 (2e35e224edd82 Merge branch 'for-next-current-v7.1-20260714' into for-next-20260714) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. + fs/btrfs/backref.c | 5 ++++- + fs/btrfs/btrfs_inode.h | 2 ++ + fs/btrfs/extent_io.c | 4 ++-- + fs/btrfs/extent_map.c | 4 ++-- + fs/btrfs/inode.c | 3 ++- + fs/btrfs/ioctl.c | 1 + + fs/btrfs/relocation.c | 55 ++++++++++++++++++++++++++++++++++++---------- + fs/btrfs/subpage.c | 26 +++++++++++++++++++--- + include/uapi/linux/btrfs.h | 2 +- + 9 files changed, 80 insertions(+), 22 deletions(-) +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 (fce2dfa773ced Merge tag 'v7.2-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Already up to date. +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 (13a315afaeb67 MAINTAINERS: update mailing list address for exfat) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Auto-merging MAINTAINERS +Auto-merging fs/exfat/iomap.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + fs/exfat/exfat_fs.h | 2 +- + fs/exfat/file.c | 222 +++++++++++++++++++++++++++++++++++++++++++--------- + fs/exfat/iomap.c | 22 +++++- + 4 files changed, 209 insertions(+), 39 deletions(-) +Merging ext3/for_next (04267552014fe Pull isofs compressed block offset fix.) +$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. + fs/isofs/compress.c | 6 ++++-- + fs/notify/fanotify/fanotify.c | 1 + + fs/udf/balloc.c | 12 ++++++++++-- + fs/udf/inode.c | 26 +++++++++++++++++++++++--- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 23 ++++++++++++++--------- + fs/udf/truncate.c | 2 +- + fs/udf/udfdecl.h | 3 ++- + 8 files changed, 56 insertions(+), 19 deletions(-) +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 (6429f3bf6dc33 f2fs: fix folio_nr_pages() race after put in large folio invalidate) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + fs/f2fs/data.c | 5 +++-- + fs/f2fs/debug.c | 4 ---- + fs/f2fs/f2fs.h | 29 ++++++++++++++++++++++++++++- + fs/f2fs/file.c | 28 +++++++++++++++++----------- + fs/f2fs/gc.c | 36 +++++++++++++++--------------------- + fs/f2fs/gc.h | 27 +-------------------------- + fs/f2fs/segment.c | 9 ++++----- + fs/f2fs/super.c | 6 +++--- + fs/f2fs/sysfs.c | 22 +++++++++++----------- + 9 files changed, 82 insertions(+), 84 deletions(-) +Merging fsverity/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (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 (39ccf3cdc6790 ksmbd: Do not skip lock checks for single-byte ranges) +$ 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. + fs/smb/server/compress.c | 3 +- + fs/smb/server/connection.c | 16 ++- + fs/smb/server/ksmbd_netlink.h | 1 + + fs/smb/server/mgmt/user_session.c | 25 ++--- + fs/smb/server/mgmt/user_session.h | 2 +- + fs/smb/server/oplock.c | 6 +- + fs/smb/server/smb2misc.c | 5 + + fs/smb/server/smb2pdu.c | 224 ++++++++++++++++++++++++++++++++------ + fs/smb/server/smbacl.c | 147 +++++++++++++++++-------- + fs/smb/server/smbacl.h | 3 +- + fs/smb/server/vfs.c | 8 +- + 11 files changed, 334 insertions(+), 106 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 (a13c140cc289c Linux 7.2-rc3) +$ 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 (27934d02cbeb8 NFS: Charge unstable writes by request size, not folio size) +$ 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 (c83cc1e5e8d2b nfsd: add support to CB_NOTIFY for dir attribute changes) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/nfsd/nfsctl.c +Merge made by the 'ort' strategy. + Documentation/sunrpc/xdr/nfs4_1.x | 258 ++++++++- + fs/lockd/lockd.h | 2 +- + fs/lockd/svc.c | 4 +- + fs/lockd/svc4proc.c | 4 +- + fs/lockd/svclock.c | 42 +- + fs/lockd/svcproc.c | 4 +- + fs/lockd/svcsubs.c | 107 +++- + fs/nfs/callback.c | 4 +- + fs/nfs_common/nfslocalio.c | 16 +- + fs/nfsd/filecache.c | 265 ++++++--- + fs/nfsd/filecache.h | 3 + + fs/nfsd/flexfilelayoutxdr.c | 20 +- + fs/nfsd/localio.c | 8 +- + fs/nfsd/lockd.c | 6 +- + fs/nfsd/netns.h | 29 +- + fs/nfsd/nfs2acl.c | 21 +- + fs/nfsd/nfs3acl.c | 17 +- + fs/nfsd/nfs3proc.c | 40 ++ + fs/nfsd/nfs4callback.c | 207 ++++++- + fs/nfsd/nfs4layouts.c | 45 +- + fs/nfsd/nfs4proc.c | 114 +++- + fs/nfsd/nfs4recover.c | 48 +- + fs/nfsd/nfs4state.c | 944 ++++++++++++++++++++++++++----- + fs/nfsd/nfs4xdr.c | 392 +++++++++++-- + fs/nfsd/nfs4xdr_gen.c | 600 +++++++++++++++++++- + fs/nfsd/nfs4xdr_gen.h | 17 +- + fs/nfsd/nfscache.c | 4 +- + fs/nfsd/nfsctl.c | 156 +++-- + fs/nfsd/nfsd.h | 9 +- + fs/nfsd/nfsfh.c | 42 +- + fs/nfsd/nfsfh.h | 3 + + fs/nfsd/nfsproc.c | 7 + + fs/nfsd/nfssvc.c | 61 +- + fs/nfsd/nfsxdr.c | 32 +- + fs/nfsd/state.h | 88 ++- + fs/nfsd/trace.h | 42 +- + fs/nfsd/vfs.c | 48 +- + fs/nfsd/xdr4.h | 5 + + fs/nfsd/xdr4cb.h | 12 + + include/linux/lockd/bind.h | 12 +- + include/linux/nfs4.h | 127 ----- + include/linux/sunrpc/bc_xprt.h | 5 + + include/linux/sunrpc/svc.h | 1 + + include/linux/sunrpc/svc_rdma_pcl.h | 4 +- + include/linux/sunrpc/xdrgen/nfs4_1.h | 290 +++++++++- + include/uapi/linux/nfs4.h | 2 - + 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 | 81 ++- + 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 ++- + 64 files changed, 3787 insertions(+), 815 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 (9e3ca21f5d941 ntfs: use pagecache_isize_extended() on size extension) +$ git merge -m Merge branch 'ntfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git ntfs/ntfs-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + fs/ntfs/attrib.c | 15 ++++++++ + fs/ntfs/compress.c | 102 ++++++++++++++++++++--------------------------------- + fs/ntfs/dir.c | 5 +-- + fs/ntfs/ea.c | 85 ++++++++++++++++++++++++++++++++++---------- + fs/ntfs/file.c | 71 ++++++++++++++++++++++++++----------- + fs/ntfs/inode.c | 6 +--- + fs/ntfs/inode.h | 2 +- + fs/ntfs/iomap.c | 34 +----------------- + fs/ntfs/mft.c | 3 +- + fs/ntfs/namei.c | 3 +- + fs/ntfs/reparse.c | 6 ++-- + fs/ntfs/runlist.c | 50 ++++++++++++++------------ + 13 files changed, 210 insertions(+), 174 deletions(-) +Merging ntfs3/master (349a7959ffd7a fs/ntfs3: load ATTR_BITMAP run extents from $MFT extension records) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/inode.c +Merge made by the 'ort' strategy. + fs/ntfs3/dir.c | 36 +++++++++++++++++++++++++++--------- + fs/ntfs3/file.c | 2 +- + fs/ntfs3/frecord.c | 31 +++++++++++++++++++++---------- + fs/ntfs3/fslog.c | 21 ++++++++------------- + fs/ntfs3/fsntfs.c | 8 ++++---- + fs/ntfs3/index.c | 7 +++---- + fs/ntfs3/inode.c | 18 +++++++++++++----- + fs/ntfs3/lznt.c | 4 +++- + fs/ntfs3/namei.c | 9 +++++++-- + fs/ntfs3/ntfs_fs.h | 6 +++--- + fs/ntfs3/run.c | 9 +++++---- + fs/ntfs3/super.c | 9 +++++---- + fs/ntfs3/xattr.c | 1 - + 13 files changed, 100 insertions(+), 61 deletions(-) +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 (59c462b0f5cfa xfs: don't zap bmbt forks if they are MAXLEVELS tall) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (3a8389d42bdf4 zonefs: handle integer overflow in zonefs_fname_to_fno) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging vfs-brauner/vfs.all (b148f6ef8f3b0 Merge branch 'vfs-7.3.kthread' 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/afs/dir.c +Auto-merging fs/bpf_fs_kfuncs.c +CONFLICT (content): Merge conflict in fs/bpf_fs_kfuncs.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/erofs/super.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/iomap/direct-io.c +Auto-merging fs/iomap/ioend.c +Auto-merging fs/namei.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/ntfs/namei.c +Auto-merging fs/ntfs3/namei.c +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/smb/client/cifsfs.h +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 fs/xfs/xfs_super.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/netfs.h +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Auto-merging tools/testing/selftests/filesystems/.gitignore +CONFLICT (content): Merge conflict in tools/testing/selftests/filesystems/.gitignore +Auto-merging tools/testing/selftests/filesystems/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/filesystems/Makefile +Resolved 'fs/bpf_fs_kfuncs.c' using previous resolution. +Resolved 'tools/testing/selftests/filesystems/.gitignore' using previous resolution. +Resolved 'tools/testing/selftests/filesystems/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 6aad3f0fd71d1] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/locking.rst | 2 +- + Documentation/filesystems/overlayfs.rst | 16 + + Documentation/filesystems/porting.rst | 10 +- + Documentation/filesystems/vfs.rst | 2 +- + MAINTAINERS | 5 - + block/bdev.c | 125 +++- + 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 | 10 +- + 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 +- + .../filesystems/statmount/statmount_test.c | 5 +- + tools/testing/selftests/filesystems/ustat_test.c | 135 +++++ + tools/testing/selftests/proc/proc-pidns.c | 1 + + 148 files changed, 2536 insertions(+), 1982 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 (3566356c5b2ea mm: memcg: initialize *locked in memcg1_oom_prepare() stub) +$ 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 MAINTAINERS +Auto-merging arch/arm64/mm/mmu.c +Merge made by the 'ort' strategy. + .mailmap | 1 + + Documentation/ABI/testing/sysfs-kernel-mm-damon | 174 ++++++++++++------------ + MAINTAINERS | 3 +- + arch/arm64/include/asm/ptdump.h | 2 - + arch/arm64/mm/mmu.c | 43 +----- + arch/arm64/mm/ptdump.c | 11 +- + arch/m68k/include/asm/page_mm.h | 2 + + arch/x86/mm/pat/set_memory.c | 15 +- + drivers/virtio/virtio_balloon.c | 5 +- + fs/fat/fat.h | 4 +- + fs/fat/fat_test.c | 4 +- + fs/ocfs2/dir.c | 5 +- + fs/proc/task_mmu.c | 34 ++++- + include/linux/damon.h | 2 - + include/linux/memcontrol.h | 25 ++++ + include/linux/mmap_lock.h | 3 + + include/linux/page_reporting.h | 4 +- + include/trace/events/memory-failure.h | 6 +- + lib/test_hmm.c | 2 +- + mm/damon/core.c | 15 +- + 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 | 14 +- + mm/hugetlb.c | 24 +++- + mm/hugetlb_cma.c | 2 +- + mm/kmemleak.c | 7 +- + mm/memcontrol-v1.h | 6 +- + mm/memremap.c | 1 + + mm/migrate.c | 6 +- + mm/migrate_device.c | 5 +- + mm/mm_init.c | 15 +- + mm/page_reporting.c | 24 ++-- + mm/page_vma_mapped.c | 33 +++-- + mm/pagewalk.c | 36 +++-- + mm/percpu-km.c | 2 +- + mm/ptdump.c | 7 + + mm/userfaultfd.c | 5 +- + mm/util.c | 2 +- + mm/vmalloc.c | 40 ++++-- + mm/vmscan.c | 11 +- + tools/testing/selftests/filesystems/fclog.c | 4 +- + tools/testing/selftests/mm/pagemap_ioctl.c | 56 +++++++- + 55 files changed, 413 insertions(+), 281 deletions(-) +Merging fs-current (7f6f78211933e Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. +Merging kbuild-current/kbuild-fixes-for-next (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 (76f38ad1b39cf ARC: configs: Drop redundant I2C_DESIGNWARE_PLATFORM) +$ git merge -m Merge branch 'for-curr' of https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Merge made by the 'ort' strategy. + arch/arc/configs/axs101_defconfig | 1 - + arch/arc/configs/axs103_defconfig | 1 - + arch/arc/configs/axs103_smp_defconfig | 1 - + arch/arc/configs/tb10x_defconfig | 1 - + arch/arc/kernel/smp.c | 6 ++++-- + 5 files changed, 4 insertions(+), 6 deletions(-) +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 (f797f51a185ff arm64: mm: When logging data aborts only decode Xs when ISV=1) +$ 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. + arch/arm64/include/asm/fixmap.h | 6 +++++- + arch/arm64/kernel/ptrace.c | 29 +++++++++++++++++++++++++++++ + arch/arm64/mm/fault.c | 7 ++++--- + drivers/resctrl/mpam_devices.c | 36 ++++++++++++++++++++++-------------- + 4 files changed, 60 insertions(+), 18 deletions(-) +Merging arm-soc-fixes/arm/fixes (add11ea55f2d2 Merge tag 'scmi-ffa-fixes-7.2' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging drivers/firmware/arm_ffa/driver.c +Merge made by the 'ort' strategy. + .mailmap | 1 + + MAINTAINERS | 12 ++++++------ + arch/arm/mach-ixp4xx/Kconfig | 1 - + arch/arm/mach-pxa/Kconfig | 3 --- + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 24 +++++++++++------------ + arch/arm64/boot/dts/nvidia/tegra264.dtsi | 4 ++-- + drivers/firmware/arm_ffa/driver.c | 29 ++++++++++++++++++++-------- + drivers/firmware/arm_scmi/Kconfig | 4 ++-- + drivers/firmware/arm_scmi/clock.c | 13 ++++++++----- + drivers/firmware/arm_scmi/notify.c | 6 +++--- + drivers/gpu/drm/tegra/sor.c | 6 ++---- + drivers/reset/reset-imx7.c | 6 ++++++ + drivers/reset/reset-sunxi.c | 4 +++- + drivers/reset/spacemit/reset-spacemit-k3.c | 2 +- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 2 +- + include/dt-bindings/reset/altr,rst-mgr-s10.h | 2 +- + include/soc/tegra/pmc.h | 5 ++++- + 17 files changed, 73 insertions(+), 51 deletions(-) +Merging davinci-current/davinci/for-current (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'davinci/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging realtek-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git realtek-fixes/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging sophgo-fixes/fixes (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b428 Linux 6.15-rc1) +$ git merge -m Merge branch 'soc-fixes' of https://github.com/sophgo/linux.git sophgo-soc-fixes/soc-fixes +Already up to date. +Merging m68k-current/for-linus (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 (a2c02aa0c6ca3 powerpc: Remove dead non-preemption code) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Merge made by the 'ort' strategy. + arch/powerpc/include/asm/preempt.h | 16 ---------------- + arch/powerpc/include/asm/uaccess.h | 2 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 9 +++++++++ + arch/powerpc/kernel/time.c | 4 +++- + arch/powerpc/lib/vmx-helper.c | 2 +- + arch/powerpc/platforms/85xx/common.c | 2 ++ + arch/powerpc/platforms/cell/spufs/file.c | 6 ++++-- + arch/powerpc/platforms/pseries/Kconfig | 1 + + .../powerpc/platforms/pseries/papr_platform_attributes.c | 8 +++----- + 9 files changed, 24 insertions(+), 26 deletions(-) + delete mode 100644 arch/powerpc/include/asm/preempt.h +Merging s390-fixes/fixes (49145bce53911 s390/perf_cpum_cf: Add missing array_index_nospec() to __hw_perf_event_init()) +$ 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. + arch/s390/kernel/perf_cpum_cf.c | 3 +++ + arch/s390/lib/csum-partial.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging net/main (2c72eb6286347 llc: fix SAP refcount leak when creating incoming sockets) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Auto-merging .mailmap +Merge made by the 'ort' strategy. + .mailmap | 4 +- + drivers/bluetooth/btqca.c | 2 +- + drivers/bluetooth/btrtl.c | 5 +- + drivers/bluetooth/hci_qca.c | 4 + + drivers/dpll/dpll_netlink.c | 3 + + drivers/net/can/Kconfig | 7 +- + drivers/net/can/peak_canfd/peak_canfd.c | 2 +- + drivers/net/can/peak_canfd/peak_canfd_user.h | 2 +- + drivers/net/can/peak_canfd/peak_pciefd_main.c | 4 +- + drivers/net/can/sja1000/peak_pci.c | 4 +- + drivers/net/can/sja1000/peak_pcmcia.c | 4 +- + drivers/net/can/usb/esd_usb.c | 5 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 2 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 4 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.h | 2 +- + drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 2 +- + drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 2 +- + drivers/net/can/usb/peak_usb/pcan_usb_pro.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 39 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/st.c | 1 + + drivers/net/macsec.c | 7 +- + drivers/net/ppp/ppp_generic.c | 18 +- + .../broadcom/brcm80211/brcmfmac/cyw/core.c | 6 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 8 +- + drivers/net/wireless/intel/ipw2x00/libipw_rx.c | 4 +- + drivers/net/wireless/intersil/p54/txrx.c | 8 + + drivers/net/wireless/marvell/libertas/firmware.c | 1 + + drivers/net/wireless/marvell/libertas/tx.c | 7 + + drivers/net/wireless/marvell/libertas_tf/main.c | 2 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 +- + drivers/net/wireless/marvell/mwifiex/join.c | 1 - + drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 12 +- + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 8 + + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 12 +- + drivers/net/wireless/virtual/mac80211_hwsim_main.c | 16 +- + include/linux/can/dev/peak_canfd.h | 2 +- + include/linux/ieee80211-eht.h | 12 +- + include/net/bluetooth/hci_core.h | 1 + + include/net/cfg80211.h | 4 +- + include/net/sctp/structs.h | 3 +- + include/net/xfrm.h | 2 + + net/bluetooth/hci_event.c | 18 +- + net/bluetooth/hci_sync.c | 68 ++- + net/bluetooth/mgmt.c | 105 +++- + net/can/bcm.c | 654 ++++++++++++++++----- + net/can/isotp.c | 298 +++++++--- + net/can/j1939/transport.c | 18 +- + net/can/raw.c | 66 +-- + net/core/dev.c | 10 +- + net/ipv4/fib_trie.c | 2 +- + net/ipv4/tcp_ipv4.c | 6 +- + net/ipv6/netfilter.c | 4 +- + net/ipv6/tcp_ipv6.c | 6 +- + net/ipv6/xfrm6_policy.c | 1 + + net/iucv/af_iucv.c | 4 + + net/llc/llc_conn.c | 1 - + net/mac80211/cfg.c | 11 +- + net/mac80211/ibss.c | 13 +- + net/mac80211/iface.c | 8 +- + net/mac80211/main.c | 3 +- + net/mac80211/mlme.c | 12 +- + net/mac80211/nan.c | 35 +- + net/mac80211/rx.c | 34 +- + net/mac80211/sta_info.c | 15 +- + net/mac80211/tx.c | 17 +- + net/mac80211/util.c | 3 + + net/netfilter/ipvs/ip_vs_app.c | 10 +- + net/netfilter/ipvs/ip_vs_core.c | 3 +- + net/netfilter/ipvs/ip_vs_xmit.c | 6 +- + net/netfilter/nf_conncount.c | 6 +- + net/netfilter/nf_conntrack_ecache.c | 2 +- + net/netfilter/nf_flow_table_core.c | 6 +- + net/netfilter/xt_nat.c | 9 + + net/netfilter/xt_physdev.c | 5 - + net/openvswitch/flow_netlink.c | 201 +++++-- + net/sched/act_tunnel_key.c | 14 +- + net/sctp/sm_statefuns.c | 23 +- + net/wireless/core.c | 14 +- + net/wireless/core.h | 4 +- + net/wireless/mlme.c | 105 +++- + net/wireless/nl80211.c | 25 +- + net/wireless/pmsr.c | 34 +- + net/wireless/scan.c | 18 +- + net/wireless/sme.c | 6 +- + net/xfrm/xfrm_device.c | 13 +- + net/xfrm/xfrm_iptfs.c | 1 + + net/xfrm/xfrm_nat_keepalive.c | 15 +- + net/xfrm/xfrm_policy.c | 4 +- + net/xfrm/xfrm_state.c | 12 +- + net/xfrm/xfrm_user.c | 41 +- + .../drivers/net/netconsole/netcons_resume.sh | 3 +- + .../selftests/net/netfilter/nft_flowtable.sh | 55 ++ + 97 files changed, 1685 insertions(+), 608 deletions(-) +Merging bpf/master (3d84d674e3a5a Merge branch 'bpf-fix-tracing-of-kfuncs-with-implicit-args') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master +Merge made by the 'ort' strategy. + include/linux/btf.h | 1 + + include/linux/skmsg.h | 14 ---- + kernel/bpf/btf.c | 29 +++++++ + kernel/bpf/verifier.c | 97 ++++++++++++++++------ + net/core/bpf_sk_storage.c | 2 - + net/core/sock.c | 3 + + net/core/sock_map.c | 2 + + net/ipv4/tcp_bpf.c | 17 +++- + .../bpf/prog_tests/kfunc_implicit_args_tracing.c | 36 ++++++++ + .../prog_tests/raw_tp_writable_reject_bad_access.c | 57 +++++++++++++ + .../raw_tp_writable_reject_nbd_invalid.c | 43 ---------- + .../selftests/bpf/prog_tests/sockmap_basic.c | 45 +++++++++- + .../selftests/bpf/prog_tests/sockmap_listen.c | 21 ++--- + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + .../bpf/progs/kfunc_implicit_args_tracing.c | 77 +++++++++++++++++ + .../selftests/bpf/progs/verifier_ptr_to_buf.c | 27 ++++++ + .../selftests/bpf/progs/verifier_raw_tp_writable.c | 16 ++++ + tools/testing/selftests/bpf/test_maps.c | 13 ++- + 18 files changed, 397 insertions(+), 105 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/kfunc_implicit_args_tracing.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/raw_tp_writable_reject_bad_access.c + delete mode 100644 tools/testing/selftests/bpf/prog_tests/raw_tp_writable_reject_nbd_invalid.c + create mode 100644 tools/testing/selftests/bpf/progs/kfunc_implicit_args_tracing.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_ptr_to_buf.c +Merging ipsec/master (21697720ff43b esp: do not unref managed frag pages in esp_ssg_unref()) +$ 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/ipv4/esp4.c | 7 +++++++ + net/ipv6/esp6.c | 7 +++++++ + net/ipv6/xfrm6_input.c | 2 +- + 3 files changed, 15 insertions(+), 1 deletion(-) +Merging netfilter/main (2c7c88a412aa6 Merge tag 'net-7.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (2c7c88a412aa6 Merge tag 'net-7.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (a0d82fb850532 Merge tag 'wireless-2026-07-09' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless) +$ 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 (a1a21995c2e1c wifi: carl9170: fix buffer overflow in rx_stream failover path) +$ 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/ath10k/htt_rx.c | 2 ++ + drivers/net/wireless/ath/ath11k/ahb.c | 1 + + drivers/net/wireless/ath/ath11k/dp_rx.c | 3 +++ + drivers/net/wireless/ath/ath11k/pci.c | 4 ++++ + drivers/net/wireless/ath/ath11k/qmi.c | 11 ++++++--- + drivers/net/wireless/ath/ath12k/dp_peer.c | 11 +++++++-- + drivers/net/wireless/ath/ath12k/dp_peer.h | 1 + + drivers/net/wireless/ath/ath12k/dp_rx.c | 7 +++--- + drivers/net/wireless/ath/ath12k/hw.h | 16 +++++++++++++ + drivers/net/wireless/ath/ath12k/mac.c | 10 +++++--- + drivers/net/wireless/ath/ath12k/pci.c | 4 ++++ + drivers/net/wireless/ath/ath12k/peer.c | 3 +++ + drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c | 33 +++++++++++++++++++++++++++ + drivers/net/wireless/ath/ath12k/wifi7/dp_rx.h | 6 +++++ + drivers/net/wireless/ath/ath12k/wifi7/hw.c | 3 +++ + drivers/net/wireless/ath/ath6kl/txrx.c | 12 ++++++---- + drivers/net/wireless/ath/ath6kl/wmi.c | 20 ++++++++++++++++ + drivers/net/wireless/ath/ath9k/hif_usb.c | 7 +----- + drivers/net/wireless/ath/carl9170/rx.c | 7 ++++-- + drivers/net/wireless/ath/carl9170/tx.c | 2 +- + 20 files changed, 137 insertions(+), 26 deletions(-) +Merging iwlwifi/fixes (a426d3227c669 wifi: iwlwifi: adapt ND match notif sizing to fixed matches array) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/cfg/rf-pe.c | 1 + + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 33 ++++++++++- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 9 ++- + drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/smem.c | 28 ++++++++-- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 64 ++++++++++++++-------- + drivers/net/wireless/intel/iwlwifi/mld/agg.c | 7 ++- + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mld/mcc.c | 10 +++- + drivers/net/wireless/intel/iwlwifi/mld/thermal.c | 9 ++- + drivers/net/wireless/intel/iwlwifi/mld/tx.c | 4 ++ + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 46 +++++++++++----- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 55 +++++++++++++------ + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 10 ++++ + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 25 +++++---- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 7 +-- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 - + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 43 ++++++++++++--- + drivers/net/wireless/intel/iwlwifi/mvm/ptp.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 9 ++- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 5 ++ + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 10 +++- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 5 ++ + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 45 ++++++++++++++- + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 7 ++- + .../net/wireless/intel/iwlwifi/pcie/gen1_2/rx.c | 9 ++- + 28 files changed, 349 insertions(+), 109 deletions(-) +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 (3cda0dfe8c651 RDMA/irdma: Prevent overflows in memory contiguity checks) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (ac1e8d01f4ea0 ALSA: hda/realtek: Add inverted LED quirk for HP ZBook 8 G2a) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/core/seq/seq_timer.c | 13 ++++++++- + sound/hda/codecs/hdmi/hdmi.c | 3 ++ + sound/hda/codecs/hdmi/hdmi_local.h | 9 ++++++ + sound/hda/codecs/hdmi/intelhdmi.c | 36 ++++++++++++++++++++---- + sound/hda/codecs/realtek/alc269.c | 45 ++++++++++++++++++++++++++++++ + sound/hda/codecs/side-codecs/cs35l41_hda.c | 11 +++++++- + 6 files changed, 109 insertions(+), 8 deletions(-) +Merging sound-asoc-fixes/for-linus (0b604e886ece1 ASoC: bt-sco: fix duplicate DAPM widget names for wideband DAI) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/amd/acp-config.c | 12 ++++++++ + sound/soc/amd/yc/acp6x-mach.c | 7 +++++ + sound/soc/codecs/bt-sco.c | 10 +++++-- + sound/soc/codecs/tas2781-fmwlib.c | 63 +++++++++++++++++++++++++++++++++++---- + sound/soc/fsl/fsl_sai.c | 29 +++++++++++++++--- + sound/soc/fsl/imx-card.c | 12 +++++--- + sound/soc/sunxi/sun4i-codec.c | 1 + + 7 files changed, 118 insertions(+), 16 deletions(-) +Merging regmap-fixes/for-linus (63d441e937b7c 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 (d38f8bd771c49 regulator: core: regulator_lock_two() should test for EDEADLK not EDEADLOCK) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (e919ca35a6e84 spi: cadence-quadspi: Fix indirect write timeout when DMA read mode is enabled) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-cadence-quadspi.c | 12 ++++++++---- + drivers/spi/spi-dw-dma.c | 3 ++- + 2 files changed, 10 insertions(+), 5 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 (af071d9e07e57 serial: sc16is7xx: implement gpio get_direction() callback) +$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/serial/8250/8250_mid.c | 14 +++++++++----- + drivers/tty/serial/sc16is7xx.c | 12 ++++++++++++ + 2 files changed, 21 insertions(+), 5 deletions(-) +Merging usb.current/usb-linus (71132cedd1ecb usb: atm: ueagle-atm: reject descriptors that confuse probe and disconnect) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/atm/ueagle-atm.c | 17 +++ + drivers/usb/chipidea/core.c | 1 + + drivers/usb/core/port.c | 2 + + drivers/usb/core/sysfs.c | 8 +- + drivers/usb/gadget/function/f_midi.c | 1 + + drivers/usb/gadget/function/f_ncm.c | 17 ++- + drivers/usb/gadget/function/f_printer.c | 23 ++- + drivers/usb/gadget/function/f_tcm.c | 192 +++++++++++++++++++++---- + drivers/usb/gadget/function/tcm.h | 13 ++ + drivers/usb/gadget/function/uvc_v4l2.c | 2 + + drivers/usb/gadget/udc/bdc/bdc_core.c | 20 +++ + drivers/usb/gadget/udc/bdc/bdc_udc.c | 7 +- + drivers/usb/gadget/udc/dummy_hcd.c | 40 ++++-- + drivers/usb/gadget/udc/fsl_udc_core.c | 99 ++++++------- + drivers/usb/gadget/udc/fsl_usb2_udc.h | 1 + + drivers/usb/gadget/udc/pxa27x_udc.c | 10 +- + drivers/usb/gadget/udc/snps_udc_core.c | 1 - + drivers/usb/host/xhci-pci.c | 1 + + drivers/usb/host/xhci.c | 15 +- + drivers/usb/host/xhci.h | 1 + + drivers/usb/musb/omap2430.c | 2 - + drivers/usb/storage/unusual_devs.h | 7 + + drivers/usb/typec/ucsi/ucsi.c | 240 +++++++++++++++++++++++++------- + drivers/usb/typec/ucsi/ucsi_yoga_c630.c | 23 --- + 24 files changed, 541 insertions(+), 202 deletions(-) +Merging usb-serial-fixes/usb-linus (fad0fd120e290 USB: serial: ftdi_sio: add support for E+H FXA291) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/serial/ftdi_sio.c | 2 ++ + drivers/usb/serial/ftdi_sio_ids.h | 5 +++++ + drivers/usb/serial/keyspan_pda.c | 44 +++++++++++++++++++++++++++++++-------- + 3 files changed, 42 insertions(+), 9 deletions(-) +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 (a13c140cc289c Linux 7.2-rc3) +$ 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 (a41000ba3a230 iio: light: gp2ap002: Disable regulators on resume failure) +$ 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/temperature/hid-sensor-temperature.c +Merge made by the 'ort' strategy. + drivers/iio/adc/Kconfig | 2 ++ + drivers/iio/dac/m62332.c | 17 ++++++++++++----- + drivers/iio/light/gp2ap002.c | 10 ++++++++-- + drivers/iio/temperature/hid-sensor-temperature.c | 3 ++- + 4 files changed, 24 insertions(+), 8 deletions(-) +Merging watchdog-fixes/watchdog (bcfcd7619f277 watchdog: airoha: Prevent division by zero when clock frequency is zero) +$ 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. + Documentation/watchdog/watchdog-parameters.rst | 4 ++-- + drivers/watchdog/airoha_wdt.c | 3 +++ + drivers/watchdog/ni903x_wdt.c | 7 ++++++- + drivers/watchdog/s32g_wdt.c | 3 +-- + drivers/watchdog/watchdog_pretimeout.c | 2 ++ + 5 files changed, 14 insertions(+), 5 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 (a13c140cc289c Linux 7.2-rc3) +$ git merge -m Merge branch 'char-misc-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (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 (adea84ee6cdea Input: mms114 - fix multi-touch slot corruption) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (8173f7e2ce67e rhashtable: clear stale iter->p on table restart) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Merge made by the 'ort' strategy. + lib/rhashtable.c | 1 + + 1 file changed, 1 insertion(+) +Merging libcrypto-fixes/libcrypto-fixes (e073f1238ecae crypto: aes - Fix conditions for selecting MAC dependencies) +$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Merge made by the 'ort' strategy. + Documentation/crypto/libcrypto-blockcipher.rst | 6 ++-- + Documentation/crypto/libcrypto-hash.rst | 38 ++++++++++++++------------ + Documentation/crypto/libcrypto-signature.rst | 2 +- + Documentation/crypto/libcrypto.rst | 5 ++-- + crypto/Kconfig | 4 +-- + lib/crypto/Kconfig | 3 +- + lib/crypto/md5.c | 14 ---------- + 7 files changed, 30 insertions(+), 42 deletions(-) +Merging vfio-fixes/for-linus (e242e974e812e vfio: selftests: Add luuid to libvfio.mk's list of libraries, not to the Makefile) +$ git merge -m Merge branch 'for-linus' of https://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (c5c413534d40e selftests/tracing: Have trigger-hist-poll.tc use sched_process_exit) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (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 (2b533e775aec5 Revert "mtd: maps: remove uclinux map driver") +$ git merge -m Merge branch 'mtd/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/devices/mchp23k256.c | 2 +- + drivers/mtd/maps/Kconfig | 6 ++ + drivers/mtd/maps/Makefile | 1 + + drivers/mtd/maps/uclinux.c | 118 +++++++++++++++++++++++++++++ + drivers/mtd/mtd_virt_concat.c | 8 +- + drivers/mtd/mtdcore.c | 23 +++++- + drivers/mtd/mtdpart.c | 8 ++ + drivers/mtd/mtdswap.c | 5 +- + drivers/mtd/nand/ecc-mtk.c | 24 ++++-- + drivers/mtd/nand/onenand/onenand_samsung.c | 7 +- + drivers/mtd/nand/raw/Kconfig | 1 + + drivers/mtd/nand/raw/fsl_ifc_nand.c | 9 ++- + drivers/mtd/nand/raw/ingenic/ingenic_ecc.c | 7 +- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 12 ++- + drivers/mtd/nand/raw/lpc32xx_slc.c | 12 ++- + drivers/mtd/nand/raw/ndfc.c | 2 +- + drivers/mtd/nand/spi/core.c | 2 +- + 17 files changed, 224 insertions(+), 23 deletions(-) + create mode 100644 drivers/mtd/maps/uclinux.c +Merging mfd-fixes/for-mfd-fixes (d5d2d7a8d8be1 MAINTAINERS: Add a mailing list entry to MFD) +$ git merge -m Merge branch 'for-mfd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (71827776667f4 reset: imx7: Correct polarity of MIPI CSI resets on i.MX8MQ) +$ git merge -m Merge branch 'reset/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (a13c140cc289c Linux 7.2-rc3) +$ git merge -m Merge branch 'mips-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (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 (25f744ffa0c8e KVM: SVM: Bump asid_generation on CPU online to avoid ASID collision after hotplug) +$ 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 (3e3aa6da87d30 KVM: s390: pci: Fix handling of AIF enable without AISB) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging kvm-arm-fixes/fixes (8d187d4b33c26 KVM: arm64: Fix propagation of TLBI level in kvm_pgtable_stage2_relax_perms()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm-fixes/fixes +Already up to date. +Merging hwmon-fixes/hwmon (f151d0143ac4e hwmon: (nzxt-kraken3) Stop device IO before calling hid_hw_stop) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/corsair-cpro.c | 1 + + drivers/hwmon/corsair-psu.c | 1 + + drivers/hwmon/gigabyte_waterforce.c | 4 +++- + drivers/hwmon/nzxt-kraken3.c | 6 ++++-- + drivers/hwmon/nzxt-smart2.c | 2 +- + 5 files changed, 10 insertions(+), 4 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (a8aec14230322 nvdimm/bus: Fix potential use after free in asynchronous initialization) +$ git merge -m Merge branch 'libnvdimm-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (d90f236f8b9e3 cxl/test: Update mock dev array before calling platform_device_add()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/dma-mapping-fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'dma-mapping-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes +Already up to date. +Merging drivers-x86-fixes/fixes (78bf392ba77dd platform/x86: asus-wmi: temporarily revert to setting a charge limit) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Merge made by the 'ort' strategy. + drivers/platform/x86/asus-wmi.c | 26 +++++++++++++++++++++++--- + drivers/platform/x86/intel/vsec.c | 17 ++++++++++++----- + 2 files changed, 35 insertions(+), 8 deletions(-) +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 (e166bafc483e9 scsi: hpsa: Fix DMA mapping leak on IOACCEL2 reset path) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- + drivers/scsi/elx/efct/efct_hw.c | 2 + + drivers/scsi/elx/efct/efct_unsol.c | 1 + + drivers/scsi/hosts.c | 2 + + drivers/scsi/hpsa.c | 4 ++ + drivers/scsi/lpfc/lpfc_init.c | 3 +- + drivers/scsi/scsi_error.c | 22 +++++++- + drivers/scsi/scsi_lib.c | 8 --- + drivers/scsi/scsi_priv.h | 2 + + drivers/scsi/sg.c | 7 ++- + drivers/target/target_core_fabric_lib.c | 89 +++++++++++++++++++++++++-------- + drivers/target/target_core_internal.h | 3 +- + drivers/target/target_core_pr.c | 12 +++-- + drivers/xen/xen-scsiback.c | 30 ++++++++--- + include/scsi/scsi_device.h | 1 - + include/scsi/scsi_host.h | 3 ++ + 16 files changed, 141 insertions(+), 50 deletions(-) +Merging drm-fixes/drm-fixes (5d1238c7ac366 Merge tag 'amd-drm-fixes-7.2-2026-07-16' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 62 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 10 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 23 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 551 +++++++++++++-------- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 70 +-- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 20 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 45 ++ + drivers/gpu/drm/amd/display/dc/dc.h | 3 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 11 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 2 +- + .../display/dc/link/protocols/link_dp_capability.c | 6 +- + .../display/dc/resource/dce100/dce100_resource.c | 7 +- + .../amd/display/dc/resource/dcn42/dcn42_resource.c | 1 + + .../display/dc/resource/dcn42b/dcn42b_resource.c | 23 +- + .../display/dc/resource/dcn42b/dcn42b_resource.h | 116 +---- + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 17 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c | 7 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 16 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 12 + + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 12 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 45 ++ + drivers/gpu/drm/drm_panel_backlight_quirks.c | 9 + + include/drm/drm_utils.h | 1 + + 31 files changed, 720 insertions(+), 431 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (612978b83f45b drm/i915/selftests: Fix GT PM sort comparators) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/skl_universal_plane.c | 33 +++++++++------------- + drivers/gpu/drm/i915/display/skl_watermark.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_user.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_gt_pm.c | 8 +++--- + 4 files changed, 19 insertions(+), 26 deletions(-) +Merging mmc-fixes/fixes (e27c946b589c5 mmc: sdhci-esdhc-imx: fix resume error handling) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 29 +++++++- + drivers/memstick/core/ms_block.c | 4 + + drivers/mmc/core/block.c | 3 +- + drivers/mmc/core/mmc_test.c | 18 +++-- + drivers/mmc/host/sdhci-esdhc-imx.c | 91 +++++++++++++++-------- + drivers/mmc/host/sdhci-of-dwcmshc.c | 14 ++-- + drivers/mmc/host/vub300.c | 36 ++++++--- + 7 files changed, 135 insertions(+), 60 deletions(-) +Merging rtc-fixes/rtc-fixes (254f49634ee16 Linux 7.1-rc1) +$ git merge -m Merge branch 'rtc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (a13c140cc289c Linux 7.2-rc3) +$ git merge -m Merge branch 'gnss-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (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 (5caae1deee89a riscv: hwprobe: Avoid uninitialized read in hwprobe_get_cpus()) +$ 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 | 2 +- + arch/riscv/include/asm/cacheflush.h | 5 +++-- + arch/riscv/include/asm/io.h | 8 ++++++++ + arch/riscv/kernel/entry.S | 2 +- + arch/riscv/kernel/sys_hwprobe.c | 1 + + arch/riscv/kernel/vdso/Makefile | 6 +++--- + arch/riscv/kernel/vdso/rt_sigreturn.S | 10 +++++++++- + arch/riscv/mm/init.c | 2 ++ + mm/sparse-vmemmap.c | 2 ++ + 9 files changed, 30 insertions(+), 8 deletions(-) +Merging riscv-dt-fixes/riscv-dt-fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ 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 (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'spdx-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (9dc325327babe gpio: pca953x: fix pca953x_irq_bus_sync_unlock regmap lock) +$ git merge -m Merge branch 'gpio/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'ort' strategy. + drivers/gpio/gpio-pca953x.c | 19 ++++++++++++++----- + drivers/gpio/gpio-sloppy-logic-analyzer.c | 10 ++++++++++ + drivers/gpio/gpiolib.c | 13 ++++++++----- + 3 files changed, 32 insertions(+), 10 deletions(-) +Merging gpio-intel-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (5142c56651578 bug: fix warning suppressions with kunit built as module) +$ git merge -m Merge branch 'kunit-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging 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 (6fa6ee724d8da arm64: dts: renesas: ironhide: Describe inline ECC carveouts) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/renesas/r8a78000-ironhide.dts | 41 +++++++++++++++++++++++ + 1 file changed, 41 insertions(+) +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 (c3b8ee84a9650 iommu/arm-smmu-v3-iommufd: Require exactly one Stream ID for a vDEVICE) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Merge made by the 'ort' strategy. + .../iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 15 +++++++++++++++ + drivers/iommu/iommufd/device.c | 2 +- + drivers/iommu/iommufd/pages.c | 3 +++ + drivers/iommu/iommufd/viommu.c | 22 ++++++++++++++++------ + 4 files changed, 35 insertions(+), 7 deletions(-) +Merging rust-fixes/rust-fixes (a19bda861b3a7 rust: device: avoid trailing ; in printing macros) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Auto-merging Makefile +Merge made by the 'ort' strategy. + Makefile | 5 +++ + init/Kconfig | 3 ++ + rust/Makefile | 16 +++++++-- + rust/bindings/lib.rs | 4 +++ + rust/kernel/device.rs | 20 +++++------ + rust/uapi/lib.rs | 4 +++ + rust/zerocopy-derive/README.md | 14 ++++---- + rust/zerocopy-derive/derive/from_bytes.rs | 2 +- + rust/zerocopy-derive/derive/into_bytes.rs | 2 +- + rust/zerocopy-derive/derive/known_layout.rs | 3 +- + rust/zerocopy-derive/derive/mod.rs | 20 ++++++----- + rust/zerocopy-derive/derive/try_from_bytes.rs | 6 ++-- + rust/zerocopy-derive/derive/unaligned.rs | 2 +- + rust/zerocopy-derive/lib.rs | 36 ++++++++++++++++++- + rust/zerocopy-derive/repr.rs | 2 +- + rust/zerocopy-derive/util.rs | 34 +++++++++++++----- + rust/zerocopy/README.md | 15 ++++---- + rust/zerocopy/rustdoc/style.css | 1 - + rust/zerocopy/src/byte_slice.rs | 2 +- + rust/zerocopy/src/byteorder.rs | 50 ++++++++++++++++++++++----- + rust/zerocopy/src/deprecated.rs | 2 +- + rust/zerocopy/src/error.rs | 2 +- + rust/zerocopy/src/impls.rs | 4 +-- + rust/zerocopy/src/layout.rs | 4 ++- + rust/zerocopy/src/lib.rs | 12 ++++--- + rust/zerocopy/src/macros.rs | 2 +- + rust/zerocopy/src/pointer/inner.rs | 2 +- + rust/zerocopy/src/pointer/invariant.rs | 2 +- + rust/zerocopy/src/pointer/mod.rs | 2 +- + rust/zerocopy/src/pointer/ptr.rs | 2 +- + rust/zerocopy/src/pointer/transmute.rs | 2 +- + rust/zerocopy/src/ref.rs | 2 +- + rust/zerocopy/src/split_at.rs | 2 +- + rust/zerocopy/src/util/macro_util.rs | 2 +- + rust/zerocopy/src/util/macros.rs | 2 +- + rust/zerocopy/src/util/mod.rs | 8 ++++- + rust/zerocopy/src/wrappers.rs | 2 +- + tools/objtool/check.c | 1 + + 38 files changed, 208 insertions(+), 88 deletions(-) +Merging w1-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (a4876f11aa1d0 pmdomain: mediatek: Fix possible nullptr KP in HWV cleanup/on-check) +$ 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 (deb35336b5bfe i2c: mediatek: fix WRRD for SoCs without auto_restart option) +$ git merge -m Merge branch 'i2c/i2c-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-andi-fixes/i2c/i2c-fixes +Merge made by the 'ort' strategy. + CREDITS | 7 +++++++ + drivers/i2c/busses/i2c-imx.c | 36 +++++++++++++++++++++++++++++++++--- + drivers/i2c/busses/i2c-k1.c | 2 +- + drivers/i2c/busses/i2c-mlxbf.c | 4 +++- + drivers/i2c/busses/i2c-mt65xx.c | 2 +- + 5 files changed, 45 insertions(+), 6 deletions(-) +Merging i2c-rust-fixes/rust-i2c-fixes (4eb422482ca5d rust: i2c: fix I2cAdapter refcounts double increment) +$ git merge -m Merge branch 'rust-i2c-fixes' of https://github.com/ikrtn/rust-for-linux i2c-rust-fixes/rust-i2c-fixes +Already up to date. +Merging sparc-fixes/for-linus (254f49634ee16 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (8cdeaa50eae8d Linux 7.2-rc2) +$ 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 (601ddaceb861b ring-buffer: Allow sparse CPU masks in ring_buffer_desc()) +$ git merge -m Merge branch 'trace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes +Already up to date. +Merging tracefs-fixes/tracefs/fixes (07004a8c4b572 eventfs: Hold eventfs_mutex and SRCU when remount walks events) +$ git merge -m Merge branch 'tracefs/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes +Already up to date. +Merging spacemit-fixes/fixes (eb525edd48907 clk: spacemit: k3: set hdma clock as critical) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux spacemit-fixes/fixes +Merge made by the 'ort' strategy. + drivers/clk/spacemit/ccu-k3.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging tip-fixes/tip/urgent (3d2378ed6c8ff 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/boot/compressed/acpi.c | 7 ++++++- + arch/x86/boot/early_serial_console.c | 11 +++++++---- + arch/x86/kernel/cpu/Makefile | 1 - + 3 files changed, 13 insertions(+), 6 deletions(-) +Merging slab-fixes/slab/for-next-fixes (d9e6a76239389 mm/slab: prevent unbounded recursion in free path with new kmalloc type) +$ 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 +Merge made by the 'ort' strategy. + include/linux/alloc_tag.h | 3 ++ + include/linux/slab.h | 19 +++++++- + lib/alloc_tag.c | 9 ++++ + mm/slab.h | 32 ++++++++++-- + mm/slab_common.c | 19 +++++++- + mm/slub.c | 121 +++++++++++++++++++--------------------------- + 6 files changed, 126 insertions(+), 77 deletions(-) +Merging kexec-fixes/kexec-fixes (ada2e5a44e991 crash_dump: release keyring reference at the correct time) +$ git merge -m Merge branch 'kexec-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git kexec-fixes/kexec-fixes +Merge made by the 'ort' strategy. + kernel/crash_dump_dm_crypt.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) +Merging liveupdate-fixes/fixes (0b27b47604411 liveupdate: reject nonzero reserved value for SESSION_FINISH) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git liveupdate-fixes/fixes +Merge made by the 'ort' strategy. + kernel/liveupdate/luo_session.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging drm-msm-fixes/msm-fixes (e2332abed2a4d drm/msm: Only fini scheduler after successful init) +$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes +Auto-merging drivers/gpu/drm/msm/msm_ringbuffer.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 36 ++++++++++++++++++++++++++- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 5 ++++ + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 5 +++- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 8 ++++-- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 5 +++- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 12 +++++++++ + drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 5 +++- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 2 +- + drivers/gpu/drm/msm/dp/dp_panel.c | 4 ++- + drivers/gpu/drm/msm/dsi/dsi_host.c | 12 +++++++++ + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 18 ++++++++++++-- + drivers/gpu/drm/msm/msm_gpu.c | 8 ++++-- + drivers/gpu/drm/msm/msm_ringbuffer.c | 7 +++--- + drivers/gpu/drm/msm/msm_ringbuffer.h | 1 + + drivers/gpu/drm/msm/registers/adreno/a3xx.xml | 2 ++ + 16 files changed, 116 insertions(+), 15 deletions(-) +Merging uml-fixes/fixes (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 (faebb7ba1ac65 accel/amdxdna: Fix use-after-free of mm_struct in job scheduler) +$ 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_ctx.c | 18 +++++++++++ + drivers/accel/ivpu/ivpu_fw_log.c | 4 +++ + drivers/accel/ivpu/ivpu_hw_btrs.c | 2 +- + drivers/dma-buf/udmabuf.c | 9 +++--- + drivers/gpu/drm/drm_gpusvm.c | 53 ++++++++++++++++++++++---------- + drivers/gpu/drm/panthor/panthor_device.c | 5 ++- + drivers/gpu/drm/panthor/panthor_fw.c | 1 + + drivers/gpu/drm/ttm/ttm_pool.c | 34 +++++++++++++++++--- + drivers/gpu/drm/virtio/virtgpu_gem.c | 14 +++++---- + drivers/gpu/drm/virtio/virtgpu_kms.c | 5 ++- + drivers/gpu/drm/virtio/virtgpu_vq.c | 3 -- + drivers/gpu/host1x/bus.c | 4 +-- + 12 files changed, 114 insertions(+), 38 deletions(-) +Merging rust/rust-next (7059bdf4f04a3 Merge tag 'for-7.2-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging rust-interop/interop-next (05f7e89ab9731 Linux 6.19) +$ git merge -m Merge branch 'interop-next' of https://github.com/Rust-for-Linux/linux.git rust-interop/interop-next +Already up to date. +Merging rust-alloc/alloc-next (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 (0c20f77a26b89 rust: pin-init: make `[pin_]chain` unwind safe) +$ git merge -m Merge branch 'pin-init-next' of https://github.com/Rust-for-Linux/linux.git rust-pin-init/pin-init-next +Merge made by the 'ort' strategy. + rust/pin-init/examples/mutex.rs | 5 +- + rust/pin-init/internal/src/init.rs | 8 +- + rust/pin-init/internal/src/pin_data.rs | 10 +-- + rust/pin-init/src/lib.rs | 151 ++++++++++++++++++++------------- + 4 files changed, 101 insertions(+), 73 deletions(-) +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 (0e35b9b6ec0ff Merge tag 'mm-hotfixes-stable-2026-07-06-17-49' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ git merge -m Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (0e35b9b6ec0ff Merge tag 'mm-hotfixes-stable-2026-07-06-17-49' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm) +$ git merge -m Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm-unstable/mm-unstable (e549221365405 mm/damon/sysfs: read ops_id only once in damon_sysfs_apply_inputs()) + 28a5d16195e4d ("mm/mm_init: handle alloc_percpu failure in free_area_init_core_hotplug") +$ 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 CREDITS +Auto-merging MAINTAINERS +Auto-merging arch/riscv/Kconfig +Auto-merging drivers/accel/amdxdna/aie2_ctx.c +Auto-merging drivers/gpu/drm/drm_gpusvm.c +Auto-merging fs/smb/client/file.c +Auto-merging include/linux/alloc_tag.h +Auto-merging include/linux/memory_hotplug.h +Auto-merging init/Kconfig +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/events/core.c +Auto-merging kernel/trace/ring_buffer.c +Auto-merging mm/alloc_tag.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/mm_init.c +Auto-merging mm/slab.h +Auto-merging mm/slub.c +Auto-merging mm/sparse-vmemmap.c +Merge made by the 'ort' strategy. + CREDITS | 4 + + Documentation/ABI/testing/sysfs-block-zram | 6 +- + Documentation/ABI/testing/sysfs-bus-dax | 24 + + Documentation/ABI/testing/sysfs-kernel-mm-damon | 75 +- + Documentation/admin-guide/cgroup-v1/cpusets.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 7 +- + Documentation/admin-guide/mm/damon/usage.rst | 19 +- + Documentation/admin-guide/mm/pagemap.rst | 13 +- + Documentation/admin-guide/mm/transhuge.rst | 2 +- + Documentation/admin-guide/mm/userfaultfd.rst | 269 +++++- + Documentation/admin-guide/sysctl/vm.rst | 83 +- + Documentation/core-api/maple_tree.rst | 21 +- + Documentation/core-api/mm-api.rst | 3 +- + Documentation/dev-tools/kmemleak.rst | 8 + + Documentation/driver-api/basics.rst | 3 + + Documentation/filesystems/locking.rst | 5 +- + Documentation/filesystems/proc.rst | 1 + + Documentation/filesystems/vfs.rst | 4 +- + Documentation/mm/allocation-profiling.rst | 5 + + Documentation/mm/damon/design.rst | 43 +- + Documentation/mm/hmm.rst | 79 +- + Documentation/mm/page_owner.rst | 78 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 + + MAINTAINERS | 36 +- + arch/arm/mm/fault-armv.c | 4 +- + arch/arm/mm/flush.c | 2 +- + arch/arm64/Kconfig | 3 +- + arch/arm64/include/asm/pgtable-prot.h | 8 +- + arch/arm64/include/asm/pgtable.h | 51 +- + arch/arm64/include/asm/vmalloc.h | 8 +- + arch/arm64/mm/hugetlbpage.c | 17 +- + arch/csky/abiv1/inc/abi/cacheflush.h | 7 +- + arch/loongarch/Kconfig | 3 +- + arch/loongarch/include/asm/pgtable.h | 4 +- + arch/mips/kernel/vdso.c | 4 +- + arch/nios2/mm/cacheflush.c | 2 +- + arch/parisc/kernel/cache.c | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 7 +- + arch/powerpc/mm/book3s64/slice.c | 6 +- + arch/powerpc/mm/hugetlbpage.c | 13 +- + arch/powerpc/platforms/Kconfig.cputype | 3 +- + arch/riscv/Kconfig | 3 +- + arch/riscv/include/asm/pgtable-bits.h | 12 +- + arch/riscv/include/asm/pgtable.h | 67 +- + arch/s390/Kconfig | 3 +- + arch/s390/include/asm/hugetlb.h | 12 +- + arch/s390/include/asm/pgtable.h | 6 +- + arch/s390/mm/vmem.c | 4 +- + arch/sparc/include/asm/pgtable_64.h | 4 - + arch/x86/Kconfig | 3 +- + arch/x86/events/intel/ds.c | 6 +- + arch/x86/include/asm/pgtable.h | 58 +- + arch/x86/include/asm/pgtable_types.h | 16 +- + arch/x86/kernel/cpu/sgx/virt.c | 3 +- + arch/x86/kvm/vmx/vmx.c | 2 +- + arch/x86/mm/init_64.c | 134 +-- + arch/x86/virt/hw.c | 2 +- + drivers/accel/amdxdna/aie2_ctx.c | 23 +- + drivers/base/arch_numa.c | 4 - + drivers/base/memory.c | 9 + + drivers/dax/bus.h | 2 + + drivers/dax/kmem.c | 506 +++++++++--- + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/drm_gem_dma_helper.c | 2 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- + drivers/gpu/drm/drm_gpusvm.c | 61 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 6 +- + drivers/gpu/drm/gma500/gem.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 20 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 11 +- + drivers/gpu/drm/panthor/panthor_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/tegra/gem.c | 5 +- + drivers/gpu/drm/ttm/ttm_backup.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 7 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c | 2 +- + drivers/gpu/drm/xe/xe_device.c | 2 +- + drivers/gpu/drm/xe/xe_mmio_gem.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 2 +- + drivers/hv/mshv_regions.c | 54 +- + drivers/infiniband/core/umem_odp.c | 18 +- + drivers/misc/sgi-xp/xpc_uv.c | 5 +- + drivers/net/ethernet/fungible/funeth/funeth_rx.c | 2 +- + drivers/vfio/pci/nvgrace-gpu/main.c | 3 +- + drivers/vfio/pci/vfio_pci_core.c | 3 +- + drivers/video/fbdev/core/fb_io_fops.c | 2 +- + fs/aio.c | 2 +- + fs/dax.c | 2 +- + fs/hugetlbfs/inode.c | 18 +- + fs/nfs/file.c | 4 +- + fs/proc/task_mmu.c | 119 ++- + fs/smb/client/file.c | 4 +- + include/asm-generic/fixmap.h | 4 +- + include/asm-generic/getorder.h | 4 +- + include/asm-generic/hugetlb.h | 18 +- + include/asm-generic/memory_model.h | 6 +- + include/asm-generic/mmu.h | 2 +- + include/asm-generic/pgtable-nop4d.h | 4 +- + include/asm-generic/pgtable-nopmd.h | 4 +- + include/asm-generic/pgtable-nopud.h | 4 +- + include/asm-generic/pgtable_uffd.h | 32 +- + include/linux/alloc_tag.h | 4 +- + include/linux/backing-dev.h | 2 - + include/linux/bootmem_info.h | 89 -- + include/linux/codetag.h | 2 + + include/linux/cpuset.h | 4 +- + include/linux/damon.h | 160 ++-- + include/linux/gfp.h | 54 +- + include/linux/gfp_types.h | 12 +- + include/linux/hmm.h | 2 + + include/linux/huge_mm.h | 20 +- + include/linux/hugetlb.h | 57 +- + include/linux/hugetlb_cgroup.h | 2 +- + include/linux/leafops.h | 32 +- + include/linux/lockdep.h | 3 + + include/linux/lockdep_types.h | 3 +- + include/linux/maple_tree.h | 14 +- + include/linux/memfd.h | 6 +- + include/linux/memory.h | 27 + + include/linux/memory_hotplug.h | 14 + + include/linux/migrate.h | 8 +- + include/linux/migrate_mode.h | 1 + + include/linux/mm.h | 269 ++++-- + include/linux/mm_inline.h | 8 +- + include/linux/mm_types.h | 3 + + include/linux/mmap_lock.h | 8 + + include/linux/mmzone.h | 43 +- + include/linux/oom.h | 2 +- + include/linux/page-flags.h | 14 - + include/linux/page_owner.h | 7 +- + include/linux/pagemap.h | 35 +- + include/linux/percpu-defs.h | 4 +- + include/linux/percpu-refcount.h | 5 +- + include/linux/pfn.h | 2 +- + include/linux/pgtable.h | 71 +- + include/linux/radix-tree.h | 5 +- + include/linux/sched.h | 1 + + include/linux/sched/mm.h | 13 +- + include/linux/shmem_fs.h | 5 +- + include/linux/skbuff.h | 2 +- + include/linux/swap.h | 90 +- + include/linux/swapops.h | 10 +- + include/linux/userfaultfd_k.h | 100 ++- + include/linux/vm_event_item.h | 4 + + include/linux/vmalloc.h | 4 +- + include/linux/vmpressure.h | 48 +- + include/linux/writeback.h | 2 +- + include/trace/events/damon.h | 8 +- + include/trace/events/huge_memory.h | 2 +- + include/trace/events/migrate.h | 11 +- + include/trace/events/mmflags.h | 17 +- + include/trace/events/pagemap.h | 8 + + include/uapi/linux/alloc_tag.h | 99 +++ + include/uapi/linux/fs.h | 1 + + include/uapi/linux/mempolicy.h | 2 +- + include/uapi/linux/userfaultfd.h | 54 +- + init/Kconfig | 8 + + ipc/shm.c | 3 +- + kernel/cgroup/cpuset.c | 2 +- + kernel/dma/coherent.c | 7 +- + kernel/dma/direct.c | 6 +- + kernel/dma/mapping.c | 8 +- + kernel/dma/ops_helpers.c | 4 +- + kernel/events/core.c | 20 +- + kernel/events/uprobes.c | 13 +- + kernel/kcov.c | 2 +- + kernel/liveupdate/kexec_handover.c | 3 +- + kernel/locking/lockdep.c | 58 +- + kernel/trace/ring_buffer.c | 3 +- + lib/Kconfig.debug | 28 - + lib/Makefile | 1 - + lib/codetag.c | 18 + + lib/maple_tree.c | 361 +++++--- + lib/percpu-refcount.c | 2 +- + lib/radix-tree.c | 7 +- + lib/test_hmm.c | 109 ++- + lib/test_hmm_uapi.h | 1 + + mm/Kconfig | 33 +- + mm/Kconfig.debug | 28 + + mm/Makefile | 4 +- + {lib => mm}/alloc_tag.c | 368 ++++++++- + mm/bootmem_info.c | 72 -- + mm/cma.c | 4 +- + mm/compaction.c | 8 +- + mm/damon/core.c | 646 ++++++++++----- + mm/damon/lru_sort.c | 13 +- + mm/damon/ops-common.c | 2 +- + mm/damon/paddr.c | 36 +- + mm/damon/reclaim.c | 11 +- + mm/damon/stat.c | 2 +- + mm/damon/sysfs-schemes.c | 31 +- + mm/damon/sysfs.c | 200 +++-- + mm/damon/tests/core-kunit.h | 245 ++++-- + mm/damon/vaddr.c | 42 +- + mm/debug.c | 7 +- + mm/debug_vm_pgtable.c | 16 +- + mm/execmem.c | 1 + + mm/filemap.c | 50 +- + mm/{swap.c => folio.c} | 68 +- + mm/gup.c | 13 +- + mm/hmm.c | 277 +++++-- + mm/huge_memory.c | 227 +++-- + mm/hugetlb.c | 728 +++++++++------- + mm/hugetlb_cma.c | 140 +++- + mm/hugetlb_cma.h | 8 +- + mm/hugetlb_vmemmap.c | 141 +--- + mm/hugetlb_vmemmap.h | 5 - + mm/internal.h | 598 +++----------- + mm/interval_tree.c | 111 ++- + mm/kasan/hw_tags.c | 2 +- + mm/khugepaged.c | 54 +- + mm/kmemleak.c | 181 +++- + mm/kmsan/hooks.c | 1 + + mm/kmsan/init.c | 2 +- + mm/kmsan/shadow.c | 1 + + mm/ksm.c | 95 ++- + mm/madvise.c | 32 +- + mm/mapping_dirty_helpers.c | 2 +- + mm/memblock.c | 1 + + mm/memcontrol-v1.c | 309 ++++++- + mm/memcontrol-v1.h | 6 - + mm/memcontrol.c | 48 +- + mm/memfd.c | 16 +- + mm/memory-failure.c | 119 ++- + mm/memory.c | 345 +++++--- + mm/memory_hotplug.c | 166 +++- + mm/mempolicy.c | 53 +- + mm/migrate.c | 95 ++- + mm/migrate_device.c | 42 +- + mm/mincore.c | 11 +- + mm/mlock.c | 101 +-- + mm/mm_init.c | 90 +- + mm/mm_init.h | 120 +++ + mm/mm_slot.h | 11 + + mm/mmap.c | 205 +++-- + mm/mmu_notifier.c | 2 +- + mm/mmzone.c | 5 +- + mm/mprotect.c | 117 ++- + mm/mremap.c | 67 +- + mm/msync.c | 4 +- + mm/nommu.c | 68 +- + mm/page-writeback.c | 10 - + mm/page_alloc.c | 407 +++++---- + mm/page_alloc.h | 312 +++++++ + mm/page_frag_cache.c | 6 +- + mm/page_io.c | 588 ++++++------- + mm/page_isolation.c | 1 + + mm/page_owner.c | 303 +++++-- + mm/page_reporting.c | 1 + + mm/page_table_check.c | 8 +- + mm/page_vma_mapped.c | 8 +- + mm/pagewalk.c | 4 +- + mm/percpu-km.c | 9 +- + mm/percpu-vm.c | 49 +- + mm/percpu.c | 20 +- + mm/rmap.c | 477 ++++++----- + mm/shmem.c | 43 +- + mm/show_mem.c | 10 +- + mm/shuffle.c | 1 + + mm/slab.h | 2 +- + mm/slub.c | 17 +- + mm/sparse-vmemmap.c | 28 +- + mm/sparse.c | 53 +- + mm/sparse.h | 63 ++ + mm/swap.h | 75 +- + mm/swap_state.c | 105 ++- + mm/swapfile.c | 42 +- + mm/userfaultfd.c | 403 ++++++++- + mm/util.c | 14 +- + mm/vma.c | 309 ++++--- + mm/vma.h | 88 +- + mm/vma_exec.c | 32 +- + mm/vma_init.c | 6 +- + mm/vma_internal.h | 4 +- + mm/vmalloc.c | 296 +++++-- + mm/vmalloc.h | 46 ++ + mm/vmpressure.c | 301 +------ + mm/vmscan.c | 66 +- + mm/vmstat.c | 9 +- + mm/zsmalloc.c | 230 +++++- + mm/zswap.c | 6 +- + samples/damon/Kconfig | 2 +- + samples/damon/mtier.c | 9 +- + samples/damon/prcl.c | 9 +- + samples/damon/wsse.c | 9 +- + scripts/gdb/linux/page_owner.py | 4 +- + sound/core/memalloc.c | 2 +- + tools/include/linux/gfp_types.h | 7 - + tools/include/uapi/linux/fs.h | 1 + + tools/include/uapi/linux/userfaultfd.h | 54 +- + tools/mm/.gitignore | 1 + + tools/mm/Makefile | 4 +- + tools/mm/page_owner_filter.c | 310 +++++++ + tools/mm/page_owner_sort.c | 87 +- + tools/testing/memblock/internal.h | 20 - + tools/testing/memblock/mm_init.h | 24 + + tools/testing/radix-tree/maple.c | 4 +- + tools/testing/selftests/Makefile | 2 + + tools/testing/selftests/alloc_tag/Makefile | 9 + + .../selftests/alloc_tag/allocinfo_ioctl_test.c | 548 ++++++++++++ + tools/testing/selftests/damon/Makefile | 1 + + tools/testing/selftests/damon/_damon_sysfs.py | 23 +- + .../selftests/damon/damos_apply_interval.py | 2 +- + tools/testing/selftests/damon/damos_quota_goal.py | 2 +- + .../testing/selftests/damon/damos_tried_regions.py | 4 +- + .../selftests/damon/drgn_dump_damon_status.py | 3 +- + tools/testing/selftests/damon/sysfs.py | 35 +- + tools/testing/selftests/damon/sysfs.sh | 79 +- + tools/testing/selftests/damon/sysfs_refresh.py | 75 ++ + ..._update_schemes_tried_regions_wss_estimation.py | 2 +- + tools/testing/selftests/dax/Makefile | 6 + + tools/testing/selftests/dax/config | 4 + + tools/testing/selftests/dax/dax-kmem-hotplug.sh | 317 +++++++ + tools/testing/selftests/dax/settings | 1 + + tools/testing/selftests/mincore/mincore_selftest.c | 12 +- + tools/testing/selftests/mm/Makefile | 6 +- + tools/testing/selftests/mm/hmm-tests.c | 792 ++++++++---------- + tools/testing/selftests/mm/hugepage_settings.c | 2 +- + tools/testing/selftests/mm/hugetlb-vmemmap.c | 132 --- + tools/testing/selftests/mm/hwpoison-panic.sh | 255 ++++++ + .../testing/selftests/mm/ksft_kmemleak_confirm.sh | 132 +++ + tools/testing/selftests/mm/ksm_tests.c | 28 +- + tools/testing/selftests/mm/pkey-helpers.h | 4 +- + tools/testing/selftests/mm/pkey-powerpc.h | 2 +- + tools/testing/selftests/mm/pkey_sighandler_tests.c | 115 +-- + tools/testing/selftests/mm/pkey_util.c | 90 ++ + tools/testing/selftests/mm/protection_keys.c | 99 +-- + tools/testing/selftests/mm/rmap.c | 81 ++ + tools/testing/selftests/mm/run_vmtests.sh | 3 +- + tools/testing/selftests/mm/uffd-common.c | 9 +- + tools/testing/selftests/mm/uffd-unit-tests.c | 919 +++++++++++++++++++++ + tools/testing/selftests/mm/vm_util.c | 26 +- + tools/testing/selftests/mm/vm_util.h | 1 + + tools/testing/shared/linux/kmemleak.h | 1 + + tools/testing/vma/Makefile | 2 +- + tools/testing/vma/include/dup.h | 52 +- + tools/testing/vma/include/stubs.h | 16 +- + tools/testing/vma/shared.c | 9 - + tools/testing/vma/shared.h | 43 +- + tools/testing/vma/tests/merge.c | 40 +- + tools/testing/vma/vma_internal.h | 4 +- + virt/kvm/guest_memfd.c | 2 +- + 350 files changed, 13483 insertions(+), 6450 deletions(-) + delete mode 100644 include/linux/bootmem_info.h + create mode 100644 include/uapi/linux/alloc_tag.h + rename {lib => mm}/alloc_tag.c (73%) + delete mode 100644 mm/bootmem_info.c + rename mm/{swap.c => folio.c} (95%) + create mode 100644 mm/mm_init.h + create mode 100644 mm/page_alloc.h + create mode 100644 mm/sparse.h + create mode 100644 mm/vmalloc.h + create mode 100644 tools/mm/page_owner_filter.c + create mode 100644 tools/testing/memblock/mm_init.h + create mode 100644 tools/testing/selftests/alloc_tag/Makefile + create mode 100644 tools/testing/selftests/alloc_tag/allocinfo_ioctl_test.c + create mode 100755 tools/testing/selftests/damon/sysfs_refresh.py + create mode 100644 tools/testing/selftests/dax/Makefile + create mode 100644 tools/testing/selftests/dax/config + create mode 100755 tools/testing/selftests/dax/dax-kmem-hotplug.sh + create mode 100644 tools/testing/selftests/dax/settings + delete mode 100644 tools/testing/selftests/mm/hugetlb-vmemmap.c + create mode 100755 tools/testing/selftests/mm/hwpoison-panic.sh + create mode 100755 tools/testing/selftests/mm/ksft_kmemleak_confirm.sh +$ git am -3 ../patches/0001-mm-Fix-up-build-for-uninitialised-pte.patch +Applying: mm: Fix up build for uninitialised pte +Using index info to reconstruct a base tree... +M mm/khugepaged.c +Falling back to patching base and 3-way merge... +Auto-merging mm/khugepaged.c +No changes -- Patch already applied. +Merging mm-nonmm-unstable/mm-nonmm-unstable (8ce79abc8a125 tools/accounting: fix macro typos in getdelays) +$ git merge -m Merge branch 'mm-nonmm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable +Auto-merging .mailmap +Auto-merging arch/riscv/include/asm/cacheflush.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/kernel/entry.S +Auto-merging kernel/signal.c +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + .get_maintainer.ignore | 1 + + .mailmap | 1 + + Documentation/accounting/delay-accounting.rst | 45 +++- + arch/riscv/include/asm/cacheflush.h | 15 +- + arch/riscv/include/asm/pgtable.h | 9 +- + arch/riscv/kernel/entry.S | 11 +- + drivers/media/v4l2-core/v4l2-vp9.c | 30 +-- + drivers/pps/clients/pps-gpio.c | 66 ++--- + drivers/pps/kc.c | 10 + + drivers/pps/pps.c | 10 +- + drivers/rapidio/rio-scan.c | 1 + + fs/fat/inode.c | 5 +- + fs/fat/misc.c | 4 + + fs/fat/nfs.c | 4 +- + fs/ocfs2/cluster/heartbeat.c | 134 ++++++---- + fs/ocfs2/cluster/nodemanager.c | 19 +- + fs/ocfs2/cluster/nodemanager.h | 2 + + fs/ocfs2/dir.c | 20 +- + fs/ocfs2/dlm/dlmmaster.c | 6 + + fs/ocfs2/dlm/dlmrecovery.c | 9 + + fs/ocfs2/inode.c | 6 +- + fs/ocfs2/namei.c | 17 +- + fs/ocfs2/refcounttree.c | 27 ++ + fs/ocfs2/xattr.c | 215 +++++++++++++++- + fs/ocfs2/xattr.h | 2 + + fs/ramfs/file-nommu.c | 3 + + include/linux/nmi.h | 4 +- + include/linux/pps_kernel.h | 1 + + include/linux/taskstats_kern.h | 1 - + ipc/ipc_sysctl.c | 2 +- + kernel/fork.c | 2 +- + kernel/params.c | 4 +- + kernel/reboot.c | 169 +++++------- + kernel/resource.c | 2 +- + kernel/signal.c | 51 ++-- + kernel/taskstats.c | 2 +- + 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/raid/Kconfig | 12 + + lib/raid/raid6/Makefile | 2 + + lib/raid/raid6/algos.c | 102 ++++---- + lib/raid/raid6/tests/raid6_kunit.c | 66 ++++- + lib/raid/xor/Makefile | 2 + + lib/raid/xor/tests/Makefile | 2 + + lib/raid/xor/tests/xor_kunit.c | 64 ++++- + lib/raid/xor/xor-core.c | 55 ++-- + lib/random32.c | 184 +------------ + lib/string.c | 3 +- + lib/test_ida.c | 14 + + lib/tests/Makefile | 3 +- + lib/tests/random32_kunit.c | 182 +++++++++++++ + lib/xz/xz_dec_bcj.c | 2 +- + lib/xz/xz_dec_lzma2.c | 63 +++-- + lib/xz/xz_dec_stream.c | 4 +- + lib/xz/xz_lzma2.h | 2 +- + scripts/checkpatch.pl | 6 + + tools/accounting/delaytop.c | 286 ++++++++++++++++++--- + tools/accounting/getdelays.c | 37 +-- + tools/include/linux/compiler.h | 2 +- + tools/testing/selftests/acct/.gitignore | 1 + + tools/testing/selftests/acct/Makefile | 11 + + tools/testing/selftests/acct/cgroupstats.c | 231 +++++++++++++++++ + tools/testing/selftests/acct/netlink_helper.c | 116 +++++++++ + tools/testing/selftests/acct/netlink_helper.h | 44 ++++ + .../selftests/acct/taskstats_fill_stats_tgid.c | 134 +--------- + 69 files changed, 2105 insertions(+), 809 deletions(-) + create mode 100644 lib/math/tests/polynomial_kunit.c + create mode 100644 lib/tests/random32_kunit.c + create mode 100644 tools/testing/selftests/acct/cgroupstats.c + create mode 100644 tools/testing/selftests/acct/netlink_helper.c + create mode 100644 tools/testing/selftests/acct/netlink_helper.h +Merging kbuild/kbuild-for-next (4859c0d5918e2 scripts/tags.sh: Add support for rust source files) +$ git merge -m Merge branch 'kbuild-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild/kbuild-for-next +Auto-merging Makefile +Merge made by the 'ort' strategy. + Makefile | 6 ++++++ + arch/arm64/include/asm/module.lds.h | 13 ------------ + scripts/Makefile.build | 4 ++-- + scripts/headers_install.sh | 1 + + scripts/kconfig/merge_config.sh | 2 +- + scripts/tags.sh | 42 ++++++++++++++++++++++++++++--------- + 6 files changed, 42 insertions(+), 26 deletions(-) +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 (3f7909fa921e3 perf stat: Do not open cgroups for BPF counters) +$ 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/lib/api/fd/array.c | 17 +- + tools/perf/.clang-format | 9 +- + tools/perf/Documentation/perf-test.txt | 6 +- + tools/perf/Documentation/topdown.txt | 4 +- + tools/perf/Makefile.perf | 9 +- + tools/perf/arch/arm/util/cs-etm.c | 10 +- + tools/perf/arch/arm64/util/arm-spe.c | 8 +- + tools/perf/arch/arm64/util/hisi-ptt.c | 2 +- + tools/perf/arch/x86/tests/amd-ibs-period.c | 20 +- + tools/perf/arch/x86/tests/hybrid.c | 22 +- + tools/perf/arch/x86/tests/topdown.c | 4 +- + tools/perf/arch/x86/util/auxtrace.c | 2 +- + tools/perf/arch/x86/util/intel-bts.c | 6 +- + tools/perf/arch/x86/util/intel-pt.c | 9 +- + tools/perf/arch/x86/util/iostat.c | 14 +- + tools/perf/bench/evlist-open-close.c | 29 +- + tools/perf/builtin-annotate.c | 7 +- + tools/perf/builtin-ftrace.c | 14 +- + tools/perf/builtin-inject.c | 9 +- + tools/perf/builtin-kvm.c | 123 +- + tools/perf/builtin-kwork.c | 8 +- + tools/perf/builtin-lock.c | 4 +- + tools/perf/builtin-record.c | 146 +- + tools/perf/builtin-report.c | 6 +- + tools/perf/builtin-sched.c | 61 +- + tools/perf/builtin-script.c | 16 +- + tools/perf/builtin-stat.c | 113 +- + tools/perf/builtin-timechart.c | 212 +- + tools/perf/builtin-top.c | 104 +- + tools/perf/builtin-trace.c | 65 +- + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 80 +- + .../perf/pmu-events/arch/x86/alderlake/cache.json | 36 + + .../arch/x86/alderlake/metricgroups.json | 2 +- + .../pmu-events/arch/x86/alderlake/pipeline.json | 6 +- + .../perf/pmu-events/arch/x86/alderlaken/cache.json | 32 + + .../arch/x86/amdzen5/floating-point.json | 160 +- + .../pmu-events/arch/x86/amdzen5/load-store.json | 8 +- + .../arch/x86/amdzen6/floating-point.json | 34 +- + .../pmu-events/arch/x86/arrowlake/arl-metrics.json | 152 +- + .../perf/pmu-events/arch/x86/arrowlake/cache.json | 30 +- + .../arch/x86/arrowlake/floating-point.json | 45 + + .../perf/pmu-events/arch/x86/arrowlake/memory.json | 18 + + .../arch/x86/arrowlake/metricgroups.json | 2 +- + .../pmu-events/arch/x86/arrowlake/pipeline.json | 131 +- + .../arch/x86/arrowlake/uncore-memory.json | 84 +- + .../arch/x86/clearwaterforest/memory.json | 33 + + .../arch/x86/clearwaterforest/pipeline.json | 19 + + .../x86/clearwaterforest/uncore-interconnect.json | 10 + + .../arch/x86/clearwaterforest/uncore-memory.json | 2 +- + .../pmu-events/arch/x86/emeraldrapids/cache.json | 9 + + .../arch/x86/emeraldrapids/emr-metrics.json | 135 +- + .../arch/x86/emeraldrapids/metricgroups.json | 2 +- + .../perf/pmu-events/arch/x86/grandridge/cache.json | 25 + + .../pmu-events/arch/x86/grandridge/counter.json | 42 - + .../arch/x86/grandridge/floating-point.json | 56 + + .../pmu-events/arch/x86/grandridge/memory.json | 57 + + .../pmu-events/arch/x86/grandridge/pipeline.json | 140 ++ + .../arch/x86/grandridge/uncore-memory.json | 2 +- + .../arch/x86/grandridge/virtual-memory.json | 8 + + .../arch/x86/graniterapids/gnr-metrics.json | 102 +- + .../arch/x86/graniterapids/metricgroups.json | 2 +- + .../arch/x86/graniterapids/pipeline.json | 2 +- + .../x86/graniterapids/uncore-interconnect.json | 10 + + .../arch/x86/graniterapids/uncore-memory.json | 2 +- + .../perf/pmu-events/arch/x86/lunarlake/cache.json | 2 +- + .../pmu-events/arch/x86/lunarlake/lnl-metrics.json | 142 +- + .../arch/x86/lunarlake/metricgroups.json | 2 +- + .../pmu-events/arch/x86/lunarlake/pipeline.json | 29 +- + .../arch/x86/lunarlake/uncore-memory.json | 208 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 25 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 11 +- + .../arch/x86/meteorlake/metricgroups.json | 2 +- + .../arch/x86/meteorlake/mtl-metrics.json | 88 +- + .../pmu-events/arch/x86/meteorlake/pipeline.json | 4 +- + .../arch/x86/meteorlake/uncore-memory.json | 84 +- + tools/perf/pmu-events/arch/x86/novalake/cache.json | 749 ++++++ + .../perf/pmu-events/arch/x86/novalake/counter.json | 17 + + .../arch/x86/novalake/floating-point.json | 452 ++++ + .../pmu-events/arch/x86/novalake/frontend.json | 600 +++++ + .../perf/pmu-events/arch/x86/novalake/memory.json | 299 +++ + tools/perf/pmu-events/arch/x86/novalake/other.json | 144 ++ + .../pmu-events/arch/x86/novalake/pipeline.json | 1976 +++++++++++++++ + .../arch/x86/novalake/uncore-memory.json | 42 + + .../arch/x86/novalake/virtual-memory.json | 338 +++ + .../pmu-events/arch/x86/pantherlake/counter.json | 5 + + .../pmu-events/arch/x86/pantherlake/pipeline.json | 31 +- + .../arch/x86/pantherlake/uncore-interconnect.json | 10 + + .../arch/x86/pantherlake/uncore-memory.json | 221 +- + .../pmu-events/arch/x86/sierraforest/counter.json | 77 - + .../arch/x86/sierraforest/uncore-interconnect.json | 10 + + .../arch/x86/sierraforest/uncore-memory.json | 2 +- + tools/perf/pmu-events/jevents.py | 9 +- + tools/perf/pmu-events/metric.py | 6 +- + tools/perf/python/perf.pyi | 672 ++++++ + tools/perf/python/perf_live.py | 59 + + tools/perf/scripts/python/arm-cs-trace-disasm.py | 9 +- + tools/perf/scripts/python/powerpc-hcalls.py | 137 +- + tools/perf/tests/backward-ring-buffer.c | 26 +- + tools/perf/tests/builtin-test.c | 183 +- + 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/coresight/callchain.sh | 172 ++ + .../shell/coresight/test_arm_coresight_disasm.sh | 4 +- + tools/perf/tests/shell/inject_aslr.sh | 10 +- + tools/perf/tests/shell/jitdump-python.sh | 69 +- + tools/perf/tests/shell/kvm.sh | 71 +- + .../perf/tests/shell/lib/perf_metric_validation.py | 11 +- + tools/perf/tests/shell/lib/perf_record.sh | 58 + + tools/perf/tests/shell/lib/setup_python.sh | 13 + + tools/perf/tests/shell/lock_contention.sh | 33 +- + tools/perf/tests/shell/pipe_test.sh | 4 +- + .../shell/record+zstd_comp_decomp_multi_record.sh | 63 + + tools/perf/tests/shell/record.sh | 216 +- + tools/perf/tests/shell/record_lbr.sh | 50 +- + tools/perf/tests/shell/record_offcpu.sh | 14 +- + tools/perf/tests/shell/stat.sh | 12 + + 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/tests.h | 1 + + tools/perf/tests/time-utils-test.c | 14 +- + tools/perf/tests/tool_pmu.c | 7 +- + tools/perf/tests/topology.c | 4 +- + tools/perf/tests/uncore-event-sorting.c | 6 +- + tools/perf/tests/workloads/Build | 2 + + tools/perf/tests/workloads/callchain.c | 33 + + tools/perf/tests/workloads/noploop.c | 17 +- + tools/perf/tests/workloads/thloop.c | 16 +- + tools/perf/ui/browsers/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/capstone.c | 13 +- + tools/perf/util/cgroup.c | 26 +- + tools/perf/util/compress.h | 6 +- + tools/perf/util/cs-etm.c | 382 +-- + tools/perf/util/data-convert-bt.c | 2 +- + tools/perf/util/data-convert-json.c | 1 + + tools/perf/util/data.c | 27 +- + tools/perf/util/data.h | 4 +- + tools/perf/util/dso.h | 57 +- + tools/perf/util/evlist.c | 494 ++-- + tools/perf/util/evlist.h | 273 ++- + tools/perf/util/evsel.c | 41 +- + 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/kvm-stat-arch/kvm-stat-powerpc.c | 31 +- + tools/perf/util/kvm-stat-arch/kvm-stat-x86.c | 35 +- + tools/perf/util/kvm-stat.c | 41 + + tools/perf/util/kvm-stat.h | 18 +- + tools/perf/util/map.h | 9 +- + tools/perf/util/metricgroup.c | 45 +- + tools/perf/util/metricgroup.h | 4 +- + tools/perf/util/parse-events.c | 40 +- + tools/perf/util/parse-events.h | 17 +- + tools/perf/util/parse-events.y | 2 +- + tools/perf/util/perf_api_probe.c | 20 +- + tools/perf/util/pfm.c | 4 +- + tools/perf/util/pmu.c | 6 +- + tools/perf/util/pmus.c | 2 + + tools/perf/util/print-events.c | 2 +- + tools/perf/util/probe-file.c | 2 + + tools/perf/util/python.c | 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 | 54 +- + 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/symbol-elf.c | 4 + + tools/perf/util/symbol.c | 4 +- + tools/perf/util/symbol.h | 12 + + tools/perf/util/synthetic-events.c | 11 +- + tools/perf/util/time-utils.c | 12 +- + tools/perf/util/top.c | 4 +- + tools/perf/util/zstd.c | 25 +- + 230 files changed, 12863 insertions(+), 2712 deletions(-) + delete mode 100644 tools/perf/pmu-events/arch/x86/grandridge/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/uncore-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/novalake/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/pantherlake/uncore-interconnect.json + delete mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/counter.json + create mode 100644 tools/perf/python/perf.pyi + create mode 100755 tools/perf/python/perf_live.py + create mode 100755 tools/perf/tests/shell/coresight/callchain.sh + create mode 100644 tools/perf/tests/shell/lib/perf_record.sh + create mode 100755 tools/perf/tests/shell/record+zstd_comp_decomp_multi_record.sh + create mode 100644 tools/perf/tests/workloads/callchain.c +Merging compiler-attributes/compiler-attributes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/dma-mapping-for-next (0188616c057d3 dma-direct: Improve readability of the dma_direct_map_sg() for P2PDMA case) +$ git merge -m Merge branch 'dma-mapping-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next +Auto-merging kernel/dma/coherent.c +Auto-merging kernel/dma/direct.c +Merge made by the 'ort' strategy. + drivers/iommu/dma-iommu.c | 69 +++++++++++++++++++---------------------------- + kernel/dma/coherent.c | 10 +++---- + kernel/dma/direct.c | 3 +-- + 3 files changed, 34 insertions(+), 48 deletions(-) +Merging asm-generic/master (adbbd9714f805 scripts: headers_install.sh: Remove config leak ignore machinery) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic asm-generic/master +Already up to date. +Merging alpha/alpha-next (d58041d2c63e0 MAINTAINERS: Add Magnus Lindholm as maintainer for alpha port) +$ git merge -m Merge branch 'alpha-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next +Already up to date. +Merging arm/for-next (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 (a13c140cc289c Linux 7.2-rc3) +$ 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 (900d72f1052c1 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/Kconfig | 80 +++++++++++++---------- + arch/arm/Kconfig.platforms | 2 +- + arch/arm/arm-soc-for-next-contents.txt | 36 ++++++++++ + arch/arm/boot/dts/st/spear1340-evb.dts | 2 +- + arch/arm/boot/dts/st/spear13xx.dtsi | 4 -- + arch/arm/boot/dts/st/spear320.dtsi | 2 +- + arch/arm/boot/dts/st/ste-dbx5x0.dtsi | 2 +- + arch/arm/boot/dts/st/ste-href.dtsi | 2 +- + arch/arm/boot/dts/st/ste-snowball.dts | 2 +- + arch/arm/boot/dts/st/ste-ux500-samsung-gavini.dts | 2 +- + arch/arm/boot/dts/st/ste-ux500-samsung-janice.dts | 2 +- + arch/arm/boot/dts/st/ste-ux500-samsung-kyle.dts | 2 +- + arch/arm/boot/dts/st/ste-ux500-samsung-skomer.dts | 2 +- + arch/arm/configs/am200epdkit_defconfig | 3 +- + arch/arm/configs/aspeed_g4_defconfig | 2 - + arch/arm/configs/aspeed_g5_defconfig | 1 - + arch/arm/configs/assabet_defconfig | 3 + + arch/arm/configs/at91_dt_defconfig | 2 - + arch/arm/configs/axm55xx_defconfig | 2 - + arch/arm/configs/bcm2835_defconfig | 1 - + arch/arm/configs/clps711x_defconfig | 1 - + arch/arm/configs/collie_defconfig | 2 +- + arch/arm/configs/davinci_all_defconfig | 1 - + arch/arm/configs/dove_defconfig | 2 +- + arch/arm/configs/ep93xx_defconfig | 1 - + arch/arm/configs/footbridge_defconfig | 2 + + arch/arm/configs/gemini_defconfig | 1 - + arch/arm/configs/h3600_defconfig | 3 +- + arch/arm/configs/hisi_defconfig | 1 - + arch/arm/configs/imx_v4_v5_defconfig | 1 - + arch/arm/configs/integrator_defconfig | 2 - + arch/arm/configs/ixp4xx_defconfig | 1 - + arch/arm/configs/jornada720_defconfig | 3 +- + arch/arm/configs/keystone_defconfig | 1 - + arch/arm/configs/lpc32xx_defconfig | 1 - + arch/arm/configs/mmp2_defconfig | 1 - + arch/arm/configs/moxart_defconfig | 2 - + arch/arm/configs/mps2_defconfig | 1 - + arch/arm/configs/multi_v4t_defconfig | 2 - + arch/arm/configs/multi_v5_defconfig | 10 --- + arch/arm/configs/mv78xx0_defconfig | 3 +- + arch/arm/configs/mvebu_v5_defconfig | 10 --- + arch/arm/configs/mxs_defconfig | 1 - + arch/arm/configs/neponset_defconfig | 3 + + arch/arm/configs/netwinder_defconfig | 3 + + arch/arm/configs/nhk8815_defconfig | 1 - + arch/arm/configs/omap1_defconfig | 3 +- + arch/arm/configs/orion5x_defconfig | 11 ---- + arch/arm/configs/pxa168_defconfig | 2 - + arch/arm/configs/pxa3xx_defconfig | 2 - + arch/arm/configs/pxa910_defconfig | 2 - + arch/arm/configs/pxa_defconfig | 5 -- + arch/arm/configs/rpc_defconfig | 3 + + arch/arm/configs/s3c6400_defconfig | 2 + + arch/arm/configs/sama5_defconfig | 1 - + arch/arm/configs/sama7_defconfig | 1 - + arch/arm/configs/spear13xx_defconfig | 1 - + arch/arm/configs/spitz_defconfig | 2 +- + arch/arm/configs/stm32_defconfig | 1 - + arch/arm/configs/versatile_defconfig | 2 - + arch/arm/configs/vt8500_v6_v7_defconfig | 1 - + arch/arm/configs/wpcm450_defconfig | 2 - + arch/arm/mach-at91/Kconfig | 4 +- + arch/arm/mach-axxia/Kconfig | 4 +- + arch/arm/mach-dove/Kconfig | 8 ++- + arch/arm/mach-footbridge/Kconfig | 7 +- + arch/arm/mach-imx/Kconfig | 13 +++- + arch/arm/mach-mv78xx0/Kconfig | 4 +- + arch/arm/mach-omap2/Kconfig | 18 +++-- + arch/arm/mach-orion5x/Kconfig | 47 ++++++++++--- + arch/arm/mach-pxa/Kconfig | 10 ++- + arch/arm/mach-rpc/Kconfig | 5 +- + arch/arm/mach-s3c/Kconfig.s3c64xx | 15 +++-- + arch/arm/mach-sa1100/Kconfig | 5 +- + arch/arm/mach-stm32/Kconfig | 14 ++-- + arch/arm/mach-versatile/Kconfig | 15 +++-- + arch/arm/mm/Kconfig | 29 +++++++- + 77 files changed, 270 insertions(+), 183 deletions(-) + 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 (297f9bd201933 Merge branch 'apple-soc/drivers-7.3' into asahi-soc/for-next) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/soc/apple/apple,t6000-pmgr-misc.yaml | 45 +++++ + MAINTAINERS | 1 + + arch/arm64/boot/dts/apple/t600x-die0.dtsi | 7 + + arch/arm64/boot/dts/apple/t602x-die0.dtsi | 7 + + arch/arm64/boot/dts/apple/t8122.dtsi | 30 ++-- + drivers/soc/apple/Kconfig | 10 ++ + drivers/soc/apple/Makefile | 2 + + drivers/soc/apple/apple-pmgr-misc.c | 181 +++++++++++++++++++++ + drivers/soc/apple/sart.c | 9 +- + 9 files changed, 275 insertions(+), 17 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/apple/apple,t6000-pmgr-misc.yaml + create mode 100644 drivers/soc/apple/apple-pmgr-misc.c +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 (8111c7f3723f4 memory: tegra: Guard against NULL mc_regs in IRQ handler) +$ 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 +Auto-merging drivers/memory/tegra/tegra186-emc.c +CONFLICT (content): Merge conflict in drivers/memory/tegra/tegra186-emc.c +Resolved 'drivers/memory/tegra/tegra186-emc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0dffd3ba933bc] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git +$ git diff -M --stat --summary HEAD^.. + drivers/memory/stm32_omm.c | 2 +- + drivers/memory/tegra/mc.c | 48 ++++++++++++++++++++----- + drivers/memory/tegra/mc.h | 37 +++++++++++++++++++ + drivers/memory/tegra/tegra186-emc.c | 71 ++++++++++++++++++++++++++++--------- + 4 files changed, 132 insertions(+), 26 deletions(-) +Merging fsl/soc_fsl (3300a285c2852 soc: fsl: qe_ports_ic: Use generic I/O helper instead of specific powerPC ones) +$ git merge -m Merge branch 'soc_fsl' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git fsl/soc_fsl +Merge made by the 'ort' strategy. + drivers/soc/fsl/qe/qe_ports_ic.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) +Merging imx-mxs/for-next (d089adef10f38 Merge branch 'imx/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 24 + + .../devicetree/bindings/input/fsl,scu-key.yaml | 4 +- + .../bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml | 39 + + arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi | 2 + + arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi | 10 + + arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi | 10 + + arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi | 2 + + .../boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi | 10 + + arch/arm/boot/dts/nxp/imx/imx7d-pico.dtsi | 23 + + arch/arm/boot/dts/nxp/ls/ls1021a-twr.dts | 2 +- + 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 | 24 + + .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 3 + + .../boot/dts/freescale/imx8mm-emtop-baseboard.dts | 301 +++-- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 2 + + .../boot/dts/freescale/imx8mm-var-dart-sonata.dts | 516 +++++++++ + arch/arm64/boot/dts/freescale/imx8mm-var-dart.dtsi | 558 ++++++++++ + .../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 | 97 +- + arch/arm64/boot/dts/freescale/imx8mp-frdm.dts | 2 + + .../dts/freescale/imx8mp-nitrogen-smarc-som.dtsi | 82 +- + ...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-dart-sonata.dts | 733 ++++++++++++ + arch/arm64/boot/dts/freescale/imx8mp-var-dart.dtsi | 475 ++++++++ + .../boot/dts/freescale/imx8mp-var-som-symphony.dts | 389 ++++++- + arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 84 ++ + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 23 + + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 3 + + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 7 + + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 3 + + arch/arm64/boot/dts/freescale/imx91-9x9-qsb.dts | 160 +++ + .../dts/freescale/imx91-tqma9131-mba91xxca.dts | 4 + + arch/arm64/boot/dts/freescale/imx91-tqma9131.dtsi | 4 +- + .../boot/dts/freescale/imx91-var-dart-sonata.dts | 14 +- + .../freescale/imx93-11x11-evk-dy1212w-4856.dtso | 81 ++ + .../boot/dts/freescale/imx93-kontron-osm-s.dtsi | 4 +- + .../dts/freescale/imx93-tqma9352-mba93xxca.dts | 21 + + .../imx93-tqma9352-mba93xxla-lvds-tm070jvhg33.dtso | 38 + + .../freescale/imx93-tqma9352-mba93xxla-mini.dts | 45 + + .../dts/freescale/imx93-tqma9352-mba93xxla.dts | 21 + + .../boot/dts/freescale/imx93-var-dart-sonata.dts | 14 +- + arch/arm64/boot/dts/freescale/imx93.dtsi | 39 +- + arch/arm64/boot/dts/freescale/imx94.dtsi | 16 +- + arch/arm64/boot/dts/freescale/imx943-evk.dts | 14 +- + arch/arm64/boot/dts/freescale/imx943.dtsi | 16 +- + arch/arm64/boot/dts/freescale/imx95-15x15-evk.dts | 4 +- + arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts | 8 +- + .../boot/dts/freescale/imx95-toradex-smarc.dtsi | 1 + + .../boot/dts/freescale/imx95-var-dart-sonata.dts | 3 - + arch/arm64/boot/dts/freescale/imx95-var-dart.dtsi | 10 + + arch/arm64/boot/dts/freescale/imx95.dtsi | 62 +- + arch/arm64/boot/dts/freescale/s32g2.dtsi | 21 +- + arch/arm64/boot/dts/freescale/s32g3.dtsi | 53 +- + drivers/firmware/imx/sm-misc.c | 3 + + drivers/soc/imx/soc-imx9.c | 9 + + 68 files changed, 5595 insertions(+), 293 deletions(-) + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-var-dart-sonata.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-var-dart.dtsi + 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/imx8mp-var-dart-sonata.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-var-dart.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-11x11-evk-dy1212w-4856.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla-lvds-tm070jvhg33.dtso +Merging mediatek/for-next (b1ccec7cca558 Merge branch 'v7.2-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. + .../bindings/soc/mediatek/mediatek,mutex.yaml | 17 +- + arch/arm/boot/dts/mediatek/mt8127.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt6795.dtsi | 4 +- + .../boot/dts/mediatek/mt8183-kukui-kodama.dtsi | 6 +- + .../dts/mediatek/mt8183-kukui-krane-sku176.dts | 4 +- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 + + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 22 ++ + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 132 +++++---- + arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi | 1 + + arch/arm64/boot/dts/mediatek/mt8188.dtsi | 33 +++ + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 17 ++ + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 37 +++ + .../boot/dts/mediatek/mt8390-genio-common.dtsi | 2 +- + .../boot/dts/mediatek/mt8390-tungsten-smarc.dtsi | 4 - + drivers/soc/mediatek/mt8167-mmsys.h | 21 +- + drivers/soc/mediatek/mt8173-mmsys.h | 28 +- + drivers/soc/mediatek/mt8183-mmsys.h | 14 +- + drivers/soc/mediatek/mt8186-mmsys.h | 22 +- + drivers/soc/mediatek/mt8188-mmsys.h | 78 +++--- + drivers/soc/mediatek/mt8192-mmsys.h | 20 +- + drivers/soc/mediatek/mt8195-mmsys.h | 181 ++++++------- + drivers/soc/mediatek/mt8365-mmsys.h | 20 +- + drivers/soc/mediatek/mtk-dvfsrc.c | 1 + + drivers/soc/mediatek/mtk-mmsys.h | 300 +++++++++------------ + drivers/soc/mediatek/mtk-socinfo.c | 7 +- + 25 files changed, 531 insertions(+), 444 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 (ba251bb5ce2db Merge branch 'omap-for-v7.3/drivers' into tmp/omap-next-20260706.114259) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. + 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 | 15 +- + 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/dm8148-evm.dts | 4 +- + arch/arm/boot/dts/ti/omap/dm814x.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/dm816x-clocks.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/dm816x.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/dra7-l4.dtsi | 4 +- + .../boot/dts/ti/omap/motorola-mapphone-common.dtsi | 10 +- + arch/arm/boot/dts/ti/omap/omap2430.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap3-cm-t3x30.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap3-n950-n9.dtsi | 2 +- + .../boot/dts/ti/omap/omap3-overo-common-lcd35.dtsi | 2 +- + .../boot/dts/ti/omap/omap3-overo-common-lcd43.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap3.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts | 13 +- + 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 | 13 ++ + arch/arm/mach-omap2/omap_hwmod.c | 26 ++-- + arch/arm/mach-omap2/sleep44xx.S | 5 +- + drivers/bus/ti-sysc.c | 12 +- + 36 files changed, 472 insertions(+), 56 deletions(-) + create mode 100644 arch/arm/boot/dts/ti/omap/am335x-icev2-prueth-overlay.dtso +Merging qcom/for-next (5bdb10dafd3fd Merge branches 'arm32-for-7.3', 'arm64-defconfig-for-7.3', 'arm64-fixes-for-7.2', 'arm64-for-7.3', 'clk-fixes-for-7.2', 'clk-for-7.3' and 'drivers-for-7.3' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/clk/qcom/camcc-sc8280xp.c +Auto-merging drivers/clk/qcom/camcc-x1p42100.c +Auto-merging drivers/clk/qcom/dispcc-eliza.c +Auto-merging drivers/clk/qcom/gcc-glymur.c +Auto-merging drivers/clk/qcom/gcc-qcs8300.c +Auto-merging drivers/clk/qcom/gxclkctl-kaanapali.c +Auto-merging drivers/clk/qcom/videocc-x1p42100.c +Auto-merging drivers/gpu/drm/msm/adreno/a5xx_gpu.c +Auto-merging drivers/soc/qcom/qcom_pd_mapper.c +Merge made by the 'ort' strategy. + .../bindings/arm/qcom,coresight-ctcu.yaml | 4 + + Documentation/devicetree/bindings/arm/qcom.yaml | 533 +-- + .../devicetree/bindings/cache/qcom,llcc.yaml | 63 +- + .../bindings/clock/qcom,gcc-msm8953.yaml | 2 - + .../bindings/clock/qcom,glymur-evacc.yaml | 72 + + .../devicetree/bindings/clock/qcom,glymur-gcc.yaml | 8 + + .../bindings/clock/qcom,ipq9574-gcc.yaml | 1 - + .../bindings/clock/qcom,ipq9574-nsscc.yaml | 1 - + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 65 +- + .../devicetree/bindings/clock/qcom,shikra-gcc.yaml | 70 + + .../bindings/clock/qcom,sm8450-camcc.yaml | 12 +- + .../bindings/clock/qcom,sm8450-videocc.yaml | 15 +- + .../bindings/clock/qcom,x1e80100-camcc.yaml | 3 + + .../bindings/clock/samsung,exynosautov9-clock.yaml | 2 +- + .../devicetree/bindings/firmware/qcom,scm.yaml | 9 + + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + + .../bindings/soc/qcom/qcom,pmic-glink.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 1 + + Documentation/devicetree/bindings/sram/sram.yaml | 3 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + MAINTAINERS | 9 + + arch/arm/boot/dts/qcom/Makefile | 2 + + arch/arm/boot/dts/qcom/msm8226-motorola-titan.dts | 350 ++ + .../dts/qcom/msm8926-sony-xperia-yukon-eagle.dts | 407 ++ + arch/arm/boot/dts/qcom/pm8921.dtsi | 12 + + arch/arm/boot/dts/qcom/qcom-apq8064-pins.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi | 4 +- + arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 2 +- + .../dts/qcom/qcom-msm8960-samsung-expressatt.dts | 54 + + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-msm8974pro-htc-m8.dts | 94 +- + arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts | 2 - + .../boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts | 2 - + arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 3 + + arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts | 2 +- + arch/arm64/boot/dts/qcom/Makefile | 19 +- + arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtso | 2 +- + arch/arm64/boot/dts/qcom/eliza-cqs-evk.dts | 14 + + arch/arm64/boot/dts/qcom/eliza-cqs-som.dtsi | 399 ++ + arch/arm64/boot/dts/qcom/eliza-evk.dtsi | 20 + + arch/arm64/boot/dts/qcom/eliza-mtp.dts | 44 + + arch/arm64/boot/dts/qcom/eliza.dtsi | 100 +- + arch/arm64/boot/dts/qcom/glymur-crd.dts | 399 -- + arch/arm64/boot/dts/qcom/glymur-crd.dtsi | 546 ++- + arch/arm64/boot/dts/qcom/glymur.dtsi | 871 +++- + arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts | 16 + + arch/arm64/boot/dts/qcom/hamoa.dtsi | 267 +- + arch/arm64/boot/dts/qcom/ipq5018.dtsi | 15 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp-common.dtsi | 24 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts | 16 +- + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 53 +- + arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts | 12 +- + arch/arm64/boot/dts/qcom/ipq5424.dtsi | 24 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 10 + + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 34 +- + arch/arm64/boot/dts/qcom/kaanapali-mtp.dts | 58 +- + arch/arm64/boot/dts/qcom/kaanapali-qrd.dts | 58 +- + arch/arm64/boot/dts/qcom/kaanapali.dtsi | 190 +- + arch/arm64/boot/dts/qcom/kodiak.dtsi | 36 +- + arch/arm64/boot/dts/qcom/lemans-auto.dtsi | 104 - + arch/arm64/boot/dts/qcom/lemans-evk-camera.dtso | 2 +- + arch/arm64/boot/dts/qcom/lemans-evk.dts | 251 +- + arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi | 4 +- + arch/arm64/boot/dts/qcom/lemans.dtsi | 55 +- + arch/arm64/boot/dts/qcom/milos-fairphone-fp6.dts | 29 +- + .../boot/dts/qcom/milos-nothing-asteroids.dts | 38 - + arch/arm64/boot/dts/qcom/milos.dtsi | 282 +- + arch/arm64/boot/dts/qcom/monaco-arduino-monza.dts | 120 +- + arch/arm64/boot/dts/qcom/monaco.dtsi | 86 +- + .../arm64/boot/dts/qcom/msm8953-flipkart-rimob.dts | 138 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 41 + + arch/arm64/boot/dts/qcom/pm4125.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm7550-eliza.dtsi | 61 + + arch/arm64/boot/dts/qcom/pm8010-kaanapali.dtsi | 20 + + arch/arm64/boot/dts/qcom/pm8010.dtsi | 20 + + arch/arm64/boot/dts/qcom/pm8550vs-d-eliza.dtsi | 63 + + arch/arm64/boot/dts/qcom/pm8550vs-g-eliza.dtsi | 63 + + arch/arm64/boot/dts/qcom/pmk8550-eliza.dtsi | 87 + + arch/arm64/boot/dts/qcom/pmr735d-eliza.dtsi | 63 + + arch/arm64/boot/dts/qcom/purwa-iot-som.dtsi | 4 + + arch/arm64/boot/dts/qcom/purwa.dtsi | 52 + + arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 64 +- + .../boot/dts/qcom/qcm6490-particle-tachyon.dts | 16 +- + arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts | 7 +- + arch/arm64/boot/dts/qcom/qcs615-ride.dts | 6 +- + .../boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts | 20 +- + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 7 +- + .../dts/qcom/qcs6490-thundercomm-minipc-g1iot.dts | 18 +- + .../boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts | 20 +- + .../boot/dts/qcom/qcs6490-vicharak-axon-mini.dts | 1014 +++++ + arch/arm64/boot/dts/qcom/qcs8550-rb5gen2.dts | 1573 +++++++ + arch/arm64/boot/dts/qcom/qdu1000.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qrb2210-arduino-imola.dts | 4 +- + .../dts/qcom/qrb2210-rb1-vision-mezzanine.dtso | 4 +- + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 4 +- + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 6 + + arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 32 +- + arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 16 +- + arch/arm64/boot/dts/qcom/sa8775p-ride-r3.dts | 17 - + arch/arm64/boot/dts/qcom/sa8775p-ride.dts | 17 - + arch/arm64/boot/dts/qcom/sar2130p.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 5 + + arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- + .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 2 + + arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 5 + + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 5 +- + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 57 +- + arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 56 +- + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 22 +- + .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 16 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 38 +- + .../boot/dts/qcom/sc8280xp-microsoft-arcata.dts | 301 +- + .../boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 25 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 347 +- + arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi | 5 + + arch/arm64/boot/dts/qcom/sdm670.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 3 - + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 2 - + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 +- + .../boot/dts/qcom/sdm845-samsung-starqltechn.dts | 2 - + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 2 - + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 2 - + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 2 - + arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +- + .../dts/qcom/sdm850-huawei-matebook-e-2019.dts | 2 - + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 6 +- + arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 3 +- + arch/arm64/boot/dts/qcom/sdx75.dtsi | 2 +- + arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts | 40 + + arch/arm64/boot/dts/qcom/shikra-cqm-som.dtsi | 156 + + arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts | 40 + + arch/arm64/boot/dts/qcom/shikra-evk.dtsi | 14 + + arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts | 40 + + arch/arm64/boot/dts/qcom/shikra-iqs-som.dtsi | 170 + + arch/arm64/boot/dts/qcom/shikra.dtsi | 842 ++++ + arch/arm64/boot/dts/qcom/sm4450.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 65 + + .../boot/dts/qcom/sm6125-xiaomi-ginkgo-common.dtsi | 64 +- + .../boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 168 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 19 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 5 +- + .../dts/qcom/sm7325-motorola-dubai-common.dtsi | 1454 +++++++ + .../boot/dts/qcom/sm7325-motorola-dubai-csot.dts | 13 + + .../boot/dts/qcom/sm7325-motorola-dubai-tianma.dts | 13 + + arch/arm64/boot/dts/qcom/sm7325-motorola-dubai.dts | 3 - + .../boot/dts/qcom/sm7325-nothing-spacewar.dts | 2 - + arch/arm64/boot/dts/qcom/sm7325-xiaomi-taoyao.dts | 913 ++++ + arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- + .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 153 + + arch/arm64/boot/dts/qcom/sm8250.dtsi | 57 +- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 11 +- + .../dts/qcom/sm8350-microsoft-surface-duo2.dts | 2 - + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 2 - + .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 3 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 86 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 38 +- + 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 | 28 +- + arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 3 +- + arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 3 +- + arch/arm64/boot/dts/qcom/sm8650.dtsi | 131 +- + arch/arm64/boot/dts/qcom/sm8750.dtsi | 266 +- + arch/arm64/boot/dts/qcom/talos-evk-som.dtsi | 8 + + arch/arm64/boot/dts/qcom/talos.dtsi | 140 +- + arch/arm64/boot/dts/qcom/x1-crd.dtsi | 16 + + arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 2 + + .../dts/qcom/x1e80100-honor-magicbook-art-14.dts | 1341 ++++++ + .../boot/dts/qcom/x1p42100-microsoft-sp12in.dts | 1194 ++++++ + arch/arm64/configs/defconfig | 3 + + drivers/bus/qcom-ebi2.c | 44 +- + drivers/clk/qcom/Kconfig | 232 +- + drivers/clk/qcom/Makefile | 4 + + drivers/clk/qcom/camcc-glymur.c | 2280 ++++++++++ + drivers/clk/qcom/camcc-sc8280xp.c | 19 - + drivers/clk/qcom/camcc-x1p42100.c | 6 +- + drivers/clk/qcom/clk-regmap-phy-mux.c | 58 +- + drivers/clk/qcom/clk-smd-rpm.c | 5 + + drivers/clk/qcom/common.c | 2 +- + drivers/clk/qcom/dispcc-eliza.c | 2 +- + drivers/clk/qcom/evacc-glymur.c | 455 ++ + drivers/clk/qcom/gcc-glymur.c | 33 +- + drivers/clk/qcom/gcc-ipq5424.c | 11 - + drivers/clk/qcom/gcc-ipq9650.c | 89 + + drivers/clk/qcom/gcc-qcs8300.c | 8 +- + drivers/clk/qcom/gcc-shikra.c | 4431 ++++++++++++++++++++ + drivers/clk/qcom/gcc-sm6115.c | 1 + + drivers/clk/qcom/gdsc.c | 47 +- + drivers/clk/qcom/gdsc.h | 1 + + drivers/clk/qcom/gxclkctl-kaanapali.c | 12 +- + drivers/clk/qcom/videocc-hawi.c | 840 ++++ + drivers/clk/qcom/videocc-x1p42100.c | 4 +- + drivers/cpuidle/Kconfig.arm | 4 +- + drivers/firmware/qcom/Kconfig | 22 +- + drivers/firmware/qcom/Makefile | 3 + + drivers/firmware/qcom/qcom_pas.c | 298 ++ + drivers/firmware/qcom/qcom_pas.h | 50 + + drivers/firmware/qcom/qcom_pas_tee.c | 479 +++ + drivers/firmware/qcom/qcom_scm-smc.c | 10 + + drivers/firmware/qcom/qcom_scm.c | 456 +- + drivers/firmware/qcom/qcom_scm_trace.h | 143 + + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 4 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 11 +- + drivers/net/ipa/Kconfig | 2 +- + drivers/net/ipa/ipa_main.c | 13 +- + drivers/soc/qcom/Kconfig | 120 +- + drivers/soc/qcom/cmd-db.c | 2 +- + drivers/soc/qcom/ice.c | 4 +- + drivers/soc/qcom/llcc-qcom.c | 29 + + drivers/soc/qcom/qcom_pd_mapper.c | 38 + + drivers/soc/qcom/qcom_stats.c | 2 + + drivers/soc/qcom/rpmh-rsc.c | 37 +- + drivers/soc/qcom/socinfo.c | 1 + + drivers/soc/qcom/ubwc_config.c | 370 +- + include/dt-bindings/arm/qcom,ids.h | 1 + + include/dt-bindings/clock/qcom,glymur-camcc.h | 122 + + include/dt-bindings/clock/qcom,glymur-evacc.h | 38 + + include/dt-bindings/clock/qcom,hawi-videocc.h | 64 + + include/dt-bindings/clock/qcom,ipq9650-gcc.h | 5 + + include/dt-bindings/clock/qcom,shikra-gcc.h | 263 ++ + include/linux/firmware/qcom/qcom_pas.h | 43 + + include/linux/soc/qcom/ubwc.h | 83 +- + 228 files changed, 26761 insertions(+), 2478 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,glymur-evacc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,shikra-gcc.yaml + create mode 100644 arch/arm/boot/dts/qcom/msm8226-motorola-titan.dts + create mode 100644 arch/arm/boot/dts/qcom/msm8926-sony-xperia-yukon-eagle.dts + create mode 100644 arch/arm64/boot/dts/qcom/eliza-cqs-evk.dts + create mode 100644 arch/arm64/boot/dts/qcom/eliza-cqs-som.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/eliza-evk.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/lemans-auto.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm7550-eliza.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8550vs-d-eliza.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8550vs-g-eliza.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmk8550-eliza.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmr735d-eliza.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcs6490-vicharak-axon-mini.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-rb5gen2.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sa8775p-ride-r3.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sa8775p-ride.dts + create mode 100644 arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts + create mode 100644 arch/arm64/boot/dts/qcom/shikra-cqm-som.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts + create mode 100644 arch/arm64/boot/dts/qcom/shikra-evk.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts + create mode 100644 arch/arm64/boot/dts/qcom/shikra-iqs-som.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/shikra.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm7325-motorola-dubai-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm7325-motorola-dubai-csot.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm7325-motorola-dubai-tianma.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm7325-xiaomi-taoyao.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-honor-magicbook-art-14.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1p42100-microsoft-sp12in.dts + create mode 100644 drivers/clk/qcom/camcc-glymur.c + create mode 100644 drivers/clk/qcom/evacc-glymur.c + create mode 100644 drivers/clk/qcom/gcc-shikra.c + create mode 100644 drivers/clk/qcom/videocc-hawi.c + create mode 100644 drivers/firmware/qcom/qcom_pas.c + create mode 100644 drivers/firmware/qcom/qcom_pas.h + create mode 100644 drivers/firmware/qcom/qcom_pas_tee.c + create mode 100644 drivers/firmware/qcom/qcom_scm_trace.h + create mode 100644 include/dt-bindings/clock/qcom,glymur-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,glymur-evacc.h + create mode 100644 include/dt-bindings/clock/qcom,hawi-videocc.h + create mode 100644 include/dt-bindings/clock/qcom,shikra-gcc.h + create mode 100644 include/linux/firmware/qcom/qcom_pas.h +$ git reset --hard HEAD^ +HEAD is now at e2e42cfb943a1 Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git +Merging next-20260716 version of qcom +$ git merge -m next-20260716/qcom 64a28053710d050b72f8f8aaa9e75654fac0f2d5 +Auto-merging MAINTAINERS +Auto-merging drivers/clk/qcom/camcc-sc8280xp.c +Auto-merging drivers/clk/qcom/camcc-x1p42100.c +Auto-merging drivers/clk/qcom/dispcc-eliza.c +Auto-merging drivers/clk/qcom/gcc-glymur.c +Auto-merging drivers/clk/qcom/gcc-qcs8300.c +Auto-merging drivers/clk/qcom/gxclkctl-kaanapali.c +Auto-merging drivers/clk/qcom/videocc-x1p42100.c +Auto-merging drivers/gpu/drm/msm/adreno/a5xx_gpu.c +Auto-merging drivers/soc/qcom/qcom_pd_mapper.c +Merge made by the 'ort' strategy. + .../bindings/arm/qcom,coresight-ctcu.yaml | 4 + + Documentation/devicetree/bindings/arm/qcom.yaml | 533 +-- + .../devicetree/bindings/cache/qcom,llcc.yaml | 63 +- + .../bindings/clock/qcom,gcc-msm8953.yaml | 2 - + .../bindings/clock/qcom,glymur-evacc.yaml | 72 + + .../bindings/clock/qcom,ipq9574-gcc.yaml | 1 - + .../bindings/clock/qcom,ipq9574-nsscc.yaml | 1 - + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 65 +- + .../devicetree/bindings/clock/qcom,shikra-gcc.yaml | 70 + + .../bindings/clock/qcom,sm8450-camcc.yaml | 12 +- + .../bindings/clock/qcom,sm8450-videocc.yaml | 15 +- + .../bindings/clock/qcom,x1e80100-camcc.yaml | 3 + + .../bindings/clock/samsung,exynosautov9-clock.yaml | 2 +- + .../devicetree/bindings/firmware/qcom,scm.yaml | 9 + + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + + .../bindings/soc/qcom/qcom,pmic-glink.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 1 + + Documentation/devicetree/bindings/sram/sram.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + MAINTAINERS | 9 + + arch/arm/boot/dts/qcom/Makefile | 2 + + arch/arm/boot/dts/qcom/msm8226-motorola-titan.dts | 350 ++ + .../dts/qcom/msm8926-sony-xperia-yukon-eagle.dts | 407 ++ + arch/arm/boot/dts/qcom/pm8921.dtsi | 12 + + arch/arm/boot/dts/qcom/qcom-apq8064-pins.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi | 4 +- + arch/arm/boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 2 +- + .../dts/qcom/qcom-msm8960-samsung-expressatt.dts | 54 + + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-msm8974pro-htc-m8.dts | 94 +- + arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts | 2 - + .../boot/dts/qcom/qcom-sdx55-telit-fn980-tlb.dts | 2 - + arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 3 + + arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts | 2 +- + arch/arm64/boot/dts/qcom/Makefile | 19 +- + arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtso | 2 +- + arch/arm64/boot/dts/qcom/eliza-cqs-evk.dts | 14 + + arch/arm64/boot/dts/qcom/eliza-cqs-som.dtsi | 399 ++ + arch/arm64/boot/dts/qcom/eliza-evk.dtsi | 20 + + arch/arm64/boot/dts/qcom/eliza-mtp.dts | 44 + + arch/arm64/boot/dts/qcom/eliza.dtsi | 100 +- + arch/arm64/boot/dts/qcom/glymur-crd.dts | 399 -- + arch/arm64/boot/dts/qcom/glymur-crd.dtsi | 546 ++- + arch/arm64/boot/dts/qcom/glymur.dtsi | 871 +++- + arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts | 16 + + arch/arm64/boot/dts/qcom/hamoa.dtsi | 284 +- + arch/arm64/boot/dts/qcom/ipq5018.dtsi | 15 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp-common.dtsi | 24 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts | 16 +- + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 53 +- + arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts | 12 +- + arch/arm64/boot/dts/qcom/ipq5424.dtsi | 24 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 10 + + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 34 +- + arch/arm64/boot/dts/qcom/kaanapali-mtp.dts | 58 +- + arch/arm64/boot/dts/qcom/kaanapali-qrd.dts | 58 +- + arch/arm64/boot/dts/qcom/kaanapali.dtsi | 190 +- + arch/arm64/boot/dts/qcom/kodiak.dtsi | 36 +- + arch/arm64/boot/dts/qcom/lemans-auto.dtsi | 104 - + arch/arm64/boot/dts/qcom/lemans-evk-camera.dtso | 2 +- + arch/arm64/boot/dts/qcom/lemans-evk.dts | 251 +- + arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi | 4 +- + arch/arm64/boot/dts/qcom/lemans.dtsi | 55 +- + arch/arm64/boot/dts/qcom/milos-fairphone-fp6.dts | 29 +- + .../boot/dts/qcom/milos-nothing-asteroids.dts | 38 - + arch/arm64/boot/dts/qcom/milos.dtsi | 282 +- + arch/arm64/boot/dts/qcom/monaco-arduino-monza.dts | 120 +- + arch/arm64/boot/dts/qcom/monaco.dtsi | 86 +- + .../arm64/boot/dts/qcom/msm8953-flipkart-rimob.dts | 138 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 41 + + arch/arm64/boot/dts/qcom/pm4125.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm7550-eliza.dtsi | 61 + + arch/arm64/boot/dts/qcom/pm8010-kaanapali.dtsi | 20 + + arch/arm64/boot/dts/qcom/pm8010.dtsi | 20 + + arch/arm64/boot/dts/qcom/pm8550vs-d-eliza.dtsi | 63 + + arch/arm64/boot/dts/qcom/pm8550vs-g-eliza.dtsi | 63 + + arch/arm64/boot/dts/qcom/pmk8550-eliza.dtsi | 87 + + arch/arm64/boot/dts/qcom/pmr735d-eliza.dtsi | 63 + + arch/arm64/boot/dts/qcom/purwa-iot-som.dtsi | 4 + + arch/arm64/boot/dts/qcom/purwa.dtsi | 62 + + arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 64 +- + .../boot/dts/qcom/qcm6490-particle-tachyon.dts | 16 +- + arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts | 7 +- + arch/arm64/boot/dts/qcom/qcs615-ride.dts | 6 +- + .../boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts | 20 +- + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 7 +- + .../dts/qcom/qcs6490-thundercomm-minipc-g1iot.dts | 18 +- + .../boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts | 20 +- + .../boot/dts/qcom/qcs6490-vicharak-axon-mini.dts | 1014 +++++ + arch/arm64/boot/dts/qcom/qcs8550-rb5gen2.dts | 1573 +++++++ + arch/arm64/boot/dts/qcom/qdu1000.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qrb2210-arduino-imola.dts | 4 +- + .../dts/qcom/qrb2210-rb1-vision-mezzanine.dtso | 4 +- + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 4 +- + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 6 + + arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 32 +- + arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 16 +- + arch/arm64/boot/dts/qcom/sa8775p-ride-r3.dts | 17 - + arch/arm64/boot/dts/qcom/sa8775p-ride.dts | 17 - + arch/arm64/boot/dts/qcom/sar2130p.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 5 + + arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +- + .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 2 + + arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 5 + + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 5 +- + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 57 +- + arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 56 +- + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 22 +- + .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 16 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 38 +- + .../boot/dts/qcom/sc8280xp-microsoft-arcata.dts | 301 +- + .../boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 25 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 347 +- + arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi | 5 + + arch/arm64/boot/dts/qcom/sdm670.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 3 - + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 2 - + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 4 +- + .../boot/dts/qcom/sdm845-samsung-starqltechn.dts | 2 - + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 2 - + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 2 - + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 2 - + arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +- + .../dts/qcom/sdm850-huawei-matebook-e-2019.dts | 2 - + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 6 +- + arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 3 +- + arch/arm64/boot/dts/qcom/sdx75.dtsi | 2 +- + arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts | 40 + + arch/arm64/boot/dts/qcom/shikra-cqm-som.dtsi | 156 + + arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts | 40 + + arch/arm64/boot/dts/qcom/shikra-evk.dtsi | 14 + + arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts | 40 + + arch/arm64/boot/dts/qcom/shikra-iqs-som.dtsi | 170 + + arch/arm64/boot/dts/qcom/shikra.dtsi | 842 ++++ + arch/arm64/boot/dts/qcom/sm4450.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 65 + + .../boot/dts/qcom/sm6125-xiaomi-ginkgo-common.dtsi | 64 +- + .../boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 168 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 19 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 5 +- + .../dts/qcom/sm7325-motorola-dubai-common.dtsi | 1454 +++++++ + .../boot/dts/qcom/sm7325-motorola-dubai-csot.dts | 13 + + .../boot/dts/qcom/sm7325-motorola-dubai-tianma.dts | 13 + + arch/arm64/boot/dts/qcom/sm7325-motorola-dubai.dts | 3 - + .../boot/dts/qcom/sm7325-nothing-spacewar.dts | 2 - + arch/arm64/boot/dts/qcom/sm7325-xiaomi-taoyao.dts | 913 ++++ + arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- + .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 153 + + arch/arm64/boot/dts/qcom/sm8250.dtsi | 57 +- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 11 +- + .../dts/qcom/sm8350-microsoft-surface-duo2.dts | 2 - + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 2 - + .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 3 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 86 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 38 +- + 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 | 28 +- + arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 3 +- + arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 3 +- + arch/arm64/boot/dts/qcom/sm8650.dtsi | 131 +- + arch/arm64/boot/dts/qcom/sm8750.dtsi | 266 +- + arch/arm64/boot/dts/qcom/talos-evk-som.dtsi | 8 + + arch/arm64/boot/dts/qcom/talos.dtsi | 140 +- + arch/arm64/boot/dts/qcom/x1-crd.dtsi | 16 + + arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 2 + + .../dts/qcom/x1e80100-honor-magicbook-art-14.dts | 1341 ++++++ + .../boot/dts/qcom/x1p42100-microsoft-sp12in.dts | 1194 ++++++ + arch/arm64/configs/defconfig | 3 + + drivers/bus/qcom-ebi2.c | 44 +- + drivers/clk/qcom/Kconfig | 232 +- + drivers/clk/qcom/Makefile | 4 + + drivers/clk/qcom/camcc-glymur.c | 2280 ++++++++++ + drivers/clk/qcom/camcc-sc8280xp.c | 19 - + drivers/clk/qcom/camcc-x1p42100.c | 6 +- + drivers/clk/qcom/clk-regmap-phy-mux.c | 58 +- + drivers/clk/qcom/clk-smd-rpm.c | 5 + + drivers/clk/qcom/common.c | 2 +- + drivers/clk/qcom/dispcc-eliza.c | 2 +- + drivers/clk/qcom/evacc-glymur.c | 455 ++ + drivers/clk/qcom/gcc-glymur.c | 32 +- + drivers/clk/qcom/gcc-ipq5424.c | 11 - + drivers/clk/qcom/gcc-ipq9650.c | 89 + + drivers/clk/qcom/gcc-qcs8300.c | 8 +- + drivers/clk/qcom/gcc-shikra.c | 4431 ++++++++++++++++++++ + drivers/clk/qcom/gcc-sm6115.c | 1 + + drivers/clk/qcom/gdsc.c | 47 +- + drivers/clk/qcom/gdsc.h | 1 + + drivers/clk/qcom/gxclkctl-kaanapali.c | 12 +- + drivers/clk/qcom/videocc-hawi.c | 840 ++++ + drivers/clk/qcom/videocc-x1p42100.c | 4 +- + drivers/cpuidle/Kconfig.arm | 4 +- + drivers/firmware/qcom/Kconfig | 22 +- + drivers/firmware/qcom/Makefile | 3 + + drivers/firmware/qcom/qcom_pas.c | 298 ++ + drivers/firmware/qcom/qcom_pas.h | 50 + + drivers/firmware/qcom/qcom_pas_tee.c | 479 +++ + drivers/firmware/qcom/qcom_scm-smc.c | 10 + + drivers/firmware/qcom/qcom_scm.c | 456 +- + drivers/firmware/qcom/qcom_scm_trace.h | 143 + + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 4 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 11 +- + drivers/soc/qcom/Kconfig | 120 +- + drivers/soc/qcom/cmd-db.c | 2 +- + drivers/soc/qcom/ice.c | 4 +- + drivers/soc/qcom/llcc-qcom.c | 29 + + drivers/soc/qcom/qcom_pd_mapper.c | 38 + + drivers/soc/qcom/qcom_stats.c | 2 + + drivers/soc/qcom/rpmh-rsc.c | 37 +- + drivers/soc/qcom/socinfo.c | 1 + + drivers/soc/qcom/ubwc_config.c | 370 +- + include/dt-bindings/arm/qcom,ids.h | 1 + + include/dt-bindings/clock/qcom,glymur-camcc.h | 122 + + include/dt-bindings/clock/qcom,glymur-evacc.h | 38 + + include/dt-bindings/clock/qcom,hawi-videocc.h | 64 + + include/dt-bindings/clock/qcom,ipq9650-gcc.h | 5 + + include/dt-bindings/clock/qcom,shikra-gcc.h | 263 ++ + include/linux/firmware/qcom/qcom_pas.h | 43 + + include/linux/soc/qcom/ubwc.h | 83 +- + 225 files changed, 26769 insertions(+), 2472 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,glymur-evacc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,shikra-gcc.yaml + create mode 100644 arch/arm/boot/dts/qcom/msm8226-motorola-titan.dts + create mode 100644 arch/arm/boot/dts/qcom/msm8926-sony-xperia-yukon-eagle.dts + create mode 100644 arch/arm64/boot/dts/qcom/eliza-cqs-evk.dts + create mode 100644 arch/arm64/boot/dts/qcom/eliza-cqs-som.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/eliza-evk.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/lemans-auto.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm7550-eliza.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8550vs-d-eliza.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8550vs-g-eliza.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmk8550-eliza.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmr735d-eliza.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcs6490-vicharak-axon-mini.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-rb5gen2.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sa8775p-ride-r3.dts + delete mode 100644 arch/arm64/boot/dts/qcom/sa8775p-ride.dts + create mode 100644 arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts + create mode 100644 arch/arm64/boot/dts/qcom/shikra-cqm-som.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts + create mode 100644 arch/arm64/boot/dts/qcom/shikra-evk.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts + create mode 100644 arch/arm64/boot/dts/qcom/shikra-iqs-som.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/shikra.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm7325-motorola-dubai-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm7325-motorola-dubai-csot.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm7325-motorola-dubai-tianma.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm7325-xiaomi-taoyao.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-honor-magicbook-art-14.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1p42100-microsoft-sp12in.dts + create mode 100644 drivers/clk/qcom/camcc-glymur.c + create mode 100644 drivers/clk/qcom/evacc-glymur.c + create mode 100644 drivers/clk/qcom/gcc-shikra.c + create mode 100644 drivers/clk/qcom/videocc-hawi.c + create mode 100644 drivers/firmware/qcom/qcom_pas.c + create mode 100644 drivers/firmware/qcom/qcom_pas.h + create mode 100644 drivers/firmware/qcom/qcom_pas_tee.c + create mode 100644 drivers/firmware/qcom/qcom_scm_trace.h + create mode 100644 include/dt-bindings/clock/qcom,glymur-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,glymur-evacc.h + create mode 100644 include/dt-bindings/clock/qcom,hawi-videocc.h + create mode 100644 include/dt-bindings/clock/qcom,shikra-gcc.h + create mode 100644 include/linux/firmware/qcom/qcom_pas.h +Merging realtek/for-next (3c778f0c9fa36 arm64: dts: realtek: Add GPIO support for RTD1625) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git realtek/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/realtek/kent.dtsi | 41 +++++++++++++++++++++++++++++++- + arch/arm64/boot/dts/realtek/rtd16xx.dtsi | 3 ++- + 2 files changed, 42 insertions(+), 2 deletions(-) +Merging renesas/next (f9592c355314c Merge branches 'renesas-arm-soc-for-v7.3', 'renesas-drivers-for-v7.3' and 'renesas-dts-for-v7.3' into renesas-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. + 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 | 525 ++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 114 ++++- + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 22 +- + arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 160 ++++++- + .../boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts | 18 + + .../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 + + drivers/soc/renesas/Kconfig | 1 - + 31 files changed, 1430 insertions(+), 122 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 (70d6721bd79c8 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 +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 29 + + .../devicetree/bindings/arm/rockchip/pmu.yaml | 8 +- + .../devicetree/bindings/soc/rockchip/grf.yaml | 7 +- + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + arch/arm/boot/dts/rockchip/Makefile | 1 + + arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 5 + + .../dts/rockchip/rv1126-alientek-clrv1126f.dtsi | 291 +++++ + .../boot/dts/rockchip/rv1126-alientek-dlrv1126.dts | 256 +++++ + arch/arm/boot/dts/rockchip/rv1126-pinctrl.dtsi | 10 + + arch/arm/boot/dts/rockchip/rv1126.dtsi | 15 + + arch/arm64/boot/dts/rockchip/Makefile | 5 + + arch/arm64/boot/dts/rockchip/px30-cobra.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/px30-pp1516.dtsi | 2 +- + .../rockchip/px30-ringneck-haikou-video-demo.dtso | 10 +- + arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 2 +- + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 18 - + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 2 +- + .../boot/dts/rockchip/rk3528-hinlink-h28k.dts | 318 ++++++ + .../boot/dts/rockchip/rk3568-9tripod-x3568-v4.dts | 60 +- + .../dts/rockchip/rk3568-graperain-g3568-v2.dts | 943 ++++++++++++++++ + .../boot/dts/rockchip/rk3576-lckfb-tspi-3m.dts | 1003 +++++++++++++++++ + 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 +- + .../rockchip/rk3588-friendlyelec-cm3588-nas.dts | 31 + + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 14 +- + .../boot/dts/rockchip/rk3588-youyeetoo-yy3588.dts | 1190 ++++++++++++++++++++ + .../boot/dts/rockchip/rk3588s-orangepi-5-5b.dtsi | 256 +++++ + .../boot/dts/rockchip/rk3588s-orangepi-5-pro.dts | 358 ++++++ + .../arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 6 +- + .../boot/dts/rockchip/rk3588s-orangepi-5.dtsi | 263 +---- + .../boot/dts/rockchip/rk3588s-orangepi-5b.dts | 2 +- + .../boot/dts/rockchip/rk3588s-radxa-cm5-io.dts | 19 + + arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts | 29 +- + drivers/clk/rockchip/clk-rk3588.c | 10 +- + 35 files changed, 4898 insertions(+), 309 deletions(-) + create mode 100644 arch/arm/boot/dts/rockchip/rv1126-alientek-clrv1126f.dtsi + create mode 100644 arch/arm/boot/dts/rockchip/rv1126-alientek-dlrv1126.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3528-hinlink-h28k.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-graperain-g3568-v2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-lckfb-tspi-3m.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-youyeetoo-yy3588.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-5b.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5-pro.dts +Merging samsung-krzk/for-next (4a7924bcff476 Merge branches 'next/clk' and 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/clk/samsung/clk-exynos990.c +Merge made by the 'ort' strategy. + .../bindings/arm/samsung/samsung-boards.yaml | 6 + + .../bindings/soc/samsung/exynos-pmu.yaml | 27 +- + .../soc/samsung/samsung,exynos-sysreg.yaml | 1 + + MAINTAINERS | 7 + + arch/arm/boot/dts/samsung/exynos5250-manta.dts | 41 +- + arch/arm/mach-s3c/map-base.h | 2 +- + arch/arm64/boot/dts/exynos/Makefile | 1 + + arch/arm64/boot/dts/exynos/exynos8855-pinctrl.dtsi | 574 +++++++++++++++++++++ + arch/arm64/boot/dts/exynos/exynos8855-smdk.dts | 31 ++ + arch/arm64/boot/dts/exynos/exynos8855.dtsi | 204 ++++++++ + arch/arm64/boot/dts/exynos/exynosautov920.dtsi | 6 + + drivers/clk/samsung/clk-exynos990.c | 24 +- + drivers/soc/samsung/exynos-pmu.c | 4 +- + include/dt-bindings/clock/samsung,exynos990.h | 1 + + include/linux/serial_s3c.h | 4 +- + 15 files changed, 914 insertions(+), 19 deletions(-) + create mode 100644 arch/arm64/boot/dts/exynos/exynos8855-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos8855-smdk.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos8855.dtsi +Merging scmi/for-linux-next (f6ce093c482b9 Merge branch 'for-next/scmi/updates' 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_scmi/bus.c | 115 +++++++++++++++---------- + drivers/firmware/arm_scmi/common.h | 2 + + drivers/firmware/arm_scmi/driver.c | 81 ++++++++++------- + drivers/firmware/arm_scmi/notify.c | 64 ++++++++------ + drivers/firmware/arm_scmi/notify.h | 1 + + drivers/firmware/arm_scmi/transports/mailbox.c | 26 ++++-- + drivers/firmware/arm_scmi/transports/smc.c | 15 ++-- + 7 files changed, 190 insertions(+), 114 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 (ab092591e4d9d Merge branch 'spacemit-dt-for-next' into spacemit-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux spacemit/for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts | 35 +++++++- + arch/riscv/boot/dts/spacemit/k1-opp.dtsi | 105 ++++++++++++++++++++++++ + arch/riscv/boot/dts/spacemit/k1-pdma.h | 56 +++++++++++++ + arch/riscv/boot/dts/spacemit/k1.dtsi | 12 ++- + arch/riscv/boot/dts/spacemit/k3-com260-ifx.dts | 18 ++++ + arch/riscv/boot/dts/spacemit/k3-pico-itx.dts | 99 +++++++++++++++++++++- + arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi | 76 +++++++++++++++++ + arch/riscv/boot/dts/spacemit/k3.dtsi | 30 +++++++ + drivers/clk/spacemit/ccu-k3.c | 10 ++- + drivers/cpufreq/cpufreq-dt-platdev.c | 2 + + include/dt-bindings/clock/spacemit,k3-clocks.h | 1 + + 11 files changed, 437 insertions(+), 7 deletions(-) + create mode 100644 arch/riscv/boot/dts/spacemit/k1-opp.dtsi + create mode 100644 arch/riscv/boot/dts/spacemit/k1-pdma.h +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 (36078904c9908 Merge branches 'sunxi/clk-for-7.3', '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 +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 7 + + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 1 + + .../bindings/rtc/allwinner,sun6i-a31-rtc.yaml | 13 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/allwinner/Makefile | 5 + + .../boot/dts/allwinner/sun8i-h3-nanopi-duo2.dts | 4 +- + .../allwinner/sun8i-t113s-netcube-dobermann.dts | 149 ++++++++++++++++ + 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 + + arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 6 + + drivers/clk/sunxi-ng/ccu-sun6i-rtc.c | 38 ++-- + drivers/clk/sunxi-ng/ccu_common.c | 12 +- + drivers/clk/sunxi-ng/ccu_common.h | 1 + + drivers/clk/sunxi-ng/ccu_mux.c | 1 - + include/dt-bindings/clock/sun6i-rtc.h | 4 + + 18 files changed, 564 insertions(+), 36 deletions(-) + create mode 100644 arch/arm/boot/dts/allwinner/sun8i-t113s-netcube-dobermann.dts + 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 +Merge made by the 'ort' strategy. + drivers/tee/optee/ffa_abi.c | 3 +++ + drivers/tee/qcomtee/call.c | 7 ++++++- + 2 files changed, 9 insertions(+), 1 deletion(-) +Merging tegra/for-next (f98a7877ab4a8 Merge branch for-7.3/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + .../bindings/gpu/host1x/nvidia,tegra210-nvdec.yaml | 2 +- + .../bindings/gpu/host1x/nvidia,tegra210-nvenc.yaml | 2 +- + .../bindings/gpu/host1x/nvidia,tegra210-nvjpg.yaml | 2 +- + .../bindings/gpu/host1x/nvidia,tegra234-nvdec.yaml | 2 +- + .../bindings/iommu/nvidia,tegra264-cmdqv.yaml | 2 +- + arch/arm64/boot/dts/nvidia/tegra264-p3834.dtsi | 4 + + arch/arm64/boot/dts/nvidia/tegra264.dtsi | 613 +++++++++++++++++---- + drivers/soc/tegra/pmc.c | 21 +- + 8 files changed, 537 insertions(+), 111 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 (fd52109054693 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 (50a8e96a15137 dt-bindings: xilinx: Remove EDK/Ethernet references) +$ git merge -m Merge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/xilinx.txt | 98 +--------------------- + 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 - + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 37 ++++---- + .../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 - + 14 files changed, 19 insertions(+), 136 deletions(-) +Merging socfpga/for-next (39ea7cb401924 ARM: dts: intel: arria10: Correct indentation) +$ 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 +++++- + .../boot/dts/intel/socfpga/socfpga_arria10.dtsi | 2 +- + 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 ++++ + 8 files changed, 342 insertions(+), 10 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 (8cdeaa50eae8d Linux 7.2-rc2) +$ 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 (2df26b8663b6f clk: r9a08g045: Add clocks and resets for CAN-FD) +$ 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/r9a08g045-cpg.c | 9 + + drivers/clk/renesas/r9a08g046-cpg.c | 130 +++++++ + drivers/clk/renesas/r9a09g047-cpg.c | 123 ++++++- + drivers/clk/renesas/r9a09g077-cpg.c | 375 ++++++++++++++++++++- + drivers/clk/renesas/renesas-cpg-mssr.c | 20 +- + drivers/clk/renesas/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 +- + 15 files changed, 913 insertions(+), 223 deletions(-) + create mode 100644 drivers/clk/renesas/rzv2h-cpg-lib.c +Merging thead-clk/thead-clk-for-next (b2ee00d0bf4cc clk: thead: allow COMPILE_TEST builds) +$ git merge -m Merge branch 'thead-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk/thead-clk-for-next +Merge made by the 'ort' strategy. + drivers/clk/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (8227805754a68 platform/loongarch: laptop: Stop setting acpi_device_class()) +$ git merge -m Merge branch 'loongarch-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Merge made by the 'ort' strategy. + arch/loongarch/include/asm/asmmacro.h | 2 +- + arch/loongarch/kernel/acpi.c | 27 ++++++++++++++++++++++++++- + arch/loongarch/kernel/machine_kexec.c | 5 ++++- + arch/loongarch/kernel/rethook_trampoline.S | 18 +++++++++--------- + arch/loongarch/kernel/smp.c | 4 ++-- + arch/loongarch/net/bpf_jit.c | 8 ++++---- + drivers/platform/loongarch/loongson-laptop.c | 3 --- + 7 files changed, 46 insertions(+), 21 deletions(-) +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 (d13e97dad5664 m68k/coldfire: replace linux/gpio.h inclusions) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/coldfire/device.c | 2 +- + arch/m68k/configs/m5235evb_defconfig | 52 ++++++++++++++++++++++++++++++++++++ + arch/m68k/configs/m5282evb_defconfig | 51 +++++++++++++++++++++++++++++++++++ + arch/m68k/include/asm/mcfgpio.h | 2 +- + 4 files changed, 105 insertions(+), 2 deletions(-) + create mode 100644 arch/m68k/configs/m5235evb_defconfig + create mode 100644 arch/m68k/configs/m5282evb_defconfig +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 (27c61f8565a43 MIPS: BCM47XX: Convert buttons to software nodes) +$ git merge -m Merge branch 'mips-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Merge made by the 'ort' strategy. + arch/mips/bcm47xx/buttons.c | 444 ++++++++++++++++++++-------------- + arch/mips/include/asm/gio_device.h | 1 - + arch/mips/include/asm/txx9/generic.h | 9 +- + arch/mips/include/asm/txx9/tx4938.h | 1 - + arch/mips/include/asm/txx9pio.h | 3 +- + arch/mips/kernel/gpio_txx9.c | 5 +- + arch/mips/kernel/proc.c | 4 +- + arch/mips/txx9/Kconfig | 1 - + arch/mips/txx9/generic/setup.c | 45 ++-- + arch/mips/txx9/generic/setup_tx4938.c | 6 - + arch/mips/txx9/rbtx4927/setup.c | 41 +++- + drivers/bcma/driver_gpio.c | 43 +++- + drivers/ssb/driver_gpio.c | 48 +++- + include/linux/bcma/bcma.h | 2 + + include/linux/ssb/ssb.h | 2 + + 15 files changed, 393 insertions(+), 262 deletions(-) +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 (8cdeaa50eae8d Linux 7.2-rc2) +$ 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 (1d8304bdd65f7 riscv: cfi: reduce shadow stack size limit from 2GB to 512MB) +$ 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 +Auto-merging arch/riscv/include/asm/pgtable.h +Resolved 'arch/riscv/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6fef84fd898e3] 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/include/asm/pgtable.h | 15 ++++++++++++-- + arch/riscv/include/asm/tlbflush.h | 23 +++++++++++++++++++++ + arch/riscv/kernel/acpi.c | 5 +++++ + arch/riscv/kernel/efi.c | 5 +++++ + arch/riscv/kernel/probes/decode-insn.c | 2 +- + arch/riscv/kernel/probes/simulate-insn.c | 7 +++++++ + arch/riscv/kernel/probes/simulate-insn.h | 1 + + arch/riscv/kernel/reset.c | 7 +++++++ + arch/riscv/kernel/setup.c | 2 ++ + arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S | 24 ++++++++++++++++++++++ + arch/riscv/kernel/usercfi.c | 4 ++-- + arch/riscv/kernel/vdso/Makefile | 7 ++----- + arch/riscv/mm/tlbflush.c | 23 --------------------- + drivers/acpi/tables.c | 1 + + 16 files changed, 96 insertions(+), 33 deletions(-) +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 (8cdeaa50eae8d Linux 7.2-rc2) +$ git merge -m Merge branch 'riscv-soc-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Already up to date. +Merging s390/for-next (8b313d717bcf4 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging MAINTAINERS +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/include/asm/hugetlb.h +Merge made by the 'ort' strategy. + MAINTAINERS | 8 +++ + arch/s390/Kconfig | 5 ++ + arch/s390/configs/debug_defconfig | 2 + + arch/s390/configs/defconfig | 2 + + arch/s390/include/asm/hugetlb.h | 4 +- + arch/s390/include/asm/processor.h | 4 -- + arch/s390/include/asm/thread_info.h | 1 + + arch/s390/kernel/idle.c | 1 - + arch/s390/kernel/irq.c | 4 -- + arch/s390/kernel/smp.c | 1 - + arch/s390/kernel/traps.c | 41 ++++++++++++- + arch/s390/mm/hugetlbpage.c | 10 ++-- + drivers/cpuidle/Kconfig | 5 ++ + drivers/cpuidle/Kconfig.s390 | 11 ++++ + drivers/cpuidle/Makefile | 4 ++ + drivers/cpuidle/cpuidle-s390.c | 115 ++++++++++++++++++++++++++++++++++++ + include/linux/tick.h | 3 - + kernel/time/tick-sched.c | 7 +-- + 18 files changed, 204 insertions(+), 24 deletions(-) + create mode 100644 drivers/cpuidle/Kconfig.s390 + create mode 100644 drivers/cpuidle/cpuidle-s390.c +Merging sh/for-next (b0aa5e4b087b6 sh: Fix fallout from ZERO_PAGE consolidation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (5b2a3b1a98fb4 sparc: Remove remaining defconfig references to the pktcdvd driver) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (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 (070f41f072722 Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging Documentation/filesystems/locking.rst +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging MAINTAINERS +Auto-merging drivers/target/target_core_pr.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/ocfs2/namei.c +Auto-merging include/linux/sched.h +Auto-merging kernel/fork.c +Auto-merging mm/shmem.c +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 2 +- + Documentation/filesystems/overlayfs.rst | 16 + + Documentation/filesystems/porting.rst | 10 +- + Documentation/filesystems/vfs.rst | 2 +- + Documentation/sunrpc/xdr/nfs4_1.x | 258 +++++- + MAINTAINERS | 10 +- + block/bdev.c | 125 ++- + 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/backref.c | 5 +- + fs/btrfs/btrfs_inode.h | 2 + + fs/btrfs/dev-replace.c | 65 +- + fs/btrfs/extent_io.c | 4 +- + fs/btrfs/extent_map.c | 4 +- + fs/btrfs/inode.c | 7 +- + fs/btrfs/ioctl.c | 5 +- + fs/btrfs/relocation.c | 55 +- + fs/btrfs/subpage.c | 26 +- + 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/exfat_fs.h | 2 +- + fs/exfat/file.c | 222 ++++- + 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/data.c | 5 +- + fs/f2fs/debug.c | 4 - + fs/f2fs/f2fs.h | 29 +- + fs/f2fs/file.c | 28 +- + fs/f2fs/gc.c | 36 +- + fs/f2fs/gc.h | 27 +- + fs/f2fs/namei.c | 4 +- + fs/f2fs/segment.c | 9 +- + fs/f2fs/super.c | 12 +- + fs/f2fs/sysfs.c | 22 +- + 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/isofs/compress.c | 6 +- + fs/jffs2/dir.c | 6 +- + fs/jfs/namei.c | 4 +- + fs/kernel_read_file.c | 9 +- + fs/lockd/lockd.h | 2 +- + fs/lockd/svc.c | 4 +- + fs/lockd/svc4proc.c | 4 +- + fs/lockd/svclock.c | 42 +- + fs/lockd/svcproc.c | 4 +- + fs/lockd/svcsubs.c | 107 ++- + 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 | 265 ++++-- + fs/nfsd/filecache.h | 3 + + fs/nfsd/flexfilelayoutxdr.c | 20 +- + fs/nfsd/localio.c | 8 +- + fs/nfsd/lockd.c | 6 +- + fs/nfsd/netns.h | 29 +- + fs/nfsd/nfs2acl.c | 21 +- + fs/nfsd/nfs3acl.c | 17 +- + fs/nfsd/nfs3proc.c | 40 + + fs/nfsd/nfs4callback.c | 207 ++++- + fs/nfsd/nfs4layouts.c | 45 +- + fs/nfsd/nfs4proc.c | 114 ++- + fs/nfsd/nfs4recover.c | 48 +- + fs/nfsd/nfs4state.c | 944 +++++++++++++++++---- + fs/nfsd/nfs4xdr.c | 392 ++++++++- + fs/nfsd/nfs4xdr_gen.c | 600 ++++++++++++- + fs/nfsd/nfs4xdr_gen.h | 17 +- + fs/nfsd/nfscache.c | 4 +- + fs/nfsd/nfsctl.c | 156 +++- + fs/nfsd/nfsd.h | 9 +- + fs/nfsd/nfsfh.c | 42 +- + fs/nfsd/nfsfh.h | 3 + + fs/nfsd/nfsproc.c | 7 + + fs/nfsd/nfssvc.c | 61 +- + fs/nfsd/nfsxdr.c | 32 +- + fs/nfsd/state.h | 88 +- + fs/nfsd/trace.h | 42 +- + fs/nfsd/vfs.c | 48 +- + fs/nfsd/xdr4.h | 5 + + fs/nfsd/xdr4cb.h | 12 + + fs/nilfs2/namei.c | 4 +- + fs/notify/fanotify/fanotify.c | 1 + + fs/ntfs/attrib.c | 15 + + fs/ntfs/compress.c | 102 +-- + fs/ntfs/dir.c | 5 +- + fs/ntfs/ea.c | 85 +- + fs/ntfs/file.c | 71 +- + fs/ntfs/inode.c | 6 +- + fs/ntfs/inode.h | 2 +- + fs/ntfs/iomap.c | 34 +- + fs/ntfs/mft.c | 3 +- + fs/ntfs/namei.c | 7 +- + fs/ntfs/reparse.c | 6 +- + fs/ntfs/runlist.c | 50 +- + fs/ntfs3/dir.c | 36 +- + fs/ntfs3/file.c | 2 +- + fs/ntfs3/frecord.c | 31 +- + fs/ntfs3/fslog.c | 21 +- + fs/ntfs3/fsntfs.c | 8 +- + fs/ntfs3/index.c | 7 +- + fs/ntfs3/inode.c | 18 +- + fs/ntfs3/lznt.c | 4 +- + fs/ntfs3/namei.c | 13 +- + fs/ntfs3/ntfs_fs.h | 6 +- + fs/ntfs3/run.c | 9 +- + fs/ntfs3/super.c | 9 +- + fs/ntfs3/xattr.c | 1 - + 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 | 10 +- + fs/smb/client/cifsfs.h | 2 +- + fs/smb/client/dir.c | 2 +- + fs/smb/client/inode.c | 7 + + fs/smb/server/compress.c | 3 +- + fs/smb/server/connection.c | 16 +- + fs/smb/server/ksmbd_netlink.h | 1 + + fs/smb/server/mgmt/share_config.c | 4 +- + fs/smb/server/mgmt/user_session.c | 25 +- + fs/smb/server/mgmt/user_session.h | 2 +- + fs/smb/server/oplock.c | 6 +- + fs/smb/server/smb2misc.c | 5 + + fs/smb/server/smb2pdu.c | 228 ++++- + fs/smb/server/smbacl.c | 147 +++- + fs/smb/server/smbacl.h | 3 +- + fs/smb/server/vfs.c | 17 +- + fs/super.c | 639 +++++++++----- + fs/ubifs/dir.c | 4 +- + fs/udf/balloc.c | 12 +- + fs/udf/inode.c | 26 +- + fs/udf/namei.c | 4 +- + fs/udf/partition.c | 2 +- + fs/udf/super.c | 23 +- + fs/udf/truncate.c | 2 +- + fs/udf/udfdecl.h | 3 +- + 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/lockd/bind.h | 12 +- + include/linux/net.h | 1 + + include/linux/nfs4.h | 127 --- + include/linux/sched.h | 1 + + include/linux/sched/task.h | 1 + + include/linux/sunrpc/bc_xprt.h | 5 + + include/linux/sunrpc/svc.h | 1 + + include/linux/sunrpc/svc_rdma_pcl.h | 4 +- + include/linux/sunrpc/xdrgen/nfs4_1.h | 290 ++++++- + include/linux/types.h | 2 + + include/uapi/asm-generic/errno.h | 2 +- + include/uapi/linux/btrfs.h | 2 +- + include/uapi/linux/efs_fs_sb.h | 63 -- + include/uapi/linux/fscrypt.h | 1 - + include/uapi/linux/nfs4.h | 2 - + 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 | 81 +- + 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 +- + .../filesystems/statmount/statmount_test.c | 5 +- + tools/testing/selftests/filesystems/ustat_test.c | 135 +++ + tools/testing/selftests/proc/proc-pidns.c | 1 + + 286 files changed, 9511 insertions(+), 3386 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 (703a9d76a45dd Merge branch 'for-7.3-console-registration-cleanup' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. + kernel/printk/printk.c | 30 +++++++++++++++++------------- + lib/tests/test_ratelimit.c | 29 +++++++++++++++++++---------- + lib/vsprintf.c | 4 ++++ + 3 files changed, 40 insertions(+), 23 deletions(-) +Merging pci/next (41d034327abe1 Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/pci/controller/dwc/pci-meson.c +Auto-merging drivers/pci/controller/dwc/pcie-spacemit-k1.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-pci | 2 +- + Documentation/arch/arm64/silicon-errata.rst | 1 + + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 25 +++ + .../bindings/pci/mediatek-pcie-gen3.yaml | 2 + + .../devicetree/bindings/pci/qcom,hawi-pcie.yaml | 201 ++++++++++++++++++ + .../devicetree/bindings/pci/qcom,pcie-ipq9574.yaml | 15 ++ + .../bindings/pci/renesas,r9a08g045-pcie.yaml | 34 ++- + MAINTAINERS | 1 + + arch/alpha/kernel/pci-sysfs.c | 6 +- + arch/arm64/Kconfig | 9 + + arch/powerpc/kernel/pci-common.c | 9 +- + drivers/irqchip/irq-gic-v3-its.c | 24 ++- + drivers/pci/controller/Kconfig | 2 +- + drivers/pci/controller/cadence/pcie-cadence-plat.c | 1 + + drivers/pci/controller/dwc/Kconfig | 6 +- + drivers/pci/controller/dwc/pci-imx6.c | 63 +++--- + drivers/pci/controller/dwc/pci-keystone.c | 6 +- + drivers/pci/controller/dwc/pci-meson.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 10 +- + drivers/pci/controller/dwc/pcie-qcom.c | 38 ++++ + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 118 ++++++++++- + drivers/pci/controller/dwc/pcie-spacemit-k1.c | 1 + + drivers/pci/controller/pci-host-common.c | 29 +-- + drivers/pci/controller/pci-xgene.c | 5 +- + drivers/pci/controller/pcie-mediatek.c | 154 ++++++++++++++ + drivers/pci/controller/pcie-rzg3s-host.c | 233 +++++++++++++++++++-- + drivers/pci/hotplug/acpiphp_ibm.c | 3 +- + drivers/pci/pci-sysfs.c | 38 +++- + drivers/pci/pcie/portdrv.c | 2 +- + 29 files changed, 928 insertions(+), 112 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/hid-core.c | 7 + + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-nintendo.c | 1 - + 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 +- + 8 files changed, 516 insertions(+), 134 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 (c844ed7266c9d Merge branch 'i2c/i2c-fixes' into i2c/i2c-next) +$ git merge -m Merge branch 'i2c/i2c-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-andi/i2c/i2c-next +Merge made by the 'ort' strategy. + .../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 (eeedacd0866ee i3c: dw: avoid shift-out-of-bounds when DAA assigns no devices) +$ git merge -m Merge branch 'i3c/next' of https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'ort' strategy. + drivers/i3c/master/adi-i3c-master.c | 15 +++++++-------- + drivers/i3c/master/dw-i3c-master.c | 10 +++++++++- + drivers/i3c/master/svc-i3c-master.c | 18 +++++++++++++++--- + 3 files changed, 31 insertions(+), 12 deletions(-) +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 (ca078d004cf58 hwmon: (asus_ec_sensors) add ProArt Z690-CREATOR WIFI) +$ 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/eswin,eic7700-pvt.yaml | 72 +++ + .../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/asus_ec_sensors.rst | 4 + + 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 | 24 + + drivers/hwmon/Makefile | 2 + + drivers/hwmon/acpi_power_meter.c | 6 +- + drivers/hwmon/asus-ec-sensors.c | 33 ++ + drivers/hwmon/chipcap2.c | 25 +- + drivers/hwmon/coretemp.c | 2 +- + drivers/hwmon/cros_ec_hwmon.c | 12 +- + drivers/hwmon/eic7700-pvt.c | 509 +++++++++++++++++++++ + drivers/hwmon/eic7700-pvt.h | 99 ++++ + 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 - + drivers/hwmon/yogafan.c | 14 + + 33 files changed, 2162 insertions(+), 36 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/eswin,eic7700-pvt.yaml + 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/eic7700-pvt.c + create mode 100644 drivers/hwmon/eic7700-pvt.h + create mode 100644 drivers/hwmon/pmbus/sq24860.c + create mode 100644 drivers/hwmon/tvs-mpfs.c +Merging jc_docs/docs-next (be828e6819ed1 docs: pt_BR: Translate deprecated interfaces guide to Portuguese) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/mm/pagemap.rst +Auto-merging Documentation/filesystems/overlayfs.rst +Merge made by the 'ort' strategy. + Documentation/ABI/README | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 23 +- + 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/dma-api.rst | 2 +- + Documentation/core-api/errseq.rst | 2 +- + Documentation/core-api/index.rst | 1 + + Documentation/core-api/list.rst | 2 +- + Documentation/core-api/packing.rst | 4 +- + Documentation/dev-tools/container.rst | 6 +- + .../driver-api/usb/writing_usb_driver.rst | 3 - + Documentation/filesystems/overlayfs.rst | 3 +- + Documentation/kernel-hacking/locking.rst | 8 +- + Documentation/process/submitting-patches.rst | 14 +- + Documentation/scheduler/sched-energy.rst | 2 +- + Documentation/scheduler/sched-pelt.c | 3 +- + Documentation/sphinx-static/custom.css | 11 +- + Documentation/sphinx/maintainers_include.py | 7 +- + .../ja_JP/process/submitting-patches.rst | 148 ++--- + Documentation/translations/pt_BR/index.rst | 11 + + .../translations/pt_BR/process/4.Coding.rst | 440 +++++++++++++ + .../translations/pt_BR/process/5.Posting.rst | 376 +++++++++++ + .../translations/pt_BR/process/6.Followthrough.rst | 220 +++++++ + .../pt_BR/process/7.AdvancedTopics.rst | 201 ++++++ + .../translations/pt_BR/process/8.Conclusion.rst | 73 +++ + .../translations/pt_BR/process/adding-syscalls.rst | 700 +++++++++++++++++++++ + .../pt_BR/process/applying-patches.rst | 447 +++++++++++++ + .../translations/pt_BR/process/backporting.rst | 598 ++++++++++++++++++ + .../pt_BR/process/botching-up-ioctls.rst | 256 ++++++++ + .../process/code-of-conduct-interpretation.rst | 257 ++++++++ + .../translations/pt_BR/process/code-of-conduct.rst | 88 +++ + .../pt_BR/process/contribution-maturity-model.rst | 111 ++++ + .../translations/pt_BR/process/deprecated.rst | 422 +++++++++++++ + .../pt_BR/process/development-process.rst | 5 + + .../pt_BR/process/kernel-driver-statement.rst | 205 ++++++ + .../pt_BR/process/maintainer-netdev.rst | 23 +- + .../pt_BR/process/submit-checklist.rst | 145 +++++ + .../translations/zh_CN/scheduler/sched-energy.rst | 2 +- + README | 18 +- + tools/lib/python/kdoc/kdoc_output.py | 2 +- + 42 files changed, 4720 insertions(+), 146 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 + create mode 100644 Documentation/translations/pt_BR/process/6.Followthrough.rst + create mode 100644 Documentation/translations/pt_BR/process/7.AdvancedTopics.rst + create mode 100644 Documentation/translations/pt_BR/process/8.Conclusion.rst + create mode 100644 Documentation/translations/pt_BR/process/adding-syscalls.rst + create mode 100644 Documentation/translations/pt_BR/process/applying-patches.rst + create mode 100644 Documentation/translations/pt_BR/process/backporting.rst + create mode 100644 Documentation/translations/pt_BR/process/botching-up-ioctls.rst + create mode 100644 Documentation/translations/pt_BR/process/code-of-conduct-interpretation.rst + create mode 100644 Documentation/translations/pt_BR/process/code-of-conduct.rst + create mode 100644 Documentation/translations/pt_BR/process/contribution-maturity-model.rst + create mode 100644 Documentation/translations/pt_BR/process/deprecated.rst + create mode 100644 Documentation/translations/pt_BR/process/kernel-driver-statement.rst + create mode 100644 Documentation/translations/pt_BR/process/submit-checklist.rst +Merging v4l-dvb/next (a52e6f7923c17 media: chips-media: wave5: Resume device before setting EOS flag) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Auto-merging CREDITS +Auto-merging MAINTAINERS +Auto-merging drivers/media/i2c/cvs/core.c +Auto-merging drivers/media/i2c/ov8865.c +Auto-merging drivers/media/i2c/video-i2c.c +Auto-merging drivers/media/usb/em28xx/em28xx.h +Merge made by the 'ort' strategy. + CREDITS | 7 + + .../admin-guide/media/em28xx-cardlist.rst | 4 + + .../devicetree/bindings/media/i2c/sony,imx355.yaml | 11 +- + .../devicetree/bindings/media/i2c/sony,imx678.yaml | 130 ++ + .../devicetree/bindings/media/i2c/st,vd55g1.yaml | 3 +- + Documentation/devicetree/bindings/media/rc.yaml | 4 +- + .../driver-api/media/maintainer-entry-profile.rst | 4 + + .../media/cec/cec-ioc-adap-g-log-addrs.rst | 7 + + .../userspace-api/media/v4l/vidioc-g-ext-ctrls.rst | 15 +- + MAINTAINERS | 43 +- + drivers/acpi/scan.c | 1 + + drivers/media/cec/core/cec-adap.c | 95 +- + drivers/media/cec/core/cec-api.c | 5 +- + drivers/media/cec/core/cec-core.c | 117 +- + drivers/media/cec/core/cec-pin.c | 18 +- + drivers/media/cec/platform/meson/ao-cec-g12a.c | 1 + + drivers/media/cec/platform/seco/seco-cec.c | 5 +- + drivers/media/cec/platform/stm32/stm32-cec.c | 19 +- + drivers/media/cec/platform/tegra/tegra_cec.c | 33 +- + .../extron-da-hd-4k-plus/extron-da-hd-4k-plus.c | 3 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 14 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 13 - + drivers/media/dvb-core/dvb_frontend.c | 157 +- + drivers/media/dvb-frontends/helene.c | 56 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 23 +- + drivers/media/i2c/Kconfig | 23 + + drivers/media/i2c/Makefile | 2 + + drivers/media/i2c/alvium-csi2.c | 2 +- + drivers/media/i2c/cvs/core.c | 3 + + drivers/media/i2c/gc0310.c | 30 +- + drivers/media/i2c/imx355.c | 1524 +++++---------- + drivers/media/i2c/imx412.c | 751 ++++---- + drivers/media/i2c/imx471.c | 957 ++++++++++ + drivers/media/i2c/imx678.c | 1447 +++++++++++++++ + drivers/media/i2c/ov02a10.c | 12 +- + drivers/media/i2c/ov7740.c | 10 +- + drivers/media/i2c/ov8865.c | 48 +- + drivers/media/i2c/ov9282.c | 1 - + drivers/media/i2c/rdacm21.c | 5 +- + drivers/media/i2c/vd55g1.c | 160 +- + drivers/media/i2c/video-i2c.c | 8 +- + drivers/media/pci/bt8xx/bttv-driver.c | 12 +- + drivers/media/pci/cobalt/cobalt-alsa-main.c | 1 - + drivers/media/pci/cobalt/cobalt-driver.c | 5 +- + drivers/media/pci/cx18/cx18-driver.c | 5 +- + drivers/media/pci/cx18/cx18-vbi.c | 2 +- + drivers/media/pci/cx23885/cx23885-core.c | 10 +- + drivers/media/pci/cx25821/cx25821-alsa.c | 4 +- + drivers/media/pci/cx25821/cx25821-core.c | 10 +- + drivers/media/pci/cx88/cx88-alsa.c | 6 +- + drivers/media/pci/cx88/cx88-mpeg.c | 5 +- + drivers/media/pci/cx88/cx88-video.c | 5 +- + drivers/media/pci/ddbridge/ddbridge-main.c | 2 +- + drivers/media/pci/ddbridge/ddbridge.h | 2 +- + drivers/media/pci/dm1105/dm1105.c | 10 +- + drivers/media/pci/dt3155/dt3155.c | 4 +- + drivers/media/pci/hws/hws_v4l2_ioctl.h | 4 - + drivers/media/pci/intel/ipu-bridge.c | 51 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2 +- + drivers/media/pci/intel/ipu6/ipu6.c | 10 +- + drivers/media/pci/ivtv/ivtv-driver.c | 8 +- + drivers/media/pci/ivtv/ivtv-vbi.c | 2 +- + drivers/media/pci/mantis/mantis_common.h | 8 +- + drivers/media/pci/mgb4/mgb4_core.c | 6 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +- + drivers/media/pci/ngene/ngene-cards.c | 5 +- + drivers/media/pci/pluto2/pluto2.c | 5 +- + drivers/media/pci/saa7134/saa7134-cards.c | 1949 +++++++------------- + drivers/media/pci/saa7146/hexium_gemini.c | 22 +- + drivers/media/pci/saa7146/hexium_orion.c | 33 +- + drivers/media/pci/saa7146/mxb.c | 10 +- + drivers/media/pci/saa7164/saa7164-core.c | 5 +- + drivers/media/pci/smipcie/smipcie-main.c | 5 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 2 +- + drivers/media/pci/ttpci/budget-ci.c | 4 +- + drivers/media/pci/ttpci/budget.c | 4 +- + drivers/media/pci/tw5864/tw5864-core.c | 4 +- + drivers/media/pci/tw68/tw68-core.c | 16 +- + drivers/media/pci/tw686x/tw686x-core.c | 23 +- + drivers/media/pci/zoran/zoran_card.c | 7 +- + drivers/media/platform/amd/isp4/Kconfig | 1 + + drivers/media/platform/amd/isp4/isp4_interface.c | 4 +- + drivers/media/platform/amd/isp4/isp4_interface.h | 2 +- + drivers/media/platform/amd/isp4/isp4_subdev.c | 2 +- + drivers/media/platform/amphion/venc.c | 2 - + drivers/media/platform/broadcom/bcm2835-unicam.c | 2 + + .../platform/chips-media/wave5/wave5-vpu-dec.c | 64 +- + .../platform/chips-media/wave5/wave5-vpu-enc.c | 6 +- + .../platform/chips-media/wave5/wave5-vpuconfig.h | 2 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 6 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.h | 6 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 6 +- + .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 29 +- + drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 4 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-cru.h | 2 - + drivers/media/platform/rockchip/rga/rga3-hw.c | 12 +- + .../platform/rockchip/rkvdec/rkvdec-hevc-common.c | 3 + + .../media/platform/rockchip/rkvdec/rkvdec-hevc.c | 4 +- + .../platform/rockchip/rkvdec/rkvdec-vdpu381-hevc.c | 8 +- + .../platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c | 8 +- + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 8 +- + .../media/platform/samsung/s3c-camif/camif-core.c | 10 +- + drivers/media/platform/st/stm32/stm32-dcmi.c | 4 +- + .../platform/st/stm32/stm32-dcmipp/dcmipp-core.c | 4 +- + drivers/media/platform/ti/Kconfig | 1 + + drivers/media/platform/verisilicon/hantro_drv.c | 12 +- + drivers/media/radio/radio-cadet.c | 4 +- + drivers/media/radio/radio-gemtek.c | 4 +- + drivers/media/rc/fintek-cir.c | 4 +- + drivers/media/rc/ite-cir.c | 29 +- + drivers/media/rc/keymaps/Makefile | 2 +- + .../{rc-videomate-m1f.c => rc-videomate-k100.c} | 2 +- + drivers/media/rc/nuvoton-cir.c | 6 +- + drivers/media/rc/sunxi-cir.c | 9 +- + drivers/media/rc/winbond-cir.c | 4 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 4 +- + drivers/media/test-drivers/vimc/vimc-sensor.c | 12 +- + drivers/media/test-drivers/vivid/vivid-meta-out.c | 23 +- + drivers/media/usb/airspy/airspy.c | 19 +- + drivers/media/usb/au0828/au0828-cards.c | 14 + + drivers/media/usb/au0828/au0828-cards.h | 1 + + drivers/media/usb/au0828/au0828-dvb.c | 1 + + drivers/media/usb/cx231xx/cx231xx-audio.c | 5 + + drivers/media/usb/cx231xx/cx231xx-video.c | 4 +- + drivers/media/usb/em28xx/em28xx-cards.c | 33 +- + drivers/media/usb/em28xx/em28xx-core.c | 4 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 2 +- + drivers/media/usb/em28xx/em28xx-reg.h | 1 + + drivers/media/usb/em28xx/em28xx-video.c | 114 +- + drivers/media/usb/em28xx/em28xx.h | 3 +- + drivers/media/usb/go7007/go7007-driver.c | 14 +- + drivers/media/usb/go7007/go7007-fw.c | 28 +- + drivers/media/usb/go7007/snd-go7007.c | 10 +- + drivers/media/usb/s2255/s2255drv.c | 5 + + drivers/media/usb/stk1160/stk1160-core.c | 15 +- + drivers/media/usb/stk1160/stk1160-video.c | 3 + + drivers/media/usb/usbtv/usbtv-audio.c | 11 + + drivers/media/v4l2-core/v4l2-async.c | 15 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 15 + + drivers/media/v4l2-core/v4l2-fwnode.c | 2 + + drivers/platform/x86/intel/int3472/discrete.c | 18 + + .../pci/base/circbuf/interface/ia_css_circbuf.h | 40 +- + .../base/circbuf/interface/ia_css_circbuf_comm.h | 4 +- + .../base/circbuf/interface/ia_css_circbuf_desc.h | 14 +- + .../pci/camera/util/interface/ia_css_util.h | 2 +- + .../pci/css_2401_system/host/csi_rx_private.h | 18 +- + .../pci/css_2401_system/host/isys_irq_private.h | 4 +- + .../host/isys_stream2mmio_private.h | 12 +- + .../pci/css_2401_system/host/pixelgen_private.h | 8 +- + .../atomisp/pci/css_2401_system/pixelgen_global.h | 2 +- + .../pci/hive_isp_css_common/timed_ctrl_global.h | 2 +- + .../device_access/device_access.h | 2 +- + .../pci/hive_isp_css_include/host/csi_rx_public.h | 18 +- + .../host/isys_stream2mmio_public.h | 12 +- + .../hive_isp_css_include/host/pixelgen_public.h | 8 +- + .../pci/hive_isp_css_include/host/tag_public.h | 4 +- + .../pci/hive_isp_css_include/platform_support.h | 2 +- + .../pci/hive_isp_css_include/type_support.h | 2 +- + .../media/atomisp/pci/ia_css_frame_public.h | 2 +- + .../staging/media/atomisp/pci/ia_css_host_data.h | 4 +- + .../staging/media/atomisp/pci/ia_css_pipe_public.h | 8 +- + drivers/staging/media/atomisp/pci/ia_css_prbs.h | 4 +- + drivers/staging/media/atomisp/pci/ia_css_stream.h | 2 +- + drivers/staging/media/atomisp/pci/ia_css_timer.h | 7 +- + drivers/staging/media/atomisp/pci/ia_css_types.h | 6 +- + .../conversion_1.0/ia_css_conversion_types.h | 2 +- + .../pci/isp/kernels/eed1_8/ia_css_eed1_8_types.h | 2 +- + .../atomisp/pci/isp/kernels/hdr/ia_css_hdr_types.h | 42 +- + .../ipu2_io_ls/common/ia_css_common_io_param.h | 2 +- + .../ipu2_io_ls/common/ia_css_common_io_types.h | 2 +- + .../yuv444_io_ls/ia_css_yuv444_io.host.h | 2 +- + .../yuv444_io_ls/ia_css_yuv444_io_param.h | 2 +- + .../yuv444_io_ls/ia_css_yuv444_io_types.h | 2 +- + .../pci/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 4 +- + .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h | 14 +- + .../pci/isp/modes/interface/input_buf.isp.h | 2 +- + .../pci/runtime/binary/interface/ia_css_binary.h | 2 +- + .../pci/runtime/bufq/interface/ia_css_bufq.h | 26 +- + .../pci/runtime/debug/interface/ia_css_debug.h | 10 +- + .../runtime/debug/interface/ia_css_debug_pipe.h | 10 +- + .../pci/runtime/eventq/interface/ia_css_eventq.h | 4 +- + .../isp_param/interface/ia_css_isp_param_types.h | 2 +- + .../pci/runtime/isys/interface/ia_css_isys.h | 8 +- + .../runtime/pipeline/interface/ia_css_pipeline.h | 10 +- + .../pci/runtime/rmgr/interface/ia_css_rmgr.h | 4 +- + .../pci/runtime/rmgr/interface/ia_css_rmgr_vbuf.h | 18 +- + .../tagger/interface/ia_css_tagger_common.h | 4 +- + .../staging/media/atomisp/pci/sh_css_internal.h | 4 +- + drivers/staging/media/atomisp/pci/sh_css_sp.h | 14 +- + drivers/staging/media/atomisp/pci/system_global.h | 4 +- + drivers/staging/media/av7110/av7110.c | 20 +- + drivers/staging/media/ipu7/ipu7.c | 4 +- + drivers/staging/media/meson/vdec/vdec.c | 4 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 4 +- + drivers/staging/media/tegra-video/vi.c | 87 +- + drivers/staging/media/tegra-video/vip.c | 10 +- + include/media/cec.h | 6 +- + include/media/drv-intf/s3c_camif.h | 2 - + include/media/drv-intf/saa7146.h | 11 +- + include/media/media-entity.h | 1 + + include/media/rc-map.h | 2 - + include/media/v4l2-ioctl.h | 4 +- + include/media/videobuf2-v4l2.h | 13 + + include/uapi/linux/cec.h | 2 + + 204 files changed, 5526 insertions(+), 3720 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx678.yaml + create mode 100644 drivers/media/i2c/imx471.c + create mode 100644 drivers/media/i2c/imx678.c + 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 (ca2b8f92568b7 Merge branch 'intel-idle-lpi' into linux-next) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging arch/riscv/include/asm/acpi.h +Auto-merging drivers/acpi/scan.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/pm/cpufreq.rst | 2 +- + Documentation/driver-api/acpi/acpi-drivers.rst | 80 ------ + Documentation/driver-api/acpi/index.rst | 1 - + arch/riscv/include/asm/acpi.h | 1 + + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/msr-index.h | 2 + + drivers/acpi/acpi_processor.c | 354 +++++++++++++++++++++++++ + drivers/acpi/apei/ghes.c | 4 +- + drivers/acpi/arm64/iort.c | 22 +- + drivers/acpi/bus.c | 138 +--------- + drivers/acpi/fan_core.c | 25 +- + drivers/acpi/irq.c | 172 +++++++++++- + drivers/acpi/numa/srat.c | 2 - + drivers/acpi/power.c | 1 - + drivers/acpi/processor_idle.c | 269 +------------------ + drivers/acpi/riscv/irq.c | 141 +--------- + drivers/acpi/scan.c | 18 +- + drivers/base/power/runtime.c | 6 +- + drivers/cpufreq/amd-pstate.c | 1 + + drivers/cpufreq/cpufreq.c | 14 +- + drivers/cpufreq/intel_pstate.c | 131 ++++----- + drivers/idle/intel_idle.c | 199 +++++++++++--- + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-gic-v5-iwb.c | 2 + + drivers/irqchip/irq-gic-v5.c | 13 +- + drivers/irqchip/irq-gic.c | 2 +- + drivers/irqchip/irq-loongarch-cpu.c | 2 +- + drivers/irqchip/irq-riscv-intc.c | 3 +- + drivers/pnp/card.c | 11 +- + drivers/pnp/pnpacpi/core.c | 5 +- + drivers/pnp/system.c | 6 +- + drivers/thermal/intel/therm_throt.c | 277 ++++++++++++++++++- + drivers/xen/xen-acpi-pad.c | 5 - + include/acpi/acpi_bus.h | 50 +--- + include/linux/acpi.h | 26 +- + include/linux/acpi_iort.h | 3 +- + include/linux/cpufreq.h | 2 + + kernel/power/wakelock.c | 2 +- + kernel/sched/cpufreq_schedutil.c | 6 +- + rust/kernel/cpufreq.rs | 11 +- + 40 files changed, 1153 insertions(+), 860 deletions(-) + delete mode 100644 Documentation/driver-api/acpi/acpi-drivers.rst +Merging cpufreq-arm/cpufreq/arm/linux-next (6a9e0e0f75923 cpufreq: spear: Fix an IS_ERR() vs NULL bug in spear1340_set_cpu_rate()) +$ 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 +Auto-merging drivers/cpufreq/cpufreq-dt-platdev.c +Merge made by the 'ort' strategy. + drivers/cpufreq/apple-soc-cpufreq.c | 36 ++++++++++++++--------------------- + drivers/cpufreq/brcmstb-avs-cpufreq.c | 5 +---- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/qcom-cpufreq-nvmem.c | 8 ++++++++ + drivers/cpufreq/rcpufreq_dt.rs | 13 ++++++++++--- + drivers/cpufreq/spear-cpufreq.c | 4 ++-- + 6 files changed, 36 insertions(+), 31 deletions(-) +Merging cpupower/cpupower (5100bd356cd31 cpupower: Print kernel and hardware frequency information) +$ git merge -m Merge branch 'cpupower' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'ort' strategy. + tools/power/cpupower/Makefile | 2 +- + tools/power/cpupower/utils/cpufreq-info.c | 11 +++--- + tools/power/cpupower/utils/helpers/cppc.c | 56 ++++++++++++++++++++++++++++ + tools/power/cpupower/utils/helpers/helpers.h | 2 + + 4 files changed, 65 insertions(+), 6 deletions(-) + create mode 100644 tools/power/cpupower/utils/helpers/cppc.c +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 (8247e08d2196c pmdomain: Merge branch dt into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Merge made by the 'ort' strategy. + .../bindings/power/mediatek,power-controller.yaml | 1 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 4 + + drivers/pmdomain/arm/Kconfig | 2 +- + drivers/pmdomain/bcm/bcm2835-power.c | 9 +- + drivers/pmdomain/imx/Kconfig | 11 +- + drivers/pmdomain/mediatek/mt8196-pm-domains.h | 27 ++++ + drivers/pmdomain/mediatek/mtk-pm-domains.c | 146 +++++++++++++++++---- + drivers/pmdomain/mediatek/mtk-pm-domains.h | 1 + + drivers/pmdomain/qcom/rpmhpd.c | 38 +++--- + drivers/pmdomain/tegra/powergate-bpmp.c | 9 +- + include/dt-bindings/power/mediatek,mt8196-power.h | 4 + + 11 files changed, 200 insertions(+), 52 deletions(-) +Merging opp/opp/linux-next (ce46fede7792c OPP: Fix cleanup ordering) +$ 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 +Merge made by the 'ort' strategy. + drivers/opp/core.c | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) +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 (e952e079d2262 RDMA/umem: Constify struct dma_buf_attach_ops) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/core/cma.c +Auto-merging drivers/infiniband/hw/irdma/verbs.c +Auto-merging drivers/infiniband/sw/siw/siw_verbs.c +Auto-merging net/sunrpc/xprtrdma/svc_rdma_transport.c +Merge made by the 'ort' strategy. + Documentation/infiniband/user_mad.rst | 2 +- + drivers/infiniband/core/addr.c | 2 +- + drivers/infiniband/core/cma.c | 2 +- + drivers/infiniband/core/cq.c | 3 +- + drivers/infiniband/core/iwpm_msg.c | 2 +- + drivers/infiniband/core/nldev.c | 30 +++- + drivers/infiniband/core/restrack.c | 2 +- + drivers/infiniband/core/umem.c | 5 +- + drivers/infiniband/core/umem_dmabuf.c | 4 +- + drivers/infiniband/core/uverbs_std_types_mr.c | 6 +- + drivers/infiniband/hw/bng_re/bng_fw.c | 10 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 1 - + drivers/infiniband/hw/efa/Makefile | 4 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 6 +- + drivers/infiniband/hw/efa/efa_ah_cache.c | 135 ++++++++++++++++ + drivers/infiniband/hw/efa/efa_ah_cache.h | 39 +++++ + drivers/infiniband/hw/efa/efa_com.c | 12 +- + drivers/infiniband/hw/efa/efa_com.h | 3 + + drivers/infiniband/hw/efa/efa_com_cmd.c | 41 ++++- + drivers/infiniband/hw/efa/efa_com_cmd.h | 1 + + drivers/infiniband/hw/efa/efa_main.c | 2 + + drivers/infiniband/hw/efa/efa_verbs.c | 10 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 2 - + drivers/infiniband/hw/hfi1/chip.c | 21 ++- + drivers/infiniband/hw/hfi1/chip.h | 2 +- + drivers/infiniband/hw/hfi1/device.c | 32 +--- + drivers/infiniband/hw/hfi1/device.h | 1 - + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/hfi1/hfi.h | 4 +- + drivers/infiniband/hw/hfi1/init.c | 196 ++++++++++-------------- + drivers/infiniband/hw/hfi1/pcie.c | 32 ++-- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 2 - + drivers/infiniband/hw/ionic/ionic_ibdev.h | 1 - + drivers/infiniband/hw/irdma/i40iw_hw.c | 4 +- + drivers/infiniband/hw/irdma/icrdma_hw.c | 2 + + drivers/infiniband/hw/irdma/icrdma_hw.h | 2 + + drivers/infiniband/hw/irdma/icrdma_if.c | 8 +- + drivers/infiniband/hw/irdma/irdma.h | 2 + + drivers/infiniband/hw/irdma/utils.c | 6 + + drivers/infiniband/hw/irdma/verbs.c | 117 ++++++++++---- + drivers/infiniband/hw/irdma/verbs.h | 3 + + drivers/infiniband/hw/mana/main.c | 1 - + drivers/infiniband/hw/mlx4/cm.c | 13 +- + drivers/infiniband/hw/mlx4/main.c | 2 - + drivers/infiniband/hw/mlx5/main.c | 1 - + drivers/infiniband/hw/mlx5/mr.c | 6 +- + drivers/infiniband/hw/mlx5/odp.c | 6 +- + drivers/infiniband/hw/mlx5/umr.c | 2 +- + drivers/infiniband/hw/mthca/mthca_allocator.c | 6 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 7 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 1 - + drivers/infiniband/hw/qedr/verbs.c | 4 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 1 - + drivers/infiniband/sw/rdmavt/qp.c | 8 +- + drivers/infiniband/sw/rdmavt/vt.c | 4 +- + drivers/infiniband/sw/rxe/rxe_mw.c | 20 ++- + drivers/infiniband/sw/rxe/rxe_odp.c | 11 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 22 +-- + drivers/infiniband/sw/rxe/rxe_resp.c | 9 +- + drivers/infiniband/sw/rxe/rxe_srq.c | 16 +- + drivers/infiniband/sw/siw/siw_verbs.c | 2 - + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 10 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 5 +- + drivers/infiniband/ulp/isert/ib_isert.c | 7 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 11 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 11 +- + drivers/infiniband/ulp/srp/ib_srp.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 21 ++- + drivers/nvme/host/rdma.c | 8 +- + drivers/nvme/target/rdma.c | 26 ++-- + fs/smb/smbdirect/accept.c | 5 +- + fs/smb/smbdirect/connect.c | 5 +- + fs/smb/smbdirect/connection.c | 8 +- + include/linux/sunrpc/svc_rdma.h | 4 +- + include/rdma/ib_verbs.h | 52 +++---- + include/rdma/restrack.h | 2 +- + include/rdma/uverbs_ioctl.h | 20 +++ + include/uapi/rdma/rdma_netlink.h | 5 + + net/rds/ib.c | 10 +- + net/rds/ib_cm.c | 10 +- + net/sunrpc/xprtrdma/frwr_ops.c | 7 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 5 +- + net/sunrpc/xprtrdma/verbs.c | 2 +- + 85 files changed, 709 insertions(+), 435 deletions(-) + create mode 100644 drivers/infiniband/hw/efa/efa_ah_cache.c + create mode 100644 drivers/infiniband/hw/efa/efa_ah_cache.h +Merging net-next/main (ce6b4d3216b63 net: mana: Add handler for sriov configure) +$ 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 drivers/net/macsec.c +Auto-merging include/linux/net.h +Auto-merging net/core/dev.c +Auto-merging net/ipv4/fib_trie.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0e044f7b7ddca] Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/driver-api/dpll.rst | 7 + + Documentation/netlink/specs/devlink.yaml | 30 +- + Documentation/netlink/specs/dpll.yaml | 19 + + Documentation/netlink/specs/rt-addr.yaml | 4 + + Documentation/networking/devlink/devlink-port.rst | 11 + + Documentation/networking/devlink/index.rst | 8 +- + Documentation/networking/devlink/mlx5.rst | 33 + + .../net_cachelines/netns_ipv4_sysctl.rst | 1 + + Documentation/networking/netdevices.rst | 7 + + MAINTAINERS | 5 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/mm/mem.c | 6 - + drivers/cxl/core/core.h | 2 + + drivers/cxl/core/mbox.c | 51 +- + drivers/cxl/core/memdev.c | 67 + + drivers/cxl/core/pci.c | 1 + + drivers/cxl/core/port.c | 1 + + drivers/cxl/core/regs.c | 1 + + drivers/cxl/cxlpci.h | 12 - + drivers/cxl/pci.c | 1 + + drivers/dpll/dpll_core.c | 6 +- + drivers/dpll/dpll_nl.c | 2 +- + drivers/dpll/zl3073x/chan.c | 128 +- + drivers/dpll/zl3073x/chan.h | 48 + + drivers/dpll/zl3073x/core.c | 48 +- + drivers/dpll/zl3073x/core.h | 12 +- + drivers/dpll/zl3073x/dpll.c | 491 ++- + drivers/dpll/zl3073x/dpll.h | 4 + + drivers/dpll/zl3073x/regs.h | 11 + + drivers/net/amt.c | 43 +- + drivers/net/bareudp.c | 45 +- + drivers/net/bonding/bond_3ad.c | 24 +- + drivers/net/bonding/bond_main.c | 6 - + 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 | 431 ++- + drivers/net/dsa/microchip/ksz9477.c | 164 +- + drivers/net/dsa/microchip/ksz9477.h | 4 +- + drivers/net/dsa/microchip/ksz_common.c | 594 +--- + drivers/net/dsa/microchip/ksz_common.h | 85 +- + drivers/net/dsa/microchip/lan937x_main.c | 6 +- + 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/airoha/airoha_ppe.c | 10 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 3 +- + .../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/hisilicon/hns3/hnae3.h | 14 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 3 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 12 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 9 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 172 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 7 + + drivers/net/ethernet/ibm/Kconfig | 9 - + drivers/net/ethernet/ibm/Makefile | 1 - + drivers/net/ethernet/ibm/ehea/Makefile | 7 - + drivers/net/ethernet/ibm/ehea/ehea.h | 477 --- + drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 277 -- + drivers/net/ethernet/ibm/ehea/ehea_hw.h | 253 -- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 3581 -------------------- + drivers/net/ethernet/ibm/ehea/ehea_phyp.c | 612 ---- + drivers/net/ethernet/ibm/ehea/ehea_phyp.h | 433 --- + drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 999 ------ + drivers/net/ethernet/ibm/ehea/ehea_qmr.h | 390 --- + drivers/net/ethernet/intel/ice/ice_gnss.c | 5 +- + drivers/net/ethernet/intel/igb/e1000_82575.h | 21 + + drivers/net/ethernet/intel/igb/igb.h | 3 + + drivers/net/ethernet/intel/igb/igb_ethtool.c | 89 +- + drivers/net/ethernet/intel/igb/igb_main.c | 25 +- + drivers/net/ethernet/intel/igc/igc.h | 3 + + drivers/net/ethernet/intel/igc/igc_base.c | 33 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 9 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 279 +- + drivers/net/ethernet/intel/igc/igc_hw.h | 10 +- + drivers/net/ethernet/intel/igc/igc_mac.c | 35 +- + drivers/net/ethernet/intel/igc/igc_main.c | 10 +- + drivers/net/ethernet/intel/igc/igc_phy.c | 65 +- + drivers/net/ethernet/intel/igc/igc_phy.h | 1 + + 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 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 5 + + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 1 + + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 605 ++-- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h | 3 - + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 27 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 18 +- + .../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 2 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 2 +- + drivers/net/ethernet/microsoft/Kconfig | 1 + + drivers/net/ethernet/microsoft/mana/gdma_main.c | 53 + + drivers/net/ethernet/microsoft/mana/mana_en.c | 189 ++ + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 167 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- + .../net/ethernet/pensando/ionic/ionic_rx_filter.c | 7 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 2 +- + drivers/net/ethernet/qualcomm/ppe/ppe.c | 1 - + drivers/net/ethernet/qualcomm/ppe/ppe_config.c | 7 +- + drivers/net/ethernet/qualcomm/ppe/ppe_config.h | 2 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 3 +- + drivers/net/ethernet/sfc/Kconfig | 9 + + drivers/net/ethernet/sfc/Makefile | 1 + + drivers/net/ethernet/sfc/ef10.c | 41 +- + drivers/net/ethernet/sfc/efx.c | 18 +- + drivers/net/ethernet/sfc/efx_cxl.c | 105 + + drivers/net/ethernet/sfc/efx_cxl.h | 32 + + drivers/net/ethernet/sfc/mcdi.c | 7 +- + drivers/net/ethernet/sfc/net_driver.h | 10 + + drivers/net/ethernet/sfc/nic.h | 3 + + drivers/net/ethernet/sfc/siena/mcdi.c | 7 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 9 +- + drivers/net/gtp.c | 12 +- + drivers/net/ipvlan/ipvlan.h | 12 +- + drivers/net/ipvlan/ipvlan_main.c | 147 +- + drivers/net/ipvlan/ipvtap.c | 25 +- + drivers/net/macsec.c | 78 +- + drivers/net/macvlan.c | 109 +- + drivers/net/netconsole.c | 201 +- + drivers/net/phy/mdio_device.c | 2 +- + drivers/net/phy/phylink.c | 15 +- + drivers/net/ppp/ppp_async.c | 2 - + drivers/net/ppp/ppp_synctty.c | 2 - + drivers/net/tun.c | 60 +- + drivers/net/tun_vnet.h | 8 +- + drivers/net/usb/rtl8150.c | 4 +- + drivers/net/veth.c | 34 +- + include/cxl/cxl.h | 2 + + include/cxl/pci.h | 22 + + include/linux/mdio.h | 1 - + include/linux/net.h | 23 + + include/linux/netdevice.h | 24 + + include/linux/netfilter.h | 7 + + include/linux/netfilter/nf_conntrack_h323.h | 2 - + include/linux/netfilter/nf_conntrack_pptp.h | 2 - + include/linux/netfilter/nf_conntrack_sane.h | 2 - + include/linux/netfilter/nf_conntrack_tftp.h | 2 - + include/linux/netpoll.h | 18 - + include/linux/rtnetlink.h | 8 + + include/net/bond_3ad.h | 4 +- + include/net/bonding.h | 8 +- + include/net/devlink.h | 15 +- + include/net/fib_rules.h | 4 +- + include/net/ip_fib.h | 3 +- + include/net/ip_vs.h | 2 +- + include/net/mana/gdma.h | 24 +- + include/net/mana/mana.h | 57 + + include/net/net_namespace.h | 3 + + include/net/netfilter/nf_conntrack_helper.h | 10 +- + include/net/netns/ipv4.h | 1 + + include/net/udp.h | 2 +- + include/uapi/linux/devlink.h | 2 + + include/uapi/linux/dpll.h | 8 + + include/uapi/linux/ethtool.h | 6 + + include/uapi/linux/if_addr.h | 1 + + 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/bridge/netfilter/ebtables.c | 12 +- + net/core/dev.c | 140 +- + net/core/fib_rules.c | 83 +- + net/core/lock_debug.c | 4 +- + net/core/net_namespace.c | 4 + + net/core/netpoll.c | 51 +- + net/core/rtnetlink.c | 74 +- + net/devlink/core.c | 20 +- + net/devlink/dev.c | 16 +- + net/devlink/devl_internal.h | 20 + + net/devlink/dpipe.c | 14 +- + net/devlink/health.c | 12 +- + net/devlink/linecard.c | 4 +- + net/devlink/netlink.c | 82 +- + net/devlink/netlink_gen.c | 24 +- + net/devlink/netlink_gen.h | 8 + + net/devlink/param.c | 4 +- + net/devlink/port.c | 24 +- + net/devlink/rate.c | 329 +- + net/devlink/region.c | 6 +- + net/devlink/resource.c | 14 +- + net/devlink/sb.c | 22 +- + net/devlink/trap.c | 12 +- + net/dsa/dsa.c | 20 +- + net/dsa/user.c | 19 +- + net/ipv4/fib_frontend.c | 69 +- + net/ipv4/fib_rules.c | 20 +- + net/ipv4/fib_trie.c | 3 +- + net/ipv4/igmp.c | 2 + + net/ipv4/netfilter/nf_nat_snmp_basic_main.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/netfilter/ipvs/ip_vs_nfct.c | 2 +- + net/netfilter/nf_conntrack_amanda.c | 6 +- + net/netfilter/nf_conntrack_broadcast.c | 2 - + net/netfilter/nf_conntrack_ftp.c | 32 +- + net/netfilter/nf_conntrack_h323_main.c | 12 +- + net/netfilter/nf_conntrack_helper.c | 77 +- + net/netfilter/nf_conntrack_irc.c | 27 +- + net/netfilter/nf_conntrack_netbios_ns.c | 2 - + net/netfilter/nf_conntrack_ovs.c | 6 +- + net/netfilter/nf_conntrack_pptp.c | 2 +- + net/netfilter/nf_conntrack_sane.c | 34 +- + net/netfilter/nf_conntrack_sip.c | 45 +- + net/netfilter/nf_conntrack_snmp.c | 4 +- + net/netfilter/nf_conntrack_tftp.c | 33 +- + net/netfilter/nf_nat_core.c | 6 - + net/netfilter/nf_nat_proto.c | 8 + + net/netfilter/nfnetlink_cthelper.c | 21 +- + net/netfilter/nfnetlink_cttimeout.c | 2 +- + net/netfilter/nfnetlink_hook.c | 37 +- + net/netfilter/nft_ct.c | 35 + + net/netfilter/nft_set_rbtree.c | 3 +- + net/netfilter/x_tables.c | 30 +- + net/netfilter/xt_TCPOPTSTRIP.c | 8 +- + net/netfilter/xt_dscp.c | 12 + + net/netfilter/xt_recent.c | 2 +- + net/netfilter/xt_tcpmss.c | 13 + + net/sched/act_ct.c | 4 +- + 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/Makefile | 1 + + .../drivers/net/hw/devlink_rate_cross_esw.py | 296 ++ + tools/testing/selftests/drivers/net/hw/rss_ctx.py | 11 +- + tools/testing/selftests/drivers/net/hw/toeplitz.py | 22 + + tools/testing/selftests/drivers/net/lib/py/env.py | 27 +- + tools/testing/selftests/drivers/net/xdp.py | 94 +- + tools/testing/selftests/net/getsockopt_iter.c | 97 + + .../selftests/net/openvswitch/openvswitch.sh | 87 + + tools/testing/selftests/net/rtnetlink.py | 101 +- + .../tc-testing/tc-tests/infra/qdiscs.json | 164 + + 265 files changed, 7593 insertions(+), 10083 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 drivers/net/ethernet/sfc/efx_cxl.c + create mode 100644 drivers/net/ethernet/sfc/efx_cxl.h + create mode 100644 include/cxl/pci.h + create mode 100644 tools/net/ynl/pyynl/lib/specdir.py + create mode 100755 tools/testing/selftests/drivers/net/hw/devlink_rate_cross_esw.py +Merging bpf-next/for-next (9a3a07d06e7d7 Merge branch 'bpf-fix-warning-in-bpf_trampoline_multi_detach') +$ 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/btf.c +Auto-merging kernel/bpf/verifier.c +Auto-merging tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +Merge made by the 'ort' strategy. + Documentation/bpf/bpf_devel_QA.rst | 5 +- + Documentation/bpf/index.rst | 1 + + Documentation/bpf/kfuncs.rst | 23 +- + Documentation/bpf/signing.rst | 497 +++++++++ + arch/s390/net/bpf_jit_comp.c | 4 +- + include/linux/bpf.h | 16 +- + include/linux/bpf_verifier.h | 28 +- + include/uapi/linux/bpf.h | 28 +- + kernel/bpf/bpf_lsm.c | 1 - + kernel/bpf/btf.c | 19 +- + kernel/bpf/core.c | 9 +- + kernel/bpf/cpumask.c | 6 +- + kernel/bpf/fixups.c | 11 +- + kernel/bpf/syscall.c | 85 +- + kernel/bpf/task_iter.c | 36 +- + kernel/bpf/trampoline.c | 1 + + kernel/bpf/verifier.c | 627 +++++++++--- + kernel/trace/bpf_trace.c | 55 + + net/core/filter.c | 106 +- + tools/bpf/bpftool/Makefile | 2 +- + tools/bpf/bpftool/btf.c | 13 +- + tools/bpf/bpftool/btf_dumper.c | 14 +- + tools/bpf/bpftool/gen.c | 2 + + tools/bpf/bpftool/link.c | 133 +++ + tools/bpf/bpftool/map.c | 12 +- + tools/bpf/bpftool/sign.c | 24 +- + tools/bpf/bpftool/struct_ops.c | 4 + + tools/bpf/resolve_btfids/Makefile | 5 +- + tools/include/linux/btf_ids.h | 78 +- + tools/include/uapi/linux/bpf.h | 28 +- + tools/lib/bpf/bpf_gen_internal.h | 1 - + tools/lib/bpf/btf.c | 20 +- + 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 | 92 +- + tools/lib/bpf/libbpf.c | 88 +- + tools/lib/bpf/libbpf_internal.h | 1 - + tools/lib/bpf/nlattr.c | 2 +- + tools/lib/bpf/relo_core.c | 22 +- + tools/lib/bpf/skel_internal.h | 31 +- + tools/lib/bpf/usdt.c | 33 +- + tools/sched_ext/include/scx/compat.bpf.h | 2 +- + .../bpf/libarena/include/libarena/bitmap.h | 34 + + .../bpf/libarena/include/libarena/common.h | 2 +- + .../{st_asan_buddy.bpf.c => test_asan_buddy.bpf.c} | 10 +- + .../{st_asan_common.h => test_asan_common.h} | 0 + .../bpf/libarena/selftests/test_bitmap.bpf.c | 394 +++++++ + .../selftests/{st_buddy.bpf.c => test_buddy.bpf.c} | 8 +- + .../libarena/selftests/test_parallel_bitmap.bpf.c | 190 ++++ + .../libarena/selftests/test_parallel_spmc.bpf.c | 9 +- + .../selftests/bpf/libarena/src/bitmap.bpf.c | 245 +++++ + .../selftests/bpf/libarena/src/common.bpf.c | 9 +- + tools/testing/selftests/bpf/network_helpers.c | 4 +- + tools/testing/selftests/bpf/network_helpers.h | 5 + + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 12 + + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 14 - + .../selftests/bpf/prog_tests/fill_link_info.c | 242 +++++ + .../bpf/prog_tests/get_smp_processor_id.c | 45 + + .../selftests/bpf/prog_tests/icmp_send_kfunc.c | 292 ++++++ + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 1 + + tools/testing/selftests/bpf/prog_tests/libarena.c | 8 +- + .../selftests/bpf/prog_tests/libarena_asan.c | 8 +- + .../testing/selftests/bpf/prog_tests/linked_list.c | 1 + + tools/testing/selftests/bpf/prog_tests/mptcp.c | 13 +- + .../selftests/bpf/prog_tests/res_spin_lock.c | 20 + + .../selftests/bpf/prog_tests/resolve_btfids.c | 169 ++- + .../selftests/bpf/prog_tests/signed_loader.c | 1083 ++++++++++++++++---- + .../selftests/bpf/prog_tests/sockmap_basic.c | 52 - + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 68 ++ + .../selftests/bpf/prog_tests/test_map_uninit.c | 68 ++ + .../selftests/bpf/prog_tests/tracing_multi.c | 69 ++ + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 3 + + tools/testing/selftests/bpf/progs/btf_data.c | 10 + + tools/testing/selftests/bpf/progs/cpumask_common.h | 2 +- + .../testing/selftests/bpf/progs/cpumask_failure.c | 23 +- + .../testing/selftests/bpf/progs/cpumask_success.c | 6 +- + .../selftests/bpf/progs/freplace_cls_redirect.c | 34 - + .../selftests/bpf/progs/get_smp_processor_id.c | 20 + + tools/testing/selftests/bpf/progs/icmp_send.c | 123 +++ + .../testing/selftests/bpf/progs/kfunc_call_fail.c | 33 + + .../testing/selftests/bpf/progs/linked_list_fail.c | 23 + + 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 +- + .../bpf/progs/tcp_ca_untrusted_btf_write.c | 26 + + .../selftests/bpf/progs/test_fill_link_info.c | 6 + + .../selftests/bpf/progs/test_signed_loader.c | 9 +- + .../selftests/bpf/progs/test_sockmap_update.c | 48 - + tools/testing/selftests/bpf/progs/test_tc_peer.c | 22 + + .../bpf/progs/tracing_multi_intersect_attach.c | 8 + + tools/testing/selftests/bpf/progs/verifier_gotox.c | 25 + + .../testing/selftests/bpf/progs/verifier_map_ptr.c | 23 +- + .../selftests/bpf/progs/verifier_scalar_ids.c | 56 + + .../selftests/bpf/progs/verifier_sockmap_mutate.c | 12 +- + .../selftests/bpf/progs/verifier_spill_fill.c | 68 ++ + .../testing/selftests/bpf/progs/verifier_var_off.c | 110 ++ + tools/testing/selftests/bpf/test_sockmap.c | 3 +- + tools/testing/selftests/bpf/veristat.c | 23 + + 99 files changed, 5037 insertions(+), 961 deletions(-) + create mode 100644 Documentation/bpf/signing.rst + create mode 100644 tools/testing/selftests/bpf/libarena/include/libarena/bitmap.h + rename tools/testing/selftests/bpf/libarena/selftests/{st_asan_buddy.bpf.c => test_asan_buddy.bpf.c} (98%) + rename tools/testing/selftests/bpf/libarena/selftests/{st_asan_common.h => test_asan_common.h} (100%) + create mode 100644 tools/testing/selftests/bpf/libarena/selftests/test_bitmap.bpf.c + rename tools/testing/selftests/bpf/libarena/selftests/{st_buddy.bpf.c => test_buddy.bpf.c} (97%) + create mode 100644 tools/testing/selftests/bpf/libarena/selftests/test_parallel_bitmap.bpf.c + create mode 100644 tools/testing/selftests/bpf/libarena/src/bitmap.bpf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/get_smp_processor_id.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/icmp_send_kfunc.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_map_uninit.c + delete mode 100644 tools/testing/selftests/bpf/progs/freplace_cls_redirect.c + create mode 100644 tools/testing/selftests/bpf/progs/get_smp_processor_id.c + create mode 100644 tools/testing/selftests/bpf/progs/icmp_send.c + create mode 100644 tools/testing/selftests/bpf/progs/tcp_ca_untrusted_btf_write.c + delete mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_update.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 (bee40a7d0bd12 net/mlx5: Add PSP related fields to the mlx5_ifc) +$ git merge -m Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Merge made by the 'ort' strategy. + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 12 +------ + .../ethernet/mellanox/mlx5/core/steering/hws/cmd.c | 6 ++-- + include/linux/mlx5/device.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 38 ++++++++++++---------- + 4 files changed, 25 insertions(+), 32 deletions(-) +Merging netfilter-next/main (f6f3b36c15ed4 net: ethernet: qualcomm: remove unneeded 'fast_io' parameter in regmap_config) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (f6f3b36c15ed4 net: ethernet: qualcomm: remove unneeded 'fast_io' parameter in regmap_config) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (bd8bee79e1fa8 Bluetooth: btintel_pcie: serialize reset_type with RECOVERY_IN_PROGRESS) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging drivers/bluetooth/btintel_pcie.c +CONFLICT (content): Merge conflict in drivers/bluetooth/btintel_pcie.c +Auto-merging drivers/bluetooth/btnxpuart.c +Auto-merging drivers/bluetooth/btqca.c +Auto-merging drivers/bluetooth/hci_qca.c +Auto-merging net/bluetooth/af_bluetooth.c +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/l2cap_sock.c +Recorded preimage for 'drivers/bluetooth/btintel_pcie.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/bluetooth/btintel_pcie.c'. +[master 8d77a46db4d58] Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/Makefile | 2 + + drivers/bluetooth/btintel_pcie.c | 260 ++++++++++++++++++++++++++------------- + drivers/bluetooth/btintel_pcie.h | 12 +- + drivers/bluetooth/btnxpuart.c | 4 +- + drivers/bluetooth/btqca.c | 25 +--- + drivers/bluetooth/btusb.c | 100 +++++++++------ + drivers/bluetooth/hci_nokia.c | 20 +++ + include/net/bluetooth/hci_sync.h | 4 +- + net/bluetooth/Makefile | 2 + + net/bluetooth/af_bluetooth.c | 7 +- + net/bluetooth/bnep/Makefile | 2 + + net/bluetooth/coredump.c | 2 - + net/bluetooth/hci_core.c | 3 + + net/bluetooth/hci_debugfs.c | 12 +- + net/bluetooth/hci_event.c | 5 +- + net/bluetooth/hci_sync.c | 44 ++----- + net/bluetooth/hidp/Makefile | 2 + + net/bluetooth/l2cap_sock.c | 1 + + net/bluetooth/rfcomm/Makefile | 2 + + net/bluetooth/rfcomm/sock.c | 1 + + 20 files changed, 309 insertions(+), 201 deletions(-) +Merging wireless-next/for-next (ac798f757d647 wifi: mac80211: Route (Re)association req/response to per-STA queue) +$ 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 +Auto-merging drivers/net/wireless/ath/ath12k/mac.c +Auto-merging drivers/net/wireless/marvell/mwifiex/cfg80211.c +Auto-merging drivers/net/wireless/virtual/mac80211_hwsim_main.c +Auto-merging include/net/cfg80211.h +Auto-merging net/mac80211/cfg.c +Auto-merging net/mac80211/tx.c +Auto-merging net/wireless/nl80211.c +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath12k/mac.c | 6 - + drivers/net/wireless/ath/wil6210/cfg80211.c | 10 +- + drivers/net/wireless/broadcom/b43/debugfs.c | 12 +- + drivers/net/wireless/broadcom/b43legacy/debugfs.c | 12 +- + drivers/net/wireless/intersil/p54/Kconfig | 6 +- + drivers/net/wireless/intersil/p54/fwio.c | 4 +- + drivers/net/wireless/intersil/p54/p54usb.c | 2 +- + drivers/net/wireless/marvell/libertas/debugfs.c | 39 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 8 +- + drivers/net/wireless/marvell/mwifiex/debugfs.c | 62 ++- + drivers/net/wireless/realtek/rtw89/core.c | 3 - + drivers/net/wireless/ti/wlcore/main.c | 14 +- + drivers/net/wireless/virtual/mac80211_hwsim_main.c | 7 +- + include/linux/ieee80211.h | 12 + + include/net/cfg80211.h | 41 +- + include/net/ieee80211_radiotap.h | 190 ++++++++ + include/uapi/linux/nl80211.h | 46 +- + net/mac80211/cfg.c | 6 +- + net/mac80211/ieee80211_i.h | 4 +- + net/mac80211/status.c | 2 +- + net/mac80211/tx.c | 7 + + net/wireless/nl80211.c | 476 ++++++++++++++------- + net/wireless/rdev-ops.h | 10 +- + net/wireless/trace.h | 2 +- + net/wireless/wext-core.c | 6 +- + 25 files changed, 693 insertions(+), 294 deletions(-) +Merging ath-next/for-next (f78703024c71a wifi: ath6kl: avoid buffer overreads in WMI event handlers) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Auto-merging drivers/net/wireless/ath/ath10k/htt_rx.c +Auto-merging drivers/net/wireless/ath/ath11k/dp_rx.c +Auto-merging drivers/net/wireless/ath/ath12k/mac.c +Auto-merging drivers/net/wireless/ath/ath12k/pci.c +Auto-merging drivers/net/wireless/ath/ath12k/peer.c +Auto-merging drivers/net/wireless/ath/ath12k/wifi7/hw.c +Auto-merging drivers/net/wireless/ath/ath6kl/wmi.c +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath10k/ahb.c | 12 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 6 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 32 +-- + drivers/net/wireless/ath/ath11k/wmi.c | 6 + + drivers/net/wireless/ath/ath12k/Kconfig | 2 +- + drivers/net/wireless/ath/ath12k/ahb.c | 11 +- + drivers/net/wireless/ath/ath12k/ahb.h | 2 +- + drivers/net/wireless/ath/ath12k/core.c | 9 +- + drivers/net/wireless/ath/ath12k/core.h | 5 +- + 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 | 15 +- + drivers/net/wireless/ath/ath12k/mac.c | 39 ++- + drivers/net/wireless/ath/ath12k/pci.c | 12 +- + drivers/net/wireless/ath/ath12k/peer.c | 132 ++++++++--- + drivers/net/wireless/ath/ath12k/peer.h | 14 +- + drivers/net/wireless/ath/ath12k/qmi.c | 261 ++++++++++++--------- + drivers/net/wireless/ath/ath12k/qmi.h | 34 +-- + 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_rx_desc.h | 34 ++- + .../net/wireless/ath/ath12k/wifi7/hal_wcn7850.c | 13 +- + drivers/net/wireless/ath/ath12k/wifi7/hw.c | 67 ++++-- + drivers/net/wireless/ath/ath12k/wmi.c | 65 +++-- + drivers/net/wireless/ath/ath12k/wmi.h | 8 + + drivers/net/wireless/ath/ath6kl/wmi.c | 17 +- + kernel/irq/manage.c | 1 + + 32 files changed, 635 insertions(+), 392 deletions(-) +Merging iwlwifi-next/next (905f57aefde4f wifi: iwlwifi: mei: pass correct argument to function) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi-next/next +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/pnvm.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mld/agg.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mld/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mld/mcc.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/d3.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 4 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 41 +++++++++++- + drivers/net/wireless/intel/iwlwifi/fw/dump.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 6 ++ + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 13 +++- + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 26 +++++--- + drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 8 ++- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 33 +++++++++- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 22 ++++++- + drivers/net/wireless/intel/iwlwifi/mei/main.c | 28 ++++++-- + drivers/net/wireless/intel/iwlwifi/mld/agg.c | 9 ++- + drivers/net/wireless/intel/iwlwifi/mld/d3.c | 70 ++++++++++++++------ + .../net/wireless/intel/iwlwifi/mld/ftm-initiator.c | 21 ++++++ + .../net/wireless/intel/iwlwifi/mld/ftm-initiator.h | 1 + + drivers/net/wireless/intel/iwlwifi/mld/hcmd.h | 9 ++- + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 19 ++++-- + drivers/net/wireless/intel/iwlwifi/mld/mac80211.h | 2 + + drivers/net/wireless/intel/iwlwifi/mld/mcc.c | 26 +++++--- + drivers/net/wireless/intel/iwlwifi/mld/mld.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mld/mld.h | 2 - + drivers/net/wireless/intel/iwlwifi/mld/notif.c | 2 +- + .../net/wireless/intel/iwlwifi/mld/regulatory.c | 74 ++++++++++++++++------ + drivers/net/wireless/intel/iwlwifi/mld/sta.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 36 +++++++++++ + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 23 +++++-- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 10 +-- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 54 +++------------- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 + + .../wireless/intel/iwlwifi/pcie/gen1_2/tx-gen2.c | 2 + + .../net/wireless/intel/iwlwifi/pcie/gen1_2/tx.c | 11 +++- + 36 files changed, 434 insertions(+), 161 deletions(-) +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 (adfc275b317c0 mtd: parsers: redboot: reject unterminated FIS names) +$ 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/atmel/nand-controller.c | 3 +- + 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 +++++++++++++++++++++++++++ + drivers/mtd/parsers/redboot.c | 9 +- + include/linux/mtd/spinand.h | 1 + + 8 files changed, 252 insertions(+), 11 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 (df373d39c6f03 crypto: qce - Mark QCE as BROKEN) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging MAINTAINERS +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/char/hw_random/airoha-trng.c +Auto-merging drivers/char/hw_random/atmel-rng.c +Auto-merging drivers/char/hw_random/imx-rngc.c +Auto-merging drivers/char/hw_random/xgene-rng.c +Auto-merging drivers/char/hw_random/xilinx-trng.c +Auto-merging drivers/crypto/atmel-tdes.c +Auto-merging drivers/crypto/ccp/sev-dev.c +Auto-merging lib/rhashtable.c +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-firmware-sev-vulnerabilities | 19 ++ + Documentation/admin-guide/sysctl/crypto.rst | 36 +++ + Documentation/crypto/architecture.rst | 2 +- + Documentation/crypto/userspace-if.rst | 13 +- + .../bindings/crypto/qcom,inline-crypto-engine.yaml | 5 + + .../devicetree/bindings/crypto/qcom,prng.yaml | 1 + + .../bindings/rng/inside-secure,safexcel-eip76.yaml | 2 +- + MAINTAINERS | 2 +- + arch/arm/configs/multi_v7_defconfig | 3 +- + arch/arm/configs/qcom_defconfig | 2 +- + arch/arm64/configs/defconfig | 3 +- + arch/powerpc/crypto/aes_cbc.c | 6 +- + crypto/af_alg.c | 72 +++++- + crypto/algif_aead.c | 11 + + crypto/algif_hash.c | 24 ++ + crypto/algif_rng.c | 9 + + crypto/algif_skcipher.c | 23 ++ + crypto/api.c | 2 +- + crypto/crypto_user.c | 9 +- + crypto/ecc.c | 98 +++++---- + crypto/hctr2.c | 3 +- + crypto/lrw.c | 2 +- + crypto/lskcipher.c | 3 +- + crypto/xts.c | 3 +- + drivers/char/hw_random/Kconfig | 13 +- + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/airoha-trng.c | 4 +- + drivers/char/hw_random/atmel-rng.c | 2 +- + drivers/char/hw_random/cctrng.c | 2 +- + drivers/char/hw_random/core.c | 4 +- + drivers/char/hw_random/imx-rngc.c | 2 +- + drivers/char/hw_random/jh7110-trng.c | 3 +- + drivers/char/hw_random/ks-sa-rng.c | 9 +- + drivers/char/hw_random/omap-rng.c | 35 +-- + drivers/{crypto => char/hw_random}/qcom-rng.c | 156 +++---------- + drivers/char/hw_random/xgene-rng.c | 2 +- + drivers/char/hw_random/xilinx-trng.c | 32 ++- + drivers/crypto/Kconfig | 18 +- + drivers/crypto/Makefile | 1 - + drivers/crypto/allwinner/Kconfig | 16 -- + drivers/crypto/allwinner/sun8i-ce/Makefile | 1 - + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 63 ------ + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c | 159 -------------- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 29 --- + drivers/crypto/allwinner/sun8i-ss/Makefile | 1 - + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 45 ---- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 177 --------------- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss.h | 23 -- + drivers/crypto/amcc/crypto4xx_core.c | 11 +- + drivers/crypto/aspeed/aspeed-acry.c | 2 +- + drivers/crypto/aspeed/aspeed-hace.c | 2 +- + drivers/crypto/atmel-ecc.c | 50 ++--- + drivers/crypto/atmel-i2c.c | 5 +- + drivers/crypto/atmel-sha204a.c | 16 +- + drivers/crypto/atmel-tdes.c | 66 +++--- + drivers/crypto/caam/Kconfig | 9 - + drivers/crypto/caam/Makefile | 1 - + drivers/crypto/caam/caamprng.c | 241 --------------------- + drivers/crypto/caam/intern.h | 15 -- + drivers/crypto/caam/jr.c | 2 - + drivers/crypto/cavium/nitrox/nitrox_hal.c | 3 +- + drivers/crypto/ccp/ccp-crypto-sha.c | 2 +- + drivers/crypto/ccp/sev-dev.c | 196 ++++++++++++++++- + drivers/crypto/ccp/sev-dev.h | 3 + + drivers/crypto/gemini/sl3516-ce-cipher.c | 8 - + drivers/crypto/hisilicon/qm.c | 5 +- + drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c | 1 + + .../crypto/intel/keembay/keembay-ocs-aes-core.c | 4 +- + drivers/crypto/intel/keembay/keembay-ocs-ecc.c | 1 + + drivers/crypto/intel/qat/qat_common/adf_aer.c | 2 + + drivers/crypto/intel/qat/qat_common/adf_cfg.c | 7 +- + .../crypto/intel/qat/qat_common/adf_cfg_services.c | 15 +- + .../crypto/intel/qat/qat_common/adf_cfg_services.h | 2 +- + .../crypto/intel/qat/qat_common/adf_mstate_mgr.c | 3 +- + drivers/crypto/intel/qat/qat_common/adf_sysfs.c | 2 +- + .../intel/qat/qat_common/adf_transport_debug.c | 3 +- + drivers/crypto/intel/qat/qat_common/qat_algs.c | 1 + + .../crypto/intel/qat/qat_common/qat_compression.c | 3 +- + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 4 +- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 4 +- + drivers/crypto/mxs-dcp.c | 2 +- + drivers/crypto/qce/aead.c | 56 +---- + drivers/crypto/qce/common.c | 55 +---- + drivers/crypto/qce/common.h | 16 +- + drivers/crypto/qce/regs-v5.h | 4 - + drivers/crypto/qce/sha.c | 61 +----- + drivers/crypto/qce/sha.h | 1 - + drivers/crypto/qce/skcipher.c | 97 +-------- + drivers/crypto/rockchip/rk3288_crypto_ahash.c | 7 +- + drivers/crypto/sa2ul.c | 6 +- + drivers/gpu/drm/ci/arm64.config | 2 +- + include/crypto/aes.h | 2 +- + include/crypto/if_alg.h | 8 + + include/linux/psp-sev.h | 51 +++++ + include/linux/rhashtable.h | 1 - + lib/rhashtable.c | 2 + + 96 files changed, 783 insertions(+), 1428 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-sev-vulnerabilities + rename drivers/{crypto => char/hw_random}/qcom-rng.c (53%) + delete mode 100644 drivers/crypto/allwinner/sun8i-ce/sun8i-ce-prng.c + delete mode 100644 drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c + delete mode 100644 drivers/crypto/caam/caamprng.c +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 (a1c81cb052730 Merge tag 'drm-intel-gt-next-2026-07-16' of https://gitlab.freedesktop.org/drm/i915/kernel into drm-next) + 0421fc6ab3a85 ("drm/amd/display: fix __udivdi3 link error") + 11a90eaf5c808 ("drm/amd/display: Fix 8K Mode Not Parsed by EDID") + 11c141672045f ("drm/amdgpu: Fix VFCT bus number matching with soft filter") + 14a2012a49025 ("drm/i915/gt: use correct selftest config symbol") + 183bbded999a7 ("drm/amd/display: fix dcn42b det allocation order") + 198663d035cc4 ("drm/amd/display: fix dcn42 det allocation order") + 1fff2e07b6670 ("drm/amdkfd: free MQD managers on DQM init failures") + 28ec64943e3ee ("drm/amd/display: dce100: skip non-DP stream encoders for DP MST") + 2f79f0130f828 ("drm/amd/display: Set native cursor mode for disabled CRTCs") + 319f7e13423ae ("drm/amdkfd: fix 32-bit overflow in CWSR total size calculation") + 358dd0a9ce66d ("drm/amd/pm/si: Fix AC/DC switch notification") + 3ddc0ae76202c ("drm/amdgpu: fix bo->pin leaking in amdgpu_bo_create_reserved") + 4e2c0821509fe ("drm/amdgpu: Reserve space for IB contents in devcoredumps") + 516f8fc30a1b5 ("drm/amd/pm/smu7: Fix AC/DC switch notification") + 682ea2d28d18b ("drm/i915/selftests: Fix GT PM sort comparators") + 85453fb4ff726 ("drm/amd/display: wire DCN42B mcache programming callback") + 871ceb853841b ("drm/amd/display: Add dp_skip_rbr flag for NUTMEG") + 99f3af19073b3 ("drm/amd/display: set new_stream to NULL after release") + 9ceb4e034a327 ("drm/amdgpu: Disable PCIe dynamic speed switching on Ryzen Pinnacle Ridge") + a8171229bc836 ("drm/amdgpu/ttm: Consider concurrent VM flushes for buffer entities") + b7d69145907cd ("drm/amd/display: Fix DCN42B null registers & register masks") + bc639a9eadc75 ("drm/amdgpu: always emit the job vm fence") + bd018d36171a6 ("drm/amd/pm/si: Don't schedule thermal work when queue isn't initialized") + ca5988682b4cb ("drm/amdgpu: Release VFCT ACPI table reference") + d34acad064ee7 ("drm/amd/pm/ci: Don't disable MCLK DPM on Bonaire 0x6658 (R7 260X)") + e78b0a367f869 ("drm/amd/display: Fix preferred link rate for NUTMEG") + ee186ae23ab0f ("Revert "drm/amd/display: Restore 5s vbl offdelay for NV3x+ DGPUs"") + f8ee6447e7ec1 ("drm/amdgpu/discovery: Fix device family for DCN42") + fed7aa36d7980 ("drm/amdgpu: Print vmid, pasid and more task info in devcoredump") +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging .mailmap +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/accel/amdxdna/amdxdna_gem.c +Auto-merging drivers/gpu/buddy.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_bios.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_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc21.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_events.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.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_crtc.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/link/link_detection.c +Auto-merging drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.h +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c +Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/drm_gpusvm.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_lt_phy.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.c +Auto-merging drivers/gpu/drm/panthor/panthor_gem.c +Auto-merging drivers/gpu/drm/ttm/ttm_pool.c +Auto-merging drivers/gpu/drm/v3d/v3d_submit.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_kms.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_vq.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_vram.c +Auto-merging drivers/gpu/drm/xe/tests/xe_pci.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_pt.c +Auto-merging drivers/gpu/drm/xe/xe_vm_madvise.c +Auto-merging kernel/events/core.c +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c' +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/core/dc.c' +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c' +Recorded preimage for 'drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c'. +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/core/dc.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/resource/dcn42b/dcn42b_resource.c'. +Recorded resolution for 'drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h'. +[master 71105826f28dd] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git +$ git diff -M --stat --summary HEAD^.. + .clang-format | 2 +- + .mailmap | 1 + + .../ABI/testing/sysfs-driver-intel-xe-hwmon | 7 + + 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 + + .../gpu/amdgpu/display/display-manager.rst | 9 + + Documentation/gpu/automated_testing.rst | 3 +- + Documentation/gpu/drm-kms-helpers.rst | 6 + + Documentation/gpu/drm-kms.rst | 12 + + .../gpu/intel-display/dp-link-training.rst | 8 + + Documentation/gpu/intel-display/index.rst | 1 + + Documentation/gpu/todo.rst | 50 +- + MAINTAINERS | 20 +- + 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/accel/rocket/rocket_job.c | 32 +- + drivers/dma-buf/dma-fence-unwrap.c | 8 +- + drivers/dma-buf/dma-fence.c | 22 +- + drivers/dma-buf/dma-heap.c | 3 +- + drivers/dma-buf/st-dma-fence-chain.c | 4 +- + drivers/dma-buf/st-dma-fence-unwrap.c | 42 +- + drivers/dma-buf/st-dma-fence.c | 16 +- + drivers/dma-buf/st-dma-resv.c | 10 +- + drivers/firmware/Kconfig | 28 +- + drivers/gpu/buddy.c | 105 +- + drivers/gpu/drm/adp/adp-mipi.c | 4 + + drivers/gpu/drm/amd/amdgpu/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 320 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 985 --- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 232 - + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 68 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.h | 151 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 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_gfx_v11.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c | 3 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12_1.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 184 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 62 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 135 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cper.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 215 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 349 +- + 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 | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 290 +- + 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_ih.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ip.c | 157 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 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 | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 486 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 108 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 293 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 89 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 23 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 +- + 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 | 1008 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 514 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 26 - + drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 206 +- + 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_ucode.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 266 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 44 - + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 165 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 19 +- + 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 + + .../amdgpu_video_codecs.h} | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_wb.c | 129 + + drivers/gpu/drm/amd/amdgpu/amdgpu_wb.h | 102 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 302 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 61 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 66 +- + drivers/gpu/drm/amd/amdgpu/atom.h | 3 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 8 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 66 - + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 57 - + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 57 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 373 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 268 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 285 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 236 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 1097 +-- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 125 - + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.h | 4 + + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 21 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 88 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.h | 4 + + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 94 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h | 8 + + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.c | 66 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_3_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 165 +- + drivers/gpu/drm/amd/amdgpu/mes_userqueue.h | 9 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 333 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 273 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_1.c | 363 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 231 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c | 65 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 7 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 10 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 73 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 204 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 10 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 28 +- + drivers/gpu/drm/amd/amdgpu/si.c | 12 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 8 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 10 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 61 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 13 +- + drivers/gpu/drm/amd/amdgpu/soc24.c | 12 +- + drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 40 - + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 736 +- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 31 - + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 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 | 23 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 17 +- + drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 115 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 24 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 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 | 32 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 147 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 2 +- + 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 | 7259 +------------------- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 90 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_audio.c | 337 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_audio.h | 58 + + .../amd/display/amdgpu_dm/amdgpu_dm_backlight.c | 737 ++ + .../amd/display/amdgpu_dm/amdgpu_dm_backlight.h | 90 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 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 | 3715 ++++++++++ + .../amd/display/amdgpu_dm/amdgpu_dm_connector.h | 177 + + .../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 | 949 +++ + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.h | 68 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 191 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 17 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 136 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.h | 61 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 1762 ++++- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 84 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_ism.c | 4 + + .../display/amdgpu_dm/amdgpu_dm_kunit_helpers.h | 1 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 193 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 26 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 182 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 60 + + .../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 | 34 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h | 17 + + .../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 | 608 ++ + .../amdgpu_dm/tests/amdgpu_dm_backlight_test.c | 1950 ++++++ + .../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 | 3813 ++++++++++ + .../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 | 537 +- + .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 3907 +++++++++++ + .../display/amdgpu_dm/tests/amdgpu_dm_irq_test.c | 4096 +++++++++++ + .../display/amdgpu_dm/tests/amdgpu_dm_ism_test.c | 392 +- + .../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 | 1429 ++++ + .../display/amdgpu_dm/tests/amdgpu_dm_plane_test.c | 3284 +++++++++ + .../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 | 436 ++ + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 57 +- + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h | 9 + + .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 16 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 355 +- + .../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_stream.c | 21 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 44 +- + drivers/gpu/drm/amd/display/dc/dc.h | 243 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 45 +- + 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 | 75 +- + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c | 11 +- + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h | 5 +- + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c | 61 +- + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/Makefile | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 9 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 73 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_cacp.c | 213 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_cacp.h | 20 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 4 +- + .../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 + + .../amd/display/dc/dio/dcn10/dcn10_link_encoder.c | 10 +- + .../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 +- + .../dml2_0/dml21/inc/bounding_boxes/dcn42_soc_bb.h | 6 - + .../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 - + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 25 +- + .../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 +- + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 3 +- + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.h | 4 +- + .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.c | 3 +- + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h | 3 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 2 +- + .../gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.c | 57 +- + .../gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.h | 5 + + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 20 +- + .../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/dcn21/dcn21_hwseq.c | 40 +- + .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.h | 2 + + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 10 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 70 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 36 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 18 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 364 +- + .../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 | 329 +- + .../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/abm.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 | 27 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 194 +- + 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_irq_handler.c | 1 - + .../dc/link/protocols/link_dp_panel_replay.c | 3 +- + .../dc/link/protocols/link_edp_panel_control.c | 21 +- + .../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 +- + .../display/dc/resource/dcn401/dcn401_resource.h | 3 +- + .../amd/display/dc/resource/dcn42/dcn42_resource.c | 11 +- + .../amd/display/dc/resource/dcn42/dcn42_resource.h | 1 + + .../display/dc/resource/dcn42b/dcn42b_resource.c | 25 +- + .../display/dc/resource/dcn42b/dcn42b_resource.h | 43 +- + .../amd/display/dc/soc_and_ip_translator/Makefile | 3 + + .../dcn401/dcn401_soc_and_ip_translator.c | 16 + + .../dcn42/dcn42_soc_and_ip_translator.c | 18 +- + .../dcn42/dcn42_soc_and_ip_translator.h | 1 + + .../dcn42b/dcn42b_soc_and_ip_translator.c | 42 + + .../dcn42b/dcn42b_soc_and_ip_translator.h | 17 + + .../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/dmub_srv.h | 9 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 289 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 55 +- + .../drm/amd/display/include/ddc_service_types.h | 1 + + drivers/gpu/drm/amd/display/include/gpio_types.h | 48 + + .../gpu/drm/amd/display/modules/inc/mod_power.h | 11 + + drivers/gpu/drm/amd/display/modules/power/Makefile | 2 +- + drivers/gpu/drm/amd/display/modules/power/power.c | 28 +- + .../gpu/drm/amd/display/modules/power/power_abm.c | 150 +- + .../drm/amd/display/modules/power/power_helpers.h | 10 + + .../gpu/drm/amd/display/modules/power/power_psr.c | 7 + + .../drm/amd/display/modules/power/power_replay.c | 16 +- + drivers/gpu/drm/amd/include/amd_shared.h | 6 - + .../amd/include/asic_reg/sdma/sdma_4_4_2_offset.h | 4 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 3 + + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 52 +- + drivers/gpu/drm/amd/include/mes_v12_api_def.h | 5 +- + drivers/gpu/drm/amd/include/soc15_hw_ip.h | 1 + + drivers/gpu/drm/amd/include/v9_structs.h | 4 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 7 - + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 116 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 1 - + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 21 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 38 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c | 11 +- + .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 753 +- + .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 450 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 60 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 83 +- + .../pm/powerplay/hwmgr/vega10_processpptables.c | 761 +- + .../pm/powerplay/hwmgr/vega12_processpptables.c | 7 + + .../pm/powerplay/hwmgr/vega20_processpptables.c | 7 + + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 20 + + .../gpu/drm/amd/pm/powerplay/smumgr/smu7_smumgr.c | 25 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 45 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 44 +- + 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 | 136 - + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 674 -- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 31 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 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 +- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c | 7 +- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 140 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 13 + + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 1 - + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c | 84 +- + .../drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.c | 2 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c | 79 +- + 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/bridge/adv7511/adv7511_drv.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 13 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 13 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 19 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 6 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 32 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 2 +- + drivers/gpu/drm/bridge/aux-bridge.c | 4 + + drivers/gpu/drm/bridge/aux-hpd-bridge.c | 4 + + drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 9 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 8 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 2 +- + drivers/gpu/drm/bridge/chrontel-ch7033.c | 13 +- + drivers/gpu/drm/bridge/cros-ec-anx7688.c | 4 + + 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-lt8713sx.c | 4 + + drivers/gpu/drm/bridge/lontium-lt8912b.c | 8 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 3 + + drivers/gpu/drm/bridge/lvds-codec.c | 12 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 3 + + drivers/gpu/drm/bridge/microchip-lvds.c | 3 + + drivers/gpu/drm/bridge/nwl-dsi.c | 2 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 17 +- + drivers/gpu/drm/bridge/of-display-mode-bridge.c | 6 +- + drivers/gpu/drm/bridge/panel.c | 2 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 18 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 2 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 4 +- + drivers/gpu/drm/bridge/sii902x.c | 6 +- + drivers/gpu/drm/bridge/sii9234.c | 39 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 4 + + drivers/gpu/drm/bridge/simple-bridge.c | 13 +- + 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/tc358764.c | 13 +- + drivers/gpu/drm/bridge/tc358767.c | 6 +- + drivers/gpu/drm/bridge/tc358768.c | 2 +- + drivers/gpu/drm/bridge/tc358775.c | 2 +- + drivers/gpu/drm/bridge/tda998x_drv.c | 13 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 14 +- + 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 | 12 +- + drivers/gpu/drm/bridge/ti-tpd12s015.c | 4 + + drivers/gpu/drm/bridge/waveshare-dsi.c | 14 +- + drivers/gpu/drm/clients/drm_log.c | 10 +- + drivers/gpu/drm/display/drm_bridge_connector.c | 45 +- + drivers/gpu/drm/display/drm_hdmi_state_helper.c | 68 +- + drivers/gpu/drm/drm_atomic.c | 82 +- + drivers/gpu/drm/drm_atomic_helper.c | 86 + + drivers/gpu/drm/drm_atomic_state_helper.c | 154 +- + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_blend.c | 20 +- + drivers/gpu/drm/drm_bridge.c | 187 +- + drivers/gpu/drm/drm_buddy.c | 30 +- + drivers/gpu/drm/drm_colorop.c | 41 +- + drivers/gpu/drm/drm_connector.c | 192 +- + drivers/gpu/drm/drm_displayid_internal.h | 24 + + drivers/gpu/drm/drm_draw_internal.h | 7 - + drivers/gpu/drm/drm_drv.c | 4 +- + drivers/gpu/drm/drm_dumb_buffers.c | 1 - + drivers/gpu/drm/drm_edid.c | 80 +- + drivers/gpu/drm/drm_exec.c | 2 +- + drivers/gpu/drm/drm_fb_helper.c | 11 +- + drivers/gpu/drm/drm_gem.c | 3 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 22 +- + drivers/gpu/drm/drm_gpusvm.c | 243 +- + drivers/gpu/drm/drm_gpuvm.c | 44 - + drivers/gpu/drm/drm_mode_config.c | 210 +- + drivers/gpu/drm/drm_modes.c | 23 + + drivers/gpu/drm/drm_of.c | 46 +- + drivers/gpu/drm/drm_panel.c | 44 +- + drivers/gpu/drm/drm_panic.c | 6 +- + drivers/gpu/drm/drm_print.c | 4 +- + drivers/gpu/drm/drm_syncobj.c | 2 +- + drivers/gpu/drm/drm_writeback.c | 6 + + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 23 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 14 +- + 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/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_crtc.c | 2 +- + 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 | 539 +- + 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 | 14 +- + 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 | 54 +- + drivers/gpu/drm/i915/display/intel_plane.h | 5 +- + drivers/gpu/drm/i915/display/intel_psr.c | 264 +- + 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/gt/intel_reset.c | 2 +- + .../gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c | 2 +- + drivers/gpu/drm/i915/gvt/edid.c | 14 +- + drivers/gpu/drm/i915/i915_active.c | 2 +- + drivers/gpu/drm/i915/i915_driver.c | 123 +- + drivers/gpu/drm/i915/i915_panic.c | 35 - + drivers/gpu/drm/i915/i915_panic.h | 9 - + drivers/gpu/drm/imagination/pvr_drv.c | 2 +- + drivers/gpu/drm/imx/dc/dc-ic.c | 6 +- + 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/mcde/mcde_dsi.c | 3 + + drivers/gpu/drm/mediatek/mtk_dp.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 12 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 2 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- + drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 2 +- + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 2 +- + drivers/gpu/drm/meson/meson_encoder_dsi.c | 2 +- + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 24 +- + drivers/gpu/drm/msm/dp/dp_drm.c | 4 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 25 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 13 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 2 - + drivers/gpu/drm/mxsfb/lcdif_drv.c | 2 +- + drivers/gpu/drm/mxsfb/lcdif_kms.c | 18 +- + drivers/gpu/drm/mxsfb/lcdif_regs.h | 1 + + drivers/gpu/drm/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 +- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fbsr.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 39 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h | 1 + + drivers/gpu/drm/omapdrm/dss/dpi.c | 14 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 14 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 2 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 14 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 14 +- + drivers/gpu/drm/panel/Kconfig | 56 + + drivers/gpu/drm/panel/Makefile | 5 + + drivers/gpu/drm/panel/panel-anbernic-td4310.c | 258 + + .../gpu/drm/panel/panel-boe-th101mb31ig002-28a.c | 3 +- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 3 +- + drivers/gpu/drm/panel/panel-chipone-icna35xx.c | 423 ++ + drivers/gpu/drm/panel/panel-chipwealth-ch13726a.c | 3 +- + drivers/gpu/drm/panel/panel-edp.c | 24 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 3 +- + drivers/gpu/drm/panel/panel-focaltech-ota7290b.c | 3 +- + drivers/gpu/drm/panel/panel-himax-hx83102.c | 3 +- + drivers/gpu/drm/panel/panel-himax-hx83121a.c | 39 +- + drivers/gpu/drm/panel/panel-himax-hx8394.c | 3 +- + drivers/gpu/drm/panel/panel-ilitek-ili7807s.c | 285 + + drivers/gpu/drm/panel/panel-ilitek-ili9488.c | 290 + + drivers/gpu/drm/panel/panel-ilitek-ili9806e-dsi.c | 3 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 3 +- + drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 3 +- + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 2 +- + drivers/gpu/drm/panel/panel-lvds.c | 2 +- + drivers/gpu/drm/panel/panel-novatek-nt36523.c | 3 +- + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 522 +- + drivers/gpu/drm/panel/panel-novatek-nt37801.c | 106 +- + drivers/gpu/drm/panel/panel-renesas-r63419.c | 351 + + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 10 +- + drivers/gpu/drm/panel/panel-simple.c | 2 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 3 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 3 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 3 +- + drivers/gpu/drm/panel/panel-visionox-vtdr6130.c | 42 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 1 + + 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/panthor/panthor_sched.c | 1 - + drivers/gpu/drm/qxl/qxl_display.c | 12 +- + drivers/gpu/drm/qxl/qxl_drv.c | 15 +- + drivers/gpu/drm/radeon/r600_dpm.c | 21 +- + drivers/gpu/drm/radeon/radeon_bios.c | 64 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 20 +- + drivers/gpu/drm/renesas/rcar-du/rcar_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 | 40 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 11 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 9 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c | 8 +- + drivers/gpu/drm/rockchip/dw_dp-rockchip.c | 16 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 228 +- + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 112 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 10 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 4 + + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 176 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 11 +- + drivers/gpu/drm/rockchip/rockchip_rgb.c | 8 +- + 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 | 360 +- + drivers/gpu/drm/sti/sti_dvo.c | 20 +- + drivers/gpu/drm/sti/sti_hda.c | 20 +- + drivers/gpu/drm/sti/sti_hdmi.c | 20 +- + drivers/gpu/drm/stm/lvds.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 11 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 10 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 10 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 10 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 10 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 8 +- + drivers/gpu/drm/sysfb/Kconfig | 7 +- + drivers/gpu/drm/sysfb/simpledrm.c | 120 +- + 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 | 1017 ++- + drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 347 +- + drivers/gpu/drm/tests/drm_kunit_edid.c | 995 +++ + drivers/gpu/drm/tests/drm_kunit_edid.h | 985 +-- + drivers/gpu/drm/tidss/tidss_crtc.c | 17 +- + drivers/gpu/drm/tidss/tidss_encoder.c | 2 +- + drivers/gpu/drm/tidss/tidss_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 | 83 +- + drivers/gpu/drm/v3d/v3d_gem.c | 7 +- + drivers/gpu/drm/v3d/v3d_irq.c | 7 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 189 +- + drivers/gpu/drm/v3d/v3d_power.c | 4 + + drivers/gpu/drm/v3d/v3d_sched.c | 103 +- + drivers/gpu/drm/v3d/v3d_submit.c | 966 +-- + 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/Kconfig.profile | 71 +- + drivers/gpu/drm/xe/Makefile | 2 + + 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/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_bo.c | 2 +- + drivers/gpu/drm/xe/xe_debugfs.c | 1 - + drivers/gpu/drm/xe/xe_device.c | 38 +- + 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 | 8 +- + 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_sched_job.c | 2 +- + drivers/gpu/drm/xe/xe_step.c | 38 +- + drivers/gpu/drm/xe/xe_step.h | 8 +- + drivers/gpu/drm/xe/xe_svm.c | 68 +- + drivers/gpu/drm/xe/xe_svm.h | 14 +- + 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_userptr.c | 7 +- + drivers/gpu/drm/xe/xe_vm.c | 4 +- + 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 + + 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 | 149 +- + 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_gpusvm.h | 67 +- + include/drm/drm_gpuvm.h | 4 +- + include/drm/drm_managed.h | 2 +- + include/drm/drm_mipi_dsi.h | 2 + + include/drm/drm_mode_config.h | 1 + + include/drm/drm_modes.h | 1 + + include/drm/drm_of.h | 11 + + include/drm/drm_panel.h | 8 - + include/drm/drm_plane.h | 16 + + include/drm/drm_print.h | 2 +- + include/drm/gpu_scheduler.h | 3 +- + include/drm/intel/display_parent_interface.h | 4 +- + include/drm/intel/mchbar_regs.h | 2 - + include/drm/intel/pciids.h | 5 +- + include/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/perf_event.h | 31 +- + include/linux/sysfb.h | 4 +- + include/uapi/drm/amdgpu_drm.h | 21 + + include/uapi/drm/drm_mode.h | 1 + + include/uapi/drm/ethosu_accel.h | 60 +- + include/uapi/drm/panthor_drm.h | 26 +- + include/uapi/drm/xe_drm.h | 11 +- + kernel/cgroup/dmem.c | 15 + + kernel/events/core.c | 18 + + lib/fonts/fonts.c | 31 + + 951 files changed, 64703 insertions(+), 29987 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 Documentation/gpu/intel-display/dp-link-training.rst + create mode 100644 drivers/accel/ethosu/ethosu_perfmon.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sa.h + rename drivers/gpu/drm/amd/{display/modules/power/power_helpers.c => amdgpu/amdgpu_video_codecs.h} (63%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_wb.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_wb.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_audio.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_audio.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_backlight.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_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/dce/dmub_abm_cacp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_abm_cacp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn42b/dcn42b_soc_and_ip_translator.c + create mode 100644 drivers/gpu/drm/amd/display/dc/soc_and_ip_translator/dcn42b/dcn42b_soc_and_ip_translator.h + create mode 100644 drivers/gpu/drm/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 + 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 + 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-Fix-up-lut3d-mismerge.patch +Applying: drm: Fix up lut3d mismerge +Using index info to reconstruct a base tree... +M drivers/gpu/drm/drm_atomic.c +M include/drm/drm_colorop.h +Falling back to patching base and 3-way merge... +Auto-merging include/drm/drm_colorop.h +Auto-merging drivers/gpu/drm/drm_atomic.c +No changes -- Patch already applied. +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 (6143359440d41 drm/gma500: Remove dependency on DRM simple helpers) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging drivers/gpu/host1x/bus.c +Merge made by the 'ort' strategy. + .../display/tegra/nvidia,tegra124-vic.yaml | 1 + + .../display/tegra/nvidia,tegra20-host1x.yaml | 20 ++- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 9 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 120 +++++++------- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 10 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 9 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 9 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 9 +- + drivers/gpu/drm/solomon/ssd130x.c | 9 +- + drivers/gpu/drm/tegra/drm.c | 1 + + drivers/gpu/drm/tegra/falcon.c | 66 ++++++-- + drivers/gpu/drm/tegra/falcon.h | 23 +++ + drivers/gpu/drm/tegra/vic.c | 92 ++++++++--- + drivers/gpu/drm/tegra/vic.h | 9 +- + drivers/gpu/host1x/Makefile | 3 +- + drivers/gpu/host1x/bus.c | 2 +- + drivers/gpu/host1x/cdma.c | 3 +- + drivers/gpu/host1x/context.c | 13 +- + drivers/gpu/host1x/debug.c | 4 +- + drivers/gpu/host1x/dev.c | 41 +++++ + drivers/gpu/host1x/hw/cdma_hw.c | 14 +- + drivers/gpu/host1x/hw/channel_hw.c | 15 +- + drivers/gpu/host1x/hw/host1x10.c | 33 ++++ + drivers/gpu/host1x/hw/host1x10.h | 15 ++ + drivers/gpu/host1x/hw/host1x10_hardware.h | 21 +++ + drivers/gpu/host1x/hw/hw_host1x10_common.h | 6 + + drivers/gpu/host1x/hw/hw_host1x10_hypervisor.h | 10 ++ + drivers/gpu/host1x/hw/hw_host1x10_uclass.h | 181 +++++++++++++++++++++ + drivers/gpu/host1x/hw/hw_host1x10_vm.h | 36 ++++ + drivers/gpu/host1x/intr.c | 5 +- + drivers/gpu/host1x/job.c | 2 +- + drivers/gpu/host1x/syncpt.c | 7 +- + drivers/gpu/host1x/syncpt.h | 3 +- + 34 files changed, 672 insertions(+), 138 deletions(-) + create mode 100644 drivers/gpu/host1x/hw/host1x10.c + create mode 100644 drivers/gpu/host1x/hw/host1x10.h + create mode 100644 drivers/gpu/host1x/hw/host1x10_hardware.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x10_common.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x10_hypervisor.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x10_uclass.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x10_vm.h +$ git am -3 ../patches/0001-drm-bridge-microchip-lvds-Rename-drm_atomic_state-to.patch +Applying: drm/bridge: microchip-lvds: Rename drm_atomic_state to drm_atomic_commit +Using index info to reconstruct a base tree... +M drivers/gpu/drm/bridge/microchip-lvds.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/bridge/microchip-lvds.c +No changes -- Patch already applied. +Merging amdgpu/drm-next (8e1f8214cbba2 drm/radeon: Only define radeon_acpi_vfct_match when actually used) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git amdgpu/drm-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 5 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 38 ++++++++++++++++++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 17 ++++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 8 ++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 5 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 41 +++++++++++++++++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 18 ++++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 11 +++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 37 ++++++++++++++++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 5 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 8 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 12 ++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 6 ++-- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_3_0.c | 24 +++++++++++++ + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 19 +++------- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 10 +++--- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 10 +++--- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 26 ++++++++++++++ + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 9 +++++ + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 19 +++++++++- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 4 +-- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 16 +++++++-- + drivers/gpu/drm/radeon/radeon_bios.c | 2 +- + 32 files changed, 289 insertions(+), 85 deletions(-) +$ git am -3 ../patches/0001-amdgpu-Fix-up-drm_atomic_commit-rename.patch +Applying: amdgpu: Fix up drm_atomic_commit rename +Using index info to reconstruct a base tree... +M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +No changes -- Patch already applied. +Merging drm-intel/for-linux-next (67e955e073c6f drm/i915/display: expose blend mode on alpha-capable planes) +$ 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_dp.c +Auto-merging drivers/gpu/drm/i915/display/skl_watermark.c +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/display/xe_display_bo.c +Auto-merging drivers/gpu/drm/xe/display/xe_fb_pin.c +Merge made by the 'ort' strategy. + .../gpu/intel-display/dp-link-capabilities.rst | 11 + + Documentation/gpu/intel-display/index.rst | 1 + + drivers/gpu/drm/i915/.kunitconfig | 9 + + drivers/gpu/drm/i915/Kconfig.debug | 12 + + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 4 + + drivers/gpu/drm/i915/display/intel_audio.c | 55 +- + drivers/gpu/drm/i915/display/intel_bw.c | 92 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 3 + + drivers/gpu/drm/i915/display/intel_ddi.c | 6 +- + drivers/gpu/drm/i915/display/intel_display.c | 31 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 2 + + .../gpu/drm/i915/display/intel_display_device.h | 2 + + .../gpu/drm/i915/display/intel_display_driver.c | 71 + + .../gpu/drm/i915/display/intel_display_driver.h | 8 + + drivers/gpu/drm/i915/display/intel_display_irq.c | 2 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 4 +- + drivers/gpu/drm/i915/display/intel_display_regs.h | 3 + + drivers/gpu/drm/i915/display/intel_display_types.h | 2 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 2 + + drivers/gpu/drm/i915/display/intel_display_wa.h | 1 + + drivers/gpu/drm/i915/display/intel_dmc.c | 10 +- + drivers/gpu/drm/i915/display/intel_dp.c | 295 ++-- + drivers/gpu/drm/i915/display/intel_dp.h | 11 +- + drivers/gpu/drm/i915/display/intel_dp_link_caps.c | 759 ++++++++++- + drivers/gpu/drm/i915/display/intel_dp_link_caps.h | 172 ++- + .../gpu/drm/i915/display/intel_dp_link_training.c | 237 ++-- + .../gpu/drm/i915/display/intel_dp_link_training.h | 31 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 74 +- + drivers/gpu/drm/i915/display/intel_dp_test.c | 107 +- + drivers/gpu/drm/i915/display/intel_dp_test.h | 3 +- + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 8 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 35 +- + drivers/gpu/drm/i915/display/intel_initial_plane.c | 6 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 18 +- + drivers/gpu/drm/i915/display/intel_pmdemand.c | 12 +- + drivers/gpu/drm/i915/display/intel_psr.c | 16 + + drivers/gpu/drm/i915/display/intel_sprite.c | 4 + + drivers/gpu/drm/i915/display/intel_vrr.c | 6 + + drivers/gpu/drm/i915/display/skl_watermark.c | 6 + + drivers/gpu/drm/i915/display/tests/Makefile | 7 + + .../drm/i915/display/tests/intel_dp_link_test.c | 1440 ++++++++++++++++++++ + drivers/gpu/drm/i915/i915_driver.c | 58 +- + drivers/gpu/drm/i915/i915_initial_plane.c | 12 +- + drivers/gpu/drm/xe/.gitignore | 1 + + drivers/gpu/drm/xe/.kunitconfig-display | 11 + + drivers/gpu/drm/xe/Makefile | 3 + + drivers/gpu/drm/xe/display/tests/Makefile | 13 + + drivers/gpu/drm/xe/display/xe_display.c | 44 +- + drivers/gpu/drm/xe/display/xe_display.h | 2 + + drivers/gpu/drm/xe/display/xe_display_bo.c | 33 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 33 +- + drivers/gpu/drm/xe/display/xe_initial_plane.c | 58 +- + drivers/gpu/drm/xe/xe_pm.c | 2 + + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 16 +- + 55 files changed, 3243 insertions(+), 623 deletions(-) + create mode 100644 Documentation/gpu/intel-display/dp-link-capabilities.rst + create mode 100644 drivers/gpu/drm/i915/.kunitconfig + create mode 100644 drivers/gpu/drm/i915/display/tests/Makefile + create mode 100644 drivers/gpu/drm/i915/display/tests/intel_dp_link_test.c + create mode 100644 drivers/gpu/drm/xe/.kunitconfig-display + create mode 100644 drivers/gpu/drm/xe/display/tests/Makefile +Merging drm-msm/msm-next (e2332abed2a4d drm/msm: Only fini scheduler after successful init) +$ 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 (53a7115f9862f drm/xe/xe_ras: Add RAS GPU health indicator) +$ 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/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_pt.c +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-driver-intel-xe-ras | 30 ++ + Documentation/gpu/xe/xe_device.rst | 7 + + drivers/gpu/drm/xe/abi/guc_actions_abi.h | 1 + + drivers/gpu/drm/xe/abi/guc_capture_abi.h | 3 +- + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 39 +- + drivers/gpu/drm/xe/abi/guc_scheduler_abi.h | 3 +- + drivers/gpu/drm/xe/abi/xe_driver_klvs_abi.h | 27 ++ + drivers/gpu/drm/xe/regs/xe_pmt.h | 2 + + .../gpu/drm/xe/tests/xe_guc_klv_helpers_kunit.c | 429 ++++++++++++++++++++ + drivers/gpu/drm/xe/tests/xe_sriov_packet_kunit.c | 89 +++++ + drivers/gpu/drm/xe/xe_bo.c | 58 ++- + drivers/gpu/drm/xe/xe_bo.h | 3 +- + drivers/gpu/drm/xe/xe_bo_types.h | 2 + + drivers/gpu/drm/xe/xe_configfs.c | 65 +++ + drivers/gpu/drm/xe/xe_configfs.h | 2 + + drivers/gpu/drm/xe/xe_debugfs.c | 87 ++++- + drivers/gpu/drm/xe/xe_debugfs.h | 6 + + drivers/gpu/drm/xe/xe_device.c | 4 +- + drivers/gpu/drm/xe/xe_device_types.h | 2 +- + drivers/gpu/drm/xe/xe_dma_buf.c | 2 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 17 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 27 ++ + drivers/gpu/drm/xe/xe_execlist.c | 1 + + drivers/gpu/drm/xe/xe_gt.c | 5 +- + drivers/gpu/drm/xe/xe_gt.h | 14 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 5 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c | 5 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 47 +++ + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 4 + + drivers/gpu/drm/xe/xe_gt_types.h | 17 +- + drivers/gpu/drm/xe/xe_guc.c | 70 ++++ + drivers/gpu/drm/xe/xe_guc.h | 23 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 134 +++++-- + drivers/gpu/drm/xe/xe_guc_capture.c | 21 +- + drivers/gpu/drm/xe/xe_guc_capture.h | 6 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 43 +- + drivers/gpu/drm/xe/xe_guc_engine_activity.c | 12 +- + drivers/gpu/drm/xe/xe_guc_exec_queue_types.h | 12 + + drivers/gpu/drm/xe/xe_guc_fwif.h | 1 + + drivers/gpu/drm/xe/xe_guc_klv_helpers.c | 260 +++++++++++- + drivers/gpu/drm/xe/xe_guc_klv_helpers.h | 10 + + drivers/gpu/drm/xe/xe_guc_submit.c | 434 ++++++++++++++++++--- + drivers/gpu/drm/xe/xe_guc_submit.h | 1 + + drivers/gpu/drm/xe/xe_guc_types.h | 2 - + drivers/gpu/drm/xe/xe_hw_engine.c | 82 +++- + drivers/gpu/drm/xe/xe_hw_engine_group.c | 85 +++- + drivers/gpu/drm/xe/xe_hw_engine_types.h | 7 +- + drivers/gpu/drm/xe/xe_hw_error.c | 11 +- + drivers/gpu/drm/xe/xe_migrate.c | 37 +- + drivers/gpu/drm/xe/xe_migrate.h | 1 + + drivers/gpu/drm/xe/xe_module.c | 49 +++ + drivers/gpu/drm/xe/xe_module.h | 5 + + drivers/gpu/drm/xe/xe_nvm.c | 9 +- + drivers/gpu/drm/xe/xe_pci.c | 34 +- + drivers/gpu/drm/xe/xe_pci_error.c | 21 +- + drivers/gpu/drm/xe/xe_pci_types.h | 2 + + drivers/gpu/drm/xe/xe_pcode.c | 32 ++ + drivers/gpu/drm/xe/xe_pcode.h | 7 + + drivers/gpu/drm/xe/xe_preempt_fence.c | 7 + + drivers/gpu/drm/xe/xe_pt.c | 3 + + drivers/gpu/drm/xe/xe_ras.c | 276 ++++++++++++- + drivers/gpu/drm/xe/xe_ras.h | 2 + + drivers/gpu/drm/xe/xe_ras_types.h | 97 +++++ + drivers/gpu/drm/xe/xe_sriov_packet.c | 115 +++--- + drivers/gpu/drm/xe/xe_sriov_vf_ccs.c | 20 +- + drivers/gpu/drm/xe/xe_sriov_vf_ccs.h | 3 +- + drivers/gpu/drm/xe/xe_sysctrl_event.c | 2 +- + drivers/gpu/drm/xe/xe_sysctrl_event_types.h | 3 - + drivers/gpu/drm/xe/xe_sysctrl_mailbox_types.h | 9 + + drivers/gpu/drm/xe/xe_trace.h | 5 + + drivers/gpu/drm/xe/xe_uc_fw.c | 1 + + drivers/gpu/drm/xe/xe_vm.c | 43 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 5 + + drivers/gpu/drm/xe/xe_wopcm.c | 15 +- + include/uapi/drm/xe_drm.h | 6 +- + 76 files changed, 2692 insertions(+), 335 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-xe-ras + create mode 100644 drivers/gpu/drm/xe/abi/xe_driver_klvs_abi.h + create mode 100644 drivers/gpu/drm/xe/tests/xe_guc_klv_helpers_kunit.c + create mode 100644 drivers/gpu/drm/xe/tests/xe_sriov_packet_kunit.c +$ 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 (ce2d97f714c8a gpu: nova-core: store Fsp instance in Gpu) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/for-linux-next +Auto-merging drivers/gpu/drm/drm_drv.c +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/drm_drv.c | 34 +- + drivers/gpu/drm/nova/Makefile | 5 +- + drivers/gpu/drm/nova/driver.rs | 36 +- + drivers/gpu/drm/nova/file.rs | 22 +- + drivers/gpu/drm/nova/gem.rs | 18 +- + drivers/gpu/drm/tyr/driver.rs | 25 +- + drivers/gpu/drm/tyr/file.rs | 8 +- + drivers/gpu/drm/tyr/gem.rs | 11 +- + drivers/gpu/drm/tyr/regs.rs | 14 +- + drivers/gpu/nova-core/.gitignore | 1 + + drivers/gpu/nova-core/Makefile | 5 +- + drivers/gpu/nova-core/bitfield.rs | 329 ----- + drivers/gpu/nova-core/falcon.rs | 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 | 34 +- + drivers/gpu/nova-core/firmware/booter.rs | 25 +- + drivers/gpu/nova-core/firmware/fwsec.rs | 24 +- + drivers/gpu/nova-core/firmware/fwsec/bootloader.rs | 16 +- + drivers/gpu/nova-core/fsp.rs | 137 +- + drivers/gpu/nova-core/gpu.rs | 184 ++- + drivers/gpu/nova-core/gsp.rs | 99 +- + drivers/gpu/nova-core/gsp/boot.rs | 137 +- + drivers/gpu/nova-core/gsp/cmdq.rs | 69 +- + drivers/gpu/nova-core/gsp/commands.rs | 89 +- + drivers/gpu/nova-core/gsp/fw.rs | 101 +- + drivers/gpu/nova-core/gsp/fw/commands.rs | 42 +- + drivers/gpu/nova-core/gsp/hal.rs | 68 +- + drivers/gpu/nova-core/gsp/hal/ga102.rs | 14 + + drivers/gpu/nova-core/gsp/hal/gh100.rs | 89 +- + drivers/gpu/nova-core/gsp/hal/tu102.rs | 396 +++-- + drivers/gpu/nova-core/gsp/regs.rs | 11 + + drivers/gpu/nova-core/gsp/sequencer.rs | 98 +- + 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 +- + drivers/pwm/pwm_th1520.rs | 7 +- + rust/helpers/io.c | 13 + + rust/kernel/devres.rs | 24 +- + rust/kernel/dma.rs | 281 ++-- + rust/kernel/drm/device.rs | 291 +++- + rust/kernel/drm/driver.rs | 113 +- + rust/kernel/drm/gem/mod.rs | 111 +- + rust/kernel/drm/gem/shmem.rs | 594 +++++++- + rust/kernel/drm/gpuvm/mod.rs | 36 +- + rust/kernel/drm/gpuvm/sm_ops.rs | 4 +- + rust/kernel/drm/gpuvm/va.rs | 8 + + rust/kernel/drm/gpuvm/vm_bo.rs | 9 + + rust/kernel/drm/ioctl.rs | 56 +- + rust/kernel/drm/mod.rs | 4 +- + rust/kernel/faux.rs | 81 +- + rust/kernel/io.rs | 1526 +++++++++++++++----- + rust/kernel/io/mem.rs | 29 +- + rust/kernel/io/poll.rs | 6 +- + rust/kernel/io/register.rs | 44 +- + rust/kernel/lib.rs | 3 + + rust/kernel/pci.rs | 1 - + rust/kernel/pci/io.rs | 170 ++- + rust/kernel/ptr.rs | 12 + + samples/rust/rust_dma.rs | 12 +- + samples/rust/rust_driver_faux.rs | 3 +- + 74 files changed, 4067 insertions(+), 2381 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/hal/ga102.rs + create mode 100644 drivers/gpu/nova-core/gsp/regs.rs + create mode 100644 drivers/gpu/nova-core/nova_core_exports.c +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 d860d0dea2534] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git + Date: Fri Jul 17 16:50:35 2026 +0100 +Merging regmap/for-next (8979c222ebebb 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 +++----- + drivers/base/regmap/regcache.c | 24 +++++++++++++----------- + drivers/base/regmap/regmap-irq.c | 22 ++++++++++++++++++++++ + include/linux/regmap.h | 2 ++ + 7 files changed, 45 insertions(+), 25 deletions(-) +Merging sound/for-next (4392569d95e6a ALSA: aloop: make read-only array texts static const) +$ 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 sound/hda/codecs/hdmi/hdmi.c +Auto-merging sound/hda/codecs/realtek/alc269.c +Merge made by the 'ort' strategy. + include/sound/ac97/codec.h | 4 +- + include/sound/hda_codec.h | 1 + + include/sound/hda_regmap.h | 42 +- + include/uapi/sound/firewire.h | 24 +- + sound/core/compress_offload.c | 18 +- + sound/core/control.c | 29 +- + sound/core/hwdep.c | 25 +- + sound/core/info.c | 2 +- + sound/core/init.c | 23 +- + sound/core/jack.c | 38 +- + sound/core/oss/mixer_oss.c | 19 +- + sound/core/oss/pcm_oss.c | 27 +- + sound/core/pcm_native.c | 62 +- + sound/core/rawmidi.c | 20 +- + sound/core/seq/oss/seq_oss.c | 21 +- + sound/core/seq/seq_clientmgr.c | 24 +- + sound/core/sound.c | 25 +- + sound/core/timer.c | 30 +- + sound/drivers/aloop.c | 120 +++- + sound/hda/codecs/cm9825.c | 148 ++++- + 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 | 28 +- + sound/hda/core/stream.c | 40 +- + sound/pci/asihpi/hpi6000.c | 5 + + sound/pci/via82xx_modem.c | 26 +- + sound/usb/card.c | 70 ++- + sound/usb/mixer_quirks.c | 20 + + sound/usb/quirks-table.h | 67 +++ + sound/usb/usx2y/us144mkii_pcm.h | 6 +- + 33 files changed, 1532 insertions(+), 293 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 (d721340cd338e Merge remote-tracking branch 'asoc/for-7.3' into asoc-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/cirrus,cs35l36.yaml | 240 ++++++ + .../devicetree/bindings/sound/cs35l36.txt | 168 ----- + .../devicetree/bindings/sound/dmic-codec.yaml | 4 + + .../devicetree/bindings/sound/fsl,micfil.yaml | 4 + + .../bindings/sound/loongson,ls-audio-card.yaml | 53 +- + .../bindings/sound/loongson,ls2k1000-i2s.yaml | 22 +- + .../bindings/sound/mediatek,mtk-btcvsd-snd.yaml | 59 ++ + .../devicetree/bindings/sound/mtk-btcvsd-snd.txt | 24 - + .../devicetree/bindings/sound/wlf,wm8524.yaml | 4 + + include/sound/simple_card_utils.h | 37 +- + include/sound/soc_sdw_utils.h | 31 +- + include/sound/sof/dai-amd.h | 1 + + include/sound/sof/dai.h | 3 + + include/uapi/sound/sof/tokens.h | 1 + + sound/soc/amd/acp-config.c | 12 + + sound/soc/amd/acp/acp-i2s.c | 6 + + sound/soc/amd/acp/acp-sdw-legacy-mach.c | 2 +- + sound/soc/amd/acp/acp-sdw-sof-mach.c | 2 +- + sound/soc/amd/mach-config.h | 1 + + sound/soc/amd/raven/acp3x-i2s.c | 6 + + sound/soc/amd/vangogh/acp5x-i2s.c | 6 + + sound/soc/amd/yc/acp6x-mach.c | 12 +- + sound/soc/apple/mca.c | 308 +++++--- + sound/soc/au1x/psc-ac97.c | 4 +- + sound/soc/codecs/Kconfig | 34 +- + sound/soc/codecs/ab8500-codec.c | 12 +- + sound/soc/codecs/ak4613.c | 77 +- + sound/soc/codecs/arizona-jack.c | 121 ++- + sound/soc/codecs/arizona.c | 26 +- + sound/soc/codecs/aw87390.c | 10 +- + sound/soc/codecs/aw88081.c | 18 +- + sound/soc/codecs/aw88166.c | 24 +- + sound/soc/codecs/aw88261.c | 27 +- + sound/soc/codecs/aw88261.h | 6 - + sound/soc/codecs/aw88395/aw88395.c | 24 +- + sound/soc/codecs/aw88395/aw88395_device.c | 40 +- + sound/soc/codecs/aw88399.c | 15 +- + sound/soc/codecs/cros_ec_codec.c | 18 +- + sound/soc/codecs/cs-amp-lib.c | 11 +- + sound/soc/codecs/cs35l32.c | 10 +- + sound/soc/codecs/cs35l33.c | 14 +- + sound/soc/codecs/cs35l34.c | 14 +- + sound/soc/codecs/cs35l56-i2c.c | 4 +- + sound/soc/codecs/cs35l56-sdw.c | 2 + + sound/soc/codecs/cs35l56-shared.c | 26 +- + sound/soc/codecs/cs35l56-spi.c | 4 +- + sound/soc/codecs/cs35l56.c | 18 +- + sound/soc/codecs/cs42l42-sdw.c | 14 +- + sound/soc/codecs/cs42l42.c | 56 +- + sound/soc/codecs/cs42l43-jack.c | 138 ++-- + sound/soc/codecs/cs42l43.c | 16 +- + sound/soc/codecs/cs42l84.c | 10 +- + sound/soc/codecs/cs43130.c | 72 +- + sound/soc/codecs/cs4349.c | 8 +- + sound/soc/codecs/cs47l15.c | 11 +- + sound/soc/codecs/cs47l35.c | 11 +- + sound/soc/codecs/cs47l85.c | 11 +- + sound/soc/codecs/cs47l90.c | 11 +- + sound/soc/codecs/cs47l92.c | 11 +- + sound/soc/codecs/cs48l32.c | 26 +- + sound/soc/codecs/cx2072x.c | 5 +- + sound/soc/codecs/es8328.c | 5 + + sound/soc/codecs/es8389.c | 236 +++++- + sound/soc/codecs/es8389.h | 11 +- + sound/soc/codecs/es9356.c | 2 +- + sound/soc/codecs/fs210x.c | 1 + + sound/soc/codecs/hdac_hda.c | 4 +- + sound/soc/codecs/hdac_hdmi.c | 10 +- + sound/soc/codecs/lpass-rx-macro.c | 141 ++-- + sound/soc/codecs/lpass-tx-macro.c | 130 ++-- + sound/soc/codecs/lpass-va-macro.c | 139 ++-- + sound/soc/codecs/lpass-wsa-macro.c | 144 ++-- + sound/soc/codecs/max98090.c | 9 +- + sound/soc/codecs/max98363.c | 7 +- + sound/soc/codecs/max98373-i2c.c | 9 +- + sound/soc/codecs/max98373-sdw.c | 7 +- + sound/soc/codecs/max98388.c | 8 +- + sound/soc/codecs/max98390.c | 8 +- + sound/soc/codecs/max98396.c | 24 +- + sound/soc/codecs/max98927.c | 8 +- + sound/soc/codecs/pcm1681.c | 7 + + sound/soc/codecs/pcm1754.c | 6 + + sound/soc/codecs/pcm1789.c | 7 + + sound/soc/codecs/pcm179x.c | 6 + + sound/soc/codecs/pcm186x.c | 9 + + sound/soc/codecs/pcm3060.c | 8 + + sound/soc/codecs/pcm512x.c | 9 + + sound/soc/codecs/pm4125-sdw.c | 8 +- + sound/soc/codecs/pm4125.c | 3 +- + sound/soc/codecs/rt1017-sdca-sdw.c | 7 +- + sound/soc/codecs/rt1316-sdw.c | 7 +- + sound/soc/codecs/rt1318-sdw.c | 7 +- + sound/soc/codecs/rt1320-sdw.c | 833 +++++++++++++++++---- + sound/soc/codecs/rt1320-sdw.h | 12 + + sound/soc/codecs/rt5514.c | 16 +- + sound/soc/codecs/rt5645.c | 16 +- + sound/soc/codecs/rt5677.c | 17 + + sound/soc/codecs/rt5682-sdw.c | 20 +- + sound/soc/codecs/rt700-sdw.c | 6 +- + sound/soc/codecs/rt712-sdca-dmic.c | 17 +- + sound/soc/codecs/rt712-sdca-sdw.c | 17 +- + sound/soc/codecs/rt721-sdca-sdw.c | 17 +- + sound/soc/codecs/rt722-sdca-sdw.c | 8 +- + sound/soc/codecs/rt9120.c | 9 +- + sound/soc/codecs/sma1303.c | 2 + + sound/soc/codecs/tas2552.c | 10 +- + sound/soc/codecs/tas2783-sdw.c | 16 +- + sound/soc/codecs/tlv320aic26.c | 6 + + sound/soc/codecs/uda1342.c | 9 +- + sound/soc/codecs/wcd937x-sdw.c | 8 +- + sound/soc/codecs/wcd938x-sdw.c | 8 +- + sound/soc/codecs/wcd939x-sdw.c | 8 +- + sound/soc/codecs/wm2200.c | 10 +- + sound/soc/codecs/wm5100.c | 10 +- + sound/soc/codecs/wm8962.c | 9 +- + sound/soc/codecs/wsa881x.c | 8 +- + sound/soc/codecs/wsa883x.c | 8 +- + sound/soc/codecs/wsa884x.c | 8 +- + 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/generic/audio-graph-card.c | 16 +- + sound/soc/generic/audio-graph-card2.c | 35 +- + sound/soc/generic/simple-card-utils.c | 82 +- + sound/soc/generic/simple-card.c | 127 ++-- + sound/soc/intel/atom/sst-atom-controls.c | 67 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 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 | 4 +- + 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/mediatek/mt8365/mt8365-mt6357.c | 9 +- + sound/soc/meson/Makefile | 2 + + sound/soc/meson/aiu-encoder-i2s.c | 281 +++++-- + sound/soc/meson/aiu-formatter-i2s.c | 103 +++ + 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 | 12 +- + sound/soc/renesas/fsi.c | 9 +- + sound/soc/renesas/rcar/adg.c | 8 +- + sound/soc/samsung/aries_wm8994.c | 1 + + sound/soc/samsung/i2s.c | 33 +- + sound/soc/samsung/spdif.c | 8 +- + sound/soc/sdw_utils/soc_sdw_bridge_cs35l56.c | 4 +- + sound/soc/sdw_utils/soc_sdw_utils.c | 36 +- + sound/soc/sof/amd/Kconfig | 11 + + sound/soc/sof/amd/Makefile | 2 + + sound/soc/sof/amd/acp-dsp-offset.h | 17 + + sound/soc/sof/amd/acp-ipc.c | 13 +- + sound/soc/sof/amd/acp-loader.c | 37 +- + sound/soc/sof/amd/acp.c | 267 ++++++- + sound/soc/sof/amd/acp.h | 20 + + sound/soc/sof/amd/acp7x.c | 185 +++++ + sound/soc/sof/amd/pci-acp7x.c | 116 +++ + sound/soc/sof/intel/hda-loader.c | 11 +- + sound/soc/sof/intel/hda-sdw-bpt.c | 2 +- + sound/soc/sof/intel/hda-stream.c | 15 +- + sound/soc/sof/intel/hda.h | 5 +- + sound/soc/sof/ipc3-pcm.c | 6 + + sound/soc/sof/ipc3-topology.c | 39 +- + sound/soc/sof/ipc4-topology.c | 2 + + sound/soc/sof/nocodec.c | 16 +- + sound/soc/sof/topology.c | 15 +- + sound/soc/spacemit/k1_i2s.c | 7 + + sound/soc/sunxi/sun4i-codec.c | 4 +- + sound/soc/tegra/tegra20_das.c | 7 +- + sound/soc/tegra/tegra210_adx.c | 12 +- + sound/soc/tegra/tegra210_amx.c | 12 +- + sound/soc/tegra/tegra210_i2s.c | 10 +- + sound/soc/ti/j721e-evm.c | 4 +- + sound/soc/xilinx/xlnx_i2s.c | 18 +- + sound/soc/xilinx/xlnx_spdif.c | 31 +- + sound/soc/xtensa/xtfpga-i2s.c | 60 +- + 200 files changed, 4926 insertions(+), 2164 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 + create mode 100644 sound/soc/sof/amd/acp7x.c + create mode 100644 sound/soc/sof/amd/pci-acp7x.c +Merging modules/modules-next (2600d43b235b0 rust: module_param: support bool parameters) +$ git merge -m Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Auto-merging kernel/params.c +Merge made by the 'ort' strategy. + arch/xtensa/platforms/iss/simdisk.c | 38 ++++++++++++++++++++++++++++++++----- + include/linux/module.h | 4 ---- + kernel/module/dups.c | 2 +- + kernel/module/kallsyms.c | 24 +++++++++++++++-------- + kernel/module/main.c | 15 ++++++++------- + kernel/module/procfs.c | 2 +- + kernel/module/stats.c | 2 +- + kernel/params.c | 2 +- + rust/kernel/module_param.rs | 27 ++++++++++++++++++++++++-- + rust/macros/lib.rs | 1 + + rust/macros/module.rs | 1 + + samples/rust/rust_minimal.rs | 10 +++++++++- + scripts/module.lds.S | 5 ----- + 13 files changed, 97 insertions(+), 36 deletions(-) +Merging input/next (3ed4ba919eb35 Input: wacom_w8001 - replace strlcat() with a strscpy() helper) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'ort' strategy. + .../bindings/input/gpio-charlieplex-keypad.yaml | 2 +- + .../devicetree/bindings/input/imagis,isa1200.yaml | 141 ++++++ + .../bindings/input/microchip,cap11xx.yaml | 92 +++- + .../devicetree/bindings/input/syna,rmi4.yaml | 11 +- + drivers/input/keyboard/cap11xx.c | 275 +++++++---- + drivers/input/keyboard/matrix_keypad.c | 1 - + drivers/input/keyboard/tca8418_keypad.c | 3 +- + drivers/input/misc/Kconfig | 12 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ims-pcu.c | 1 + + drivers/input/misc/isa1200.c | 533 +++++++++++++++++++++ + drivers/input/mouse/synaptics.c | 1 + + drivers/input/serio/i8042-acpipnpio.h | 27 +- + drivers/input/touchscreen/mms114.c | 299 ++++++------ + drivers/input/touchscreen/sur40.c | 4 +- + drivers/input/touchscreen/wacom_w8001.c | 17 +- + 16 files changed, 1149 insertions(+), 271 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/imagis,isa1200.yaml + create mode 100644 drivers/input/misc/isa1200.c +Merging block/for-next (1a5c200b36e4f Merge branch 'block-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/bio.c | 64 +++++++++++++++++++++++++----------------- + block/blk-cgroup.c | 4 +-- + block/blk-map.c | 9 ++++-- + block/blk.h | 13 +++++++-- + block/elevator.c | 9 ++++-- + block/error-injection.c | 7 +++-- + block/partitions/aix.c | 9 +++++- + drivers/block/loop.c | 32 +++++++++------------ + include/linux/io_uring_types.h | 2 ++ + io_uring/fs.c | 3 +- + io_uring/io-wq.c | 5 ++++ + io_uring/io_uring.c | 2 ++ + io_uring/kbuf.c | 4 +-- + io_uring/sqpoll.c | 7 ++++- + 14 files changed, 110 insertions(+), 60 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 bd4ddc05ec9b4] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Fri Jul 17 16:50:48 2026 +0100 +Merging device-mapper/for-next (22eb919f1b790 dm-inlinecrypt: don't overwrite the error with -EINVAL) +$ 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 +Merge made by the 'ort' strategy. + drivers/md/dm-cache-target.c | 56 +++++------ + drivers/md/dm-inlinecrypt.c | 1 - + drivers/md/dm-integrity.c | 6 +- + drivers/md/dm-ioctl.c | 208 ++++++++++++++++++----------------------- + drivers/md/dm-snap.c | 4 +- + drivers/md/dm-switch.c | 2 +- + drivers/md/dm-table.c | 2 +- + drivers/md/dm-verity-target.c | 2 - + drivers/md/dm-zoned-metadata.c | 8 +- + drivers/md/dm-zoned-reclaim.c | 4 +- + 10 files changed, 127 insertions(+), 166 deletions(-) +Merging libata/for-next (1393f2c98fb42 ata: pata_mpc52xx: Remove redundant dev_err()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Auto-merging drivers/ata/libata-core.c +Merge made by the 'ort' strategy. + drivers/ata/libata-core.c | 79 ++++- + drivers/ata/libata-eh.c | 6 +- + drivers/ata/libata-scsi.c | 716 ++++++++++++++++++++++++++++++++++++++------- + drivers/ata/libata.h | 2 +- + drivers/ata/pata_mpc52xx.c | 4 +- + drivers/scsi/scsi_debug.c | 46 --- + include/linux/ata.h | 17 ++ + include/linux/libata.h | 93 +++--- + include/scsi/scsi_proto.h | 74 +++++ + 9 files changed, 832 insertions(+), 205 deletions(-) +Merging pcmcia/pcmcia-next (b3c26ea81ccc5 pcmcia: remove obsolete host controller drivers) +$ git merge -m Merge branch 'pcmcia-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (5608386899d9d mmc: bcm2835: DMA mapping improvements) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/qcom,sdhci-msm.yaml | 95 ++++++++++----- + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 1 + + Documentation/devicetree/bindings/mmc/sdhci-st.txt | 110 ----------------- + .../devicetree/bindings/mmc/st,sdhci.yaml | 105 +++++++++++++++++ + .../devicetree/bindings/mmc/ti,omap2420-mmc.yaml | 60 ++++++++++ + Documentation/devicetree/bindings/mmc/ti-omap.txt | 26 ---- + MAINTAINERS | 7 ++ + arch/arm/boot/dts/st/stih407-family.dtsi | 4 +- + arch/arm/boot/dts/st/stih410-b2260.dts | 4 +- + arch/arm/boot/dts/st/stih418-b2199.dts | 4 +- + arch/arm/boot/dts/st/stih418.dtsi | 2 +- + drivers/misc/cardreader/rtsx_usb.c | 26 +++- + drivers/mmc/core/block.c | 5 + + drivers/mmc/core/sd.c | 9 +- + drivers/mmc/host/bcm2835.c | 37 +++--- + drivers/mmc/host/cqhci-core.c | 17 ++- + drivers/mmc/host/cqhci.h | 3 +- + drivers/mmc/host/dw_mmc-pltfm.h | 1 - + drivers/mmc/host/dw_mmc.c | 1 + + drivers/mmc/host/dw_mmc.h | 2 + + drivers/mmc/host/litex_mmc.c | 131 +++++---------------- + drivers/mmc/host/moxart-mmc.c | 11 +- + drivers/mmc/host/mtk-sd.c | 2 +- + drivers/mmc/host/pxamci.c | 3 +- + drivers/mmc/host/rtsx_usb_sdmmc.c | 13 +- + drivers/mmc/host/sdhci-brcmstb.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- + drivers/mmc/host/sdhci-esdhc-mcf.c | 24 ++-- + drivers/mmc/host/sdhci-msm.c | 2 +- + drivers/mmc/host/sdhci-of-arasan.c | 2 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 3 +- + drivers/mmc/host/sdhci-of-ma35d1.c | 1 + + drivers/mmc/host/sdhci-pci-core.c | 2 +- + drivers/mmc/host/sdhci-pci-gli.c | 2 +- + drivers/mmc/host/sdhci-tegra.c | 2 +- + drivers/mmc/host/sdhci_am654.c | 2 +- + drivers/mmc/host/wbsd.c | 6 +- + include/linux/rtsx_usb.h | 3 + + include/linux/soc/pxa/cpu.h | 56 --------- + 39 files changed, 388 insertions(+), 400 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-st.txt + create mode 100644 Documentation/devicetree/bindings/mmc/st,sdhci.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/ti,omap2420-mmc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/ti-omap.txt +Merging mfd/for-mfd-next (6384e5c5e0bcf mfd: Unify style of spi_device_id arrays) +$ 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 +Auto-merging drivers/mfd/motorola-cpcap.c +Auto-merging drivers/mfd/ocelot-spi.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/Makefile | 2 +- + .../bindings/mfd/marvell,88pm886-a1.yaml | 2 +- + .../bindings/mfd/mediatek,mt8195-scpsys.yaml | 1 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 1 + + .../devicetree/bindings/mfd/syscon-common.yaml | 34 ++ + Documentation/devicetree/bindings/mfd/syscon.yaml | 116 ----- + MAINTAINERS | 11 + + arch/arm/mach-ux500/cpu-db8500.c | 6 +- + drivers/clk/ux500/clk-prcmu.c | 20 +- + drivers/clk/ux500/u8500_of_clk.c | 2 +- + drivers/cpuidle/cpuidle-ux500.c | 6 +- + drivers/mfd/88pm886.c | 21 +- + drivers/mfd/Kconfig | 1 - + drivers/mfd/ab8500-core.c | 2 +- + drivers/mfd/altera-a10sr.c | 2 +- + drivers/mfd/arizona-spi.c | 12 +- + drivers/mfd/axp20x.c | 2 +- + drivers/mfd/cs40l50-spi.c | 4 +- + drivers/mfd/cs42l43-i2c.c | 2 - + drivers/mfd/cs42l43-sdw.c | 7 - + drivers/mfd/cs42l43.c | 15 +- + drivers/mfd/da9052-spi.c | 12 +- + drivers/mfd/db8500-prcmu.c | 6 +- + drivers/mfd/intel-m10-bmc-spi.c | 6 +- + drivers/mfd/ipaq-micro.c | 2 +- + drivers/mfd/madera-spi.c | 18 +- + drivers/mfd/motorola-cpcap.c | 6 +- + drivers/mfd/mt6397-core.c | 3 + + drivers/mfd/ocelot-spi.c | 2 +- + drivers/mfd/rk8xx-spi.c | 2 +- + drivers/mfd/rohm-bd71828.c | 125 +++-- + drivers/mfd/rohm-bd718x7.c | 123 +++-- + drivers/mfd/rsmu_spi.c | 12 +- + drivers/mfd/si476x-cmd.c | 1 - + drivers/mfd/si476x-i2c.c | 46 +- + drivers/mfd/sprd-sc27xx-spi.c | 3 +- + drivers/mfd/stmpe-spi.c | 12 +- + drivers/mfd/tps65912-spi.c | 2 +- + drivers/mfd/viperboard.c | 3 +- + drivers/mfd/wm831x-spi.c | 16 +- + drivers/regulator/db8500-prcmu.c | 12 +- + drivers/thermal/db8500_thermal.c | 10 +- + drivers/watchdog/db8500_wdt.c | 22 +- + include/linux/mfd/88pm886.h | 5 + + include/linux/mfd/cs42l43.h | 2 - + include/linux/mfd/db8500-prcmu.h | 252 ++++++++- + include/linux/mfd/dbx500-prcmu.h | 575 --------------------- + include/linux/mfd/si476x-core.h | 5 +- + include/linux/mfd/si476x-platform.h | 2 - + sound/soc/ux500/ux500_msp_dai.c | 2 +- + 50 files changed, 637 insertions(+), 919 deletions(-) + delete mode 100644 include/linux/mfd/dbx500-prcmu.h +Merging backlight/for-backlight-next (4b3f5baf67dea MAINTAINERS: Update my email address for the AW99706 backlight driver) +$ git merge -m Merge branch 'for-backlight-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/leds/backlight/awinic,aw99706.yaml | 2 +- + .../bindings/leds/backlight/silergy,sy7758.yaml | 52 +++++ + MAINTAINERS | 2 +- + drivers/video/backlight/Kconfig | 8 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/sy7758.c | 259 +++++++++++++++++++++ + 6 files changed, 322 insertions(+), 2 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/silergy,sy7758.yaml + create mode 100644 drivers/video/backlight/sy7758.c +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 (e370243ea7670 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 +Merge made by the 'ort' strategy. + .../regulator/qcom,sdm845-refgen-regulator.yaml | 31 +- + .../regulator/qcom,usb-vbus-regulator.yaml | 50 ++- + .../bindings/regulator/richtek,rtq2208.yaml | 4 +- + .../bindings/regulator/rohm,bd71815-regulator.yaml | 27 +- + .../bindings/regulator/rohm,bd71828-regulator.yaml | 20 +- + .../bindings/regulator/rohm,bd71837-regulator.yaml | 16 +- + .../bindings/regulator/rohm,bd71847-regulator.yaml | 16 +- + .../bindings/regulator/rohm,bd72720-regulator.yaml | 40 +-- + .../bindings/regulator/rohm,pmic-states.yaml | 57 ++++ + drivers/regulator/88pg86x.c | 4 +- + drivers/regulator/Kconfig | 7 + + drivers/regulator/Makefile | 1 + + drivers/regulator/act8865-regulator.c | 2 +- + drivers/regulator/ad5398.c | 4 +- + drivers/regulator/adp5055-regulator.c | 6 +- + drivers/regulator/as3722-regulator.c | 1 - + drivers/regulator/aw37503-regulator.c | 4 +- + drivers/regulator/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 | 12 +- + drivers/regulator/max14577-regulator.c | 103 +++++- + drivers/regulator/max1586.c | 2 +- + drivers/regulator/max20086-regulator.c | 8 +- + drivers/regulator/max20411-regulator.c | 2 +- + drivers/regulator/max77503-regulator.c | 2 +- + drivers/regulator/max77675-regulator.c | 2 +- + drivers/regulator/max77826-regulator.c | 2 +- + drivers/regulator/max77838-regulator.c | 2 +- + drivers/regulator/max77857-regulator.c | 8 +- + drivers/regulator/max8649.c | 2 +- + drivers/regulator/max8893.c | 2 +- + drivers/regulator/max8952.c | 2 +- + drivers/regulator/max8973-regulator.c | 6 +- + drivers/regulator/max8998.c | 1 - + drivers/regulator/mcp16502.c | 27 +- + drivers/regulator/mp5416.c | 6 +- + drivers/regulator/mp8859.c | 4 +- + drivers/regulator/mp886x.c | 6 +- + drivers/regulator/mpq7920.c | 4 +- + drivers/regulator/mt6311-regulator.c | 4 +- + drivers/regulator/pf530x-regulator.c | 8 +- + drivers/regulator/pf8x00-regulator.c | 8 +- + drivers/regulator/pv88060-regulator.c | 4 +- + drivers/regulator/pv88080-regulator.c | 8 +- + drivers/regulator/pv88090-regulator.c | 4 +- + drivers/regulator/qcom-refgen-regulator.c | 113 ++++++- + drivers/regulator/qcom_usb_vbus-regulator.c | 102 +++++- + drivers/regulator/rtq2208-regulator.c | 7 +- + drivers/regulator/sc2730-regulator.c | 375 +++++++++++++++++++++ + drivers/regulator/sgm3804-regulator.c | 2 +- + drivers/regulator/slg51000-regulator.c | 4 +- + drivers/regulator/sy8106a-regulator.c | 2 +- + drivers/regulator/sy8824x.c | 8 +- + drivers/regulator/sy8827n.c | 4 +- + drivers/regulator/tps51632-regulator.c | 4 +- + drivers/regulator/tps62360-regulator.c | 10 +- + drivers/regulator/tps6286x-regulator.c | 10 +- + drivers/regulator/tps6287x-regulator.c | 10 +- + drivers/regulator/tps65023-regulator.c | 6 +- + drivers/regulator/tps65132-regulator.c | 4 +- + drivers/regulator/tps6594-regulator.c | 19 +- + include/linux/mfd/max14577-private.h | 3 + + 71 files changed, 997 insertions(+), 285 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/rohm,pmic-states.yaml + create mode 100644 drivers/regulator/sc2730-regulator.c +Merging security/next (0cee720cfd514 selftests/lsm: Fix memory leak in attr_lsm_count) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Merge made by the 'ort' strategy. + Documentation/security/credentials.rst | 6 ++---- + Documentation/translations/zh_CN/security/credentials.rst | 4 +--- + include/linux/cred.h | 1 - + rust/helpers/task.c | 5 ----- + rust/kernel/task.rs | 11 ++--------- + security/security.c | 5 ++--- + tools/testing/selftests/lsm/common.c | 4 +++- + 7 files changed, 10 insertions(+), 26 deletions(-) +Merging apparmor/apparmor-next (c431011ab65fd apparmor: replace decompress_zstd() prototype with its entity) +$ 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 | 199 ++++++++++++++++++++++++------ + 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, 209 insertions(+), 46 deletions(-) +Merging integrity/next-integrity (1da739feb31b4 ima: measure userspace policy writes before parsing) +$ git merge -m Merge branch 'next-integrity' of https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'ort' strategy. + include/linux/lsm_hooks.h | 2 + + security/integrity/ima/Kconfig | 10 ++++ + security/integrity/ima/ima.h | 5 ++ + security/integrity/ima/ima_efi.c | 2 + + security/integrity/ima/ima_fs.c | 9 ++- + security/integrity/ima/ima_init.c | 15 +++-- + security/integrity/ima/ima_main.c | 26 +++++++++ + security/integrity/ima/ima_policy.c | 95 ++++++++++++++++++++++++++++++- + security/integrity/ima/ima_template_lib.c | 3 +- + security/lsm_init.c | 13 ++++- + 10 files changed, 170 insertions(+), 10 deletions(-) +Merging selinux/next (f47f45c7f1ca2 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 | 69 +++++++++++++++++++++++++----------------- + security/selinux/ima.c | 65 +++++++++++++++++++-------------------- + security/selinux/include/ima.h | 4 +++ + security/selinux/selinuxfs.c | 19 ++++++++---- + security/selinux/ss/policydb.c | 11 +++++-- + security/selinux/ss/services.c | 18 +++++------ + 7 files changed, 110 insertions(+), 79 deletions(-) +Merging smack/next (a7c44fd9f80e3 smack: restrict smackfs/{direct,mapped} values to 0-255) +$ 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.h | 6 +- + security/smack/smack_access.c | 9 ++ + security/smack/smack_lsm.c | 69 +++++++++---- + security/smack/smackfs.c | 224 +++++++++++++----------------------------- + 4 files changed, 130 insertions(+), 178 deletions(-) +Merging tomoyo/master (58717b2a1365d Merge tag 'sound-7.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Already up to date. +Merging tpmdd-tpm/for-next-tpm (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 (94794a4483523 dt-bindings: watchdog: apple,wdt: Add t6030 and t6031 compatibles) +$ 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. + .../devicetree/bindings/watchdog/apple,wdt.yaml | 3 + + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 1 + + drivers/watchdog/Kconfig | 31 ++- + drivers/watchdog/Makefile | 2 + + drivers/watchdog/cros_ec_wdt.c | 4 +- + drivers/watchdog/lenovo_se30g2_se60_wdt.c | 289 +++++++++++++++++++++ + drivers/watchdog/max63xx_wdt.c | 14 +- + drivers/watchdog/max77620_wdt.c | 6 +- + drivers/watchdog/pretimeout_dump.c | 45 ++++ + drivers/watchdog/w83627hf_wdt.c | 22 +- + drivers/watchdog/watchdog_pretimeout.h | 4 +- + 11 files changed, 402 insertions(+), 19 deletions(-) + create mode 100644 drivers/watchdog/lenovo_se30g2_se60_wdt.c + create mode 100644 drivers/watchdog/pretimeout_dump.c +Merging iommu/next (750356af88d61 Merge branches 'mediatek', 'qualcomm/msm', 'riscv', '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 +Merge made by the 'ort' strategy. + drivers/iommu/amd/init.c | 57 ++++++++++++++++++++++------- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 ++++- + drivers/iommu/intel/iommu.c | 15 ++++++-- + drivers/iommu/msm_iommu.c | 2 +- + drivers/iommu/mtk_iommu_v1.c | 2 +- + drivers/iommu/riscv/iommu-pci.c | 6 +-- + drivers/pci/ats.c | 13 +++++-- + rust/kernel/iommu/pgtable.rs | 3 +- + 8 files changed, 78 insertions(+), 29 deletions(-) +Merging audit/next (1715cd1303c70 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 +++ + 3 files changed, 37 insertions(+) +Merging devicetree/for-next (bcef80df6d6f4 dt-bindings: interconnect: qcom-bwmon: Add Shikra cpu-bwmon compatible) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/clock/qcom,gcc-msm8953.yaml +Auto-merging Documentation/devicetree/bindings/clock/qcom,ipq9574-gcc.yaml +Auto-merging Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml +Auto-merging Documentation/devicetree/bindings/clock/samsung,exynosautov9-clock.yaml +Auto-merging Documentation/devicetree/bindings/firmware/qcom,scm.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 +++++++++++++++++++++ + .../devicetree/bindings/bus/ti,da850-mstpri.txt | 20 ---- + .../devicetree/bindings/bus/ti,da850-mstpri.yaml | 37 +++++++ + .../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/display/verisilicon,dc.yaml | 2 + + .../devicetree/bindings/firmware/qcom,scm.yaml | 3 + + .../bindings/i2c/samsung,s3c2410-i2c.yaml | 2 +- + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 5 +- + .../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 +-- + .../bindings/watchdog/microchip,pic32-dmt.txt | 19 ---- + .../bindings/watchdog/microchip,pic32-wdt.txt | 18 ---- + .../bindings/watchdog/microchip,pic32mzda-dmt.yaml | 45 +++++++++ + .../bindings/watchdog/microchip,pic32mzda-wdt.yaml | 44 +++++++++ + 73 files changed, 371 insertions(+), 226 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/xen.txt + create mode 100644 Documentation/devicetree/bindings/arm/xen.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/ti,da850-mstpri.txt + create mode 100644 Documentation/devicetree/bindings/bus/ti,da850-mstpri.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32-dmt.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32mzda-dmt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32mzda-wdt.yaml +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 (97a74f7b0a6a0 Merge remote-tracking branch 'spi/for-7.3' into spi-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. + .../bindings/spi/cavium,octeon-3010-spi.yaml | 61 ++++++++++++ + .../bindings/spi/qcom,sa8255p-geni-spi.yaml | 64 +++++++++++++ + .../devicetree/bindings/spi/spi-octeon.txt | 33 ------- + .../devicetree/bindings/spi/st,stm32-qspi.yaml | 3 + + drivers/spi/atmel-quadspi.c | 54 +++++------ + drivers/spi/spi-altera-platform.c | 13 +-- + drivers/spi/spi-atcspi200.c | 5 +- + drivers/spi/spi-bcm-qspi.c | 6 +- + drivers/spi/spi-bcm2835.c | 2 +- + 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-geni-qcom.c | 105 ++++++++++----------- + drivers/spi/spi-npcm-fiu.c | 15 +-- + drivers/spi/spi-nxp-fspi.c | 31 ++++-- + drivers/spi/spi-qpic-snand.c | 6 +- + drivers/spi/spi-realtek-rtl.c | 26 ++--- + 18 files changed, 300 insertions(+), 162 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/cavium,octeon-3010-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/qcom,sa8255p-geni-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-octeon.txt +Merging tip/master (b94f4faa5968a Merge branch into tip/master: 'x86/tdx') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm/mm/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/kernel/ptrace.c +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/mips/kernel/vdso.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/events/intel/ds.c +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/include/asm/pgtable_types.h +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/irqchip/irq-gic-v5-iwb.c +Auto-merging drivers/thermal/intel/therm_throt.c +Auto-merging include/linux/cpuset.h +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/events/core.c +Auto-merging kernel/events/uprobes.c +Auto-merging kernel/fork.c +Auto-merging kernel/irq/manage.c +Auto-merging kernel/locking/lockdep.c +Auto-merging tools/lib/bpf/usdt.c +Auto-merging tools/objtool/check.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 3 - + Documentation/admin-guide/sysctl/kernel.rst | 17 + + Documentation/arch/x86/amd-memory-encryption.rst | 2 +- + Documentation/core-api/entry.rst | 64 +- + .../interrupt-controller/realtek,rtl-intc.yaml | 5 +- + MAINTAINERS | 1 + + arch/Kconfig | 17 +- + arch/alpha/kernel/ptrace.c | 4 +- + arch/arc/kernel/ptrace.c | 2 +- + arch/arm/kernel/ptrace.c | 4 +- + arch/arm/mm/Kconfig | 1 - + arch/arm/vdso/vdso.lds.S | 2 + + arch/arm/vdso/vgettimeofday.c | 14 +- + arch/arm64/Kconfig | 1 - + arch/arm64/kernel/ptrace.c | 4 +- + arch/arm64/kernel/vdso32/vdso.lds.S | 2 + + arch/arm64/kernel/vdso32/vgettimeofday.c | 14 +- + arch/csky/kernel/ptrace.c | 4 +- + arch/hexagon/kernel/traps.c | 2 +- + arch/loongarch/Kconfig | 2 +- + arch/loongarch/include/asm/syscall.h | 6 - + arch/loongarch/kernel/syscall.c | 17 +- + arch/m68k/kernel/ptrace.c | 4 +- + arch/microblaze/kernel/ptrace.c | 2 +- + arch/mips/Kconfig | 1 - + arch/mips/kernel/ptrace.c | 4 +- + arch/mips/kernel/vdso.c | 4 +- + arch/mips/vdso/vdso.lds.S | 2 + + arch/mips/vdso/vgettimeofday.c | 3 + + arch/nios2/kernel/ptrace.c | 2 +- + arch/openrisc/kernel/ptrace.c | 2 +- + arch/parisc/kernel/ptrace.c | 12 +- + arch/parisc/kernel/smp.c | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/syscall.h | 5 - + arch/powerpc/kernel/syscall.c | 5 +- + arch/powerpc/kernel/vdso/gettimeofday.S | 8 + + arch/powerpc/kernel/vdso/vdso32.lds.S | 8 +- + arch/powerpc/kernel/vdso/vgettimeofday.c | 16 +- + arch/riscv/Kconfig | 8 +- + arch/riscv/include/asm/syscall.h | 5 - + arch/riscv/kernel/traps.c | 14 +- + arch/s390/Kconfig | 1 - + arch/s390/include/asm/syscall.h | 5 - + arch/s390/kernel/syscall.c | 11 +- + arch/sh/kernel/ptrace_32.c | 4 +- + arch/sparc/Kconfig | 1 - + arch/sparc/kernel/ptrace_32.c | 2 +- + arch/sparc/kernel/ptrace_64.c | 2 +- + arch/sparc/vdso/vclock_gettime.c | 4 + + arch/sparc/vdso/vdso32/vdso32.lds.S | 6 +- + arch/um/include/asm/cpufeature.h | 16 +- + arch/um/kernel/ptrace.c | 2 +- + arch/um/kernel/skas/syscall.c | 2 +- + arch/um/kernel/um_arch.c | 12 - + arch/x86/Kconfig | 2 +- + arch/x86/boot/compressed/head_64.S | 18 +- + arch/x86/coco/tdx/tdx.c | 10 +- + arch/x86/entry/entry_64_fred.S | 2 + + arch/x86/entry/syscall_32.c | 70 +- + arch/x86/entry/syscall_64.c | 59 +- + arch/x86/entry/vdso/common/vclock_gettime.c | 20 +- + arch/x86/entry/vdso/vdso32/vdso32.lds.S | 2 + + arch/x86/entry/vsyscall/vsyscall_64.c | 14 +- + arch/x86/events/amd/core.c | 2 +- + arch/x86/events/amd/uncore.c | 31 + + arch/x86/events/core.c | 3 +- + arch/x86/events/intel/core.c | 62 +- + arch/x86/events/intel/ds.c | 13 - + arch/x86/events/intel/lbr.c | 38 +- + 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 | 6 +- + arch/x86/hyperv/hv_apic.c | 12 +- + arch/x86/include/asm/alternative.h | 68 +- + arch/x86/include/asm/archrandom.h | 4 +- + arch/x86/include/asm/cmpxchg_32.h | 4 +- + arch/x86/include/asm/cpufeature.h | 10 +- + arch/x86/include/asm/cpufeatures.h | 2 +- + arch/x86/include/asm/debugreg.h | 2 +- + arch/x86/include/asm/entry-common.h | 1 - + arch/x86/include/asm/insn-eval.h | 36 + + arch/x86/include/asm/linkage.h | 2 +- + arch/x86/include/asm/microcode.h | 2 - + arch/x86/include/asm/nospec-branch.h | 1 + + arch/x86/include/asm/pgtable.h | 6 +- + arch/x86/include/asm/pgtable_types.h | 2 +- + arch/x86/include/asm/processor.h | 1 + + arch/x86/include/asm/resctrl.h | 5 +- + arch/x86/include/asm/sync_core.h | 4 +- + arch/x86/include/asm/syscall.h | 10 +- + arch/x86/kernel/acpi/sleep.c | 20 +- + arch/x86/kernel/alternative.c | 202 +--- + arch/x86/kernel/apic/apic.c | 39 +- + arch/x86/kernel/apic/apic_numachip.c | 2 +- + arch/x86/kernel/cpu/amd.c | 34 +- + arch/x86/kernel/cpu/bugs.c | 10 +- + arch/x86/kernel/cpu/cacheinfo.c | 2 +- + arch/x86/kernel/cpu/centaur.c | 35 +- + arch/x86/kernel/cpu/common.c | 12 +- + arch/x86/kernel/cpu/feat_ctl.c | 25 +- + 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/mtrr/amd.c | 31 +- + arch/x86/kernel/cpu/mtrr/centaur.c | 18 +- + arch/x86/kernel/cpu/mtrr/cleanup.c | 18 +- + arch/x86/kernel/cpu/mtrr/generic.c | 97 +- + arch/x86/kernel/cpu/mtrr/mtrr.c | 4 +- + arch/x86/kernel/cpu/resctrl/core.c | 25 +- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 4 +- + arch/x86/kernel/cpu/resctrl/intel_aet.c | 5 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 29 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 12 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 4 +- + arch/x86/kernel/cpu/transmeta.c | 9 +- + arch/x86/kernel/cpu/zhaoxin.c | 12 +- + arch/x86/kernel/fpu/core.c | 20 +- + arch/x86/kernel/fpu/signal.c | 2 +- + arch/x86/kernel/kprobes/core.c | 3 - + arch/x86/kernel/kprobes/opt.c | 3 +- + arch/x86/kernel/ldt.c | 2 +- + arch/x86/kernel/module.c | 13 +- + arch/x86/kernel/process.c | 10 +- + arch/x86/kernel/process_64.c | 6 +- + arch/x86/kernel/signal_32.c | 2 +- + arch/x86/kernel/smpboot.c | 3 - + arch/x86/kernel/time.c | 2 +- + arch/x86/kernel/tsc.c | 6 +- + arch/x86/kernel/tsc_msr.c | 15 +- + arch/x86/kernel/uprobes.c | 408 ++++--- + arch/x86/kernel/vmlinux.lds.S | 20 +- + arch/x86/kvm/cpuid.c | 4 +- + arch/x86/kvm/emulate.c | 26 +- + arch/x86/kvm/svm/svm.c | 22 +- + arch/x86/kvm/vmx/vmx.c | 30 +- + arch/x86/kvm/x86.c | 10 +- + arch/x86/kvm/xen.c | 2 +- + arch/x86/lib/copy_mc.c | 4 +- + arch/x86/lib/msr-smp.c | 8 +- + arch/x86/lib/usercopy_32.c | 2 +- + arch/x86/mm/extable.c | 2 +- + arch/x86/mm/fault.c | 8 +- + arch/x86/mm/ident_map.c | 2 +- + arch/x86/mm/init_64.c | 16 +- + arch/x86/mm/pat/set_memory.c | 46 +- + arch/x86/mm/pgtable.c | 4 +- + arch/x86/mm/tlb.c | 14 +- + arch/x86/pci/mmconfig-shared.c | 8 +- + arch/x86/platform/intel-quark/imr.c | 4 +- + arch/x86/platform/olpc/olpc-xo1-sci.c | 11 +- + arch/x86/ras/Kconfig | 23 - + arch/x86/tools/relocs.c | 2 +- + arch/x86/virt/vmx/tdx/tdx.c | 6 +- + arch/x86/xen/mmu_pv.c | 22 +- + arch/xtensa/kernel/ptrace.c | 5 +- + drivers/acpi/processor_perflib.c | 11 +- + drivers/acpi/processor_throttling.c | 14 +- + drivers/cpufreq/acpi-cpufreq.c | 22 +- + drivers/cpufreq/e_powersaver.c | 49 +- + drivers/cpufreq/longhaul.c | 15 +- + drivers/cpufreq/longrun.c | 77 +- + drivers/cpufreq/powernow-k6.c | 12 +- + drivers/cpufreq/powernow-k8.c | 67 +- + drivers/cpufreq/speedstep-centrino.c | 16 +- + drivers/cpufreq/speedstep-lib.c | 63 +- + drivers/edac/ie31200_edac.c | 10 +- + drivers/edac/mce_amd.c | 8 +- + drivers/firewire/ohci.c | 2 +- + drivers/gpu/drm/drm_cache.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 4 +- + drivers/gpu/drm/i915/i915_memcpy.c | 2 +- + drivers/hwmon/hwmon-vid.c | 11 +- + drivers/irqchip/Kconfig | 5 - + drivers/irqchip/Makefile | 1 - + drivers/irqchip/irq-gic-its-msi-parent.c | 3 +- + drivers/irqchip/irq-gic-v3-its.c | 12 +- + drivers/irqchip/irq-gic-v5-iwb.c | 2 +- + drivers/irqchip/irq-imgpdc.c | 495 -------- + drivers/irqchip/irq-qcom-mpm.c | 4 +- + drivers/irqchip/irq-realtek-rtl.c | 152 ++- + drivers/irqchip/irq-renesas-irqc.c | 1 + + drivers/irqchip/irq-renesas-rzt2h.c | 2 +- + drivers/irqchip/irq-renesas-rzv2h.c | 4 +- + drivers/irqchip/qcom-pdc.c | 548 +++++++-- + drivers/md/dm-writecache.c | 2 +- + .../x86/intel/speed_select_if/isst_tpmi_core.c | 2 +- + drivers/powercap/intel_rapl_common.c | 20 +- + drivers/ras/Kconfig | 24 +- + drivers/thermal/intel/intel_tcc.c | 10 +- + drivers/thermal/intel/therm_throt.c | 78 +- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 32 +- + fs/resctrl/ctrlmondata.c | 50 +- + fs/resctrl/internal.h | 3 +- + fs/resctrl/monitor.c | 131 ++- + fs/resctrl/pseudo_lock.c | 2 +- + fs/resctrl/rdtgroup.c | 732 +++++++----- + include/asm-generic/syscall.h | 4 +- + include/asm-generic/vdso/vsyscall.h | 4 +- + include/linux/cpuhotplug.h | 1 - + include/linux/cpuset.h | 6 + + include/linux/entry-common.h | 164 +-- + include/linux/hrtimer.h | 34 +- + include/linux/{hrtimer_defs.h => hrtimer_bases.h} | 14 +- + include/linux/hrtimer_rearm.h | 5 + + include/linux/irq-entry-common.h | 6 +- + include/linux/irqdesc.h | 2 +- + include/linux/ptrace.h | 13 +- + include/linux/randomize_kstack.h | 19 + + include/linux/sched.h | 4 +- + include/linux/seccomp.h | 12 +- + include/linux/syscall_user_dispatch.h | 28 +- + include/linux/syscall_user_dispatch_types.h | 2 +- + include/linux/timekeeper_internal.h | 30 +- + include/linux/timekeeping.h | 10 +- + include/linux/uprobes.h | 5 - + include/linux/vdso_datastore.h | 6 +- + include/uapi/linux/time_types.h | 2 +- + include/vdso/datapage.h | 6 +- + include/vdso/helpers.h | 4 +- + include/vdso/processor.h | 4 +- + include/vdso/vsyscall.h | 4 +- + init/Kconfig | 2 +- + kernel/cgroup/cpuset.c | 22 + + kernel/entry/Makefile | 3 +- + kernel/entry/syscall-common.c | 21 +- + kernel/entry/syscall_user_dispatch.c | 38 +- + kernel/events/core.c | 41 +- + kernel/events/uprobes.c | 10 - + kernel/fork.c | 1 - + kernel/futex/core.c | 3 +- + kernel/irq/irqdesc.c | 11 +- + kernel/irq/irqdomain.c | 8 +- + kernel/irq/manage.c | 6 +- + kernel/locking/lockdep.c | 34 +- + kernel/sched/core.c | 5 +- + kernel/sched/deadline.c | 6 +- + kernel/sched/debug.c | 92 +- + kernel/sched/fair.c | 1226 +++++++++++--------- + kernel/sched/pelt.c | 6 +- + kernel/sched/psi.c | 2 +- + kernel/sched/rt.c | 3 +- + kernel/sched/sched.h | 49 +- + kernel/seccomp.c | 36 +- + kernel/smp.c | 26 +- + kernel/sys_ni.c | 4 + + kernel/time/clocksource.c | 9 +- + kernel/time/hrtimer.c | 56 +- + kernel/time/namespace.c | 6 +- + kernel/time/namespace_vdso.c | 7 +- + kernel/time/ntp.c | 312 ++++- + kernel/time/ntp_internal.h | 4 +- + kernel/time/posix-cpu-timers.c | 9 +- + kernel/time/tick-internal.h | 1 + + kernel/time/time.c | 25 +- + kernel/time/timekeeping.c | 141 ++- + kernel/time/timekeeping_internal.h | 21 + + kernel/time/timer_list.c | 17 +- + kernel/time/timer_migration.c | 4 +- + lib/vdso/Kconfig | 8 +- + lib/vdso/Makefile | 2 +- + lib/vdso/datastore.c | 63 +- + lib/vdso/gettimeofday.c | 20 + + sound/drivers/dummy.c | 1 + + tools/arch/x86/include/asm/cpufeatures.h | 2 +- + tools/lib/bpf/features.c | 4 +- + tools/lib/bpf/usdt.c | 16 +- + tools/objtool/check.c | 1 - + tools/objtool/klp-diff.c | 1 - + tools/testing/selftests/bpf/bench.c | 20 +- + tools/testing/selftests/bpf/benchs/bench_trigger.c | 38 +- + .../selftests/bpf/benchs/run_bench_uprobes.sh | 2 +- + .../selftests/bpf/prog_tests/uprobe_syscall.c | 325 +++++- + tools/testing/selftests/bpf/prog_tests/usdt.c | 74 +- + tools/testing/selftests/bpf/progs/test_usdt.c | 25 + + tools/testing/selftests/bpf/usdt.h | 2 +- + tools/testing/selftests/bpf/usdt_2.c | 15 +- + .../testing/selftests/futex/functional/.gitignore | 1 + + tools/testing/selftests/futex/functional/Makefile | 6 +- + .../futex/functional/futex_lock_pi_exiting.c | 263 +++++ + .../selftests/futex/functional/futex_numa_mpol.c | 127 +- + .../selftests/futex/functional/futex_priv_hash.c | 163 +-- + .../selftests/futex/functional/futex_requeue.c | 60 +- + .../selftests/futex/functional/futex_requeue_pi.c | 157 +-- + .../functional/futex_requeue_pi_mismatched_ops.c | 41 +- + .../functional/futex_requeue_pi_signal_restart.c | 74 +- + .../selftests/futex/functional/futex_wait.c | 129 +- + .../functional/futex_wait_private_mapped_file.c | 36 +- + .../futex/functional/futex_wait_timeout.c | 106 +- + .../functional/futex_wait_uninitialized_heap.c | 35 +- + .../futex/functional/futex_wait_wouldblock.c | 34 +- + .../selftests/futex/functional/futex_waitv.c | 146 +-- + .../selftests/futex/functional/robust_list.c | 183 +-- + tools/testing/selftests/futex/functional/run.sh | 3 + + tools/testing/selftests/futex/include/futex2test.h | 10 + + .../testing/selftests/futex/include/futex_thread.h | 115 ++ + .../selftests/rseq/rseq-x86-thread-pointer.h | 4 +- + tools/testing/selftests/rseq/rseq.c | 2 +- + .../testing/selftests/syscall_user_dispatch/config | 2 +- + tools/testing/selftests/timers/Makefile | 2 +- + tools/testing/selftests/timers/adjtick.c | 5 +- + .../testing/selftests/timers/alarmtimer-suspend.c | 3 +- + .../testing/selftests/timers/inconsistency-check.c | 3 +- + tools/testing/selftests/timers/leap-a-day.c | 22 +- + tools/testing/selftests/timers/mqueue-lat.c | 3 +- + tools/testing/selftests/timers/nanosleep.c | 3 +- + tools/testing/selftests/timers/nsleep-lat.c | 3 +- + tools/testing/selftests/timers/posix_timers.c | 4 +- + tools/testing/selftests/timers/raw_skew.c | 3 +- + tools/testing/selftests/timers/set-2038.c | 3 +- + tools/testing/selftests/timers/set-timer-lat.c | 3 +- + tools/testing/selftests/timers/valid-adjtimex.c | 4 +- + 321 files changed, 6216 insertions(+), 4511 deletions(-) + delete mode 100644 arch/x86/ras/Kconfig + delete mode 100644 drivers/irqchip/irq-imgpdc.c + rename include/linux/{hrtimer_defs.h => hrtimer_bases.h} (93%) + create mode 100644 tools/testing/selftests/futex/functional/futex_lock_pi_exiting.c + create mode 100644 tools/testing/selftests/futex/include/futex_thread.h +$ 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... +Auto-merging kernel/time/namespace_vdso.c +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 (fc1b1fca6c309 Merge branch 'kho-scratch' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git liveupdate/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/x86/boot/compressed/kaslr.c | 2 + + arch/x86/include/asm/Kbuild | 1 + + arch/x86/include/asm/setup.h | 2 - + arch/x86/kernel/setup.c | 1 + + include/asm-generic/kexec_handover.h | 12 + + include/linux/kexec_handover.h | 6 +- + kernel/liveupdate/luo_session.c | 1 - + tools/testing/selftests/liveupdate/.gitignore | 1 + + tools/testing/selftests/liveupdate/config | 1 + + tools/testing/selftests/liveupdate/config.aarch64 | 2 + + tools/testing/selftests/liveupdate/config.x86_64 | 2 + + tools/testing/selftests/liveupdate/init.c | 179 ++++++++++++++ + .../testing/selftests/liveupdate/luo_test_utils.c | 15 +- + tools/testing/selftests/liveupdate/run-vmtests.sh | 97 ++++++++ + tools/testing/selftests/liveupdate/vmtest.sh | 263 +++++++++++++++++++++ + 16 files changed, 569 insertions(+), 17 deletions(-) + create mode 100644 include/asm-generic/kexec_handover.h + create mode 100644 tools/testing/selftests/liveupdate/config.aarch64 + create mode 100644 tools/testing/selftests/liveupdate/config.x86_64 + create mode 100644 tools/testing/selftests/liveupdate/init.c + create mode 100755 tools/testing/selftests/liveupdate/run-vmtests.sh + create mode 100755 tools/testing/selftests/liveupdate/vmtest.sh +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 (5adf9141e5800 Merge ras/edac-misc into for-next) +$ git merge -m Merge branch 'edac-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging CREDITS +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + CREDITS | 4 ++ + MAINTAINERS | 13 ++--- + drivers/edac/altera_edac.c | 135 +++++++++++++++++++++---------------------- + drivers/edac/altera_edac.h | 1 + + drivers/edac/amd64_edac.c | 2 + + drivers/edac/debugfs.c | 65 +-------------------- + drivers/edac/edac_mc_sysfs.c | 2 +- + drivers/ras/amd/atl/core.c | 1 - + include/linux/edac.h | 3 - + 9 files changed, 81 insertions(+), 145 deletions(-) +Merging ftrace/for-next (030bb1d8bb077 Merge probes/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/setup.c +Auto-merging init/Kconfig +Auto-merging init/main.c +Auto-merging kernel/trace/trace.c +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/bootconfig.rst | 81 +++ + Documentation/trace/eprobetrace.rst | 7 +- + Documentation/trace/fprobetrace.rst | 10 + + Documentation/trace/kprobetrace.rst | 11 + + MAINTAINERS | 1 + + Makefile | 27 +- + arch/x86/Kconfig | 1 + + arch/x86/kernel/setup.c | 14 +- + include/asm-generic/kprobes.h | 4 +- + include/linux/bootconfig.h | 14 + + init/Kconfig | 36 ++ + init/main.c | 52 +- + kernel/trace/Kconfig | 12 + + kernel/trace/trace.c | 8 +- + kernel/trace/trace_eprobe.c | 2 + + kernel/trace/trace_fprobe.c | 6 +- + kernel/trace/trace_kprobe.c | 2 + + kernel/trace/trace_probe.c | 612 +++++++++++++++++---- + kernel/trace/trace_probe.h | 102 ++-- + kernel/trace/trace_probe_tmpl.h | 27 +- + kernel/trace/trace_uprobe.c | 3 + + lib/Makefile | 16 + + lib/bootconfig.c | 139 ++++- + lib/embedded-cmdline.S | 16 + + samples/trace_events/trace-events-sample.c | 40 +- + samples/trace_events/trace-events-sample.h | 34 +- + tools/bootconfig/Makefile | 4 +- + tools/bootconfig/scripts/ftrace2bconf.sh | 2 + + .../ftrace/test.d/dynevent/btf_probe_event.tc | 51 ++ + .../test.d/dynevent/btf_typecast_accepted.tc | 103 ++++ + .../test.d/dynevent/eprobes_syntax_errors.tc | 12 +- + .../ftrace/test.d/dynevent/fprobe_syntax_errors.tc | 12 + + .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 12 + + .../ftrace/test.d/kprobe/uprobe_syntax_errors.tc | 5 + + 34 files changed, 1274 insertions(+), 204 deletions(-) + create mode 100644 lib/embedded-cmdline.S + create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/btf_probe_event.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/btf_typecast_accepted.tc +$ git am -3 ../patches/0001-ftrace-Fix-semantic-conflict-with-mm-tree.patch +Applying: ftrace: Fix semantic conflict with mm tree +Using index info to reconstruct a base tree... +M kernel/trace/trace_printk.c +Falling back to patching base and 3-way merge... +Auto-merging kernel/trace/trace_printk.c +No changes -- Patch already applied. +Merging rcu/next (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 (c2d939be90724 smp: Make CSD lock acquisition atomic for debug mode) +$ git merge -m Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Auto-merging kernel/smp.c +Merge made by the 'ort' strategy. + kernel/smp.c | 29 ++++++++++++++++++++++++----- + 1 file changed, 24 insertions(+), 5 deletions(-) +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/cpuid.c +Auto-merging arch/x86/kvm/irq.c +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/nested.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Recorded preimage for 'arch/x86/kvm/x86.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/x86/kvm/x86.c'. +[master 138d5eef7e606] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/kvm_host.h | 655 +--- + arch/x86/kvm/Makefile | 4 +- + arch/x86/kvm/cpuid.c | 1 + + arch/x86/kvm/fpu.h | 26 + + arch/x86/kvm/hyperv.c | 7 +- + arch/x86/kvm/hyperv.h | 3 +- + arch/x86/kvm/ioapic.c | 1 + + arch/x86/kvm/ioapic.h | 12 + + arch/x86/kvm/irq.c | 7 + + arch/x86/kvm/irq.h | 6 + + arch/x86/kvm/lapic.h | 8 + + arch/x86/kvm/mmu.h | 121 +- + arch/x86/kvm/mmu/mmu.c | 541 +-- + arch/x86/kvm/mmu/mmu_internal.h | 66 - + arch/x86/kvm/mmu/paging_tmpl.h | 88 +- + arch/x86/kvm/mmu/spte.c | 4 +- + arch/x86/kvm/mmu/spte.h | 69 +- + arch/x86/kvm/mmu/tdp_mmu.c | 3 +- + arch/x86/kvm/msrs.c | 2745 ++++++++++++++ + arch/x86/kvm/msrs.h | 156 + + arch/x86/kvm/mtrr.c | 2 +- + arch/x86/kvm/pmu.c | 12 + + arch/x86/kvm/regs.c | 874 +++++ + arch/x86/kvm/regs.h | 60 + + arch/x86/kvm/svm/nested.c | 14 +- + arch/x86/kvm/svm/svm.c | 6 +- + arch/x86/kvm/tss.h | 7 + + arch/x86/kvm/vmx/nested.c | 16 +- + arch/x86/kvm/vmx/vmx.c | 26 +- + arch/x86/kvm/x86.c | 3762 +------------------- + arch/x86/kvm/x86.h | 462 ++- + tools/testing/selftests/kvm/Makefile.kvm | 1 + + tools/testing/selftests/kvm/include/x86/pmu.h | 6 + + .../testing/selftests/kvm/include/x86/processor.h | 10 + + tools/testing/selftests/kvm/include/x86/svm_util.h | 5 +- + tools/testing/selftests/kvm/include/x86/vmx.h | 4 +- + tools/testing/selftests/kvm/lib/x86/memstress.c | 19 +- + tools/testing/selftests/kvm/lib/x86/processor.c | 45 +- + tools/testing/selftests/kvm/lib/x86/svm.c | 6 +- + tools/testing/selftests/kvm/lib/x86/vmx.c | 6 +- + tools/testing/selftests/kvm/x86/aperfmperf_test.c | 9 +- + .../selftests/kvm/x86/evmcs_smm_controls_test.c | 5 +- + tools/testing/selftests/kvm/x86/hyperv_evmcs.c | 6 +- + tools/testing/selftests/kvm/x86/hyperv_svm_test.c | 6 +- + tools/testing/selftests/kvm/x86/kvm_buslock_test.c | 9 +- + .../selftests/kvm/x86/nested_close_kvm_test.c | 12 +- + .../selftests/kvm/x86/nested_dirty_log_test.c | 8 +- + .../selftests/kvm/x86/nested_emulation_test.c | 4 +- + .../selftests/kvm/x86/nested_exceptions_test.c | 9 +- + .../selftests/kvm/x86/nested_invalid_cr3_test.c | 10 +- + .../selftests/kvm/x86/nested_tdp_fault_test.c | 9 +- + .../selftests/kvm/x86/nested_tsc_adjust_test.c | 10 +- + .../selftests/kvm/x86/nested_tsc_scaling_test.c | 10 +- + .../selftests/kvm/x86/nested_vmsave_vmload_test.c | 6 +- + tools/testing/selftests/kvm/x86/smm_test.c | 8 +- + tools/testing/selftests/kvm/x86/state_test.c | 11 +- + tools/testing/selftests/kvm/x86/svm_int_ctl_test.c | 5 +- + .../selftests/kvm/x86/svm_lbr_nested_state.c | 6 +- + .../selftests/kvm/x86/svm_nested_clear_efer_svme.c | 7 +- + .../selftests/kvm/x86/svm_nested_pat_test.c | 8 +- + .../selftests/kvm/x86/svm_nested_shutdown_test.c | 5 +- + .../kvm/x86/svm_nested_soft_inject_test.c | 6 +- + .../selftests/kvm/x86/svm_nested_vmcb12_gpa.c | 13 +- + .../selftests/kvm/x86/svm_pmu_host_guest_test.c | 215 ++ + tools/testing/selftests/kvm/x86/svm_vmcall_test.c | 5 +- + .../selftests/kvm/x86/triple_fault_event_test.c | 9 +- + .../selftests/kvm/x86/vmx_apic_access_test.c | 5 +- + .../selftests/kvm/x86/vmx_apicv_updates_test.c | 4 +- + .../kvm/x86/vmx_invalid_nested_guest_state.c | 6 +- + .../selftests/kvm/x86/vmx_nested_la57_state_test.c | 5 +- + .../selftests/kvm/x86/vmx_preemption_timer_test.c | 5 +- + 71 files changed, 5273 insertions(+), 5029 deletions(-) + create mode 100644 arch/x86/kvm/msrs.c + create mode 100644 arch/x86/kvm/msrs.h + create mode 100644 arch/x86/kvm/regs.c + create mode 100644 tools/testing/selftests/kvm/x86/svm_pmu_host_guest_test.c +$ git am -3 ../patches/kvm-x86-static-cpu-has +Applying: Signed-off-by: Mark Brown <broonie@kernel.org> +Using index info to reconstruct a base tree... +M arch/x86/kvm/msrs.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging kvm-arm/next (cb9360ae65491 Merge branch 'kvm-arm64/pkvm-7.3' into kvmarm/next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging arch/arm64/kvm/hyp/nvhe/pkvm.c +Auto-merging arch/arm64/kvm/pkvm.c +Merge made by the 'ort' strategy. + arch/arm64/kvm/hyp/include/nvhe/clock.h | 8 ++++---- + arch/arm64/kvm/hyp/nvhe/clock.c | 4 ++-- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 1 - + arch/arm64/kvm/hyp/nvhe/trace.c | 4 ++-- + arch/arm64/kvm/pkvm.c | 13 +++++-------- + 5 files changed, 13 insertions(+), 17 deletions(-) +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 (8cdeaa50eae8d Linux 7.2-rc2) +$ 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 (8d9c9b135b5c2 KVM: riscv: Fix Spectre-v1 in vector register access) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Merge made by the 'ort' strategy. + arch/riscv/include/asm/kvm_host.h | 10 +++--- + arch/riscv/kvm/aia.c | 35 ++++++++++++++++---- + arch/riscv/kvm/gstage.c | 6 +++- + arch/riscv/kvm/mmu.c | 3 +- + arch/riscv/kvm/vcpu.c | 68 +++++++++++++++++++++++++++------------ + arch/riscv/kvm/vcpu_exit.c | 19 +++++++++++ + arch/riscv/kvm/vcpu_onereg.c | 46 +++++++------------------- + arch/riscv/kvm/vcpu_pmu.c | 4 +-- + arch/riscv/kvm/vcpu_sbi_fwft.c | 6 ++-- + arch/riscv/kvm/vcpu_vector.c | 14 ++++++-- + 10 files changed, 137 insertions(+), 74 deletions(-) +Merging kvm-x86/next (6bc96b971766f Merge branches 'coco', 'fixes', 'generic', 'irq_test', 'misc', 'selftests', 'svm' and 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/xen.c +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Auto-merging virt/kvm/guest_memfd.c +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + arch/x86/include/asm/cpufeatures.h | 10 + + arch/x86/include/asm/kvm-x86-nested-ops.h | 36 ++ + arch/x86/include/asm/kvm-x86-ops.h | 8 +- + arch/x86/include/asm/kvm_host.h | 214 ++---------- + arch/x86/kvm/cpuid.c | 22 +- + arch/x86/kvm/emulate.c | 49 ++- + arch/x86/kvm/hyperv.c | 70 ++-- + arch/x86/kvm/hyperv.h | 117 ++++++- + arch/x86/kvm/lapic.c | 10 + + arch/x86/kvm/lapic.h | 33 ++ + arch/x86/kvm/mmu.h | 11 +- + arch/x86/kvm/mmu/mmu.c | 76 +++-- + arch/x86/kvm/mmu/paging_tmpl.h | 2 +- + arch/x86/kvm/msrs.h | 4 +- + arch/x86/kvm/regs.h | 38 +++ + arch/x86/kvm/svm/avic.c | 96 ++++-- + arch/x86/kvm/svm/nested.c | 3 +- + arch/x86/kvm/svm/sev.c | 173 +++++++--- + arch/x86/kvm/svm/svm.c | 30 +- + arch/x86/kvm/svm/svm.h | 19 +- + arch/x86/kvm/tss.h | 7 + + arch/x86/kvm/vmx/main.c | 3 +- + arch/x86/kvm/vmx/nested.c | 64 ++-- + arch/x86/kvm/vmx/nested.h | 6 +- + arch/x86/kvm/vmx/tdx.c | 7 +- + arch/x86/kvm/vmx/vmx.c | 20 +- + arch/x86/kvm/x86.c | 89 +++-- + arch/x86/kvm/x86.h | 10 +- + arch/x86/kvm/xen.c | 43 ++- + include/linux/kvm_host.h | 8 + + tools/testing/selftests/kvm/Makefile.kvm | 7 +- + tools/testing/selftests/kvm/arch_timer.c | 2 +- + .../selftests/kvm/arm64/arch_timer_edge_cases.c | 2 +- + tools/testing/selftests/kvm/demand_paging_test.c | 2 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 4 +- + tools/testing/selftests/kvm/dirty_log_test.c | 11 +- + tools/testing/selftests/kvm/include/kvm_syscalls.h | 7 + + tools/testing/selftests/kvm/include/kvm_util.h | 12 + + tools/testing/selftests/kvm/include/proc_util.h | 11 + + tools/testing/selftests/kvm/include/test_util.h | 25 +- + .../selftests/kvm/include/x86/kvm_util_arch.h | 4 +- + tools/testing/selftests/kvm/irq_test.c | 362 +++++++++++++++++++++ + tools/testing/selftests/kvm/lib/assert.c | 8 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 54 ++- + tools/testing/selftests/kvm/lib/memstress.c | 8 +- + tools/testing/selftests/kvm/lib/proc_util.c | 54 +++ + tools/testing/selftests/kvm/lib/test_util.c | 27 +- + tools/testing/selftests/kvm/mmu_stress_test.c | 15 +- + tools/testing/selftests/kvm/rseq_test.c | 6 +- + tools/testing/selftests/kvm/steal_time.c | 37 +-- + tools/testing/selftests/kvm/x86/sev_dbg_test.c | 2 +- + tools/testing/selftests/kvm/x86/xapic_ipi_test.c | 2 +- + virt/kvm/guest_memfd.c | 4 + + virt/kvm/kvm_main.c | 9 + + 54 files changed, 1366 insertions(+), 587 deletions(-) + create mode 100644 arch/x86/include/asm/kvm-x86-nested-ops.h + create mode 100644 tools/testing/selftests/kvm/include/proc_util.h + create mode 100644 tools/testing/selftests/kvm/irq_test.c + create mode 100644 tools/testing/selftests/kvm/lib/proc_util.c +$ 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 +Already up to date. +Merging percpu/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (c5a3a03816ddb Merge branch 'for-7.1-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. + Documentation/core-api/workqueue.rst | 2 +- + kernel/workqueue.c | 144 ++++++++++++++++++++++++++++++----- + tools/workqueue/wq_dump.py | 10 +-- + tools/workqueue/wq_monitor.py | 6 +- + 4 files changed, 135 insertions(+), 27 deletions(-) +Merging sched-ext/for-next (1ed374f61d7ce 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 +Auto-merging init/init_task.c +Auto-merging kernel/sched/sched.h +Auto-merging tools/sched_ext/include/scx/compat.bpf.h +Merge made by the 'ort' strategy. + include/linux/sched/ext.h | 37 +- + include/trace/events/sched_ext.h | 28 + + init/init_task.c | 1 + + kernel/rcu/tree.c | 3 + + kernel/rcu/tree_exp.h | 5 +- + kernel/rcu/tree_stall.h | 13 +- + kernel/sched/build_policy.c | 3 + + kernel/sched/ext/arena.c | 13 +- + kernel/sched/ext/cid.c | 563 ++++++- + kernel/sched/ext/cid.h | 19 +- + kernel/sched/ext/ext.c | 2263 +++++++++++--------------- + kernel/sched/ext/idle.c | 96 +- + kernel/sched/ext/inlines.h | 128 ++ + kernel/sched/ext/internal.h | 554 ++++++- + kernel/sched/ext/sub.c | 1791 ++++++++++++++++++++ + kernel/sched/ext/sub.h | 189 +++ + kernel/sched/ext/types.h | 74 +- + kernel/sched/idle.c | 8 +- + kernel/sched/sched.h | 19 +- + tools/sched_ext/include/scx/cid.bpf.h | 77 + + tools/sched_ext/include/scx/common.bpf.h | 31 +- + tools/sched_ext/include/scx/compat.bpf.h | 28 +- + 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_flatcg.c | 4 +- + tools/sched_ext/scx_qmap.bpf.c | 858 +++++++++- + tools/sched_ext/scx_qmap.c | 376 ++++- + tools/sched_ext/scx_qmap.h | 147 +- + tools/sched_ext/scx_sdt.c | 2 +- + tools/sched_ext/scx_simple.c | 2 +- + tools/sched_ext/scx_userland.c | 2 +- + tools/testing/selftests/sched_ext/prog_run.c | 36 +- + 33 files changed, 5740 insertions(+), 1647 deletions(-) + create mode 100644 kernel/sched/ext/inlines.h + create mode 100644 kernel/sched/ext/sub.c + create mode 100644 kernel/sched/ext/sub.h +Merging drivers-x86/for-next (2b3a5dabe89e3 platform/surface: acpi-notify: Check ACPI companion before use) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/platform/x86/asus-armoury.h +Auto-merging drivers/platform/x86/asus-wmi.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/amdpmf-interface | 73 +++ + .../ABI/testing/sysfs-driver-uniwill-laptop | 25 + + .../admin-guide/laptops/thinkpad-acpi.rst | 24 + + .../admin-guide/laptops/uniwill-laptop.rst | 27 + + MAINTAINERS | 8 + + arch/x86/platform/olpc/olpc-xo15-sci.c | 5 - + drivers/char/sonypi.c | 2 - + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c | 13 +- + drivers/platform/mellanox/mlxbf-pmc.c | 10 +- + drivers/platform/surface/surface_acpi_notify.c | 6 +- + drivers/platform/surface/surface_aggregator_hub.c | 9 +- + .../platform/surface/surface_aggregator_tabletsw.c | 9 +- + drivers/platform/surface/surfacepro3_button.c | 8 +- + drivers/platform/x86/Kconfig | 1 - + drivers/platform/x86/amd/Kconfig | 11 + + drivers/platform/x86/amd/Makefile | 1 + + drivers/platform/x86/amd/amd_halo_led.c | 315 ++++++++++ + drivers/platform/x86/amd/hsmp/acpi.c | 53 +- + drivers/platform/x86/amd/hsmp/hsmp.c | 13 + + drivers/platform/x86/amd/pmf/Kconfig | 10 + + drivers/platform/x86/amd/pmf/Makefile | 2 + + drivers/platform/x86/amd/pmf/core.c | 5 + + drivers/platform/x86/amd/pmf/pmf.h | 34 +- + drivers/platform/x86/amd/pmf/spc.c | 72 +-- + drivers/platform/x86/amd/pmf/tee-if.c | 13 +- + drivers/platform/x86/amd/pmf/util.c | 153 +++++ + drivers/platform/x86/asus-armoury.c | 66 ++- + drivers/platform/x86/asus-armoury.h | 124 ++++ + drivers/platform/x86/asus-laptop.c | 9 +- + drivers/platform/x86/asus-wireless.c | 11 +- + drivers/platform/x86/asus-wmi.c | 30 +- + drivers/platform/x86/dell/dell-wmi-base.c | 19 +- + drivers/platform/x86/dell/dell-wmi-ddv.c | 22 +- + drivers/platform/x86/dell/dell-wmi-privacy.c | 4 +- + .../x86/dell/dell-wmi-sysman/biosattr-interface.c | 1 - + drivers/platform/x86/eeepc-laptop.c | 7 +- + drivers/platform/x86/fujitsu-laptop.c | 18 +- + drivers/platform/x86/fujitsu-tablet.c | 13 +- + drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 16 +- + drivers/platform/x86/hp/hp-bioscfg/bioscfg.h | 8 + + .../platform/x86/hp/hp-bioscfg/enum-attributes.c | 11 +- + .../platform/x86/hp/hp-bioscfg/int-attributes.c | 4 +- + .../x86/hp/hp-bioscfg/order-list-attributes.c | 8 +- + .../x86/hp/hp-bioscfg/passwdobj-attributes.c | 6 +- + .../platform/x86/hp/hp-bioscfg/string-attributes.c | 4 +- + drivers/platform/x86/hp/hp-wmi.c | 270 ++++++--- + drivers/platform/x86/huawei-wmi.c | 99 ++++ + drivers/platform/x86/intel/ishtp_eclite.c | 5 +- + drivers/platform/x86/lenovo/thinkpad_acpi.c | 127 +++- + drivers/platform/x86/lenovo/ymc.c | 8 +- + drivers/platform/x86/lg-laptop.c | 652 +++++++++++++-------- + drivers/platform/x86/msi-ec.c | 81 +++ + drivers/platform/x86/msi-wmi.c | 97 ++- + drivers/platform/x86/panasonic-laptop.c | 4 - + drivers/platform/x86/sony-laptop.c | 5 +- + drivers/platform/x86/topstar-laptop.c | 2 - + drivers/platform/x86/toshiba_acpi.c | 6 +- + drivers/platform/x86/toshiba_bluetooth.c | 6 +- + drivers/platform/x86/toshiba_haps.c | 4 +- + drivers/platform/x86/uniwill/uniwill-acpi.c | 609 ++++++++++++++++++- + drivers/platform/x86/uniwill/uniwill-wmi.h | 2 + + drivers/platform/x86/xo15-ebook.c | 8 +- + drivers/power/supply/surface_battery.c | 11 +- + drivers/power/supply/surface_charger.c | 7 +- + include/linux/amd-pmf-io.h | 9 - + include/linux/platform_data/x86/asus-wmi.h | 5 + + include/uapi/linux/amd-pmf.h | 204 +++++++ + tools/platform/x86/amd/Makefile | 60 ++ + tools/platform/x86/amd/test-pmf.c | 142 +++++ + 69 files changed, 3065 insertions(+), 641 deletions(-) + create mode 100644 Documentation/ABI/testing/amdpmf-interface + create mode 100644 drivers/platform/x86/amd/amd_halo_led.c + create mode 100644 drivers/platform/x86/amd/pmf/util.c + create mode 100644 include/uapi/linux/amd-pmf.h + create mode 100644 tools/platform/x86/amd/Makefile + create mode 100644 tools/platform/x86/amd/test-pmf.c +$ 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 d5fe85c92364f] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git + Date: Fri Jul 17 18:16:32 2026 +0100 +Merging chrome-platform/for-next (9a3f43b30373c platform/chrome: sensorhub: Fix dropped timestamp events and log spam) +$ 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 | 28 +++++++++++++++++++----- + drivers/platform/chrome/cros_ec_sysfs.c | 4 ++-- + drivers/platform/chrome/cros_ec_typec.c | 6 +++++ + drivers/platform/chrome/cros_ec_vbc.c | 4 ++-- + drivers/platform/chrome/cros_kbd_led_backlight.c | 4 ++-- + drivers/platform/chrome/cros_usbpd_logger.c | 4 ++-- + drivers/platform/chrome/cros_usbpd_notify.c | 4 ++-- + drivers/platform/chrome/wilco_ec/core.c | 4 ++-- + drivers/platform/chrome/wilco_ec/debugfs.c | 4 ++-- + drivers/platform/chrome/wilco_ec/telemetry.c | 4 ++-- + 15 files changed, 54 insertions(+), 30 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 (96fa4d69958cf leds: st1202: Correct and extend hw_pattern documentation) +$ 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. + Documentation/leds/leds-st1202.rst | 9 ++- + drivers/leds/leds-pca9532.c | 6 +- + drivers/leds/leds-st1202.c | 102 ++++++++++++++++++++------------- + drivers/leds/rgb/leds-lp5860-core.c | 3 +- + drivers/leds/rgb/leds-lp5860-spi.c | 10 ++-- + drivers/leds/rgb/leds-pwm-multicolor.c | 2 + + drivers/leds/trigger/ledtrig-netdev.c | 46 ++++++++++++++- + include/linux/leds.h | 4 ++ + 8 files changed, 127 insertions(+), 55 deletions(-) +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 (2b74f1f202448 Merge patch series "software node: provide support for fw_devlink") +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/xe/xe_i2c.c +Auto-merging drivers/usb/chipidea/core.c +Auto-merging include/linux/platform_device.h +CONFLICT (content): Merge conflict in include/linux/platform_device.h +Auto-merging rust/macros/lib.rs +Resolved 'include/linux/platform_device.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5e5c11ee29922] Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 + + arch/powerpc/platforms/powermac/low_i2c.c | 2 +- + drivers/base/dd.c | 4 +- + drivers/base/firmware_loader/builtin/Makefile | 32 +-- + drivers/base/firmware_loader/builtin/main.c | 2 + + drivers/base/isa.c | 16 +- + drivers/base/module.c | 2 +- + drivers/base/platform.c | 61 ++++- + drivers/base/swnode.c | 79 ++++++ + drivers/base/test/Kconfig | 5 + + drivers/base/test/Makefile | 2 + + drivers/base/test/swnode-devlink-test.c | 337 ++++++++++++++++++++++++++ + drivers/gpu/drm/xe/xe_i2c.c | 2 +- + drivers/gpu/nova-core/driver.rs | 4 +- + drivers/i2c/busses/i2c-pxa-pci.c | 3 +- + drivers/iommu/fsl_pamu.c | 16 +- + drivers/mfd/tps6586x.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 3 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- + drivers/of/platform.c | 2 +- + drivers/platform/surface/surface_gpe.c | 2 +- + drivers/pmdomain/imx/gpc.c | 3 +- + drivers/pwm/pwm_th1520.rs | 5 +- + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 2 +- + drivers/slimbus/qcom-ngd-ctrl.c | 2 +- + drivers/usb/chipidea/core.c | 2 +- + drivers/usb/musb/jz4740.c | 2 +- + fs/debugfs/file.c | 3 +- + include/kunit/fwnode.h | 29 +++ + include/linux/container_of.h | 5 +- + include/linux/kobject.h | 75 +++++- + include/linux/platform_device.h | 8 + + lib/kobject.c | 8 +- + lib/kunit/Makefile | 1 + + lib/kunit/fwnode.c | 146 +++++++++++ + rust/kernel/auxiliary.rs | 78 ++++-- + rust/kernel/devres.rs | 131 +++++++++- + rust/kernel/io/mem.rs | 65 +++-- + rust/kernel/io/register.rs | 2 +- + rust/kernel/pci.rs | 1 + + rust/kernel/pci/io.rs | 37 ++- + rust/kernel/types.rs | 5 +- + rust/kernel/types/for_lt.rs | 103 +++++--- + rust/macros/for_lt.rs | 41 +++- + rust/macros/lib.rs | 18 +- + samples/kobject/kobject-example.c | 24 +- + samples/rust/rust_driver_auxiliary.rs | 92 +++++-- + 47 files changed, 1271 insertions(+), 197 deletions(-) + create mode 100644 drivers/base/test/swnode-devlink-test.c + create mode 100644 include/kunit/fwnode.h + create mode 100644 lib/kunit/fwnode.c +Merging usb/usb-next (b60af0b9e752a Merge 7.2-rc3 into usb-next) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/devicetree/bindings/usb/qcom,snps-dwc3.yaml +Auto-merging drivers/net/wireless/ath/ath9k/hif_usb.c +Auto-merging drivers/usb/typec/ucsi/ucsi.c +Merge made by the 'ort' strategy. + Documentation/ABI/obsolete/sysfs-bus-usb | 2 +- + Documentation/ABI/testing/sysfs-bus-usb | 2 +- + Documentation/admin-guide/thunderbolt.rst | 4 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 7 + + .../devicetree/bindings/usb/generic-ohci.yaml | 5 + + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 6 +- + .../devicetree/bindings/usb/qcom,snps-dwc3.yaml | 3 + + .../devicetree/bindings/usb/renesas,usbhs.yaml | 1 + + Documentation/translations/zh_CN/usb/CREDITS | 147 +++++---- + Documentation/translations/zh_CN/usb/acm.rst | 62 ++-- + .../translations/zh_CN/usb/authorization.rst | 79 +++-- + Documentation/translations/zh_CN/usb/chipidea.rst | 63 ++-- + Documentation/translations/zh_CN/usb/dwc3.rst | 37 ++- + Documentation/translations/zh_CN/usb/ehci.rst | 249 ++++++---------- + Documentation/translations/zh_CN/usb/index.rst | 18 +- + Documentation/translations/zh_CN/usb/usbmon.rst | 332 +++++++++------------ + Documentation/usb/functionfs.rst | 80 +++++ + drivers/media/usb/as102/as102_usb_drv.c | 75 ++--- + drivers/net/usb/pegasus.c | 54 ++-- + drivers/net/usb/pegasus.h | 3 - + drivers/net/wireless/ath/ath9k/hif_usb.c | 12 +- + drivers/net/wireless/ath/ath9k/hif_usb.h | 2 +- + drivers/usb/atm/xusbatm.c | 6 +- + drivers/usb/cdns3/cdns3-plat.c | 4 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 2 +- + drivers/usb/class/usbtmc.c | 2 - + drivers/usb/core/config.c | 2 +- + drivers/usb/core/devices.c | 7 +- + drivers/usb/core/devio.c | 13 +- + drivers/usb/core/driver.c | 12 +- + drivers/usb/dwc2/core_intr.c | 3 +- + drivers/usb/dwc3/core.c | 99 +++++- + drivers/usb/dwc3/core.h | 7 +- + drivers/usb/dwc3/dwc3-am62.c | 13 +- + drivers/usb/dwc3/dwc3-qcom.c | 2 +- + drivers/usb/dwc3/dwc3-xilinx.c | 18 +- + drivers/usb/dwc3/gadget.c | 15 +- + drivers/usb/gadget/configfs.c | 8 +- + drivers/usb/gadget/function/f_fs.c | 143 +++++++-- + drivers/usb/gadget/function/f_uac1.c | 13 +- + drivers/usb/gadget/function/f_uac2.c | 13 +- + drivers/usb/gadget/function/u_audio.c | 12 +- + drivers/usb/gadget/function/u_fs.h | 8 +- + drivers/usb/gadget/legacy/inode.c | 17 +- + drivers/usb/gadget/legacy/nokia.c | 2 +- + drivers/usb/gadget/udc/Kconfig | 2 +- + drivers/usb/gadget/udc/aspeed_udc.c | 50 ++-- + drivers/usb/gadget/udc/fsl_qe_udc.c | 8 +- + drivers/usb/gadget/udc/pch_udc.c | 1 - + drivers/usb/gadget/udc/r8a66597-udc.c | 1 - + drivers/usb/host/fsl-mph-dr-of.c | 7 +- + drivers/usb/host/ohci-dbg.c | 9 +- + drivers/usb/misc/usb-ljca.c | 3 + + drivers/usb/mtu3/mtu3_core.c | 11 +- + drivers/usb/mtu3/mtu3_host.c | 26 ++ + drivers/usb/mtu3/mtu3_plat.c | 3 +- + drivers/usb/renesas_usbhs/common.c | 6 +- + drivers/usb/serial/spcp8x5.c | 6 +- + drivers/usb/typec/altmodes/displayport.c | 18 +- + drivers/usb/typec/altmodes/thunderbolt.c | 4 + + drivers/usb/typec/class.c | 71 +++++ + drivers/usb/typec/mux/tusb1046.c | 1 + + drivers/usb/typec/tcpm/tcpm.c | 11 +- + drivers/usb/typec/tipd/core.c | 9 +- + drivers/usb/typec/tipd/tps6598x.h | 10 +- + drivers/usb/typec/ucsi/debugfs.c | 5 +- + drivers/usb/typec/ucsi/ucsi.c | 18 +- + drivers/usb/typec/ucsi/ucsi.h | 1 + + drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c | 15 +- + include/linux/usb.h | 3 +- + include/linux/usb/pd.h | 2 +- + include/linux/usb/typec.h | 1 + + include/uapi/linux/usb/functionfs.h | 24 ++ + rust/kernel/usb.rs | 31 +- + 74 files changed, 1190 insertions(+), 831 deletions(-) +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 (091738d09786a USB: serial: keyspan_pda: drop unused driver data usb-serial pointer) +$ 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 +Auto-merging drivers/usb/serial/keyspan_pda.c +Merge made by the 'ort' strategy. + drivers/usb/serial/digi_acceleport.c | 325 ++++++++++++++--------------------- + drivers/usb/serial/keyspan_pda.c | 1 - + drivers/usb/serial/metro-usb.c | 31 ++-- + 3 files changed, 150 insertions(+), 207 deletions(-) +Merging tty/tty-next (facd005eee65d Revert "serial: qcom-geni: remove .pm callback, use runtime PM in startup/shutdown") +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging drivers/tty/serial/sc16is7xx.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/maxim,max310x.yaml | 92 +++++- + drivers/tty/amiserial.c | 14 +- + drivers/tty/goldfish.c | 23 +- + drivers/tty/serdev/core.c | 4 +- + drivers/tty/serial/8250/8250.h | 7 + + drivers/tty/serial/8250/8250_core.c | 6 +- + drivers/tty/serial/8250/8250_early.c | 19 +- + drivers/tty/serial/8250/8250_exar.c | 30 +- + drivers/tty/serial/8250/8250_hub6.c | 8 + + drivers/tty/serial/8250/8250_of.c | 12 + + drivers/tty/serial/8250/8250_platform.c | 1 + + drivers/tty/serial/8250/8250_pnp.c | 309 +++++++++++---------- + drivers/tty/serial/8250/8250_port.c | 43 +-- + drivers/tty/serial/8250/8250_rsa.c | 40 ++- + drivers/tty/serial/cpm_uart.c | 9 +- + drivers/tty/serial/earlycon.c | 17 +- + drivers/tty/serial/kgdboc.c | 2 +- + drivers/tty/serial/ma35d1_serial.c | 12 +- + drivers/tty/serial/max3100.c | 1 + + drivers/tty/serial/max310x.c | 100 +++++-- + drivers/tty/serial/men_z135_uart.c | 7 +- + drivers/tty/serial/mpc52xx_uart.c | 8 + + drivers/tty/serial/pch_uart.c | 11 +- + drivers/tty/serial/qcom_geni_serial.c | 92 ++++-- + drivers/tty/serial/rp2.c | 2 +- + drivers/tty/serial/sc16is7xx.c | 9 +- + drivers/tty/serial/serial_core.c | 135 +++++---- + drivers/tty/tty_jobctrl.c | 41 +-- + drivers/tty/vt/vc_screen.c | 6 +- + include/linux/goldfish.h | 24 -- + include/linux/serial_core.h | 6 + + include/trace/events/qcom_geni_serial.h | 7 +- + include/uapi/linux/serial.h | 1 + + 33 files changed, 649 insertions(+), 449 deletions(-) +Merging char-misc/char-misc-next (775553d19b163 Merge 7.2-rc3 into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Merge made by the 'ort' strategy. + drivers/android/binder/allocation.rs | 4 +- + drivers/android/binder/defs.rs | 8 ++-- + drivers/android/binder/freeze.rs | 67 +++++++++++++++++++--------- + drivers/android/binder/node.rs | 55 +++++++++++------------ + drivers/android/binder/node/wrapper.rs | 2 +- + drivers/android/binder/page_range.rs | 8 ++-- + drivers/android/binder/process.rs | 71 +++++++++++++++++------------- + drivers/android/binder/rust_binder_main.rs | 10 +---- + drivers/android/binder/thread.rs | 24 +++++----- + drivers/android/binder/trace.rs | 4 +- + drivers/android/binder/transaction.rs | 14 +++--- + 11 files changed, 152 insertions(+), 115 deletions(-) +$ 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. +$ git am -3 ../patches/char-misc-binder +Applying: linux-next: manual merge of the char-misc tree with the origin tree +Using index info to reconstruct a base tree... +M drivers/android/binder/process.rs +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 (b5ba63e247075 fpga: dfl: fme: add error handling) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + drivers/fpga/dfl-fme-perf.c | 2 ++ + drivers/fpga/stratix10-soc.c | 21 ++++++++++++--------- + drivers/fpga/xilinx-pr-decoupler.c | 20 ++------------------ + 3 files changed, 16 insertions(+), 27 deletions(-) +Merging icc/icc-next (e11872288b4b3 Merge branch 'icc-maili' 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 +Auto-merging drivers/interconnect/qcom/sc8280xp.c +Merge made by the 'ort' strategy. + .../bindings/interconnect/qcom,maili-rpmh.yaml | 127 ++ + .../bindings/interconnect/qcom,osm-l3.yaml | 2 + + .../bindings/interconnect/qcom,sc8280xp-rpmh.yaml | 101 +- + .../bindings/interconnect/qcom,x1e80100-rpmh.yaml | 72 + + drivers/interconnect/qcom/Kconfig | 11 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/maili.c | 2091 ++++++++++++++++++++ + drivers/interconnect/qcom/osm-l3.c | 16 +- + drivers/interconnect/qcom/sc8280xp.c | 356 ++++ + drivers/interconnect/qcom/x1e80100.c | 485 +++++ + include/dt-bindings/interconnect/qcom,maili-rpmh.h | 171 ++ + 11 files changed, 3431 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,maili-rpmh.yaml + create mode 100644 drivers/interconnect/qcom/maili.c + create mode 100644 include/dt-bindings/interconnect/qcom,maili-rpmh.h +Merging iio/togreg (2e2f2de7532cb iio: hid-sensors: Use implicit NULL pointer checks) +$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging .mailmap +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/iio/accel/bmc150-accel-core.c +Auto-merging drivers/iio/adc/Kconfig +Auto-merging drivers/iio/adc/ti-ads124s08.c +Auto-merging drivers/iio/imu/bmi160/bmi160_core.c +Auto-merging drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c +Auto-merging drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c +Auto-merging drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h +Auto-merging drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c +Auto-merging drivers/iio/light/gp2ap002.c +Auto-merging drivers/iio/orientation/hid-sensor-rotation.c +Auto-merging drivers/iio/temperature/hid-sensor-temperature.c +Auto-merging lib/vsprintf.c +Auto-merging sound/soc/samsung/aries_wm8994.c +Merge made by the 'ort' strategy. + .mailmap | 1 + + Documentation/ABI/testing/sysfs-bus-iio | 11 +- + 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 + + .../bindings/iio/adc/mediatek,mt6359-auxadc.yaml | 3 +- + .../bindings/iio/adc/xlnx,versal-sysmon.yaml | 154 +++ + .../bindings/iio/chemical/sensirion,scd30.yaml | 1 + + .../devicetree/bindings/iio/dac/adi,ad3530r.yaml | 16 +- + .../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 | 34 +- + drivers/extcon/extcon-adc-jack.c | 1 + + drivers/hwmon/iio_hwmon.c | 1 + + drivers/hwmon/ntc_thermistor.c | 1 + + 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 | 68 +- + 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 | 47 +- + drivers/iio/adc/Makefile | 4 + + 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/ad7779.c | 6 +- + drivers/iio/adc/ad7780.c | 8 +- + drivers/iio/adc/ad7791.c | 10 +- + drivers/iio/adc/ad7793.c | 18 +- + drivers/iio/adc/ad7887.c | 2 +- + drivers/iio/adc/ad7923.c | 14 +- + drivers/iio/adc/ad7944.c | 6 +- + drivers/iio/adc/ad7949.c | 6 +- + drivers/iio/adc/ad9467.c | 14 +- + drivers/iio/adc/ade9000.c | 4 +- + drivers/iio/adc/envelope-detector.c | 1 + + 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 | 9 +- + drivers/iio/adc/max14001.c | 4 +- + drivers/iio/adc/mcp320x.c | 26 +- + drivers/iio/adc/mcp3564.c | 24 +- + drivers/iio/adc/mcp3911.c | 14 +- + drivers/iio/adc/mt6323-auxadc.c | 314 +++++ + drivers/iio/adc/rohm-bd79112.c | 2 +- + drivers/iio/adc/rtq6056.c | 4 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 12 +- + drivers/iio/adc/ti-adc081c.c | 6 +- + drivers/iio/adc/ti-adc0832.c | 8 +- + drivers/iio/adc/ti-adc084s021.c | 8 +- + drivers/iio/adc/ti-adc108s102.c | 2 +- + drivers/iio/adc/ti-adc12138.c | 6 +- + drivers/iio/adc/ti-adc128s052.c | 24 +- + drivers/iio/adc/ti-adc161s626.c | 4 +- + drivers/iio/adc/ti-ads1015.c | 46 +- + drivers/iio/adc/ti-ads1018.c | 4 +- + drivers/iio/adc/ti-ads124s08.c | 4 +- + drivers/iio/adc/ti-ads1298.c | 2 +- + drivers/iio/adc/ti-ads131e08.c | 6 +- + drivers/iio/adc/ti-ads131m02.c | 10 +- + drivers/iio/adc/ti-ads7950.c | 24 +- + drivers/iio/adc/ti-ads8688.c | 4 +- + drivers/iio/adc/ti-lmp92064.c | 2 +- + drivers/iio/adc/ti-tlc4541.c | 4 +- + drivers/iio/adc/ti-tsc2046.c | 25 +- + drivers/iio/adc/versal-sysmon-core.c | 1052 +++++++++++++++++ + drivers/iio/adc/versal-sysmon-i2c.c | 134 +++ + drivers/iio/adc/versal-sysmon.c | 92 ++ + drivers/iio/adc/versal-sysmon.h | 120 ++ + drivers/iio/addac/ad74115.c | 2 +- + drivers/iio/afe/iio-rescale.c | 1 + + drivers/iio/amplifiers/ad8366.c | 26 +- + drivers/iio/amplifiers/ada4250.c | 2 +- + drivers/iio/buffer/industrialio-buffer-cb.c | 1 + + drivers/iio/buffer/industrialio-hw-consumer.c | 1 + + drivers/iio/chemical/bme680_spi.c | 2 +- + drivers/iio/chemical/ens160_spi.c | 2 +- + drivers/iio/chemical/scd30_core.c | 10 +- + drivers/iio/chemical/scd30_i2c.c | 4 +- + drivers/iio/chemical/scd30_serial.c | 4 +- + drivers/iio/chemical/sps30_i2c.c | 4 +- + drivers/iio/chemical/sps30_serial.c | 4 +- + .../iio/common/hid-sensors/hid-sensor-attributes.c | 81 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 7 +- + .../iio/common/hid-sensors/hid-sensor-trigger.h | 2 +- + drivers/iio/dac/Kconfig | 18 +- + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/ad3530r.c | 359 +++++- + drivers/iio/dac/ad5064.c | 32 +- + drivers/iio/dac/ad5360.c | 16 +- + drivers/iio/dac/ad5380.c | 32 +- + drivers/iio/dac/ad5446-spi.c | 62 +- + drivers/iio/dac/ad5449.c | 14 +- + drivers/iio/dac/ad5504.c | 4 +- + drivers/iio/dac/ad5624r_spi.c | 12 +- + drivers/iio/dac/ad5686.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/ad8460.c | 1 + + drivers/iio/dac/ad8801.c | 4 +- + drivers/iio/dac/ad9739a.c | 2 +- + drivers/iio/dac/dpot-dac.c | 1 + + drivers/iio/dac/ltc1660.c | 4 +- + drivers/iio/dac/ltc2632.c | 44 +- + drivers/iio/dac/ltc2664.c | 4 +- + drivers/iio/dac/ltc2688.c | 2 +- + drivers/iio/dac/max22007.c | 2 +- + drivers/iio/dac/max5522.c | 31 +- + drivers/iio/dac/mcf54415_dac.c | 180 +++ + drivers/iio/dac/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 | 57 +- + drivers/iio/gyro/st_gyro_spi.c | 18 +- + drivers/iio/health/afe4403.c | 2 +- + drivers/iio/humidity/hid-sensor-humidity.c | 35 +- + 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 | 44 +- + drivers/iio/imu/adis16550.c | 89 +- + drivers/iio/imu/bmi160/bmi160_core.c | 2 +- + drivers/iio/imu/bmi160/bmi160_spi.c | 4 +- + drivers/iio/imu/bmi270/bmi270_spi.c | 5 +- + drivers/iio/imu/bmi323/bmi323_core.c | 2 +- + drivers/iio/imu/bmi323/bmi323_spi.c | 2 +- + drivers/iio/imu/fxos8700_core.c | 2 +- + drivers/iio/imu/fxos8700_spi.c | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 10 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 18 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 45 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.h | 3 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 12 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 16 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 6 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 20 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_temp.c | 3 +- + drivers/iio/imu/inv_icm45600/inv_icm45600.h | 2 +- + drivers/iio/imu/inv_icm45600/inv_icm45600_buffer.c | 7 +- + drivers/iio/imu/inv_icm45600/inv_icm45600_core.c | 2 +- + drivers/iio/imu/inv_icm45600/inv_icm45600_i2c.c | 2 +- + drivers/iio/imu/inv_icm45600/inv_icm45600_spi.c | 16 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_magn.c | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 34 +- + drivers/iio/imu/smi240.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 48 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 4 +- + drivers/iio/industrialio-backend.c | 8 +- + drivers/iio/industrialio-core.c | 49 +- + drivers/iio/inkern.c | 54 +- + drivers/iio/light/cm3605.c | 1 + + drivers/iio/light/gp2ap002.c | 1 + + drivers/iio/light/hid-sensor-als.c | 52 +- + drivers/iio/light/hid-sensor-prox.c | 49 +- + 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/hid-sensor-magn-3d.c | 73 +- + drivers/iio/magnetometer/hmc5843_spi.c | 6 +- + drivers/iio/magnetometer/mmc5983.c | 2 +- + drivers/iio/magnetometer/qmc5883l.c | 516 ++++++++ + drivers/iio/magnetometer/st_magn_spi.c | 12 +- + drivers/iio/multiplexer/iio-mux.c | 1 + + drivers/iio/orientation/hid-sensor-incl-3d.c | 55 +- + drivers/iio/orientation/hid-sensor-rotation.c | 48 +- + .../iio/position/hid-sensor-custom-intel-hinge.c | 19 +- + drivers/iio/potentiometer/max5481.c | 8 +- + drivers/iio/potentiometer/max5487.c | 6 +- + drivers/iio/potentiometer/mcp41010.c | 12 +- + drivers/iio/potentiometer/mcp4131.c | 128 +- + drivers/iio/potentiometer/x9250.c | 4 +- + drivers/iio/potentiostat/lmp91000.c | 1 + + drivers/iio/pressure/abp2030pa_spi.c | 2 +- + drivers/iio/pressure/bmp280-core.c | 32 +- + drivers/iio/pressure/bmp280-spi.c | 14 +- + drivers/iio/pressure/hid-sensor-press.c | 57 +- + 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/rohm-bm1390.c | 23 +- + 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 | 32 +- + drivers/iio/resolver/ad2s90.c | 2 +- + drivers/iio/temperature/hid-sensor-temperature.c | 34 +- + 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/input/joystick/adc-joystick.c | 1 + + drivers/input/keyboard/adc-keys.c | 1 + + drivers/input/touchscreen/colibri-vf50-ts.c | 1 + + drivers/input/touchscreen/resistive-adc-touch.c | 1 + + drivers/phy/motorola/phy-cpcap-usb.c | 1 + + drivers/power/supply/ab8500_btemp.c | 1 + + drivers/power/supply/ab8500_charger.c | 1 + + drivers/power/supply/ab8500_fg.c | 1 + + drivers/power/supply/axp20x_ac_power.c | 1 + + drivers/power/supply/axp20x_battery.c | 1 + + drivers/power/supply/axp20x_usb_power.c | 1 + + drivers/power/supply/axp288_fuel_gauge.c | 1 + + drivers/power/supply/cpcap-battery.c | 1 + + drivers/power/supply/cpcap-charger.c | 1 + + drivers/power/supply/da9150-charger.c | 1 + + drivers/power/supply/generic-adc-battery.c | 1 + + drivers/power/supply/ingenic-battery.c | 1 + + drivers/power/supply/intel_dc_ti_battery.c | 1 + + drivers/power/supply/lego_ev3_battery.c | 1 + + drivers/power/supply/lp8788-charger.c | 1 + + drivers/power/supply/max17040_battery.c | 1 + + drivers/power/supply/mp2629_charger.c | 1 + + drivers/power/supply/mt6370-charger.c | 1 + + drivers/power/supply/qcom_smbx.c | 1 + + drivers/power/supply/rn5t618_power.c | 1 + + drivers/power/supply/rx51_battery.c | 1 + + drivers/power/supply/sc27xx_fuel_gauge.c | 1 + + drivers/power/supply/twl4030_charger.c | 1 + + drivers/power/supply/twl4030_madc_battery.c | 1 + + drivers/power/supply/twl6030_charger.c | 1 + + drivers/staging/iio/adc/ad7816.c | 6 +- + drivers/staging/iio/addac/adt7316-spi.c | 13 +- + drivers/staging/iio/frequency/ad9832.c | 24 +- + drivers/staging/iio/frequency/ad9834.c | 30 +- + drivers/staging/iio/frequency/dds.h | 24 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 1 + + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 1 + + drivers/thermal/renesas/rzg3s_thermal.c | 1 + + drivers/thermal/thermal-generic-adc.c | 1 + + .../dt-bindings/iio/adc/mediatek,mt6323-auxadc.h | 24 + + 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 +- + sound/soc/codecs/audio-iio-aux.c | 1 + + sound/soc/samsung/aries_wm8994.c | 1 + + sound/soc/samsung/midas_wm1811.c | 1 + + sound/soc/stm/stm32_adfsdm.c | 1 + + 329 files changed, 7677 insertions(+), 1999 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-frequency + create mode 100644 Documentation/devicetree/bindings/iio/adc/xlnx,versal-sysmon.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,adf41513.yaml + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/qstcorp,qmc5883l.yaml + create mode 100644 Documentation/iio/adf41513.rst + create mode 100644 drivers/iio/adc/mt6323-auxadc.c + create mode 100644 drivers/iio/adc/versal-sysmon-core.c + create mode 100644 drivers/iio/adc/versal-sysmon-i2c.c + create mode 100644 drivers/iio/adc/versal-sysmon.c + create mode 100644 drivers/iio/adc/versal-sysmon.h + create mode 100644 drivers/iio/dac/mcf54415_dac.c + create mode 100644 drivers/iio/frequency/adf41513.c + create mode 100644 drivers/iio/magnetometer/qmc5883l.c + create mode 100644 include/dt-bindings/iio/adc/mediatek,mt6323-auxadc.h +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 3020a85b2113e] 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 (6409292ab5f7d soundwire: bus.h: repair kernel-doc comments) +$ 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/bus.h | 10 ++++---- + drivers/soundwire/dmi-quirks.c | 28 +++++++++++++++++++++- + drivers/soundwire/intel_auxdevice.c | 1 + + drivers/soundwire/qcom.c | 23 +++++++++++++++--- + 5 files changed, 63 insertions(+), 19 deletions(-) +Merging extcon/extcon-next (254f49634ee16 Linux 7.1-rc1) +$ git merge -m Merge branch 'extcon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (a13c140cc289c Linux 7.2-rc3) +$ git merge -m Merge branch 'gnss-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (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 (169ae5e65e5aa 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 +++++++++++++++++++++++ + Documentation/w1/masters/omap-hdq.rst | 2 +- + drivers/w1/masters/ds2482.c | 8 +++ + drivers/w1/slaves/w1_ds28e17.c | 8 +++ + 5 files changed, 87 insertions(+), 23 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 (8cdeaa50eae8d Linux 7.2-rc2) +$ git merge -m Merge branch 'spmi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (64276d9bfe4d1 staging: rtl8723bs: Remove space after cast) +$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Merge made by the 'ort' strategy. + drivers/staging/axis-fifo/axis-fifo.c | 3 +- + drivers/staging/fbtft/fb_upd161704.c | 2 +- + drivers/staging/fbtft/fbtft-sysfs.c | 2 +- + drivers/staging/greybus/audio_codec.c | 5 +- + drivers/staging/greybus/audio_gb.c | 13 + + drivers/staging/greybus/audio_manager_sysfs.c | 2 +- + drivers/staging/greybus/authentication.c | 2 - + drivers/staging/greybus/hid.c | 2 +- + drivers/staging/greybus/loopback.c | 26 -- + drivers/staging/greybus/power_supply.c | 4 +- + drivers/staging/greybus/vibrator.c | 2 +- + drivers/staging/most/dim2/dim2.c | 14 +- + drivers/staging/nvec/nvec.c | 4 +- + drivers/staging/octeon/ethernet-rx.c | 20 +- + drivers/staging/octeon/ethernet-rx.h | 2 +- + drivers/staging/octeon/ethernet-tx.c | 19 +- + drivers/staging/octeon/ethernet-tx.h | 2 +- + drivers/staging/octeon/ethernet.c | 66 +++- + drivers/staging/rtl8723bs/core/rtw_ap.c | 174 ++------- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 219 ++++++----- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 12 +- + drivers/staging/rtl8723bs/core/rtw_io.c | 7 - + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 30 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 76 ++-- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 429 +++++++++++---------- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 28 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 37 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 34 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 71 ++-- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 71 ++-- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 26 +- + drivers/staging/rtl8723bs/hal/HalPhyRf.c | 12 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 58 +-- + drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 38 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 10 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 8 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 2 +- + drivers/staging/rtl8723bs/hal/hal_intf.c | 14 +- + drivers/staging/rtl8723bs/hal/hal_sdio.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 3 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 240 +++++------- + drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 6 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 58 +-- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 67 +--- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 10 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 58 ++- + drivers/staging/rtl8723bs/include/drv_types.h | 2 +- + drivers/staging/rtl8723bs/include/hal_com_reg.h | 10 +- + drivers/staging/rtl8723bs/include/hal_data.h | 99 ----- + drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 30 +- + drivers/staging/rtl8723bs/include/ioctl_cfg80211.h | 4 +- + .../rtl8723bs/include/osdep_service_linux.h | 3 - + drivers/staging/rtl8723bs/include/rtl8192c_recv.h | 3 - + drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 18 +- + drivers/staging/rtl8723bs/include/rtw_ap.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_cmd.h | 144 ++++--- + drivers/staging/rtl8723bs/include/rtw_event.h | 4 - + drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 61 ++- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 56 +-- + drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 6 +- + drivers/staging/rtl8723bs/include/rtw_security.h | 10 +- + drivers/staging/rtl8723bs/include/sta_info.h | 2 +- + drivers/staging/rtl8723bs/include/wifi.h | 34 +- + drivers/staging/rtl8723bs/include/wlan_bssdef.h | 38 +- + drivers/staging/rtl8723bs/include/xmit_osdep.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 146 ++++--- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 18 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 18 +- + drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 4 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 6 +- + drivers/staging/sm750fb/Kconfig | 1 + + drivers/staging/sm750fb/sm750.c | 27 +- + drivers/staging/sm750fb/sm750.h | 17 +- + drivers/staging/sm750fb/sm750_hw.c | 28 +- + 81 files changed, 1218 insertions(+), 1585 deletions(-) +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 (338c853b7c3b4 dmaengine: Constify struct dma_descriptor_metadata_ops) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Auto-merging drivers/crypto/atmel-aes.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/altr,msgdma.yaml | 2 +- + .../devicetree/bindings/dma/mediatek,uart-dma.yaml | 1 + + .../devicetree/bindings/dma/qcom,bam-dma.yaml | 2 +- + .../bindings/dma/xilinx/xlnx,axi-dma.yaml | 13 +- + Documentation/driver-api/dmaengine/client.rst | 9 + + MAINTAINERS | 4 +- + drivers/crypto/atmel-aes.c | 10 +- + drivers/dma/arm-dma350.c | 9 + + drivers/dma/dmaengine.c | 9 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 2 +- + drivers/dma/dw-edma/dw-edma-core.c | 298 ++++++++------------- + drivers/dma/dw-edma/dw-edma-core.h | 74 +++-- + drivers/dma/dw-edma/dw-edma-pcie.c | 8 +- + drivers/dma/dw-edma/dw-edma-v0-core.c | 240 ++++++++--------- + drivers/dma/dw-edma/dw-hdma-v0-core.c | 196 +++++++------- + drivers/dma/dw-edma/dw-hdma-v0-regs.h | 2 +- + drivers/dma/fsl-edma-main.c | 2 + + drivers/dma/fsl_raid.c | 58 ++-- + drivers/dma/fsl_raid.h | 4 +- + 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/ti/k3-udma.c | 2 +- + drivers/dma/xilinx/xilinx_dma.c | 66 +++-- + drivers/dma/xilinx/zynqmp_dma.c | 6 +- + drivers/nvme/target/pci-epf.c | 33 +-- + drivers/pci/endpoint/functions/pci-epf-mhi.c | 52 ++-- + drivers/pci/endpoint/functions/pci-epf-test.c | 8 +- + include/linux/dma/edma.h | 10 +- + include/linux/dmaengine.h | 151 ++++++++++- + 31 files changed, 696 insertions(+), 610 deletions(-) +Merging cgroup/for-next (6486f6d8f5455 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 +Auto-merging kernel/sched/psi.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v1/memcg_test.rst | 2 +- + Documentation/admin-guide/cgroup-v2.rst | 30 +- + include/linux/cgroup-defs.h | 2 +- + include/linux/cgroup.h | 2 +- + include/linux/psi.h | 4 +- + kernel/cgroup/cgroup.c | 23 +- + kernel/cgroup/cpuset-internal.h | 12 +- + kernel/cgroup/cpuset.c | 530 +++++++++++++-------- + kernel/sched/psi.c | 75 ++- + 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.c | 243 ++++++++++ + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 11 +- + .../testing/selftests/cgroup/test_hugetlb_memcg.c | 10 +- + 15 files changed, 761 insertions(+), 237 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 (aec9f1f18ffdd scsi: parisc: superio: Spelling s/Peterson/Petersen/) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/ufs/ufs-common.yaml | 58 +++++++ + MAINTAINERS | 2 +- + drivers/parisc/superio.c | 2 +- + drivers/scsi/mpt3sas/Makefile | 2 + + drivers/scsi/mpt3sas/mpt3sas_base.h | 20 +++ + drivers/scsi/mpt3sas/mpt3sas_config.c | 36 ++++ + drivers/scsi/mpt3sas/mpt3sas_hwmon.c | 191 +++++++++++++++++++++ + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 6 + + drivers/scsi/qla2xxx/qla_os.c | 15 +- + drivers/scsi/virtio_scsi.c | 18 +- + drivers/ufs/core/ufs-sysfs.c | 1 + + drivers/ufs/core/ufs-txeq.c | 73 ++++++-- + drivers/ufs/core/ufshcd.c | 23 ++- + drivers/ufs/host/ufs-mediatek.c | 12 +- + drivers/ufs/host/ufs-mediatek.h | 4 +- + drivers/ufs/host/ufs-qcom.c | 9 +- + drivers/ufs/host/ufshcd-pltfrm.c | 154 +++++++++++++++++ + include/ufs/ufshcd.h | 7 +- + 18 files changed, 579 insertions(+), 54 deletions(-) + create mode 100644 drivers/scsi/mpt3sas/mpt3sas_hwmon.c +$ git am -3 ../patches/device-id-zorro +Applying: foofof +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/device-id/zorro.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 18176263e22b4] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git + Date: Fri Jul 17 18:31:52 2026 +0100 +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 (f041a428881dc Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../remoteproc/amlogic,meson-mx-ao-arc.yaml | 2 +- + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 82 ++++----- + .../remoteproc/qcom,kaanapali-soccp-pas.yaml | 156 ++++++++++++++++ + .../bindings/remoteproc/qcom,milos-pas.yaml | 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 | 32 ++++ + .../bindings/remoteproc/ti,pru-consumer.yaml | 1 - + Documentation/staging/rpmsg.rst | 1 - + MAINTAINERS | 2 +- + drivers/firmware/xilinx/zynqmp.c | 93 ++++++++++ + drivers/hwspinlock/hwspinlock_core.c | 2 +- + drivers/remoteproc/Kconfig | 4 +- + drivers/remoteproc/imx_dsp_rproc.c | 41 +---- + drivers/remoteproc/imx_rproc.c | 40 +--- + drivers/remoteproc/keystone_remoteproc.c | 2 +- + drivers/remoteproc/mtk_scp.c | 9 +- + drivers/remoteproc/omap_remoteproc.c | 2 +- + drivers/remoteproc/qcom_common.c | 4 +- + drivers/remoteproc/qcom_common.h | 6 + + drivers/remoteproc/qcom_q6v5.c | 57 ++++-- + drivers/remoteproc/qcom_q6v5.h | 4 + + drivers/remoteproc/qcom_q6v5_adsp.c | 1 + + drivers/remoteproc/qcom_q6v5_mss.c | 24 ++- + drivers/remoteproc/qcom_q6v5_pas.c | 171 ++++++++++++++--- + drivers/remoteproc/qcom_sysmon.c | 19 ++ + drivers/remoteproc/qcom_wcnss.c | 35 ++-- + drivers/remoteproc/rcar_rproc.c | 41 +---- + drivers/remoteproc/remoteproc_core.c | 43 ++++- + drivers/remoteproc/remoteproc_internal.h | 54 ++++++ + drivers/remoteproc/st_remoteproc.c | 31 +--- + drivers/remoteproc/stm32_rproc.c | 39 +--- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 8 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 204 +++++++++------------ + drivers/rpmsg/qcom_glink_native.c | 5 +- + drivers/rpmsg/qcom_glink_smem.c | 7 + + drivers/rpmsg/qcom_smd.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 11 +- + drivers/rpmsg/rpmsg_core.c | 6 +- + drivers/soc/qcom/mdt_loader.c | 12 +- + include/linux/firmware/xlnx-zynqmp.h | 12 ++ + include/linux/remoteproc.h | 4 + + include/linux/soc/qcom/mdt_loader.h | 6 +- + 53 files changed, 1148 insertions(+), 465 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,kaanapali-soccp-pas.yaml +Merging gpio-brgl/gpio/for-next (fbd35c8cc6c6e gpio: pcf857x: Use le16_to_cpu() and cpu_to_le16() in IO accessors) +$ 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-sloppy-logic-analyzer.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/gpio/cdns,gpio.yaml | 7 +- + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 3 + + .../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-bd72720.c | 24 +- + drivers/gpio/gpio-bt8xx.c | 21 +- + drivers/gpio/gpio-mt7621.c | 40 +- + drivers/gpio/gpio-mvebu.c | 40 +- + drivers/gpio/gpio-nomadik.c | 64 +-- + drivers/gpio/gpio-pca9570.c | 2 +- + drivers/gpio/gpio-pcf857x.c | 13 +- + drivers/gpio/gpio-rcar.c | 1 - + drivers/gpio/gpio-rockchip.c | 16 +- + drivers/gpio/gpio-rtd1625.c | 611 +++++++++++++++++++++ + drivers/gpio/gpio-sifive.c | 1 + + drivers/gpio/gpio-sloppy-logic-analyzer.c | 1 + + drivers/gpio/gpio-tb10x.c | 5 +- + drivers/gpio/gpio-vf610.c | 1 + + drivers/gpio/gpiolib-cdev.c | 9 +- + drivers/gpio/gpiolib-kunit.c | 280 +++++++++- + drivers/gpio/gpiolib-swnode.c | 23 +- + include/linux/gpio/machine.h | 2 +- + 24 files changed, 1104 insertions(+), 168 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 (a7c4e636e400e Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 2 + + .../pinctrl/aspeed,ast2700-soc1-pinctrl.yaml | 1 + + .../bindings/pinctrl/nxp,s32g2-siul2-pinctrl.yaml | 90 ++- + Documentation/driver-api/pin-control.rst | 2 +- + MAINTAINERS | 7 + + arch/sh/boards/mach-rsk/devices-rsk7203.c | 300 +++++--- + arch/sh/include/cpu-common/cpu/pfc.h | 3 + + arch/sh/kernel/cpu/pfc.c | 20 +- + 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-rp1.c | 2 +- + drivers/pinctrl/pinctrl-sx150x.c | 1 + + drivers/pinctrl/pinctrl-tb10x.c | 2 +- + drivers/pinctrl/renesas/gpio.c | 28 + + 19 files changed, 1124 insertions(+), 201 deletions(-) +Merging pinctrl-intel/for-next (ed1608d5e3c44 Merge patch series "upboard pinctrl support for device id INTC1055") +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Auto-merging drivers/pinctrl/intel/pinctrl-tigerlake.c +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-tigerlake.c | 32 +++++++++++++++++++++++++++++++ + drivers/pinctrl/pinctrl-upboard.c | 21 ++++++++++++++++++++ + 2 files changed, 53 insertions(+) +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 (d441836c9d704 pinctrl: samsung: Add Exynos8855 pinctrl configuration) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Auto-merging Documentation/devicetree/bindings/pinctrl/samsung,pinctrl.yaml +Merge made by the 'ort' strategy. + .../pinctrl/samsung,pinctrl-wakeup-interrupt.yaml | 1 + + .../bindings/pinctrl/samsung,pinctrl.yaml | 1 + + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 132 +++++++++++++++++++++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + 5 files changed, 137 insertions(+) +Merging pinctrl-qcom/pinctrl-qcom/for-next (82c3edf870115 pinctrl: qcom: milos-lpass-lpi: Add Eliza LPASS LPI TLMM) +$ 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 ++ + .../pinctrl/qcom,milos-lpass-lpi-pinctrl.yaml | 18 +- + .../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-milos-lpass-lpi.c | 40 + + drivers/pinctrl/qcom/pinctrl-msm.c | 24 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 + + drivers/pinctrl/qcom/pinctrl-x1e80100.c | 4 +- + drivers/pinctrl/qcom/tlmm-test.c | 3 - + 11 files changed, 1835 insertions(+), 14 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 (7f1565db53367 pwm: rzg2l-gpt: Drop unused rzg2l_gpt_chip parameter from rzg2l_gpt_calculate_prescale()) +$ 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 +Auto-merging drivers/pwm/pwm-adp5585.c +Auto-merging drivers/pwm/pwm-apple.c +Auto-merging drivers/pwm/pwm-berlin.c +Auto-merging drivers/pwm/pwm-lpc18xx-sct.c +Auto-merging drivers/pwm/pwm-lpss-platform.c +Auto-merging drivers/pwm/pwm-pxa.c +Auto-merging drivers/pwm/pwm-sifive.c +Auto-merging drivers/pwm/pwm-sl28cpld.c +Auto-merging drivers/pwm/pwm-sprd.c +Auto-merging drivers/pwm/pwm-sunplus.c +Auto-merging drivers/pwm/pwm-vt8500.c +Merge made by the 'ort' strategy. + .../bindings/pwm/nvidia,tegra20-pwm.yaml | 1 + + drivers/pwm/Kconfig | 2 +- + drivers/pwm/core.c | 4 +- + drivers/pwm/pwm-adp5585.c | 4 +- + drivers/pwm/pwm-apple.c | 2 +- + drivers/pwm/pwm-argon-fan-hat.c | 2 +- + drivers/pwm/pwm-atmel-hlcdc.c | 15 +- + drivers/pwm/pwm-atmel-tcb.c | 6 +- + drivers/pwm/pwm-atmel.c | 3 +- + drivers/pwm/pwm-bcm-iproc.c | 2 +- + drivers/pwm/pwm-bcm-kona.c | 2 +- + drivers/pwm/pwm-bcm2835.c | 2 +- + drivers/pwm/pwm-berlin.c | 2 +- + drivers/pwm/pwm-brcmstb.c | 2 +- + drivers/pwm/pwm-clk.c | 2 +- + drivers/pwm/pwm-clps711x.c | 2 +- + drivers/pwm/pwm-cros-ec.c | 2 +- + drivers/pwm/pwm-hibvt.c | 2 +- + drivers/pwm/pwm-imx-tpm.c | 2 +- + drivers/pwm/pwm-imx1.c | 2 +- + drivers/pwm/pwm-imx27.c | 2 +- + drivers/pwm/pwm-ipq.c | 4 +- + drivers/pwm/pwm-jz4740.c | 2 +- + drivers/pwm/pwm-loongson.c | 2 +- + drivers/pwm/pwm-lp3943.c | 2 +- + drivers/pwm/pwm-lpc18xx-sct.c | 2 +- + drivers/pwm/pwm-lpc32xx.c | 2 +- + drivers/pwm/pwm-lpss-pci.c | 2 +- + drivers/pwm/pwm-lpss-platform.c | 10 +- + drivers/pwm/pwm-mc33xs2410.c | 2 +- + drivers/pwm/pwm-mediatek.c | 2 +- + drivers/pwm/pwm-meson.c | 9 +- + drivers/pwm/pwm-mtk-disp.c | 8 +- + drivers/pwm/pwm-mxs.c | 2 +- + drivers/pwm/pwm-omap-dmtimer.c | 4 +- + drivers/pwm/pwm-pca9685.c | 6 +- + drivers/pwm/pwm-pxa.c | 30 ++-- + drivers/pwm/pwm-raspberrypi-poe.c | 2 +- + drivers/pwm/pwm-rcar.c | 4 +- + drivers/pwm/pwm-renesas-tpu.c | 10 +- + drivers/pwm/pwm-rockchip.c | 8 +- + drivers/pwm/pwm-rzg2l-gpt.c | 7 +- + drivers/pwm/pwm-samsung.c | 2 +- + drivers/pwm/pwm-sifive.c | 2 +- + drivers/pwm/pwm-sl28cpld.c | 2 +- + drivers/pwm/pwm-sophgo-sg2042.c | 7 +- + drivers/pwm/pwm-sprd.c | 4 +- + drivers/pwm/pwm-sti.c | 2 +- + drivers/pwm/pwm-stm32-lp.c | 4 +- + drivers/pwm/pwm-stm32.c | 6 +- + drivers/pwm/pwm-sun4i.c | 2 +- + drivers/pwm/pwm-sunplus.c | 4 +- + drivers/pwm/pwm-tegra.c | 160 ++++++++++++++------- + drivers/pwm/pwm-tiecap.c | 6 +- + drivers/pwm/pwm-tiehrpwm.c | 2 +- + drivers/pwm/pwm-twl-led.c | 2 +- + drivers/pwm/pwm-twl.c | 2 +- + drivers/pwm/pwm-visconti.c | 2 +- + drivers/pwm/pwm-vt8500.c | 2 +- + drivers/pwm/pwm-xilinx.c | 4 +- + 60 files changed, 221 insertions(+), 177 deletions(-) +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 (20f01a5565ce7 selftests/ftrace: fix spelling error in poll test comment) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'ort' strategy. + tools/testing/selftests/ftrace/poll.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (34b5c0132952c kunit: configs: enable GPIO kunit test cases in all_tests.config) +$ 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. + Documentation/dev-tools/kunit/faq.rst | 43 ++++++++++++++++------------ + Documentation/dev-tools/kunit/style.rst | 7 +++-- + include/kunit/test.h | 1 + + lib/kunit/debugfs.c | 28 ++++++++++++------ + lib/kunit/kunit-example-test.c | 29 +++++++++++++++++++ + lib/kunit/string-stream.c | 9 ++++-- + lib/kunit/test.c | 17 ++++++++++- + rust/kernel/kunit.rs | 1 + + tools/testing/kunit/configs/all_tests.config | 1 + + 9 files changed, 103 insertions(+), 33 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 (6191eeb6c70b4 dax: fsdev.c minor formatting cleanup) +$ git merge -m Merge branch 'libnvdimm-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Auto-merging fs/dax.c +Merge made by the 'ort' strategy. + drivers/dax/dax-private.h | 2 - + drivers/dax/fsdev.c | 154 ++++++++++++++++++++++++++----------- + drivers/dax/super.c | 54 +++++++++++-- + drivers/nvdimm/btt.c | 8 ++ + drivers/nvdimm/label.c | 17 +++- + fs/dax.c | 12 +-- + tools/testing/nvdimm/test/ndtest.c | 3 +- + tools/testing/nvdimm/test/nfit.c | 3 +- + 8 files changed, 186 insertions(+), 67 deletions(-) +Merging at24/at24/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'at24/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (41fa043273841 selftests/seccomp: Add hard-coded __NR_uprobe for x86_64) +$ git merge -m Merge branch 'for-next/seccomp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging slimbus/for-next (c922423ce66bc slimbus: qcom-ngd-ctrl: Use the unified QMI service ID instead of defining it locally) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Auto-merging drivers/slimbus/qcom-ngd-ctrl.c +Merge made by the 'ort' strategy. + drivers/slimbus/qcom-ngd-ctrl.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging nvmem/for-next (2a3ed29b05313 Merge branch 'nvmem-for-7.3' into nvmem-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/nvmem/brcm_nvram.c +Auto-merging drivers/nvmem/nintendo-otp.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 911b7d5309145] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mfd/mediatek,mt6397.yaml | 21 ++ + .../bindings/nvmem/airoha,smc-efuses.yaml | 67 ++++ + .../bindings/nvmem/microchip,lan9662-otpc.yaml | 1 + + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 6 + + MAINTAINERS | 14 +- + drivers/misc/eeprom/Kconfig | 93 ------ + drivers/misc/eeprom/Makefile | 5 - + drivers/nvmem/Kconfig | 121 +++++++- + drivers/nvmem/Makefile | 9 + + drivers/nvmem/airoha-smc-efuses.c | 125 ++++++++ + drivers/nvmem/apple-spmi-nvmem.c | 20 +- + drivers/{misc/eeprom => nvmem}/at24.c | 0 + drivers/{misc/eeprom => nvmem}/at25.c | 0 + drivers/nvmem/brcm_nvram.c | 15 +- + drivers/nvmem/core.c | 341 +++++++++++---------- + drivers/{misc/eeprom => nvmem}/ee1004.c | 0 + drivers/{misc/eeprom => nvmem}/eeprom_93xx46.c | 0 + drivers/nvmem/internals.h | 15 +- + drivers/nvmem/lan9662-otpc.c | 12 +- + drivers/nvmem/layouts.c | 11 - + drivers/nvmem/layouts/Kconfig | 9 + + drivers/nvmem/layouts/Makefile | 1 + + drivers/nvmem/layouts/fixed-layout.c | 58 ++++ + drivers/nvmem/layouts/u-boot-env.c | 5 +- + drivers/{misc/eeprom => nvmem}/m24lr.c | 0 + drivers/nvmem/mt6323-efuse.c | 85 +++++ + drivers/nvmem/nintendo-otp.c | 9 +- + drivers/nvmem/rockchip-otp.c | 9 +- + include/linux/nvmem-provider.h | 6 + + 29 files changed, 746 insertions(+), 312 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/airoha,smc-efuses.yaml + create mode 100644 drivers/nvmem/airoha-smc-efuses.c + rename drivers/{misc/eeprom => nvmem}/at24.c (100%) + rename drivers/{misc/eeprom => nvmem}/at25.c (100%) + rename drivers/{misc/eeprom => nvmem}/ee1004.c (100%) + rename drivers/{misc/eeprom => nvmem}/eeprom_93xx46.c (100%) + create mode 100644 drivers/nvmem/layouts/fixed-layout.c + rename drivers/{misc/eeprom => nvmem}/m24lr.c (100%) + create mode 100644 drivers/nvmem/mt6323-efuse.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 (95545ddcb3cfb auxdisplay: panel: Remove unused callback binding code) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Merge made by the 'ort' strategy. + drivers/auxdisplay/ht16k33.c | 5 +---- + drivers/auxdisplay/panel.c | 37 ------------------------------------- + 2 files changed, 1 insertion(+), 41 deletions(-) +Merging kgdb/kgdb/for-next (fdbdd0ccb30af kdb: remove redundant check for scancode 0xe0) +$ git merge -m Merge branch 'kgdb/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'hmm' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'cfi/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (34c66fc4c223a bus: mhi: host: Flush the posted write after writing to MHI_SOC_RESET_REQ_OFFSET) +$ git merge -m Merge branch 'mhi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Auto-merging MAINTAINERS +Auto-merging drivers/bus/mhi/ep/main.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/bus/mhi/ep/main.c | 15 ++++++++++----- + drivers/bus/mhi/host/main.c | 6 ++++++ + drivers/bus/mhi/host/pm.c | 14 +++----------- + 4 files changed, 20 insertions(+), 16 deletions(-) +$ 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 (1a6e6a79b8df1 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging arch/riscv/mm/init.c +Auto-merging drivers/base/arch_numa.c +Auto-merging mm/hugetlb.c +Auto-merging mm/memblock.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/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 ++++++++++------------ + 16 files changed, 27 insertions(+), 123 deletions(-) +Merging cxl/next (5ca04f3ba91f1 Bounds-check the fwctl feature commands) +$ 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/features.c | 23 +- + drivers/cxl/core/mbox.c | 20 +- + drivers/cxl/core/mce.c | 27 +- + drivers/cxl/core/memdev.c | 2 +- + drivers/cxl/core/port.c | 4 +- + drivers/cxl/core/region.c | 43 +- + drivers/cxl/cxl.h | 8 +- + drivers/cxl/cxlmem.h | 4 +- + drivers/cxl/pci.c | 13 +- + include/cxl/mailbox.h | 2 + + tools/testing/cxl/test/Kbuild | 2 + + tools/testing/cxl/test/accel.c | 66 ++ + tools/testing/cxl/test/cxl.c | 833 ++++++++++++++++------ + tools/testing/cxl/test/hmem_test.c | 3 +- + tools/testing/cxl/test/mock.h | 2 + + 16 files changed, 775 insertions(+), 281 deletions(-) + create mode 100644 tools/testing/cxl/test/accel.c +Merging zstd/zstd-next (65d1f5507ed2c zstd: Import upstream v1.5.7) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (4953e0a8a149d efi/runtime-wrappers: mark efi_runtime_lock_owner as __used) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Merge made by the 'ort' strategy. + arch/x86/platform/efi/quirks.c | 9 +---- + drivers/firmware/efi/runtime-wrappers.c | 70 ++++++++++++++++++++++++++++----- + include/linux/efi.h | 6 ++- + tools/objtool/noreturns.h | 1 + + 4 files changed, 66 insertions(+), 20 deletions(-) +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 (56aa9b819edce mm/slub: add comment explaining intentional kobject handling in sysfs_slab_add) +$ git merge -m Merge branch 'slab/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging mm/slub.c +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 | 179 ++++++++++++------------ + 4 files changed, 127 insertions(+), 110 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 (55f82176ef8dd selftests/landlock: Fix spelling error in fs_test comment) +$ 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. + Documentation/admin-guide/LSM/landlock.rst | 1 + + include/uapi/linux/landlock.h | 8 ++++---- + security/landlock/task.c | 11 +++++++++++ + tools/testing/selftests/landlock/fs_test.c | 2 +- + 4 files changed, 17 insertions(+), 5 deletions(-) +Merging sysctl/sysctl-next (dccde188b7fc1 sysctl: add Returns: kernel-doc for all functions) +$ git merge -m Merge branch 'sysctl-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Merge made by the 'ort' strategy. + fs/pipe.c | 2 +- + include/linux/sysctl.h | 125 ++++++++---- + kernel/sysctl.c | 530 ++++++++++++++++++++++++++----------------------- + kernel/time/jiffies.c | 28 ++- + 4 files changed, 395 insertions(+), 290 deletions(-) +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 (fc6926b0ead4b nodemask: reduce bitmap width to nr_node_ids in __nodemask_pr_numnodes()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging arch/x86/events/amd/uncore.c +Auto-merging arch/x86/events/intel/core.c +Auto-merging arch/x86/events/intel/uncore.c +Auto-merging drivers/devfreq/event/rockchip-dfi.c +Auto-merging drivers/fpga/dfl-fme-perf.c +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging kernel/events/core.c +Merge made by the 'ort' strategy. + arch/arm/mach-imx/mmdc.c | 2 +- + arch/arm/mm/cache-l2x0-pmu.c | 2 +- + arch/powerpc/kernel/cacheinfo.c | 3 ++- + arch/powerpc/perf/hv-24x7.c | 2 +- + arch/powerpc/perf/hv-gpci.c | 2 +- + arch/powerpc/perf/imc-pmu.c | 2 +- + arch/x86/events/amd/iommu.c | 2 +- + arch/x86/events/amd/power.c | 2 +- + arch/x86/events/amd/uncore.c | 2 +- + arch/x86/events/intel/core.c | 2 +- + arch/x86/events/intel/uncore.c | 2 +- + drivers/base/cpu.c | 2 +- + drivers/devfreq/event/rockchip-dfi.c | 2 +- + drivers/devfreq/hisi_uncore_freq.c | 2 +- + drivers/firmware/psci/psci_checker.c | 15 ++--------- + drivers/fpga/dfl-fme-perf.c | 2 +- + drivers/hwtracing/ptt/hisi_ptt.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.c | 3 ++- + drivers/pci/pci-sysfs.c | 7 +++--- + drivers/perf/alibaba_uncore_drw_pmu.c | 2 +- + drivers/perf/amlogic/meson_ddr_pmu_core.c | 2 +- + drivers/perf/arm-cci.c | 2 +- + drivers/perf/arm-ccn.c | 2 +- + drivers/perf/arm-cmn.c | 2 +- + drivers/perf/arm-ni.c | 2 +- + drivers/perf/arm_cspmu/arm_cspmu.c | 2 +- + drivers/perf/arm_dmc620_pmu.c | 4 +-- + drivers/perf/arm_dsu_pmu.c | 2 +- + drivers/perf/arm_pmu.c | 2 +- + drivers/perf/arm_smmuv3_pmu.c | 2 +- + drivers/perf/arm_spe_pmu.c | 2 +- + drivers/perf/cxl_pmu.c | 2 +- + drivers/perf/dwc_pcie_pmu.c | 2 +- + drivers/perf/fsl_imx8_ddr_perf.c | 2 +- + drivers/perf/fsl_imx9_ddr_perf.c | 2 +- + drivers/perf/fujitsu_uncore_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_pcie_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_pmu.c | 2 +- + drivers/perf/marvell_cn10k_ddr_pmu.c | 2 +- + drivers/perf/marvell_cn10k_tad_pmu.c | 2 +- + drivers/perf/marvell_pem_pmu.c | 2 +- + drivers/perf/nvidia_t410_c2c_pmu.c | 2 +- + drivers/perf/nvidia_t410_cmem_latency_pmu.c | 2 +- + drivers/perf/qcom_l2_pmu.c | 2 +- + drivers/perf/qcom_l3_pmu.c | 2 +- + drivers/perf/starfive_starlink_pmu.c | 2 +- + drivers/perf/thunderx2_pmu.c | 2 +- + drivers/perf/xgene_pmu.c | 2 +- + include/asm-generic/bitops/le.h | 18 ++++++------- + include/linux/bitmap.h | 4 +-- + include/linux/bits.h | 6 ++--- + include/linux/cpumask.h | 19 -------------- + include/linux/nodemask.h | 15 ++++++----- + kernel/events/core.c | 2 +- + lib/bitmap-str.c | 9 +++---- + lib/bitmap.c | 32 +++++++++++++---------- + lib/find_bit_benchmark.c | 17 +++++++++++++ + lib/test_bitmap.c | 39 +++++++++++++++++++++++++++++ + tools/include/linux/bits.h | 6 ++--- + 59 files changed, 161 insertions(+), 124 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 (3421b9b056a65 selftests/seccomp: Fix pointer type mismatch build error) +$ git merge -m Merge branch 'for-next/kspp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Merge made by the 'ort' strategy. + lib/test_fortify/Makefile | 1 + + tools/testing/selftests/lkdtm/tests.txt | 2 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 3 ++- + 3 files changed, 4 insertions(+), 2 deletions(-) +Merging nolibc/for-next (070cf03f5ec45 selftests/nolibc: add debug information) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Merge made by the 'ort' strategy. + tools/include/nolibc/arch-sparc.h | 2 +- + tools/include/nolibc/unistd.h | 58 +++++++++++++++++++++++++ + tools/testing/selftests/nolibc/Makefile.include | 2 +- + tools/testing/selftests/nolibc/nolibc-test.c | 53 ++++++++++++++++++++++ + 4 files changed, 113 insertions(+), 2 deletions(-) +Merging iommufd/for-next (b737ad0b96a6e Documentation: Update VFIO NOIOMMU mode) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Auto-merging drivers/iommu/iommufd/device.c +Auto-merging drivers/iommu/iommufd/viommu.c +Merge made by the 'ort' strategy. + Documentation/driver-api/vfio.rst | 89 ++++++++++++- + drivers/iommu/iommu.c | 2 +- + drivers/iommu/iommufd/Kconfig | 12 ++ + drivers/iommu/iommufd/Makefile | 1 + + drivers/iommu/iommufd/device.c | 228 ++++++++++++++++++++++---------- + drivers/iommu/iommufd/hw_pagetable.c | 19 ++- + drivers/iommu/iommufd/hwpt_noiommu.c | 105 +++++++++++++++ + drivers/iommu/iommufd/io_pagetable.c | 80 ++++++++++- + drivers/iommu/iommufd/ioas.c | 36 +++++ + drivers/iommu/iommufd/iommufd_private.h | 39 ++++-- + drivers/iommu/iommufd/main.c | 24 ++++ + drivers/iommu/iommufd/selftest.c | 12 +- + drivers/iommu/iommufd/viommu.c | 14 +- + drivers/vfio/Kconfig | 7 +- + drivers/vfio/device_cdev.c | 9 ++ + drivers/vfio/iommufd.c | 12 +- + drivers/vfio/vfio.h | 23 ++-- + drivers/vfio/vfio_main.c | 26 +++- + include/linux/vfio.h | 1 + + include/uapi/linux/iommufd.h | 28 ++++ + 20 files changed, 652 insertions(+), 115 deletions(-) + create mode 100644 drivers/iommu/iommufd/hwpt_noiommu.c +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 (162ea02941a93 power: sequencing: pwrseq-pcie-m2: Add QCC2072 BT PCI device 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 | 8 ++++++++ + 1 file changed, 8 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 (a5db65458a911 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/hisilicon/linux-hisi.git hisilicon/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 4 ---- + arch/arm64/boot/dts/hisilicon/hip05.dtsi | 14 +++++++------- + 2 files changed, 7 insertions(+), 11 deletions(-) +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. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..590fee5c5e75 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20260717 |