diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000000000..f640b6e02cb8f
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,362 @@
+Name SHA1
+---- ----
+origin 4b810bf037e524b54669acbe4e0df54b15d87ea1
+fixes d528014517f2b0531862c02865b9d4c908019dc4
+mm-hotfixes 46575249388f6f514f2e1ed2ae3c0a5f2cfcfef2
+kbuild-current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763
+arm-current 2b951b0efbaa6c805854b60c11f08811054d50cd
+arm64-fixes 55b87b74996383230586f4f9f801ae304c70e649
+arm-soc-fixes 6722e46513e0af8e2fff4698f7cb78bc50a9f13f
+davinci-current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+drivers-memory-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a
+m68k-current 4055eabe04a26f5d113b5a02588b20b5e166a753
+powerpc-fixes cf53564b11cef5cdfafc548b172345c9aa753f89
+s390-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe
+fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813
+fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6
+net 9d23aac8a85f69239e585c8656c6fdb21be65695
+bpf 2e06c57d66d3f6c26faa5f5b479fb3add34ce85a
+ipsec 57010b8ece2821a1fdfdba2197d14a022f3769db
+netfilter 9d0aba98316d00f9c0a4506fc15f5ed9241bc1fd
+ipvs 1a7d09a737a09297e77d9cd575cfe7d1bd14aad9
+wireless f1a0898b5d6a77d332d036da03bad6fa9770de5b
+wpan 9a43827e876c9a071826cc81783aa2222b020f1d
+rdma-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+sound-current 645e583d2689a1dd2163da28a7789b4d9febf316
+sound-asoc-fixes a3e64c2b2c65fbb98b6b2e423bd8186ac30eef76
+regmap-fixes 963b54df82b6d6206d7def273390bf3f7af558e1
+regulator-fixes 31e112d5bb1cbdc89a67a672dd91ffab6660d896
+spi-fixes f481dd5886fa8b25d421126efe67b3be70e80eb2
+pci-current 37540db221e1ca94d9a57632238d1a62043205b3
+driver-core.current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+tty.current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+usb.current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+usb-serial-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+phy 8932089b566c24ea19b57e37704c492678de1420
+staging.current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+iio-fixes 3af5d5b9a262ff72feb5d2178219afab9c6dfe28
+counter-current 9b53a13422162feac7c7ee58e5bc0e0a80a41963
+char-misc.current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+soundwire-fixes 7891d0a5ce6f627132d3068ba925cf86f29008b1
+thunderbolt-fixes 6995e2de6891c724bfeb2db33d7b87775f913ad1
+input-current eb09074bdb05ffd6bfe77f8b4a41b76ef78c997b
+crypto-current 0b7ec177b589842c0abf9e91459c83ba28d32452
+vfio-fixes 4752354af71043e6fd72ef5490ed6da39e6cab4a
+kselftest-fixes b33b8731566d50aae6e11bd02921452cf3a7e0e7
+modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d
+dmaengine-fixes d2a257684758b7253ed37c4642b68e0fc1e9bfac
+backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98
+mtd-fixes 7e6b04f9238eab0f684fafd158c1f32ea65b9eaa
+mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98
+v4l-dvb-fixes f2702d8e53d80ff1cae0163d1eec30596f46a619
+reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98
+mips-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+at91-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+omap-fixes 2a906db2824b75444982f5e9df870106982afca8
+kvm-fixes 2623b3dc875a3c92dd0e0775cd19fbaeef0574ca
+kvms390-fixes 21f27df854008b86349a203bf97fef79bb11f53e
+hwmon-fixes b153a0bb4199566abd337119207f82b59a8cd1ca
+nvdimm-fixes e98d14fa7315867fded127a98db355f49807dfdb
+cxl-fixes a70fc4ed20a6118837b0aecbbf789074935f473b
+btrfs-fixes a14ea7d5b756bcb8ec580dda7b282eed02a00a83
+vfs-fixes 609d54441493c99f21c1823dfd66fa7f4c512ff4
+dma-mapping-fixes bbb73a103fbbed6f63cb738d3783261c4241b4b2
+drivers-x86-fixes 6b293a8c91bca52726448d03216e65da509e9bb7
+samsung-krzk-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+pinctrl-samsung-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+devicetree-fixes 0bb8f49cd2cc8cb32ac51189ff9fcbe7ec3d9d65
+dt-krzk-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+scsi-fixes f4d1a8e011909fee24643f84bd1196e1366c26f2
+drm-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+drm-intel-fixes 113899c2669dff148b2a5bea4780123811aecc13
+mmc-fixes d44263222134b5635932974c6177a5cba65a07e8
+rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d
+gnss-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+hyperv-fixes 55e544e1a922d272b62ec576a3de92329f838ce9
+soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+risc-v-fixes b690e266dae2f85f4dfea21fa6a05e3500a51054
+riscv-dt-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+riscv-soc-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+fpga-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+spdx 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+gpio-brgl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+gpio-intel-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+pinctrl-intel-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+erofs-fixes 18bddc5b67038722cb88fcf51fbf41a0277092cb
+kunit-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65
+memblock-fixes 647037adcad00f2bab8828d3d41cd0553d41f3bd
+nfsd-fixes d7dbed457c2ef83709a2a2723a2d58de43623449
+irqchip-fixes 6fe5c68ee6a1aae0ef291a56001e7888de547fa2
+renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b
+broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780
+perf-current ad07149f34dbb3e0f4e25e19ef80bdd3216ba1cf
+efi-fixes 36e4fc57fc1619f462e669e939209c45763bc8f5
+zstd-fixes 6906598f1ce93761716d780b6e3f171e13f0f4ce
+battery-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+uml-fixes 73a23d7710331a530e972903318528b75e5a5f58
+asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
+iommufd-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+rust-fixes ac9a78681b921877518763ba0e89202254349d1b
+v9fs-fixes 95f41d87810083d8b3dedcce46a4e356cf4a9673
+w1-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+drm-misc-fixes 2329cc7a101af1a844fbf706c0724c0baea38365
+mm-stable 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+mm-nonmm-stable 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+mm 8a5829411a1e4de1b30a3ded30c5f64e5ef0d61e
+kbuild 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+clang-format 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+perf bcd981db12e6d26111609802fc7c358f30a8c72a
+compiler-attributes eeac8ede17557680855031c6f305ece2378af326
+dma-mapping 8ac04063354a01a484d2e55d20ed1958aa0d3392
+asm-generic 4dd595c34c4bb22c16a76206a18c13e4e194335d
+arc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+arm 1faf70485ea9b3209620bfbdd74ccd9b49e2fdba
+arm64 893b24181b4c4bf1fa2841b1ed192e5413a97cb1
+arm-perf dea0f4146f66a242450b29fae4d643bd5318c511
+arm-soc 6722e46513e0af8e2fff4698f7cb78bc50a9f13f
+amlogic 76483eaf2109fc3d94f29c68ff9dee6579e95ccf
+asahi-soc eaf935fa48ec826f7c564c269a607cb4fba082b3
+aspeed a43f3e970a1d8f7b2f5729fcf7af9985dd0d6a0d
+at91 47508c7ba8db77b69de61aae67709799aa9c5d77
+broadcom 0d8d8753ede03c7db24e05bdb8c9a95016d430ec
+davinci 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+drivers-memory d1478aea649e739a0a0e4890cd8b049ae5d08c13
+imx-mxs 89c016c82e46c2bf4d9ce1cb1f233212c7c4990d
+mediatek f6925844c82ae23165097eb14e272f76b855fb5d
+mvebu 54fbc0260c64a6386cbd88a7aff5b3ae4ceeff3c
+omap f581c395fcb821a0acc17c7fa8728752c021156a
+qcom 6faff7e892237232ddc8d6071a591198df2d9a30
+renesas 3b5ba33b4d1d8f6f7aa07925040bbdceffaef1b6
+reset afb39e2bd36af1d80913bb6851caece829526217
+rockchip 28832358cbda2809bc077e276ee249b501b5156a
+samsung-krzk f822ca9191811f991af0256d709942a721f6aff0
+scmi 16f6bdd81f19df4b7c063a8645474cf472b0835a
+stm32 2f38de940f072db369edd3e6e8d82bb8f42c5c9b
+sunxi 1bcb932283c9664a2bc57bb74864b9ab0050981b
+tee 6a8b7e80105416cc7324fda295608ea2d3f98862
+tegra 492a5be06fb0e0ab06352db26de00b3864d8b5cb
+ti 8a07516806c64324f7a2a49b845a50db09105897
+xilinx 6008eee2c754529d16d41acb0b81d471f3ff40c6
+clk f679e89acdd3e825995a84b1b07e2ea33ea882ee
+clk-imx 878b02d5f3b56cb090dbe2c70c89273be144087f
+clk-renesas bbceb13ce2c7b084bbbf2463ac8ac2b1f2bd2949
+csky 6ee1ffdc1838cb84d8d91b23c718bbbb12007286
+loongarch 06351cc358eae676965131f8ed82b6a449918636
+m68k 4055eabe04a26f5d113b5a02588b20b5e166a753
+m68knommu 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+microblaze fe15c26ee26efa11741a7b632e9f23b01aca4cc6
+mips 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+openrisc dceaafd668812115037fc13a1893d068b7b880f5
+parisc-hd 6995e2de6891c724bfeb2db33d7b87775f913ad1
+powerpc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670
+risc-v 471aba2e4760f9abcec7d872a85795c6dd60dce1
+riscv-dt ef6012f301f71fd8d8bc07dd9710f5e5de362cf5
+riscv-soc 1fcaaa1d489c33a24e297cd26646887bfab8d659
+s390 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+sh 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+uml 6032aca0deb9c138df122192f8ef02de1fdccf25
+xtensa a160e9414d8a1747225206558b24d7df513b3c8d
+pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451
+fscrypt 324718ddddc40905f0216062dfbb977809184c06
+afs 0a278bc196e784b4849c1581266421adbca1989f
+btrfs cc87d1d73c34283ac8248ca6e1349fc87b260570
+ceph a282a2f10539dce2aa619e71e1817570d557fc97
+cifs b04a275441037964e6d5dec8c83c07a4d8fb52f0
+configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5
+ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8
+erofs 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+exfat d42334578eba1390859012ebb91e1e556d51db49
+ext3 eccf9ae283126b6eeca01600b757d1877a870d73
+ext4 7c79210b15ef69a5702d1fb817bad9a30bffb097
+f2fs 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+fsverity 456ae5fe9b448f44ebe98b391a3bae9c75df465e
+fuse 6a567e920fd0451bf29abc418df96c3365925770
+gfs2 94c76955e86a5a4f16a1d690b66dcc268c156e6a
+jfs 95e2b352c03b0a86c5717ba1d24ea20969abcacc
+ksmbd 956cd69868ee7419f5115981bdcec48f1a2fb221
+nfs 5b4a82a0724af1dfd1320826e0266117b6a57fbd
+nfs-anna 43439d858bbae244a510de47f9a55f667ca4ed52
+nfsd 76c53d9f9a9d6f078cebdda4d369e31547928af8
+ntfs3 44b4494d5c5971dc8f531c8783d90a637e862880
+orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599
+overlayfs 0a3bf81dbcb228124c9de72c85c442a81d70ab1e
+ubifs b5fda08ef213352ac2df7447611eb4d383cce929
+v9fs 4ec5183ec48656cec489c49f989c508b68b518e3
+v9fs-ericvh 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+xfs ed04a91f718e6e1ab82d47a22b26e4b50c1666f6
+zonefs 8812387d056957355ef1d026cd38bed3830649db
+iomap 447a0bc108e4bae4c1ea845aacf43c10c28814e8
+djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763
+file-locks 0d6aeec73f8cd3290662748a4fb1bded1e5bb5c7
+iversion 63355b9884b3d1677de6bd1517cd2b8a9bf53978
+vfs-brauner cf22d118b89a09a0160586412160d89098f7c4c7
+vfs cff4b23c731a1cbdf39d5ce180196b8dffb6c411
+printk 16bff6f075a1055a0084c8a05fd4a0c4ab4b3607
+pci ffb9381f49dac1203a54823542d9dc6eb32d0393
+pstore efe5be6664c8b9a7eac1d733b194292d018ad05d
+hid 5eb5c80feb93316ff0f659f386025ec492c6fad7
+i2c 6537ed3904a3b3720e5e238dd5d542448fcf94c2
+i3c 49b472ebc61de3d4aa7cc57539246bb39f6c5128
+dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df
+hwmon-staging 4dbbaf8fbdbd13adc80731b2452257857e4c2d8b
+jc_docs 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+v4l-dvb 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+v4l-dvb-next 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+pm 3c61a03588dd8486041f484e9b6c48b2c9a69b92
+cpufreq-arm 9d4807ffe9efac0c40aba5764e79dda91b642c84
+cpupower d7de5d8e403a1293e10f8f59a1f2db320232c831
+devfreq a83bfdca8b2098999e3edfb87e98925e019eb818
+opp 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+thermal 57c9eaa4de537e6f08819d9214de502cac5a989c
+dlm fc4ea4229c2b2dca0bffc12eee6973e353c20086
+rdma 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+net-next ba2274dcfda859b8a27193e68ad37bfe4da28ddc
+bpf-next 1cd0e7715cad848017e48033772791e8b9ee2932
+ipsec-next a94fd40a18ae76ba76dbaa8eca0e3c46aa1142c1
+mlx5-next 77f7eb9f3416aace703971156133926e44e2195b
+netfilter-next b8e39b38487e68c6503419db6e4a851a0ef56de7
+ipvs-next 61dc651cdfe85066e1371dd1bd8aee685bd6ec75
+bluetooth 2ba6216b8b375666776fcba4eea11e134fed0ea6
+wireless-next 31b5a547622b3782388eb676081da1eefe5b98d2
+wpan-next 18b849f12dcc34ec4cb9c8fadeb503b069499ba4
+wpan-staging 18b849f12dcc34ec4cb9c8fadeb503b069499ba4
+mtd 259b4d4c1308a1fa0a671be3ecd8f847c7ce2e95
+nand 2b42d718c7d7f4269d45fb58b4f74d7b2bfb08bd
+spi-nor 4b0cb4e7ab2f777c0dd07b6d381047db85801a89
+crypto 486bfb05913ac9969a3a71a4dc48f17f31cb162d
+drm 6725f33228077902ddac2a05e0ab361dee36e4ba
+drm-misc 7dae503584a1f9fb761fbdfa2efcb6f8a029a0ea
+amdgpu 093b21f43173ecd9820a73a87a48905805b4f676
+drm-intel 290d161045753240f2100b8f44660426ecc97be5
+drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c
+drm-msm cd036d542afb82adfbbd43c5dbeb7010e8e91ee7
+drm-msm-lumag 1275b21a6c54b0d72100d16e978e0e01238e6659
+etnaviv 295b6c02f84b81971c42b592771920783fc181cd
+fbdev 53a90ae81a33437ff6ae907c75fd8a9902df2480
+regmap c9a82362486316ed15610555efc60d794e46d176
+sound 67192cc0f0263847ab3ccdcfe90989624a0c7fe3
+ieee1394 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+sound-asoc 3acd333049b833555cd315b9e8d86ed006605486
+modules 9ce170cef66916526dcaa868a67cfcc0c2f0c3d6
+input 677232f879f2464007c511a73048ff5996b479fc
+block cfd18f91a1540190e8cd341f6ae1fbe06aa6498d
+device-mapper 7aa303bf1bd244cd4c6d9f2f3f543f74f033166e
+libata fd3ac6e8049799ca7dbd2738de8e149536e92a5e
+pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452
+mmc 9289a19bce218f80afe498b025410366c7370520
+mfd b90e33b6116afd3bf18f43d4b6d2858caa3c8640
+backlight a33677b9211b6c328ad359b072043af94f7c9592
+battery 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+regulator f5f8fe9226b16332ba167f435841cd90c083a5d5
+security c31288e56c1a7bb57a1be1f9f6f3faacbeddeff6
+apparmor afad53575a938ceb557227ecfeb0dda59d668d4e
+integrity 95526d13038c2bbddd567a4d8e39fac42484e182
+safesetid 64b634830c919979de4b18163e15d30df66e64a8
+selinux 5b0eea835d4e9cb5229e696c5763929fc2394f39
+smack 2c085f3a8f23c9b444e8b99d93c15d7ce870fc4e
+tomoyo 1c7873e3364570ec89343ff4877e0f27a7b21a61
+tpmdd bcd320a57f5dca3dbf6e0081bc432744a381efb6
+watchdog 2500df55a615f2f177bacf1a261f927790a137db
+iommu a7a334076dd725b8c3b5d64f68e3992ffcfd1d25
+audit 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+devicetree 31e9f406efae513156c129e9f7ad16b9f0ec7a65
+dt-krzk 9d5d7ad3d5172e3a4e881827edc17a5465dda32e
+mailbox 1b712f18c461bd75f018033a15cf381e712806b5
+spi 6930bfa7a90e00a80dc274d134c180bf2b02984a
+tip 1a2945f27157825a561be7840023e3664111ab2f
+clockevents 8b5bf64c89c7100c921bd807ba39b2eb003061ab
+edac 852667c317ae23f366cfaade3b9269b1943888dd
+irqchip a82f3119d543406ed5b242deabf83cdecb9fe523
+ftrace 61c692f56feceaa5f6bf55301f7c108ac1013e91
+rcu 7408340a707e48690cc2cf6d26e15f315d743e1f
+kvm 255006adb3da71bb75c334453786df781b415f54
+kvm-arm 192df2aa0113ddddee2a93e453ff46610807b425
+kvms390 db54dfc9f71cd2df7afd1e88535ef6099cb0333e
+kvm-riscv 07f225b5842420ae9c18cba17873fc71ed69c28e
+kvm-x86 88bb466c9dec4f70d682cf38c685324e7b1b3d60
+xen-tip 21a235bce12361e64adfc2ef97e4ae2e51ad63d4
+percpu b9819165bb455bfdce37086c622a18cce2dd2f5e
+workqueues 6dc917b4452559777d2cb8d9a175183fa0ee6730
+drivers-x86 9204fc5071bf8b237d455e0c271c37729682a7ff
+chrome-platform 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+hsi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+leds 1b929c02afd37871d5afb9d498426f83432e71c2
+leds-lj 7a2b85a76b05f16e8e788d035afcacdd4faa1d71
+ipmi b02bb79eee074f07acdfde540f2d4fe2a04471d8
+driver-core 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+usb 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+thunderbolt 481012b479fe6d8dd4e01d739c359a8d99d074a9
+usb-serial 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+tty 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+char-misc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+accel e6f49e96bc57d34fc0f617f37bfdf62a9b58d2c2
+coresight 6c50384ef8b94a527445e3694ae6549e1f15d859
+fastrpc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+fpga e9fdc41a3d66c7602b524a248d3b4ec7c430cb92
+icc 9bcd2e1565e4ea0cf19afe40cba84b0c62738037
+iio 9e66fb52449538406cea43e9f3889c391350e76e
+phy-next 76009ee76e05e30e29aade02e788aebe9ce9ffd2
+soundwire 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+extcon 94da3da96c35744001adfdb65e501e633a64cb51
+gnss 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+vfio ff598081e5b9d0bdd6874bfe340811bbb75b35e4
+w1 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+staging 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+counter-next 9b53a13422162feac7c7ee58e5bc0e0a80a41963
+mux 44c026a73be8038f03dbdeef028b642880cf1511
+dmaengine 1b13e52c0c76097fde35d3283e8105545d34b80b
+cgroup d1d4ff5d11a5887a9c4cfc00294bc68ba03e7c16
+scsi f4d1a8e011909fee24643f84bd1196e1366c26f2
+scsi-mkp e152a616c88653e67244595979fde24038d9653a
+vhost 373abdba01d4a975390a8ef1d2265cdcaa51aa33
+rpmsg 81aceef4b71d2c93a5d28b3f9a3a9dce5fecb284
+gpio ac9a78681b921877518763ba0e89202254349d1b
+gpio-brgl 0f93a345aa42c40e2145c3719d878e7daa4eb6ee
+gpio-intel 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+pinctrl 04e601f2a71c804422a91df813e19fda5f4b845e
+pinctrl-intel 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+pinctrl-renesas bf8da305fef96b3384194e7c14a3ce8c8a0af91b
+pinctrl-samsung 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+pwm 92554cdd428fce212d2a71a06939e7cab90f7c77
+userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d
+ktest 7dc8e24f0e09834341f84d37433840b353d64bc8
+kselftest 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+kunit 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+kunit-next 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+livepatching ac4890f972116f84253934570b2c2a74e50227f3
+rtc 1b733a9ebc3d8011ca66ec6ff17f55a440358794
+nvdimm 1ea7ca1b090145519aad998679222f0a14ab8fce
+at24 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+ntb 994def29acc5d8cc5b513fc67a75aa79b059dbe8
+seccomp f373d301908a99ec62a4e12a356b69226f7689d0
+fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e
+slimbus 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+nvmem 3a7e4daf7aeaf05a0be0aed579866dc98482327e
+xarray 69cb69ea55420388b444ee30b1530ec15ab584f7
+hyperv a494aef23dfc732945cb42e22246a5c31174e4a5
+auxdisplay def85dce1451ec276b8047da2010b6e6a159c2b6
+kgdb b6464883f45ae6412de33e53587974fd86ba811e
+hmm 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
+mhi d0184830e611d0881e014e0fb10da707edbb3f71
+memblock 0f5e4adb608c79bedd8ced30f9ffdcfa01c37459
+cxl fe77cc2e5a6a7c85f5c6ef8a39d7694ffc7f41c9
+zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f
+efi 2e28a798c3092ea42b968fa16ac835969d124898
+unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1
+slab 44f6a42d4935028ffd788e7cf9114e4a1f8d6d3a
+random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff
+landlock 35ca4239929737bdc021ee923f97ebe7aff8fcc4
+rust d2e3115d717197cb2bc020dd1f06b06538474ac3
+sysctl 5664eaac4dcf561ed5a39641f525587bca289007
+execve aa88054b70905069d1cf706aa5e9a3418d1d341d
+bitmap 7e281084b62c4bba679d7f7f622ee17bf6a2998d
+hte ac9a78681b921877518763ba0e89202254349d1b
+kspp ec7633de404e7ce704d8f79081b97bca5b616c23
+kspp-gustavo 221a4b56ec70c1a9f09ce78751613d16c508a4ce
+iommufd 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000000000..a5f7e6aee1cbe
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,364 @@
+Trees included into this release:
+
+Name Type Url
+---- ---- ---
+origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master
+fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes
+mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable
+kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes
+arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr
+arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes
+arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes
+arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes
+davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current
+drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes
+tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes
+m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes
+s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master
+fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current
+fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current
+net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main
+bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master
+ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master
+netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main
+ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main
+wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next
+wpan git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master
+rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc
+sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus
+sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus
+regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus
+regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus
+spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus
+pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus
+driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus
+tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus
+usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus
+usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus
+phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes
+staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus
+iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg
+counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current
+char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus
+soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes
+thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes
+input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus
+crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master
+vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus
+kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes
+modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus
+dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes
+backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes
+mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes
+mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes
+v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes
+reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes
+mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes
+at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes
+omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes
+kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master
+kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master
+hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon
+nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes
+cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes
+btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes
+vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes
+dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus
+drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes
+samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes
+pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes
+devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus
+dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes
+scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes
+drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes
+drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes
+mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes
+rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes
+gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus
+hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes
+soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix
+risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes
+riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes
+riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes
+fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes
+spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus
+gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current
+gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes
+pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes
+erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes
+kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes
+ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes
+memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes
+nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes
+irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes
+renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes
+broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes
+perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools#perf-tools
+efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent
+zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus
+battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes
+uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes
+asahi-soc-fixes git https://github.com/AsahiLinux/linux.git#asahi-soc/fixes
+iommufd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc
+rust-fixes git https://github.com/Rust-for-Linux/linux.git#rust-fixes
+v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next
+w1-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes
+drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes
+mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable
+mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable
+mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next
+clang-format git https://github.com/ojeda/linux.git#clang-format
+perf git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next
+compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes
+dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master
+arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next
+arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next
+arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core
+arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf
+arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next
+amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next
+asahi-soc git https://github.com/AsahiLinux/linux.git#asahi-soc/for-next
+aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next
+at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next
+broadcom git https://github.com/Broadcom/stblinux.git#next
+davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next
+drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next
+imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next
+mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next
+mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next
+omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next
+qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next
+renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next
+reset git https://git.pengutronix.de/git/pza/linux#reset/next
+rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next
+samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next
+scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next
+stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next
+sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next
+tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next
+tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next
+ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next
+xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next
+clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next
+clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next
+clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk
+csky git git://github.com/c-sky/csky-linux.git#linux-next
+loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next
+m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next
+m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next
+microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next
+mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next
+openrisc git git://github.com/openrisc/linux.git#for-next
+parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next
+powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next
+soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next
+risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next
+riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next
+riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next
+s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next
+sh git git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next
+uml git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next
+xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next
+pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next
+fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next
+afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next
+btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next
+ceph git git://github.com/ceph/ceph-client.git#master
+cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next
+configfs git git://git.infradead.org/users/hch/configfs.git#for-next
+ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next
+erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev
+exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev
+ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next
+ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev
+f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev
+fsverity git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next
+fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
+gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next
+jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next
+ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next
+nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
+nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next
+nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next
+ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master
+orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next
+overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next
+ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next
+v9fs git git://github.com/martinetd/linux#9p-next
+v9fs-ericvh git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next
+xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next
+zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next
+iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next
+djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next
+file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next
+iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next
+vfs-brauner git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all
+vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next
+printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next
+pci git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next
+pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore
+hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next
+i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next
+i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next
+dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next
+hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next
+jc_docs git git://git.lwn.net/linux.git#docs-next
+v4l-dvb git git://linuxtv.org/media_tree.git#master
+v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master
+pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next
+cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next
+cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower
+devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next
+opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next
+thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next
+rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next
+net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main
+bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next
+ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master
+mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next
+netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main
+ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main
+bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master
+wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next
+wpan-next git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master
+wpan-staging git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging
+mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next
+nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next
+spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next
+crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master
+drm git git://git.freedesktop.org/git/drm/drm.git#drm-next
+drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next
+amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next
+drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next
+drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next
+drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next
+drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag
+etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next
+fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next
+regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next
+sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next
+ieee1394 git https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next
+sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next
+modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next
+block git git://git.kernel.dk/linux-block.git#for-next
+device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next
+libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next
+pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next
+mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next
+backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next
+battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next
+regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next
+security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next
+apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next
+integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity
+safesetid git https://github.com/micah-morton/linux.git#safesetid-next
+selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next
+smack git git://github.com/cschaufler/smack-next#next
+tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master
+tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next
+watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master
+iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next
+audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next
+devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next
+dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next
+mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next
+spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master
+clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next
+edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next
+irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next
+ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next
+rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next
+kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next
+kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next
+kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next
+kvm-riscv git https://github.com/kvm-riscv/linux.git#riscv_kvm_next
+kvm-x86 git https://github.com/kvm-x86/linux.git#next
+xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next
+percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next
+workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next
+chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next
+hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next
+leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next
+leds-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next
+ipmi git git://github.com/cminyard/linux-ipmi.git#for-next
+driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next
+usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next
+thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next
+usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next
+tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next
+char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next
+accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next
+coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next
+fastrpc git git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next
+fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next
+icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next
+iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg
+phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next
+soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next
+extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next
+gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next
+vfio git git://github.com/awilliam/linux-vfio.git#next
+w1 git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next
+staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next
+counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next
+mux git https://gitlab.com/peda-linux/mux.git#for-next
+dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next
+cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next
+scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next
+scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next
+vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next
+rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next
+gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
+gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next
+gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next
+pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next
+pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next
+pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl
+pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next
+pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next
+userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next
+ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next
+kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next
+kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test
+kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit
+livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next
+rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next
+nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next
+at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next
+ntb git https://github.com/jonmason/ntb.git#ntb-next
+seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp
+fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next
+slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next
+nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next
+xarray git git://git.infradead.org/users/willy/xarray.git#main
+hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next
+auxdisplay git https://github.com/ojeda/linux.git#auxdisplay
+kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next
+hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm
+cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next
+mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next
+memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next
+cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next
+zstd git https://github.com/terrelln/linux.git#zstd-next
+efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next
+unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next
+slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next
+random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master
+landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next
+rust git https://github.com/Rust-for-Linux/linux.git#rust-next
+sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next
+execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve
+bitmap git https://github.com/norov/linux.git#bitmap-for-next
+hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next
+kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp
+kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp
+iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 0000000000000..f0a411ce9a7c7
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,4454 @@
+$ date -R
+Fri, 14 Jul 2023 09:05:24 +1000
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 3f01e9fed845 Merge tag 'linux-watchdog-6.5-rc2' of git://www.linux-watchdog.org/linux-watchdog
+Merging origin/master (4b810bf037e5 Merge tag 'erofs-for-6.5-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
+Updating 3f01e9fed845..4b810bf037e5
+Fast-forward (no commit created; -m option ignored)
+ Documentation/process/maintainer-netdev.rst | 2 +-
+ Documentation/wmi/devices/dell-wmi-ddv.rst | 3 +-
+ MAINTAINERS | 1 +
+ arch/arm64/Kconfig | 2 +
+ arch/arm64/include/asm/ftrace.h | 4 +
+ arch/arm64/include/asm/syscall.h | 3 +
+ arch/arm64/kernel/syscall.c | 3 -
+ arch/openrisc/include/uapi/asm/sigcontext.h | 6 +-
+ arch/openrisc/kernel/signal.c | 4 +-
+ arch/riscv/net/bpf_jit.h | 6 +-
+ arch/riscv/net/bpf_jit_core.c | 19 ++-
+ arch/sh/boards/mach-dreamcast/irq.c | 6 +-
+ arch/sh/boards/mach-highlander/setup.c | 4 +-
+ arch/sh/boards/mach-r2d/irq.c | 4 +-
+ arch/sh/cchips/Kconfig | 4 +-
+ arch/sh/include/asm/hd64461.h | 2 +-
+ arch/x86/kernel/ftrace.c | 1 -
+ arch/x86/xen/xen-head.S | 37 +++--
+ drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_desc.c | 30 +++-
+ drivers/hid/hid-hyperv.c | 10 +-
+ drivers/hid/hid-input.c | 7 +-
+ drivers/hid/hid-logitech-hidpp.c | 2 +
+ drivers/hid/hid-nvidia-shield.c | 12 +-
+ drivers/net/dsa/ocelot/felix.c | 10 +-
+ drivers/net/dsa/ocelot/felix.h | 1 -
+ drivers/net/dsa/ocelot/felix_vsc9959.c | 59 ++++---
+ drivers/net/dsa/qca/qca8k-8xxx.c | 3 +
+ drivers/net/ethernet/amazon/ena/ena_com.c | 3 +
+ drivers/net/ethernet/broadcom/bgmac.c | 4 +-
+ drivers/net/ethernet/freescale/fec.h | 17 +-
+ drivers/net/ethernet/freescale/fec_main.c | 166 ++++++++++++-------
+ drivers/net/ethernet/google/gve/gve.h | 1 +
+ drivers/net/ethernet/google/gve/gve_ethtool.c | 5 +-
+ drivers/net/ethernet/google/gve/gve_main.c | 11 +-
+ drivers/net/ethernet/intel/ice/ice_main.c | 23 ++-
+ drivers/net/ethernet/intel/ice/ice_tc_lib.c | 22 +--
+ drivers/net/ethernet/intel/ice/ice_tc_lib.h | 1 +
+ drivers/net/ethernet/intel/igc/igc.h | 9 +-
+ drivers/net/ethernet/intel/igc/igc_ethtool.c | 2 +
+ drivers/net/ethernet/intel/igc/igc_main.c | 98 ++++++++----
+ drivers/net/ethernet/intel/igc/igc_ptp.c | 25 ++-
+ drivers/net/ethernet/intel/igc/igc_tsn.c | 68 ++++++--
+ drivers/net/ethernet/marvell/mvneta.c | 4 +-
+ drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 19 ++-
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 2 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 11 +-
+ .../ethernet/marvell/octeontx2/af/rvu_npc_hash.c | 23 ++-
+ .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 8 +
+ .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 15 ++
+ .../mellanox/mlx5/core/en/fs_tt_redirect.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 14 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 3 +-
+ .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 44 +++---
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 3 +
+ drivers/net/ethernet/mellanox/mlx5/core/thermal.c | 19 ++-
+ drivers/net/ethernet/microchip/Kconfig | 2 +-
+ drivers/net/ethernet/mscc/ocelot.c | 1 -
+ drivers/net/ethernet/mscc/ocelot_mm.c | 14 +-
+ .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 6 -
+ drivers/net/ethernet/pensando/ionic/ionic_lif.c | 5 -
+ drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 3 -
+ drivers/net/netdevsim/dev.c | 9 +-
+ drivers/net/wireless/cisco/airo.c | 5 +-
+ drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 5 -
+ drivers/net/wireless/intel/iwlwifi/iwl-config.h | 2 -
+ drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 4 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 6 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 2 +-
+ drivers/net/wireless/intel/iwlwifi/queue/tx.c | 10 +-
+ drivers/net/wireless/intel/iwlwifi/queue/tx.h | 8 +-
+ drivers/net/wireless/mediatek/mt76/mt7921/dma.c | 4 -
+ drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 8 -
+ drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 8 +
+ drivers/net/wireless/realtek/rtw89/debug.c | 5 +-
+ drivers/platform/x86/amd/Makefile | 2 +-
+ drivers/platform/x86/amd/pmc-quirks.c | 176 +++++++++++++++++++++
+ drivers/platform/x86/amd/pmc.c | 32 ++--
+ drivers/platform/x86/amd/pmc.h | 44 ++++++
+ drivers/platform/x86/amd/pmf/core.c | 3 +
+ drivers/platform/x86/dell/dell-wmi-ddv.c | 7 +-
+ .../platform/x86/intel/int3472/clk_and_regulator.c | 2 +-
+ drivers/platform/x86/intel/tpmi.c | 4 +-
+ drivers/platform/x86/thinkpad_acpi.c | 143 -----------------
+ drivers/platform/x86/touchscreen_dmi.c | 22 +++
+ drivers/platform/x86/wmi.c | 28 ++--
+ drivers/s390/net/ism_drv.c | 153 +++++++++---------
+ drivers/xen/grant-dma-ops.c | 2 +
+ fs/erofs/decompressor.c | 37 ++---
+ fs/erofs/inode.c | 3 +-
+ fs/erofs/zdata.c | 4 +-
+ include/linux/ftrace.h | 9 ++
+ include/linux/ism.h | 7 +-
+ include/linux/rethook.h | 1 +
+ include/net/netfilter/nf_conntrack_tuple.h | 3 +
+ include/net/netfilter/nf_tables.h | 31 +++-
+ include/net/pkt_sched.h | 2 +-
+ include/soc/mscc/ocelot.h | 9 +-
+ kernel/bpf/cpumap.c | 40 +++--
+ kernel/bpf/verifier.c | 5 +-
+ kernel/kprobes.c | 8 +-
+ kernel/trace/fgraph.c | 1 +
+ kernel/trace/fprobe.c | 15 +-
+ kernel/trace/ftrace.c | 45 ++++--
+ kernel/trace/ftrace_internal.h | 5 +-
+ kernel/trace/rethook.c | 13 ++
+ kernel/trace/ring_buffer.c | 24 +--
+ kernel/trace/trace.c | 22 ++-
+ kernel/trace/trace_eprobe.c | 18 ++-
+ kernel/trace/trace_events_hist.c | 8 +-
+ kernel/trace/trace_events_user.c | 3 +
+ kernel/trace/trace_kprobe_selftest.c | 3 +
+ net/core/net-traces.c | 2 +
+ net/core/skbuff.c | 5 +
+ net/core/xdp.c | 2 +-
+ net/ipv6/addrconf.c | 3 +-
+ net/ipv6/icmp.c | 5 +-
+ net/ipv6/udp.c | 4 +-
+ net/netfilter/nf_conntrack_core.c | 20 +--
+ net/netfilter/nf_conntrack_helper.c | 4 +
+ net/netfilter/nf_conntrack_proto_gre.c | 10 +-
+ net/netfilter/nf_tables_api.c | 174 ++++++++++++--------
+ net/netfilter/nft_byteorder.c | 14 +-
+ net/netfilter/nft_flow_offload.c | 6 +-
+ net/netfilter/nft_immediate.c | 8 +-
+ net/netfilter/nft_objref.c | 8 +-
+ net/sched/act_api.c | 2 +-
+ net/sched/cls_flower.c | 10 ++
+ net/sched/cls_fw.c | 10 +-
+ net/sched/sch_qfq.c | 18 ++-
+ net/wireless/util.c | 2 +
+ samples/ftrace/ftrace-direct-modify.c | 34 ++++
+ samples/ftrace/ftrace-direct-multi-modify.c | 40 +++++
+ samples/ftrace/ftrace-direct-multi.c | 25 +++
+ samples/ftrace/ftrace-direct-too.c | 40 ++++-
+ samples/ftrace/ftrace-direct.c | 24 +++
+ .../selftests/bpf/prog_tests/async_stack_depth.c | 9 ++
+ .../selftests/bpf/progs/async_stack_depth.c | 40 +++++
+ tools/testing/selftests/hid/vmtest.sh | 1 +
+ .../selftests/tc-testing/tc-tests/qdiscs/qfq.json | 86 ++++++++++
+ tools/testing/selftests/user_events/dyn_test.c | 12 ++
+ 146 files changed, 1703 insertions(+), 847 deletions(-)
+ create mode 100644 drivers/platform/x86/amd/pmc-quirks.c
+ create mode 100644 drivers/platform/x86/amd/pmc.h
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/async_stack_depth.c
+ create mode 100644 tools/testing/selftests/bpf/progs/async_stack_depth.c
+Merging fixes/fixes (d528014517f2 Revert ".gitignore: ignore *.cover and *.mbx")
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes
+Already up to date.
+Merging mm-hotfixes/mm-hotfixes-unstable (46575249388f mm-shmem-fix-race-in-shmem_undo_range-w-thp-fix)
+$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable
+Merge made by the 'ort' strategy.
+ kernel/sys.c | 10 ++---
+ lib/maple_tree.c | 3 +-
+ lib/test_maple_tree.c | 5 ++-
+ mm/hugetlb.c | 75 +++++++++++++++++++++++-----------
+ mm/memory.c | 3 ++
+ mm/mlock.c | 9 ++--
+ mm/shmem.c | 19 ++++++++-
+ tools/testing/radix-tree/maple.c | 6 +--
+ tools/testing/selftests/Makefile | 21 +---------
+ tools/testing/selftests/arm64/Makefile | 2 +-
+ tools/testing/selftests/lib.mk | 40 ++----------------
+ tools/testing/selftests/mm/mkdirty.c | 2 +-
+ 12 files changed, 97 insertions(+), 98 deletions(-)
+Merging kbuild-current/fixes (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3)
+$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr
+Already up to date.
+Merging arm-current/fixes (2b951b0efbaa ARM: 9297/1: vfp: avoid unbalanced stack on 'success' return path)
+$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (55b87b749963 arm64: Fix HFGxTR_EL2 field naming)
+$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes
+Merge made by the 'ort' strategy.
+ arch/arm64/tools/sysreg | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+Merging arm-soc-fixes/arm/fixes (6722e46513e0 bus: ixp4xx: fix IXP4XX_EXP_T1_MASK)
+$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes
+Already up to date.
+Merging davinci-current/davinci/for-current (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current
+Already up to date.
+Merging drivers-memory-fixes/fixes (06c2afb862f9 Linux 6.5-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 tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8)
+$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes
+Already up to date.
+Merging m68k-current/for-linus (4055eabe04a2 m68k: defconfig: Update defconfigs for v6.4-rc1)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (cf53564b11ce powerpc/mm/book3s64/hash/4k: Add pmd_same callback for 4K page size)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
+Merge made by the 'ort' strategy.
+ arch/powerpc/include/asm/book3s/64/hash-4k.h | 6 -----
+ arch/powerpc/include/asm/book3s/64/hash-64k.h | 5 ----
+ arch/powerpc/include/asm/book3s/64/hash.h | 5 ++++
+ arch/powerpc/kernel/exceptions-64e.S | 31 ++++++++++++----------
+ arch/powerpc/kernel/security.c | 37 ++++++++++++++-------------
+ arch/powerpc/mm/book3s64/hash_native.c | 13 +++++++---
+ 6 files changed, 51 insertions(+), 46 deletions(-)
+Merging s390-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
+Already up to date.
+Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master
+Auto-merging arch/sparc/mm/srmmu.c
+Merge made by the 'ort' strategy.
+Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref())
+$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current
+Already up to date.
+Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY)
+$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current
+Already up to date.
+Merging net/main (9d23aac8a85f Merge branch 'net-sched-fixes-for-sch_qfq')
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main
+Already up to date.
+Merging bpf/master (2e06c57d66d3 xdp: use trusted arguments in XDP hints kfuncs)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master
+Already up to date.
+Merging ipsec/master (57010b8ece28 xfrm: Silence warnings triggerable by bad packets)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
+Merge made by the 'ort' strategy.
+ net/key/af_key.c | 4 ++--
+ net/xfrm/xfrm_compat.c | 2 +-
+ net/xfrm/xfrm_input.c | 22 +++++++++-------------
+ net/xfrm/xfrm_user.c | 11 ++++++++++-
+ 4 files changed, 22 insertions(+), 17 deletions(-)
+Merging netfilter/main (9d0aba98316d gve: unify driver name usage)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main
+Already up to date.
+Merging ipvs/main (1a7d09a737a0 Merge tag 'nf-23-06-27' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main
+Already up to date.
+Merging wireless/for-next (f1a0898b5d6a wifi: iwlwifi: mvm: spin_lock_bh() to fix lockdep regression)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next
+Already up to date.
+Merging wpan/master (9a43827e876c net: dpaa2-mac: add 25gbase-r support)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master
+Already up to date.
+Merging rdma-fixes/for-rc (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
+Already up to date.
+Merging sound-current/for-linus (645e583d2689 selftests: ALSA: Fix fclose on an already fclosed file pointer)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
+Merge made by the 'ort' strategy.
+ sound/drivers/pcmtest.c | 12 +++++++-----
+ tools/testing/selftests/alsa/test-pcmtest-driver.c | 4 +---
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+Merging sound-asoc-fixes/for-linus (a3e64c2b2c65 Merge remote-tracking branch 'asoc/for-6.4' into asoc-linus)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus
+Auto-merging sound/soc/codecs/Kconfig
+Merge made by the 'ort' strategy.
+ .../bindings/sound/audio-graph-card2.yaml | 20 +--
+ .../bindings/sound/google,sc7180-trogdor.yaml | 2 +-
+ .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 2 +-
+ sound/soc/amd/acp/amd.h | 7 +-
+ sound/soc/amd/ps/acp63.h | 22 +++-
+ sound/soc/amd/ps/pci-ps.c | 4 +-
+ sound/soc/amd/ps/ps-sdw-dma.c | 16 ++-
+ sound/soc/codecs/Kconfig | 2 +
+ sound/soc/codecs/cs43130.h | 138 ++++++++++-----------
+ sound/soc/codecs/rt5640.c | 12 +-
+ sound/soc/codecs/rt5645.c | 6 +-
+ sound/soc/codecs/wcd-mbhc-v2.c | 57 ++++++---
+ sound/soc/codecs/wcd934x.c | 20 ++-
+ sound/soc/codecs/wcd938x.c | 99 ++++++++++++---
+ sound/soc/fsl/fsl_sai.c | 6 -
+ sound/soc/qcom/qdsp6/q6afe-dai.c | 2 +-
+ sound/soc/qcom/qdsp6/q6apm-dai.c | 1 +
+ sound/soc/qcom/qdsp6/q6apm.c | 7 +-
+ sound/soc/qcom/qdsp6/topology.c | 4 +-
+ sound/soc/soc-compress.c | 1 +
+ sound/soc/soc-core.c | 6 +-
+ sound/soc/soc-topology.c | 10 +-
+ sound/soc/sof/amd/acp.c | 10 +-
+ sound/soc/tegra/tegra210_adx.c | 34 +++--
+ sound/soc/tegra/tegra210_amx.c | 40 +++---
+ sound/soc/tegra/tegra210_sfc.c | 31 ++++-
+ sound/soc/tegra/tegra210_sfc.h | 4 +-
+ 27 files changed, 370 insertions(+), 193 deletions(-)
+Merging regmap-fixes/for-linus (963b54df82b6 regmap-irq: Fix out-of-bounds access when allocating config buffers)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus
+Merge made by the 'ort' strategy.
+ drivers/base/regmap/regmap-irq.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging regulator-fixes/for-linus (31e112d5bb1c Merge remote-tracking branch 'regulator/for-6.4' into regulator-linus)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
+Merge made by the 'ort' strategy.
+ drivers/regulator/da9063-regulator.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+Merging spi-fixes/for-linus (f481dd5886fa Merge remote-tracking branch 'spi/for-6.4' into spi-linus)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
+Auto-merging .mailmap
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .mailmap | 1 +
+ MAINTAINERS | 9 ++++++++-
+ drivers/spi/spi-bcm63xx.c | 2 +-
+ drivers/spi/spi-s3c64xx.c | 2 ++
+ drivers/spi/spi-zynqmp-gqspi.c | 12 ++++++++----
+ 5 files changed, 20 insertions(+), 6 deletions(-)
+Merging pci-current/for-linus (37540db221e1 MAINTAINERS: Add Manivannan Sadhasivam as DesignWare PCIe driver maintainer)
+$ git merge -m Merge branch 'for-linus' of git://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 insertion(+)
+Merging driver-core.current/driver-core-linus (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus
+Already up to date.
+Merging usb-serial-fixes/usb-linus (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus
+Already up to date.
+Merging phy/fixes (8932089b566c phy: qcom-snps-femto-v2: use qcom_snps_hsphy_suspend/resume error code)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes
+Merge made by the 'ort' strategy.
+ drivers/phy/mediatek/phy-mtk-dp.c | 2 +-
+ drivers/phy/mediatek/phy-mtk-hdmi-mt8195.c | 2 +-
+ drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 78 +++++++++++++++++----------
+ 3 files changed, 52 insertions(+), 30 deletions(-)
+Merging staging.current/staging-linus (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus
+Already up to date.
+Merging iio-fixes/fixes-togreg (3af5d5b9a262 iio: adc: ina2xx: avoid NULL pointer dereference on OF device match)
+$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg
+Merge made by the 'ort' strategy.
+ drivers/iio/adc/ad7192.c | 16 ++++++++--------
+ drivers/iio/adc/ina2xx-adc.c | 9 ++++++---
+ drivers/iio/light/rohm-bu27008.c | 22 +++++++++++++++++++---
+ drivers/iio/light/rohm-bu27034.c | 22 +++++++++++++++++++---
+ 4 files changed, 52 insertions(+), 17 deletions(-)
+Merging counter-current/counter-current (9b53a1342216 counter: Fix menuconfig "Counter support" submenu entries disappearance)
+$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current
+Auto-merging drivers/counter/Kconfig
+Merge made by the 'ort' strategy.
+ drivers/counter/Kconfig | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+Merging char-misc.current/char-misc-linus (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'char-misc-linus' of git://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 (7891d0a5ce6f soundwire: amd: Fix a check for errors in probe())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/soundwire/amd_manager.c | 4 ++--
+ drivers/soundwire/bus.c | 8 ++++----
+ drivers/soundwire/qcom.c | 2 +-
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+Merging thunderbolt-fixes/fixes (6995e2de6891 Linux 6.4)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (eb09074bdb05 Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN)
+$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus
+Merge made by the 'ort' strategy.
+ drivers/input/misc/cpcap-pwrbutton.c | 12 ++----------
+ drivers/input/serio/i8042-acpipnpio.h | 7 +++++++
+ drivers/input/touchscreen/exc3000.c | 10 ++++++++++
+ 3 files changed, 19 insertions(+), 10 deletions(-)
+Merging crypto-current/master (0b7ec177b589 crypto: algif_hash - Fix race between MORE and non-MORE sends)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master
+Already up to date.
+Merging vfio-fixes/for-linus (4752354af710 vfio/type1: check pfn valid before converting to struct page)
+$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus
+Already up to date.
+Merging kselftest-fixes/fixes (b33b8731566d selftests/mincore: fix skip condition for check_huge_pages test)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
+Merge made by the 'ort' strategy.
+ tools/testing/selftests/mincore/mincore_selftest.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition)
+$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus
+Already up to date.
+Merging dmaengine-fixes/fixes (d2a257684758 dmaengine: mcf-edma: Fix a potential un-allocated memory access)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/dma/Kconfig | 2 ++
+ drivers/dma/mcf-edma.c | 13 +++++++------
+ drivers/dma/xilinx/xdma.c | 2 +-
+ 3 files changed, 10 insertions(+), 7 deletions(-)
+Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2)
+$ git merge -m Merge branch 'for-backlight-fixes' of git://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 (7e6b04f9238e mtd: rawnand: meson: fix OOB available bytes for ECC)
+$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
+Merge made by the 'ort' strategy.
+ drivers/mtd/nand/raw/meson_nand.c | 3 +--
+ drivers/mtd/nand/raw/omap_elm.c | 24 ++++++++++++------------
+ drivers/mtd/nand/spi/toshiba.c | 4 ++--
+ drivers/mtd/nand/spi/winbond.c | 4 ++--
+ 4 files changed, 17 insertions(+), 18 deletions(-)
+Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2)
+$ git merge -m Merge branch 'for-mfd-fixes' of git://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 (f2702d8e53d8 media: verisilicon: change confusingly named relaxed register access)
+$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes
+Auto-merging drivers/media/platform/amphion/vpu_core.c
+Merge made by the 'ort' strategy.
+ drivers/media/cec/usb/pulse8/pulse8-cec.c | 7 +-
+ drivers/media/i2c/tc358746.c | 4 +-
+ drivers/media/pci/cx23885/cx23885-dvb.c | 12 --
+ drivers/media/platform/amphion/vpu_core.c | 4 +-
+ drivers/media/platform/amphion/vpu_mbox.c | 9 +-
+ .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 6 +-
+ .../media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 4 +-
+ .../media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 4 +-
+ .../platform/mediatek/vcodec/vdec_msg_queue.c | 3 +-
+ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h | 1 -
+ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 135 ++++++++++-----------
+ drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 5 +-
+ drivers/media/platform/verisilicon/hantro.h | 50 ++++----
+ .../media/platform/verisilicon/hantro_postproc.c | 12 +-
+ drivers/staging/media/atomisp/Kconfig | 1 +
+ 15 files changed, 118 insertions(+), 139 deletions(-)
+Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref)
+$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes
+Already up to date.
+Merging mips-fixes/mips-fixes (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes
+Already up to date.
+Merging at91-fixes/at91-fixes (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes
+Already up to date.
+Merging kvm-fixes/master (2623b3dc875a Merge tag 'kvmarm-fixes-6.4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
+$ 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 (21f27df85400 KVM: s390: pv: fix external interruption loop not always detected)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (b153a0bb4199 hwmon: (pmbus/adm1275) Fix problems with temperature monitoring on ADM1272)
+$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
+Already up to date.
+Merging nvdimm-fixes/libnvdimm-fixes (e98d14fa7315 tools/testing/nvdimm: Drop empty platform remove function)
+$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes
+Already up to date.
+Merging cxl-fixes/fixes (a70fc4ed20a6 cxl/port: Fix NULL pointer access in devm_cxl_add_port())
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes
+Already up to date.
+Merging btrfs-fixes/next-fixes (a14ea7d5b756 Merge branch 'misc-6.5' into next-fixes)
+$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes
+Auto-merging fs/btrfs/block-group.c
+Auto-merging fs/btrfs/volumes.c
+Merge made by the 'ort' strategy.
+ fs/btrfs/block-group.c | 13 +++++++++++--
+ fs/btrfs/block-group.h | 5 +++++
+ fs/btrfs/volumes.c | 17 ++++++-----------
+ 3 files changed, 22 insertions(+), 13 deletions(-)
+Merging vfs-fixes/fixes (609d54441493 fs: prevent out-of-bounds array speculation when closing a file descriptor)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes
+Already up to date.
+Merging dma-mapping-fixes/for-linus (bbb73a103fbb swiotlb: fix a braino in the alignment check fix)
+$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus
+Already up to date.
+Merging drivers-x86-fixes/fixes (6b293a8c91bc platform/x86: touchscreen_dmi: Add info for the Archos 101 Cesium Educ tablet)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (0bb8f49cd2cc of: Preserve "of-display" device name for compatibility)
+$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus
+Merge made by the 'ort' strategy.
+ drivers/of/Kconfig | 2 +-
+ drivers/of/platform.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging dt-krzk-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes
+Already up to date.
+Merging scsi-fixes/fixes (f4d1a8e01190 scsi: storvsc: Handle SRB status value 0x30)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-driver-ufs | 76 +++++++++++++-------------
+ block/blk-zoned.c | 86 +++++++++++++++++-------------
+ drivers/block/null_blk/zoned.c | 16 ++----
+ drivers/block/virtio_blk.c | 34 ++++++------
+ drivers/nvme/host/zns.c | 9 ++--
+ drivers/scsi/aacraid/aacraid.h | 2 +-
+ drivers/scsi/fnic/fnic_trace.c | 2 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +
+ drivers/scsi/qla2xxx/qla_def.h | 1 -
+ drivers/scsi/qla2xxx/qla_init.c | 4 +-
+ drivers/scsi/qla2xxx/qla_iocb.c | 5 +-
+ drivers/scsi/scsi_debug.c | 8 ---
+ drivers/scsi/sd_zbc.c | 12 ++---
+ drivers/scsi/storvsc_drv.c | 2 +
+ drivers/ufs/core/ufshcd.c | 38 +++++++++++++
+ drivers/ufs/host/Kconfig | 1 +
+ include/uapi/scsi/scsi_bsg_ufs.h | 25 +++++++++
+ include/ufs/ufs.h | 1 +
+ 18 files changed, 193 insertions(+), 131 deletions(-)
+Merging drm-fixes/drm-fixes (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (113899c2669d drm/i915: Fix one wrong caching mode enum usage)
+$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/i915/display/intel_display.c | 1 -
+ drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 3 ---
+ drivers/gpu/drm/i915/gt/intel_gtt.c | 2 +-
+ drivers/gpu/drm/i915/i915_perf.c | 11 ++++++++++-
+ 4 files changed, 11 insertions(+), 6 deletions(-)
+Merging mmc-fixes/fixes (d44263222134 mmc: moxart: read scr register without changing byte order)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes
+Merge made by the 'ort' strategy.
+ drivers/mmc/host/moxart-mmc.c | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource)
+$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes
+Already up to date.
+Merging gnss-fixes/gnss-linus (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus
+Already up to date.
+Merging hyperv-fixes/hyperv-fixes (55e544e1a922 x86/hyperv: Improve code for referencing hyperv_pcpu_input_arg)
+$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
+Auto-merging arch/x86/hyperv/ivm.c
+Merge made by the 'ort' strategy.
+ arch/x86/hyperv/hv_apic.c | 4 +---
+ arch/x86/hyperv/ivm.c | 7 +++----
+ arch/x86/hyperv/mmu.c | 12 ++----------
+ arch/x86/hyperv/nested.c | 11 ++---------
+ drivers/hv/connection.c | 13 ++++++-------
+ drivers/hv/hv_balloon.c | 2 +-
+ drivers/hv/hv_common.c | 10 +++++-----
+ include/asm-generic/mshyperv.h | 2 +-
+ 8 files changed, 21 insertions(+), 40 deletions(-)
+Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix
+Already up to date.
+Merging risc-v-fixes/fixes (b690e266dae2 riscv: mm: fix truncation warning on RV32)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
+Merge made by the 'ort' strategy.
+ Documentation/riscv/hwprobe.rst | 2 +-
+ arch/riscv/mm/init.c | 2 +-
+ drivers/perf/riscv_pmu.c | 3 ---
+ 3 files changed, 2 insertions(+), 5 deletions(-)
+Merging riscv-dt-fixes/riscv-dt-fixes (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'riscv-dt-fixes' of git://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 (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'riscv-soc-fixes' of git://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 (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes
+Already up to date.
+Merging spdx/spdx-linus (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'spdx-linus' of git://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 (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current
+Already up to date.
+Merging gpio-intel-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'fixes' of git://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 (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes
+Already up to date.
+Merging erofs-fixes/fixes (18bddc5b6703 erofs: fix fsdax unavailability for chunk-based regular files)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes
+Already up to date.
+Merging kunit-fixes/kunit-fixes (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes
+Already up to date.
+Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes
+Already up to date.
+Merging memblock-fixes/fixes (647037adcad0 Revert "mm: Always release pages to the buddy allocator in memblock_free_late().")
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes
+Already up to date.
+Merging nfsd-fixes/nfsd-fixes (d7dbed457c2e nfsd: Fix creation time serialization order)
+$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes
+Already up to date.
+Merging irqchip-fixes/irq/irqchip-fixes (6fe5c68ee6a1 irqchip/gic-v3: Workaround for GIC-700 erratum 2941627)
+$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes
+Auto-merging Documentation/arch/arm64/silicon-errata.rst
+Merge made by the 'ort' strategy.
+ Documentation/arch/arm64/silicon-errata.rst | 3 ++
+ drivers/irqchip/irq-bcm6345-l1.c | 14 ++----
+ drivers/irqchip/irq-gic-v3-its.c | 78 ++++++++++++++++++-----------
+ drivers/irqchip/irq-gic-v3.c | 62 ++++++++++++++++++++++-
+ 4 files changed, 117 insertions(+), 40 deletions(-)
+Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes
+Already up to date.
+Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
+$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes
+Already up to date.
+Merging perf-current/perf-tools (ad07149f34db tools headers UAPI: Sync linux/prctl.h with the kernel sources)
+$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools
+Merge made by the 'ort' strategy.
+ tools/build/feature/Makefile | 2 +-
+ tools/include/uapi/asm-generic/unistd.h | 5 +-
+ tools/include/uapi/drm/i915_drm.h | 95 +++++++++++++++++++++-
+ tools/include/uapi/linux/fcntl.h | 5 ++
+ tools/include/uapi/linux/kvm.h | 6 +-
+ tools/include/uapi/linux/mman.h | 14 ++++
+ tools/include/uapi/linux/mount.h | 3 +-
+ tools/include/uapi/linux/prctl.h | 11 +++
+ tools/perf/Makefile.config | 4 +-
+ .../perf/arch/mips/entry/syscalls/syscall_n64.tbl | 1 +
+ tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 1 +
+ tools/perf/arch/s390/entry/syscalls/syscall.tbl | 1 +
+ tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ .../pmu-events/arch/x86/amdzen1/recommended.json | 3 +-
+ .../pmu-events/arch/x86/amdzen2/recommended.json | 3 +-
+ .../pmu-events/arch/x86/amdzen3/recommended.json | 3 +-
+ .../tests/shell/test_uprobe_from_different_cu.sh | 77 ++++++++++++++++++
+ tools/perf/trace/beauty/move_mount_flags.sh | 2 +-
+ tools/perf/util/dwarf-aux.c | 4 +-
+ 19 files changed, 228 insertions(+), 13 deletions(-)
+ create mode 100755 tools/perf/tests/shell/test_uprobe_from_different_cu.sh
+Merging efi-fixes/urgent (36e4fc57fc16 efi: Bump stub image version for macOS HVF compatibility)
+$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent
+Already up to date.
+Merging zstd-fixes/zstd-linus (6906598f1ce9 zstd: Fix definition of assert())
+$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus
+Already up to date.
+Merging battery-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes
+Already up to date.
+Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes
+Already up to date.
+Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1)
+$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes
+Already up to date.
+Merging iommufd-fixes/for-rc (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc
+Already up to date.
+Merging rust-fixes/rust-fixes (ac9a78681b92 Linux 6.4-rc1)
+$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes
+Already up to date.
+Merging v9fs-fixes/fixes/next (95f41d878100 fs/9p: Fix a datatype used with V9FS_DIRECT_IO)
+$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next
+Merge made by the 'ort' strategy.
+ fs/9p/v9fs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging w1-fixes/fixes (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes
+Already up to date.
+Merging drm-misc-fixes/for-linux-next-fixes (2329cc7a101a drm/client: Fix memory leak in drm_client_modeset_probe)
+$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes
+Merge made by the 'ort' strategy.
+ drivers/accel/ivpu/ivpu_drv.h | 1 +
+ drivers/accel/ivpu/ivpu_hw_mtl.c | 20 ++++++++----
+ drivers/dma-buf/dma-fence-unwrap.c | 26 ++++++++++++---
+ drivers/dma-buf/dma-fence.c | 7 ++--
+ drivers/gpu/drm/armada/armada_fbdev.c | 4 ---
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 9 +++---
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 35 ++++++++++++--------
+ drivers/gpu/drm/drm_client.c | 21 ++++++++++++
+ drivers/gpu/drm/drm_client_modeset.c | 6 ++++
+ drivers/gpu/drm/drm_fbdev_dma.c | 6 +---
+ drivers/gpu/drm/drm_fbdev_generic.c | 4 ---
+ drivers/gpu/drm/drm_syncobj.c | 6 ++--
+ drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 ---
+ drivers/gpu/drm/gma500/fbdev.c | 4 ---
+ drivers/gpu/drm/msm/msm_fbdev.c | 4 ---
+ drivers/gpu/drm/nouveau/dispnv50/disp.c | 8 +++--
+ drivers/gpu/drm/nouveau/nouveau_chan.c | 1 +
+ drivers/gpu/drm/nouveau/nouveau_chan.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 20 ++++++++++--
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/acr/base.c | 2 +-
+ drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 ---
+ drivers/gpu/drm/panel/panel-simple.c | 2 ++
+ drivers/gpu/drm/radeon/radeon_fbdev.c | 4 ---
+ drivers/gpu/drm/scheduler/sched_entity.c | 41 +++++++++++++++++++-----
+ drivers/gpu/drm/scheduler/sched_fence.c | 40 ++++++++++++++---------
+ drivers/gpu/drm/scheduler/sched_main.c | 3 +-
+ drivers/gpu/drm/tegra/fbdev.c | 4 ---
+ drivers/gpu/drm/ttm/ttm_bo.c | 29 ++++++++++-------
+ drivers/gpu/drm/ttm/ttm_resource.c | 5 ++-
+ include/drm/gpu_scheduler.h | 5 ++-
+ include/linux/dma-fence.h | 2 +-
+ 33 files changed, 212 insertions(+), 119 deletions(-)
+Merging mm-stable/mm-stable (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'mm-stable' of git://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 (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable
+Already up to date.
+Merging mm/mm-everything (8a5829411a1e Merge branch 'mm-nonmm-unstable' into mm-everything)
+$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything
+Auto-merging arch/arm64/Kconfig
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-memory-page-offline | 4 +-
+ Documentation/admin-guide/cgroup-v1/memory.rst | 2 -
+ Documentation/admin-guide/kernel-parameters.txt | 2 +-
+ Documentation/admin-guide/mm/ksm.rst | 25 +-
+ Documentation/admin-guide/mm/memory-hotplug.rst | 2 +-
+ Documentation/admin-guide/mm/userfaultfd.rst | 15 +
+ Documentation/filesystems/tmpfs.rst | 31 ++
+ Makefile | 22 +-
+ arch/Kconfig | 13 -
+ arch/arm/Kconfig | 29 +-
+ arch/arm/mm/fault-armv.c | 3 +-
+ arch/arm64/Kconfig | 62 +--
+ arch/arm64/include/asm/mte.h | 4 +-
+ arch/arm64/include/asm/pgtable.h | 26 +-
+ arch/arm64/kernel/mte.c | 37 +-
+ arch/arm64/mm/fault.c | 3 +-
+ arch/arm64/mm/init.c | 2 -
+ arch/ia64/Kconfig | 30 +-
+ arch/ia64/include/asm/cmpxchg.h | 17 +
+ arch/ia64/include/uapi/asm/cmpxchg.h | 17 -
+ arch/loongarch/Kconfig | 26 +-
+ arch/m68k/Kconfig | 19 +-
+ arch/mips/Kconfig | 30 +-
+ arch/parisc/Kconfig | 34 +-
+ arch/powerpc/Kconfig | 55 +--
+ arch/powerpc/include/asm/pgalloc.h | 4 +
+ arch/powerpc/mm/fault.c | 3 +-
+ arch/powerpc/mm/pgtable-frag.c | 29 +-
+ arch/powerpc/mm/pgtable.c | 16 +-
+ arch/powerpc/xmon/xmon.c | 2 +-
+ arch/riscv/Kbuild | 2 +-
+ arch/riscv/Kconfig | 46 +-
+ arch/riscv/include/asm/pgtable.h | 12 +-
+ arch/riscv/kernel/elf_kexec.c | 4 +-
+ arch/s390/Kbuild | 2 +-
+ arch/s390/Kconfig | 69 +--
+ arch/s390/include/asm/pgalloc.h | 4 +
+ arch/s390/mm/fault.c | 3 +-
+ arch/s390/mm/pgalloc.c | 80 +++-
+ arch/sh/Kconfig | 42 +-
+ arch/sparc/include/asm/pgalloc_64.h | 4 +
+ arch/sparc/kernel/setup_32.c | 2 +-
+ arch/sparc/mm/init_64.c | 16 +
+ arch/x86/Kconfig | 90 +---
+ arch/x86/include/asm/pgtable.h | 16 +-
+ arch/x86/mm/fault.c | 3 +-
+ drivers/char/xillybus/Kconfig | 2 +-
+ drivers/clk/Kconfig | 1 +
+ drivers/dax/kmem.c | 4 +-
+ drivers/dma-buf/heaps/system_heap.c | 5 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 5 +-
+ drivers/irqchip/Kconfig | 1 +
+ drivers/misc/Kconfig | 1 +
+ drivers/net/ethernet/altera/Kconfig | 1 +
+ drivers/pcmcia/Kconfig | 1 +
+ drivers/tty/sysrq.c | 2 +-
+ drivers/tty/vt/keyboard.c | 2 +-
+ fs/9p/cache.c | 2 +
+ fs/Kconfig | 17 +-
+ fs/affs/file.c | 77 ++--
+ fs/affs/symlink.c | 12 +-
+ fs/afs/internal.h | 2 +
+ fs/buffer.c | 36 +-
+ fs/cachefiles/namei.c | 2 +
+ fs/ceph/cache.c | 2 +
+ fs/drop_caches.c | 2 +
+ fs/ext4/inode.c | 4 +-
+ fs/ext4/move_extent.c | 19 +-
+ fs/hugetlbfs/inode.c | 57 ++-
+ fs/jbd2/journal.c | 35 +-
+ fs/nfs/fscache.c | 3 +
+ fs/ntfs3/inode.c | 10 +-
+ fs/ocfs2/file.c | 7 +-
+ fs/proc/base.c | 1 +
+ fs/proc/task_mmu.c | 24 +-
+ fs/proc/task_nommu.c | 15 +-
+ fs/quota/dquot.c | 2 +-
+ fs/smb/client/fscache.c | 2 +
+ fs/splice.c | 3 +-
+ fs/udf/file.c | 6 +-
+ fs/userfaultfd.c | 109 +++--
+ include/linux/buffer_head.h | 4 +-
+ include/linux/dma-map-ops.h | 6 -
+ include/linux/fs.h | 2 +-
+ include/linux/highmem.h | 44 ++
+ include/linux/hugetlb.h | 25 +-
+ include/linux/ksm.h | 20 +
+ include/linux/maple_tree.h | 7 +-
+ include/linux/memblock.h | 4 +-
+ include/linux/memcontrol.h | 2 -
+ include/linux/memory-tiers.h | 4 +-
+ include/linux/mm.h | 79 ++--
+ include/linux/mm_inline.h | 21 +
+ include/linux/mm_types.h | 16 +-
+ include/linux/mmap_lock.h | 10 -
+ include/linux/mmzone.h | 1 -
+ include/linux/page_idle.h | 5 -
+ include/linux/page_table_check.h | 66 +--
+ include/linux/pagemap.h | 27 +-
+ include/linux/pgtable.h | 16 +-
+ include/linux/seqlock.h | 2 +-
+ include/linux/shmem_fs.h | 28 ++
+ include/linux/swapops.h | 15 +-
+ include/linux/userfaultfd_k.h | 4 +
+ include/uapi/linux/quota.h | 1 +
+ include/uapi/linux/userfaultfd.h | 25 +-
+ init/Kconfig | 2 +
+ init/initramfs.c | 2 +-
+ ipc/sem.c | 6 +-
+ kernel/Kconfig.kexec | 116 +++++
+ kernel/acct.c | 2 +-
+ kernel/cred.c | 27 +-
+ kernel/dma/Kconfig | 6 +-
+ kernel/dma/contiguous.c | 8 +-
+ kernel/events/core.c | 22 +-
+ kernel/futex/core.c | 3 +-
+ kernel/kexec_file.c | 6 +-
+ kernel/panic.c | 2 +-
+ kernel/relay.c | 2 +-
+ kernel/signal.c | 13 +-
+ lib/maple_tree.c | 348 ++++++---------
+ lib/notifier-error-inject.c | 3 -
+ lib/test_hmm.c | 10 +-
+ lib/test_maple_tree.c | 65 +++
+ mm/Kconfig | 3 +
+ mm/Makefile | 2 +-
+ mm/cma.c | 4 +-
+ mm/compaction.c | 34 +-
+ mm/filemap.c | 54 +--
+ mm/gup.c | 83 ++--
+ mm/huge_memory.c | 5 +-
+ mm/hugetlb.c | 316 +++-----------
+ mm/hugetlb_vmemmap.c | 34 +-
+ mm/internal.h | 17 +
+ mm/khugepaged.c | 486 ++++++++-------------
+ mm/ksm.c | 28 +-
+ mm/madvise.c | 10 +-
+ mm/memcontrol.c | 13 +-
+ mm/memfd.c | 57 ++-
+ mm/memory-failure.c | 135 ++++--
+ mm/memory-tiers.c | 6 +-
+ mm/memory.c | 144 +++---
+ mm/memory_hotplug.c | 5 +
+ mm/migrate.c | 5 +-
+ mm/migrate_device.c | 21 +-
+ mm/mm_init.c | 15 +-
+ mm/mmap.c | 11 +-
+ mm/mprotect.c | 4 +-
+ mm/nommu.c | 8 +-
+ mm/page_alloc.c | 76 +++-
+ mm/page_table_check.c | 50 +--
+ mm/page_vma_mapped.c | 12 +-
+ mm/pgtable-generic.c | 97 +++-
+ mm/rmap.c | 8 +-
+ mm/shmem.c | 476 +++++++++++++++-----
+ mm/shmem_quota.c | 350 +++++++++++++++
+ mm/show_mem.c | 4 +-
+ mm/sparse.c | 3 +-
+ mm/swap.h | 1 -
+ mm/swap_state.c | 12 +-
+ mm/swapfile.c | 18 +-
+ mm/truncate.c | 8 +-
+ mm/userfaultfd.c | 87 +++-
+ mm/util.c | 6 -
+ mm/vmscan.c | 8 +-
+ mm/zsmalloc.c | 79 ++--
+ mm/zswap.c | 81 ++--
+ scripts/headers_install.sh | 1 -
+ security/selinux/hooks.c | 8 +-
+ tools/testing/radix-tree/maple.c | 75 ++++
+ tools/testing/selftests/cgroup/.gitignore | 1 +
+ tools/testing/selftests/cgroup/Makefile | 2 +
+ tools/testing/selftests/cgroup/test_zswap.c | 286 ++++++++++++
+ tools/testing/selftests/memfd/memfd_test.c | 5 +
+ tools/testing/selftests/mm/.gitignore | 1 +
+ tools/testing/selftests/mm/Makefile | 1 +
+ tools/testing/selftests/mm/hugetlb-read-hwpoison.c | 322 ++++++++++++++
+ tools/testing/selftests/mm/ksm_functional_tests.c | 98 ++++-
+ tools/testing/selftests/mm/run_vmtests.sh | 48 +-
+ tools/testing/selftests/mm/uffd-common.c | 5 +-
+ tools/testing/selftests/mm/uffd-common.h | 3 +
+ tools/testing/selftests/mm/uffd-stress.c | 8 +-
+ tools/testing/selftests/mm/uffd-unit-tests.c | 117 +++++
+ tools/testing/selftests/proc/proc-empty-vm.c | 23 +
+ 184 files changed, 4048 insertions(+), 2342 deletions(-)
+ create mode 100644 kernel/Kconfig.kexec
+ create mode 100644 mm/shmem_quota.c
+ create mode 100644 tools/testing/selftests/cgroup/test_zswap.c
+ create mode 100644 tools/testing/selftests/mm/hugetlb-read-hwpoison.c
+Merging kbuild/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
+Already up to date.
+Merging clang-format/clang-format (06c2afb862f9 Linux 6.5-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 (bcd981db12e6 perf test: Fix event parsing test when PERF_PMU_CAP_EXTENDED_HW_TYPE isn't supported.)
+$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next
+Already up to date.
+Merging compiler-attributes/compiler-attributes (eeac8ede1755 Linux 6.3-rc2)
+$ 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/for-next (8ac04063354a swiotlb: reduce the number of areas to match actual memory pool size)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next
+Already up to date.
+Merging asm-generic/master (4dd595c34c4b syscalls: Remove file path comments from headers)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master
+Already up to date.
+Merging arc/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next
+Already up to date.
+Merging arm/for-next (1faf70485ea9 Merge branches 'misc' and 'fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next
+Merge made by the 'ort' strategy.
+Merging arm64/for-next/core (893b24181b4c arm64: sme: Use STR P to clear FFR context field in streaming SVE mode)
+$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core
+Already up to date.
+Merging arm-perf/for-next/perf (dea0f4146f66 docs: perf: Fix warning from 'make htmldocs' in hisi-pmu.rst)
+$ git merge -m Merge branch 'for-next/perf' of git://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 (6722e46513e0 bus: ixp4xx: fix IXP4XX_EXP_T1_MASK)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next
+Already up to date.
+Merging amlogic/for-next (76483eaf2109 Merge branch 'v6.6/arm64-dt' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/arm/amlogic.yaml | 7 +
+ arch/arm64/boot/dts/amlogic/Makefile | 1 +
+ .../dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts | 54 +++++++
+ arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 155 +++++++++++++++++++++
+ .../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 2 +-
+ .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +-
+ 6 files changed, 219 insertions(+), 2 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi
+Merging asahi-soc/asahi-soc/for-next (eaf935fa48ec soc: apple: mailbox: Rename config symbol to APPLE_MAILBOX)
+$ 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.
+ MAINTAINERS | 2 -
+ drivers/mailbox/Kconfig | 12 -
+ drivers/mailbox/Makefile | 2 -
+ drivers/mailbox/apple-mailbox.c | 441 -------------------------------------
+ drivers/soc/apple/Kconfig | 15 +-
+ drivers/soc/apple/Makefile | 3 +
+ drivers/soc/apple/mailbox.c | 436 ++++++++++++++++++++++++++++++++++++
+ drivers/soc/apple/mailbox.h | 48 ++++
+ drivers/soc/apple/rtkit-internal.h | 8 +-
+ drivers/soc/apple/rtkit.c | 133 +++--------
+ include/linux/apple-mailbox.h | 19 --
+ include/linux/soc/apple/rtkit.h | 18 --
+ 12 files changed, 531 insertions(+), 606 deletions(-)
+ delete mode 100644 drivers/mailbox/apple-mailbox.c
+ create mode 100644 drivers/soc/apple/mailbox.c
+ create mode 100644 drivers/soc/apple/mailbox.h
+ delete mode 100644 include/linux/apple-mailbox.h
+Merging aspeed/for-next (a43f3e970a1d ARM: dts: aspeed: Add AST2600 VUARTs)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/aspeed/aspeed.yaml | 1 +
+ arch/arm/boot/dts/aspeed/Makefile | 1 +
+ .../dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts | 129 ++++---
+ .../arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 20 ++
+ .../dts/aspeed/aspeed-bmc-inventec-starscream.dts | 389 +++++++++++++++++++++
+ arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 20 ++
+ drivers/soc/aspeed/aspeed-socinfo.c | 1 +
+ drivers/soc/aspeed/aspeed-uart-routing.c | 2 +-
+ 8 files changed, 521 insertions(+), 42 deletions(-)
+ create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-inventec-starscream.dts
+Merging at91/at91-next (47508c7ba8db Merge branches 'microchip-dt64' and 'at91-dt' into at91-next)
+$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/microchip/lan966x-pcb8290.dts | 2 +-
+ arch/arm64/boot/dts/microchip/sparx5.dtsi | 12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+Merging broadcom/next (0d8d8753ede0 Merge branch 'devicetree/next' into next)
+$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/bcm/brcm,bcm53573.yaml | 39 ++++++++++++++++++++++
+ arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 18 ++++++++++
+ arch/arm/boot/dts/broadcom/bcm2711.dtsi | 4 +--
+ arch/arm/boot/dts/broadcom/bcm2835-common.dtsi | 2 +-
+ arch/arm/boot/dts/broadcom/bcm2835-rpi-a-plus.dts | 1 +
+ arch/arm/boot/dts/broadcom/bcm2835-rpi-a.dts | 1 +
+ arch/arm/boot/dts/broadcom/bcm2835-rpi-b-plus.dts | 1 +
+ arch/arm/boot/dts/broadcom/bcm2835-rpi-b-rev2.dts | 1 +
+ arch/arm/boot/dts/broadcom/bcm2835-rpi-b.dts | 1 +
+ arch/arm/boot/dts/broadcom/bcm2835-rpi-cm1-io1.dts | 1 +
+ arch/arm/boot/dts/broadcom/bcm2835-rpi-zero-w.dts | 2 ++
+ arch/arm/boot/dts/broadcom/bcm2835-rpi-zero.dts | 1 +
+ arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi | 2 --
+ arch/arm/boot/dts/broadcom/bcm2836-rpi-2-b.dts | 1 +
+ arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts | 1 +
+ .../arm/boot/dts/broadcom/bcm2837-rpi-zero-2-w.dts | 2 ++
+ arch/arm/boot/dts/broadcom/bcm283x.dtsi | 2 +-
+ .../dts/broadcom/bcm4708-linksys-ea6500-v2.dts | 3 +-
+ .../dts/broadcom/bcm47094-linksys-panamera.dts | 2 +-
+ .../boot/dts/broadcom/bcm47094-luxul-xap-1610.dts | 37 ++++++++++++++++++++
+ .../dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts | 36 ++++++++++++++++++++
+ arch/arm/boot/dts/broadcom/bcm47094-phicomm-k3.dts | 2 +-
+ .../boot/dts/broadcom/bcm47189-luxul-xap-1440.dts | 1 -
+ .../boot/dts/broadcom/bcm47189-luxul-xap-810.dts | 2 --
+ arch/arm/boot/dts/broadcom/bcm53573.dtsi | 5 +--
+ arch/arm/boot/dts/broadcom/bcm947189acdbmr.dts | 6 ++--
+ arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 2 +-
+ .../arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts | 2 +-
+ .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 +-
+ 29 files changed, 160 insertions(+), 20 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm53573.yaml
+Merging davinci/davinci/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next
+Already up to date.
+Merging drivers-memory/for-next (d1478aea649e memory: tegra: Add dummy implementation on Tegra194)
+$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next
+Merge made by the 'ort' strategy.
+ drivers/memory/tegra/mc.c | 37 +++++++++++++++++++++++++++++++++++++
+ drivers/memory/tegra/tegra194.c | 1 +
+ drivers/memory/tegra/tegra234.c | 23 +----------------------
+ include/soc/tegra/mc.h | 3 +++
+ 4 files changed, 42 insertions(+), 22 deletions(-)
+Merging imx-mxs/for-next (89c016c82e46 Merge branch 'imx/defconfig' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next
+Merge made by the 'ort' strategy.
+Merging mediatek/for-next (f6925844c82a Merge branch 'v6.4-next/soc' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next
+Auto-merging arch/arm64/boot/dts/mediatek/mt8192.dtsi
+Auto-merging arch/arm64/boot/dts/mediatek/mt8195.dtsi
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/mediatek/mt8192.dtsi | 2 ++
+ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 2 ++
+ 2 files changed, 4 insertions(+)
+Merging mvebu/for-next (54fbc0260c64 Merge branch 'mvebu/drivers' into mvebu/for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next
+Merge made by the 'ort' strategy.
+ .../boot/dts/marvell/armada-382-rd-ac3x-48g4x2xl.dts | 6 +++---
+ arch/arm/boot/dts/marvell/kirkwood-l-50.dts | 4 ++--
+ arch/arm/boot/dts/marvell/pxa168.dtsi | 2 +-
+ arch/arm/boot/dts/marvell/pxa910.dtsi | 2 +-
+ arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 20 ++++++++++++++++++--
+ arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts | 2 +-
+ drivers/firmware/turris-mox-rwtm.c | 12 ++++++------
+ 7 files changed, 32 insertions(+), 16 deletions(-)
+Merging omap/for-next (f581c395fcb8 Merge branches 'omap-for-v6.5/ti-sysc' and 'omap-for-v6.5/cleanup' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next
+Merge made by the 'ort' strategy.
+ arch/arm/mach-omap2/omap_hwmod.c | 45 ++++++---------------------------------
+ arch/arm/mach-omap2/powerdomain.c | 2 +-
+ drivers/bus/ti-sysc.c | 2 ++
+ 3 files changed, 9 insertions(+), 40 deletions(-)
+Merging qcom/for-next (6faff7e89223 Merge branches 'arm64-defconfig-for-6.6', 'arm64-fixes-for-6.5', 'arm64-for-6.6', 'clk-for-6.6', 'drivers-for-6.6' and 'dts-for-6.6' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/clock/qcom,gcc-apq8064.yaml | 2 +-
+ .../bindings/clock/qcom,gcc-ipq4019.yaml | 2 +-
+ .../bindings/clock/qcom,gcc-ipq8074.yaml | 2 +-
+ .../bindings/clock/qcom,gcc-msm8976.yaml | 2 +-
+ .../bindings/clock/qcom,gcc-msm8996.yaml | 2 +-
+ .../bindings/clock/qcom,gcc-msm8998.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,gcc-other.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,gcc-qcs404.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,gcc-sc7280.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,gcc.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,gpucc.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,mmcc.yaml | 2 +-
+ .../bindings/clock/qcom,msm8998-gpucc.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 +-
+ .../bindings/clock/qcom,sc7180-camcc.yaml | 2 +-
+ .../bindings/clock/qcom,sc7180-dispcc.yaml | 2 +-
+ .../bindings/clock/qcom,sc7180-lpasscorecc.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 2 +-
+ .../bindings/clock/qcom,sc7280-camcc.yaml | 2 +-
+ .../bindings/clock/qcom,sc7280-dispcc.yaml | 2 +-
+ .../bindings/clock/qcom,sc7280-lpasscc.yaml | 2 +-
+ .../bindings/clock/qcom,sc7280-lpasscorecc.yaml | 2 +-
+ .../bindings/clock/qcom,sdm845-dispcc.yaml | 2 +-
+ .../devicetree/bindings/clock/qcom,videocc.yaml | 2 +-
+ .../devicetree/bindings/firmware/qcom,scm.yaml | 1 +
+ .../devicetree/bindings/sram/qcom,ocmem.yaml | 26 +-
+ arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi | 7 +-
+ arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 34 +-
+ arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts | 1 -
+ arch/arm/boot/dts/qcom/qcom-ipq8064-v1.0.dtsi | 1 -
+ arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 144 ++++++++
+ arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 1 -
+ .../dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 2 +-
+ arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 15 +-
+ arch/arm64/boot/dts/qcom/apq8039-t2.dts | 2 -
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 23 +-
+ arch/arm64/boot/dts/qcom/ipq5332-rdp-common.dtsi | 36 ++
+ arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts | 26 +-
+ arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts | 26 +-
+ arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts | 24 +-
+ arch/arm64/boot/dts/qcom/ipq5332-rdp474.dts | 47 +--
+ arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 +-
+ arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts | 48 +++
+ arch/arm64/boot/dts/qcom/ipq9574.dtsi | 85 +++++
+ .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 2 +-
+ arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 1 +
+ .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 1 -
+ .../boot/dts/qcom/msm8916-samsung-serranove.dts | 70 +++-
+ .../dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts | 1 +
+ arch/arm64/boot/dts/qcom/msm8939.dtsi | 18 +-
+ arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts | 2 +-
+ arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts | 2 +-
+ arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 1 +
+ .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 8 +-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 15 +-
+ .../boot/dts/qcom/msm8996pro-xiaomi-natrium.dts | 2 +-
+ arch/arm64/boot/dts/qcom/msm8998-mtp.dts | 1 +
+ arch/arm64/boot/dts/qcom/msm8998.dtsi | 20 +-
+ arch/arm64/boot/dts/qcom/pm8350.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/pm8350b.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/pm8953.dtsi | 33 +-
+ arch/arm64/boot/dts/qcom/pmk8350.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/pmr735b.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/qcm2290.dtsi | 32 +-
+ arch/arm64/boot/dts/qcom/qcs404.dtsi | 8 +-
+ arch/arm64/boot/dts/qcom/qdu1000-idp.dts | 4 +
+ arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 8 +
+ arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 2 +-
+ arch/arm64/boot/dts/qcom/qru1000-idp.dts | 4 +
+ arch/arm64/boot/dts/qcom/sa8540p.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sa8775p-ride.dts | 109 ++++++
+ arch/arm64/boot/dts/qcom/sa8775p.dtsi | 42 +++
+ arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 6 +-
+ arch/arm64/boot/dts/qcom/sc7180-lite.dtsi | 10 +-
+ arch/arm64/boot/dts/qcom/sc7180.dtsi | 165 ++++++---
+ .../qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +-
+ .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 13 +-
+ arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi | 24 +-
+ arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 8 +-
+ arch/arm64/boot/dts/qcom/sc8180x.dtsi | 12 +-
+ arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 16 +-
+ .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 2 -
+ arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 1 +
+ arch/arm64/boot/dts/qcom/sdm630.dtsi | 10 +-
+ arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 1 +
+ .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 2 +-
+ .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 9 +
+ .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sdx75.dtsi | 4 +-
+ arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sm6115.dtsi | 105 +++++-
+ arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 65 +++-
+ .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 2 +-
+ .../boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts | 2 +-
+ arch/arm64/boot/dts/qcom/sm6350.dtsi | 396 ++++++++++++++++++++-
+ arch/arm64/boot/dts/qcom/sm6375.dtsi | 127 +++++++
+ arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 1 +
+ arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 1 +
+ .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sm8150.dtsi | 22 +-
+ arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 1 +
+ arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 1 +
+ .../dts/qcom/sm8250-sony-xperia-edo-pdx203.dts | 364 +++++++++++++++++++
+ .../dts/qcom/sm8250-sony-xperia-edo-pdx206.dts | 243 +++++++++++++
+ .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 63 +++-
+ .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 2 +-
+ arch/arm64/boot/dts/qcom/sm8250.dtsi | 229 ++++++------
+ arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 15 +-
+ arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 1 +
+ arch/arm64/boot/dts/qcom/sm8350.dtsi | 243 +++++++------
+ arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 303 +++++++++++++++-
+ arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 1 +
+ arch/arm64/boot/dts/qcom/sm8450.dtsi | 218 ++++++------
+ arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 1 +
+ arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 1 +
+ arch/arm64/boot/dts/qcom/sm8550.dtsi | 196 +++++-----
+ arch/arm64/configs/defconfig | 2 +
+ drivers/clk/qcom/gcc-ipq9574.c | 37 ++
+ drivers/clk/qcom/gcc-sc8280xp.c | 131 ++++++-
+ drivers/clk/qcom/gcc-sm7150.c | 1 +
+ drivers/clk/qcom/gpucc-sm6350.c | 18 +-
+ drivers/clk/qcom/mmcc-msm8974.c | 11 +
+ drivers/soc/qcom/cmd-db.c | 2 +-
+ drivers/soc/qcom/icc-bwmon.c | 28 +-
+ drivers/soc/qcom/ocmem.c | 67 ++--
+ drivers/soc/qcom/rpmh-rsc.c | 2 +-
+ drivers/soc/qcom/rpmpd.c | 34 +-
+ drivers/soc/qcom/spm.c | 4 +-
+ drivers/soc/qcom/trace-rpmh.h | 16 +-
+ include/dt-bindings/clock/qcom,gcc-sc8280xp.h | 10 +
+ include/dt-bindings/clock/qcom,ipq9574-gcc.h | 2 +
+ 138 files changed, 3341 insertions(+), 933 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/qcom/ipq5332-rdp-common.dtsi
+Merging renesas/next (3b5ba33b4d1d Merge branch 'renesas-dts-for-v6.6' into renesas-next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'ort' strategy.
+ .../arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts | 2 +-
+ arch/arm64/boot/dts/renesas/gmsl-cameras.dtsi | 4 ++--
+ arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 2 +-
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 4 ++--
+ arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts | 12 ++++++++++
+ arch/arm64/boot/dts/renesas/r9a07g044l2-smarc.dts | 21 ++++++++++++++++
+ arch/arm64/boot/dts/renesas/r9a07g054l2-smarc.dts | 20 ++++++++++++++++
+ arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 28 ++++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi | 4 ++--
+ .../boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi | 20 ++++++++++++++++
+ arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 22 +++++++++++++++--
+ arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 23 +++++++++++++++---
+ .../boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi | 9 +++++++
+ arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 2 +-
+ arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 14 ++++++++++-
+ arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 4 ++--
+ arch/arm64/configs/defconfig | 4 ++++
+ 17 files changed, 178 insertions(+), 17 deletions(-)
+Merging reset/reset/next (afb39e2bd36a reset: mpfs: select AUXILIARY_BUS)
+$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next
+Already up to date.
+Merging rockchip/for-next (28832358cbda Merge branch 'v6.6-armsoc/dts64' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/rockchip.yaml | 10 +
+ Documentation/devicetree/bindings/eeprom/at24.yaml | 3 +
+ .../devicetree/bindings/vendor-prefixes.yaml | 2 +
+ arch/arm64/boot/dts/rockchip/Makefile | 2 +
+ arch/arm64/boot/dts/rockchip/px30.dtsi | 16 +-
+ arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 -
+ .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 3 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts | 65 +++
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 5 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 1 +
+ .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 2 +-
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 1 +
+ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 1 +
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 27 +
+ .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 3 -
+ arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts | 3 -
+ arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 2 -
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 2 -
+ arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 2 -
+ .../boot/dts/rockchip/rk3566-radxa-cm3-io.dts | 4 +-
+ arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 2 -
+ arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi | 3 -
+ arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 3 -
+ arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 3 -
+ .../boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 4 -
+ arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts | 3 -
+ .../arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi | 3 -
+ arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts | 3 -
+ .../arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 3 -
+ arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts | 643 +++++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 3 -
+ .../boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi | 1 -
+ .../boot/dts/rockchip/rk3588-edgeble-neu6b.dtsi | 1 -
+ arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 9 +-
+ arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 22 +-
+ arch/arm64/boot/dts/rockchip/rk3588.dtsi | 44 ++
+ .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 10 +-
+ .../boot/dts/rockchip/rk3588s-khadas-edge2.dts | 1 -
+ arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 585 ++++++++++++++++++-
+ arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 90 +++
+ drivers/clk/rockchip/clk-rk3568.c | 3 +-
+ drivers/soc/rockchip/grf.c | 14 +
+ 46 files changed, 1528 insertions(+), 88 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
+Merging samsung-krzk/for-next (f822ca919181 Merge branch 'next/dt64' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next
+Merge made by the 'ort' strategy.
+ arch/arm/boot/dts/samsung/exynos4210-trats.dts | 8 ++++----
+ arch/arm/boot/dts/samsung/exynos4210-universal_c210.dts | 4 ++--
+ arch/arm/boot/dts/samsung/exynos4412-midas.dtsi | 2 +-
+ arch/arm/boot/dts/samsung/s5pv210-pinctrl.dtsi | 12 ++++++------
+ arch/arm64/boot/dts/exynos/exynos7.dtsi | 8 ++++----
+ arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 2 +-
+ arch/arm64/boot/dts/tesla/fsd.dtsi | 4 ++--
+ 7 files changed, 20 insertions(+), 20 deletions(-)
+Merging scmi/for-linux-next (16f6bdd81f19 Merge branches 'for-next/juno/fixes', 'for-next/juno/updates' and 'for-next/vexpress/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next)
+$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/arm/corstone1000.dtsi | 20 ++++++++------------
+ arch/arm64/boot/dts/arm/foundation-v8-gicv3.dtsi | 10 +++++-----
+ arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi | 1 -
+ drivers/bus/vexpress-config.c | 4 +---
+ 4 files changed, 14 insertions(+), 21 deletions(-)
+ delete mode 120000 arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
+Merging stm32/stm32-next (2f38de940f07 ARM: dts: stm32: Add missing detach mailbox for DHCOR SoM)
+$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/arm/stm32/stm32.yaml | 4 +-
+ .../devicetree/bindings/net/can/bosch,m_can.yaml | 2 +-
+ .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 3 +
+ arch/arm/boot/dts/st/Makefile | 2 +
+ arch/arm/boot/dts/st/stm32f7-pinctrl.dtsi | 10 +
+ arch/arm/boot/dts/st/stm32f746-disco.dts | 19 +-
+ arch/arm/boot/dts/st/stm32f746.dtsi | 47 ++
+ arch/arm/boot/dts/st/stm32mp131.dtsi | 16 +-
+ arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi | 129 +++++
+ arch/arm/boot/dts/st/stm32mp15-scmi.dtsi | 16 -
+ arch/arm/boot/dts/st/stm32mp151a-prtt1c.dts | 32 ++
+ arch/arm/boot/dts/st/stm32mp157.dtsi | 18 +
+ .../st/stm32mp157a-icore-stm32mp1-ctouch2-of10.dts | 24 +-
+ .../dts/st/stm32mp157a-icore-stm32mp1-edimm2.2.dts | 28 +-
+ arch/arm/boot/dts/st/stm32mp157c-dk2.dts | 28 +-
+ .../arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi | 4 +-
+ arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 28 +-
+ arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen1.dts | 93 ++++
+ arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen2.dts | 172 ++++++
+ arch/arm/boot/dts/st/stm32mp157c-odyssey-som.dtsi | 4 +-
+ arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 610 +++++++++++++++++++++
+ arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi | 4 +-
+ arch/arm/boot/dts/st/stm32mp15xx-dhcor-som.dtsi | 4 +-
+ 23 files changed, 1178 insertions(+), 119 deletions(-)
+ create mode 100644 arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen1.dts
+ create mode 100644 arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen2.dts
+ create mode 100644 arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi
+Merging sunxi/sunxi/for-next (1bcb932283c9 Merge branch 'sunxi/dt-for-6.5' into sunxi/for-next)
+$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next
+Merge made by the 'ort' strategy.
+Merging tee/next (6a8b7e801054 tee: optee: Use kmemdup() to replace kmalloc + memcpy)
+$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next
+Already up to date.
+Merging tegra/for-next (492a5be06fb0 Merge branch for-6.6/arm64/dt into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/nvidia/tegra186.dtsi | 3 ++-
+ arch/arm64/boot/dts/nvidia/tegra194.dtsi | 3 ++-
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi | 3 ++-
+ arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 1 +
+ arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts | 1 +
+ arch/arm64/boot/dts/nvidia/tegra234.dtsi | 3 ++-
+ 6 files changed, 10 insertions(+), 4 deletions(-)
+Merging ti/ti-next (8a07516806c6 Merge branch 'ti-drivers-soc-next' into ti-next)
+$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 2 +-
+ arch/arm64/boot/dts/ti/k3-am625-sk.dts | 2 +-
+ arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 8 ++--
+ arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 2 +-
+ arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 28 ++++++-------
+ arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 14 +++----
+ arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 14 +++----
+ arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 14 +++----
+ arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 26 ++++++------
+ arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 14 +++----
+ .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 2 +-
+ arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 2 +-
+ arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 2 +-
+ arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 4 +-
+ arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 2 +-
+ drivers/firmware/ti_sci.c | 49 ++++------------------
+ drivers/soc/ti/k3-ringacc.c | 7 ++--
+ 19 files changed, 85 insertions(+), 115 deletions(-)
+Merging xilinx/for-next (6008eee2c754 Merge branch 'zynqmp/soc' into for-next)
+$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next
+Merge made by the 'ort' strategy.
+ arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 ++++
+ arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 5 +++--
+ arch/arm64/boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 5 +++--
+ arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 15 +++++++++++++--
+ .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 4 ++--
+ .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 4 ++--
+ .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 8 ++++----
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 4 ++--
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 8 ++++----
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 4 ++--
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 4 ++--
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 8 ++++----
+ arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 8 ++++----
+ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 20 ++++++++++++++++----
+ drivers/soc/xilinx/xlnx_event_manager.c | 6 ++----
+ 15 files changed, 67 insertions(+), 40 deletions(-)
+Merging clk/clk-next (f679e89acdd3 clk: tegra: Avoid calling an uninitialized function)
+$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next
+Already up to date.
+Merging clk-imx/for-next (878b02d5f3b5 clk: imx: clk-imx8mp: improve error handling in imx8mp_clocks_probe())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next
+Already up to date.
+Merging clk-renesas/renesas-clk (bbceb13ce2c7 clk: renesas: rzg2l: Simplify .determine_rate())
+$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk
+Merge made by the 'ort' strategy.
+ drivers/clk/renesas/r8a774a1-cpg-mssr.c | 2 ++
+ drivers/clk/renesas/r8a774b1-cpg-mssr.c | 2 ++
+ drivers/clk/renesas/r8a774e1-cpg-mssr.c | 2 ++
+ drivers/clk/renesas/r9a09g011-cpg.c | 15 ++++++++++++++
+ drivers/clk/renesas/rcar-gen3-cpg.c | 35 +++++++++++++++++++++++++++++----
+ drivers/clk/renesas/rcar-gen3-cpg.h | 1 +
+ drivers/clk/renesas/rzg2l-cpg.c | 8 +-------
+ 7 files changed, 54 insertions(+), 11 deletions(-)
+Merging csky/linux-next (6ee1ffdc1838 csky: pgtable: Fixup update_mmu_cache for abiv2)
+$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next
+Merge made by the 'ort' strategy.
+ arch/csky/abiv2/cacheflush.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+Merging loongarch/loongarch-next (06351cc358ea LoongArch: Fix module relocation error with binutils 2.41)
+$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
+Merge made by the 'ort' strategy.
+ arch/loongarch/Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging m68k/for-next (4055eabe04a2 m68k: defconfig: Update defconfigs for v6.4-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next
+Already up to date.
+Merging m68knommu/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
+Already up to date.
+Merging microblaze/next (fe15c26ee26e Linux 6.3-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 (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next
+Already up to date.
+Merging openrisc/for-next (dceaafd66881 openrisc: Union fpcsr and oldmask in sigcontext to unbreak userspace ABI)
+$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next
+Already up to date.
+Merging parisc-hd/for-next (6995e2de6891 Linux 6.4)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next
+Already up to date.
+Merging powerpc/next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next
+Already up to date.
+Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next
+Already up to date.
+Merging risc-v/for-next (471aba2e4760 riscv: sigcontext: Correct the comment of sigreturn)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next
+Merge made by the 'ort' strategy.
+ arch/riscv/include/uapi/asm/sigcontext.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging riscv-dt/riscv-dt-for-next (ef6012f301f7 riscv: dts: Enable device-tree overlay support for starfive devices)
+$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next
+Merge made by the 'ort' strategy.
+ arch/riscv/boot/dts/starfive/Makefile | 6 ++++++
+ 1 file changed, 6 insertions(+)
+Merging riscv-soc/riscv-soc-for-next (1fcaaa1d489c riscv: Kconfig: Add select ARM_AMBA to SOC_STARFIVE)
+$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next
+Merge made by the 'ort' strategy.
+ arch/riscv/Kconfig.socs | 1 +
+ 1 file changed, 1 insertion(+)
+Merging s390/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
+Already up to date.
+Merging sh/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next
+Already up to date.
+Merging uml/next (6032aca0deb9 um: make stub data pages size tweakable)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next
+Already up to date.
+Merging xtensa/xtensa-for-next (a160e9414d8a xtensa: fix unaligned and load/store configuration interaction)
+$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
+Merge made by the 'ort' strategy.
+ arch/xtensa/kernel/align.S | 34 ++++++++++++++--------------------
+ arch/xtensa/kernel/traps.c | 3 ++-
+ arch/xtensa/platforms/iss/network.c | 3 ++-
+ 3 files changed, 18 insertions(+), 22 deletions(-)
+Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next
+Already up to date.
+Merging fscrypt/for-next (324718ddddc4 fscrypt: improve the "Encryption modes and usage" section)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/fscrypt.rst | 152 +++++++++++++++++++++++++---------
+ 1 file changed, 113 insertions(+), 39 deletions(-)
+Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums)
+$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next
+Merge made by the 'ort' strategy.
+ include/trace/events/afs.h | 475 ++++++++++++++-------------------------------
+ 1 file changed, 148 insertions(+), 327 deletions(-)
+Merging btrfs/for-next (cc87d1d73c34 Merge branch 'for-next-next-v6.5-20230713' into for-next-20230713)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
+Merge made by the 'ort' strategy.
+ fs/btrfs/Kconfig | 4 +-
+ fs/btrfs/backref.c | 2 +-
+ fs/btrfs/block-group.c | 92 +++++++++++++++++++++++++++--------------
+ fs/btrfs/block-group.h | 4 +-
+ fs/btrfs/ctree.c | 2 +-
+ fs/btrfs/defrag.c | 2 +-
+ fs/btrfs/delayed-inode.c | 2 +-
+ fs/btrfs/delayed-ref.c | 8 ++--
+ fs/btrfs/dev-replace.c | 6 +--
+ fs/btrfs/disk-io.c | 38 ++++++++---------
+ fs/btrfs/extent-io-tree.c | 16 ++++----
+ fs/btrfs/extent-io-tree.h | 6 +--
+ fs/btrfs/extent-tree.c | 26 +-----------
+ fs/btrfs/extent-tree.h | 3 --
+ fs/btrfs/extent_io.c | 43 +++++++++----------
+ fs/btrfs/extent_map.c | 2 +-
+ fs/btrfs/free-space-cache.c | 10 ++---
+ fs/btrfs/free-space-tree.c | 27 ++++++++----
+ fs/btrfs/inode.c | 59 ++++++++++++++++----------
+ fs/btrfs/misc.h | 10 +++++
+ fs/btrfs/ordered-data.c | 2 +-
+ fs/btrfs/raid56.c | 36 ++++++----------
+ fs/btrfs/raid56.h | 1 -
+ fs/btrfs/relocation.c | 10 +++--
+ fs/btrfs/scrub.c | 6 ---
+ fs/btrfs/super.c | 6 +++
+ fs/btrfs/sysfs.c | 7 ++++
+ fs/btrfs/transaction.c | 11 ++---
+ fs/btrfs/tree-log.c | 4 +-
+ fs/btrfs/volumes.c | 98 ++++++++++++++++++++++++++++++--------------
+ fs/btrfs/zoned.c | 9 +++-
+ include/trace/events/btrfs.h | 29 +------------
+ 32 files changed, 316 insertions(+), 265 deletions(-)
+Merging ceph/master (a282a2f10539 libceph: harden msgr2.1 frame segment length checks)
+$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
+Merge made by the 'ort' strategy.
+ net/ceph/messenger_v2.c | 47 +++++++++++++++++++++++++++++------------------
+ 1 file changed, 29 insertions(+), 18 deletions(-)
+Merging cifs/for-next (b04a27544103 smb: add missing create options for O_DIRECT and O_SYNC flags)
+$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next
+Merge made by the 'ort' strategy.
+ fs/smb/client/cifsfs.c | 2 ++
+ fs/smb/client/cifsglob.h | 1 +
+ fs/smb/client/cifssmb.c | 2 +-
+ fs/smb/client/connect.c | 3 +++
+ fs/smb/client/dfs.c | 26 ++++++++++----------------
+ fs/smb/client/dir.c | 6 ++++++
+ fs/smb/client/file.c | 4 ++--
+ fs/smb/client/fs_context.c | 4 ++++
+ fs/smb/client/fs_context.h | 2 ++
+ fs/smb/client/smb2transport.c | 2 +-
+ 10 files changed, 32 insertions(+), 20 deletions(-)
+Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items)
+$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next
+Already up to date.
+Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next
+Auto-merging fs/ecryptfs/crypto.c
+Merge made by the 'ort' strategy.
+ fs/ecryptfs/crypto.c | 10 +++++-----
+ fs/ecryptfs/keystore.c | 2 +-
+ fs/ecryptfs/read_write.c | 8 ++++----
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+Merging erofs/dev (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev
+Already up to date.
+Merging exfat/dev (d42334578eba exfat: check if filename entries exceeds max filename length)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
+Merge made by the 'ort' strategy.
+ fs/exfat/balloc.c | 6 +++---
+ fs/exfat/dir.c | 9 +++++++--
+ 2 files changed, 10 insertions(+), 5 deletions(-)
+Merging ext3/for_next (eccf9ae28312 Pull patch forbiding superblock / mount marks on internal kernel mounts.)
+$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
+Auto-merging fs/quota/dquot.c
+Merge made by the 'ort' strategy.
+ fs/ext2/ialloc.c | 3 -
+ fs/quota/dquot.c | 244 ++++++++++++++++++++++++++++---------------------------
+ 2 files changed, 125 insertions(+), 122 deletions(-)
+Merging ext4/dev (7c79210b15ef ext4: fix off by one issue in ext4_mb_choose_next_group_best_avail())
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev
+Merge made by the 'ort' strategy.
+ fs/ext4/mballoc.c | 14 ++-
+ fs/ext4/xattr.c | 14 +++
+ fs/jbd2/checkpoint.c | 289 +++++++++++++++-----------------------------
+ fs/jbd2/commit.c | 3 +-
+ fs/jbd2/transaction.c | 40 ++----
+ include/linux/jbd2.h | 7 +-
+ include/trace/events/jbd2.h | 12 +-
+ 7 files changed, 137 insertions(+), 242 deletions(-)
+Merging f2fs/dev (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
+Already up to date.
+Merging fsverity/for-next (456ae5fe9b44 fsverity: move sysctl registration out of signature.c)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next
+Merge made by the 'ort' strategy.
+ fs/verity/fsverity_private.h | 12 ++++-----
+ fs/verity/hash_algs.c | 8 ++++++
+ fs/verity/init.c | 56 +++++++++++++++++++++++++---------------
+ fs/verity/open.c | 18 ++++---------
+ fs/verity/signature.c | 61 ++++++--------------------------------------
+ fs/verity/verify.c | 11 ++------
+ 6 files changed, 63 insertions(+), 103 deletions(-)
+Merging fuse/for-next (6a567e920fd0 fuse: ioctl: translate ENOSYS in outarg)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
+Merge made by the 'ort' strategy.
+ fs/fuse/dir.c | 4 +---
+ fs/fuse/inode.c | 8 ++++++--
+ fs/fuse/ioctl.c | 21 +++++++++++++--------
+ include/uapi/linux/fuse.h | 3 +++
+ 4 files changed, 23 insertions(+), 13 deletions(-)
+Merging gfs2/for-next (94c76955e86a Merge tag 'gfs2-v6.4-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
+Already up to date.
+Merging jfs/jfs-next (95e2b352c03b FS: JFS: Check for read-only mounted filesystem in txBegin)
+$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next
+Already up to date.
+Merging ksmbd/ksmbd-for-next (956cd69868ee ksmbd: check if a mount point is crossed during path lookup)
+$ 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/smb2pdu.c | 27 ++++++++++++---------
+ fs/smb/server/vfs.c | 63 +++++++++++++++++++++++++++----------------------
+ fs/smb/server/vfs.h | 4 ++--
+ 3 files changed, 53 insertions(+), 41 deletions(-)
+Merging nfs/linux-next (5b4a82a0724a Revert "NFSv4: Retry LOCK on OLD_STATEID during delegation return")
+$ 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 (43439d858bba NFSv4.2: Fix a potential double free with READ_PLUS)
+$ 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 (76c53d9f9a9d SUNRPC: Use a per-transport receive bio_vec array)
+$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next
+Merge made by the 'ort' strategy.
+ fs/locks.c | 7 -
+ fs/nfsd/cache.h | 8 +-
+ fs/nfsd/nfs4proc.c | 15 +-
+ fs/nfsd/nfs4state.c | 120 +++++++++++--
+ fs/nfsd/nfs4xdr.c | 13 ++
+ fs/nfsd/nfscache.c | 207 ++++++++++++++---------
+ fs/nfsd/nfssvc.c | 10 +-
+ fs/nfsd/state.h | 3 +
+ fs/nfsd/stats.c | 2 +
+ fs/nfsd/stats.h | 7 +
+ fs/nfsd/trace.h | 27 ++-
+ fs/nfsd/xdr4.h | 1 +
+ include/linux/sunrpc/svc.h | 2 -
+ include/linux/sunrpc/svcsock.h | 7 +
+ net/sunrpc/.kunitconfig | 1 -
+ net/sunrpc/Kconfig | 35 ----
+ net/sunrpc/auth_gss/Makefile | 2 +-
+ net/sunrpc/auth_gss/gss_krb5_internal.h | 23 ---
+ net/sunrpc/auth_gss/gss_krb5_keys.c | 84 ----------
+ net/sunrpc/auth_gss/gss_krb5_mech.c | 257 +---------------------------
+ net/sunrpc/auth_gss/gss_krb5_seal.c | 69 --------
+ net/sunrpc/auth_gss/gss_krb5_seqnum.c | 106 ------------
+ net/sunrpc/auth_gss/gss_krb5_test.c | 196 ----------------------
+ net/sunrpc/auth_gss/gss_krb5_unseal.c | 77 ---------
+ net/sunrpc/auth_gss/gss_krb5_wrap.c | 287 --------------------------------
+ net/sunrpc/svcsock.c | 142 +++++++++-------
+ 26 files changed, 404 insertions(+), 1304 deletions(-)
+ delete mode 100644 net/sunrpc/auth_gss/gss_krb5_seqnum.c
+Merging ntfs3/master (44b4494d5c59 fs/ntfs3: Correct mode for label entry inside /proc/fs/ntfs3/)
+$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master
+Already up to date.
+Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (0a3bf81dbcb2 ovl: auto generate uuid for new overlay filesystems)
+$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next
+Merge made by the 'ort' strategy.
+ Documentation/filesystems/fsverity.rst | 2 +
+ Documentation/filesystems/overlayfs.rst | 72 +++++++++++
+ fs/overlayfs/copy_up.c | 52 +++++++-
+ fs/overlayfs/export.c | 26 +++-
+ fs/overlayfs/file.c | 8 +-
+ fs/overlayfs/inode.c | 2 +-
+ fs/overlayfs/namei.c | 87 +++++++++++--
+ fs/overlayfs/overlayfs.h | 66 +++++++++-
+ fs/overlayfs/ovl_entry.h | 4 +-
+ fs/overlayfs/params.c | 92 ++++++++++++--
+ fs/overlayfs/super.c | 34 ++++-
+ fs/overlayfs/util.c | 217 +++++++++++++++++++++++++++++++-
+ 12 files changed, 617 insertions(+), 45 deletions(-)
+Merging ubifs/next (b5fda08ef213 ubifs: Fix memleak when insert_old_idx() failed)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
+Already up to date.
+Merging v9fs/9p-next (4ec5183ec486 Linux 6.2-rc7)
+$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next
+Already up to date.
+Merging v9fs-ericvh/ericvh/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next
+Already up to date.
+Merging xfs/for-next (ed04a91f718e xfs: fix uninit warning in xfs_growfs_data)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
+Already up to date.
+Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
+Already up to date.
+Merging iomap/iomap-for-next (447a0bc108e4 iomap: drop me [hch] from MAINTAINERS for iomap)
+$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next
+Already up to date.
+Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request)
+$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next
+Already up to date.
+Merging file-locks/locks-next (0d6aeec73f8c selftests: add OFD lock tests)
+$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next
+Auto-merging fs/locks.c
+Merge made by the 'ort' strategy.
+ fs/locks.c | 23 ++++-
+ tools/testing/selftests/filelock/Makefile | 5 ++
+ tools/testing/selftests/filelock/ofdlocks.c | 132 ++++++++++++++++++++++++++++
+ 3 files changed, 157 insertions(+), 3 deletions(-)
+ create mode 100644 tools/testing/selftests/filelock/Makefile
+ create mode 100644 tools/testing/selftests/filelock/ofdlocks.c
+Merging iversion/iversion-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()')
+$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next
+Already up to date.
+Merging vfs-brauner/vfs.all (cf22d118b89a Merge branches 'vfs.readdir', 'vfs.misc', 'vfs.ctime', 'vfs.fchmodat2' and 'fs.proc.uapi' into vfs.all)
+$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all
+Auto-merging fs/btrfs/delayed-inode.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/btrfs/transaction.c
+Auto-merging fs/btrfs/tree-log.c
+Auto-merging fs/ecryptfs/crypto.c
+Auto-merging fs/ecryptfs/read_write.c
+Auto-merging fs/erofs/inode.c
+Auto-merging fs/ext2/ialloc.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/xattr.c
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/fuse/inode.c
+Auto-merging fs/hugetlbfs/inode.c
+Auto-merging fs/locks.c
+Auto-merging fs/ntfs3/inode.c
+Auto-merging fs/ocfs2/file.c
+Auto-merging fs/overlayfs/file.c
+Auto-merging fs/overlayfs/util.c
+Auto-merging fs/proc/base.c
+Auto-merging fs/smb/client/cifsfs.c
+Auto-merging fs/smb/client/file.c
+Auto-merging fs/smb/server/smb2pdu.c
+Auto-merging fs/splice.c
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/shmem_fs.h
+CONFLICT (content): Merge conflict in include/linux/shmem_fs.h
+Auto-merging mm/shmem.c
+CONFLICT (content): Merge conflict in mm/shmem.c
+Auto-merging tools/testing/selftests/Makefile
+Recorded preimage for 'include/linux/shmem_fs.h'
+Recorded preimage for 'mm/shmem.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+Recorded resolution for 'include/linux/shmem_fs.h'.
+Recorded resolution for 'mm/shmem.c'.
+[master f871a4da0b75] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/locking.rst | 8 +-
+ Documentation/filesystems/vfs.rst | 6 +-
+ arch/alpha/kernel/syscalls/syscall.tbl | 1 +
+ arch/arm/tools/syscall.tbl | 1 +
+ arch/arm64/include/asm/unistd.h | 2 +-
+ arch/arm64/include/asm/unistd32.h | 2 +
+ arch/ia64/kernel/syscalls/syscall.tbl | 1 +
+ arch/m68k/kernel/syscalls/syscall.tbl | 1 +
+ arch/microblaze/kernel/syscalls/syscall.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_n32.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_n64.tbl | 1 +
+ arch/mips/kernel/syscalls/syscall_o32.tbl | 1 +
+ arch/parisc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/kernel/syscalls/syscall.tbl | 1 +
+ arch/powerpc/platforms/cell/spufs/inode.c | 2 +-
+ arch/s390/hypfs/inode.c | 4 +-
+ arch/s390/kernel/syscalls/syscall.tbl | 1 +
+ arch/sh/kernel/syscalls/syscall.tbl | 1 +
+ arch/sparc/kernel/syscalls/syscall.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_32.tbl | 1 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 1 +
+ arch/xtensa/kernel/syscalls/syscall.tbl | 1 +
+ drivers/android/binderfs.c | 8 +-
+ drivers/infiniband/hw/qib/qib_fs.c | 3 +-
+ drivers/misc/ibmasm/ibmasmfs.c | 2 +-
+ drivers/misc/ibmvmc.c | 2 +-
+ drivers/usb/core/devio.c | 16 +-
+ drivers/usb/gadget/function/f_fs.c | 3 +-
+ drivers/usb/gadget/legacy/inode.c | 3 +-
+ fs/9p/vfs_inode.c | 4 +-
+ fs/9p/vfs_inode_dotl.c | 8 +-
+ fs/adfs/inode.c | 4 +-
+ fs/affs/amigaffs.c | 6 +-
+ fs/affs/inode.c | 16 +-
+ fs/afs/dynroot.c | 2 +-
+ fs/afs/inode.c | 6 +-
+ fs/attr.c | 8 +-
+ fs/autofs/inode.c | 2 +-
+ fs/autofs/root.c | 6 +-
+ fs/bad_inode.c | 3 +-
+ fs/befs/linuxvfs.c | 2 +-
+ fs/bfs/dir.c | 16 +-
+ fs/bfs/inode.c | 5 +-
+ fs/binfmt_misc.c | 3 +-
+ fs/btrfs/delayed-inode.c | 8 +-
+ fs/btrfs/file.c | 21 +-
+ fs/btrfs/inode.c | 54 ++--
+ fs/btrfs/ioctl.c | 2 +-
+ fs/btrfs/reflink.c | 3 +-
+ fs/btrfs/transaction.c | 3 +-
+ fs/btrfs/tree-log.c | 4 +-
+ fs/btrfs/xattr.c | 4 +-
+ fs/ceph/acl.c | 2 +-
+ fs/ceph/caps.c | 2 +-
+ fs/ceph/inode.c | 16 +-
+ fs/ceph/snap.c | 2 +-
+ fs/ceph/xattr.c | 2 +-
+ fs/coda/coda_linux.c | 3 +-
+ fs/coda/dir.c | 2 +-
+ fs/coda/file.c | 2 +-
+ fs/coda/inode.c | 2 +-
+ fs/configfs/inode.c | 7 +-
+ fs/cramfs/inode.c | 3 +-
+ fs/debugfs/inode.c | 3 +-
+ fs/devpts/inode.c | 6 +-
+ fs/ecryptfs/inode.c | 2 +-
+ fs/ecryptfs/mmap.c | 4 +-
+ fs/ecryptfs/read_write.c | 4 +-
+ fs/efivarfs/file.c | 2 +-
+ fs/efivarfs/inode.c | 2 +-
+ fs/efs/inode.c | 4 +-
+ fs/erofs/inode.c | 12 +-
+ fs/eventfd.c | 2 +-
+ fs/exfat/file.c | 4 +-
+ fs/exfat/inode.c | 6 +-
+ fs/exfat/namei.c | 26 +-
+ fs/exfat/super.c | 3 +-
+ fs/ext2/acl.c | 2 +-
+ fs/ext2/dir.c | 6 +-
+ fs/ext2/ialloc.c | 2 +-
+ fs/ext2/inode.c | 10 +-
+ fs/ext2/ioctl.c | 4 +-
+ fs/ext2/namei.c | 8 +-
+ fs/ext2/super.c | 2 +-
+ fs/ext2/xattr.c | 2 +-
+ fs/ext4/acl.c | 2 +-
+ fs/ext4/ext4.h | 79 +++---
+ fs/ext4/extents.c | 12 +-
+ fs/ext4/ialloc.c | 2 +-
+ fs/ext4/inline.c | 4 +-
+ fs/ext4/inode-test.c | 6 +-
+ fs/ext4/inode.c | 16 +-
+ fs/ext4/ioctl.c | 9 +-
+ fs/ext4/namei.c | 26 +-
+ fs/ext4/super.c | 2 +-
+ fs/ext4/xattr.c | 6 +-
+ fs/f2fs/dir.c | 8 +-
+ fs/f2fs/f2fs.h | 4 +-
+ fs/f2fs/file.c | 20 +-
+ fs/f2fs/inline.c | 2 +-
+ fs/f2fs/inode.c | 10 +-
+ fs/f2fs/namei.c | 12 +-
+ fs/f2fs/recovery.c | 4 +-
+ fs/f2fs/super.c | 2 +-
+ fs/f2fs/xattr.c | 2 +-
+ fs/fat/inode.c | 5 +-
+ fs/fat/misc.c | 3 +-
+ fs/fcntl.c | 29 +-
+ fs/freevxfs/vxfs_inode.c | 3 +-
+ fs/fuse/control.c | 2 +-
+ fs/fuse/dir.c | 8 +-
+ fs/fuse/inode.c | 16 +-
+ fs/gfs2/acl.c | 2 +-
+ fs/gfs2/bmap.c | 11 +-
+ fs/gfs2/dir.c | 15 +-
+ fs/gfs2/file.c | 2 +-
+ fs/gfs2/glops.c | 4 +-
+ fs/gfs2/inode.c | 8 +-
+ fs/gfs2/quota.c | 2 +-
+ fs/gfs2/super.c | 4 +-
+ fs/gfs2/xattr.c | 8 +-
+ fs/hfs/catalog.c | 8 +-
+ fs/hfs/dir.c | 2 +-
+ fs/hfs/inode.c | 13 +-
+ fs/hfs/sysdep.c | 4 +-
+ fs/hfsplus/catalog.c | 8 +-
+ fs/hfsplus/dir.c | 6 +-
+ fs/hfsplus/inode.c | 16 +-
+ fs/hostfs/hostfs_kern.c | 3 +-
+ fs/hpfs/dir.c | 8 +-
+ fs/hpfs/inode.c | 6 +-
+ fs/hpfs/namei.c | 29 +-
+ fs/hpfs/super.c | 5 +-
+ fs/hugetlbfs/inode.c | 12 +-
+ fs/inode.c | 26 +-
+ fs/isofs/inode.c | 9 +-
+ fs/isofs/rock.c | 16 +-
+ fs/jffs2/dir.c | 24 +-
+ fs/jffs2/file.c | 3 +-
+ fs/jffs2/fs.c | 10 +-
+ fs/jffs2/os-linux.h | 2 +-
+ fs/jfs/acl.c | 2 +-
+ fs/jfs/inode.c | 2 +-
+ fs/jfs/ioctl.c | 2 +-
+ fs/jfs/jfs_imap.c | 8 +-
+ fs/jfs/jfs_inode.c | 4 +-
+ fs/jfs/namei.c | 24 +-
+ fs/jfs/super.c | 2 +-
+ fs/jfs/xattr.c | 2 +-
+ fs/kernfs/inode.c | 5 +-
+ fs/libfs.c | 305 +++++++++++++++++++--
+ fs/locks.c | 20 +-
+ fs/minix/bitmap.c | 2 +-
+ fs/minix/dir.c | 6 +-
+ fs/minix/inode.c | 10 +-
+ fs/minix/itree_common.c | 4 +-
+ fs/minix/namei.c | 6 +-
+ fs/nfs/callback_proc.c | 2 +-
+ fs/nfs/fscache.h | 4 +-
+ fs/nfs/inode.c | 20 +-
+ fs/nfs/nfs4_fs.h | 2 +-
+ fs/nfs/nfs4file.c | 2 +-
+ fs/nfs/nfs4proc.c | 4 +-
+ fs/nfsd/nfsctl.c | 2 +-
+ fs/nfsd/vfs.c | 2 +-
+ fs/nilfs2/dir.c | 6 +-
+ fs/nilfs2/inode.c | 12 +-
+ fs/nilfs2/ioctl.c | 2 +-
+ fs/nilfs2/namei.c | 8 +-
+ fs/notify/dnotify/dnotify.c | 4 +-
+ fs/nsfs.c | 2 +-
+ fs/ntfs/inode.c | 15 +-
+ fs/ntfs/mft.c | 3 +-
+ fs/ntfs3/file.c | 6 +-
+ fs/ntfs3/frecord.c | 3 +-
+ fs/ntfs3/inode.c | 14 +-
+ fs/ntfs3/namei.c | 11 +-
+ fs/ntfs3/xattr.c | 4 +-
+ fs/ocfs2/acl.c | 6 +-
+ fs/ocfs2/alloc.c | 6 +-
+ fs/ocfs2/aops.c | 2 +-
+ fs/ocfs2/dir.c | 8 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 4 +-
+ fs/ocfs2/dlmglue.c | 7 +-
+ fs/ocfs2/file.c | 16 +-
+ fs/ocfs2/inode.c | 12 +-
+ fs/ocfs2/move_extents.c | 6 +-
+ fs/ocfs2/namei.c | 21 +-
+ fs/ocfs2/refcounttree.c | 14 +-
+ fs/ocfs2/xattr.c | 6 +-
+ fs/omfs/dir.c | 4 +-
+ fs/omfs/inode.c | 9 +-
+ fs/open.c | 19 +-
+ fs/openpromfs/inode.c | 5 +-
+ fs/orangefs/namei.c | 2 +-
+ fs/orangefs/orangefs-utils.c | 6 +-
+ fs/overlayfs/file.c | 7 +-
+ fs/overlayfs/util.c | 2 +-
+ fs/pipe.c | 8 +-
+ fs/posix_acl.c | 2 +-
+ fs/proc/base.c | 5 +-
+ fs/proc/inode.c | 2 +-
+ fs/proc/proc_net.c | 1 +
+ fs/proc/proc_sysctl.c | 2 +-
+ fs/proc/self.c | 2 +-
+ fs/proc/thread_self.c | 2 +-
+ fs/pstore/inode.c | 4 +-
+ fs/qnx4/inode.c | 3 +-
+ fs/qnx6/inode.c | 3 +-
+ fs/ramfs/inode.c | 6 +-
+ fs/reiserfs/inode.c | 12 +-
+ fs/reiserfs/ioctl.c | 4 +-
+ fs/reiserfs/journal.c | 4 +-
+ fs/reiserfs/namei.c | 18 +-
+ fs/reiserfs/stree.c | 4 +-
+ fs/reiserfs/super.c | 2 +-
+ fs/reiserfs/xattr.c | 5 +-
+ fs/reiserfs/xattr_acl.c | 2 +-
+ fs/romfs/super.c | 3 +-
+ fs/smb/client/cifsfs.c | 2 +-
+ fs/smb/client/file.c | 4 +-
+ fs/smb/client/fscache.h | 5 +-
+ fs/smb/client/inode.c | 14 +-
+ fs/smb/client/smb2ops.c | 3 +-
+ fs/smb/server/smb2pdu.c | 8 +-
+ fs/splice.c | 46 ++--
+ fs/squashfs/inode.c | 2 +-
+ fs/stack.c | 2 +-
+ fs/stat.c | 2 +-
+ fs/sysv/dir.c | 6 +-
+ fs/sysv/ialloc.c | 2 +-
+ fs/sysv/inode.c | 5 +-
+ fs/sysv/itree.c | 4 +-
+ fs/sysv/namei.c | 6 +-
+ fs/tracefs/inode.c | 2 +-
+ fs/ubifs/debug.c | 4 +-
+ fs/ubifs/dir.c | 39 +--
+ fs/ubifs/file.c | 16 +-
+ fs/ubifs/ioctl.c | 2 +-
+ fs/ubifs/journal.c | 4 +-
+ fs/ubifs/super.c | 4 +-
+ fs/ubifs/xattr.c | 6 +-
+ fs/udf/ialloc.c | 2 +-
+ fs/udf/inode.c | 17 +-
+ fs/udf/namei.c | 24 +-
+ fs/ufs/dir.c | 6 +-
+ fs/ufs/ialloc.c | 2 +-
+ fs/ufs/inode.c | 23 +-
+ fs/ufs/namei.c | 8 +-
+ fs/vboxsf/utils.c | 4 +-
+ fs/xfs/libxfs/xfs_inode_buf.c | 5 +-
+ fs/xfs/libxfs/xfs_trans_inode.c | 2 +-
+ fs/xfs/xfs_acl.c | 2 +-
+ fs/xfs/xfs_bmap_util.c | 6 +-
+ fs/xfs/xfs_inode.c | 3 +-
+ fs/xfs/xfs_inode_item.c | 2 +-
+ fs/xfs/xfs_iops.c | 4 +-
+ fs/xfs/xfs_itable.c | 4 +-
+ fs/zonefs/super.c | 8 +-
+ include/linux/dnotify.h | 4 +-
+ include/linux/filelock.h | 12 +-
+ include/linux/fs.h | 73 ++++-
+ include/linux/fs_stack.h | 2 +-
+ include/linux/pipe_fs_i.h | 4 +-
+ include/linux/shmem_fs.h | 1 +
+ include/linux/syscalls.h | 4 +-
+ include/uapi/asm-generic/unistd.h | 5 +-
+ ipc/mqueue.c | 23 +-
+ kernel/bpf/inode.c | 6 +-
+ mm/shmem.c | 88 ++++--
+ net/sunrpc/rpc_pipe.c | 2 +-
+ security/apparmor/apparmorfs.c | 11 +-
+ security/apparmor/policy_unpack.c | 11 +-
+ security/inode.c | 2 +-
+ security/selinux/selinuxfs.c | 2 +-
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/fchmodat2/.gitignore | 2 +
+ tools/testing/selftests/fchmodat2/Makefile | 6 +
+ tools/testing/selftests/fchmodat2/fchmodat2_test.c | 162 +++++++++++
+ tools/testing/selftests/nolibc/nolibc-test.c | 1 -
+ 280 files changed, 1534 insertions(+), 972 deletions(-)
+ create mode 100644 tools/testing/selftests/fchmodat2/.gitignore
+ create mode 100644 tools/testing/selftests/fchmodat2/Makefile
+ create mode 100644 tools/testing/selftests/fchmodat2/fchmodat2_test.c
+Merging vfs/for-next (cff4b23c731a Merge branch 'work.lock_rename_child' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next
+Merge made by the 'ort' strategy.
+Merging printk/for-next (16bff6f075a1 Merge branch 'for-6.4' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next
+Merge made by the 'ort' strategy.
+Merging pci/next (ffb9381f49da Merge branch 'pci/misc')
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next
+Merge made by the 'ort' strategy.
+ drivers/pci/controller/dwc/pci-imx6.c | 3 +--
+ drivers/pci/controller/dwc/pci-meson.c | 11 ++++++++---
+ drivers/pci/controller/dwc/pcie-keembay.c | 11 ++++++++---
+ drivers/pci/controller/dwc/pcie-qcom-ep.c | 2 +-
+ drivers/pci/controller/pci-rcar-gen2.c | 3 +--
+ drivers/pci/controller/pci-v3-semi.c | 3 +--
+ drivers/pci/controller/pci-xgene-msi.c | 3 +--
+ drivers/pci/controller/pcie-apple.c | 6 +++++-
+ drivers/pci/controller/pcie-iproc-msi.c | 5 ++---
+ drivers/pci/controller/pcie-microchip-host.c | 10 ++++++++--
+ drivers/pci/controller/pcie-rockchip.h | 6 +++---
+ drivers/pci/pcie/aer.c | 15 +--------------
+ include/linux/aer.h | 11 -----------
+ include/linux/pci.h | 6 +++---
+ 14 files changed, 43 insertions(+), 52 deletions(-)
+Merging pstore/for-next/pstore (efe5be6664c8 pstore: Replace crypto API compression with zlib_deflate library calls)
+$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore
+Merge made by the 'ort' strategy.
+ fs/pstore/Kconfig | 100 ++--------------
+ fs/pstore/platform.c | 330 ++++++++++++++++-----------------------------------
+ 2 files changed, 110 insertions(+), 320 deletions(-)
+Merging hid/for-next (5eb5c80feb93 Merge branch 'for-6.5/upstream-fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
+Merge made by the 'ort' strategy.
+Merging i2c/i2c/for-next (6537ed3904a3 i2c: mpc: Drop unused variable)
+$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next
+Already up to date.
+Merging i3c/i3c/next (49b472ebc61d i3c: master: svc: add NACK check after start byte sent)
+$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next
+Already up to date.
+Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks)
+$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next
+Already up to date.
+Merging hwmon-staging/hwmon-next (4dbbaf8fbdbd hwmon: (oxp-sensors) Add support for AOKZOE A1 PRO)
+$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next
+Already up to date.
+Merging jc_docs/docs-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
+Already up to date.
+Merging v4l-dvb/master (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master
+Already up to date.
+Merging v4l-dvb-next/master (06c2afb862f9 Linux 6.5-rc1)
+$ 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 (998829ca60f7 Merge branch 'thermal-core' into linux-next)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next
+Merge made by the 'ort' strategy.
+ drivers/acpi/acpica/acdebug.h | 2 +
+ drivers/acpi/acpica/acglobal.h | 1 +
+ drivers/acpi/acpica/aclocal.h | 38 +++++++----
+ drivers/acpi/acpica/acpredef.h | 3 +
+ drivers/acpi/acpica/dbcmds.c | 58 +++++++++++++++++
+ drivers/acpi/acpica/dbinput.c | 8 +++
+ drivers/acpi/acpica/dswstate.c | 4 +-
+ drivers/acpi/acpica/exserial.c | 3 +-
+ drivers/acpi/acpica/psopcode.c | 2 +-
+ drivers/acpi/acpica/utdebug.c | 5 ++
+ drivers/cpufreq/sparc-us2e-cpufreq.c | 2 +-
+ drivers/cpufreq/sparc-us3-cpufreq.c | 2 +-
+ drivers/powercap/intel_rapl_tpmi.c | 2 +-
+ drivers/thermal/gov_bang_bang.c | 1 +
+ drivers/thermal/gov_fair_share.c | 1 +
+ drivers/thermal/gov_power_allocator.c | 5 +-
+ drivers/thermal/gov_step_wise.c | 1 +
+ drivers/thermal/gov_user_space.c | 1 +
+ .../intel/int340x_thermal/int3400_thermal.c | 44 ++++++-------
+ drivers/thermal/thermal_acpi.c | 1 +
+ drivers/thermal/thermal_core.c | 7 +-
+ drivers/thermal/thermal_core.h | 4 ++
+ drivers/thermal/thermal_helpers.c | 1 +
+ drivers/thermal/thermal_hwmon.c | 1 +
+ drivers/thermal/thermal_netlink.c | 1 +
+ drivers/thermal/thermal_of.c | 1 +
+ drivers/thermal/thermal_sysfs.c | 1 +
+ drivers/thermal/thermal_trip.c | 1 +
+ include/acpi/acnames.h | 1 +
+ include/acpi/acpixf.h | 2 +-
+ include/acpi/actbl1.h | 2 +-
+ include/acpi/actbl2.h | 76 +++++++++++++++++++++-
+ include/acpi/actbl3.h | 4 +-
+ include/acpi/platform/aclinux.h | 1 +
+ include/acpi/platform/aczephyr.h | 3 -
+ kernel/power/hibernate.c | 1 +
+ kernel/power/qos.c | 9 ++-
+ 37 files changed, 244 insertions(+), 56 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at 712aea6cb48e Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git
+Merging next-20230713 version of pm
+$ git merge -m next-20230713/pm 3c61a03588dd8486041f484e9b6c48b2c9a69b92
+Merge made by the 'ort' strategy.
+ drivers/acpi/acpica/acdebug.h | 2 +
+ drivers/acpi/acpica/acglobal.h | 1 +
+ drivers/acpi/acpica/aclocal.h | 38 ++++++++++++------
+ drivers/acpi/acpica/acpredef.h | 3 ++
+ drivers/acpi/acpica/dbcmds.c | 58 +++++++++++++++++++++++++++
+ drivers/acpi/acpica/dbinput.c | 8 ++++
+ drivers/acpi/acpica/dswstate.c | 4 +-
+ drivers/acpi/acpica/exserial.c | 3 +-
+ drivers/acpi/acpica/psopcode.c | 2 +-
+ drivers/acpi/acpica/utdebug.c | 5 +++
+ drivers/cpufreq/sparc-us2e-cpufreq.c | 2 +-
+ drivers/cpufreq/sparc-us3-cpufreq.c | 2 +-
+ drivers/powercap/intel_rapl_tpmi.c | 2 +-
+ include/acpi/acnames.h | 1 +
+ include/acpi/acpixf.h | 2 +-
+ include/acpi/actbl1.h | 2 +-
+ include/acpi/actbl2.h | 76 +++++++++++++++++++++++++++++++++++-
+ include/acpi/actbl3.h | 4 +-
+ include/acpi/platform/aclinux.h | 1 +
+ include/acpi/platform/aczephyr.h | 3 --
+ kernel/power/hibernate.c | 1 +
+ kernel/power/qos.c | 9 ++++-
+ 22 files changed, 200 insertions(+), 29 deletions(-)
+Merging cpufreq-arm/cpufreq/arm/linux-next (9d4807ffe9ef cpufreq: omap: Convert to platform remove callback returning void)
+$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next
+Merge made by the 'ort' strategy.
+ drivers/cpufreq/acpi-cpufreq.c | 6 ++----
+ drivers/cpufreq/brcmstb-avs-cpufreq.c | 6 ++----
+ drivers/cpufreq/cpufreq-dt.c | 5 ++---
+ drivers/cpufreq/davinci-cpufreq.c | 6 ++----
+ drivers/cpufreq/imx-cpufreq-dt.c | 6 ++----
+ drivers/cpufreq/imx6q-cpufreq.c | 6 ++----
+ drivers/cpufreq/kirkwood-cpufreq.c | 6 ++----
+ drivers/cpufreq/mediatek-cpufreq-hw.c | 6 ++----
+ drivers/cpufreq/omap-cpufreq.c | 6 ++----
+ drivers/cpufreq/pcc-cpufreq.c | 6 ++----
+ drivers/cpufreq/qcom-cpufreq-hw.c | 6 ++----
+ drivers/cpufreq/qcom-cpufreq-nvmem.c | 6 ++----
+ drivers/cpufreq/qoriq-cpufreq.c | 6 ++----
+ drivers/cpufreq/raspberrypi-cpufreq.c | 6 ++----
+ drivers/cpufreq/scpi-cpufreq.c | 5 ++---
+ drivers/cpufreq/sun50i-cpufreq-nvmem.c | 6 ++----
+ drivers/cpufreq/tegra186-cpufreq.c | 6 ++----
+ drivers/cpufreq/tegra194-cpufreq.c | 6 ++----
+ drivers/cpufreq/vexpress-spc-cpufreq.c | 5 ++---
+ 19 files changed, 38 insertions(+), 73 deletions(-)
+Merging cpupower/cpupower (d7de5d8e403a cpupower: Bump soname version)
+$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower
+Merge made by the 'ort' strategy.
+ tools/power/cpupower/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging devfreq/devfreq-next (a83bfdca8b20 PM / devfreq: mtk-cci: Fix variable deferencing before NULL check)
+$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next
+Already up to date.
+Merging opp/opp/linux-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next
+Already up to date.
+Merging thermal/thermal/linux-next (57c9eaa4de53 thermal/drivers/qcom/temp-alarm: Use dev_err_probe)
+$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next
+Already up to date.
+Merging dlm/next (fc4ea4229c2b fs: dlm: remove filter local comms on close)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
+Already up to date.
+Merging rdma/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
+Already up to date.
+Merging net-next/main (ba2274dcfda8 net: wwan: t7xx: Add AP CLDMA)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main
+Auto-merging drivers/net/ethernet/freescale/fec_main.c
+Merge made by the 'ort' strategy.
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 9 +-
+ drivers/net/ethernet/freescale/fec_main.c | 5 +-
+ drivers/net/ethernet/freescale/fec_mpc52xx.c | 6 +-
+ drivers/net/ethernet/freescale/fec_mpc52xx_phy.c | 6 +-
+ drivers/net/ethernet/freescale/fman/mac.c | 5 +-
+ .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 5 +-
+ .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 6 +-
+ drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 6 +-
+ drivers/net/ethernet/freescale/fsl_pq_mdio.c | 6 +-
+ drivers/net/ethernet/freescale/gianfar.c | 6 +-
+ drivers/net/ethernet/freescale/ucc_geth.c | 6 +-
+ drivers/net/ethernet/mellanox/mlxsw/Makefile | 2 +-
+ .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 1 +
+ .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 1 +
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 73 +++++++
+ drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 +
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 39 ++++
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 25 ++-
+ .../ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c | 4 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 11 +-
+ .../mellanox/mlxsw/spectrum_acl_flex_keys.c | 3 +
+ .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 68 ++++++
+ .../ethernet/mellanox/mlxsw/spectrum_port_range.c | 200 ++++++++++++++++++
+ .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 28 ++-
+ drivers/net/wwan/t7xx/t7xx_hif_cldma.c | 17 +-
+ drivers/net/wwan/t7xx/t7xx_hif_cldma.h | 2 +-
+ drivers/net/wwan/t7xx/t7xx_mhccif.h | 1 +
+ drivers/net/wwan/t7xx/t7xx_modem_ops.c | 76 +++++--
+ drivers/net/wwan/t7xx/t7xx_modem_ops.h | 2 +
+ drivers/net/wwan/t7xx/t7xx_port.h | 6 +-
+ drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c | 8 +-
+ drivers/net/wwan/t7xx/t7xx_port_proxy.c | 18 +-
+ drivers/net/wwan/t7xx/t7xx_reg.h | 2 +-
+ drivers/net/wwan/t7xx/t7xx_state_monitor.c | 13 +-
+ drivers/net/wwan/t7xx/t7xx_state_monitor.h | 2 +
+ net/core/dev.c | 8 +-
+ net/core/sock.c | 15 +-
+ net/ipv4/tcp_ipv4.c | 3 +
+ net/ipv6/exthdrs.c | 2 -
+ net/ipv6/rpl_iptunnel.c | 3 +-
+ net/netlink/af_netlink.c | 5 +-
+ .../selftests/drivers/net/mlxsw/port_range_occ.sh | 111 ++++++++++
+ .../drivers/net/mlxsw/port_range_scale.sh | 95 +++++++++
+ .../net/mlxsw/spectrum-2/port_range_scale.sh | 1 +
+ .../drivers/net/mlxsw/spectrum-2/resource_scale.sh | 1 +
+ .../drivers/net/mlxsw/spectrum/port_range_scale.sh | 16 ++
+ .../drivers/net/mlxsw/spectrum/resource_scale.sh | 1 +
+ tools/testing/selftests/net/forwarding/Makefile | 1 +
+ .../net/forwarding/tc_flower_port_range.sh | 228 +++++++++++++++++++++
+ 50 files changed, 1045 insertions(+), 117 deletions(-)
+ create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_port_range.c
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/port_range_occ.sh
+ create mode 100644 tools/testing/selftests/drivers/net/mlxsw/port_range_scale.sh
+ create mode 120000 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/port_range_scale.sh
+ create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/port_range_scale.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/tc_flower_port_range.sh
+Merging bpf-next/for-next (1cd0e7715cad selftests/bpf: Add selftest for PTR_UNTRUSTED)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next
+Auto-merging MAINTAINERS
+Auto-merging include/linux/trace_events.h
+Auto-merging kernel/bpf/btf.c
+Auto-merging kernel/bpf/verifier.c
+Auto-merging kernel/trace/bpf_trace.c
+Auto-merging kernel/trace/trace_kprobe.c
+Auto-merging kernel/trace/trace_uprobe.c
+Auto-merging tools/build/feature/Makefile
+Merge made by the 'ort' strategy.
+ Documentation/bpf/bpf_devel_QA.rst | 10 +-
+ Documentation/bpf/btf.rst | 4 +-
+ Documentation/bpf/index.rst | 3 +-
+ Documentation/bpf/llvm_reloc.rst | 6 +-
+ Documentation/bpf/standardization/index.rst | 18 +
+ .../bpf/{ => standardization}/instruction-set.rst | 2 +-
+ .../bpf/{ => standardization}/linux-notes.rst | 3 +-
+ MAINTAINERS | 2 +-
+ arch/x86/net/bpf_jit_comp.c | 248 ++++++++--
+ drivers/hid/bpf/entrypoints/Makefile | 2 +-
+ include/linux/bpf-cgroup.h | 4 +-
+ include/linux/bpf.h | 30 ++
+ include/linux/bpf_mem_alloc.h | 2 +
+ include/linux/rcutiny.h | 2 +
+ include/linux/rcutree.h | 1 +
+ include/linux/trace_events.h | 3 +-
+ include/uapi/linux/bpf.h | 40 ++
+ kernel/bpf/btf.c | 24 +-
+ kernel/bpf/cpumask.c | 20 +-
+ kernel/bpf/hashtab.c | 22 +-
+ kernel/bpf/map_iter.c | 39 +-
+ kernel/bpf/memalloc.c | 378 +++++++++++----
+ kernel/bpf/preload/iterators/Makefile | 2 +-
+ kernel/bpf/preload/iterators/iterators.bpf.c | 9 +-
+ .../iterators/iterators.lskel-little-endian.h | 526 +++++++++++----------
+ kernel/bpf/ringbuf.c | 26 +-
+ kernel/bpf/syscall.c | 180 ++++++-
+ kernel/bpf/verifier.c | 42 +-
+ kernel/rcu/rcu.h | 2 -
+ kernel/trace/bpf_trace.c | 49 +-
+ kernel/trace/trace_kprobe.c | 13 +-
+ kernel/trace/trace_uprobe.c | 3 +-
+ lib/test_bpf.c | 12 +-
+ net/bpf/test_run.c | 18 +-
+ samples/bpf/Makefile | 6 +-
+ samples/bpf/gnu/stubs.h | 2 +-
+ samples/bpf/syscall_tp_kern.c | 4 +
+ samples/bpf/test_lwt_bpf.sh | 2 +-
+ samples/hid/Makefile | 6 +-
+ tools/bpf/bpftool/Documentation/bpftool-gen.rst | 4 +-
+ tools/bpf/bpftool/Makefile | 2 +-
+ tools/bpf/bpftool/btf_dumper.c | 2 +-
+ tools/bpf/bpftool/feature.c | 2 +-
+ tools/bpf/bpftool/link.c | 432 ++++++++++++++++-
+ tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 26 +-
+ tools/bpf/bpftool/skeleton/profiler.bpf.c | 27 +-
+ tools/bpf/bpftool/xlated_dumper.c | 6 +-
+ tools/bpf/bpftool/xlated_dumper.h | 2 +
+ tools/bpf/runqslower/Makefile | 2 +-
+ tools/build/feature/Makefile | 2 +-
+ tools/include/uapi/linux/bpf.h | 40 ++
+ tools/lib/bpf/bpf.c | 8 +
+ tools/lib/bpf/bpf.h | 6 +
+ tools/lib/bpf/hashmap.h | 10 -
+ tools/lib/bpf/libbpf.c | 258 +++++++++-
+ tools/lib/bpf/libbpf.h | 15 +
+ tools/lib/bpf/libbpf.map | 1 +
+ tools/lib/bpf/usdt.c | 5 +-
+ tools/testing/selftests/bpf/DENYLIST.aarch64 | 2 +
+ tools/testing/selftests/bpf/Makefile | 13 +-
+ tools/testing/selftests/bpf/bench.c | 4 +
+ .../testing/selftests/bpf/benchs/bench_htab_mem.c | 350 ++++++++++++++
+ .../testing/selftests/bpf/benchs/bench_ringbufs.c | 2 +-
+ .../selftests/bpf/benchs/run_bench_htab_mem.sh | 40 ++
+ .../selftests/bpf/bpf_testmod/bpf_testmod.c | 49 +-
+ tools/testing/selftests/bpf/cgroup_helpers.c | 12 +
+ tools/testing/selftests/bpf/cgroup_helpers.h | 1 +
+ tools/testing/selftests/bpf/cgroup_tcp_skb.h | 35 ++
+ tools/testing/selftests/bpf/gnu/stubs.h | 2 +-
+ .../selftests/bpf/map_tests/map_percpu_stats.c | 447 +++++++++++++++++
+ tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 5 +-
+ .../selftests/bpf/prog_tests/cgroup_tcp_skb.c | 402 ++++++++++++++++
+ .../testing/selftests/bpf/prog_tests/fentry_test.c | 43 +-
+ .../testing/selftests/bpf/prog_tests/fexit_test.c | 43 +-
+ .../selftests/bpf/prog_tests/get_func_args_test.c | 4 +-
+ .../selftests/bpf/prog_tests/global_map_resize.c | 14 +-
+ .../selftests/bpf/prog_tests/modify_return.c | 10 +-
+ .../bpf/prog_tests/netfilter_link_attach.c | 86 ++++
+ .../selftests/bpf/prog_tests/ptr_untrusted.c | 36 ++
+ .../selftests/bpf/prog_tests/tcp_hdr_options.c | 2 +-
+ .../selftests/bpf/prog_tests/tracing_struct.c | 19 +
+ .../selftests/bpf/prog_tests/trampoline_count.c | 4 +-
+ tools/testing/selftests/bpf/prog_tests/verifier.c | 2 +
+ tools/testing/selftests/bpf/progs/cgroup_tcp_skb.c | 382 +++++++++++++++
+ .../testing/selftests/bpf/progs/fentry_many_args.c | 39 ++
+ .../testing/selftests/bpf/progs/fexit_many_args.c | 40 ++
+ tools/testing/selftests/bpf/progs/htab_mem_bench.c | 105 ++++
+ tools/testing/selftests/bpf/progs/linked_list.c | 2 +-
+ .../testing/selftests/bpf/progs/map_percpu_stats.c | 24 +
+ tools/testing/selftests/bpf/progs/modify_return.c | 40 ++
+ .../selftests/bpf/progs/nested_trust_failure.c | 16 +
+ .../selftests/bpf/progs/nested_trust_success.c | 15 +
+ .../selftests/bpf/progs/test_global_map_resize.c | 8 +-
+ .../bpf/progs/test_netfilter_link_attach.c | 14 +
+ .../selftests/bpf/progs/test_ptr_untrusted.c | 29 ++
+ tools/testing/selftests/bpf/progs/tracing_struct.c | 54 +++
+ .../testing/selftests/bpf/progs/verifier_typedef.c | 23 +
+ tools/testing/selftests/bpf/trace_helpers.c | 5 +-
+ .../selftests/bpf/verifier/atomic_cmpxchg.c | 1 +
+ tools/testing/selftests/bpf/verifier/ctx_skb.c | 2 +
+ tools/testing/selftests/bpf/verifier/jmp32.c | 8 +
+ tools/testing/selftests/bpf/verifier/map_kptr.c | 2 +
+ tools/testing/selftests/bpf/verifier/precise.c | 2 +-
+ tools/testing/selftests/hid/Makefile | 6 +-
+ tools/testing/selftests/net/Makefile | 4 +-
+ tools/testing/selftests/tc-testing/Makefile | 2 +-
+ 106 files changed, 4445 insertions(+), 620 deletions(-)
+ create mode 100644 Documentation/bpf/standardization/index.rst
+ rename Documentation/bpf/{ => standardization}/instruction-set.rst (99%)
+ rename Documentation/bpf/{ => standardization}/linux-notes.rst (96%)
+ create mode 100644 tools/testing/selftests/bpf/benchs/bench_htab_mem.c
+ create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_htab_mem.sh
+ create mode 100644 tools/testing/selftests/bpf/cgroup_tcp_skb.h
+ create mode 100644 tools/testing/selftests/bpf/map_tests/map_percpu_stats.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/netfilter_link_attach.c
+ create mode 100644 tools/testing/selftests/bpf/prog_tests/ptr_untrusted.c
+ create mode 100644 tools/testing/selftests/bpf/progs/cgroup_tcp_skb.c
+ create mode 100644 tools/testing/selftests/bpf/progs/fentry_many_args.c
+ create mode 100644 tools/testing/selftests/bpf/progs/fexit_many_args.c
+ create mode 100644 tools/testing/selftests/bpf/progs/htab_mem_bench.c
+ create mode 100644 tools/testing/selftests/bpf/progs/map_percpu_stats.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_netfilter_link_attach.c
+ create mode 100644 tools/testing/selftests/bpf/progs/test_ptr_untrusted.c
+ create mode 100644 tools/testing/selftests/bpf/progs/verifier_typedef.c
+Merging ipsec-next/master (a94fd40a18ae xfrm: delete not-needed clear to zero of encap_oa)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master
+Auto-merging net/key/af_key.c
+Merge made by the 'ort' strategy.
+ net/key/af_key.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging mlx5-next/mlx5-next (77f7eb9f3416 net/mlx5: Introduce other vport query for Q-counters)
+$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next
+Already up to date.
+Merging netfilter-next/main (b8e39b38487e netlink: Make use of __assign_bit() API)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main
+Already up to date.
+Merging ipvs-next/main (61dc651cdfe8 Merge tag 'nf-next-23-06-26' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next)
+$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main
+Already up to date.
+Merging bluetooth/master (2ba6216b8b37 Bluetooth: btmtk: Fix kernel crash when processing coredump)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master
+Merge made by the 'ort' strategy.
+ drivers/bluetooth/btintel.c | 124 +++++++++
+ drivers/bluetooth/btintel.h | 2 +
+ drivers/bluetooth/btmtk.c | 133 ++++++++++
+ drivers/bluetooth/btmtk.h | 42 ++++
+ drivers/bluetooth/btrtl.c | 163 +++++++++---
+ drivers/bluetooth/btrtl.h | 13 +
+ drivers/bluetooth/btusb.c | 295 +++++++++++++++++-----
+ drivers/bluetooth/hci_ldisc.c | 3 +-
+ drivers/bluetooth/hci_qca.c | 148 +++++++----
+ include/net/bluetooth/bluetooth.h | 3 +
+ include/net/bluetooth/hci.h | 11 +
+ include/net/bluetooth/hci_core.h | 80 +++++-
+ include/net/bluetooth/hci_sync.h | 2 +-
+ include/net/bluetooth/mgmt.h | 2 +
+ net/bluetooth/af_bluetooth.c | 45 ++++
+ net/bluetooth/bnep/sock.c | 10 +-
+ net/bluetooth/hci_conn.c | 515 ++++++++++++++++++--------------------
+ net/bluetooth/hci_core.c | 54 +++-
+ net/bluetooth/hci_debugfs.c | 3 +-
+ net/bluetooth/hci_event.c | 174 +++++++++----
+ net/bluetooth/hci_sock.c | 77 +++++-
+ net/bluetooth/hci_sync.c | 307 ++++++++++++++++++-----
+ net/bluetooth/hidp/sock.c | 10 +-
+ net/bluetooth/iso.c | 149 ++++++-----
+ net/bluetooth/l2cap_sock.c | 29 +--
+ net/bluetooth/mgmt.c | 53 ++--
+ net/bluetooth/msft.c | 414 ++++++++++++++++++++++++++++--
+ net/bluetooth/rfcomm/sock.c | 13 +-
+ net/bluetooth/sco.c | 33 +--
+ 29 files changed, 2151 insertions(+), 756 deletions(-)
+$ git am -3 ../patches/0001-Revert-Bluetooth-hci_sock-Forward-credentials-to-mon.patch
+Applying: Revert "Bluetooth: hci_sock: Forward credentials to monitor"
+$ git reset HEAD^
+Unstaged changes after reset:
+M include/net/bluetooth/bluetooth.h
+M net/bluetooth/hci_sock.c
+$ git add -A .
+$ git commit -v -a --amend
+[master eadc61ed7fa6] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
+ Date: Fri Jul 14 11:05:57 2023 +1000
+Merging wireless-next/for-next (31b5a547622b wifi: ieee80211: fix erroneous NSTR bitmap size checks)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next
+Already up to date.
+Merging wpan-next/master (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master
+Already up to date.
+Merging wpan-staging/staging (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call)
+$ git merge -m Merge branch 'staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging
+Already up to date.
+Merging mtd/mtd/next (259b4d4c1308 mtd: devices: docg3: Remove unnecessary (void*) conversions)
+$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next
+Merge made by the 'ort' strategy.
+ drivers/mtd/devices/docg3.c | 8 ++--
+ drivers/mtd/devices/spear_smi.c | 5 +--
+ drivers/mtd/devices/st_spi_fsm.c | 14 +------
+ drivers/mtd/lpddr/lpddr2_nvm.c | 4 +-
+ drivers/mtd/maps/lantiq-flash.c | 11 ++---
+ drivers/mtd/maps/physmap-core.c | 3 +-
+ drivers/mtd/maps/plat-ram.c | 3 +-
+ drivers/mtd/mtdcore.c | 88 +++++++++++++++++++++-------------------
+ drivers/mtd/mtdcore.h | 1 +
+ drivers/mtd/mtdpart.c | 14 ++++---
+ include/linux/mtd/mtd.h | 2 +-
+ 11 files changed, 70 insertions(+), 83 deletions(-)
+Merging nand/nand/next (2b42d718c7d7 dt-bindings: mtd: Fix nand-controller.yaml license)
+$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next
+Auto-merging drivers/mtd/nand/raw/meson_nand.c
+Auto-merging drivers/mtd/nand/spi/toshiba.c
+Merge made by the 'ort' strategy.
+ .../bindings/mtd/marvell,nand-controller.yaml | 1 +
+ .../devicetree/bindings/mtd/nand-controller.yaml | 2 +-
+ .../devicetree/bindings/mtd/oxnas-nand.txt | 41 -
+ drivers/mtd/nand/onenand/onenand_omap2.c | 12 +-
+ drivers/mtd/nand/onenand/onenand_samsung.c | 9 +-
+ drivers/mtd/nand/raw/Kconfig | 9 +-
+ drivers/mtd/nand/raw/Makefile | 1 -
+ drivers/mtd/nand/raw/atmel/nand-controller.c | 3 +-
+ drivers/mtd/nand/raw/brcmnand/brcmnand.c | 119 ++-
+ drivers/mtd/nand/raw/fsl_upm.c | 3 +-
+ drivers/mtd/nand/raw/lpc32xx_mlc.c | 3 +-
+ drivers/mtd/nand/raw/lpc32xx_slc.c | 3 +-
+ drivers/mtd/nand/raw/marvell_nand.c | 16 +
+ drivers/mtd/nand/raw/meson_nand.c | 26 +-
+ drivers/mtd/nand/raw/mxc_nand.c | 9 +-
+ drivers/mtd/nand/raw/nand_base.c | 1 +
+ drivers/mtd/nand/raw/omap2.c | 3 +-
+ drivers/mtd/nand/raw/oxnas_nand.c | 209 -----
+ drivers/mtd/nand/raw/qcom_nandc.c | 891 ++++++++++++---------
+ drivers/mtd/nand/raw/sh_flctl.c | 3 +-
+ drivers/mtd/nand/raw/stm32_fmc2_nand.c | 4 +-
+ drivers/mtd/nand/raw/sunxi_nand.c | 3 +-
+ drivers/mtd/nand/spi/esmt.c | 9 +
+ drivers/mtd/nand/spi/gigadevice.c | 20 +
+ drivers/mtd/nand/spi/toshiba.c | 33 +
+ include/linux/mtd/rawnand.h | 1 +
+ 26 files changed, 724 insertions(+), 710 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mtd/oxnas-nand.txt
+ delete mode 100644 drivers/mtd/nand/raw/oxnas_nand.c
+Merging spi-nor/spi-nor/next (4b0cb4e7ab2f dt-bindings: mtd: spi-nor: clarify the need for spi-nor compatibles)
+$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 21 +++++++++++++++++++--
+ drivers/mtd/spi-nor/core.c | 3 +++
+ drivers/mtd/spi-nor/core.h | 1 +
+ drivers/mtd/spi-nor/debugfs.c | 1 +
+ drivers/mtd/spi-nor/swp.c | 9 +++++++--
+ 5 files changed, 31 insertions(+), 4 deletions(-)
+Merging crypto/master (486bfb05913a crypto: akcipher - Do not copy dst if it is NULL)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master
+Already up to date.
+Merging drm/drm-next (6725f3322807 Merge tag 'drm-misc-next-fixes-2023-07-06' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
+$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next
+Already up to date.
+Merging drm-misc/for-linux-next (7dae503584a1 drm/ssd130x: Change pixel format used to compute the buffer size)
+$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next
+Auto-merging MAINTAINERS
+Auto-merging drivers/accel/ivpu/ivpu_drv.h
+Auto-merging drivers/accel/ivpu/ivpu_hw_mtl.c
+Auto-merging drivers/dma-buf/heaps/system_heap.c
+Auto-merging drivers/dma-buf/udmabuf.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+Auto-merging drivers/gpu/drm/drm_fbdev_dma.c
+Auto-merging drivers/gpu/drm/drm_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_driver.c
+Auto-merging drivers/gpu/drm/nouveau/dispnv50/disp.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c
+Auto-merging drivers/gpu/drm/panel/panel-simple.c
+Auto-merging drivers/gpu/drm/rockchip/inno_hdmi.c
+Auto-merging drivers/gpu/drm/rockchip/rk3066_hdmi.c
+Auto-merging drivers/gpu/drm/ttm/ttm_bo.c
+Auto-merging drivers/video/backlight/bd6107.c
+Auto-merging drivers/video/backlight/lv5207lp.c
+Auto-merging drivers/video/fbdev/broadsheetfb.c
+Auto-merging drivers/video/fbdev/metronomefb.c
+Auto-merging drivers/video/fbdev/sh7760fb.c
+Auto-merging include/linux/efi.h
+Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 59389a7ac7fd] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/panel/visionox,r66451.yaml | 59 ++
+ .../bindings/display/solomon,ssd1307fb.yaml | 28 +-
+ .../bindings/display/ti/ti,am65x-dss.yaml | 18 +-
+ Documentation/gpu/drm-mm.rst | 12 +
+ Documentation/gpu/todo.rst | 22 +-
+ MAINTAINERS | 20 +-
+ arch/arm/kernel/efi.c | 2 +
+ arch/arm64/kernel/efi.c | 1 +
+ arch/loongarch/kernel/efi.c | 1 +
+ arch/sh/boards/mach-ecovec24/setup.c | 2 +-
+ arch/sh/boards/mach-kfr2r09/setup.c | 2 +-
+ drivers/accel/ivpu/Makefile | 4 +-
+ drivers/accel/ivpu/ivpu_debugfs.c | 294 ++++++
+ drivers/accel/ivpu/ivpu_debugfs.h | 13 +
+ drivers/accel/ivpu/ivpu_drv.c | 16 +-
+ drivers/accel/ivpu/ivpu_drv.h | 1 +
+ drivers/accel/ivpu/ivpu_fw.c | 68 +-
+ drivers/accel/ivpu/ivpu_fw.h | 4 +
+ drivers/accel/ivpu/ivpu_fw_log.c | 142 +++
+ drivers/accel/ivpu/ivpu_fw_log.h | 38 +
+ drivers/accel/ivpu/ivpu_hw.h | 1 +
+ drivers/accel/ivpu/ivpu_hw_mtl.c | 19 +-
+ drivers/accel/ivpu/ivpu_job.c | 4 +-
+ drivers/accel/ivpu/ivpu_mmu.c | 14 +-
+ drivers/accel/ivpu/ivpu_mmu_context.c | 330 +++++--
+ drivers/accel/ivpu/ivpu_mmu_context.h | 9 +-
+ drivers/accel/ivpu/ivpu_pm.c | 1 +
+ drivers/accel/ivpu/ivpu_pm.h | 1 +
+ drivers/accel/qaic/qaic_drv.c | 1 -
+ drivers/dma-buf/dma-buf.c | 17 +-
+ drivers/dma-buf/heaps/cma_heap.c | 3 -
+ drivers/dma-buf/heaps/system_heap.c | 3 -
+ drivers/dma-buf/udmabuf.c | 2 -
+ drivers/firmware/efi/libstub/efi-stub-entry.c | 2 +
+ drivers/firmware/efi/libstub/screen_info.c | 2 +
+ drivers/gpu/drm/Kconfig | 9 +
+ drivers/gpu/drm/Makefile | 3 +
+ drivers/gpu/drm/amd/amdgpu/Kconfig | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 299 +++---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 73 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 211 ++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 78 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 79 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 84 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 24 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 7 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 49 +-
+ drivers/gpu/drm/arm/Kconfig | 1 +
+ drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 5 +-
+ drivers/gpu/drm/arm/hdlcd_drv.c | 5 +-
+ drivers/gpu/drm/arm/malidp_drv.c | 5 +-
+ drivers/gpu/drm/armada/armada_drv.c | 2 -
+ drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 6 +-
+ drivers/gpu/drm/ast/ast_dp501.c | 6 +-
+ drivers/gpu/drm/ast/ast_drv.h | 94 +-
+ drivers/gpu/drm/ast/ast_main.c | 333 ++++---
+ drivers/gpu/drm/ast/ast_mm.c | 2 -
+ drivers/gpu/drm/ast/ast_mode.c | 35 +-
+ drivers/gpu/drm/ast/ast_post.c | 74 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 6 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 77 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-j721e.c | 9 +-
+ .../gpu/drm/bridge/cadence/cdns-mhdp8546-j721e.h | 2 +-
+ drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 6 +-
+ drivers/gpu/drm/bridge/parade-ps8640.c | 79 --
+ drivers/gpu/drm/bridge/samsung-dsim.c | 2 +-
+ drivers/gpu/drm/bridge/sii902x.c | 40 +
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 35 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 28 +-
+ drivers/gpu/drm/bridge/tc358762.c | 63 +-
+ drivers/gpu/drm/bridge/tc358764.c | 14 +-
+ drivers/gpu/drm/bridge/tc358767.c | 25 +-
+ drivers/gpu/drm/bridge/ti-tfp410.c | 43 +
+ drivers/gpu/drm/display/drm_hdcp_helper.c | 4 +-
+ drivers/gpu/drm/drm_atomic_uapi.c | 58 +-
+ drivers/gpu/drm/drm_bridge_connector.c | 2 +-
+ drivers/gpu/drm/drm_connector.c | 8 +-
+ drivers/gpu/drm/drm_edid.c | 3 +-
+ drivers/gpu/drm/drm_exec.c | 333 +++++++
+ drivers/gpu/drm/drm_fbdev_dma.c | 6 +-
+ drivers/gpu/drm/drm_gem.c | 4 +-
+ drivers/gpu/drm/drm_gem_shmem_helper.c | 226 ++---
+ drivers/gpu/drm/drm_ioctl.c | 3 +-
+ drivers/gpu/drm/drm_mode_object.c | 4 +-
+ drivers/gpu/drm/drm_prime.c | 83 +-
+ drivers/gpu/drm/drm_sysfs.c | 23 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 3 -
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 -
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 6 +-
+ drivers/gpu/drm/gud/gud_pipe.c | 2 +-
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 1 -
+ drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 6 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 5 +-
+ drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 1 +
+ drivers/gpu/drm/i2c/ch7006_drv.c | 2 +-
+ drivers/gpu/drm/i2c/sil164_drv.c | 2 +-
+ drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 -
+ drivers/gpu/drm/i915/i915_driver.c | 2 -
+ drivers/gpu/drm/ingenic/Kconfig | 2 +
+ drivers/gpu/drm/lima/lima_drv.c | 8 +-
+ drivers/gpu/drm/lima/lima_gem.c | 8 +-
+ drivers/gpu/drm/logicvc/logicvc_drm.c | 6 +-
+ drivers/gpu/drm/loongson/Kconfig | 17 +
+ drivers/gpu/drm/loongson/Makefile | 22 +
+ drivers/gpu/drm/loongson/loongson_device.c | 102 ++
+ drivers/gpu/drm/loongson/loongson_module.c | 33 +
+ drivers/gpu/drm/loongson/loongson_module.h | 12 +
+ drivers/gpu/drm/loongson/lsdc_benchmark.c | 133 +++
+ drivers/gpu/drm/loongson/lsdc_benchmark.h | 13 +
+ drivers/gpu/drm/loongson/lsdc_crtc.c | 1024 ++++++++++++++++++++
+ drivers/gpu/drm/loongson/lsdc_debugfs.c | 110 +++
+ drivers/gpu/drm/loongson/lsdc_drv.c | 456 +++++++++
+ drivers/gpu/drm/loongson/lsdc_drv.h | 388 ++++++++
+ drivers/gpu/drm/loongson/lsdc_gem.c | 311 ++++++
+ drivers/gpu/drm/loongson/lsdc_gem.h | 37 +
+ drivers/gpu/drm/loongson/lsdc_gfxpll.c | 199 ++++
+ drivers/gpu/drm/loongson/lsdc_gfxpll.h | 52 +
+ drivers/gpu/drm/loongson/lsdc_i2c.c | 179 ++++
+ drivers/gpu/drm/loongson/lsdc_i2c.h | 29 +
+ drivers/gpu/drm/loongson/lsdc_irq.c | 74 ++
+ drivers/gpu/drm/loongson/lsdc_irq.h | 16 +
+ drivers/gpu/drm/loongson/lsdc_output.h | 21 +
+ drivers/gpu/drm/loongson/lsdc_output_7a1000.c | 178 ++++
+ drivers/gpu/drm/loongson/lsdc_output_7a2000.c | 552 +++++++++++
+ drivers/gpu/drm/loongson/lsdc_pixpll.c | 481 +++++++++
+ drivers/gpu/drm/loongson/lsdc_pixpll.h | 86 ++
+ drivers/gpu/drm/loongson/lsdc_plane.c | 793 +++++++++++++++
+ drivers/gpu/drm/loongson/lsdc_probe.c | 56 ++
+ drivers/gpu/drm/loongson/lsdc_probe.h | 12 +
+ drivers/gpu/drm/loongson/lsdc_regs.h | 406 ++++++++
+ drivers/gpu/drm/loongson/lsdc_ttm.c | 591 +++++++++++
+ drivers/gpu/drm/loongson/lsdc_ttm.h | 99 ++
+ drivers/gpu/drm/mcde/mcde_drv.c | 6 +-
+ drivers/gpu/drm/mcde/mcde_dsi.c | 6 +-
+ drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 -
+ drivers/gpu/drm/meson/meson_drv.c | 6 +-
+ drivers/gpu/drm/meson/meson_dw_hdmi.c | 10 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +-
+ drivers/gpu/drm/msm/msm_drv.c | 3 -
+ drivers/gpu/drm/msm/msm_drv.h | 1 -
+ drivers/gpu/drm/msm/msm_gem.c | 8 +
+ drivers/gpu/drm/msm/msm_gem_prime.c | 15 -
+ drivers/gpu/drm/mxsfb/lcdif_drv.c | 6 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +-
+ drivers/gpu/drm/mxsfb/mxsfb_kms.c | 9 +
+ drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 29 +-
+ drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +-
+ drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | 6 +-
+ drivers/gpu/drm/nouveau/include/nvkm/core/os.h | 5 -
+ .../gpu/drm/nouveau/include/nvkm/engine/falcon.h | 2 +-
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 7 +-
+ drivers/gpu/drm/nouveau/nouveau_display.c | 17 +-
+ drivers/gpu/drm/nouveau/nouveau_dp.c | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 3 -
+ drivers/gpu/drm/nouveau/nouveau_encoder.h | 3 +-
+ drivers/gpu/drm/nouveau/nvif/mmu.c | 3 +
+ drivers/gpu/drm/nouveau/nvkm/core/intr.c | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/core/object.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/ce/ga100.c | 10 +
+ drivers/gpu/drm/nouveau/nvkm/engine/ce/ga102.c | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c | 32 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga100.c | 105 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.h | 6 +
+ drivers/gpu/drm/nouveau/nvkm/engine/fifo/uchan.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c | 15 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/ga102.c | 7 +
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 14 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 1 +
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.h | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h | 5 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c | 5 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/mpeg/priv.h | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/sw/base.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h | 4 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/sw/gf100.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/sw/nv10.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/engine/sw/priv.h | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c | 12 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga100.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga102.c | 9 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c | 17 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/gv100.c | 3 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 5 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | 2 +-
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramga102.c | 40 -
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp102.c | 30 +
+ drivers/gpu/drm/nouveau/nvkm/subdev/fb/tu102.c | 3 +-
+ drivers/gpu/drm/omapdrm/dss/dispc.c | 5 +-
+ drivers/gpu/drm/omapdrm/dss/dsi.c | 6 +-
+ drivers/gpu/drm/omapdrm/dss/dss.c | 6 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi4.c | 5 +-
+ drivers/gpu/drm/omapdrm/dss/hdmi5.c | 5 +-
+ drivers/gpu/drm/omapdrm/dss/venc.c | 5 +-
+ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 9 +-
+ drivers/gpu/drm/omapdrm/omap_drv.c | 8 +-
+ drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 -
+ drivers/gpu/drm/panel/Kconfig | 9 +
+ drivers/gpu/drm/panel/Makefile | 1 +
+ drivers/gpu/drm/panel/panel-edp.c | 1 +
+ drivers/gpu/drm/panel/panel-lvds.c | 6 +-
+ drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c | 3 +-
+ drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 6 +-
+ drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 6 +-
+ drivers/gpu/drm/panel/panel-simple.c | 6 +-
+ drivers/gpu/drm/panel/panel-visionox-r66451.c | 390 ++++++++
+ drivers/gpu/drm/panfrost/panfrost_drv.c | 15 +-
+ drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 6 +-
+ drivers/gpu/drm/panfrost/panfrost_mmu.c | 19 +-
+ drivers/gpu/drm/pl111/pl111_drv.c | 3 -
+ drivers/gpu/drm/qxl/qxl_drv.c | 2 -
+ drivers/gpu/drm/radeon/radeon_drv.c | 3 -
+ drivers/gpu/drm/renesas/rcar-du/rcar_cmm.c | 6 +-
+ drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 9 +-
+ drivers/gpu/drm/renesas/rcar-du/rcar_dw_hdmi.c | 6 +-
+ drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c | 6 +-
+ drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 6 +-
+ drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c | 6 +-
+ drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 6 +-
+ drivers/gpu/drm/rockchip/cdn-dp-core.c | 6 +-
+ drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 6 +-
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 6 +-
+ drivers/gpu/drm/rockchip/inno_hdmi.c | 6 +-
+ drivers/gpu/drm/rockchip/rk3066_hdmi.c | 6 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 9 +-
+ drivers/gpu/drm/rockchip/rockchip_lvds.c | 6 +-
+ drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 6 +-
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 6 +-
+ drivers/gpu/drm/solomon/ssd130x.c | 124 ++-
+ drivers/gpu/drm/solomon/ssd130x.h | 6 +
+ drivers/gpu/drm/sti/sti_compositor.c | 5 +-
+ drivers/gpu/drm/sti/sti_drv.c | 6 +-
+ drivers/gpu/drm/sti/sti_dvo.c | 5 +-
+ drivers/gpu/drm/sti/sti_hda.c | 5 +-
+ drivers/gpu/drm/sti/sti_hdmi.c | 6 +-
+ drivers/gpu/drm/sti/sti_hqvdp.c | 5 +-
+ drivers/gpu/drm/sti/sti_tvout.c | 5 +-
+ drivers/gpu/drm/stm/drv.c | 6 +-
+ drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 6 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.c | 6 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 6 +-
+ drivers/gpu/drm/sun4i/sun4i_frontend.c | 6 +-
+ drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 6 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.c | 6 +-
+ drivers/gpu/drm/sun4i/sun4i_tv.c | 6 +-
+ drivers/gpu/drm/sun4i/sun6i_drc.c | 6 +-
+ drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 6 +-
+ drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 6 +-
+ drivers/gpu/drm/sun4i/sun8i_mixer.c | 6 +-
+ drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 6 +-
+ drivers/gpu/drm/tegra/drm.c | 2 -
+ drivers/gpu/drm/tegra/gem.c | 2 -
+ drivers/gpu/drm/tests/Makefile | 3 +-
+ drivers/gpu/drm/tests/drm_exec_test.c | 159 +++
+ drivers/gpu/drm/tests/drm_framebuffer_test.c | 4 +-
+ drivers/gpu/drm/tidss/tidss_dispc.c | 57 +-
+ drivers/gpu/drm/tidss/tidss_dispc.h | 2 +
+ drivers/gpu/drm/tidss/tidss_drv.c | 7 +-
+ drivers/gpu/drm/tidss/tidss_encoder.c | 138 ++-
+ drivers/gpu/drm/tidss/tidss_encoder.h | 5 +-
+ drivers/gpu/drm/tidss/tidss_kms.c | 12 +-
+ drivers/gpu/drm/tilcdc/tilcdc_panel.c | 6 +-
+ drivers/gpu/drm/tiny/ofdrm.c | 6 +-
+ drivers/gpu/drm/tiny/simpledrm.c | 6 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 4 +-
+ drivers/gpu/drm/tve200/tve200_drv.c | 6 +-
+ drivers/gpu/drm/v3d/v3d_drv.c | 9 +-
+ drivers/gpu/drm/vc4/vc4_crtc.c | 5 +-
+ drivers/gpu/drm/vc4/vc4_dpi.c | 5 +-
+ drivers/gpu/drm/vc4/vc4_drv.c | 6 +-
+ drivers/gpu/drm/vc4/vc4_dsi.c | 6 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 5 +-
+ drivers/gpu/drm/vc4/vc4_hvs.c | 5 +-
+ drivers/gpu/drm/vc4/vc4_txp.c | 5 +-
+ drivers/gpu/drm/vc4/vc4_v3d.c | 5 +-
+ drivers/gpu/drm/vc4/vc4_vec.c | 5 +-
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 3 -
+ drivers/gpu/drm/virtio/virtgpu_submit.c | 30 +-
+ drivers/gpu/drm/vkms/vkms_composer.c | 10 +-
+ drivers/gpu/drm/vkms/vkms_drv.h | 4 +-
+ drivers/gpu/drm/vkms/vkms_formats.c | 149 ++-
+ drivers/gpu/drm/vkms/vkms_formats.h | 2 +-
+ drivers/gpu/drm/vkms/vkms_writeback.c | 9 +-
+ drivers/gpu/drm/xen/xen_drm_front.c | 3 -
+ drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 6 +-
+ .../media/common/videobuf2/videobuf2-dma-contig.c | 3 -
+ drivers/media/common/videobuf2/videobuf2-dma-sg.c | 3 -
+ drivers/media/common/videobuf2/videobuf2-vmalloc.c | 3 -
+ drivers/staging/fbtft/Kconfig | 1 +
+ drivers/staging/sm750fb/sm750.c | 1 -
+ drivers/staging/sm750fb/sm750_accel.c | 1 -
+ drivers/staging/sm750fb/sm750_cursor.c | 1 -
+ drivers/staging/sm750fb/sm750_hw.c | 1 -
+ drivers/video/backlight/bd6107.c | 2 +-
+ drivers/video/backlight/gpio_backlight.c | 6 +-
+ drivers/video/backlight/lv5207lp.c | 2 +-
+ drivers/video/fbdev/Kconfig | 44 +-
+ drivers/video/fbdev/aty/aty128fb.c | 12 +-
+ drivers/video/fbdev/aty/atyfb_base.c | 18 +-
+ drivers/video/fbdev/aty/radeon_backlight.c | 2 +-
+ drivers/video/fbdev/aty/radeon_base.c | 3 +-
+ drivers/video/fbdev/broadsheetfb.c | 80 +-
+ drivers/video/fbdev/core/Makefile | 7 +-
+ drivers/video/fbdev/core/fb_backlight.c | 33 +
+ drivers/video/fbdev/core/fb_chrdev.c | 485 +++++++++
+ drivers/video/fbdev/core/fb_info.c | 78 ++
+ drivers/video/fbdev/core/fb_internal.h | 67 ++
+ drivers/video/fbdev/core/fb_procfs.c | 62 ++
+ drivers/video/fbdev/core/fbcon.c | 1 +
+ drivers/video/fbdev/core/fbmem.c | 592 +----------
+ drivers/video/fbdev/core/fbsysfs.c | 138 +--
+ drivers/video/fbdev/ep93xx-fb.c | 21 +-
+ drivers/video/fbdev/fsl-diu-fb.c | 26 +-
+ drivers/video/fbdev/hecubafb.c | 78 +-
+ drivers/video/fbdev/hyperv_fb.c | 1 +
+ drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 9 +-
+ drivers/video/fbdev/metronomefb.c | 76 +-
+ drivers/video/fbdev/nvidia/nv_backlight.c | 2 +-
+ drivers/video/fbdev/nvidia/nvidia.c | 8 +-
+ drivers/video/fbdev/omap2/omapfb/Kconfig | 2 +-
+ drivers/video/fbdev/pxa168fb.c | 2 +-
+ drivers/video/fbdev/riva/fbdev.c | 10 +-
+ drivers/video/fbdev/sh7760fb.c | 50 +-
+ drivers/video/fbdev/sm501fb.c | 2 +-
+ drivers/video/fbdev/sm712fb.c | 9 +-
+ drivers/video/fbdev/smscufx.c | 4 +-
+ drivers/video/fbdev/ssd1307fb.c | 69 +-
+ drivers/video/fbdev/tdfxfb.c | 4 +-
+ drivers/video/fbdev/xen-fbfront.c | 61 +-
+ include/drm/bridge/dw_hdmi.h | 2 +
+ include/drm/drm_drv.h | 26 +-
+ include/drm/drm_exec.h | 123 +++
+ include/drm/drm_gem_dma_helper.h | 14 +-
+ include/drm/drm_gem_shmem_helper.h | 19 +-
+ include/drm/drm_gem_vram_helper.h | 9 +-
+ include/drm/drm_prime.h | 7 -
+ include/drm/drm_sysfs.h | 4 +-
+ include/linux/efi.h | 3 +-
+ include/linux/fb.h | 6 +-
+ include/linux/platform_data/bd6107.h | 2 +-
+ include/linux/platform_data/gpio_backlight.h | 2 +-
+ include/linux/platform_data/lv5207lp.h | 2 +-
+ include/linux/sysfb.h | 3 +-
+ include/uapi/drm/drm_mode.h | 4 +-
+ 370 files changed, 11492 insertions(+), 3333 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/panel/visionox,r66451.yaml
+ create mode 100644 drivers/accel/ivpu/ivpu_debugfs.c
+ create mode 100644 drivers/accel/ivpu/ivpu_debugfs.h
+ create mode 100644 drivers/accel/ivpu/ivpu_fw_log.c
+ create mode 100644 drivers/accel/ivpu/ivpu_fw_log.h
+ create mode 100644 drivers/gpu/drm/drm_exec.c
+ create mode 100644 drivers/gpu/drm/loongson/Kconfig
+ create mode 100644 drivers/gpu/drm/loongson/Makefile
+ create mode 100644 drivers/gpu/drm/loongson/loongson_device.c
+ create mode 100644 drivers/gpu/drm/loongson/loongson_module.c
+ create mode 100644 drivers/gpu/drm/loongson/loongson_module.h
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_benchmark.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_benchmark.h
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_crtc.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_debugfs.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_drv.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_drv.h
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_gem.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_gem.h
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_gfxpll.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_gfxpll.h
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_i2c.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_i2c.h
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_irq.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_irq.h
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_output.h
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_output_7a1000.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_output_7a2000.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_pixpll.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_pixpll.h
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_plane.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_probe.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_probe.h
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_regs.h
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_ttm.c
+ create mode 100644 drivers/gpu/drm/loongson/lsdc_ttm.h
+ delete mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramga102.c
+ create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp102.c
+ create mode 100644 drivers/gpu/drm/panel/panel-visionox-r66451.c
+ create mode 100644 drivers/gpu/drm/tests/drm_exec_test.c
+ create mode 100644 drivers/video/fbdev/core/fb_backlight.c
+ create mode 100644 drivers/video/fbdev/core/fb_chrdev.c
+ create mode 100644 drivers/video/fbdev/core/fb_info.c
+ create mode 100644 drivers/video/fbdev/core/fb_internal.h
+ create mode 100644 drivers/video/fbdev/core/fb_procfs.c
+ create mode 100644 include/drm/drm_exec.h
+Merging amdgpu/drm-next (093b21f43173 Revert "drm/amdgpu: update kernel vcn ring test")
+$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+Auto-merging drivers/gpu/drm/radeon/radeon_atombios.c
+Merge made by the 'ort' strategy.
+ Documentation/gpu/amdgpu/flashing.rst | 33 ++++
+ Documentation/gpu/amdgpu/index.rst | 1 +
+ drivers/gpu/drm/amd/amdgpu/Makefile | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 50 ++++++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 8 +-
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.h | 27 +++
+ .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c | 167 ++++++++++++++++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.h | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 17 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 10 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 32 ++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 158 ++++++++--------
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 23 +--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 28 ++-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 21 +--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 8 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 59 ++++++
+ .../{aqua_vanjaram_reg_init.c => aqua_vanjaram.c} | 0
+ drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 200 ++++++++++-----------
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 34 ++--
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 74 ++++----
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 7 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 38 ++--
+ drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 33 ++--
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 52 +++---
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 54 +++---
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 87 ++++-----
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 40 ++---
+ drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 4 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 11 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 9 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_debug.h | 5 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 23 ++-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 22 ++-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 22 ++-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 36 +++-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 3 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 8 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 15 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 3 +
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 183 ++++++++++---------
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 6 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 12 ++
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 14 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 42 +++--
+ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 1 +
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 4 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 11 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dc.h | 8 +-
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 9 +
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 25 ++-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 4 +-
+ drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.h | 3 +
+ drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 3 +-
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_optc.c | 185 +++++++++++++++++++
+ .../gpu/drm/amd/display/dc/dcn301/dcn301_optc.h | 36 ++++
+ .../drm/amd/display/dc/dcn301/dcn301_resource.c | 4 +-
+ .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 2 +-
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 9 +-
+ drivers/gpu/drm/amd/pm/amdgpu_pm.c | 3 +-
+ .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 14 +-
+ drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 4 +
+ drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 +-
+ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 91 ++--------
+ drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 2 +-
+ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 48 +++++
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 35 +---
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 2 +-
+ .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 33 +---
+ drivers/gpu/drm/radeon/atom.c | 14 +-
+ drivers/gpu/drm/radeon/radeon_atombios.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_kms.c | 10 +-
+ drivers/gpu/drm/radeon/radeon_test.c | 8 +-
+ drivers/gpu/drm/radeon/rv770.c | 33 ++--
+ 105 files changed, 1554 insertions(+), 873 deletions(-)
+ create mode 100644 Documentation/gpu/amdgpu/flashing.rst
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.h
+ rename drivers/gpu/drm/amd/amdgpu/{aqua_vanjaram_reg_init.c => aqua_vanjaram.c} (100%)
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_optc.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn301/dcn301_optc.h
+Merging drm-intel/for-linux-next (290d16104575 Revert "drm/i915: use localized __diag_ignore_all() instead of per file")
+$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next
+Auto-merging drivers/gpu/drm/i915/display/intel_cx0_phy.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display.c
+Auto-merging drivers/gpu/drm/i915/display/intel_display_power.h
+Auto-merging drivers/gpu/drm/i915/display/intel_display_power_well.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power_well.h
+Auto-merging drivers/gpu/drm/i915/display/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_hdcp.c
+Auto-merging drivers/gpu/drm/i915/display/intel_psr.c
+Auto-merging drivers/gpu/drm/i915/display/intel_psr_regs.h
+Auto-merging drivers/gpu/drm/i915/gt/uc/intel_huc.c
+Auto-merging drivers/gpu/drm/i915/i915_driver.c
+Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c
+Auto-merging drivers/gpu/drm/i915/selftests/mock_gem_device.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/selftests/mock_gem_device.c
+Resolved 'drivers/gpu/drm/i915/display/intel_display_power_well.h' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/selftests/mock_gem_device.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 5163c27db1b0] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel
+$ git diff -M --stat --summary HEAD^..
+ Documentation/gpu/rfc/i915_scheduler.rst | 4 +
+ drivers/gpu/drm/i915/Makefile | 5 +
+ drivers/gpu/drm/i915/display/g4x_dp.c | 8 +
+ drivers/gpu/drm/i915/display/g4x_hdmi.c | 23 ++-
+ drivers/gpu/drm/i915/display/icl_dsi.c | 134 +++++++------
+ drivers/gpu/drm/i915/display/icl_dsi.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_bios.c | 188 +++++--------------
+ drivers/gpu/drm/i915/display/intel_bios.h | 6 +
+ drivers/gpu/drm/i915/display/intel_cdclk.c | 12 +-
+ drivers/gpu/drm/i915/display/intel_crt.c | 2 +
+ drivers/gpu/drm/i915/display/intel_cx0_phy.c | 13 +-
+ drivers/gpu/drm/i915/display/intel_cx0_phy.h | 3 -
+ drivers/gpu/drm/i915/display/intel_ddi.c | 106 +++++++++--
+ drivers/gpu/drm/i915/display/intel_ddi.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 28 ++-
+ drivers/gpu/drm/i915/display/intel_display.c | 104 ++---------
+ drivers/gpu/drm/i915/display/intel_display.h | 4 +-
+ drivers/gpu/drm/i915/display/intel_display_core.h | 11 +-
+ .../gpu/drm/i915/display/intel_display_device.c | 192 +++++++++++++------
+ .../gpu/drm/i915/display/intel_display_device.h | 6 +
+ drivers/gpu/drm/i915/display/intel_display_irq.c | 18 +-
+ drivers/gpu/drm/i915/display/intel_display_power.c | 47 +++--
+ drivers/gpu/drm/i915/display/intel_display_power.h | 29 ++-
+ .../drm/i915/display/intel_display_power_well.h | 1 -
+ drivers/gpu/drm/i915/display/intel_dp.c | 13 +-
+ drivers/gpu/drm/i915/display/intel_dp_aux.c | 53 +++++-
+ drivers/gpu/drm/i915/display/intel_dp_aux.h | 3 +
+ drivers/gpu/drm/i915/display/intel_dsi.c | 20 ++
+ drivers/gpu/drm/i915/display/intel_dsi.h | 2 +
+ drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +-
+ drivers/gpu/drm/i915/display/intel_dvo.c | 2 +
+ drivers/gpu/drm/i915/display/intel_fbdev.c | 5 -
+ drivers/gpu/drm/i915/display/intel_hdcp.c | 5 +-
+ drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 80 ++++----
+ drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 3 +-
+ drivers/gpu/drm/i915/display/intel_hdmi.c | 72 +++++--
+ drivers/gpu/drm/i915/display/intel_hotplug.c | 14 +-
+ drivers/gpu/drm/i915/display/intel_psr.c | 196 +++++++++++++++----
+ drivers/gpu/drm/i915/display/intel_psr_regs.h | 16 ++
+ drivers/gpu/drm/i915/display/intel_qp_tables.c | 10 +-
+ drivers/gpu/drm/i915/display/intel_sdvo.c | 20 +-
+ drivers/gpu/drm/i915/display/intel_vdsc.c | 208 ++++++++++++++-------
+ drivers/gpu/drm/i915/display/intel_vdsc.h | 1 +
+ drivers/gpu/drm/i915/display/vlv_dsi.c | 23 ---
+ .../gpu/drm/i915/gt/intel_execlists_submission.c | 6 +-
+ drivers/gpu/drm/i915/gt/intel_gt.c | 2 +-
+ drivers/gpu/drm/i915/gt/intel_gt_irq.c | 8 +-
+ drivers/gpu/drm/i915/gt/intel_sa_media.c | 2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 2 +-
+ drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 1 +
+ drivers/gpu/drm/i915/i915_driver.c | 2 +
+ drivers/gpu/drm/i915/i915_drv.h | 11 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 6 +
+ drivers/gpu/drm/i915/i915_gpu_error.h | 3 +
+ drivers/gpu/drm/i915/i915_irq.c | 20 +-
+ drivers/gpu/drm/i915/i915_pci.c | 69 ++++---
+ drivers/gpu/drm/i915/intel_clock_gating.c | 11 ++
+ drivers/gpu/drm/i915/intel_device_info.c | 48 ++---
+ drivers/gpu/drm/i915/intel_device_info.h | 11 +-
+ drivers/gpu/drm/i915/intel_uncore.h | 5 +
+ drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 +-
+ drivers/gpu/drm/i915/selftests/mock_gem_device.c | 4 +-
+ drivers/gpu/drm/i915/soc/intel_dram.c | 2 +-
+ drivers/gpu/drm/i915/soc/intel_gmch.c | 4 +-
+ 65 files changed, 1211 insertions(+), 712 deletions(-)
+Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow)
+$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next
+Already up to date.
+Merging drm-msm/msm-next (cd036d542afb drm/msm/a6xx: Add A610 speedbin support)
+$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next
+Already up to date.
+Merging drm-msm-lumag/msm-next-lumag (1275b21a6c54 drm/msm/dsi: Enable BURST_MODE for command mode for DSI 6G v1.3+)
+$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag
+Auto-merging drivers/gpu/drm/msm/msm_drv.c
+Auto-merging drivers/gpu/drm/msm/msm_drv.h
+Merge made by the 'ort' strategy.
+ .../bindings/display/msm/dp-controller.yaml | 1 +
+ .../bindings/display/msm/dsi-controller-main.yaml | 6 +
+ .../bindings/display/msm/dsi-phy-14nm.yaml | 11 +
+ .../bindings/display/msm/qcom,sc7180-dpu.yaml | 14 +
+ .../bindings/display/msm/qcom,sm6125-mdss.yaml | 217 +++++++++
+ .../bindings/display/msm/qcom,sm8350-mdss.yaml | 6 +
+ .../bindings/display/msm/qcom,sm8450-mdss.yaml | 8 +
+ .../bindings/display/msm/qcom,sm8550-mdss.yaml | 8 +
+ .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 327 +++++++++-----
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 348 ++++++++++-----
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 411 +++++++++++------
+ .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 448 +++++++++++++------
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 230 ++++++++++
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 430 ++++++++++++------
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 184 +++++---
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 88 ++--
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 188 +++++---
+ .../drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 88 ++--
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 95 ++--
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 418 ++++++++++++------
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 244 +++++++----
+ .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 484 +++++++++++++++------
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 445 +++++++++++++------
+ .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 467 ++++++++++++++------
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 44 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 2 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 229 +++-------
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 6 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 5 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 34 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h | 7 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 82 +++-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 34 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 +-
+ drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 2 +-
+ drivers/gpu/drm/msm/dsi/dsi_cfg.c | 2 +
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 7 +
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 +
+ drivers/gpu/drm/msm/msm_drv.c | 42 +-
+ drivers/gpu/drm/msm/msm_drv.h | 10 +-
+ drivers/gpu/drm/msm/msm_mdss.c | 8 +
+ 42 files changed, 4008 insertions(+), 1678 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6125-mdss.yaml
+ create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h
+Merging etnaviv/etnaviv/next (295b6c02f84b drm/etnaviv: slow down FE idle polling)
+$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c
+Merge made by the 'ort' strategy.
+ drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 11 ++++++-----
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +++-
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 8 ++++++++
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 1 +
+ 4 files changed, 18 insertions(+), 6 deletions(-)
+Merging fbdev/for-next (53a90ae81a33 fbdev: imxfb: remove unneeded labels)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next
+Merge made by the 'ort' strategy.
+ drivers/video/fbdev/imxfb.c | 48 +++++++++++++++++----------------------------
+ 1 file changed, 18 insertions(+), 30 deletions(-)
+Merging regmap/for-next (c9a823624863 Merge remote-tracking branch 'regmap/for-6.6' into regmap-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
+Merge made by the 'ort' strategy.
+ drivers/base/regmap/Kconfig | 12 ++-
+ drivers/base/regmap/regcache.c | 15 ----
+ drivers/base/regmap/regmap-mmio.c | 24 ------
+ drivers/base/regmap/regmap.c | 122 ---------------------------
+ tools/testing/kunit/configs/all_tests.config | 2 +
+ 5 files changed, 13 insertions(+), 162 deletions(-)
+Merging sound/for-next (67192cc0f026 ALSA: emu10k1: remove superfluous IRQ enable state saving)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
+Merge made by the 'ort' strategy.
+ include/sound/emu10k1.h | 4 +--
+ sound/pci/emu10k1/emu10k1.c | 8 +----
+ sound/pci/emu10k1/emu10k1_main.c | 56 ++++++++++++++++++---------------
+ sound/pci/emu10k1/emu10k1_synth.c | 10 +++---
+ sound/pci/emu10k1/emumixer.c | 52 ++++++++++++++----------------
+ sound/pci/emu10k1/emumpu401.c | 40 ++++++++++-------------
+ sound/pci/emu10k1/emupcm.c | 6 ++--
+ sound/pci/emu10k1/emuproc.c | 10 +++---
+ sound/pci/emu10k1/io.c | 2 ++
+ sound/pci/emu10k1/irq.c | 7 +++++
+ tools/testing/selftests/alsa/pcm-test.c | 8 +++--
+ 11 files changed, 97 insertions(+), 106 deletions(-)
+Merging ieee1394/for-next (06c2afb862f9 Linux 6.5-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 (3acd333049b8 Merge remote-tracking branch 'asoc/for-6.6' into asoc-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
+Merge made by the 'ort' strategy.
+ Documentation/core-api/kernel-api.rst | 7 +-
+ .../devicetree/bindings/sound/audio-iio-aux.yaml | 64 ++++
+ .../bindings/sound/mediatek,mt8188-afe.yaml | 7 +
+ .../devicetree/bindings/sound/nau8821.txt | 55 ----
+ .../devicetree/bindings/sound/nuvoton,nau8821.yaml | 125 ++++++++
+ .../bindings/sound/qcom,msm8916-wcd-analog.txt | 101 ------
+ .../sound/qcom,pm8916-wcd-analog-codec.yaml | 160 ++++++++++
+ .../devicetree/bindings/sound/simple-card.yaml | 53 ++++
+ Documentation/driver-api/media/dtv-common.rst | 9 -
+ drivers/iio/inkern.c | 86 ++++-
+ drivers/media/dvb-core/Makefile | 2 +-
+ drivers/media/dvb-frontends/af9013_priv.h | 2 +-
+ drivers/media/dvb-frontends/af9033_priv.h | 2 +-
+ drivers/media/dvb-frontends/cxd2820r_priv.h | 2 +-
+ drivers/media/dvb-frontends/cxd2841er.c | 2 +-
+ .../cxd2880/cxd2880_tnrdmd_dvbt2_mon.c | 2 +-
+ .../cxd2880/cxd2880_tnrdmd_dvbt_mon.c | 2 +-
+ drivers/media/dvb-frontends/cxd2880/cxd2880_top.c | 2 +-
+ drivers/media/dvb-frontends/dib7000p.c | 2 +-
+ drivers/media/dvb-frontends/dib8000.c | 2 +-
+ drivers/media/dvb-frontends/dib9000.c | 2 +-
+ drivers/media/dvb-frontends/drxk_hard.c | 2 +-
+ drivers/media/dvb-frontends/lgdt3305.c | 2 +-
+ drivers/media/dvb-frontends/lgdt3306a.c | 2 +-
+ drivers/media/dvb-frontends/lgdt330x.c | 2 +-
+ drivers/media/dvb-frontends/m88ds3103_priv.h | 2 +-
+ drivers/media/dvb-frontends/mn88443x.c | 2 +-
+ drivers/media/dvb-frontends/mn88472_priv.h | 2 +-
+ drivers/media/dvb-frontends/mn88473_priv.h | 2 +-
+ drivers/media/dvb-frontends/or51132.c | 2 +-
+ drivers/media/dvb-frontends/or51211.c | 2 +-
+ drivers/media/dvb-frontends/rtl2830_priv.h | 2 +-
+ drivers/media/dvb-frontends/rtl2832_priv.h | 2 +-
+ drivers/media/dvb-frontends/si2165.c | 2 +-
+ drivers/media/dvb-frontends/stv0367.c | 2 +-
+ drivers/media/dvb-frontends/tc90522.c | 2 +-
+ drivers/media/dvb-frontends/tda10048.c | 2 +-
+ include/linux/iio/consumer.h | 37 ++-
+ include/{media/dvb_math.h => linux/int_log.h} | 18 +-
+ include/linux/minmax.h | 64 ++++
+ include/sound/soc-dapm.h | 138 +++++---
+ lib/math/Makefile | 2 +-
+ .../dvb-core/dvb_math.c => lib/math/int_log.c | 26 +-
+ sound/soc/amd/Kconfig | 5 +-
+ sound/soc/amd/acp-config.c | 33 ++
+ sound/soc/amd/acp/Kconfig | 7 +
+ sound/soc/amd/acp/Makefile | 2 +
+ sound/soc/amd/acp/acp-i2s.c | 2 +
+ sound/soc/amd/acp/acp-legacy-common.c | 347 +++++++++++++++++++++
+ sound/soc/amd/acp/acp-mach-common.c | 267 ++++++++++++++++
+ sound/soc/amd/acp/acp-mach.h | 2 +
+ sound/soc/amd/acp/acp-pci.c | 57 +++-
+ sound/soc/amd/acp/acp-pdm.c | 13 +-
+ sound/soc/amd/acp/acp-platform.c | 6 +-
+ sound/soc/amd/acp/acp-rembrandt.c | 186 ++++-------
+ sound/soc/amd/acp/acp-renoir.c | 115 +------
+ sound/soc/amd/acp/acp-sof-mach.c | 16 +
+ sound/soc/amd/acp/amd.h | 51 +++
+ sound/soc/amd/mach-config.h | 1 +
+ sound/soc/amd/ps/ps-sdw-dma.c | 5 +-
+ sound/soc/amd/vangogh/acp5x-mach.c | 149 +++++++--
+ sound/soc/codecs/Kconfig | 13 +
+ sound/soc/codecs/Makefile | 2 +
+ sound/soc/codecs/ad1836.c | 2 +-
+ sound/soc/codecs/ad1980.c | 2 +-
+ sound/soc/codecs/adau1372.c | 2 +-
+ sound/soc/codecs/adau1373.c | 2 +-
+ sound/soc/codecs/adau1701.c | 2 +-
+ sound/soc/codecs/adau1761.c | 2 +-
+ sound/soc/codecs/adau1781.c | 2 +-
+ sound/soc/codecs/adau1977.c | 2 +-
+ sound/soc/codecs/adau7118-i2c.c | 2 +-
+ sound/soc/codecs/adav80x.c | 2 +-
+ sound/soc/codecs/audio-iio-aux.c | 344 ++++++++++++++++++++
+ sound/soc/codecs/es8316.c | 5 +-
+ sound/soc/codecs/nau8825.c | 93 +-----
+ sound/soc/codecs/rt5645.c | 50 +++
+ sound/soc/codecs/rt5677.c | 121 +++----
+ sound/soc/codecs/rt5677.h | 92 +-----
+ sound/soc/codecs/rt722-sdca-sdw.c | 2 +-
+ sound/soc/codecs/rt722-sdca.c | 3 +-
+ sound/soc/codecs/tas2781-i2c.c | 1 -
+ sound/soc/dwc/dwc-i2s.c | 65 +++-
+ sound/soc/dwc/dwc-pcm.c | 8 +-
+ sound/soc/dwc/local.h | 24 ++
+ sound/soc/fsl/imx-pcm-rpmsg.c | 12 +-
+ sound/soc/generic/simple-card.c | 46 ++-
+ sound/soc/intel/avs/board_selection.c | 16 +
+ sound/soc/intel/avs/boards/Kconfig | 20 ++
+ sound/soc/intel/avs/boards/Makefile | 4 +
+ sound/soc/intel/avs/boards/es8336.c | 315 +++++++++++++++++++
+ sound/soc/intel/avs/boards/rt5663.c | 254 +++++++++++++++
+ sound/soc/intel/avs/boards/rt5682.c | 67 ++--
+ sound/soc/intel/boards/Kconfig | 5 +-
+ sound/soc/intel/boards/sof_rt5682.c | 80 ++++-
+ sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 12 +
+ sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 8 +-
+ sound/soc/qcom/qdsp6/q6apm.c | 2 +-
+ sound/soc/soc-core.c | 144 +++++----
+ sound/soc/sof/amd/acp.c | 36 +--
+ sound/soc/sof/amd/acp.h | 4 +-
+ sound/soc/starfive/jh7110_tdm.c | 5 +-
+ 102 files changed, 3169 insertions(+), 974 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/audio-iio-aux.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/nau8821.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8821.yaml
+ delete mode 100644 Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/qcom,pm8916-wcd-analog-codec.yaml
+ rename include/{media/dvb_math.h => linux/int_log.h} (63%)
+ rename drivers/media/dvb-core/dvb_math.c => lib/math/int_log.c (84%)
+ create mode 100644 sound/soc/amd/acp/acp-legacy-common.c
+ create mode 100644 sound/soc/codecs/audio-iio-aux.c
+ create mode 100644 sound/soc/intel/avs/boards/es8336.c
+ create mode 100644 sound/soc/intel/avs/boards/rt5663.c
+Merging modules/modules-next (9ce170cef669 kernel: params: Remove unnecessary ‘0’ values from err)
+$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next
+Merge made by the 'ort' strategy.
+ include/linux/module_symbol.h | 12 +++++++++++-
+ kernel/module/kallsyms.c | 2 +-
+ kernel/params.c | 2 +-
+ scripts/mod/modpost.c | 2 +-
+ 4 files changed, 14 insertions(+), 4 deletions(-)
+Merging input/next (677232f879f2 Input: iqs7211 - point to match data directly)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
+Auto-merging drivers/input/joystick/xpad.c
+Auto-merging drivers/input/misc/Kconfig
+Auto-merging drivers/input/touchscreen/exc3000.c
+Auto-merging drivers/input/touchscreen/goodix.c
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/input/azoteq,iqs7222.yaml | 248 +-
+ .../bindings/input/touchscreen/azoteq,iqs7211.yaml | 769 ++++++
+ .../bindings/input/touchscreen/edt-ft5x06.yaml | 6 +
+ .../bindings/input/touchscreen/eeti,exc3000.yaml | 2 +
+ drivers/input/gameport/Kconfig | 4 +-
+ drivers/input/gameport/gameport.c | 26 +-
+ drivers/input/joystick/xpad.c | 25 +
+ drivers/input/keyboard/adp5588-keys.c | 17 +-
+ drivers/input/keyboard/bcm-keypad.c | 24 +-
+ drivers/input/keyboard/gpio_keys_polled.c | 8 +-
+ drivers/input/keyboard/lpc32xx-keys.c | 9 +-
+ drivers/input/keyboard/nomadik-ske-keypad.c | 127 +-
+ drivers/input/keyboard/nspire-keypad.c | 3 +-
+ drivers/input/keyboard/omap4-keypad.c | 9 +-
+ drivers/input/keyboard/opencores-kbd.c | 9 +-
+ drivers/input/keyboard/pinephone-keyboard.c | 20 +-
+ drivers/input/keyboard/pxa27x_keypad.c | 9 +-
+ drivers/input/keyboard/sun4i-lradc-keys.c | 3 +-
+ drivers/input/keyboard/tegra-kbc.c | 2 +-
+ drivers/input/misc/Kconfig | 4 +-
+ drivers/input/misc/gpio-vibra.c | 20 +-
+ drivers/input/misc/iqs7222.c | 476 +++-
+ drivers/input/misc/pwm-beeper.c | 19 +-
+ drivers/input/misc/pwm-vibra.c | 30 +-
+ drivers/input/misc/rotary_encoder.c | 9 +-
+ drivers/input/mouse/elan_i2c_core.c | 9 +-
+ drivers/input/touchscreen/Kconfig | 14 +-
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/bu21013_ts.c | 72 +-
+ drivers/input/touchscreen/bu21029_ts.c | 51 +-
+ drivers/input/touchscreen/chipone_icn8318.c | 8 +-
+ drivers/input/touchscreen/cy8ctma140.c | 8 +-
+ drivers/input/touchscreen/edt-ft5x06.c | 10 +-
+ drivers/input/touchscreen/ektf2127.c | 8 +-
+ drivers/input/touchscreen/elants_i2c.c | 22 +-
+ drivers/input/touchscreen/exc3000.c | 7 +
+ drivers/input/touchscreen/goodix.c | 40 +-
+ drivers/input/touchscreen/iqs7211.c | 2557 ++++++++++++++++++++
+ drivers/input/touchscreen/lpc32xx_ts.c | 98 +-
+ drivers/input/touchscreen/melfas_mip4.c | 9 +-
+ drivers/input/touchscreen/novatek-nvt-ts.c | 10 +-
+ drivers/input/touchscreen/pixcir_i2c_ts.c | 38 +-
+ drivers/input/touchscreen/raydium_i2c_ts.c | 30 +-
+ drivers/input/touchscreen/resistive-adc-touch.c | 8 +-
+ drivers/input/touchscreen/silead.c | 8 +-
+ drivers/input/touchscreen/sis_i2c.c | 20 +-
+ drivers/input/touchscreen/surface3_spi.c | 13 +-
+ drivers/input/touchscreen/sx8654.c | 10 +-
+ include/linux/gameport.h | 2 +-
+ 49 files changed, 4309 insertions(+), 622 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/azoteq,iqs7211.yaml
+ create mode 100644 drivers/input/touchscreen/iqs7211.c
+Merging block/for-next (cfd18f91a154 Merge branch 'for-6.6/block' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/sysctl/kernel.rst | 19 ++++++++
+ drivers/block/nbd.c | 1 +
+ include/trace/events/kyber.h | 8 +--
+ include/trace/events/wbt.h | 8 +--
+ include/uapi/linux/io_uring.h | 8 ++-
+ io_uring/cancel.c | 76 ++++++++++++++++++++---------
+ io_uring/cancel.h | 3 +-
+ io_uring/io_uring.c | 31 ++++++++++++
+ io_uring/poll.c | 17 +++----
+ io_uring/timeout.c | 16 ++----
+ 10 files changed, 134 insertions(+), 53 deletions(-)
+Merging device-mapper/for-next (7aa303bf1bd2 dm raid: protect md_stop() with 'reconfig_mutex')
+$ git merge -m Merge branch 'for-next' of git://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-integrity.c | 1 +
+ drivers/md/dm-raid.c | 20 +++++++++-----------
+ drivers/md/md.c | 2 ++
+ 3 files changed, 12 insertions(+), 11 deletions(-)
+Merging libata/for-next (fd3ac6e80497 dt-bindings: phy: rockchip: rk3588 has two reset lines)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next
+Already up to date.
+Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver)
+$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
+Already up to date.
+Merging mmc/next (9289a19bce21 mmc: pxamci: Use devm_platform_get_and_ioremap_resource())
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 10 ----
+ drivers/mmc/host/meson-gx-mmc.c | 3 --
+ drivers/mmc/host/mmci.c | 39 ++++++++++++---
+ drivers/mmc/host/mxcmmc.c | 3 +-
+ drivers/mmc/host/omap_hsmmc.c | 5 +-
+ drivers/mmc/host/pxamci.c | 5 +-
+ drivers/mmc/host/renesas_sdhi_core.c | 22 +++++----
+ drivers/mmc/host/sdhci_f_sdh30.c | 60 ++++++++++-------------
+ drivers/mmc/host/sunplus-mmc.c | 16 ++++--
+ 9 files changed, 87 insertions(+), 76 deletions(-)
+Merging mfd/for-mfd-next (b90e33b6116a mfd: wm8998: Update to use maple tree register cache)
+$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next
+Merge made by the 'ort' strategy.
+ .../devicetree/bindings/input/stmpe-keypad.txt | 41 ---
+ .../bindings/input/touchscreen/stmpe.txt | 108 --------
+ .../devicetree/bindings/mfd/atmel-hlcdc.txt | 1 +
+ .../bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml | 4 +-
+ .../bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml | 4 +-
+ .../bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml | 4 +-
+ .../bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml | 4 +-
+ .../bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml | 4 +-
+ .../bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml | 4 +-
+ .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 4 +-
+ .../devicetree/bindings/mfd/st,stmpe.yaml | 297 +++++++++++++++++++++
+ Documentation/devicetree/bindings/mfd/stmpe.txt | 42 ---
+ drivers/mfd/Kconfig | 4 +-
+ drivers/mfd/atmel-hlcdc.c | 4 +-
+ drivers/mfd/axp20x.c | 12 +-
+ drivers/mfd/cs47l15-tables.c | 8 +-
+ drivers/mfd/cs47l24-tables.c | 2 +-
+ drivers/mfd/cs47l35-tables.c | 8 +-
+ drivers/mfd/cs47l85-tables.c | 8 +-
+ drivers/mfd/cs47l90-tables.c | 8 +-
+ drivers/mfd/cs47l92-tables.c | 8 +-
+ drivers/mfd/exynos-lpass.c | 4 +-
+ drivers/mfd/hi655x-pmic.c | 3 +-
+ drivers/mfd/ipaq-micro.c | 5 +-
+ drivers/mfd/omap-usb-host.c | 4 +-
+ drivers/mfd/omap-usb-tll.c | 4 +-
+ drivers/mfd/rz-mtu3.c | 1 +
+ drivers/mfd/stm32-timers.c | 3 +-
+ drivers/mfd/ti_am335x_tscadc.c | 3 +-
+ drivers/mfd/wm5102-tables.c | 2 +-
+ drivers/mfd/wm5110-tables.c | 2 +-
+ drivers/mfd/wm8994-regmap.c | 6 +-
+ drivers/mfd/wm8997-tables.c | 2 +-
+ drivers/mfd/wm8998-tables.c | 2 +-
+ include/linux/mfd/hi655x-pmic.h | 1 -
+ 35 files changed, 358 insertions(+), 263 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/input/stmpe-keypad.txt
+ delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/stmpe.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/st,stmpe.yaml
+ delete mode 100644 Documentation/devicetree/bindings/mfd/stmpe.txt
+Merging backlight/for-backlight-next (a33677b9211b backlight: led_bl: Take led_access lock when required)
+$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next
+Already up to date.
+Merging battery/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next
+Already up to date.
+Merging regulator/for-next (f5f8fe9226b1 Merge remote-tracking branch 'regulator/for-6.6' into regulator-next)
+$ git merge -m Merge branch 'for-next' of git://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 | 57 ++++++++
+ .../bindings/regulator/richtek,rt5739.yaml | 1 +
+ drivers/regulator/Kconfig | 11 ++
+ drivers/regulator/Makefile | 1 +
+ drivers/regulator/da9062-regulator.c | 11 +-
+ drivers/regulator/qcom-refgen-regulator.c | 154 +++++++++++++++++++++
+ drivers/regulator/raa215300.c | 18 +--
+ drivers/regulator/rt5739.c | 36 ++++-
+ 8 files changed, 268 insertions(+), 21 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/qcom,sdm845-refgen-regulator.yaml
+ create mode 100644 drivers/regulator/qcom-refgen-regulator.c
+Merging security/next (c31288e56c1a evm: Support multiple LSMs providing an xattr)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next
+Auto-merging security/selinux/hooks.c
+Merge made by the 'ort' strategy.
+ include/linux/evm.h | 14 ++++---
+ include/linux/lsm_hook_defs.h | 6 +--
+ include/linux/lsm_hooks.h | 20 ++++++++++
+ security/integrity/evm/evm.h | 4 +-
+ security/integrity/evm/evm_crypto.c | 11 +++++-
+ security/integrity/evm/evm_main.c | 39 +++++++++++++++----
+ security/security.c | 75 ++++++++++++++++++++++++-------------
+ security/selinux/hooks.c | 17 +++++----
+ security/smack/smack.h | 2 +-
+ security/smack/smack_lsm.c | 68 +++++++++++++++++++--------------
+ 10 files changed, 175 insertions(+), 81 deletions(-)
+Merging apparmor/apparmor-next (afad53575a93 apparmor: use passed in gfp flags in aa_alloc_null())
+$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next
+Auto-merging security/apparmor/apparmorfs.c
+Merge made by the 'ort' strategy.
+ security/apparmor/apparmorfs.c | 3 +++
+ security/apparmor/domain.c | 2 +-
+ security/apparmor/include/net.h | 1 -
+ security/apparmor/include/task.h | 2 +-
+ security/apparmor/policy.c | 4 ++--
+ security/apparmor/task.c | 5 +----
+ 6 files changed, 8 insertions(+), 9 deletions(-)
+Merging integrity/next-integrity (95526d13038c ima: Fix build warnings)
+$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
+Already up to date.
+Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest)
+$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next
+Already up to date.
+Merging selinux/next (5b0eea835d4e selinux: introduce an initial SID for early boot processes)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
+Auto-merging security/selinux/hooks.c
+Merge made by the 'ort' strategy.
+ security/selinux/hooks.c | 28 +++++++++++++++++
+ security/selinux/include/initial_sid_to_string.h | 2 +-
+ security/selinux/include/policycap.h | 1 +
+ security/selinux/include/policycap_names.h | 3 +-
+ security/selinux/include/security.h | 39 ++++++++++--------------
+ security/selinux/ss/policydb.c | 27 ++++++++++++++++
+ 6 files changed, 75 insertions(+), 25 deletions(-)
+Merging smack/next (2c085f3a8f23 smack: Record transmuting in smk_transmuted)
+$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
+Already up to date.
+Merging tomoyo/master (1c7873e33645 mm: lock newly mapped VMA with corrected ordering)
+$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master
+Already up to date.
+Merging tpmdd/next (bcd320a57f5d tpm: make all 'class' structures const)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next
+Auto-merging include/crypto/public_key.h
+Merge made by the 'ort' strategy.
+ certs/system_keyring.c | 49 +++++++++++++++
+ crypto/asymmetric_keys/restrict.c | 44 ++++++++++++++
+ drivers/char/tpm/eventlog/tpm1.c | 3 +-
+ drivers/char/tpm/st33zp24/i2c.c | 2 +-
+ drivers/char/tpm/tpm-chip.c | 18 +++++-
+ drivers/char/tpm/tpm-interface.c | 21 +++----
+ drivers/char/tpm/tpm.h | 4 +-
+ drivers/char/tpm/tpm2-space.c | 2 +-
+ drivers/char/tpm/tpm_crb.c | 19 +++---
+ drivers/char/tpm/tpm_i2c_atmel.c | 2 +-
+ drivers/char/tpm/tpm_i2c_infineon.c | 2 +-
+ drivers/char/tpm/tpm_i2c_nuvoton.c | 2 +-
+ drivers/char/tpm/tpm_tis.c | 25 ++++++++
+ drivers/char/tpm/tpm_tis_core.c | 69 +++++++++++++++------
+ drivers/char/tpm/tpm_tis_core.h | 1 +
+ drivers/char/tpm/tpm_tis_i2c.c | 59 +++++++++++-------
+ drivers/char/tpm/tpm_tis_i2c_cr50.c | 2 +-
+ drivers/char/tpm/tpm_tis_spi_main.c | 99 ++++++++++++++++++++++++++++++-
+ drivers/char/tpm/tpm_vtpm_proxy.c | 30 +++-------
+ include/crypto/public_key.h | 11 ++++
+ include/keys/system_keyring.h | 10 ++++
+ security/integrity/digsig.c | 4 +-
+ security/integrity/evm/Kconfig | 3 +-
+ security/integrity/ima/Kconfig | 3 +-
+ security/keys/keyctl.c | 11 +++-
+ security/keys/request_key.c | 35 +++++++----
+ security/keys/request_key_auth.c | 2 +-
+ security/keys/trusted-keys/trusted_tpm2.c | 2 +-
+ 28 files changed, 416 insertions(+), 118 deletions(-)
+Merging watchdog/master (2500df55a615 dt-bindings: watchdog: Add Loongson-1 watchdog)
+$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master
+Already up to date.
+Merging iommu/next (a7a334076dd7 Merge branches 'iommu/fixes', 'arm/smmu', 'ppc/pamu', 'virtio', 'x86/vt-d', 'core' and 'x86/amd' into next)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next
+Already up to date.
+Merging audit/next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next
+Already up to date.
+Merging devicetree/for-next (31e9f406efae dt-bindings: soc: qcom: stats: Update maintainer email)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next
+Already up to date.
+Merging dt-krzk/for-next (9d5d7ad3d517 Merge branch 'next/dt-bindings' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/remoteproc/qcom,adsp.yaml | 5 +++++
+ Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml | 1 -
+ Documentation/devicetree/bindings/remoteproc/qcom,qcs404-pas.yaml | 3 ++-
+ Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml | 3 ++-
+ Documentation/devicetree/bindings/remoteproc/qcom,sc8180x-pas.yaml | 3 ++-
+ Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml | 3 ++-
+ Documentation/devicetree/bindings/remoteproc/qcom,sdx55-pas.yaml | 3 ++-
+ Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml | 3 ++-
+ Documentation/devicetree/bindings/remoteproc/qcom,sm6350-pas.yaml | 3 ++-
+ Documentation/devicetree/bindings/remoteproc/qcom,sm8150-pas.yaml | 3 ++-
+ Documentation/devicetree/bindings/remoteproc/qcom,sm8350-pas.yaml | 3 ++-
+ Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml | 1 +
+ arch/arm64/boot/dts/lg/lg1312.dtsi | 2 ++
+ arch/arm64/boot/dts/lg/lg1313.dtsi | 2 ++
+ arch/arm64/boot/dts/nuvoton/nuvoton-npcm845.dtsi | 2 ++
+ 15 files changed, 30 insertions(+), 10 deletions(-)
+Merging mailbox/mailbox-for-next (1b712f18c461 mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0)
+$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next
+Already up to date.
+Merging spi/for-next (6930bfa7a90e Merge remote-tracking branch 'spi/for-6.6' into spi-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/spi/nvidia,tegra114-spi.txt | 61 --------
+ .../bindings/spi/nvidia,tegra114-spi.yaml | 100 ++++++++++++
+ .../bindings/spi/nvidia,tegra20-sflash.txt | 37 -----
+ .../bindings/spi/nvidia,tegra20-sflash.yaml | 81 ++++++++++
+ .../bindings/spi/nvidia,tegra20-slink.txt | 37 -----
+ .../bindings/spi/nvidia,tegra20-slink.yaml | 90 +++++++++++
+ drivers/spi/spi-amd.c | 2 +-
+ drivers/spi/spi-amlogic-spifc-a1.c | 86 ++++++-----
+ drivers/spi/spi-at91-usart.c | 2 +-
+ drivers/spi/spi-ath79.c | 2 +-
+ drivers/spi/spi-atmel.c | 10 +-
+ drivers/spi/spi-bitbang-txrx.h | 16 +-
+ drivers/spi/spi-bitbang.c | 8 +-
+ drivers/spi/spi-cadence.c | 2 -
+ drivers/spi/spi-cavium-thunderx.c | 2 +-
+ drivers/spi/spi-davinci.c | 15 +-
+ drivers/spi/spi-dw-core.c | 2 +-
+ drivers/spi/spi-ep93xx.c | 13 +-
+ drivers/spi/spi-falcon.c | 2 +-
+ drivers/spi/spi-fsl-lpspi.c | 2 +-
+ drivers/spi/spi-gpio.c | 10 +-
+ drivers/spi/spi-imx.c | 13 +-
+ drivers/spi/spi-lp8841-rtc.c | 10 +-
+ drivers/spi/spi-meson-spicc.c | 2 +-
+ drivers/spi/spi-mt65xx.c | 2 +-
+ drivers/spi/spi-mxs.c | 2 +-
+ drivers/spi/spi-nxp-fspi.c | 6 +-
+ drivers/spi/spi-omap-uwire.c | 2 +-
+ drivers/spi/spi-orion.c | 2 +-
+ drivers/spi/spi-pci1xxxx.c | 2 +-
+ drivers/spi/spi-pic32-sqi.c | 2 +-
+ drivers/spi/spi-pic32.c | 2 +-
+ drivers/spi/spi-qcom-qspi.c | 2 +-
+ drivers/spi/spi-rb4xx.c | 2 +-
+ drivers/spi/spi-rockchip-sfc.c | 2 +-
+ drivers/spi/spi-rockchip.c | 2 +-
+ drivers/spi/spi-rspi.c | 3 +-
+ drivers/spi/spi-rzv2m-csi.c | 6 +-
+ drivers/spi/spi-s3c64xx.c | 9 +-
+ drivers/spi/spi-sifive.c | 2 +-
+ drivers/spi/spi-slave-mt27xx.c | 2 +-
+ drivers/spi/spi-sprd-adi.c | 2 +-
+ drivers/spi/spi-stm32.c | 15 +-
+ drivers/spi/spi-sun6i.c | 30 +++-
+ drivers/spi/spi-tegra20-slink.c | 10 +-
+ drivers/spi/spi-ti-qspi.c | 2 +-
+ drivers/spi/spi-xcomm.c | 2 +-
+ drivers/spi/spi-xtensa-xtfpga.c | 2 +-
+ drivers/spi/spi.c | 168 ++++++++++-----------
+ include/linux/spi/spi.h | 158 ++++++++++---------
+ include/trace/events/spi.h | 2 +-
+ 51 files changed, 589 insertions(+), 457 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.yaml
+ delete mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.yaml
+Merging tip/master (1a2945f27157 Merge branch into tip/master: 'x86/urgent')
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master
+Auto-merging kernel/events/core.c
+Merge made by the 'ort' strategy.
+ arch/loongarch/include/asm/local.h | 4 +-
+ arch/mips/include/asm/local.h | 4 +-
+ arch/um/kernel/um_arch.c | 2 +-
+ arch/x86/entry/entry_32.S | 53 +++++++--------------------
+ arch/x86/entry/entry_64.S | 33 ++++-------------
+ arch/x86/events/amd/ibs.c | 30 ++++++++++++++-
+ arch/x86/events/core.c | 10 ++---
+ arch/x86/events/intel/core.c | 7 ++++
+ arch/x86/events/intel/cstate.c | 10 ++---
+ arch/x86/events/msr.c | 8 ++--
+ arch/x86/include/asm/alternative.h | 2 +-
+ arch/x86/include/asm/ibt.h | 2 +-
+ arch/x86/include/asm/local.h | 4 +-
+ arch/x86/include/asm/nospec-branch.h | 4 ++
+ arch/x86/include/asm/switch_to.h | 4 +-
+ arch/x86/kernel/alternative.c | 71 ++++++++++++++++++++++++++++++++++--
+ arch/x86/kernel/module.c | 2 +-
+ arch/x86/kernel/process.c | 22 ++++++++++-
+ include/linux/psi.h | 5 ++-
+ include/linux/psi_types.h | 3 ++
+ kernel/cgroup/cgroup.c | 2 +-
+ kernel/events/core.c | 18 ++++-----
+ kernel/events/ring_buffer.c | 5 ++-
+ kernel/sched/fair.c | 2 +-
+ kernel/sched/psi.c | 29 +++++++++++----
+ lib/iov_iter.c | 2 +-
+ tools/objtool/elf.c | 2 +-
+ 27 files changed, 215 insertions(+), 125 deletions(-)
+Merging clockevents/timers/drivers/next (8b5bf64c89c7 clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe)
+$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next
+Already up to date.
+Merging edac/edac-for-next (852667c317ae Merge ras/edac-drivers into for-next)
+$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next
+Already up to date.
+Merging irqchip/irq/irqchip-next (a82f3119d543 Merge branch irq/misc-6.5 into irq/irqchip-next)
+$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next
+Already up to date.
+Merging ftrace/for-next (61c692f56fec Merge tools/for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next
+Merge made by the 'ort' strategy.
+Merging rcu/rcu/next (7408340a707e refscale: Add a "jiffies" test)
+$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Auto-merging kernel/rcu/rcu.h
+Merge made by the 'ort' strategy.
+ Documentation/RCU/lockdep-splat.rst | 2 +-
+ Documentation/RCU/rculist_nulls.rst | 38 ++-
+ Documentation/admin-guide/kernel-parameters.txt | 52 ++-
+ arch/x86/kernel/tsc.c | 2 +-
+ include/linux/notifier.h | 11 -
+ include/linux/rculist_nulls.h | 4 +-
+ include/linux/rcupdate_trace.h | 1 +
+ include/linux/rcupdate_wait.h | 5 +
+ include/linux/srcutiny.h | 7 +
+ kernel/locking/locktorture.c | 3 +-
+ kernel/rcu/rcu.h | 8 +
+ kernel/rcu/rcuscale.c | 83 ++++-
+ kernel/rcu/rcutorture.c | 1 +
+ kernel/rcu/refscale.c | 37 +-
+ kernel/rcu/tasks.h | 120 ++++++-
+ kernel/rcu/tree.c | 14 +-
+ kernel/rcu/tree_nocb.h | 4 +-
+ kernel/scftorture.c | 12 +-
+ kernel/smp.c | 13 +-
+ kernel/time/clocksource.c | 8 +-
+ kernel/torture.c | 37 +-
+ scripts/checkpatch.pl | 18 +
+ .../selftests/rcutorture/bin/configcheck.sh | 61 ++--
+ .../testing/selftests/rcutorture/bin/functions.sh | 2 +-
+ .../rcutorture/bin/kvm-recheck-rcuscale.sh | 8 +-
+ .../selftests/rcutorture/bin/kvm-recheck.sh | 44 ++-
+ .../testing/selftests/rcutorture/bin/kvm-remote.sh | 12 +-
+ .../selftests/rcutorture/bin/kvm-test-1-run.sh | 5 +-
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +-
+ tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 1 -
+ tools/testing/selftests/rcutorture/bin/torture.sh | 125 +++++--
+ .../rcutorture/configs/lock/ver_functions.sh | 5 +-
+ .../selftests/rcutorture/configs/rcu/TASKS03 | 1 -
+ .../selftests/rcutorture/configs/rcu/TREE01 | 1 -
+ .../rcutorture/configs/rcu/ver_functions.sh | 5 +-
+ .../selftests/rcutorture/configs/rcuscale/CFcommon | 2 +
+ .../selftests/rcutorture/configs/rcuscale/TRACE01 | 2 +
+ .../rcutorture/configs/rcuscale/ver_functions.sh | 5 +-
+ .../rcutorture/configs/refscale/NOPREEMPT | 1 +
+ .../rcutorture/configs/refscale/ver_functions.sh | 5 +-
+ .../selftests/rcutorture/configs/scf/NOPREEMPT | 2 +
+ .../rcutorture/configs/scf/ver_functions.sh | 5 +-
+ .../rcutorture/formal/srcu-cbmc/.gitignore | 2 -
+ .../selftests/rcutorture/formal/srcu-cbmc/Makefile | 17 -
+ .../formal/srcu-cbmc/empty_includes/linux/delay.h | 0
+ .../formal/srcu-cbmc/empty_includes/linux/export.h | 0
+ .../formal/srcu-cbmc/empty_includes/linux/mutex.h | 0
+ .../formal/srcu-cbmc/empty_includes/linux/percpu.h | 0
+ .../srcu-cbmc/empty_includes/linux/preempt.h | 0
+ .../srcu-cbmc/empty_includes/linux/rcupdate.h | 0
+ .../formal/srcu-cbmc/empty_includes/linux/sched.h | 0
+ .../formal/srcu-cbmc/empty_includes/linux/smp.h | 0
+ .../srcu-cbmc/empty_includes/linux/workqueue.h | 0
+ .../srcu-cbmc/empty_includes/uapi/linux/types.h | 0
+ .../formal/srcu-cbmc/include/linux/.gitignore | 2 -
+ .../formal/srcu-cbmc/include/linux/kconfig.h | 1 -
+ .../formal/srcu-cbmc/include/linux/types.h | 152 ---------
+ .../rcutorture/formal/srcu-cbmc/modify_srcu.awk | 376 ---------------------
+ .../rcutorture/formal/srcu-cbmc/src/assume.h | 17 -
+ .../rcutorture/formal/srcu-cbmc/src/barriers.h | 41 ---
+ .../rcutorture/formal/srcu-cbmc/src/bug_on.h | 14 -
+ .../formal/srcu-cbmc/src/combined_source.c | 14 -
+ .../rcutorture/formal/srcu-cbmc/src/config.h | 28 --
+ .../rcutorture/formal/srcu-cbmc/src/include_srcu.c | 32 --
+ .../rcutorture/formal/srcu-cbmc/src/int_typedefs.h | 34 --
+ .../rcutorture/formal/srcu-cbmc/src/locks.h | 221 ------------
+ .../rcutorture/formal/srcu-cbmc/src/misc.c | 12 -
+ .../rcutorture/formal/srcu-cbmc/src/misc.h | 58 ----
+ .../rcutorture/formal/srcu-cbmc/src/percpu.h | 93 -----
+ .../rcutorture/formal/srcu-cbmc/src/preempt.c | 79 -----
+ .../rcutorture/formal/srcu-cbmc/src/preempt.h | 59 ----
+ .../formal/srcu-cbmc/src/simple_sync_srcu.c | 51 ---
+ .../rcutorture/formal/srcu-cbmc/src/workqueues.h | 103 ------
+ .../srcu-cbmc/tests/store_buffering/.gitignore | 2 -
+ .../srcu-cbmc/tests/store_buffering/Makefile | 12 -
+ .../tests/store_buffering/assert_end.fail | 1 -
+ .../srcu-cbmc/tests/store_buffering/force.fail | 1 -
+ .../srcu-cbmc/tests/store_buffering/force2.fail | 1 -
+ .../srcu-cbmc/tests/store_buffering/force3.fail | 1 -
+ .../srcu-cbmc/tests/store_buffering/main.pass | 0
+ .../formal/srcu-cbmc/tests/store_buffering/test.c | 73 ----
+ .../formal/srcu-cbmc/tests/test_script.sh | 103 ------
+ 82 files changed, 619 insertions(+), 1755 deletions(-)
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/.gitignore
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/Makefile
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/delay.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/export.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/mutex.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/percpu.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/preempt.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/rcupdate.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/sched.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/smp.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/workqueue.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/uapi/linux/types.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/.gitignore
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/kconfig.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h
+ delete mode 100755 tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/assume.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/bug_on.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/combined_source.c
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/config.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/include_srcu.c
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/int_typedefs.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/locks.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.c
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/percpu.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.c
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/simple_sync_srcu.c
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/workqueues.h
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/.gitignore
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/Makefile
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/assert_end.fail
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force.fail
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force2.fail
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force3.fail
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/main.pass
+ delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/test.c
+ delete mode 100755 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/test_script.sh
+Merging kvm/next (255006adb3da Merge tag 'kvm-x86-vmx-6.5' of https://github.com/kvm-x86/linux into HEAD)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
+Already up to date.
+Merging kvm-arm/next (192df2aa0113 KVM: arm64: Fix misuse of KVM_ARM_VCPU_POWER_OFF bit index)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next
+Already up to date.
+Merging kvms390/next (db54dfc9f71c s390/uv: Update query for secret-UVCs)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
+Already up to date.
+Merging kvm-riscv/riscv_kvm_next (07f225b58424 RISC-V: KVM: Remove unneeded semicolon)
+$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next
+Already up to date.
+Merging kvm-x86/next (88bb466c9dec Merge branches 'generic', 'misc', 'mmu', 'selftests', 'svm', 'vmx' and 'pmu')
+$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next
+Merge made by the 'ort' strategy.
+Merging xen-tip/linux-next (21a235bce123 xen/virtio: Fix NULL deref when a bridge of PCI root bus has no parent)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
+Already up to date.
+Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next
+Merge made by the 'ort' strategy.
+Merging workqueues/for-next (6dc917b44525 Merge branch 'for-6.5-fixes' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/kernel-parameters.txt | 7 ++++
+ include/linux/workqueue.h | 44 ++-----------------------
+ kernel/workqueue.c | 28 ++++++++++++----
+ lib/Kconfig.debug | 2 +-
+ 4 files changed, 33 insertions(+), 48 deletions(-)
+Merging drivers-x86/for-next (9204fc5071bf platform/x86: hp-bioscfg: MAINTAINERS)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../ABI/testing/sysfs-class-firmware-attributes | 101 +-
+ MAINTAINERS | 6 +
+ drivers/platform/x86/hp/Kconfig | 16 +
+ drivers/platform/x86/hp/Makefile | 1 +
+ drivers/platform/x86/hp/hp-bioscfg/Makefile | 11 +
+ .../x86/hp/hp-bioscfg/biosattr-interface.c | 312 ++++++
+ drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 1055 ++++++++++++++++++++
+ drivers/platform/x86/hp/hp-bioscfg/bioscfg.h | 487 +++++++++
+ .../platform/x86/hp/hp-bioscfg/enum-attributes.c | 447 +++++++++
+ .../platform/x86/hp/hp-bioscfg/int-attributes.c | 409 ++++++++
+ .../x86/hp/hp-bioscfg/order-list-attributes.c | 436 ++++++++
+ .../x86/hp/hp-bioscfg/passwdobj-attributes.c | 543 ++++++++++
+ .../platform/x86/hp/hp-bioscfg/spmobj-attributes.c | 386 +++++++
+ .../platform/x86/hp/hp-bioscfg/string-attributes.c | 390 ++++++++
+ .../x86/hp/hp-bioscfg/surestart-attributes.c | 132 +++
+ 15 files changed, 4730 insertions(+), 2 deletions(-)
+ create mode 100644 drivers/platform/x86/hp/hp-bioscfg/Makefile
+ create mode 100644 drivers/platform/x86/hp/hp-bioscfg/biosattr-interface.c
+ create mode 100644 drivers/platform/x86/hp/hp-bioscfg/bioscfg.c
+ create mode 100644 drivers/platform/x86/hp/hp-bioscfg/bioscfg.h
+ create mode 100644 drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c
+ create mode 100644 drivers/platform/x86/hp/hp-bioscfg/int-attributes.c
+ create mode 100644 drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c
+ create mode 100644 drivers/platform/x86/hp/hp-bioscfg/passwdobj-attributes.c
+ create mode 100644 drivers/platform/x86/hp/hp-bioscfg/spmobj-attributes.c
+ create mode 100644 drivers/platform/x86/hp/hp-bioscfg/string-attributes.c
+ create mode 100644 drivers/platform/x86/hp/hp-bioscfg/surestart-attributes.c
+Merging chrome-platform/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next
+Already up to date.
+Merging hsi/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
+Already up to date.
+Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next
+Already up to date.
+Merging leds-lj/for-leds-next (7a2b85a76b05 leds: simatic-ipc-leds-gpio: Fix comment style in SPDX header)
+$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next
+Merge made by the 'ort' strategy.
+ Documentation/devicetree/bindings/leds/common.yaml | 12 ++++++++++++
+ Documentation/devicetree/bindings/leds/rohm,bd2606mvv.yaml | 4 ++--
+ drivers/leds/led-class.c | 4 ++++
+ drivers/leds/leds-aw200xx.c | 4 ++--
+ drivers/leds/leds-ip30.c | 8 +-------
+ drivers/leds/leds-pwm.c | 2 +-
+ drivers/leds/simple/Kconfig | 1 +
+ drivers/leds/simple/simatic-ipc-leds-gpio.h | 2 +-
+ 8 files changed, 24 insertions(+), 13 deletions(-)
+Merging ipmi/for-next (b02bb79eee07 ipmi: fix potential deadlock on &kcs_bmc->lock)
+$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next
+Merge made by the 'ort' strategy.
+ .../bindings/ipmi/aspeed,ast2400-kcs-bmc.yaml | 8 ++++----
+ drivers/char/ipmi/ipmb_dev_int.c | 2 +-
+ drivers/char/ipmi/ipmi_devintf.c | 24 +++++++++++-----------
+ drivers/char/ipmi/ipmi_ipmb.c | 2 +-
+ drivers/char/ipmi/ipmi_si_intf.c | 5 +++++
+ drivers/char/ipmi/ipmi_si_platform.c | 2 +-
+ drivers/char/ipmi/ipmi_ssif.c | 11 +++++++---
+ drivers/char/ipmi/ipmi_watchdog.c | 2 +-
+ drivers/char/ipmi/kcs_bmc.c | 5 +++--
+ drivers/char/ipmi/ssif_bmc.c | 2 +-
+ 10 files changed, 37 insertions(+), 26 deletions(-)
+Merging driver-core/driver-core-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next
+Already up to date.
+Merging usb/usb-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
+Already up to date.
+Merging thunderbolt/next (481012b479fe thunderbolt: Add test case for 3 DisplayPort tunnels)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
+Already up to date.
+Merging usb-serial/usb-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next
+Already up to date.
+Merging tty/tty-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
+Already up to date.
+Merging char-misc/char-misc-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next
+Already up to date.
+Merging accel/habanalabs-next (e6f49e96bc57 accel/habanalabs: refactor error info reset)
+$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next
+Already up to date.
+Merging coresight/next (6c50384ef8b9 hwtracing: hisi_ptt: Fix potential sleep in atomic context)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
+Already up to date.
+Merging fastrpc/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next
+Already up to date.
+Merging fpga/for-next (e9fdc41a3d66 fpga: zynq-fpga: Convert to devm_platform_ioremap_resource())
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next
+Merge made by the 'ort' strategy.
+ drivers/fpga/altera-freeze-bridge.c | 4 +---
+ drivers/fpga/dfl-fme-main.c | 17 +++++++++--------
+ drivers/fpga/dfl-fme-mgr.c | 4 +---
+ drivers/fpga/fpga-bridge.c | 23 ++++++++++++-----------
+ drivers/fpga/fpga-region.c | 14 ++++++++------
+ drivers/fpga/socfpga.c | 7 ++-----
+ drivers/fpga/ts73xx-fpga.c | 4 +---
+ drivers/fpga/xilinx-pr-decoupler.c | 4 +---
+ drivers/fpga/zynq-fpga.c | 4 +---
+ 9 files changed, 36 insertions(+), 45 deletions(-)
+Merging icc/icc-next (9bcd2e1565e4 Merge branch 'icc-fixes' into icc-next)
+$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next
+Merge made by the 'ort' strategy.
+ .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 2 ++
+ drivers/interconnect/qcom/bcm-voter.c | 5 +++++
+ drivers/interconnect/qcom/icc-rpmh.h | 2 ++
+ drivers/interconnect/qcom/sa8775p.c | 1 +
+ drivers/interconnect/qcom/sm8450.c | 9 +++++++++
+ drivers/interconnect/qcom/sm8550.c | 17 +++++++++++++++++
+ 6 files changed, 36 insertions(+)
+Merging iio/togreg (9e66fb524495 samples: Add userspace example for TI TPS6594 PFSM)
+$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg
+Already up to date.
+Merging phy-next/next (76009ee76e05 phy: zynqmp: Allow variation in refclk rate)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ .../bindings/phy/qcom,msm8996-qmp-ufs-phy.yaml | 228 ---
+ .../bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml | 80 -
+ .../bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml | 2 +
+ .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 48 +-
+ .../bindings/phy/rockchip,inno-usb2phy.yaml | 21 +-
+ .../bindings/phy/starfive,jh7110-pcie-phy.yaml | 58 +
+ .../bindings/phy/starfive,jh7110-usb-phy.yaml | 50 +
+ MAINTAINERS | 8 +
+ drivers/phy/Kconfig | 1 +
+ drivers/phy/Makefile | 1 +
+ drivers/phy/cadence/phy-cadence-sierra.c | 98 ++
+ drivers/phy/cadence/phy-cadence-torrent.c | 1732 +++++++-------------
+ drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 3 +-
+ drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 30 +-
+ drivers/phy/mediatek/phy-mtk-mipi-dsi.h | 1 -
+ drivers/phy/qualcomm/Kconfig | 10 +
+ drivers/phy/qualcomm/Makefile | 1 +
+ drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 602 +++----
+ .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6.h | 5 +
+ drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 10 +
+ drivers/phy/qualcomm/phy-qcom-qmp-usb-legacy.c | 1407 ++++++++++++++++
+ drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 556 -------
+ drivers/phy/qualcomm/phy-qcom-qmp.h | 2 +
+ drivers/phy/renesas/r8a779f0-ether-serdes.c | 9 +-
+ drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 234 ++-
+ drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 357 +++-
+ drivers/phy/rockchip/phy-rockchip-typec.c | 3 +-
+ drivers/phy/starfive/Kconfig | 24 +
+ drivers/phy/starfive/Makefile | 3 +
+ drivers/phy/starfive/phy-jh7110-pcie.c | 204 +++
+ drivers/phy/starfive/phy-jh7110-usb.c | 152 ++
+ drivers/phy/xilinx/phy-zynqmp.c | 95 +-
+ 32 files changed, 3573 insertions(+), 2462 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-ufs-phy.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/starfive,jh7110-pcie-phy.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/starfive,jh7110-usb-phy.yaml
+ create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-usb-legacy.c
+ create mode 100644 drivers/phy/starfive/Kconfig
+ create mode 100644 drivers/phy/starfive/Makefile
+ create mode 100644 drivers/phy/starfive/phy-jh7110-pcie.c
+ create mode 100644 drivers/phy/starfive/phy-jh7110-usb.c
+Merging soundwire/next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
+Already up to date.
+Merging extcon/extcon-next (94da3da96c35 dt-bindings: extcon: wlf,arizona: drop unneeded quotes)
+$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next
+Already up to date.
+Merging gnss/gnss-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next
+Already up to date.
+Merging vfio/next (ff598081e5b9 vfio/mdev: Move the compat_class initialization to module init)
+$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next
+Already up to date.
+Merging w1/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next
+Already up to date.
+Merging staging/staging-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next
+Already up to date.
+Merging counter-next/counter-next (9b53a1342216 counter: Fix menuconfig "Counter support" submenu entries disappearance)
+$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next
+Already up to date.
+Merging mux/for-next (44c026a73be8 Linux 6.4-rc3)
+$ 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 (1b13e52c0c76 dmaengine: xilinx: dma: remove arch dependency)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
+Auto-merging drivers/dma/Kconfig
+Merge made by the 'ort' strategy.
+ Documentation/ABI/stable/sysfs-driver-dma-idxd | 2 +-
+ .../devicetree/bindings/dma/brcm,bcm2835-dma.txt | 83 -----------------
+ .../devicetree/bindings/dma/brcm,bcm2835-dma.yaml | 102 +++++++++++++++++++++
+ .../devicetree/bindings/dma/qcom,bam-dma.yaml | 31 +++++--
+ drivers/dma/Kconfig | 2 +-
+ drivers/dma/idxd/device.c | 2 -
+ drivers/dma/idxd/sysfs.c | 2 +-
+ drivers/dma/mediatek/mtk-uart-apdma.c | 1 -
+ drivers/dma/qcom/gpi.c | 3 +-
+ drivers/dma/qcom/hidma.c | 12 +--
+ drivers/dma/qcom/hidma_mgmt.c | 5 +-
+ drivers/dma/sh/rz-dmac.c | 17 ++--
+ drivers/dma/sh/shdmac.c | 7 +-
+ drivers/dma/stm32-dma.c | 3 +-
+ 14 files changed, 150 insertions(+), 122 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.yaml
+Merging cgroup/for-next (d1d4ff5d11a5 cgroup: put cgroup_tryget_css() inside CONFIG_CGROUP_SCHED)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next
+Auto-merging MAINTAINERS
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging tools/testing/selftests/cgroup/.gitignore
+CONFLICT (content): Merge conflict in tools/testing/selftests/cgroup/.gitignore
+Auto-merging tools/testing/selftests/cgroup/Makefile
+CONFLICT (content): Merge conflict in tools/testing/selftests/cgroup/Makefile
+Resolved 'tools/testing/selftests/cgroup/.gitignore' using previous resolution.
+Resolved 'tools/testing/selftests/cgroup/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master ece0d4c92f59] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 2 +
+ kernel/cgroup/cgroup.c | 64 +++--
+ kernel/cgroup/cpuset.c | 262 +++++++++++++--------
+ tools/testing/selftests/cgroup/.gitignore | 1 +
+ tools/testing/selftests/cgroup/Makefile | 2 +
+ tools/testing/selftests/cgroup/cgroup_util.c | 2 +
+ tools/testing/selftests/cgroup/cgroup_util.h | 2 +
+ tools/testing/selftests/cgroup/test_core.c | 2 +-
+ tools/testing/selftests/cgroup/test_cpuset.c | 275 ++++++++++++++++++++++
+ tools/testing/selftests/cgroup/test_cpuset_prs.sh | 2 +-
+ 10 files changed, 479 insertions(+), 135 deletions(-)
+ create mode 100644 tools/testing/selftests/cgroup/test_cpuset.c
+Merging scsi/for-next (f4d1a8e01190 scsi: storvsc: Handle SRB status value 0x30)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next
+Already up to date.
+Merging scsi-mkp/for-next (e152a616c886 scsi: ufs: ufs-mediatek: Add MCQ support for MTK platform)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
+Auto-merging drivers/ufs/core/ufshcd.c
+Auto-merging include/ufs/ufs.h
+Merge made by the 'ort' strategy.
+ drivers/target/iscsi/iscsi_target_configfs.c | 2 -
+ drivers/target/iscsi/iscsi_target_tpg.c | 26 ----
+ drivers/target/iscsi/iscsi_target_tpg.h | 1 -
+ drivers/ufs/core/ufs-mcq.c | 3 +
+ drivers/ufs/core/ufshcd.c | 13 +-
+ drivers/ufs/core/ufshpb.c | 2 +-
+ drivers/ufs/host/ufs-mediatek.c | 174 ++++++++++++++++++++++++++-
+ drivers/ufs/host/ufs-mediatek.h | 33 +++++
+ include/target/iscsi/iscsi_target_core.h | 4 -
+ include/ufs/ufs.h | 8 +-
+ include/ufs/ufshcd.h | 3 +
+ 11 files changed, 223 insertions(+), 46 deletions(-)
+Merging vhost/linux-next (373abdba01d4 vdpa_sim: offer VHOST_BACKEND_F_ENABLE_AFTER_DRIVER_OK)
+$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
+Auto-merging drivers/net/virtio_net.c
+CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
+Auto-merging drivers/vhost/vdpa.c
+Resolved 'drivers/net/virtio_net.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit --no-edit -v -a
+[master 9b5cd0204022] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
+$ git diff -M --stat --summary HEAD^..
+ drivers/net/virtio_net.c | 163 +++++++++++--
+ drivers/vdpa/vdpa_sim/vdpa_sim.c | 8 +
+ drivers/vhost/vdpa.c | 15 +-
+ drivers/virtio/virtio_ring.c | 491 ++++++++++++++++++++++++++++++++++-----
+ include/linux/vdpa.h | 4 +
+ include/linux/virtio.h | 34 +++
+ include/uapi/linux/vhost_types.h | 4 +
+ 7 files changed, 641 insertions(+), 78 deletions(-)
+Merging rpmsg/for-next (81aceef4b71d Merge branches 'hwspinlock-next' and 'rproc-next' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next
+Merge made by the 'ort' strategy.
+Merging gpio/for-next (ac9a78681b92 Linux 6.4-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next
+Already up to date.
+Merging gpio-brgl/gpio/for-next (0f93a345aa42 gpiolib: order includes alphabetically in gpiolib.h)
+$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next
+Merge made by the 'ort' strategy.
+ drivers/gpio/gpio-mxc.c | 61 +++++++++++++++++++++-
+ drivers/gpio/gpio-sifive.c | 1 +
+ drivers/gpio/gpio-sim.c | 2 +-
+ drivers/gpio/gpiolib-acpi.c | 2 +-
+ drivers/gpio/gpiolib-of.c | 6 +--
+ drivers/gpio/gpiolib.c | 120 ++++++++++++++++++++++++--------------------
+ drivers/gpio/gpiolib.h | 11 ++--
+ 7 files changed, 137 insertions(+), 66 deletions(-)
+Merging gpio-intel/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://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 (04e601f2a71c Merge tag 'renesas-pinctrl-fixes-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into fixes)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
+Merge made by the 'ort' strategy.
+ drivers/pinctrl/pinctrl-amd.c | 61 +++++++++++++--------------------
+ drivers/pinctrl/pinctrl-amd.h | 1 -
+ drivers/pinctrl/renesas/pinctrl-rzg2l.c | 28 ++++++++++-----
+ drivers/pinctrl/renesas/pinctrl-rzv2m.c | 28 ++++++++++-----
+ 4 files changed, 63 insertions(+), 55 deletions(-)
+Merging pinctrl-intel/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next
+Already up to date.
+Merging pinctrl-renesas/renesas-pinctrl (bf8da305fef9 pinctrl: renesas: rzv2m: Use devm_clk_get_enabled())
+$ git merge -m Merge branch 'renesas-pinctrl' of git://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-rzv2m.c | 32 +++++---------------------------
+ 1 file changed, 5 insertions(+), 27 deletions(-)
+Merging pinctrl-samsung/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
+Already up to date.
+Merging pwm/for-next (92554cdd428f dt-bindings: pwm: convert pwm-bcm2835 bindings to YAML)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next
+Already up to date.
+Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next
+Auto-merging Documentation/admin-guide/sysctl/kernel.rst
+Merge made by the 'ort' strategy.
+ Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++---
+ ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++--
+ ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++
+ kernel/ucount.c | 16 ++++++-------
+ 4 files changed, 89 insertions(+), 14 deletions(-)
+Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next
+Already up to date.
+Merging kselftest/next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
+Already up to date.
+Merging kunit/test (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test
+Already up to date.
+Merging kunit-next/kunit (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
+Already up to date.
+Merging livepatching/for-next (ac4890f97211 Merge branch 'for-6.5/core' into for-next)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next
+Merge made by the 'ort' strategy.
+Merging rtc/rtc-next (1b733a9ebc3d rtc: Add rtc driver for the Loongson family chips)
+$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
+Already up to date.
+Merging nvdimm/libnvdimm-for-next (1ea7ca1b0901 dax: enable dax fault handler to report VM_FAULT_HWPOISON)
+$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next
+Already up to date.
+Merging at24/at24/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next
+Already up to date.
+Merging ntb/ntb-next (994def29acc5 ntb: Remove error checking for debugfs_create_dir())
+$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next
+Merge made by the 'ort' strategy.
+ drivers/ntb/test/ntb_tool.c | 2 --
+ 1 file changed, 2 deletions(-)
+Merging seccomp/for-next/seccomp (f373d301908a perf/benchmark: add a new benchmark for seccom_unotify)
+$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/sched/fair.c
+Auto-merging kernel/sched/sched.h
+Auto-merging kernel/sched/wait.c
+Auto-merging tools/perf/builtin-bench.c
+Merge made by the 'ort' strategy.
+ include/linux/completion.h | 1 +
+ include/linux/swait.h | 2 +-
+ include/linux/wait.h | 3 +
+ include/uapi/linux/seccomp.h | 4 +
+ kernel/sched/completion.c | 26 ++--
+ kernel/sched/core.c | 5 +-
+ kernel/sched/fair.c | 4 +
+ kernel/sched/sched.h | 13 +-
+ kernel/sched/swait.c | 8 +-
+ kernel/sched/wait.c | 5 +
+ kernel/seccomp.c | 72 ++++++++++-
+ tools/arch/x86/include/uapi/asm/unistd_32.h | 3 +
+ tools/arch/x86/include/uapi/asm/unistd_64.h | 3 +
+ tools/perf/bench/Build | 1 +
+ tools/perf/bench/bench.h | 1 +
+ tools/perf/bench/sched-seccomp-notify.c | 178 ++++++++++++++++++++++++++
+ tools/perf/builtin-bench.c | 1 +
+ tools/testing/selftests/seccomp/seccomp_bpf.c | 55 ++++++++
+ 18 files changed, 357 insertions(+), 28 deletions(-)
+ create mode 100644 tools/perf/bench/sched-seccomp-notify.c
+Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next
+Already up to date.
+Merging slimbus/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
+Already up to date.
+Merging nvmem/for-next (3a7e4daf7aea dt-bindings: nvmem: qfprom: Add compatible for MSM8226)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next
+Merge made by the 'ort' strategy.
+ Documentation/ABI/testing/sysfs-nvmem-cells | 19 ++++
+ .../bindings/nvmem/layouts/fixed-cell.yaml | 26 +++++
+ .../bindings/nvmem/layouts/fixed-layout.yaml | 12 +++
+ Documentation/devicetree/bindings/nvmem/nvmem.yaml | 5 +-
+ .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 1 +
+ drivers/nvmem/brcm_nvram.c | 3 +-
+ drivers/nvmem/core.c | 113 +++++++++++++++++++--
+ drivers/nvmem/lpc18xx_otp.c | 4 +-
+ drivers/nvmem/meson-mx-efuse.c | 4 +-
+ drivers/nvmem/qfprom.c | 17 +---
+ drivers/nvmem/rockchip-efuse.c | 3 +-
+ drivers/nvmem/stm32-romem.c | 3 +-
+ drivers/nvmem/sunxi_sid.c | 4 +-
+ drivers/nvmem/uniphier-efuse.c | 3 +-
+ 14 files changed, 181 insertions(+), 36 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-nvmem-cells
+Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated)
+$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main
+Merge made by the 'ort' strategy.
+ lib/idr.c | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+Merging hyperv/hyperv-next (a494aef23dfc PCI: hv: Replace retarget_msi_interrupt_params with hyperv_pcpu_input_arg)
+$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
+Already up to date.
+Merging auxdisplay/auxdisplay (def85dce1451 auxdisplay: Switch i2c drivers back to use .probe())
+$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay
+Already up to date.
+Merging kgdb/kgdb/for-next (b6464883f45a kdb: move kdb_send_sig() declaration to a better header file)
+$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next
+Already up to date.
+Merging hmm/hmm (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm
+Already up to date.
+Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next
+Already up to date.
+Merging mhi/mhi-next (d0184830e611 bus: mhi: host: use vmalloc_array and vcalloc)
+$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
+Merge made by the 'ort' strategy.
+ drivers/bus/mhi/host/init.c | 2 +-
+ drivers/bus/mhi/host/pci_generic.c | 47 ++++++++++++++++++++++++++++++++++----
+ drivers/bus/mhi/host/pm.c | 5 ++++
+ 3 files changed, 49 insertions(+), 5 deletions(-)
+Merging memblock/for-next (0f5e4adb608c memblock: report failures when memblock_can_resize is not set)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next
+Merge made by the 'ort' strategy.
+ mm/memblock.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging cxl/next (fe77cc2e5a6a cxl: Fix one kernel-doc comment)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
+Already up to date.
+Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2)
+$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next
+Already up to date.
+Merging efi/next (2e28a798c309 efi/libstub: Disable PCI DMA before grabbing the EFI memory map)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
+Already up to date.
+Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next
+Merge made by the 'ort' strategy.
+ fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++--------------
+ 1 file changed, 24 insertions(+), 14 deletions(-)
+Merging slab/for-next (44f6a42d4935 mm/slub: refactor freelist to use custom type)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next
+Merge made by the 'ort' strategy.
+ mm/slub.c | 43 ++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 32 insertions(+), 11 deletions(-)
+Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
+Already up to date.
+Merging landlock/next (35ca42399297 selftests/landlock: Add hostfs tests)
+$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next
+Already up to date.
+Merging rust/rust-next (d2e3115d7171 rust: error: `impl Debug` for `Error` with `errname()` integration)
+$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
+Already up to date.
+Merging sysctl/sysctl-next (5664eaac4dcf sysctl: fix unused proc_cap_handler() function warning)
+$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next
+Merge made by the 'ort' strategy.
+Merging execve/for-next/execve (aa88054b7090 binfmt_elf: fix comment typo s/reset/regset/)
+$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve
+Already up to date.
+Merging bitmap/bitmap-for-next (7e281084b62c lib: test for_each_numa_cpus())
+$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next
+Merge made by the 'ort' strategy.
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 16 ++-----
+ include/linux/find.h | 43 +++++++++++++++++
+ include/linux/topology.h | 45 +++++++++++-------
+ kernel/sched/topology.c | 49 ++++++++++---------
+ lib/cpumask.c | 7 +--
+ lib/find_bit.c | 12 +++++
+ lib/test_bitmap.c | 70 +++++++++++++++++++++++++++-
+ 7 files changed, 186 insertions(+), 56 deletions(-)
+Merging hte/for-next (ac9a78681b92 Linux 6.4-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next
+Already up to date.
+Merging kspp/for-next/kspp (ec7633de404e sparc: mark __arch_xchg() as __always_inline)
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp
+Auto-merging MAINTAINERS
+Merge made by the 'ort' strategy.
+ MAINTAINERS | 5 ++++-
+ arch/sparc/include/asm/cmpxchg_32.h | 2 +-
+ arch/sparc/include/asm/cmpxchg_64.h | 2 +-
+ include/asm-generic/vmlinux.lds.h | 1 -
+ kernel/kallsyms.c | 5 ++---
+ scripts/kallsyms.c | 6 +++---
+ 6 files changed, 11 insertions(+), 10 deletions(-)
+Merging kspp-gustavo/for-next/kspp (221a4b56ec70 sparc: openpromio: Address -Warray-bounds warning)
+$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp
+Merge made by the 'ort' strategy.
+ arch/sparc/include/uapi/asm/openpromio.h | 5 ++---
+ fs/reiserfs/fix_node.c | 5 +++--
+ fs/reiserfs/reiserfs.h | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+Merging iommufd/for-next (06c2afb862f9 Linux 6.5-rc1)
+$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next
+Already up to date.
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000000000..1e7df30222700
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20230714