diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-09-14 12:50:37 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-09-14 12:50:37 +1000 |
| commit | 98897dc735cf6635f0966f76eb0108354168fb15 (patch) | |
| tree | 1da6897a30cc6d434953f3137da69f6916265daf | |
| parent | 03bb732b061c0c29cde0efec1caf18735c888648 (diff) | |
Add linux-next specific files for 20230914next-20230914
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 368 | ||||
| -rw-r--r-- | Next/Trees | 370 | ||||
| -rw-r--r-- | Next/merge.log | 4305 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5044 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..abb55c3bd189 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,368 @@ +Name SHA1 +---- ---- +origin aed8aee11130a954356200afa3f1b8753e8a9482 +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes ff9c40b175077615dc6d8f3a7e013d9b45e7b4c9 +kbuild-current 6ccbd7fd474674654019a20177c943359469103a +arc-current 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm-current 6995e2de6891c724bfeb2db33d7b87775f913ad1 +arm64-fixes 8bd795fedb8450ecbef18eeadbd23ed8fc7630f5 +arm-soc-fixes 3c78dbf251350fdf3a9dab3b9c3391fb89df208d +davinci-current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current 010d358b9087748f403fd33c4cf34c27584871bf +powerpc-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +s390-fixes e5b7ca09e9aa4d483ab84c5f2ba88f0cc7c66540 +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net bc6ed2fa24b14e40e1005488bbe11268ce7108fa +bpf 8a19edd4fa6f5b22d5a35bb7c8bb3e7c571a74d4 +ipsec f7c4e3e5d4f6609b4725a97451948ca2e425379a +netfilter 7153a404fb70d21097af3169354e1e5fda3fbb02 +ipvs 931abcdcad1024df0cdcd9d7d114c4d3a28bc09c +wireless 6e48ebffc2db5419b3a51cfc509bde442252b356 +wpan 9a43827e876c9a071826cc81783aa2222b020f1d +rdma-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +sound-current 26f7111abd8e15726c93bafe16a349f1db2f14e0 +sound-asoc-fixes cf0ba445f5e4dd74c1e9d7a83ca721ba69204a11 +regmap-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +regulator-fixes 6223e073db78458f8846c380ccd224a7a73a3867 +spi-fixes 9855d60cfc720ff32355484c119acafd3c4dc806 +pci-current 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +driver-core.current fd6f7ad2fd4d53fa14f4fd190f9b05d043973892 +tty.current 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +usb.current f26a679ed799deef9e2934a6b60b8f38bdbf4921 +usb-serial-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +phy 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +staging.current 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +iio-fixes 00be24c416e4844b7c2967ff1aadb57d9c85e50f +counter-current df8fdd01c98b99d04915c04f3a5ce73f55456b7c +char-misc.current 98a15816636044f25be4644db2a3e09fad68aaf7 +soundwire-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +thunderbolt-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +input-current 1ac731c529cd4d6adbce134754b51ff7d822b145 +crypto-current ba22e81872c1232ea4ba421251d8109a5ed68c52 +vfio-fixes 4752354af71043e6fd72ef5490ed6da39e6cab4a +kselftest-fixes 7e021da80f48582171029714f8a487347f29dddb +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes 9836a987860e33943945d4b257729a4f94eae576 +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 6eaae198076080886b9e7d57f4ae06fa782f90ef +at91-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +omap-fixes 06f114cf7cbe96a07c51c47114d79e9654275919 +kvm-fixes d5ad9aae13dcced333c1a7816ff0a4fbbb052466 +kvms390-fixes c2fceb59bbda16468bda82b002383bff59de89ab +hwmon-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +nvdimm-fixes e98d14fa7315867fded127a98db355f49807dfdb +cxl-fixes 55b8ff06a0c70e9a6a1696c69f52c0240167d23f +btrfs-fixes 850c8ce8d39113f2d7cbd563d772d645b1a7efe5 +vfs-fixes 609d54441493c99f21c1823dfd66fa7f4c512ff4 +dma-mapping-fixes bbb73a103fbbed6f63cb738d3783261c4241b4b2 +drivers-x86-fixes 4106a70ddad57ee6d8f98b81d6f036740c72762b +samsung-krzk-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +pinctrl-samsung-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +devicetree-fixes 55e95bfccf6db8d26a66c46e1de50d53c59a6774 +dt-krzk-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +scsi-fixes 812fe6420a6e789db68f18cdb25c5c89f4561334 +drm-fixes afaf2b38025ab327c85e218f36d1819e777d4d45 +drm-intel-fixes 7c95ec3b59479bb24093918bbfc801c9f31826f2 +mmc-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +hyperv-fixes 6ad0f2f91ad14ba0a3c2990c054fd6fbe8100429 +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes 8eb8fe67e2c84324398f5983c41b4f831d0705b3 +riscv-dt-fixes 1558209533f140624a00408bdab796ab3f309450 +riscv-soc-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +fpga-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +spdx 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl-fixes 2d48c30176fa0fd61202b859d7454249f2b22bdc +gpio-intel-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +pinctrl-intel-fixes 2d325e54d9e2e4ae247c9fd03f810208ce958c51 +erofs-fixes 75a5221630fe5aa3fedba7a06be618db0f79ba1e +kunit-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 9e46e4dcd9d6cd88342b028dbfa5f4fb7483d39c +nfsd-fixes 88956eabfdea7d01d550535af120d4ef265b1d02 +irqchip-fixes cfa1f9db6d6088118ef311c0927c66072665b47e +renesas-fixes 4c188fa183ebb45238ef16504c4c7606955cf9d4 +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current c2122b687c212a28d237fb672cc979247bd94449 +efi-fixes 560f54eaa44ce3059defe2b613f04cfe4f8de6b3 +zstd-fixes 6906598f1ce93761716d780b6e3f171e13f0f4ce +battery-fixes 4ec7b666fb4247bc6b9cdc84fa753d8dc2994d25 +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +rust-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +v9fs-fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +w1-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +pmdomain-fixes e2ad626f8f409899baf1bf192d0533a851128b19 +drm-misc-fixes c900529f3d9161bfde5cca0754f83b4d3c3e0220 +mm-stable 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +mm-nonmm-stable 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +mm c7934e3f58e54d5b03244c77dabdec4822ea6724 +kbuild 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +clang-format 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +perf 45fc4628c15ab2cb7b2f53354b21db63f0a41f81 +compiler-attributes 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +dma-mapping 8556f6921c28ebd758e80993b8fc491497b1fa72 +asm-generic 6e8d96909a23c8078ee965bd48bb31cbef2de943 +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm 133789d4a458c761f60ef71cc5a6ede5a617ed7e +arm64 e1df27213941725962f68c64349bbcc60ece0314 +arm-perf 21b61fe48c2fc43d98ebb67a1f3832e0478fa523 +arm-soc 42ed07054d7596db5b1d5a01b1ffc087829d84dd +amlogic 929266f846b3a75578f427dbf6c26babc51405e9 +asahi-soc eaf935fa48ec826f7c564c269a607cb4fba082b3 +aspeed 05f42491c81340e961e024509d198eb54e643345 +at91 b04dba7c1c30a172e93a0b1c9f450076945ef546 +broadcom a70e8c9ff89a809cfd0402e8c506c240eca65468 +davinci 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +imx-mxs 246e2cc22265e395e9e8880d957e99b66f5a2ac3 +mediatek f6925844c82ae23165097eb14e272f76b855fb5d +mvebu a8e364c2c4285e78128eac157ddb27915026689f +omap 6387fcbea64f2996f540b60f6abf9893074a6825 +qcom f6f46954a7112623652d83075328eabd1d967454 +renesas f1f80f16cf65fdebcb57c299435019a932d50a6a +reset 417a3a5ae44a14b4eeb3df514b2c006b19771f82 +rockchip 6d1fa88088880e482d7a83243337f326dd4fe6f7 +samsung-krzk a942a9ea19e3317b8d7d7a54a330699a48f5f9a4 +scmi a184af4d455de3c1c08bce0f7c33b08d9e8a871a +stm32 c848f884d1b4d858dff03269265a3300f542011c +sunxi aa333f5e8461bae5e1a7888b0ca8672dccba3721 +tee 6a8b7e80105416cc7324fda295608ea2d3f98862 +tegra c62440bd774b5de4d23512131799cf8f2baac78d +ti 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +xilinx 65d6e954e37872fd9afb5ef3fc0481bb3c2f20f4 +clk 78fd9cf91630e82662874734d3b49070e2079ac0 +clk-imx 72d00e560d10665e6139c9431956a87ded6e9880 +clk-renesas f3ea14c6a243d927c172caf123e9d2ce803fdafc +csky 5195c35ac4f09bc45bde23b98d74c4f5d62bea65 +loongarch 91f3eb2e7791e8efb62d426ac63f5de0c8a69fb3 +m68k eb1e6ccdcf785e633863c5c7cec32d6c1e7b09dd +m68knommu 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +microblaze 65d6e954e37872fd9afb5ef3fc0481bb3c2f20f4 +mips e7513eccb7d7f82e28f4730210b42da71edaa6a6 +openrisc c289330331eb93bc6a3c68b9119ccd7d4285a4a2 +parisc-hd 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +powerpc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +riscv-dt 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +riscv-soc 78a03b9f8e6b317f7c65738a3fc60e1e85106a64 +s390 06fc3b0d2251b550f530a1c42e0f9c5d022476dd +sh 246f80a0b17f8f582b2c0996db02998239057c65 +uml 974b808d85abbc03c3914af63d60d5816aabf2ca +xtensa 03ce34cf8f50e4c62f9a4b62caffdba1165ca977 +bcachefs d3410e0003a77a36ccefb04757324c723e010f08 +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 324718ddddc40905f0216062dfbb977809184c06 +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs 1886ed000c2eedaa8606584d57dd3e0b3f7daf3a +ceph ce0d5bd3a6c176f9a3bf867624a07119dd4d0878 +cifs 05d0f8f55ad60854cb706798da94276a33590445 +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs 91b1ad0815fbb1095c8b9e8a2bf4201186afe304 +exfat b3a62a9886007ce5e2b69e2b14fe41c50c6843d6 +ext3 d3cc1b0be258191d6360c82ea158c2972f8d3991 +ext4 147d4a092e9a726ce706dbf0d329d2b96a025459 +f2fs 3669558bdf354cd352be955ef2764cde6a9bf5ec +fsverity 919dc320956ea353a7fb2d84265195ad5ef525ac +fuse f73016b63b09edec8adf7e182600c52465c56ee7 +gfs2 4f575b4604deb774ac5660ae91431914d90872f0 +jfs 0225e10972fa809728b8d4c1bd2772b3ec3fdb57 +ksmbd 59d8d24f4610333560cf2e8fe3f44cafe30322eb +nfs 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +nfs-anna 806a3bc421a115fbb287c1efce63a48c54ee804b +nfsd 11d1df89720ef4b0e52322f4a905b22d9674f136 +ntfs3 44b4494d5c5971dc8f531c8783d90a637e862880 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 724768a39374d35b70eaeae8dd87048a2ec7ae8e +ubifs 017c73a34a661a861712f7cc1393a123e5b2208c +v9fs 4ec5183ec48656cec489c49f989c508b68b518e3 +v9fs-ericvh 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +xfs c1950a111dd87604009496e06033ee248c676424 +zonefs 8812387d056957355ef1d026cd38bed3830649db +iomap 4aa8cdd5e523d2d8ec8df29dcd696bf207d7a494 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner 460ff2c3c768a2f4aab114d65269c20dc3ddf41e +vfs cff4b23c731a1cbdf39d5ce180196b8dffb6c411 +printk 189f53ec666838729ab29a220ca4c1e1f1359f95 +pci 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +pstore 94160062396d7e7cff4ed69320ffc5e22d51a0ab +hid bd0ffb67f8d3ec8d3b78dbf049f294db532e0b56 +i2c 637f33a4fe864ac8636e22766d67210e801fcd0d +i3c 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 80369d9e1f2f16993ae6d148553c37bf65a209e4 +jc_docs 86a0adc029d338f0da8989e7bb453c1114d51960 +v4l-dvb 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +v4l-dvb-next 0835b195d034ab98b148b8e9c81a862c0c557bb7 +pm b5eda4c9c923df3ee79181406652733b3faf2994 +cpufreq-arm 16567117aa0c8eea7ed4c2daee92f02952550d17 +cpupower 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +devfreq 5693d077595de721f9ddbf9d37f40e5409707dfe +pmdomain ae3a94e4adee4429f364a0761233a928c865f3f8 +opp e576a9a8603f7c6f8fed5159e2fe33f6d67a49e7 +thermal edd220b33f479cf9dcda0bfefb2cb8c5902e9885 +dlm 7c53e847ff5e97f033fdd31f71949807633d506b +rdma 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +net-next ca5ab9638e925613f73b575041801a7b2fd26bd4 +bpf-next 558c50cc3b135e00c9ed15df4c9159e84166f94c +ipsec-next a94fd40a18ae76ba76dbaa8eca0e3c46aa1142c1 +mlx5-next 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +netfilter-next 73be7fb14e83d24383f840a22f24d3ed222ca319 +ipvs-next c2e5f4fd1148727801a63d938cec210f16b48864 +bluetooth c0c68490dadb598cc621f14e37d56c284e668267 +wireless-next e160ab85166e77347d0cbe5149045cb25e83937f +wpan-next 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +wpan-staging 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +mtd 8ffd18a6744b18ff9b58abf7261aaccd78be98cf +nand 48919c6c48380aa1aec4243c7e6ad39e89d78539 +spi-nor 69d50d0461a182872b7f7892702fa3a1ba95950d +crypto 85b9bf9a514d991fcecb118d0a8a35e754ff9265 +drm 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +drm-ci ad6bfe1b66a5c146ec236847eca7af4c8806d666 +drm-misc fc71f615fd08a530d24c7af0a1efa72ec6ea8e34 +amdgpu addd7aef251cca374cef743824cc5ae230370bd0 +drm-intel 3072a24c778a7102d70692af5556e47363114c67 +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm 34b149ecae852d13ae3275e707fce93081ef5e4a +drm-msm-lumag d93cf453f51da168f4410ba73656f1e862096973 +etnaviv 88c31d2dd191ab78e9ba9ff967845018aa7ee214 +fbdev 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +regmap d3601857e14de6369f00ae19564f1d817d175d19 +sound 26f7111abd8e15726c93bafe16a349f1db2f14e0 +ieee1394 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +sound-asoc afe49745efb0c602955684c088b8bb4f9a1449e9 +modules 33c24bee4b787ef58d8c9a36316ba85363b93617 +input 305dd76455038f3b2338bd0560387cf829c7567c +block d975b468819a142a49c8e7db83feb07c3018c550 +device-mapper 1e4ab7b4c881cf26c1c72b3f56519e03475486fb +libata fa2259a59966c005c8ffe6983a1996fb41218e42 +pcmcia 4f733de8b78a209501041a4b0a44c83ece0e8933 +mmc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +mfd 9aab92bc3a8922d4b2e24d10271dfe3034cbf5c2 +backlight a4464092f2c514a7f0788906d340f0bab59fdd73 +battery bbaa6ffa5b6c9609d3b3c431c389b407eea5441f +regulator 451e85e29c9d6f20639d4cfcff4b9dea280178cc +security 64fc9526147c7fc14535134d8ea79b9c8dc549a7 +apparmor 8884ba07786c718771cf7b78cb3024924b27ec2b +integrity 55e2b69649be38f1788b38755070875b96111d2f +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 9d140885e35dac6dff2c56eccacc13f4fc96188a +smack 3ad49d37cf5759c3b8b68d02e3563f633d9c1aee +tomoyo 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tpmdd ea72883a3bf11fb09dd1ad4f8328cc040263881a +watchdog 8c776a0401f1dcfcfc8e5549c5260668bec59c0e +iommu d8fe59f11096d6470b5f53739e49cdce67f3e127 +audit 97f576eb38ae219a6fb337d13586d8acbf01d3f8 +devicetree d117ca218b16ce44d64667e29b4bc2761ed424f5 +dt-krzk 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +mailbox a493208079e299aefdc15169dc80e3da3ebb718a +spi 678466ba68915d452c200b78d0385931e6f8e907 +tip 3598e2142f49cc14389b5ad2cb103b5666892e1e +clockevents 0a8b07c77ea09602a152d3604e599f95726306d0 +edac ce53ad81ed36c24aff075f94474adecfabfcf239 +irqchip 19b5a44bee16518104e8a159ab9a60788292fbd4 +ftrace fc1653abba0d554aad80224e51bcad42b09895ed +rcu 94e70d269433ec9151fca988aaf6d59d4d9db2d7 +kvm d011151616e73de20c139580b73fa4c7042bd861 +kvm-arm 169c0f23caccdce069ede45196b3d17a26ddaeab +kvms390 899e2206f46aece42d8194c350bc1de71344dbc7 +kvm-riscv 477069398ed6e0498ee243e799cb6c68baf6ccb8 +kvm-x86 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +xen-tip 47550597509382ff3eb24936902e4d39b02650e9 +percpu 3fcf62f24c80e2472f472778f317e062841c2d37 +workqueues 96796025f400e9b8f763d25c98af9b0f026a5ead +drivers-x86 2c97d3e55b70edf33b6e7f211bab8a748a0a2bcc +chrome-platform 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +chrome-platform-firmware 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +hsi 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj baca986e1f2c31f8e4b2a6d99d47c3bc844033e8 +ipmi b00839ca4cca8aa9641c121c848a553d6220ce70 +driver-core 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +usb 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +thunderbolt 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +usb-serial 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tty 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +char-misc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +accel ef8b0cb1ba370231f155c1579a602b698a9f6650 +coresight c0a232f1e19e378c5c4e5973a996392942c80090 +fastrpc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +fpga 1a22ec09a2c1d367a43cb7f837c7a8719e7fe975 +icc 6ac3f01201fa1c453fc8a8ce5a7208da9cca254d +iio 22da192f43f7d302d02644efa192ba5a05d935c9 +phy-next 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +soundwire 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +extcon d20a3a8a32e3fa564ff25da860c5fc1a97642dfe +gnss 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +vfio 642265e22ecc7fe05c49cb8e1e0000a049df9857 +w1 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +staging 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +counter-next 631c15d5f14dd25b2dd0401627b716087ceca343 +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +cgroup 78d44b824ed04dd1553c55c5b839c9a55cbcaf4e +scsi bd198f03568f34e8f61308b0a19388b037d4d0f4 +scsi-mkp d32533d30e2119b0c0aa17596734f1f842f750df +vhost 1acfe2c1225899eab5ab724c91b7e1eb2881b9ab +rpmsg d1a8ac11ee72c192611b0cae98ad6304314f9ae7 +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 7777fa924754f69f9748d6fe730b1e6f38adf252 +gpio-intel 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +pinctrl 020e9c593a0d3c3c41fbf537ce3cfd7793430981 +pinctrl-intel 2d325e54d9e2e4ae247c9fd03f810208ce958c51 +pinctrl-renesas 21c11421db1fdd5ed7c8ea7048178b365185cd3a +pinctrl-samsung 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +pwm 4aae44f65827f0213a7361cf9c32cfe06114473f +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest 3f3f384139ed147c71e1d770accf610133d5309b +kunit 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +kunit-next 9076bc476d7ebf0565903c4b048442131825c1c3 +livepatching ac4890f972116f84253934570b2c2a74e50227f3 +rtc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +nvdimm 08ca6906a4b7e48f8e93b7c1f49a742a415be6d5 +at24 4cdc5dbbc1df36c4d7c93c7c15dde88e997922c2 +ntb 643982232860887fed493144957ea5794b6557d1 +seccomp 46822860a5a9a5a558475d323a55c8aab0b54012 +fsi f04d61a379d65794d5d85168b84dcdf01d426f7c +slimbus 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +nvmem 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv 284930a0146ade1ce0250a1d3bae7a675af4bb3b +auxdisplay 35b464e32c8bccef435e415db955787ead4ab44c +kgdb b6464883f45ae6412de33e53587974fd86ba811e +hmm 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi 0724869ede9c169429bb622e2d28f97995a95656 +memblock 0f5e4adb608c79bedd8ced30f9ffdcfa01c37459 +cxl fe77cc2e5a6a7c85f5c6ef8a39d7694ffc7f41c9 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi b691118f2c44d16b84fc65b8147b33620eb18cac +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 46a9ea6681907a3be6b6b0d43776dccc62cad6cf +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock 2a2015495142ee0a35711b5dcf7b215c31489f27 +rust 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +sysctl 53f3811dfd5e39507ee3aaea1be09aabce8f9c98 +execve fdf0eaf11452d72945af31804e2a1048ee1b574c +bitmap bcafd8b927ed61849f6e7062607fa57c6fb31233 +hte 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +kspp 5f536ac6a5a7b67351e4e5ae4f9e1e57d31268e6 +kspp-gustavo 4d8cbf6dbcdaebe949461b0a933ae4c71cb53edc +nolibc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +iommufd 0bb80ecc33a8fb5a682236443c1e740d5c917d1d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..9af9450104ce --- /dev/null +++ b/Next/Trees @@ -0,0 +1,370 @@ +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 https://git.linuxtv.org/media_stage.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 +pmdomain-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.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 +bcachefs git https://evilpiepirate.org/git/bcachefs.git#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 +pmdomain git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#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-ci git git://git.freedesktop.org/git/drm/drm.git#topic/drm-ci +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 +chrome-platform-firmware git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-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#slab/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 +nolibc git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#nolibc +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 000000000000..aa2fc43a3713 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4305 @@ +$ date -R +Thu, 14 Sep 2023 08:51:23 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 3669558bdf35 Merge tag 'for-6.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux +Merging origin/master (aed8aee11130 Merge tag 'pmdomain-v6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 3669558bdf35..aed8aee11130 +Fast-forward (no commit created; -m option ignored) + MAINTAINERS | 22 +++---- + arch/parisc/include/asm/cache.h | 1 + + arch/parisc/include/asm/mckinley.h | 8 --- + arch/parisc/include/asm/pdc.h | 5 +- + arch/parisc/include/asm/processor.h | 1 + + arch/parisc/include/asm/ropes.h | 7 ++- + arch/parisc/include/asm/shmparam.h | 15 +++++ + arch/parisc/kernel/asm-offsets.c | 2 + + arch/parisc/kernel/cache.c | 8 +-- + arch/parisc/kernel/drivers.c | 2 +- + arch/parisc/kernel/firmware.c | 56 +++++++++++++---- + arch/parisc/kernel/head.S | 16 ++++- + arch/parisc/kernel/irq.c | 2 +- + arch/parisc/kernel/processor.c | 2 + + arch/parisc/kernel/vmlinux.lds.S | 1 + + arch/parisc/mm/init.c | 72 ++++++++++++++++++++++ + drivers/Makefile | 2 +- + drivers/char/agp/parisc-agp.c | 2 - + drivers/char/tpm/tpm-chip.c | 2 +- + drivers/parisc/ccio-dma.c | 18 +++--- + drivers/parisc/iommu-helpers.h | 8 +-- + drivers/parisc/iosapic.c | 4 +- + drivers/parisc/iosapic_private.h | 4 +- + drivers/parisc/sba_iommu.c | 38 +++++------- + drivers/{genpd => pmdomain}/Makefile | 0 + drivers/{genpd => pmdomain}/actions/Makefile | 0 + .../{genpd => pmdomain}/actions/owl-sps-helper.c | 0 + drivers/{genpd => pmdomain}/actions/owl-sps.c | 0 + drivers/{genpd => pmdomain}/amlogic/Makefile | 0 + .../{genpd => pmdomain}/amlogic/meson-ee-pwrc.c | 0 + .../amlogic/meson-gx-pwrc-vpu.c | 0 + .../amlogic/meson-secure-pwrc.c | 0 + drivers/{genpd => pmdomain}/apple/Makefile | 0 + drivers/{genpd => pmdomain}/apple/pmgr-pwrstate.c | 0 + drivers/{genpd => pmdomain}/bcm/Makefile | 0 + drivers/{genpd => pmdomain}/bcm/bcm-pmb.c | 0 + drivers/{genpd => pmdomain}/bcm/bcm2835-power.c | 0 + drivers/{genpd => pmdomain}/bcm/bcm63xx-power.c | 0 + .../{genpd => pmdomain}/bcm/raspberrypi-power.c | 0 + drivers/{genpd => pmdomain}/imx/Makefile | 0 + drivers/{genpd => pmdomain}/imx/gpc.c | 0 + drivers/{genpd => pmdomain}/imx/gpcv2.c | 0 + drivers/{genpd => pmdomain}/imx/imx8m-blk-ctrl.c | 0 + drivers/{genpd => pmdomain}/imx/imx8mp-blk-ctrl.c | 0 + drivers/{genpd => pmdomain}/imx/imx93-blk-ctrl.c | 0 + drivers/{genpd => pmdomain}/imx/imx93-pd.c | 0 + drivers/{genpd => pmdomain}/imx/scu-pd.c | 0 + drivers/{genpd => pmdomain}/mediatek/Makefile | 0 + .../mediatek/mt6795-pm-domains.h | 0 + .../mediatek/mt8167-pm-domains.h | 0 + .../mediatek/mt8173-pm-domains.h | 0 + .../mediatek/mt8183-pm-domains.h | 0 + .../mediatek/mt8186-pm-domains.h | 0 + .../mediatek/mt8188-pm-domains.h | 0 + .../mediatek/mt8192-pm-domains.h | 0 + .../mediatek/mt8195-pm-domains.h | 0 + .../{genpd => pmdomain}/mediatek/mtk-pm-domains.c | 0 + .../{genpd => pmdomain}/mediatek/mtk-pm-domains.h | 0 + drivers/{genpd => pmdomain}/mediatek/mtk-scpsys.c | 0 + drivers/{genpd => pmdomain}/qcom/Makefile | 0 + drivers/{genpd => pmdomain}/qcom/cpr.c | 0 + drivers/{genpd => pmdomain}/qcom/rpmhpd.c | 0 + drivers/{genpd => pmdomain}/qcom/rpmpd.c | 0 + drivers/{genpd => pmdomain}/renesas/Makefile | 0 + drivers/{genpd => pmdomain}/renesas/r8a7742-sysc.c | 0 + drivers/{genpd => pmdomain}/renesas/r8a7743-sysc.c | 0 + drivers/{genpd => pmdomain}/renesas/r8a7745-sysc.c | 0 + .../{genpd => pmdomain}/renesas/r8a77470-sysc.c | 0 + .../{genpd => pmdomain}/renesas/r8a774a1-sysc.c | 0 + .../{genpd => pmdomain}/renesas/r8a774b1-sysc.c | 0 + .../{genpd => pmdomain}/renesas/r8a774c0-sysc.c | 0 + .../{genpd => pmdomain}/renesas/r8a774e1-sysc.c | 0 + drivers/{genpd => pmdomain}/renesas/r8a7779-sysc.c | 0 + drivers/{genpd => pmdomain}/renesas/r8a7790-sysc.c | 0 + drivers/{genpd => pmdomain}/renesas/r8a7791-sysc.c | 0 + drivers/{genpd => pmdomain}/renesas/r8a7792-sysc.c | 0 + drivers/{genpd => pmdomain}/renesas/r8a7794-sysc.c | 0 + drivers/{genpd => pmdomain}/renesas/r8a7795-sysc.c | 0 + drivers/{genpd => pmdomain}/renesas/r8a7796-sysc.c | 0 + .../{genpd => pmdomain}/renesas/r8a77965-sysc.c | 0 + .../{genpd => pmdomain}/renesas/r8a77970-sysc.c | 0 + .../{genpd => pmdomain}/renesas/r8a77980-sysc.c | 0 + .../{genpd => pmdomain}/renesas/r8a77990-sysc.c | 0 + .../{genpd => pmdomain}/renesas/r8a77995-sysc.c | 0 + .../{genpd => pmdomain}/renesas/r8a779a0-sysc.c | 0 + .../{genpd => pmdomain}/renesas/r8a779f0-sysc.c | 0 + .../{genpd => pmdomain}/renesas/r8a779g0-sysc.c | 0 + .../{genpd => pmdomain}/renesas/rcar-gen4-sysc.c | 0 + .../{genpd => pmdomain}/renesas/rcar-gen4-sysc.h | 0 + drivers/{genpd => pmdomain}/renesas/rcar-sysc.c | 0 + drivers/{genpd => pmdomain}/renesas/rcar-sysc.h | 0 + drivers/{genpd => pmdomain}/renesas/rmobile-sysc.c | 0 + drivers/{genpd => pmdomain}/rockchip/Makefile | 0 + drivers/{genpd => pmdomain}/rockchip/pm-domains.c | 0 + drivers/{genpd => pmdomain}/samsung/Makefile | 0 + .../samsung/exynos-pm-domains.c | 0 + drivers/{genpd => pmdomain}/st/Makefile | 0 + .../{genpd => pmdomain}/st/ste-ux500-pm-domain.c | 0 + drivers/{genpd => pmdomain}/starfive/Makefile | 0 + drivers/{genpd => pmdomain}/starfive/jh71xx-pmu.c | 0 + drivers/{genpd => pmdomain}/sunxi/Makefile | 0 + drivers/{genpd => pmdomain}/sunxi/sun20i-ppu.c | 0 + drivers/{genpd => pmdomain}/tegra/Makefile | 0 + drivers/{genpd => pmdomain}/tegra/powergate-bpmp.c | 0 + drivers/{genpd => pmdomain}/ti/Makefile | 0 + drivers/{genpd => pmdomain}/ti/omap_prm.c | 0 + drivers/{genpd => pmdomain}/ti/ti_sci_pm_domains.c | 0 + drivers/{genpd => pmdomain}/xilinx/Makefile | 0 + .../{genpd => pmdomain}/xilinx/zynqmp-pm-domains.c | 0 + fs/tracefs/event_inode.c | 59 +++++++++++++++--- + fs/tracefs/inode.c | 5 +- + fs/tracefs/internal.h | 5 +- + include/linux/export-internal.h | 2 + + include/linux/trace_events.h | 7 +-- + kernel/trace/ring_buffer.c | 7 +++ + kernel/trace/trace.c | 72 +++++++++++++++++++--- + kernel/trace/trace.h | 2 + + kernel/trace/trace_events.c | 32 ++++------ + kernel/trace/trace_events_inject.c | 3 +- + kernel/trace/trace_events_synth.c | 2 +- + scripts/mod/modpost.c | 9 +++ + .../trigger-synthetic-event-dynstring.tc | 2 +- + .../trigger-synthetic_event_syntax_errors.tc | 2 +- + 123 files changed, 372 insertions(+), 135 deletions(-) + delete mode 100644 arch/parisc/include/asm/mckinley.h + rename drivers/{genpd => pmdomain}/Makefile (100%) + rename drivers/{genpd => pmdomain}/actions/Makefile (100%) + rename drivers/{genpd => pmdomain}/actions/owl-sps-helper.c (100%) + rename drivers/{genpd => pmdomain}/actions/owl-sps.c (100%) + rename drivers/{genpd => pmdomain}/amlogic/Makefile (100%) + rename drivers/{genpd => pmdomain}/amlogic/meson-ee-pwrc.c (100%) + rename drivers/{genpd => pmdomain}/amlogic/meson-gx-pwrc-vpu.c (100%) + rename drivers/{genpd => pmdomain}/amlogic/meson-secure-pwrc.c (100%) + rename drivers/{genpd => pmdomain}/apple/Makefile (100%) + rename drivers/{genpd => pmdomain}/apple/pmgr-pwrstate.c (100%) + rename drivers/{genpd => pmdomain}/bcm/Makefile (100%) + rename drivers/{genpd => pmdomain}/bcm/bcm-pmb.c (100%) + rename drivers/{genpd => pmdomain}/bcm/bcm2835-power.c (100%) + rename drivers/{genpd => pmdomain}/bcm/bcm63xx-power.c (100%) + rename drivers/{genpd => pmdomain}/bcm/raspberrypi-power.c (100%) + rename drivers/{genpd => pmdomain}/imx/Makefile (100%) + rename drivers/{genpd => pmdomain}/imx/gpc.c (100%) + rename drivers/{genpd => pmdomain}/imx/gpcv2.c (100%) + rename drivers/{genpd => pmdomain}/imx/imx8m-blk-ctrl.c (100%) + rename drivers/{genpd => pmdomain}/imx/imx8mp-blk-ctrl.c (100%) + rename drivers/{genpd => pmdomain}/imx/imx93-blk-ctrl.c (100%) + rename drivers/{genpd => pmdomain}/imx/imx93-pd.c (100%) + rename drivers/{genpd => pmdomain}/imx/scu-pd.c (100%) + rename drivers/{genpd => pmdomain}/mediatek/Makefile (100%) + rename drivers/{genpd => pmdomain}/mediatek/mt6795-pm-domains.h (100%) + rename drivers/{genpd => pmdomain}/mediatek/mt8167-pm-domains.h (100%) + rename drivers/{genpd => pmdomain}/mediatek/mt8173-pm-domains.h (100%) + rename drivers/{genpd => pmdomain}/mediatek/mt8183-pm-domains.h (100%) + rename drivers/{genpd => pmdomain}/mediatek/mt8186-pm-domains.h (100%) + rename drivers/{genpd => pmdomain}/mediatek/mt8188-pm-domains.h (100%) + rename drivers/{genpd => pmdomain}/mediatek/mt8192-pm-domains.h (100%) + rename drivers/{genpd => pmdomain}/mediatek/mt8195-pm-domains.h (100%) + rename drivers/{genpd => pmdomain}/mediatek/mtk-pm-domains.c (100%) + rename drivers/{genpd => pmdomain}/mediatek/mtk-pm-domains.h (100%) + rename drivers/{genpd => pmdomain}/mediatek/mtk-scpsys.c (100%) + rename drivers/{genpd => pmdomain}/qcom/Makefile (100%) + rename drivers/{genpd => pmdomain}/qcom/cpr.c (100%) + rename drivers/{genpd => pmdomain}/qcom/rpmhpd.c (100%) + rename drivers/{genpd => pmdomain}/qcom/rpmpd.c (100%) + rename drivers/{genpd => pmdomain}/renesas/Makefile (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a7742-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a7743-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a7745-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a77470-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a774a1-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a774b1-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a774c0-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a774e1-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a7779-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a7790-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a7791-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a7792-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a7794-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a7795-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a7796-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a77965-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a77970-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a77980-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a77990-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a77995-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a779a0-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a779f0-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/r8a779g0-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/rcar-gen4-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/rcar-gen4-sysc.h (100%) + rename drivers/{genpd => pmdomain}/renesas/rcar-sysc.c (100%) + rename drivers/{genpd => pmdomain}/renesas/rcar-sysc.h (100%) + rename drivers/{genpd => pmdomain}/renesas/rmobile-sysc.c (100%) + rename drivers/{genpd => pmdomain}/rockchip/Makefile (100%) + rename drivers/{genpd => pmdomain}/rockchip/pm-domains.c (100%) + rename drivers/{genpd => pmdomain}/samsung/Makefile (100%) + rename drivers/{genpd => pmdomain}/samsung/exynos-pm-domains.c (100%) + rename drivers/{genpd => pmdomain}/st/Makefile (100%) + rename drivers/{genpd => pmdomain}/st/ste-ux500-pm-domain.c (100%) + rename drivers/{genpd => pmdomain}/starfive/Makefile (100%) + rename drivers/{genpd => pmdomain}/starfive/jh71xx-pmu.c (100%) + rename drivers/{genpd => pmdomain}/sunxi/Makefile (100%) + rename drivers/{genpd => pmdomain}/sunxi/sun20i-ppu.c (100%) + rename drivers/{genpd => pmdomain}/tegra/Makefile (100%) + rename drivers/{genpd => pmdomain}/tegra/powergate-bpmp.c (100%) + rename drivers/{genpd => pmdomain}/ti/Makefile (100%) + rename drivers/{genpd => pmdomain}/ti/omap_prm.c (100%) + rename drivers/{genpd => pmdomain}/ti/ti_sci_pm_domains.c (100%) + rename drivers/{genpd => pmdomain}/xilinx/Makefile (100%) + rename drivers/{genpd => pmdomain}/xilinx/zynqmp-pm-domains.c (100%) +Merging fixes/fixes (2dde18cd1d8f Linux 6.5) +$ 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 (ff9c40b17507 mips: use nth_page() in place of direct struct page manipulation) +$ 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. + arch/mips/mm/cache.c | 2 +- + arch/sh/mm/ioremap.c | 4 ++-- + fs/hugetlbfs/inode.c | 4 ++-- + kernel/pid.c | 2 +- + kernel/task_work.c | 1 + + lib/argv_split.c | 4 ++-- + lib/scatterlist.c | 4 +++- + mm/cma.c | 2 +- + mm/hugetlb.c | 2 +- + mm/memory.c | 3 +++ + mm/memory_hotplug.c | 2 +- + mm/page_alloc.c | 12 ++++++------ + mm/shmem.c | 19 ++++++++++++++++++- + scripts/gdb/linux/symbols.py | 23 ++--------------------- + tools/testing/selftests/fchmodat2/Makefile | 2 +- + tools/testing/selftests/openat2/Makefile | 2 +- + tools/testing/selftests/proc/proc-empty-vm.c | 1 + + 17 files changed, 47 insertions(+), 42 deletions(-) +Merging kbuild-current/fixes (6ccbd7fd4746 alpha: remove __init annotation from exported page_is_ram()) +$ 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 (6995e2de6891 Linux 6.4) +$ 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 (8bd795fedb84 arm64: csum: Fix OoB access in IP checksum code for negative lengths) +$ 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 +Already up to date. +Merging arm-soc-fixes/arm/fixes (3c78dbf25135 Merge tag 'qcom-arm64-fixes-for-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes) +$ 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 (0bb80ecc33a8 Linux 6.6-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 (010d358b9087 m68k: sun3/3x: Add and use "sun3.h") +$ 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 +Merge made by the 'ort' strategy. + arch/m68k/amiga/amiga.h | 5 ++++ + arch/m68k/amiga/amisound.c | 2 ++ + arch/m68k/amiga/config.c | 4 +-- + arch/m68k/amiga/pcmcia.c | 3 +-- + arch/m68k/apollo/apollo.h | 4 +++ + arch/m68k/apollo/config.c | 45 +++++++------------------------ + arch/m68k/apollo/dn_ints.c | 8 +++--- + arch/m68k/atari/ataints.c | 3 +-- + arch/m68k/atari/atakeyb.c | 2 +- + arch/m68k/atari/atari.h | 15 +++++++++++ + arch/m68k/atari/atasound.c | 1 + + arch/m68k/atari/config.c | 13 +++------ + arch/m68k/atari/stdma.c | 1 + + arch/m68k/atari/stram.c | 2 +- + arch/m68k/atari/time.c | 2 ++ + arch/m68k/bvme6000/config.c | 2 +- + arch/m68k/emu/natfeat.c | 3 +-- + arch/m68k/emu/nfeth.c | 2 +- + arch/m68k/hp300/time.c | 2 ++ + arch/m68k/include/asm/dvma.h | 8 +++++- + arch/m68k/include/asm/oplib.h | 4 ++- + arch/m68k/include/asm/pgtable.h | 9 +++++++ + arch/m68k/include/asm/pgtable_no.h | 1 - + arch/m68k/include/asm/syscalls.h | 19 ++++++++++++++ + arch/m68k/include/asm/tlbflush.h | 1 + + arch/m68k/kernel/early_printk.c | 4 +-- + arch/m68k/kernel/ints.c | 2 ++ + arch/m68k/kernel/ints.h | 7 +++++ + arch/m68k/kernel/process.c | 1 + + arch/m68k/kernel/process.h | 8 ++++++ + arch/m68k/kernel/ptrace.c | 2 ++ + arch/m68k/kernel/ptrace.h | 6 +++++ + arch/m68k/kernel/setup_mm.c | 2 -- + arch/m68k/kernel/signal.c | 4 ++- + arch/m68k/kernel/signal.h | 7 +++++ + arch/m68k/kernel/sys_m68k.c | 4 +-- + arch/m68k/kernel/traps.c | 11 ++++---- + arch/m68k/kernel/traps.h | 10 +++++++ + arch/m68k/kernel/vectors.c | 3 +++ + arch/m68k/kernel/vectors.h | 3 +++ + arch/m68k/mac/baboon.c | 2 ++ + arch/m68k/mac/config.c | 14 +++------- + arch/m68k/mac/iop.c | 2 ++ + arch/m68k/mac/mac.h | 25 ++++++++++++++++++ + arch/m68k/mac/macboing.c | 11 ++------ + arch/m68k/mac/misc.c | 5 ++-- + arch/m68k/mac/oss.c | 2 ++ + arch/m68k/mac/psc.c | 2 ++ + arch/m68k/mac/via.c | 2 ++ + arch/m68k/math-emu/fp_arith.c | 49 ++++++++++++---------------------- + arch/m68k/math-emu/fp_arith.h | 47 +++++++++++++-------------------- + arch/m68k/math-emu/fp_log.c | 46 ++++++++++++-------------------- + arch/m68k/math-emu/fp_log.h | 44 +++++++++++++++++++++++++++++++ + arch/m68k/math-emu/fp_trig.c | 54 +++++++++++++------------------------- + arch/m68k/math-emu/fp_trig.h | 25 +++++++++++++++--- + arch/m68k/math-emu/multi_arith.h | 8 +++--- + arch/m68k/mm/fault.c | 2 ++ + arch/m68k/mm/fault.h | 7 +++++ + arch/m68k/mm/hwtest.c | 2 ++ + arch/m68k/mm/sun3kmap.c | 6 ++--- + arch/m68k/mm/sun3mmu.c | 2 +- + arch/m68k/mvme147/config.c | 2 +- + arch/m68k/mvme16x/config.c | 5 ++-- + arch/m68k/mvme16x/mvme16x.h | 6 +++++ + arch/m68k/q40/config.c | 6 ++--- + arch/m68k/q40/q40.h | 6 +++++ + arch/m68k/q40/q40ints.c | 2 ++ + arch/m68k/sun3/config.c | 13 +++++---- + arch/m68k/sun3/idprom.c | 4 ++- + arch/m68k/sun3/intersil.c | 1 + + arch/m68k/sun3/leds.c | 2 ++ + arch/m68k/sun3/mmu_emu.c | 3 ++- + arch/m68k/sun3/prom/printf.c | 5 ++-- + arch/m68k/sun3/sun3.h | 22 ++++++++++++++++ + arch/m68k/sun3/sun3dvma.c | 17 ------------ + arch/m68k/sun3/sun3ints.c | 2 +- + arch/m68k/sun3x/config.c | 6 ++--- + arch/m68k/sun3x/dvma.c | 5 ++-- + arch/m68k/sun3x/prom.c | 2 +- + 79 files changed, 421 insertions(+), 280 deletions(-) + create mode 100644 arch/m68k/amiga/amiga.h + create mode 100644 arch/m68k/apollo/apollo.h + create mode 100644 arch/m68k/atari/atari.h + create mode 100644 arch/m68k/include/asm/syscalls.h + create mode 100644 arch/m68k/kernel/ints.h + create mode 100644 arch/m68k/kernel/process.h + create mode 100644 arch/m68k/kernel/ptrace.h + create mode 100644 arch/m68k/kernel/signal.h + create mode 100644 arch/m68k/kernel/traps.h + create mode 100644 arch/m68k/kernel/vectors.h + create mode 100644 arch/m68k/mac/mac.h + create mode 100644 arch/m68k/math-emu/fp_log.h + create mode 100644 arch/m68k/mm/fault.h + create mode 100644 arch/m68k/mvme16x/mvme16x.h + create mode 100644 arch/m68k/q40/q40.h + create mode 100644 arch/m68k/sun3/sun3.h +Merging powerpc-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (e5b7ca09e9aa Merge tag 's390-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ 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 (bc6ed2fa24b1 igb: clean up in all error paths when enabling SR-IOV) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + drivers/net/dsa/sja1105/sja1105.h | 2 + + drivers/net/dsa/sja1105/sja1105_dynamic_config.c | 91 ++++++++++------------ + drivers/net/dsa/sja1105/sja1105_main.c | 69 +++++++++++----- + drivers/net/ethernet/adi/adin1110.c | 2 +- + drivers/net/ethernet/broadcom/asp2/bcmasp.c | 10 ++- + drivers/net/ethernet/broadcom/asp2/bcmasp.h | 4 +- + .../net/ethernet/broadcom/asp2/bcmasp_ethtool.c | 2 +- + drivers/net/ethernet/cadence/macb_main.c | 5 +- + drivers/net/ethernet/intel/igb/igb_main.c | 5 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 28 +++---- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 5 ++ + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 6 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.h | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 43 ++-------- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 3 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 7 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 30 +++++-- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 4 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 8 +- + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 6 +- + drivers/net/ethernet/microchip/vcap/vcap_api.c | 18 ++++- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 ++- + drivers/net/usb/r8152.c | 3 + + drivers/net/veth.c | 2 + + include/net/ipv6.h | 7 +- + net/hsr/hsr_forward.c | 1 + + net/ipv4/devinet.c | 10 +-- + net/ipv4/inet_hashtables.c | 52 +++++++------ + net/kcm/kcmsock.c | 2 + + net/smc/smc_core.c | 2 + + net/smc/smc_stats.h | 3 +- + net/tls/tls_sw.c | 4 +- + tools/testing/selftests/net/bind_bhash.sh | 26 ++++--- + tools/testing/selftests/net/bind_wildcard.c | 68 +++++++++++++--- + 34 files changed, 335 insertions(+), 205 deletions(-) +Merging bpf/master (8a19edd4fa6f selftests/bpf: Fix kprobe_multi_test/attach_override test) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + include/uapi/linux/bpf.h | 4 +- + kernel/bpf/btf.c | 2 +- + kernel/bpf/cgroup.c | 13 ++- + kernel/bpf/memalloc.c | 87 ++++++++++++++- + kernel/bpf/offload.c | 12 +- + kernel/bpf/queue_stack_maps.c | 21 +++- + kernel/trace/bpf_trace.c | 16 +++ + tools/include/uapi/linux/bpf.h | 4 +- + tools/testing/selftests/bpf/DENYLIST.aarch64 | 10 +- + tools/testing/selftests/bpf/config | 1 + + tools/testing/selftests/bpf/config.x86_64 | 1 - + tools/testing/selftests/bpf/prog_tests/empty_skb.c | 12 +- + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 37 +++++++ + .../testing/selftests/bpf/prog_tests/test_bpf_ma.c | 50 +++++++++ + .../selftests/bpf/prog_tests/xdp_dev_bound_only.c | 61 ++++++++++ + .../selftests/bpf/progs/kprobe_multi_override.c | 13 +++ + tools/testing/selftests/bpf/progs/test_bpf_ma.c | 123 +++++++++++++++++++++ + tools/testing/selftests/bpf/test_verifier.c | 2 +- + 18 files changed, 436 insertions(+), 33 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_bpf_ma.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_dev_bound_only.c + create mode 100644 tools/testing/selftests/bpf/progs/kprobe_multi_override.c + create mode 100644 tools/testing/selftests/bpf/progs/test_bpf_ma.c +Merging ipsec/master (f7c4e3e5d4f6 xfrm: interface: use DEV_STATS_INC()) +$ 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/xfrm/xfrm_interface_core.c | 22 ++++++++++------------ + net/xfrm/xfrm_policy.c | 19 +++++++++++++------ + 2 files changed, 23 insertions(+), 18 deletions(-) +Merging netfilter/main (7153a404fb70 Merge tag 'nf-23-09-06' of https://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/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (931abcdcad10 Merge branch 'mlxsw-fixes') +$ 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 (6e48ebffc2db wifi: mac80211: fix mesh id corruption on 32 bit systems) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 10 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 117 +++++++++++---------- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 3 + + .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 22 +++- + drivers/net/wireless/marvell/mwifiex/fw.h | 2 +- + drivers/net/wireless/mediatek/mt76/dma.c | 8 +- + include/net/cfg80211.h | 6 +- + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/mesh.c | 8 +- + net/mac80211/mlme.c | 11 +- + net/wireless/core.c | 14 +-- + net/wireless/core.h | 7 +- + net/wireless/mlme.c | 3 +- + net/wireless/nl80211.c | 114 ++++++++++++++------ + 16 files changed, 203 insertions(+), 132 deletions(-) +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 (0bb80ecc33a8 Linux 6.6-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 (26f7111abd8e ALSA: usb-audio: mixer: Remove temporary string use in parse_clock_source_unit) +$ 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. + Documentation/sound/designs/midi-2.0.rst | 4 ++-- + sound/core/init.c | 7 ++----- + sound/core/seq/seq_ump_client.c | 22 ++++++++++++++++++++++ + sound/core/seq/seq_ump_convert.c | 2 ++ + sound/hda/intel-sdw-acpi.c | 8 ++++---- + sound/pci/hda/cs35l56_hda.c | 1 + + sound/pci/hda/cs35l56_hda_i2c.c | 1 - + sound/pci/hda/patch_realtek.c | 9 ++++++--- + sound/usb/mixer.c | 6 ++---- + tools/testing/selftests/alsa/conf.c | 1 - + tools/testing/selftests/alsa/mixer-test.c | 11 +++-------- + tools/testing/selftests/alsa/pcm-test.c | 4 ++-- + tools/testing/selftests/alsa/test-pcmtest-driver.c | 1 - + 13 files changed, 46 insertions(+), 31 deletions(-) +Merging sound-asoc-fixes/for-linus (cf0ba445f5e4 ASoC: codecs: aw88395: Fix some error codes) +$ 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 +Merge made by the 'ort' strategy. + sound/soc/amd/yc/acp6x-mach.c | 21 ++++++++++++++ + sound/soc/codecs/aw88395/aw88395_lib.c | 2 ++ + sound/soc/codecs/cs35l56-i2c.c | 1 - + sound/soc/codecs/cs35l56.c | 1 + + sound/soc/codecs/rt5640.c | 29 ++++++++----------- + sound/soc/codecs/wm8960.c | 19 +++++++++---- + sound/soc/fsl/imx-pcm-rpmsg.c | 1 + + sound/soc/meson/axg-spdifin.c | 49 +++++++++++--------------------- + sound/soc/sh/rcar/core.c | 1 + + sound/soc/soc-pcm.c | 23 +++++++-------- + sound/soc/soc-utils.c | 1 + + sound/soc/tegra/tegra_audio_graph_card.c | 30 ++++++++++--------- + 12 files changed, 98 insertions(+), 80 deletions(-) +Merging regmap-fixes/for-linus (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (6223e073db78 regulator: Fix voltage range selection) +$ 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/helpers.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi-fixes/for-linus (9855d60cfc72 spi: intel-pci: Add support for Granite Rapids SPI serial flash) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-intel-pci.c | 1 + + drivers/spi/spi-nxp-fspi.c | 7 +++++++ + drivers/spi/spi-stm32.c | 8 ++++++++ + 3 files changed, 16 insertions(+) +Merging pci-current/for-linus (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (fd6f7ad2fd4d driver core: return an error when dev_set_name() hasn't happened) +$ 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 +Merge made by the 'ort' strategy. + drivers/base/core.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging tty.current/tty-linus (0bb80ecc33a8 Linux 6.6-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 (f26a679ed799 usb: typec: ucsi: Fix NULL pointer dereference) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/typec/ucsi/debugfs.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging usb-serial-fixes/usb-linus (0bb80ecc33a8 Linux 6.6-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 (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (0bb80ecc33a8 Linux 6.6-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 (00be24c416e4 iio: light: vcnl4000: Don't power on/off chip in config) +$ 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. + Documentation/devicetree/bindings/iio/light/rohm,bu27010.yaml | 1 + + drivers/iio/adc/imx8qxp-adc.c | 4 ++-- + drivers/iio/addac/Kconfig | 2 ++ + drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c | 6 +++++- + drivers/iio/dac/ad3552r.c | 4 ++-- + drivers/iio/frequency/admv1013.c | 4 ++-- + drivers/iio/imu/bno055/Kconfig | 2 ++ + drivers/iio/light/vcnl4000.c | 1 - + drivers/iio/pressure/bmp280-core.c | 2 +- + drivers/iio/pressure/dps310.c | 8 ++++---- + drivers/iio/proximity/irsd200.c | 6 +++--- + 11 files changed, 24 insertions(+), 16 deletions(-) +Merging counter-current/counter-current (df8fdd01c98b counter: microchip-tcb-capture: Fix the use of internal GCLK logic) +$ 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/microchip-tcb-capture.c +Merge made by the 'ort' strategy. + drivers/counter/counter-chrdev.c | 4 ++-- + drivers/counter/microchip-tcb-capture.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging char-misc.current/char-misc-linus (98a158166360 Revert "comedi: add HAS_IOPORT dependencies") +$ 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 +Merge made by the 'ort' strategy. + drivers/comedi/Kconfig | 103 +++++++++++++++++-------------------------------- + 1 file changed, 35 insertions(+), 68 deletions(-) +Merging soundwire-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 (1ac731c529cd Merge branch 'next' into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (ba22e81872c1 crypto: powerpc/chacha20,poly1305-p10 - Add dependency on VSX) +$ 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 (7e021da80f48 selftests: tracing: Fix to unmount tracefs for recovering environment) +$ 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/ftrace/ftracetest | 18 +++- + tools/testing/selftests/user_events/abi_test.c | 3 + + tools/testing/selftests/user_events/config | 1 + + tools/testing/selftests/user_events/dyn_test.c | 2 + + tools/testing/selftests/user_events/ftrace_test.c | 3 + + tools/testing/selftests/user_events/perf_test.c | 3 + + .../selftests/user_events/user_events_selftests.h | 100 +++++++++++++++++++++ + 7 files changed, 129 insertions(+), 1 deletion(-) + create mode 100644 tools/testing/selftests/user_events/config + create mode 100644 tools/testing/selftests/user_events/user_events_selftests.h +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 (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +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 (9836a987860e mtd: spinand: micron: correct bitmask for ecc status) +$ 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/maps/physmap-core.c | 11 +++++++++++ + drivers/mtd/nand/raw/marvell_nand.c | 23 ++++++++++++++++++++++- + drivers/mtd/nand/spi/micron.c | 2 +- + 3 files changed, 34 insertions(+), 2 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes +Already up to date. +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 (6eaae1980760 Linux 6.5-rc3) +$ 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 (06f114cf7cbe Merge branches 'fixes-mapphone' and 'fixes-ti-sysc' 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 +Merge made by the 'ort' strategy. + .../boot/dts/ti/omap/motorola-mapphone-common.dtsi | 5 ++-- + arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi | 3 +-- + arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi | 5 +++- + arch/arm/boot/dts/ti/omap/omap443x.dtsi | 1 + + arch/arm/boot/dts/ti/omap/omap4460.dtsi | 1 + + arch/arm/mach-omap2/pm44xx.c | 4 +-- + drivers/bus/ti-sysc.c | 31 +++++++++++++++------- + 7 files changed, 34 insertions(+), 16 deletions(-) +Merging kvm-fixes/master (d5ad9aae13dc selftests/rseq: Fix build with undefined __weak) +$ 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 (c2fceb59bbda KVM: s390: pv: fix index value of replaced ASCE) +$ 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 (55b8ff06a0c7 cxl/pci: Replace host_bridge->native_aer with pcie_aer_is_native()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Merge made by the 'ort' strategy. + drivers/cxl/pci.c | 7 +++---- + drivers/pci/pcie/aer.c | 1 + + drivers/pci/pcie/portdrv.h | 2 -- + include/linux/aer.h | 2 ++ + 4 files changed, 6 insertions(+), 6 deletions(-) +Merging btrfs-fixes/next-fixes (850c8ce8d391 Merge branch 'misc-6.6' 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 +Merge made by the 'ort' strategy. + fs/btrfs/delayed-ref.c | 46 +++++++++++++++++++++++++++--------- + fs/btrfs/delayed-ref.h | 1 - + fs/btrfs/extent_io.c | 9 +------ + fs/btrfs/file.c | 16 +++++++++++-- + fs/btrfs/inode.c | 33 ++++++++++++++++++-------- + fs/btrfs/transaction.c | 6 ++--- + fs/btrfs/verity.c | 64 ++++++++++++++++++++++++-------------------------- + 7 files changed, 107 insertions(+), 68 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 (4106a70ddad5 platform/x86: asus-wmi: Support 2023 ROG X16 tablet mode) +$ 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 (0bb80ecc33a8 Linux 6.6-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 (0bb80ecc33a8 Linux 6.6-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 (55e95bfccf6d of: dynamic: Fix potential memory leak in of_changeset_action()) +$ 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/dynamic.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging dt-krzk-fixes/fixes (0bb80ecc33a8 Linux 6.6-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 (812fe6420a6e scsi: storvsc: Handle additional SRB status values) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (afaf2b38025a Merge tag 'drm-misc-next-fixes-2023-09-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/drm_exec.c | 2 +- + include/drm/drm_exec.h | 35 +++++++++++++++++++++++++++++++---- + 2 files changed, 32 insertions(+), 5 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (7c95ec3b5947 drm/i915: Only check eDP HPD when AUX CH is shared) +$ 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_bios.c | 21 +++++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_bios.h | 1 + + drivers/gpu/drm/i915/display/intel_dp.c | 7 ++++++- + 3 files changed, 28 insertions(+), 1 deletion(-) +Merging mmc-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +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 (0bb80ecc33a8 Linux 6.6-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 (6ad0f2f91ad1 Drivers: hv: vmbus: Remove unused extern declaration vmbus_ontimer()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +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 (8eb8fe67e2c8 riscv: errata: fix T-Head dcache.cva encoding) +$ 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. + arch/riscv/include/asm/errata_list.h | 4 ++-- + arch/riscv/kernel/elf_kexec.c | 8 +++++++- + 2 files changed, 9 insertions(+), 3 deletions(-) +Merging riscv-dt-fixes/riscv-dt-fixes (1558209533f1 riscv: dts: starfive: visionfive 2: Fix uart0 pins sort order) +$ 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 +Merge made by the 'ort' strategy. + .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 51 +++++++++++----------- + 1 file changed, 26 insertions(+), 25 deletions(-) +Merging riscv-soc-fixes/riscv-soc-fixes (0bb80ecc33a8 Linux 6.6-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 (0bb80ecc33a8 Linux 6.6-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 (2d48c30176fa MAINTAINERS: gpio-regmap: make myself a maintainer of it) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging gpio-intel-fixes/fixes (0bb80ecc33a8 Linux 6.6-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 (2d325e54d9e2 pinctrl: baytrail: fix debounce disable case) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) +Merging erofs-fixes/fixes (75a5221630fe erofs: fix memory leak of LZMA global compressed deduplication) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Merge made by the 'ort' strategy. + fs/erofs/decompressor_lzma.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging kunit-fixes/kunit-fixes (0bb80ecc33a8 Linux 6.6-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 (9e46e4dcd9d6 mm,memblock: reset memblock.reserved to system init state to prevent UAF) +$ 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 (88956eabfdea NFSD: fix possible oops when nfsd/pool_stats is closed.) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Merge made by the 'ort' strategy. + fs/nfsd/nfs4proc.c | 4 ++-- + fs/nfsd/nfssvc.c | 5 +++-- + 2 files changed, 5 insertions(+), 4 deletions(-) +Merging irqchip-fixes/irq/irqchip-fixes (cfa1f9db6d60 dt-bindings: interrupt-controller: renesas,rzg2l-irqc: Update description for '#interrupt-cells' property) +$ 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 +Merge made by the 'ort' strategy. + .../interrupt-controller/renesas,rzg2l-irqc.yaml | 5 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +- + drivers/irqchip/qcom-pdc.c | 69 ++++++++++++++++------ + 3 files changed, 55 insertions(+), 21 deletions(-) +Merging renesas-fixes/fixes (4c188fa183eb arm64: dts: renesas: rzg2l: Update overfow/underflow IRQ names for MTU3 channels) +$ 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 (c2122b687c21 tools headers UAPI: Update tools's copy of drm.h headers) +$ 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/arch/x86/include/asm/msr-index.h | 12 ++ + tools/include/uapi/asm-generic/unistd.h | 5 +- + tools/include/uapi/drm/drm.h | 84 +++++++++-- + tools/include/uapi/linux/seccomp.h | 157 +++++++++++++++++++++ + .../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 | 2 + + tools/perf/bench/sched-seccomp-notify.c | 2 +- + tools/perf/check-headers.sh | 1 + + tools/perf/util/hashmap.h | 10 -- + 11 files changed, 249 insertions(+), 27 deletions(-) + create mode 100644 tools/include/uapi/linux/seccomp.h +Merging efi-fixes/urgent (560f54eaa44c efi/x86: Disable buggy QueryVariableInfo() on HP ProBook x360) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/efi.h | 32 ++---------------------- + arch/x86/platform/efi/efi_32.c | 12 +++++++++ + arch/x86/platform/efi/efi_64.c | 19 ++++++++++++-- + arch/x86/platform/efi/quirks.c | 32 ++++++++++++++++++++++-- + drivers/firmware/efi/libstub/unaccepted_memory.c | 2 +- + fs/efivarfs/super.c | 14 ++++++++--- + 7 files changed, 73 insertions(+), 40 deletions(-) +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 (4ec7b666fb42 power: vexpress: fix -Wvoid-pointer-to-enum-cast warning) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Merge made by the 'ort' strategy. + drivers/power/reset/Kconfig | 2 +- + drivers/power/reset/pwr-mlxbf.c | 2 +- + drivers/power/reset/vexpress-poweroff.c | 2 +- + drivers/power/supply/Kconfig | 1 + + drivers/power/supply/ab8500_btemp.c | 9 +-------- + drivers/power/supply/ab8500_chargalg.c | 2 +- + drivers/power/supply/mt6370-charger.c | 2 +- + 7 files changed, 7 insertions(+), 13 deletions(-) +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 (0bb80ecc33a8 Linux 6.6-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 (0bb80ecc33a8 Linux 6.6-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 (2dde18cd1d8f Linux 6.5) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging w1-fixes/fixes (0bb80ecc33a8 Linux 6.6-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 pmdomain-fixes/fixes (e2ad626f8f40 pmdomain: Rename the genpd subsystem to pmdomain) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (c900529f3d91 Merge drm/drm-fixes into drm-misc-fixes) +$ 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/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +- + drivers/gpu/drm/drm_connector.c | 2 ++ + drivers/gpu/drm/radeon/radeon_sa.c | 2 +- + drivers/gpu/drm/tiny/gm12u320.c | 10 +++++----- + 4 files changed, 9 insertions(+), 7 deletions(-) +Merging mm-stable/mm-stable (0bb80ecc33a8 Linux 6.6-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 (0bb80ecc33a8 Linux 6.6-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 (c7934e3f58e5 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 +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 9 + + Documentation/admin-guide/mm/damon/usage.rst | 109 +-- + Documentation/mm/damon/design.rst | 23 +- + arch/x86/kvm/mmu/mmu.c | 18 +- + drivers/accel/ivpu/ivpu_job.c | 3 +- + drivers/acpi/acpi_pad.c | 2 +- + drivers/acpi/numa/hmat.c | 143 ++-- + drivers/android/binder_alloc.c | 30 +- + drivers/dax/kmem.c | 62 +- + drivers/dax/super.c | 3 +- + drivers/dma-buf/st-dma-fence-chain.c | 12 +- + drivers/dma-buf/st-dma-fence.c | 4 +- + drivers/firmware/efi/unaccepted_memory.c | 20 + + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 29 +- + drivers/gpu/drm/i915/gt/selftest_migrate.c | 4 +- + drivers/gpu/drm/i915/i915_drv.h | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 4 +- + drivers/gpu/drm/msm/msm_drv.h | 4 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 33 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 2 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 6 +- + drivers/gpu/drm/panfrost/panfrost_gem.h | 2 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 29 +- + drivers/gpu/drm/ttm/ttm_pool.c | 40 +- + drivers/md/bcache/bcache.h | 2 +- + drivers/md/bcache/btree.c | 27 +- + drivers/md/bcache/sysfs.c | 3 +- + drivers/md/dm-bufio.c | 28 +- + drivers/md/dm-cache-metadata.c | 2 +- + drivers/md/dm-zoned-metadata.c | 28 +- + drivers/md/raid5.c | 26 +- + drivers/md/raid5.h | 2 +- + drivers/misc/vmw_balloon.c | 38 +- + drivers/net/xen-netback/interface.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 137 +--- + drivers/scsi/qla2xxx/qla_dfs.c | 59 +- + drivers/usb/usbip/usbip_common.h | 6 - + drivers/virtio/virtio_balloon.c | 24 +- + drivers/xen/xenbus/xenbus_probe_backend.c | 17 +- + fs/btrfs/super.c | 2 +- + fs/dax.c | 24 +- + fs/erofs/utils.c | 19 +- + fs/exec.c | 4 +- + fs/ext4/ext4.h | 2 +- + fs/ext4/extents_status.c | 23 +- + fs/f2fs/super.c | 31 +- + fs/gfs2/glock.c | 19 +- + fs/gfs2/main.c | 6 +- + fs/gfs2/ops_fstype.c | 9 +- + fs/gfs2/quota.c | 25 +- + fs/gfs2/quota.h | 3 +- + fs/hugetlbfs/inode.c | 15 +- + fs/jbd2/journal.c | 29 +- + fs/kernfs/mount.c | 2 +- + fs/mbcache.c | 22 +- + fs/nfs/nfs42xattr.c | 87 +-- + fs/nfs/super.c | 21 +- + fs/nfsd/filecache.c | 23 +- + fs/nfsd/netns.h | 4 +- + fs/nfsd/nfs4state.c | 19 +- + fs/nfsd/nfscache.c | 31 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/dlmfs/dlmfs.c | 3 +- + fs/proc/array.c | 7 +- + fs/proc/base.c | 6 +- + fs/proc/kcore.c | 3 +- + fs/proc/root.c | 2 +- + fs/quota/dquot.c | 17 +- + fs/super.c | 35 +- + fs/ubifs/super.c | 21 +- + fs/xfs/xfs_buf.c | 24 +- + fs/xfs/xfs_buf.h | 2 +- + fs/xfs/xfs_icache.c | 26 +- + fs/xfs/xfs_mount.c | 4 +- + fs/xfs/xfs_mount.h | 2 +- + fs/xfs/xfs_notify_failure.c | 99 ++- + fs/xfs/xfs_qm.c | 27 +- + fs/xfs/xfs_qm.h | 2 +- + include/linux/compiler-clang.h | 5 - + include/linux/compiler-gcc.h | 2 - + include/linux/compiler.h | 5 +- + include/linux/damon.h | 22 +- + include/linux/dax.h | 10 +- + include/linux/fs.h | 2 +- + include/linux/hugetlb.h | 12 + + include/linux/jbd2.h | 2 +- + include/linux/kthread.h | 1 + + include/linux/memcontrol.h | 12 +- + include/linux/memory-tiers.h | 41 +- + include/linux/migrate.h | 4 +- + include/linux/minmax.h | 27 +- + include/linux/mm.h | 36 +- + include/linux/mm_types.h | 11 + + include/linux/page-isolation.h | 2 +- + include/linux/pagemap.h | 32 +- + include/linux/rmap.h | 2 +- + include/linux/sched.h | 1 - + include/linux/sched/signal.h | 19 +- + include/linux/seq_file.h | 15 + + include/linux/shrinker.h | 74 ++- + include/linux/stackdepot.h | 59 +- + include/linux/swap.h | 6 + + include/linux/vmstat.h | 8 - + include/trace/events/damon.h | 45 +- + init/init_task.c | 1 - + kernel/Kconfig.kexec | 2 +- + kernel/exit.c | 5 - + kernel/fork.c | 7 - + kernel/irq/manage.c | 15 +- + kernel/kthread.c | 19 +- + kernel/panic.c | 22 +- + kernel/pid_namespace.c | 6 - + kernel/rcu/tree.c | 21 +- + kernel/rcu/tree_nocb.h | 19 +- + kernel/signal.c | 22 +- + kernel/smpboot.c | 3 +- + kernel/sys.c | 41 +- + kernel/taskstats.c | 5 +- + lib/Kconfig | 10 +- + lib/stackdepot.c | 414 +++++++----- + mm/Kconfig | 1 + + mm/Makefile | 4 +- + mm/compaction.c | 91 +-- + mm/damon/core.c | 43 +- + mm/debug_page_alloc.c | 12 +- + mm/filemap.c | 34 +- + mm/huge_memory.c | 75 ++- + mm/hugetlb.c | 67 +- + mm/hugetlb_vmemmap.c | 8 +- + mm/internal.h | 47 +- + mm/kasan/common.c | 7 +- + mm/kasan/generic.c | 9 +- + mm/kasan/kasan.h | 2 +- + mm/kasan/report_tags.c | 27 +- + mm/kasan/tags.c | 24 +- + mm/kmsan/core.c | 132 +--- + mm/kmsan/kmsan_test.c | 109 +-- + mm/madvise.c | 5 +- + mm/memcontrol.c | 10 + + mm/memfd.c | 6 - + mm/memory-failure.c | 46 +- + mm/memory-tiers.c | 174 ++++- + mm/memory.c | 4 +- + mm/migrate.c | 134 ++-- + mm/mm_init.c | 2 - + mm/mmap.c | 5 +- + mm/mremap.c | 77 ++- + mm/page_alloc.c | 429 ++++++------ + mm/page_io.c | 8 +- + mm/page_isolation.c | 23 +- + mm/rmap.c | 79 ++- + mm/shmem.c | 4 - + mm/show_mem.c | 11 +- + mm/shrinker.c | 804 +++++++++++++++++++++++ + mm/shrinker_debug.c | 49 +- + mm/vmscan.c | 740 +-------------------- + mm/vmstat.c | 22 +- + mm/workingset.c | 29 +- + mm/zsmalloc.c | 27 +- + net/core/pktgen.c | 3 +- + net/sunrpc/auth.c | 20 +- + scripts/checkpatch.pl | 55 +- + tools/testing/selftests/mm/gup_longterm.c | 3 +- + tools/testing/selftests/mm/mremap_test.c | 305 +++++++-- + 164 files changed, 3814 insertions(+), 2716 deletions(-) + create mode 100644 mm/shrinker.c +Merging kbuild/for-next (0bb80ecc33a8 Linux 6.6-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 (5d0c230f1de8 Linux 6.5-rc4) +$ 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 (45fc4628c15a perf parse-events: Fix driver config term) +$ 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 (5d0c230f1de8 Linux 6.5-rc4) +$ 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 (8556f6921c28 swiotlb: fix the check whether a device has used software IO TLB) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'ort' strategy. + include/linux/swiotlb.h | 16 +++++++++------- + kernel/dma/swiotlb.c | 5 ++--- + 2 files changed, 11 insertions(+), 10 deletions(-) +Merging asm-generic/master (6e8d96909a23 asm-generic: partially revert "Unify uapi bitsperlong.h for arm64, riscv and loongarch") +$ 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 (0bb80ecc33a8 Linux 6.6-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 (133789d4a458 Revert part of ae1f8d793a19 ("ARM: 9304/1: add prototype for function called only from asm")) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Already up to date. +Merging arm64/for-next/core (e1df27213941 Merge branch 'for-next/selftests' into for-next/core) +$ 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 (21b61fe48c2f drivers/perf: hisi: Update HiSilicon PMU maintainers) +$ 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 (42ed07054d75 soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-changes.txt | 238 ++++++++++++++++++++++++++++++++++ + 1 file changed, 238 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-changes.txt +Merging amlogic/for-next (929266f846b3 Merge branch 'v6.7/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 | 1 + + .../bindings/power/amlogic,meson-sec-pwrc.yaml | 3 +- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 12 + + arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts | 145 +++++++++ + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 213 ++++++++++++- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 13 + + arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 36 +-- + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 341 +++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 60 ++++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 39 +++ + .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 6 + + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 15 + + drivers/firmware/meson/meson_sm.c | 20 +- + include/dt-bindings/power/amlogic,t7-pwrc.h | 63 ++++ + include/linux/firmware/meson/meson_sm.h | 2 +- + 16 files changed, 929 insertions(+), 41 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts + create mode 100644 include/dt-bindings/power/amlogic,t7-pwrc.h +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 +Auto-merging drivers/soc/apple/Makefile +CONFLICT (content): Merge conflict in drivers/soc/apple/Makefile +Resolved 'drivers/soc/apple/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 483572a9e662] Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git +$ git diff -M --stat --summary HEAD^.. + 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 (05f42491c813 ARM: dts: aspeed: bonnell: Add reserved memory for TPM event log) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging arch/arm/configs/aspeed_g5_defconfig +Merge made by the 'ort' strategy. + arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 8 +++++++- + arch/arm/configs/aspeed_g5_defconfig | 2 ++ + 2 files changed, 9 insertions(+), 1 deletion(-) +Merging at91/at91-next (b04dba7c1c30 Merge branch '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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging broadcom/next (a70e8c9ff89a Merge branch 'soc/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. +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 (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merging imx-mxs/for-next (246e2cc22265 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 (a8e364c2c428 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. + drivers/firmware/turris-mox-rwtm.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +Merging omap/for-next (6387fcbea64f Merge branch 'omap-for-v6.6/ti-sysc' 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. +Merging qcom/for-next (f6f46954a711 Merge branches 'clk-for-6.7' and 'drivers-for-6.7' 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/qcom,hfpll.txt | 3 + + .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 2 + + MAINTAINERS | 12 + + drivers/clk/qcom/clk-hfpll.c | 4 + + drivers/clk/qcom/clk-hfpll.h | 1 + + drivers/clk/qcom/hfpll.c | 59 +- + drivers/firmware/Kconfig | 32 + + drivers/firmware/Makefile | 2 + + drivers/firmware/qcom_qseecom.c | 120 +++ + drivers/firmware/qcom_qseecom_uefisecapp.c | 871 +++++++++++++++++++++ + drivers/firmware/qcom_scm.c | 394 ++++++++++ + drivers/soc/qcom/socinfo.c | 11 + + drivers/soc/qcom/wcnss_ctrl.c | 1 - + include/dt-bindings/arm/qcom,ids.h | 5 + + include/linux/firmware/qcom/qcom_qseecom.h | 46 ++ + include/linux/firmware/qcom/qcom_scm.h | 22 + + include/linux/ucs2_string.h | 1 + + lib/ucs2_string.c | 52 ++ + 18 files changed, 1635 insertions(+), 3 deletions(-) + create mode 100644 drivers/firmware/qcom_qseecom.c + create mode 100644 drivers/firmware/qcom_qseecom_uefisecapp.c + create mode 100644 include/linux/firmware/qcom/qcom_qseecom.h +Merging renesas/next (f1f80f16cf65 Merge branches 'renesas-drivers-for-v6.7' and 'renesas-dts-for-v6.7' 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 +Merge made by the 'ort' strategy. + arch/arm/boot/dts/renesas/r7s72100-gr-peach.dts | 1 - + arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts | 2 +- + arch/arm/boot/dts/renesas/r8a7792-blanche.dts | 2 +- + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 2 +- + arch/arm64/boot/dts/renesas/hihope-rev4.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 2 +- + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 24 ++++ + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 134 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 +- + drivers/pmdomain/renesas/rmobile-sysc.c | 2 +- + 20 files changed, 175 insertions(+), 32 deletions(-) +Merging reset/reset/next (417a3a5ae44a reset: ti: syscon: remove unneeded call to platform_set_drvdata()) +$ 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 (6d1fa8808888 Merge branch 'v6.5-armsoc/dtsfixes' 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. +Merging samsung-krzk/for-next (a942a9ea19e3 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/exynos4212-tab3.dtsi | 41 ++++++++------- + .../arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi | 43 ++++++++-------- + arch/arm/boot/dts/samsung/exynos4412-n710x.dts | 39 +++++++-------- + arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts | 13 +++-- + arch/arm/boot/dts/samsung/exynos4412-odroidx.dts | 9 ++-- + .../dts/samsung/exynos5422-odroidxu3-audio.dtsi | 19 ++++--- + arch/arm/boot/dts/samsung/exynos5422-odroidxu4.dts | 2 +- + arch/arm/boot/dts/samsung/s5pv210-fascinate4g.dts | 33 ++++++------ + arch/arm/boot/dts/samsung/s5pv210-galaxys.dts | 37 +++++++------- + arch/arm/configs/s5pv210_defconfig | 1 + + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 21 ++++---- + arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 58 ++++++++++++++++++++++ + arch/arm64/boot/dts/exynos/exynos850.dtsi | 30 +++++++++++ + arch/arm64/configs/defconfig | 1 + + 14 files changed, 214 insertions(+), 133 deletions(-) +Merging scmi/for-linux-next (a184af4d455d Merge branches 'for-next/scmi/fixes', 'for-next/scmi/updates' and 'for-next/pcc/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. + drivers/clk/clk-scmi.c | 34 ++++-- + drivers/firmware/arm_scmi/clock.c | 220 ++++++++++++++++++++++++++++++++++---- + drivers/firmware/arm_scmi/perf.c | 4 +- + drivers/mailbox/pcc.c | 91 ++++++++++++++-- + include/linux/scmi_protocol.h | 19 +++- + 5 files changed, 325 insertions(+), 43 deletions(-) +Merging stm32/stm32-next (c848f884d1b4 ARM: dts: stm32: Add Octavo OSD32MP1-RED board) +$ 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 | 1 + + arch/arm/boot/dts/st/Makefile | 1 + + arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi | 114 +++++++++++ + arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts | 225 +++++++++++++++++++++ + arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 4 - + arch/arm/boot/dts/st/stm32mp15xx-osd32.dtsi | 6 - + 6 files changed, 341 insertions(+), 10 deletions(-) + create mode 100644 arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts +Merging sunxi/sunxi/for-next (aa333f5e8461 Merge branch 'sunxi/dt-for-6.6' 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 (c62440bd774b 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. + .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 393 ------------------- + .../bindings/soc/tegra/nvidia,tegra20-pmc.yaml | 416 +++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 + + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 66 ++++ + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 1 + + arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi | 4 +- + .../dts/nvidia/tegra234-p3768-0000+p3767-0000.dts | 13 - + .../arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi | 1 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 40 +- + 9 files changed, 509 insertions(+), 427 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/tegra/nvidia,tegra20-pmc.yaml +Merging ti/ti-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (65d6e954e378 Merge tag 'gfs2-v6.5-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Already up to date. +Merging clk/clk-next (78fd9cf91630 Merge branch 'clk-fixes' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/renesas,5p35023.yaml | 11 +- + drivers/clk/clk-asm9260.c | 6 +- + drivers/clk/clk-gate.c | 2 +- + drivers/clk/clk-si521xx.c | 9 +- + drivers/clk/clk-versaclock3.c | 117 ++++++++++----------- + drivers/clk/sprd/ums512-clk.c | 2 +- + drivers/clk/tegra/clk-bpmp.c | 2 +- + 7 files changed, 76 insertions(+), 73 deletions(-) +Merging clk-imx/for-next (72d00e560d10 clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz) +$ 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 (f3ea14c6a243 clk: renesas: r9a06g032: Use for_each_compatible_node()) +$ 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/r9a06g032-clocks.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging csky/linux-next (5195c35ac4f0 csky: Fixup compile error) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (91f3eb2e7791 LoongArch: Don't inline kasan_mem_to_shadow()/kasan_shadow_to_mem()) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging mm/kasan/kasan.h +Merge made by the 'ort' strategy. + arch/loongarch/include/asm/kasan.h | 59 ++++++-------------------------------- + arch/loongarch/kernel/mem.c | 4 ++- + arch/loongarch/mm/kasan_init.c | 51 ++++++++++++++++++++++++++++++++ + include/linux/kasan.h | 2 +- + mm/kasan/kasan.h | 8 ++---- + 5 files changed, 67 insertions(+), 57 deletions(-) +Merging m68k/for-next (eb1e6ccdcf78 zorro: Include zorro.h in names.c) +$ 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 (0bb80ecc33a8 Linux 6.6-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 (65d6e954e378 Merge tag 'gfs2-v6.5-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ 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 (e7513eccb7d7 MIPS: TXx9: Do PCI error checks on own line) +$ 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 (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment) +$ 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 (0bb80ecc33a8 Linux 6.6-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 (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging riscv-dt/riscv-dt-for-next (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 +Already up to date. +Merging riscv-soc/riscv-soc-for-next (78a03b9f8e6b 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 (06fc3b0d2251 s390/vmem: do not silently ignore mapping limit) +$ 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 (246f80a0b17f sh: push-switch: Reorder cleanup operations to avoid use-after-free bug) +$ 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 (974b808d85ab um: virt-pci: fix missing declaration warning) +$ 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 (03ce34cf8f50 xtensa: add XIP-aware MTD support) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging bcachefs/for-next (d3410e0003a7 bcachefs: Heap allocate btree_trans) +$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/md/bcache/bcache.h +Auto-merging include/linux/sched.h +Auto-merging init/init_task.c +Auto-merging lib/Kconfig +Merge made by the 'ort' strategy. + MAINTAINERS | 23 + + drivers/md/bcache/Kconfig | 10 +- + drivers/md/bcache/Makefile | 4 +- + drivers/md/bcache/bcache.h | 2 +- + drivers/md/bcache/super.c | 1 - + drivers/md/bcache/util.h | 3 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/bcachefs/Kconfig | 85 + + fs/bcachefs/Makefile | 88 + + fs/bcachefs/acl.c | 462 ++++ + fs/bcachefs/acl.h | 60 + + fs/bcachefs/alloc_background.c | 2143 +++++++++++++++ + fs/bcachefs/alloc_background.h | 257 ++ + fs/bcachefs/alloc_foreground.c | 1576 +++++++++++ + fs/bcachefs/alloc_foreground.h | 224 ++ + fs/bcachefs/alloc_types.h | 126 + + fs/bcachefs/backpointers.c | 868 ++++++ + fs/bcachefs/backpointers.h | 131 + + fs/bcachefs/bbpos.h | 48 + + fs/bcachefs/bcachefs.h | 1147 ++++++++ + fs/bcachefs/bcachefs_format.h | 2389 +++++++++++++++++ + fs/bcachefs/bcachefs_ioctl.h | 368 +++ + fs/bcachefs/bkey.c | 1120 ++++++++ + fs/bcachefs/bkey.h | 782 ++++++ + fs/bcachefs/bkey_buf.h | 61 + + fs/bcachefs/bkey_cmp.h | 129 + + fs/bcachefs/bkey_methods.c | 459 ++++ + fs/bcachefs/bkey_methods.h | 188 ++ + fs/bcachefs/bkey_sort.c | 201 ++ + fs/bcachefs/bkey_sort.h | 54 + + fs/bcachefs/bset.c | 1592 +++++++++++ + fs/bcachefs/bset.h | 541 ++++ + fs/bcachefs/btree_cache.c | 1222 +++++++++ + fs/bcachefs/btree_cache.h | 130 + + fs/bcachefs/btree_gc.c | 2111 +++++++++++++++ + fs/bcachefs/btree_gc.h | 114 + + fs/bcachefs/btree_io.c | 2223 ++++++++++++++++ + fs/bcachefs/btree_io.h | 228 ++ + fs/bcachefs/btree_iter.c | 3215 +++++++++++++++++++++++ + fs/bcachefs/btree_iter.h | 939 +++++++ + fs/bcachefs/btree_journal_iter.c | 531 ++++ + fs/bcachefs/btree_journal_iter.h | 57 + + fs/bcachefs/btree_key_cache.c | 1072 ++++++++ + fs/bcachefs/btree_key_cache.h | 48 + + fs/bcachefs/btree_locking.c | 791 ++++++ + fs/bcachefs/btree_locking.h | 423 +++ + fs/bcachefs/btree_trans_commit.c | 1154 ++++++++ + fs/bcachefs/btree_types.h | 739 ++++++ + fs/bcachefs/btree_update.c | 933 +++++++ + fs/bcachefs/btree_update.h | 341 +++ + fs/bcachefs/btree_update_interior.c | 2480 +++++++++++++++++ + fs/bcachefs/btree_update_interior.h | 337 +++ + fs/bcachefs/btree_write_buffer.c | 375 +++ + fs/bcachefs/btree_write_buffer.h | 14 + + fs/bcachefs/btree_write_buffer_types.h | 44 + + fs/bcachefs/buckets.c | 2107 +++++++++++++++ + fs/bcachefs/buckets.h | 413 +++ + fs/bcachefs/buckets_types.h | 92 + + fs/bcachefs/buckets_waiting_for_journal.c | 166 ++ + fs/bcachefs/buckets_waiting_for_journal.h | 15 + + fs/bcachefs/buckets_waiting_for_journal_types.h | 23 + + fs/bcachefs/chardev.c | 769 ++++++ + fs/bcachefs/chardev.h | 31 + + fs/bcachefs/checksum.c | 753 ++++++ + fs/bcachefs/checksum.h | 210 ++ + fs/bcachefs/clock.c | 193 ++ + fs/bcachefs/clock.h | 38 + + fs/bcachefs/clock_types.h | 37 + + fs/bcachefs/compress.c | 710 +++++ + fs/bcachefs/compress.h | 55 + + fs/bcachefs/counters.c | 107 + + fs/bcachefs/counters.h | 17 + + fs/bcachefs/darray.h | 87 + + fs/bcachefs/data_update.c | 558 ++++ + fs/bcachefs/data_update.h | 43 + + fs/bcachefs/debug.c | 954 +++++++ + fs/bcachefs/debug.h | 32 + + fs/bcachefs/dirent.c | 587 +++++ + fs/bcachefs/dirent.h | 70 + + fs/bcachefs/disk_groups.c | 555 ++++ + fs/bcachefs/disk_groups.h | 106 + + fs/bcachefs/ec.c | 1966 ++++++++++++++ + fs/bcachefs/ec.h | 260 ++ + fs/bcachefs/ec_types.h | 41 + + fs/bcachefs/errcode.c | 68 + + fs/bcachefs/errcode.h | 263 ++ + fs/bcachefs/error.c | 293 +++ + fs/bcachefs/error.h | 206 ++ + fs/bcachefs/extent_update.c | 173 ++ + fs/bcachefs/extent_update.h | 12 + + fs/bcachefs/extents.c | 1403 ++++++++++ + fs/bcachefs/extents.h | 757 ++++++ + fs/bcachefs/extents_types.h | 40 + + fs/bcachefs/eytzinger.h | 281 ++ + fs/bcachefs/fifo.h | 127 + + fs/bcachefs/fs-common.c | 501 ++++ + fs/bcachefs/fs-common.h | 43 + + fs/bcachefs/fs-io-buffered.c | 1093 ++++++++ + fs/bcachefs/fs-io-buffered.h | 27 + + fs/bcachefs/fs-io-direct.c | 679 +++++ + fs/bcachefs/fs-io-direct.h | 16 + + fs/bcachefs/fs-io-pagecache.c | 791 ++++++ + fs/bcachefs/fs-io-pagecache.h | 176 ++ + fs/bcachefs/fs-io.c | 1072 ++++++++ + fs/bcachefs/fs-io.h | 184 ++ + fs/bcachefs/fs-ioctl.c | 559 ++++ + fs/bcachefs/fs-ioctl.h | 81 + + fs/bcachefs/fs.c | 1955 ++++++++++++++ + fs/bcachefs/fs.h | 209 ++ + fs/bcachefs/fsck.c | 2457 +++++++++++++++++ + fs/bcachefs/fsck.h | 14 + + fs/bcachefs/inode.c | 1129 ++++++++ + fs/bcachefs/inode.h | 207 ++ + fs/bcachefs/io_misc.c | 497 ++++ + fs/bcachefs/io_misc.h | 34 + + fs/bcachefs/io_read.c | 1208 +++++++++ + fs/bcachefs/io_read.h | 158 ++ + fs/bcachefs/io_write.c | 1669 ++++++++++++ + fs/bcachefs/io_write.h | 110 + + fs/bcachefs/io_write_types.h | 96 + + fs/bcachefs/journal.c | 1443 ++++++++++ + fs/bcachefs/journal.h | 526 ++++ + fs/bcachefs/journal_io.c | 1892 +++++++++++++ + fs/bcachefs/journal_io.h | 65 + + fs/bcachefs/journal_reclaim.c | 879 +++++++ + fs/bcachefs/journal_reclaim.h | 86 + + fs/bcachefs/journal_sb.c | 219 ++ + fs/bcachefs/journal_sb.h | 24 + + fs/bcachefs/journal_seq_blacklist.c | 320 +++ + fs/bcachefs/journal_seq_blacklist.h | 22 + + fs/bcachefs/journal_types.h | 345 +++ + fs/bcachefs/keylist.c | 52 + + fs/bcachefs/keylist.h | 74 + + fs/bcachefs/keylist_types.h | 16 + + fs/bcachefs/logged_ops.c | 110 + + fs/bcachefs/logged_ops.h | 20 + + fs/bcachefs/lru.c | 162 ++ + fs/bcachefs/lru.h | 69 + + fs/bcachefs/mean_and_variance.c | 159 ++ + fs/bcachefs/mean_and_variance.h | 198 ++ + fs/bcachefs/mean_and_variance_test.c | 240 ++ + fs/bcachefs/migrate.c | 179 ++ + fs/bcachefs/migrate.h | 7 + + fs/bcachefs/move.c | 1159 ++++++++ + fs/bcachefs/move.h | 96 + + fs/bcachefs/move_types.h | 36 + + fs/bcachefs/movinggc.c | 414 +++ + fs/bcachefs/movinggc.h | 12 + + fs/bcachefs/nocow_locking.c | 123 + + fs/bcachefs/nocow_locking.h | 49 + + fs/bcachefs/nocow_locking_types.h | 20 + + fs/bcachefs/opts.c | 599 +++++ + fs/bcachefs/opts.h | 563 ++++ + fs/bcachefs/printbuf.c | 425 +++ + fs/bcachefs/printbuf.h | 284 ++ + fs/bcachefs/quota.c | 978 +++++++ + fs/bcachefs/quota.h | 74 + + fs/bcachefs/quota_types.h | 43 + + fs/bcachefs/rebalance.c | 366 +++ + fs/bcachefs/rebalance.h | 28 + + fs/bcachefs/rebalance_types.h | 26 + + fs/bcachefs/recovery.c | 1050 ++++++++ + fs/bcachefs/recovery.h | 33 + + fs/bcachefs/recovery_types.h | 49 + + fs/bcachefs/reflink.c | 405 +++ + fs/bcachefs/reflink.h | 81 + + fs/bcachefs/replicas.c | 1059 ++++++++ + fs/bcachefs/replicas.h | 91 + + fs/bcachefs/replicas_types.h | 27 + + fs/bcachefs/sb-clean.c | 395 +++ + fs/bcachefs/sb-clean.h | 16 + + fs/bcachefs/sb-members.c | 173 ++ + fs/bcachefs/sb-members.h | 176 ++ + fs/bcachefs/seqmutex.h | 48 + + fs/bcachefs/siphash.c | 173 ++ + fs/bcachefs/siphash.h | 87 + + fs/bcachefs/six.c | 913 +++++++ + fs/bcachefs/six.h | 388 +++ + fs/bcachefs/snapshot.c | 1689 ++++++++++++ + fs/bcachefs/snapshot.h | 272 ++ + fs/bcachefs/str_hash.h | 370 +++ + fs/bcachefs/subvolume.c | 450 ++++ + fs/bcachefs/subvolume.h | 35 + + fs/bcachefs/subvolume_types.h | 31 + + fs/bcachefs/super-io.c | 1264 +++++++++ + fs/bcachefs/super-io.h | 133 + + fs/bcachefs/super.c | 2013 ++++++++++++++ + fs/bcachefs/super.h | 52 + + fs/bcachefs/super_types.h | 52 + + fs/bcachefs/sysfs.c | 1031 ++++++++ + fs/bcachefs/sysfs.h | 48 + + fs/bcachefs/tests.c | 942 +++++++ + fs/bcachefs/tests.h | 15 + + fs/bcachefs/trace.c | 16 + + fs/bcachefs/trace.h | 1284 +++++++++ + fs/bcachefs/two_state_shared_lock.c | 8 + + fs/bcachefs/two_state_shared_lock.h | 59 + + fs/bcachefs/util.c | 1141 ++++++++ + fs/bcachefs/util.h | 852 ++++++ + fs/bcachefs/varint.c | 129 + + fs/bcachefs/varint.h | 11 + + fs/bcachefs/vstructs.h | 63 + + fs/bcachefs/xattr.c | 651 +++++ + fs/bcachefs/xattr.h | 50 + + fs/dcache.c | 12 +- + {drivers/md/bcache => include/linux}/closure.h | 46 +- + include/linux/dcache.h | 1 + + include/linux/exportfs.h | 6 + + include/linux/generic-radix-tree.h | 68 +- + include/linux/sched.h | 1 + + include/linux/string_helpers.h | 4 +- + init/init_task.c | 1 + + kernel/locking/mutex.c | 3 + + kernel/locking/osq_lock.c | 2 + + kernel/stacktrace.c | 2 + + lib/Kconfig | 3 + + lib/Kconfig.debug | 9 + + lib/Makefile | 2 + + {drivers/md/bcache => lib}/closure.c | 36 +- + lib/errname.c | 1 + + lib/generic-radix-tree.c | 76 +- + lib/string_helpers.c | 10 +- + tools/objtool/noreturns.h | 2 + + 224 files changed, 94704 insertions(+), 56 deletions(-) + create mode 100644 fs/bcachefs/Kconfig + create mode 100644 fs/bcachefs/Makefile + create mode 100644 fs/bcachefs/acl.c + create mode 100644 fs/bcachefs/acl.h + create mode 100644 fs/bcachefs/alloc_background.c + create mode 100644 fs/bcachefs/alloc_background.h + create mode 100644 fs/bcachefs/alloc_foreground.c + create mode 100644 fs/bcachefs/alloc_foreground.h + create mode 100644 fs/bcachefs/alloc_types.h + create mode 100644 fs/bcachefs/backpointers.c + create mode 100644 fs/bcachefs/backpointers.h + create mode 100644 fs/bcachefs/bbpos.h + create mode 100644 fs/bcachefs/bcachefs.h + create mode 100644 fs/bcachefs/bcachefs_format.h + create mode 100644 fs/bcachefs/bcachefs_ioctl.h + create mode 100644 fs/bcachefs/bkey.c + create mode 100644 fs/bcachefs/bkey.h + create mode 100644 fs/bcachefs/bkey_buf.h + create mode 100644 fs/bcachefs/bkey_cmp.h + create mode 100644 fs/bcachefs/bkey_methods.c + create mode 100644 fs/bcachefs/bkey_methods.h + create mode 100644 fs/bcachefs/bkey_sort.c + create mode 100644 fs/bcachefs/bkey_sort.h + create mode 100644 fs/bcachefs/bset.c + create mode 100644 fs/bcachefs/bset.h + create mode 100644 fs/bcachefs/btree_cache.c + create mode 100644 fs/bcachefs/btree_cache.h + create mode 100644 fs/bcachefs/btree_gc.c + create mode 100644 fs/bcachefs/btree_gc.h + create mode 100644 fs/bcachefs/btree_io.c + create mode 100644 fs/bcachefs/btree_io.h + create mode 100644 fs/bcachefs/btree_iter.c + create mode 100644 fs/bcachefs/btree_iter.h + create mode 100644 fs/bcachefs/btree_journal_iter.c + create mode 100644 fs/bcachefs/btree_journal_iter.h + create mode 100644 fs/bcachefs/btree_key_cache.c + create mode 100644 fs/bcachefs/btree_key_cache.h + create mode 100644 fs/bcachefs/btree_locking.c + create mode 100644 fs/bcachefs/btree_locking.h + create mode 100644 fs/bcachefs/btree_trans_commit.c + create mode 100644 fs/bcachefs/btree_types.h + create mode 100644 fs/bcachefs/btree_update.c + create mode 100644 fs/bcachefs/btree_update.h + create mode 100644 fs/bcachefs/btree_update_interior.c + create mode 100644 fs/bcachefs/btree_update_interior.h + create mode 100644 fs/bcachefs/btree_write_buffer.c + create mode 100644 fs/bcachefs/btree_write_buffer.h + create mode 100644 fs/bcachefs/btree_write_buffer_types.h + create mode 100644 fs/bcachefs/buckets.c + create mode 100644 fs/bcachefs/buckets.h + create mode 100644 fs/bcachefs/buckets_types.h + create mode 100644 fs/bcachefs/buckets_waiting_for_journal.c + create mode 100644 fs/bcachefs/buckets_waiting_for_journal.h + create mode 100644 fs/bcachefs/buckets_waiting_for_journal_types.h + create mode 100644 fs/bcachefs/chardev.c + create mode 100644 fs/bcachefs/chardev.h + create mode 100644 fs/bcachefs/checksum.c + create mode 100644 fs/bcachefs/checksum.h + create mode 100644 fs/bcachefs/clock.c + create mode 100644 fs/bcachefs/clock.h + create mode 100644 fs/bcachefs/clock_types.h + create mode 100644 fs/bcachefs/compress.c + create mode 100644 fs/bcachefs/compress.h + create mode 100644 fs/bcachefs/counters.c + create mode 100644 fs/bcachefs/counters.h + create mode 100644 fs/bcachefs/darray.h + create mode 100644 fs/bcachefs/data_update.c + create mode 100644 fs/bcachefs/data_update.h + create mode 100644 fs/bcachefs/debug.c + create mode 100644 fs/bcachefs/debug.h + create mode 100644 fs/bcachefs/dirent.c + create mode 100644 fs/bcachefs/dirent.h + create mode 100644 fs/bcachefs/disk_groups.c + create mode 100644 fs/bcachefs/disk_groups.h + create mode 100644 fs/bcachefs/ec.c + create mode 100644 fs/bcachefs/ec.h + create mode 100644 fs/bcachefs/ec_types.h + create mode 100644 fs/bcachefs/errcode.c + create mode 100644 fs/bcachefs/errcode.h + create mode 100644 fs/bcachefs/error.c + create mode 100644 fs/bcachefs/error.h + create mode 100644 fs/bcachefs/extent_update.c + create mode 100644 fs/bcachefs/extent_update.h + create mode 100644 fs/bcachefs/extents.c + create mode 100644 fs/bcachefs/extents.h + create mode 100644 fs/bcachefs/extents_types.h + create mode 100644 fs/bcachefs/eytzinger.h + create mode 100644 fs/bcachefs/fifo.h + create mode 100644 fs/bcachefs/fs-common.c + create mode 100644 fs/bcachefs/fs-common.h + create mode 100644 fs/bcachefs/fs-io-buffered.c + create mode 100644 fs/bcachefs/fs-io-buffered.h + create mode 100644 fs/bcachefs/fs-io-direct.c + create mode 100644 fs/bcachefs/fs-io-direct.h + create mode 100644 fs/bcachefs/fs-io-pagecache.c + create mode 100644 fs/bcachefs/fs-io-pagecache.h + create mode 100644 fs/bcachefs/fs-io.c + create mode 100644 fs/bcachefs/fs-io.h + create mode 100644 fs/bcachefs/fs-ioctl.c + create mode 100644 fs/bcachefs/fs-ioctl.h + create mode 100644 fs/bcachefs/fs.c + create mode 100644 fs/bcachefs/fs.h + create mode 100644 fs/bcachefs/fsck.c + create mode 100644 fs/bcachefs/fsck.h + create mode 100644 fs/bcachefs/inode.c + create mode 100644 fs/bcachefs/inode.h + create mode 100644 fs/bcachefs/io_misc.c + create mode 100644 fs/bcachefs/io_misc.h + create mode 100644 fs/bcachefs/io_read.c + create mode 100644 fs/bcachefs/io_read.h + create mode 100644 fs/bcachefs/io_write.c + create mode 100644 fs/bcachefs/io_write.h + create mode 100644 fs/bcachefs/io_write_types.h + create mode 100644 fs/bcachefs/journal.c + create mode 100644 fs/bcachefs/journal.h + create mode 100644 fs/bcachefs/journal_io.c + create mode 100644 fs/bcachefs/journal_io.h + create mode 100644 fs/bcachefs/journal_reclaim.c + create mode 100644 fs/bcachefs/journal_reclaim.h + create mode 100644 fs/bcachefs/journal_sb.c + create mode 100644 fs/bcachefs/journal_sb.h + create mode 100644 fs/bcachefs/journal_seq_blacklist.c + create mode 100644 fs/bcachefs/journal_seq_blacklist.h + create mode 100644 fs/bcachefs/journal_types.h + create mode 100644 fs/bcachefs/keylist.c + create mode 100644 fs/bcachefs/keylist.h + create mode 100644 fs/bcachefs/keylist_types.h + create mode 100644 fs/bcachefs/logged_ops.c + create mode 100644 fs/bcachefs/logged_ops.h + create mode 100644 fs/bcachefs/lru.c + create mode 100644 fs/bcachefs/lru.h + create mode 100644 fs/bcachefs/mean_and_variance.c + create mode 100644 fs/bcachefs/mean_and_variance.h + create mode 100644 fs/bcachefs/mean_and_variance_test.c + create mode 100644 fs/bcachefs/migrate.c + create mode 100644 fs/bcachefs/migrate.h + create mode 100644 fs/bcachefs/move.c + create mode 100644 fs/bcachefs/move.h + create mode 100644 fs/bcachefs/move_types.h + create mode 100644 fs/bcachefs/movinggc.c + create mode 100644 fs/bcachefs/movinggc.h + create mode 100644 fs/bcachefs/nocow_locking.c + create mode 100644 fs/bcachefs/nocow_locking.h + create mode 100644 fs/bcachefs/nocow_locking_types.h + create mode 100644 fs/bcachefs/opts.c + create mode 100644 fs/bcachefs/opts.h + create mode 100644 fs/bcachefs/printbuf.c + create mode 100644 fs/bcachefs/printbuf.h + create mode 100644 fs/bcachefs/quota.c + create mode 100644 fs/bcachefs/quota.h + create mode 100644 fs/bcachefs/quota_types.h + create mode 100644 fs/bcachefs/rebalance.c + create mode 100644 fs/bcachefs/rebalance.h + create mode 100644 fs/bcachefs/rebalance_types.h + create mode 100644 fs/bcachefs/recovery.c + create mode 100644 fs/bcachefs/recovery.h + create mode 100644 fs/bcachefs/recovery_types.h + create mode 100644 fs/bcachefs/reflink.c + create mode 100644 fs/bcachefs/reflink.h + create mode 100644 fs/bcachefs/replicas.c + create mode 100644 fs/bcachefs/replicas.h + create mode 100644 fs/bcachefs/replicas_types.h + create mode 100644 fs/bcachefs/sb-clean.c + create mode 100644 fs/bcachefs/sb-clean.h + create mode 100644 fs/bcachefs/sb-members.c + create mode 100644 fs/bcachefs/sb-members.h + create mode 100644 fs/bcachefs/seqmutex.h + create mode 100644 fs/bcachefs/siphash.c + create mode 100644 fs/bcachefs/siphash.h + create mode 100644 fs/bcachefs/six.c + create mode 100644 fs/bcachefs/six.h + create mode 100644 fs/bcachefs/snapshot.c + create mode 100644 fs/bcachefs/snapshot.h + create mode 100644 fs/bcachefs/str_hash.h + create mode 100644 fs/bcachefs/subvolume.c + create mode 100644 fs/bcachefs/subvolume.h + create mode 100644 fs/bcachefs/subvolume_types.h + create mode 100644 fs/bcachefs/super-io.c + create mode 100644 fs/bcachefs/super-io.h + create mode 100644 fs/bcachefs/super.c + create mode 100644 fs/bcachefs/super.h + create mode 100644 fs/bcachefs/super_types.h + create mode 100644 fs/bcachefs/sysfs.c + create mode 100644 fs/bcachefs/sysfs.h + create mode 100644 fs/bcachefs/tests.c + create mode 100644 fs/bcachefs/tests.h + create mode 100644 fs/bcachefs/trace.c + create mode 100644 fs/bcachefs/trace.h + create mode 100644 fs/bcachefs/two_state_shared_lock.c + create mode 100644 fs/bcachefs/two_state_shared_lock.h + create mode 100644 fs/bcachefs/util.c + create mode 100644 fs/bcachefs/util.h + create mode 100644 fs/bcachefs/varint.c + create mode 100644 fs/bcachefs/varint.h + create mode 100644 fs/bcachefs/vstructs.h + create mode 100644 fs/bcachefs/xattr.c + create mode 100644 fs/bcachefs/xattr.h + rename {drivers/md/bcache => include/linux}/closure.h (93%) + rename {drivers/md/bcache => lib}/closure.c (88%) +$ git am -3 ../patches/0001-bcachefs-convert-to-dynamically-allocated-shrinkers.patch +Applying: bcachefs: convert to dynamically allocated shrinkers +$ git reset HEAD^ +Unstaged changes after reset: +M fs/bcachefs/btree_cache.c +M fs/bcachefs/btree_key_cache.c +M fs/bcachefs/btree_types.h +M fs/bcachefs/fs.c +M fs/bcachefs/sysfs.c +$ git add -A . +$ git commit -v -a --amend +[master b4cf72cd3990] Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git + Date: Thu Sep 14 09:41:04 2023 +1000 +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 +Already up to date. +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 (1886ed000c2e Merge branch 'for-next-next-v6.6-20230911' into for-next-20230911) + 0a1996a411b5 ("btrfs: set last dir index to the current last index when opening dir") + 568ff9d3df2f ("btrfs: fix race when refilling delayed refs block reserve") + 75a1897cb7f1 ("btrfs: don't clear uptodate on write errors") + d257cd9f609e ("btrfs: convert btrfs_read_merkle_tree_page() to use a folio") + d354d8aa8b40 ("btrfs: file_remove_privs needs an exclusive lock in direct io write") + e6b292f9d6bb ("btrfs: refresh dir last index during a rewinddir(3) call") + f93cae0fa843 ("btrfs: prevent transaction block reserve underflow when starting transaction") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/delayed-ref.c +CONFLICT (content): Merge conflict in fs/btrfs/delayed-ref.c +Auto-merging fs/btrfs/delayed-ref.h +Auto-merging fs/btrfs/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +CONFLICT (content): Merge conflict in fs/btrfs/inode.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/transaction.c +CONFLICT (content): Merge conflict in fs/btrfs/transaction.c +Recorded preimage for 'fs/btrfs/delayed-ref.c' +Recorded preimage for 'fs/btrfs/extent_io.c' +Recorded preimage for 'fs/btrfs/inode.c' +Recorded preimage for 'fs/btrfs/transaction.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/btrfs/delayed-ref.c'. +Recorded resolution for 'fs/btrfs/extent_io.c'. +Recorded resolution for 'fs/btrfs/inode.c'. +Recorded resolution for 'fs/btrfs/transaction.c'. +[master 11c8af08d768] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/Kconfig | 21 - + fs/btrfs/Makefile | 1 - + fs/btrfs/accessors.h | 1 + + fs/btrfs/async-thread.c | 1 + + fs/btrfs/backref.h | 6 +- + fs/btrfs/bio.c | 5 - + fs/btrfs/block-group.c | 11 +- + fs/btrfs/block-rsv.c | 18 +- + fs/btrfs/btrfs_inode.h | 21 +- + fs/btrfs/check-integrity.c | 2871 ------------------------------------------- + fs/btrfs/check-integrity.h | 20 - + fs/btrfs/compression.c | 6 +- + fs/btrfs/ctree.c | 31 +- + fs/btrfs/ctree.h | 52 - + fs/btrfs/delalloc-space.c | 3 +- + fs/btrfs/delayed-inode.c | 8 +- + fs/btrfs/delayed-ref.c | 93 +- + fs/btrfs/delayed-ref.h | 32 +- + fs/btrfs/dev-replace.c | 1 - + fs/btrfs/dir-item.h | 9 + + fs/btrfs/disk-io.c | 89 +- + fs/btrfs/extent-tree.c | 270 ++-- + fs/btrfs/extent-tree.h | 12 +- + fs/btrfs/extent_io.c | 534 ++++---- + fs/btrfs/extent_io.h | 21 +- + fs/btrfs/file.c | 1 + + fs/btrfs/free-space-cache.c | 9 +- + fs/btrfs/fs.h | 33 +- + fs/btrfs/inode-item.c | 2 +- + fs/btrfs/inode-item.h | 8 + + fs/btrfs/inode.c | 64 +- + fs/btrfs/locking.c | 19 +- + fs/btrfs/messages.c | 32 +- + fs/btrfs/messages.h | 14 +- + fs/btrfs/ordered-data.c | 24 +- + fs/btrfs/props.c | 1 + + fs/btrfs/qgroup.c | 547 +++++---- + fs/btrfs/qgroup.h | 103 +- + fs/btrfs/ref-verify.c | 2 +- + fs/btrfs/relocation.c | 2 +- + fs/btrfs/root-tree.c | 6 +- + fs/btrfs/root-tree.h | 8 +- + fs/btrfs/scrub.c | 1 - + fs/btrfs/send.c | 6 +- + fs/btrfs/space-info.c | 32 +- + fs/btrfs/space-info.h | 3 +- + fs/btrfs/super.c | 80 +- + fs/btrfs/transaction.c | 159 ++- + fs/btrfs/transaction.h | 17 +- + fs/btrfs/tree-checker.c | 1 + + fs/btrfs/tree-log.c | 18 +- + fs/btrfs/ulist.c | 3 +- + fs/btrfs/volumes.c | 71 +- + fs/btrfs/volumes.h | 12 +- + fs/btrfs/zoned.c | 2 +- + fs/btrfs/zstd.c | 11 +- + 56 files changed, 1226 insertions(+), 4202 deletions(-) + delete mode 100644 fs/btrfs/check-integrity.c + delete mode 100644 fs/btrfs/check-integrity.h +Merging ceph/master (ce0d5bd3a6c1 ceph: make num_fwd and num_retry to __u32) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (05d0f8f55ad6 smb3: move server check earlier when setting channel sequence number) +$ 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/smb2pdu.c | 25 +++++++++++++++---------- + 1 file changed, 15 insertions(+), 10 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 +Auto-merging fs/ecryptfs/read_write.c +Merge made by the 'ort' strategy. + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/keystore.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging erofs/dev (91b1ad0815fb erofs: release ztailpacking pclusters properly) +$ 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 (b3a62a988600 exfat: support create zero-size directory) +$ 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/dir.c | 12 +++---- + fs/exfat/exfat_fs.h | 8 +++++ + fs/exfat/file.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/exfat/namei.c | 36 +++++++++++++++------ + fs/exfat/super.c | 7 ++++ + 5 files changed, 141 insertions(+), 15 deletions(-) +Merging ext3/for_next (d3cc1b0be258 quota: explicitly forbid quota files from being encrypted) +$ 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/quota/dquot.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) +Merging ext4/dev (147d4a092e9a jbd2: Remove page size assumptions) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging include/linux/buffer_head.h +Merge made by the 'ort' strategy. + fs/jbd2/commit.c | 16 ++++++---------- + fs/jbd2/transaction.c | 12 ++++-------- + include/linux/buffer_head.h | 5 ++++- + 3 files changed, 14 insertions(+), 19 deletions(-) +Merging f2fs/dev (3669558bdf35 Merge tag 'for-6.6-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ 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 (919dc320956e fsverity: skip PKCS#7 parser when keyring is empty) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (f73016b63b09 fuse: conditionally fill kstat in fuse_do_statx()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (4f575b4604de gfs2: Fix another freeze/thaw hang) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/glops.c | 22 +++++----------------- + fs/gfs2/super.c | 10 ---------- + 2 files changed, 5 insertions(+), 27 deletions(-) +Merging jfs/jfs-next (0225e10972fa jfs: validate max amount of blocks before allocation.) +$ 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 (59d8d24f4610 ksmbd: fix passing freed memory 'aux_payload_buf') +$ 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 | 2 +- + fs/smb/server/smbacl.c | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging nfs/linux-next (2dde18cd1d8f Linux 6.5) +$ 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 (806a3bc421a1 NFSv4.1: fix pnfs MDS=DS session trunking) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Merge made by the 'ort' strategy. + fs/nfs/direct.c | 134 +++++++++++++++++++++++---------- + fs/nfs/flexfilelayout/flexfilelayout.c | 1 + + fs/nfs/nfs4client.c | 6 +- + fs/nfs/write.c | 23 +++--- + include/linux/nfs_fs_sb.h | 1 + + include/linux/nfs_page.h | 4 +- + net/sunrpc/clnt.c | 14 ++-- + 7 files changed, 124 insertions(+), 59 deletions(-) +Merging nfsd/nfsd-next (11d1df89720e lockd: add doc to enable EXPORT_OP_ASYNC_LOCK) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/nfsd/filecache.c +Auto-merging fs/nfsd/nfs4proc.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging include/linux/exportfs.h +Merge made by the 'ort' strategy. + Documentation/filesystems/nfs/exporting.rst | 7 +++ + fs/lockd/svclock.c | 38 ++++++++----- + fs/locks.c | 12 ++-- + fs/nfsd/filecache.c | 27 ++++++--- + fs/nfsd/nfs4proc.c | 14 ++++- + fs/nfsd/nfs4state.c | 10 +++- + fs/nfsd/trace.h | 87 +++++++++++++++++++++++++++++ + fs/nfsd/vfs.c | 61 +++++++++++--------- + fs/nfsd/vfs.h | 4 +- + include/linux/exportfs.h | 14 +++++ + 10 files changed, 215 insertions(+), 59 deletions(-) +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 (724768a39374 ovl: fix incorrect fdput() on aio completion) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (017c73a34a66 ubi: Refuse attaching if mtd's erasesize is 0) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Merge made by the 'ort' strategy. + drivers/mtd/ubi/build.c | 7 +++++++ + 1 file changed, 7 insertions(+) +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 (2dde18cd1d8f Linux 6.5) +$ 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 (c1950a111dd8 fs/xfs: Fix typos in comments) +$ 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 (4aa8cdd5e523 iomap: handle error conditions more gracefully in iomap_to_bh) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Merge made by the 'ort' strategy. + fs/buffer.c | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) +Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck) +$ 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 (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ 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 (460ff2c3c768 Merge branch 'vfs.super' 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/nfs/super.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + arch/s390/hypfs/inode.c | 3 +-- + fs/attr.c | 52 +++++++++++++++++++++++++++++++++++++++----- + fs/devpts/inode.c | 2 +- + fs/init.c | 6 ++--- + fs/inode.c | 6 +++-- + fs/namei.c | 19 ---------------- + fs/nfs/super.c | 2 +- + fs/ramfs/inode.c | 2 +- + fs/reiserfs/reiserfs.h | 6 ++--- + include/linux/fs.h | 3 ++- + include/linux/namei.h | 24 ++++++++++++++++++++ + init/do_mounts.c | 2 +- + mm/readahead.c | 3 +-- + security/selinux/selinuxfs.c | 5 +---- + 14 files changed, 88 insertions(+), 47 deletions(-) +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 (189f53ec6668 Merge branch 'for-6.6-fixup' 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (94160062396d pstore: Base compression input buffer size on estimated compressed size) +$ 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 +Already up to date. +Merging hid/for-next (bd0ffb67f8d3 Merge branch 'for-6.6/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. + drivers/hid/hid-sony.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging i2c/i2c/for-next (637f33a4fe86 i2c: cadence: Fix the kernel-doc warnings) +$ 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 +Merge made by the 'ort' strategy. + drivers/i2c/Kconfig | 2 +- + drivers/i2c/busses/Kconfig | 4 ++-- + drivers/i2c/busses/i2c-aspeed.c | 7 +++++-- + drivers/i2c/busses/i2c-cadence.c | 1 + + drivers/w1/masters/ds2482.c | 2 +- + include/linux/i2c.h | 11 +---------- + 6 files changed, 11 insertions(+), 16 deletions(-) +Merging i3c/i3c/next (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 (80369d9e1f2f hwmon: (sch5627) Document behaviour of limit registers) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/hwmon/pmbus/infineon,tda38640.yaml | 49 ++++ + .../devicetree/bindings/trivial-devices.yaml | 2 - + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/powerz.rst | 30 +++ + Documentation/hwmon/sch5627.rst | 10 + + MAINTAINERS | 7 + + drivers/hwmon/Kconfig | 11 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/pmbus/pmbus.h | 9 + + drivers/hwmon/pmbus/tda38640.c | 154 +++++++++++- + drivers/hwmon/powerz.c | 274 +++++++++++++++++++++ + drivers/hwmon/sch5627.c | 267 ++++++++++++++------ + drivers/hwmon/sch56xx-common.c | 107 ++++++++ + drivers/hwmon/sch56xx-common.h | 6 + + drivers/hwmon/tmp513.c | 52 ++-- + 15 files changed, 874 insertions(+), 106 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/infineon,tda38640.yaml + create mode 100644 Documentation/hwmon/powerz.rst + create mode 100644 drivers/hwmon/powerz.c +Merging jc_docs/docs-next (86a0adc029d3 Documentation/sphinx: fix Python string escapes) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'ort' strategy. + Documentation/sphinx/cdomain.py | 2 +- + Documentation/sphinx/kernel_abi.py | 2 +- + Documentation/sphinx/kernel_feat.py | 2 +- + Documentation/sphinx/kerneldoc.py | 2 +- + Documentation/sphinx/maintainers_include.py | 8 ++++---- + 5 files changed, 8 insertions(+), 8 deletions(-) +Merging v4l-dvb/master (0bb80ecc33a8 Linux 6.6-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 (0835b195d034 media: ivsc: Depend on VIDEO_DEV) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Merge made by the 'ort' strategy. + .../bindings/media/qcom,sdm845-venus-v2.yaml | 8 + + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 385 ++++++++++++++++----- + drivers/media/common/videobuf2/videobuf2-core.c | 2 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 6 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 8 +- + drivers/media/pci/intel/ivsc/Kconfig | 5 +- + drivers/media/platform/marvell/Kconfig | 4 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 27 +- + drivers/media/platform/qcom/camss/camss-csid-4-1.c | 8 +- + drivers/media/platform/qcom/camss/camss-csid-4-7.c | 8 +- + .../media/platform/qcom/camss/camss-csid-gen2.c | 19 +- + drivers/media/platform/qcom/camss/camss-csid.c | 6 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 2 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 28 +- + drivers/media/platform/qcom/camss/camss-ispif.c | 20 +- + drivers/media/platform/qcom/camss/camss-vfe-170.c | 22 +- + drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 16 +- + drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 16 +- + drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 16 +- + drivers/media/platform/qcom/camss/camss-vfe-480.c | 22 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 105 +++--- + drivers/media/platform/qcom/camss/camss-video.c | 64 ++-- + drivers/media/platform/qcom/camss/camss.c | 55 +-- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 26 +- + drivers/media/platform/verisilicon/hantro_drv.c | 3 +- + .../media/platform/verisilicon/hantro_postproc.c | 2 +- + drivers/media/platform/via/Kconfig | 2 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 5 +- + drivers/media/usb/cx231xx/cx231xx.h | 3 + + drivers/media/usb/dvb-usb/gp8psk.c | 2 +- + drivers/media/usb/em28xx/Kconfig | 4 +- + drivers/media/usb/go7007/Kconfig | 2 +- + drivers/media/usb/gspca/cpia1.c | 3 + + drivers/media/usb/siano/smsusb.c | 4 +- + drivers/media/usb/uvc/uvc_ctrl.c | 3 + + include/linux/platform_data/cros_ec_commands.h | 66 +++- + 37 files changed, 626 insertions(+), 353 deletions(-) +Merging pm/linux-next (b5eda4c9c923 Merge branch 'pm-cpufreq' 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/thermal.c | 2 +- + drivers/cpufreq/intel_pstate.c | 6 +----- + drivers/thermal/thermal_of.c | 8 ++++++-- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 3 ++- + include/linux/thermal.h | 4 ++-- + 5 files changed, 12 insertions(+), 11 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (16567117aa0c cpufreq: Add QCM6490 to cpufreq-dt-platdev blocklist) +$ 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/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/tegra194-cpufreq.c | 2 ++ + 2 files changed, 3 insertions(+) +Merging cpupower/cpupower (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (5693d077595d PM / devfreq: Fix leak in devfreq_dev_release()) +$ 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 pmdomain/next (ae3a94e4adee pmdomain: starfive: Add JH7110 AON PMU support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/pmdomain/amlogic/meson-secure-pwrc.c | 127 +++++++++++++++++++--- + drivers/pmdomain/starfive/jh71xx-pmu.c | 139 +++++++++++++++++++----- + drivers/soc/starfive/Kconfig | 4 +- + include/dt-bindings/power/starfive,jh7110-pmu.h | 5 +- + 5 files changed, 231 insertions(+), 45 deletions(-) +Merging opp/opp/linux-next (e576a9a8603f dt-bindings: cpufreq: Convert ti-cpufreq to json schema) +$ 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 (edd220b33f47 thermal: core: Drop thermal_zone_device_register()) +$ 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 (7c53e847ff5e dlm: fix plock lookup when using multiple lockspaces) +$ 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 (0bb80ecc33a8 Linux 6.6-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 (ca5ab9638e92 Merge branch 'selftests-classid') +$ 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 MAINTAINERS +Auto-merging net/xfrm/xfrm_policy.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/net/ti,icssg-prueth.yaml | 1 + + Documentation/networking/ip-sysctl.rst | 7 ++ + MAINTAINERS | 3 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 8 +-- + drivers/net/ethernet/intel/i40e/i40e_main.c | 10 ++- + drivers/net/ethernet/intel/iavf/iavf.h | 16 +++-- + drivers/net/ethernet/intel/iavf/iavf_main.c | 43 +++++------- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 77 ++++++++++++++-------- + drivers/net/ethernet/ti/icssg/icssg_prueth.c | 5 ++ + drivers/net/wwan/wwan_core.c | 5 +- + include/linux/tcp.h | 14 ++-- + include/net/dst.h | 4 +- + include/net/netns/ipv4.h | 1 + + include/net/sock.h | 9 ++- + net/core/dst.c | 10 +-- + net/core/sock.c | 6 +- + net/ipv4/route.c | 6 +- + net/ipv4/sysctl_net_ipv4.c | 9 +++ + net/ipv4/tcp_input.c | 8 +++ + net/ipv4/tcp_ipv4.c | 1 + + net/ipv4/tcp_output.c | 15 ++--- + net/ipv6/route.c | 4 +- + net/openvswitch/actions.c | 4 +- + net/sched/cls_route.c | 37 ++++++----- + net/sched/sch_frag.c | 4 +- + net/xfrm/xfrm_policy.c | 2 +- + .../selftests/tc-testing/tc-tests/filters/fw.json | 49 ++++++++++++++ + .../tc-testing/tc-tests/filters/route.json | 25 +++++++ + .../selftests/tc-testing/tc-tests/filters/u32.json | 25 +++++++ + 29 files changed, 277 insertions(+), 131 deletions(-) +Merging bpf-next/for-next (558c50cc3b13 docs/bpf: update out-of-date doc in BPF flow dissector) +$ 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 include/uapi/linux/bpf.h +Auto-merging kernel/bpf/btf.c +Auto-merging kernel/bpf/core.c +Auto-merging kernel/bpf/memalloc.c +Auto-merging tools/include/uapi/linux/bpf.h +Merge made by the 'ort' strategy. + Documentation/bpf/prog_flow_dissector.rst | 2 +- + arch/x86/net/bpf_jit_comp.c | 32 ++- + include/linux/bpf.h | 27 ++- + include/linux/bpf_verifier.h | 1 + + include/uapi/linux/bpf.h | 9 +- + kernel/bpf/btf.c | 5 + + kernel/bpf/core.c | 8 +- + kernel/bpf/helpers.c | 16 ++ + kernel/bpf/memalloc.c | 30 ++- + kernel/bpf/syscall.c | 4 + + kernel/bpf/task_iter.c | 40 +-- + kernel/bpf/trampoline.c | 4 +- + kernel/bpf/verifier.c | 194 ++++++++++++--- + samples/bpf/Makefile | 4 + + tools/bpf/bpftool/gen.c | 2 +- + tools/include/uapi/linux/bpf.h | 9 +- + tools/lib/bpf/bpf_helpers.h | 1 + + tools/lib/bpf/btf.c | 160 ++++++++++++ + tools/testing/selftests/bpf/bpf_experimental.h | 31 +++ + tools/testing/selftests/bpf/prog_tests/btf.c | 4 +- + .../selftests/bpf/prog_tests/fill_link_info.c | 2 +- + .../bpf/prog_tests/kprobe_multi_testmod_test.c | 20 +- + .../testing/selftests/bpf/prog_tests/libbpf_str.c | 6 +- + .../testing/selftests/bpf/prog_tests/linked_list.c | 4 +- + .../selftests/bpf/prog_tests/percpu_alloc.c | 125 ++++++++++ + .../selftests/bpf/prog_tests/preempted_bpf_ma_op.c | 89 +++++++ + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 269 +++++++++++++++++++-- + .../selftests/bpf/progs/percpu_alloc_array.c | 183 ++++++++++++++ + .../bpf/progs/percpu_alloc_cgrp_local_storage.c | 105 ++++++++ + .../selftests/bpf/progs/percpu_alloc_fail.c | 164 +++++++++++++ + .../selftests/bpf/progs/preempted_bpf_ma_op.c | 106 ++++++++ + .../selftests/bpf/progs/tailcall_bpf2bpf_fentry.c | 18 ++ + .../selftests/bpf/progs/tailcall_bpf2bpf_fexit.c | 18 ++ + .../selftests/bpf/test_bpftool_synctypes.py | 9 + + tools/testing/selftests/bpf/trace_helpers.c | 142 ++++++++--- + tools/testing/selftests/bpf/trace_helpers.h | 8 +- + 36 files changed, 1682 insertions(+), 169 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/percpu_alloc.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/preempted_bpf_ma_op.c + create mode 100644 tools/testing/selftests/bpf/progs/percpu_alloc_array.c + create mode 100644 tools/testing/selftests/bpf/progs/percpu_alloc_cgrp_local_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/percpu_alloc_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/preempted_bpf_ma_op.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_fentry.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_fexit.c +$ git am -3 ../patches/0001-bpf-Skip-unit_size-checking-for-global-per-cpu-alloc.patch +Applying: bpf: Skip unit_size checking for global per-cpu allocator +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/bpf/memalloc.c +$ git add -A . +$ git commit -v -a --amend +[master 41cf0cd4c726] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git + Date: Thu Sep 14 10:15:10 2023 +1000 +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 +Already up to date. +Merging mlx5-next/mlx5-next (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 (73be7fb14e83 Merge tag 'net-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (c2e5f4fd1148 Merge branch 'netconsole-enable-compile-time-configuration') +$ 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 (c0c68490dadb Bluetooth: ISO: Set CIS bit only for devices with CIS support) +$ 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/btusb.c | 5 +++ + include/net/bluetooth/hci.h | 3 ++ + include/net/bluetooth/hci_core.h | 25 +++++++++++++- + include/net/bluetooth/hci_sync.h | 2 ++ + net/bluetooth/hci_conn.c | 71 ++++++++++++++++++++++++---------------- + net/bluetooth/hci_core.c | 5 +++ + net/bluetooth/hci_event.c | 54 ++++++++++++++++++++++-------- + net/bluetooth/hci_request.h | 2 -- + net/bluetooth/hci_sync.c | 45 ++++++++++--------------- + net/bluetooth/iso.c | 28 +++++++++++----- + 10 files changed, 160 insertions(+), 80 deletions(-) +Merging wireless-next/for-next (e160ab85166e wifi: mac80211: don't return unset power in ieee80211_get_tx_power()) +$ 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 +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c +Auto-merging drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +CONFLICT (content): Merge conflict in drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +Auto-merging include/net/cfg80211.h +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/mesh.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/wireless/core.c +Auto-merging net/wireless/core.h +Auto-merging net/wireless/mlme.c +Auto-merging net/wireless/nl80211.c +CONFLICT (content): Merge conflict in net/wireless/nl80211.c +Recorded preimage for 'drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c' +Resolved 'net/wireless/nl80211.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c'. +[master 13844fced4f1] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git +$ git diff -M --stat --summary HEAD^.. + drivers/net/wireless/ath/ath11k/mac.c | 15 +- + drivers/net/wireless/ath/ath12k/mac.c | 12 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 8 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 3 +- + drivers/net/wireless/ath/wil6210/wmi.c | 2 - + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 5 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + drivers/net/wireless/intel/iwlegacy/common.c | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 10 +- + drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 8 +- + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 33 +- + drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 14 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.h | 12 +- + drivers/net/wireless/intel/iwlwifi/dvm/tt.h | 9 +- + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 1 + + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 22 + + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 16 +- + drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 25 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 1 + + drivers/net/wireless/intel/iwlwifi/fw/file.h | 27 +- + drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h | 3 +- + drivers/net/wireless/intel/iwlwifi/fw/rs.c | 1 - + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 5 - + .../wireless/intel/iwlwifi/iwl-context-info-gen3.h | 10 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 51 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 2 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 13 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 20 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 54 +- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 3 - + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 34 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 5 + + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 23 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 5 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 2 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.h | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 14 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 59 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 8 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 33 +- + drivers/net/wireless/intel/iwlwifi/queue/tx.h | 6 +- + drivers/net/wireless/marvell/mwifiex/11h.c | 4 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7996/init.c | 3 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 4 +- + drivers/net/wireless/purelifi/plfxlc/mac.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 4 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 5 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/event.c | 4 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 1 + + drivers/net/wireless/realtek/rtw88/rtw8822cu.c | 4 +- + drivers/net/wireless/realtek/rtw89/chan.c | 1155 ++++++++++++++++++++ + drivers/net/wireless/realtek/rtw89/chan.h | 20 + + drivers/net/wireless/realtek/rtw89/core.c | 21 +- + drivers/net/wireless/realtek/rtw89/core.h | 106 ++ + drivers/net/wireless/realtek/rtw89/fw.c | 124 ++- + drivers/net/wireless/realtek/rtw89/fw.h | 9 +- + drivers/net/wireless/realtek/rtw89/mac.c | 45 +- + drivers/net/wireless/realtek/rtw89/mac.h | 10 +- + drivers/net/wireless/realtek/rtw89/mac_be.c | 156 +++ + drivers/net/wireless/realtek/rtw89/reg.h | 117 ++ + drivers/net/wireless/realtek/rtw89/regd.c | 2 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 7 + + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 23 +- + .../wireless/realtek/rtw89/rtw8852c_rfk_table.c | 42 +- + .../net/wireless/realtek/rtw89/rtw8852c_table.c | 9 +- + drivers/net/wireless/realtek/rtw89/wow.c | 4 +- + drivers/net/wireless/ti/wlcore/event.c | 2 +- + drivers/net/wireless/ti/wlcore/main.c | 6 +- + drivers/net/wireless/virtual/mac80211_hwsim.c | 32 +- + drivers/net/wireless/virtual/mac80211_hwsim.h | 19 +- + drivers/ssb/main.c | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 6 +- + include/linux/ieee80211.h | 13 +- + include/net/cfg80211.h | 194 ++-- + include/net/mac80211.h | 42 +- + include/uapi/linux/nl80211.h | 13 +- + net/mac80211/Kconfig | 11 + + net/mac80211/Makefile | 2 + + net/mac80211/agg-rx.c | 63 +- + net/mac80211/agg-tx.c | 63 +- + net/mac80211/airtime.c | 10 +- + net/mac80211/cfg.c | 487 ++++----- + net/mac80211/chan.c | 156 ++- + net/mac80211/debugfs.c | 11 +- + net/mac80211/debugfs_key.c | 20 +- + net/mac80211/debugfs_netdev.c | 133 ++- + net/mac80211/debugfs_sta.c | 4 +- + net/mac80211/driver-ops.c | 31 +- + net/mac80211/driver-ops.h | 127 ++- + net/mac80211/ethtool.c | 11 +- + net/mac80211/ht.c | 60 +- + net/mac80211/ibss.c | 104 +- + net/mac80211/ieee80211_i.h | 199 ++-- + net/mac80211/iface.c | 170 ++- + net/mac80211/key.c | 165 ++- + net/mac80211/key.h | 11 +- + net/mac80211/link.c | 56 +- + net/mac80211/main.c | 88 +- + net/mac80211/mesh.c | 16 +- + net/mac80211/mesh_pathtbl.c | 2 +- + net/mac80211/mlme.c | 410 ++++--- + net/mac80211/ocb.c | 19 +- + net/mac80211/offchannel.c | 103 +- + net/mac80211/pm.c | 13 +- + net/mac80211/rc80211_minstrel_ht.c | 7 +- + net/mac80211/rx.c | 6 +- + net/mac80211/s1g.c | 15 +- + net/mac80211/scan.c | 226 ++-- + net/mac80211/sta_info.c | 111 +- + net/mac80211/sta_info.h | 26 +- + net/mac80211/status.c | 102 +- + net/mac80211/tdls.c | 84 +- + net/mac80211/tests/Makefile | 3 + + net/mac80211/tests/elems.c | 101 ++ + net/mac80211/tests/module.c | 10 + + net/mac80211/trace.h | 11 +- + net/mac80211/tx.c | 57 +- + net/mac80211/util.c | 196 +--- + net/wireless/Kconfig | 11 + + net/wireless/Makefile | 1 + + net/wireless/ap.c | 24 +- + net/wireless/chan.c | 55 +- + net/wireless/core.c | 72 +- + net/wireless/core.h | 60 +- + net/wireless/ibss.c | 76 +- + net/wireless/lib80211_crypt_tkip.c | 12 +- + net/wireless/mesh.c | 28 +- + net/wireless/mlme.c | 21 +- + net/wireless/nl80211.c | 468 +++----- + net/wireless/ocb.c | 43 +- + net/wireless/pmsr.c | 4 +- + net/wireless/rdev-ops.h | 2 +- + net/wireless/reg.c | 66 +- + net/wireless/reg.h | 16 +- + net/wireless/scan.c | 74 +- + net/wireless/sme.c | 59 +- + net/wireless/sysfs.c | 4 +- + net/wireless/tests/Makefile | 3 + + net/wireless/tests/fragmentation.c | 157 +++ + net/wireless/tests/module.c | 10 + + net/wireless/trace.h | 72 +- + net/wireless/util.c | 57 +- + net/wireless/wext-compat.c | 43 +- + net/wireless/wext-sme.c | 59 +- + 166 files changed, 4678 insertions(+), 3240 deletions(-) + create mode 100644 net/mac80211/tests/Makefile + create mode 100644 net/mac80211/tests/elems.c + create mode 100644 net/mac80211/tests/module.c + create mode 100644 net/wireless/tests/Makefile + create mode 100644 net/wireless/tests/fragmentation.c + create mode 100644 net/wireless/tests/module.c +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 (8ffd18a6744b mtd: lpddr_cmds: Add literal suffix) +$ 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/lpddr/lpddr_cmds.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nand/nand/next (48919c6c4838 mtd: rawnand: remove 'nand_exit_status_op()' prototype) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/internals.h | 1 - + drivers/mtd/nand/raw/omap2.c | 8 ++++---- + drivers/mtd/nand/raw/tegra_nand.c | 4 ++++ + 3 files changed, 8 insertions(+), 5 deletions(-) +Merging spi-nor/spi-nor/next (69d50d0461a1 mtd: spi-nor: nxp-spifi: Use helper function devm_clk_get_enabled()) +$ 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 +Already up to date. +Merging crypto/master (85b9bf9a514d Revert "dt-bindings: crypto: qcom,prng: Add SM8450") +$ 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ 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-ci/topic/drm-ci (ad6bfe1b66a5 drm: ci: docs: fix build warning - add missing escape) +$ git merge -m Merge branch 'topic/drm-ci' of git://git.freedesktop.org/git/drm/drm.git drm-ci/topic/drm-ci +Already up to date. +Merging drm-misc/for-linux-next (fc71f615fd08 drm/amd/display: Fix -Wuninitialized in dm_helpers_dp_mst_send_payload_allocation()) +$ 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/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +Auto-merging drivers/gpu/drm/bridge/samsung-dsim.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Auto-merging drivers/gpu/drm/drm_buddy.c +Auto-merging drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c +Auto-merging drivers/gpu/drm/mediatek/mtk_disp_aal.c +Auto-merging drivers/gpu/drm/mediatek/mtk_disp_ccorr.c +Auto-merging drivers/gpu/drm/mediatek/mtk_dp.c +Auto-merging drivers/gpu/drm/mediatek/mtk_dpi.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/mediatek/mtk_dpi.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_drv.c +Auto-merging drivers/gpu/drm/msm/adreno/adreno_device.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/msm_mdss.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/disp.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_exec.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.c +Auto-merging drivers/gpu/drm/panel/panel-jdi-lt070me05000.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_vop.c +Auto-merging drivers/hid/Kconfig +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/video/fbdev/Makefile +Auto-merging drivers/video/fbdev/au1200fb.c +Auto-merging drivers/video/fbdev/bw2.c +Auto-merging drivers/video/fbdev/cg14.c +Auto-merging drivers/video/fbdev/cg3.c +Auto-merging drivers/video/fbdev/cg6.c +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/video/fbdev/ffb.c +Auto-merging drivers/video/fbdev/leo.c +Auto-merging drivers/video/fbdev/p9100.c +Auto-merging drivers/video/fbdev/tcx.c +Auto-merging include/linux/fb.h +Resolved 'drivers/gpu/drm/mediatek/mtk_dpi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master af45b4d1dea7] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/panel/jdi,lpm102a188a.yaml | 94 +++ + .../bindings/display/panel/panel-simple.yaml | 2 + + .../display/rockchip/rockchip,dw-mipi-dsi.yaml | 2 + + .../bindings/display/rockchip/rockchip-vop.yaml | 1 + + Documentation/driver-api/dma-buf.rst | 30 +- + Documentation/gpu/drm-uapi.rst | 7 + + Documentation/gpu/rfc/xe.rst | 89 ++- + .../userspace-api/dma-buf-alloc-exchange.rst | 389 ++++++++++ + Documentation/userspace-api/index.rst | 1 + + MAINTAINERS | 9 +- + drivers/accel/drm_accel.c | 35 +- + drivers/accel/ivpu/ivpu_drv.c | 65 +- + drivers/accel/ivpu/ivpu_drv.h | 18 +- + drivers/accel/ivpu/ivpu_fw.c | 6 +- + drivers/accel/ivpu/ivpu_fw.h | 2 +- + drivers/accel/ivpu/ivpu_hw_37xx.c | 75 +- + drivers/accel/ivpu/ivpu_hw_37xx_reg.h | 187 ++--- + drivers/accel/ivpu/ivpu_hw_40xx.c | 7 + + drivers/accel/ivpu/ivpu_ipc.c | 13 +- + drivers/accel/ivpu/ivpu_mmu.c | 117 +-- + drivers/accel/ivpu/ivpu_mmu_context.c | 18 +- + drivers/accel/ivpu/ivpu_mmu_context.h | 2 + + drivers/accel/ivpu/ivpu_pm.c | 16 +- + drivers/accel/ivpu/ivpu_pm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 58 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 20 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 9 +- + drivers/gpu/drm/bridge/Kconfig | 2 + + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 9 - + drivers/gpu/drm/bridge/cadence/Kconfig | 1 + + drivers/gpu/drm/bridge/ite-it66121.c | 29 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 22 +- + drivers/gpu/drm/bridge/lvds-codec.c | 12 +- + drivers/gpu/drm/bridge/panel.c | 18 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 20 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 - + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 - + drivers/gpu/drm/display/drm_dp_mst_topology.c | 171 +++-- + drivers/gpu/drm/drm_atomic.c | 4 +- + drivers/gpu/drm/drm_atomic_helper.c | 3 + + drivers/gpu/drm/drm_bridge.c | 4 +- + drivers/gpu/drm/drm_buddy.c | 136 +++- + drivers/gpu/drm/drm_client.c | 4 +- + drivers/gpu/drm/drm_crtc_internal.h | 2 +- + drivers/gpu/drm/drm_debugfs.c | 174 ++--- + drivers/gpu/drm/drm_drv.c | 28 +- + drivers/gpu/drm/drm_framebuffer.c | 4 +- + drivers/gpu/drm/drm_internal.h | 29 +- + drivers/gpu/drm/drm_mode_config.c | 2 - + drivers/gpu/drm/gma500/gma_display.h | 1 - + drivers/gpu/drm/gma500/psb_drv.h | 9 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 14 - + drivers/gpu/drm/gma500/psb_irq.c | 5 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 18 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 23 +- + drivers/gpu/drm/imx/ipuv3/dw_hdmi-imx.c | 6 +- + drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 13 +- + drivers/gpu/drm/imx/ipuv3/imx-ldb.c | 5 +- + drivers/gpu/drm/imx/ipuv3/imx-tve.c | 5 +- + drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c | 5 +- + drivers/gpu/drm/imx/ipuv3/parallel-display.c | 6 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 70 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 5 +- + drivers/gpu/drm/loongson/lsdc_pixpll.c | 6 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 6 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 5 +- + drivers/gpu/drm/msm/dp/dp_display.c | 6 +- + drivers/gpu/drm/msm/dsi/dsi.c | 6 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 6 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 6 +- + drivers/gpu/drm/msm/msm_drv.c | 6 +- + drivers/gpu/drm/msm/msm_mdss.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 19 +- + drivers/gpu/drm/panel/Kconfig | 11 + + drivers/gpu/drm/panel/Makefile | 1 + + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 9 - + drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 9 - + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 9 - + drivers/gpu/drm/panel/panel-jdi-lpm102a188a.c | 551 ++++++++++++++ + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 4 - + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 9 - + drivers/gpu/drm/panel/panel-novatek-nt36523.c | 12 - + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 17 - + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 38 - + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 25 - + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 10 - + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 9 - + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 10 - + drivers/gpu/drm/panel/panel-simple.c | 29 + + drivers/gpu/drm/panel/panel-sony-td4353-jdi.c | 9 - + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 18 - + .../gpu/drm/panel/panel-startek-kd070fhfid015.c | 11 - + drivers/gpu/drm/panel/panel-truly-nt35597.c | 20 - + drivers/gpu/drm/panel/panel-visionox-r66451.c | 16 - + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 8 - + drivers/gpu/drm/panel/panel-visionox-vtdr6130.c | 9 - + drivers/gpu/drm/panfrost/panfrost_gpu.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 4 +- + drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 6 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 20 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 24 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 39 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 55 ++ + drivers/gpu/drm/solomon/ssd130x.c | 49 +- + drivers/gpu/drm/solomon/ssd130x.h | 4 +- + drivers/gpu/drm/tegra/dc.c | 9 +- + drivers/gpu/drm/tegra/dsi.c | 1 + + drivers/gpu/drm/tegra/hdmi.c | 3 +- + drivers/gpu/drm/tegra/sor.c | 1 + + drivers/gpu/drm/tests/drm_format_helper_test.c | 813 +++++++++++++++++++-- + drivers/gpu/drm/tiny/repaper.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 7 - + drivers/hid/Kconfig | 8 +- + drivers/hid/hid-picolcd_fb.c | 73 +- + drivers/staging/fbtft/Kconfig | 6 +- + drivers/staging/fbtft/fbtft-core.c | 99 +-- + drivers/video/fbdev/Kconfig | 35 +- + drivers/video/fbdev/Makefile | 17 +- + drivers/video/fbdev/au1200fb.c | 9 - + drivers/video/fbdev/bw2.c | 17 +- + drivers/video/fbdev/cg14.c | 19 +- + drivers/video/fbdev/cg3.c | 17 +- + drivers/video/fbdev/cg6.c | 17 +- + drivers/video/fbdev/core/Kconfig | 6 + + drivers/video/fbdev/core/Makefile | 2 + + drivers/video/fbdev/core/fb_internal.h | 17 + + drivers/video/fbdev/core/fb_logo.c | 508 +++++++++++++ + drivers/video/fbdev/core/fbcon.c | 2 + + drivers/video/fbdev/core/fbmem.c | 542 +------------- + drivers/video/fbdev/ffb.c | 17 +- + drivers/video/fbdev/hyperv_fb.c | 48 +- + drivers/video/fbdev/leo.c | 19 +- + drivers/video/fbdev/mmp/fb/mmpfb.c | 7 - + drivers/video/fbdev/p9100.c | 18 +- + drivers/video/fbdev/sbuslib.h | 37 +- + drivers/video/fbdev/smscufx.c | 85 +-- + drivers/video/fbdev/tcx.c | 20 +- + drivers/video/fbdev/udlfb.c | 89 +-- + include/drm/bridge/samsung-dsim.h | 1 + + include/drm/display/drm_dp_mst_helper.h | 23 +- + include/drm/drm_accel.h | 9 +- + include/drm/drm_atomic.h | 2 +- + include/drm/drm_bridge.h | 6 +- + include/drm/drm_buddy.h | 6 +- + include/drm/drm_client.h | 2 +- + include/drm/drm_connector.h | 3 +- + include/drm/drm_debugfs.h | 4 +- + include/drm/drm_device.h | 14 +- + include/drm/drm_drv.h | 8 + + include/drm/drm_file.h | 4 +- + include/linux/fb.h | 5 - + include/uapi/drm/ivpu_accel.h | 18 +- + 156 files changed, 3758 insertions(+), 2211 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/jdi,lpm102a188a.yaml + create mode 100644 Documentation/userspace-api/dma-buf-alloc-exchange.rst + create mode 100644 drivers/gpu/drm/panel/panel-jdi-lpm102a188a.c + create mode 100644 drivers/video/fbdev/core/fb_logo.c +Merging amdgpu/drm-next (addd7aef251c drm/amdgpu: add remap_hdp_registers callback for nbio 7.11) +$ 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_amdkfd.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +Auto-merging drivers/gpu/drm/amd/display/dc/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +Auto-merging drivers/gpu/drm/amd/include/amd_shared.h +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 204ef94af006] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/amdgpu/thermal.rst | 30 + + drivers/gpu/drm/amd/amdgpu/Makefile | 22 +- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 185 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 66 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 18 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 8 - + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 69 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 36 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 873 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.h | 218 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 676 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h | 91 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 48 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 112 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.c | 516 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 622 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.h | 35 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 589 + + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.h | 29 + + drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 3 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 296 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_11.h | 33 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 3 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 20 +- + drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c | 19 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 5 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 14 +- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 365 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 125 + + drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c | 408 + + drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 1779 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.h | 35 + + drivers/gpu/drm/amd/amdgpu/vpe_6_1_fw_if.h | 217 + + drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c | 289 + + drivers/gpu/drm/amd/amdgpu/vpe_v6_1.h | 29 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 123 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 34 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 43 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 44 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 75 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 152 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 58 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 4 +- + drivers/gpu/drm/amd/display/dc/Makefile | 1 + + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 8 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 5 + + .../gpu/drm/amd/display/dc/clk_mgr/dcn32/dalsmc.h | 11 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 64 + + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c | 154 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 1000 + + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h | 63 + + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 453 + + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h | 180 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 133 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 23 + + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 35 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 1415 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc.h | 66 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 75 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_helper.c | 4 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 1 - + drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 9 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 20 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 4 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 6 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 10 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 39 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 10 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 3 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 33 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 30 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 24 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 64 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 52 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 5 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 22 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 4 +- + .../drm/amd/display/dc/dcn201/dcn201_resource.c | 1 + + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 1 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 104 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 17 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 1 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 1 + + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 1 + + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 1 + + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 1 + + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.h | 10 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 32 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h | 3 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 1 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 2 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.h | 6 + + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 22 +- + .../display/dc/dcn314/dcn314_dio_stream_encoder.h | 40 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 3 +- + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 24 + + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 1 + + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 14 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 6 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 104 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 9 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 2 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h | 4 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 25 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 105 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 15 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 50 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 20 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c | 737 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.h | 190 + + .../amd/display/dc/dcn35/dcn35_dio_link_encoder.c | 267 + + .../amd/display/dc/dcn35/dcn35_dio_link_encoder.h | 137 + + .../display/dc/dcn35/dcn35_dio_stream_encoder.c | 528 + + .../display/dc/dcn35/dcn35_dio_stream_encoder.h | 326 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.c | 51 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.h | 55 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.c | 58 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.h | 57 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.c | 58 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.h | 59 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c | 573 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.h | 148 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.c | 104 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.h | 59 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.c | 1192 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.h | 82 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c | 167 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.h | 32 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.c | 57 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.h | 73 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.c | 51 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.h | 65 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.c | 288 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.h | 219 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.c | 553 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.h | 193 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_resource.c | 2084 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_resource.h | 307 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 6 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 2 + + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 754 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 3 - + .../dc/dml/dcn32/display_mode_vba_util_32.c | 4 - + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 484 + + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.h | 44 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 15 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 7 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 16 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 10 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/pg_cntl.h | 52 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 5 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 28 + + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 268 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 9 + + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 12 +- + .../amd/display/dc/irq/dce120/irq_service_dce120.c | 12 +- + .../amd/display/dc/irq/dce60/irq_service_dce60.c | 12 +- + .../amd/display/dc/irq/dce80/irq_service_dce80.c | 12 +- + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 14 +- + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 14 +- + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 14 +- + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 16 +- + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 16 +- + .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 16 +- + .../amd/display/dc/irq/dcn303/irq_service_dcn303.c | 14 +- + .../amd/display/dc/irq/dcn31/irq_service_dcn31.c | 16 +- + .../amd/display/dc/irq/dcn314/irq_service_dcn314.c | 16 +- + .../amd/display/dc/irq/dcn315/irq_service_dcn315.c | 16 +- + .../amd/display/dc/irq/dcn32/irq_service_dcn32.c | 16 +- + .../amd/display/dc/irq/dcn35/irq_service_dcn35.c | 427 + + .../amd/display/dc/irq/dcn35/irq_service_dcn35.h | 34 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.h | 2 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 47 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 5 + + .../amd/display/dc/link/protocols/link_dp_phy.c | 3 +- + .../dc/link/protocols/link_edp_panel_control.c | 29 + + .../dc/link/protocols/link_edp_panel_control.h | 1 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 52 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 11 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 62 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 17 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 552 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h | 282 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 94 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 2 + + .../drm/amd/display/include/ddc_service_types.h | 1 + + drivers/gpu/drm/amd/display/include/logger_types.h | 5 +- + .../drm/amd/display/modules/color/color_gamma.c | 115 +- + drivers/gpu/drm/amd/include/amd_shared.h | 3 + + .../amd/include/asic_reg/dcn/dcn_3_5_0_offset.h | 15255 +++++ + .../amd/include/asic_reg/dcn/dcn_3_5_0_sh_mask.h | 53412 +++++++++++++++++ + .../drm/amd/include/asic_reg/gc/gc_11_5_0_offset.h | 10000 ++++ + .../amd/include/asic_reg/gc/gc_11_5_0_sh_mask.h | 36531 ++++++++++++ + .../include/asic_reg/mmhub/mmhub_3_3_0_offset.h | 1395 + + .../include/asic_reg/mmhub/mmhub_3_3_0_sh_mask.h | 6722 +++ + .../drm/amd/include/asic_reg/mp/mp_14_0_0_offset.h | 359 + + .../amd/include/asic_reg/mp/mp_14_0_0_sh_mask.h | 534 + + .../amd/include/asic_reg/nbio/nbio_7_11_0_offset.h | 9391 +++ + .../include/asic_reg/nbio/nbio_7_11_0_sh_mask.h | 57846 +++++++++++++++++++ + .../amd/include/asic_reg/umc/umc_12_0_0_offset.h | 33 + + .../amd/include/asic_reg/umc/umc_12_0_0_sh_mask.h | 95 + + .../amd/include/asic_reg/vcn/vcn_4_0_0_offset.h | 422 + + .../amd/include/asic_reg/vcn/vcn_4_0_0_sh_mask.h | 882 + + .../amd/include/asic_reg/vcn/vcn_4_0_5_offset.h | 1797 + + .../amd/include/asic_reg/vcn/vcn_4_0_5_sh_mask.h | 8614 +++ + .../amd/include/asic_reg/vpe/vpe_6_1_0_offset.h | 1553 + + .../amd/include/asic_reg/vpe/vpe_6_1_0_sh_mask.h | 4393 ++ + .../drm/amd/include/ivsrcid/vpe/irqsrcs_vpe_6_1.h | 40 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 11 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 12 +- + drivers/gpu/drm/amd/include/soc15_hw_ip.h | 1 + + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 2 + + drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h | 437 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 791 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 14 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 33 + + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_6.h | 3 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 3 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 172 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 24 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 189 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 368 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 34 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 362 +- + drivers/gpu/drm/radeon/evergreen.c | 7 +- + drivers/gpu/drm/radeon/radeon.h | 4 - + drivers/gpu/drm/radeon/radeon_drv.c | 2 - + drivers/gpu/drm/radeon/radeon_fence.c | 111 +- + drivers/gpu/drm/radeon/radeon_gem.c | 16 - + drivers/gpu/drm/radeon/radeon_ttm.c | 2 - + include/uapi/drm/amdgpu_drm.h | 6 +- + 330 files changed, 236045 insertions(+), 2076 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v12_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v12_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_6_1_fw_if.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_v6_1.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/pg_cntl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_3_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_3_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_12_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_12_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_5_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_5_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vpe/vpe_6_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vpe/vpe_6_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/vpe/irqsrcs_vpe_6_1.h + create mode 100644 drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h +Merging drm-intel/for-linux-next (3072a24c778a drm/i915: Introduce crtc_state->enhanced_framing) + 70052100fabe ("drm/i915: Only check eDP HPD when AUX CH is shared") +$ 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/drm_edid.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/display/intel_hotplug.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_object.h +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c +Auto-merging drivers/gpu/drm/i915/pxp/intel_pxp_tee.c +Auto-merging drivers/media/cec/core/cec-adap.c +Auto-merging drivers/media/cec/core/cec-notifier.c +Auto-merging include/drm/drm_connector.h +Auto-merging include/drm/drm_edid.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/display/drm_dp_cec.c | 23 +- + drivers/gpu/drm/display/drm_dp_helper.c | 8 +- + drivers/gpu/drm/drm_edid.c | 22 +- + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/g4x_dp.c | 10 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 1 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 1 + + drivers/gpu/drm/i915/display/intel_audio.c | 6 +- + drivers/gpu/drm/i915/display/intel_audio.h | 3 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 63 +- + drivers/gpu/drm/i915/display/intel_color.c | 107 +++- + drivers/gpu/drm/i915/display/intel_color_regs.h | 286 +++++++++ + drivers/gpu/drm/i915/display/intel_combo_phy.c | 17 +- + drivers/gpu/drm/i915/display/intel_crt.c | 19 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 3 + + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 194 +++--- + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 13 + + drivers/gpu/drm/i915/display/intel_ddi.c | 33 +- + drivers/gpu/drm/i915/display/intel_display.c | 81 +-- + .../gpu/drm/i915/display/intel_display_debugfs.c | 4 + + .../gpu/drm/i915/display/intel_display_device.h | 26 + + .../gpu/drm/i915/display/intel_display_driver.c | 3 + + drivers/gpu/drm/i915/display/intel_display_power.c | 4 - + drivers/gpu/drm/i915/display/intel_display_power.h | 1 - + .../gpu/drm/i915/display/intel_display_power_map.c | 9 - + .../drm/i915/display/intel_display_power_well.c | 5 + + drivers/gpu/drm/i915/display/intel_display_types.h | 10 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 48 ++ + drivers/gpu/drm/i915/display/intel_display_wa.h | 13 + + drivers/gpu/drm/i915/display/intel_dmc.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 706 ++++++++++++++++----- + drivers/gpu/drm/i915/display/intel_dp.h | 19 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 87 ++- + .../gpu/drm/i915/display/intel_dp_link_training.c | 14 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 54 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 54 +- + drivers/gpu/drm/i915/display/intel_drrs.c | 1 + + drivers/gpu/drm/i915/display/intel_dsb.c | 53 +- + drivers/gpu/drm/i915/display/intel_fb.c | 61 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 9 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 9 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 29 + + drivers/gpu/drm/i915/display/intel_frontbuffer.h | 4 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 33 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 23 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 85 ++- + drivers/gpu/drm/i915/display/intel_overlay.c | 2 + + drivers/gpu/drm/i915/display/intel_plane_initial.c | 1 + + drivers/gpu/drm/i915/display/intel_pmdemand.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 52 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 366 +++++------ + drivers/gpu/drm/i915/display/intel_sdvo_regs.h | 2 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 1 + + drivers/gpu/drm/i915/display/intel_tc.c | 38 +- + drivers/gpu/drm/i915/display/intel_tc.h | 3 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 628 +++++++++--------- + drivers/gpu/drm/i915/display/intel_vdsc_regs.h | 371 ++++------- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_object.h | 89 --- + .../gpu/drm/i915/gem/i915_gem_object_frontbuffer.h | 103 +++ + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 1 + + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 39 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 36 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 4 +- + drivers/gpu/drm/i915/i915_driver.c | 3 + + drivers/gpu/drm/i915/i915_drv.h | 11 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 1 - + drivers/gpu/drm/i915/i915_reg.h | 274 -------- + drivers/gpu/drm/i915/i915_vma.c | 1 + + drivers/gpu/drm/i915/i915_vma_resource.c | 2 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 52 +- + drivers/gpu/drm/i915/intel_device_info.h | 1 - + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 + + drivers/gpu/drm/i915/intel_step.c | 1 + + drivers/gpu/drm/i915/pxp/intel_pxp.c | 40 +- + drivers/gpu/drm/i915/pxp/intel_pxp.h | 2 +- + drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 7 +- + drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 18 +- + drivers/gpu/drm/i915/pxp/intel_pxp_pm.h | 5 +- + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 7 +- + drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 9 + + drivers/media/cec/core/cec-adap.c | 5 + + drivers/media/cec/core/cec-notifier.c | 5 + + include/drm/display/drm_dp_helper.h | 6 + + include/drm/drm_connector.h | 8 + + include/drm/drm_edid.h | 1 + + include/drm/i915_pciids.h | 8 +- + 93 files changed, 2632 insertions(+), 1850 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_color_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_wa.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_wa.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h +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 (34b149ecae85 drm/msm/a6xx: Bail out early if setting GPU OOB fails) +$ 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 (d93cf453f51d drm/msm/dpu: fix the irq index in dpu_encoder_phys_wb_wait_for_commit_done) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging etnaviv/etnaviv/next (88c31d2dd191 drm/etnaviv: fix error code in event_alloc()) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (2dde18cd1d8f Linux 6.5) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +Merging regmap/for-next (d3601857e14d regmap: debugfs: Fix a erroneous check after snprintf()) +$ 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/regmap-debugfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sound/for-next (26f7111abd8e ALSA: usb-audio: mixer: Remove temporary string use in parse_clock_source_unit) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging ieee1394/for-next (2dde18cd1d8f Linux 6.5) +$ 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 (afe49745efb0 Merge remote-tracking branch 'asoc/for-6.7' 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/sound/qcom,lpass-tx-macro.yaml | 18 + + .../bindings/sound/starfive,jh7110-pwmdac.yaml | 76 +++ + MAINTAINERS | 7 + + include/sound/cs35l41.h | 4 +- + include/sound/max9768.h | 4 - + include/sound/soc.h | 7 +- + sound/pci/hda/cs35l41_hda.c | 23 +- + sound/soc/amd/acp-config.c | 70 +++ + sound/soc/amd/acp/Makefile | 2 +- + sound/soc/amd/acp/acp-legacy-mach.c | 102 +++- + sound/soc/amd/acp/acp-mach-common.c | 8 + + sound/soc/amd/acp/acp-mach.h | 67 +++ + sound/soc/amd/acp/acp-renoir.c | 4 + + sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c | 443 +++++++++++++++++ + sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.h | 12 + + sound/soc/codecs/ak4642.c | 28 +- + sound/soc/codecs/cs35l41-i2c.c | 11 +- + sound/soc/codecs/cs35l41-lib.c | 60 ++- + sound/soc/codecs/cs35l41-spi.c | 11 +- + sound/soc/codecs/cs35l41.c | 93 ++-- + sound/soc/codecs/cs35l41.h | 1 - + sound/soc/codecs/cs35l45-tables.c | 3 + + sound/soc/codecs/cs35l45.c | 193 +++++++- + sound/soc/codecs/cs35l45.h | 36 +- + sound/soc/codecs/cs42xx8-i2c.c | 14 +- + sound/soc/codecs/es8316.c | 50 +- + sound/soc/codecs/es8316.h | 3 + + sound/soc/codecs/hdac_hdmi.c | 13 +- + sound/soc/codecs/lpass-macro-common.h | 2 + + sound/soc/codecs/lpass-tx-macro.c | 22 +- + sound/soc/codecs/max9768.c | 41 +- + sound/soc/codecs/max98357a.c | 1 - + sound/soc/codecs/max98373-i2c.c | 17 - + sound/soc/codecs/max98373.c | 35 +- + sound/soc/codecs/max98373.h | 2 +- + sound/soc/codecs/max98388.c | 3 +- + sound/soc/codecs/max98396.c | 1 - + sound/soc/codecs/max98520.c | 2 - + sound/soc/codecs/max98927.c | 2 - + sound/soc/codecs/nau8821.c | 3 + + sound/soc/codecs/tas571x.c | 13 +- + sound/soc/codecs/tlv320aic32x4-i2c.c | 19 +- + sound/soc/codecs/tlv320aic32x4-spi.c | 18 +- + sound/soc/codecs/tlv320aic32x4.c | 5 +- + sound/soc/codecs/tlv320aic32x4.h | 3 +- + sound/soc/codecs/wm8580.c | 26 +- + sound/soc/mediatek/common/mtk-dsp-sof-common.c | 113 ++++- + sound/soc/mediatek/common/mtk-dsp-sof-common.h | 8 + + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 239 +++++++++- + sound/soc/meson/axg-fifo.c | 2 +- + sound/soc/meson/axg-fifo.h | 2 +- + sound/soc/meson/axg-tdm.h | 2 +- + sound/soc/sh/rcar/core.c | 1 - + sound/soc/starfive/Kconfig | 9 + + sound/soc/starfive/Makefile | 1 + + sound/soc/starfive/jh7110_pwmdac.c | 529 +++++++++++++++++++++ + 56 files changed, 2147 insertions(+), 337 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/starfive,jh7110-pwmdac.yaml + create mode 100644 sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c + create mode 100644 sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.h + create mode 100644 sound/soc/starfive/jh7110_pwmdac.c +Merging modules/modules-next (33c24bee4b78 kallsyms: Add more debug output for selftest) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (305dd7645503 Input: wdt87xx_i2c - use device core to create driver-specific device attributes) +$ 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/touchscreen/exc3000.c +Merge made by the 'ort' strategy. + drivers/input/keyboard/cros_ec_keyb.c | 10 +++------- + drivers/input/misc/iqs269a.c | 10 ++-------- + drivers/input/misc/kxtj9.c | 29 +++++++++++++++++------------ + drivers/input/mouse/cyapa.c | 14 +++----------- + drivers/input/touchscreen/ad7877.c | 12 +++++------- + drivers/input/touchscreen/ad7879-i2c.c | 7 ++++--- + drivers/input/touchscreen/ad7879-spi.c | 7 ++++--- + drivers/input/touchscreen/ad7879.c | 10 ++++++---- + drivers/input/touchscreen/ad7879.h | 3 +++ + drivers/input/touchscreen/ads7846.c | 18 ++++++------------ + drivers/input/touchscreen/edt-ft5x06.c | 10 ++-------- + drivers/input/touchscreen/elants_i2c.c | 15 +++------------ + drivers/input/touchscreen/exc3000.c | 12 +++--------- + drivers/input/touchscreen/hideep.c | 15 +++------------ + drivers/input/touchscreen/hycon-hy46xx.c | 10 ++-------- + drivers/input/touchscreen/ili210x.c | 15 +++++---------- + drivers/input/touchscreen/ilitek_ts_i2c.c | 12 ++---------- + drivers/input/touchscreen/iqs5xx.c | 10 +++------- + drivers/input/touchscreen/melfas_mip4.c | 13 ++----------- + drivers/input/touchscreen/raydium_i2c_ts.c | 16 +++------------- + drivers/input/touchscreen/rohm_bu21023.c | 12 ++---------- + drivers/input/touchscreen/s6sy761.c | 10 ++-------- + drivers/input/touchscreen/stmfts.c | 10 ++-------- + drivers/input/touchscreen/tsc2004.c | 7 ++++--- + drivers/input/touchscreen/tsc2005.c | 7 ++++--- + drivers/input/touchscreen/tsc200x-core.c | 18 +++++++----------- + drivers/input/touchscreen/tsc200x-core.h | 1 + + drivers/input/touchscreen/wdt87xx_i2c.c | 16 ++++------------ + 28 files changed, 107 insertions(+), 222 deletions(-) +Merging block/for-next (d975b468819a Merge branch 'io_uring-futex' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging kernel/exit.c +Merge made by the 'ort' strategy. + include/linux/io_uring_types.h | 7 + + include/uapi/linux/futex.h | 31 +++- + include/uapi/linux/io_uring.h | 6 + + io_uring/Makefile | 4 +- + io_uring/cancel.c | 10 ++ + io_uring/cancel.h | 4 + + io_uring/futex.c | 376 +++++++++++++++++++++++++++++++++++++++++ + io_uring/futex.h | 36 ++++ + io_uring/io_uring.c | 10 ++ + io_uring/opdef.c | 44 ++++- + io_uring/waitid.c | 372 ++++++++++++++++++++++++++++++++++++++++ + io_uring/waitid.h | 15 ++ + kernel/exit.c | 131 +++++++------- + kernel/exit.h | 30 ++++ + kernel/futex/futex.h | 93 +++++++++- + kernel/futex/requeue.c | 3 +- + kernel/futex/syscalls.c | 41 +++-- + kernel/futex/waitwake.c | 55 +++--- + 18 files changed, 1160 insertions(+), 108 deletions(-) + create mode 100644 io_uring/futex.c + create mode 100644 io_uring/futex.h + create mode 100644 io_uring/waitid.c + create mode 100644 io_uring/waitid.h + create mode 100644 kernel/exit.h +Merging device-mapper/for-next (1e4ab7b4c881 dm cache policy smq: ensure IO doesn't prevent cleaner policy progress) +$ 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 +Already up to date. +Merging libata/for-next (fa2259a59966 ata: libata: Cleanup inline DMA helper functions) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'ort' strategy. + drivers/ata/libahci.c | 2 +- + drivers/ata/libata-core.c | 243 +++++++++++++++++++++++++++++++---------- + drivers/ata/libata-eh.c | 76 +++++++++++-- + drivers/ata/libata-sata.c | 5 +- + drivers/ata/libata-scsi.c | 143 ++++++++++++------------ + drivers/ata/libata-sff.c | 10 +- + drivers/ata/libata-transport.c | 9 +- + drivers/ata/libata.h | 7 ++ + drivers/ata/pata_cs5520.c | 2 +- + drivers/ata/pata_macio.c | 1 + + drivers/ata/sata_mv.c | 1 + + drivers/ata/sata_nv.c | 2 + + drivers/ata/sata_sil24.c | 1 + + drivers/scsi/scsi_scan.c | 12 +- + drivers/scsi/sd.c | 10 +- + include/linux/libata.h | 32 ++++-- + include/scsi/scsi_device.h | 1 - + include/scsi/scsi_host.h | 2 +- + 18 files changed, 385 insertions(+), 174 deletions(-) +Merging pcmcia/pcmcia-next (4f733de8b78a pcmcia: tcic: remove unneeded "&" in call to setup_timer()) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Merge made by the 'ort' strategy. + drivers/pcmcia/cs.c | 1 + + drivers/pcmcia/ds.c | 14 +++++++++----- + drivers/pcmcia/pcmcia_resource.c | 2 +- + drivers/pcmcia/tcic.c | 2 +- + 4 files changed, 12 insertions(+), 7 deletions(-) +Merging mmc/next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (9aab92bc3a89 mfd: mc13xxx: Simplify device data fetching in probe()) +$ 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 +Already up to date. +Merging backlight/for-backlight-next (a4464092f2c5 backlight: led_bl: Remove redundant of_match_ptr()) +$ 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 (bbaa6ffa5b6c power: supply: core: Use blocking_notifier_call_chain to avoid RCU complaint) +$ 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 +Auto-merging drivers/power/supply/mt6370-charger.c +Merge made by the 'ort' strategy. + .../bindings/power/reset/syscon-poweroff.yaml | 10 ++- + drivers/power/reset/axxia-reset.c | 7 +- + drivers/power/reset/msm-poweroff.c | 7 +- + drivers/power/reset/nvmem-reboot-mode.c | 4 +- + drivers/power/reset/st-poweroff.c | 7 +- + drivers/power/reset/syscon-poweroff.c | 29 ++++----- + drivers/power/reset/xgene-reboot.c | 7 +- + drivers/power/supply/88pm860x_battery.c | 8 +-- + drivers/power/supply/bq24257_charger.c | 76 +++++++++++----------- + drivers/power/supply/bq2515x_charger.c | 65 +++++++++--------- + drivers/power/supply/bq256xx_charger.c | 50 +++++++------- + drivers/power/supply/max17042_battery.c | 6 +- + drivers/power/supply/mt6370-charger.c | 4 +- + drivers/power/supply/power_supply_core.c | 8 +-- + drivers/power/supply/qcom_pmi8998_charger.c | 3 +- + drivers/power/supply/sbs-battery.c | 8 +-- + include/linux/power_supply.h | 2 +- + 17 files changed, 139 insertions(+), 162 deletions(-) +Merging regulator/for-next (451e85e29c9d Merge remote-tracking branch 'regulator/for-6.7' 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. + drivers/regulator/fan53555.c | 9 ++--- + drivers/regulator/ltc3589.c | 61 ++++++++++++++----------------- + drivers/regulator/max20086-regulator.c | 65 ++++++++++++++++------------------ + drivers/regulator/mp5416.c | 10 +++--- + drivers/regulator/mp886x.c | 14 +++----- + drivers/regulator/pv88080-regulator.c | 58 +++++++++--------------------- + drivers/regulator/rk808-regulator.c | 2 -- + drivers/regulator/sy8824x.c | 26 ++++---------- + 8 files changed, 92 insertions(+), 153 deletions(-) +Merging security/next (64fc9526147c lsm: constify 'bprm' parameter in security_bprm_committing_creds()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + include/linux/fs.h | 2 +- + include/linux/lsm_hook_defs.h | 6 +++--- + include/linux/security.h | 14 +++++++------- + security/apparmor/lsm.c | 2 +- + security/commoncap.c | 4 ++-- + security/security.c | 6 +++--- + security/selinux/hooks.c | 6 +++--- + 7 files changed, 20 insertions(+), 20 deletions(-) +Merging apparmor/apparmor-next (8884ba07786c apparmor: fix invalid reference on profile->disconnected) +$ 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 +Auto-merging security/apparmor/policy_unpack.c +Merge made by the 'ort' strategy. + security/apparmor/apparmorfs.c | 3 +++ + security/apparmor/audit.c | 1 + + security/apparmor/capability.c | 4 ++-- + security/apparmor/domain.c | 12 +++++++----- + security/apparmor/file.c | 6 +++--- + security/apparmor/include/file.h | 37 ------------------------------------- + security/apparmor/include/net.h | 1 - + security/apparmor/include/policy.h | 9 --------- + security/apparmor/include/task.h | 2 +- + security/apparmor/label.c | 26 ++++++++++++++------------ + security/apparmor/lib.c | 4 ++-- + security/apparmor/match.c | 4 ++-- + security/apparmor/policy.c | 22 +++++++++++++--------- + security/apparmor/policy_compat.c | 1 + + security/apparmor/policy_unpack.c | 7 ++++--- + security/apparmor/resource.c | 8 ++++---- + security/apparmor/task.c | 5 +---- + 17 files changed, 58 insertions(+), 94 deletions(-) +Merging integrity/next-integrity (55e2b69649be kexec_lock: Replace kexec_mutex() by kexec_lock() in two comments) +$ 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 (9d140885e35d selinux: hweight optimization in avtab_read_item) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/Kconfig | 10 ++++++++++ + security/selinux/Makefile | 2 ++ + security/selinux/ss/avtab.c | 17 ++++------------- + security/selinux/ss/hashtab.c | 5 +++++ + security/selinux/ss/hashtab.h | 1 + + security/selinux/ss/policydb.c | 6 +++--- + security/selinux/ss/sidtab.c | 2 +- + 7 files changed, 26 insertions(+), 17 deletions(-) +Merging smack/next (3ad49d37cf57 smackfs: Prevent underflow in smk_set_cipso()) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 (ea72883a3bf1 tpm: Fix typo in tpmrm class definition) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (8c776a0401f1 watchdog: Add support for Amlogic-T7 SoCs) +$ 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 (d8fe59f11096 Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/rockchip', 'arm/smmu', 'unisoc', 'x86/vt-d', 'x86/amd' and 'core' 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 (97f576eb38ae audit: Annotate struct audit_chunk with __counted_by) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Merge made by the 'ort' strategy. + kernel/audit_tree.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devicetree/for-next (d117ca218b16 Merge branch 'dt/header-cleanups-for-6.6' into dt/next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Merge made by the 'ort' strategy. +Merging dt-krzk/for-next (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 +Already up to date. +Merging mailbox/mailbox-for-next (a493208079e2 mailbox: qcom-ipcc: fix incorrect num_chans counting) +$ 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 (678466ba6891 Merge remote-tracking branch 'spi/for-6.7' 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. + drivers/spi/spi-ar934x.c | 22 +--- + drivers/spi/spi-armada-3700.c | 23 +--- + drivers/spi/spi-aspeed-smc.c | 16 +-- + drivers/spi/spi-ath79.c | 11 +- + drivers/spi/spi-axi-spi-engine.c | 25 +--- + drivers/spi/spi-bcm2835.c | 11 +- + drivers/spi/spi-bcm2835aux.c | 23 +--- + drivers/spi/spi-cadence-quadspi.c | 42 ++++-- + drivers/spi/spi-cadence.c | 23 +--- + drivers/spi/spi-cavium-thunderx.c | 8 +- + drivers/spi/spi-davinci.c | 11 +- + drivers/spi/spi-dw-bt1.c | 23 +--- + drivers/spi/spi-dw-mmio.c | 31 ++--- + drivers/spi/spi-fsl-dspi.c | 12 +- + drivers/spi/spi-lantiq-ssc.c | 10 +- + drivers/spi/spi-lm70llp.c | 20 +-- + drivers/spi/spi-lp8841-rtc.c | 56 ++++---- + drivers/spi/spi-meson-spicc.c | 121 ++++++++---------- + drivers/spi/spi-meson-spifc.c | 79 +++++------- + drivers/spi/spi-microchip-core-qspi.c | 39 ++---- + drivers/spi/spi-microchip-core.c | 83 ++++++------ + drivers/spi/spi-mpc512x-psc.c | 54 ++++---- + drivers/spi/spi-mpc52xx-psc.c | 34 ++--- + drivers/spi/spi-mpc52xx.c | 56 ++++---- + drivers/spi/spi-mt65xx.c | 190 ++++++++++++++-------------- + drivers/spi/spi-mt7621.c | 50 ++++---- + drivers/spi/spi-mtk-nor.c | 14 +- + drivers/spi/spi-mtk-snfi.c | 67 ++-------- + drivers/spi/spi-mux.c | 2 +- + drivers/spi/spi-mxic.c | 68 +++++----- + drivers/spi/spi-mxs.c | 70 +++++----- + drivers/spi/spi-npcm-fiu.c | 14 +- + drivers/spi/spi-npcm-pspi.c | 68 +++++----- + drivers/spi/spi-nxp-fspi.c | 30 ++--- + drivers/spi/spi-oc-tiny.c | 30 ++--- + drivers/spi/spi-omap-uwire.c | 32 ++--- + drivers/spi/spi-omap2-mcspi.c | 232 +++++++++++++++++----------------- + drivers/spi/spi-orion.c | 11 +- + drivers/spi/spi-pic32-sqi.c | 27 +--- + drivers/spi/spi-pic32.c | 8 +- + drivers/spi/spi-pl022.c | 11 +- + drivers/spi/spi-rockchip.c | 30 +---- + drivers/spi/spi-tegra20-slink.c | 2 + + drivers/spi/spidev.c | 24 ++-- + 44 files changed, 754 insertions(+), 1059 deletions(-) +Merging tip/master (3598e2142f49 Merge branch into tip/master: 'x86/tdx') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/x86/Kconfig +Merge made by the 'ort' strategy. + Documentation/admin-guide/hw-vuln/srso.rst | 24 +- + arch/x86/Kconfig | 12 + + arch/x86/Makefile | 2 + + arch/x86/boot/compressed/tdx.c | 6 +- + arch/x86/coco/tdx/tdcall.S | 236 ++----------- + arch/x86/coco/tdx/tdx-shared.c | 28 +- + arch/x86/coco/tdx/tdx.c | 135 ++++--- + arch/x86/events/core.c | 6 +- + arch/x86/events/intel/core.c | 485 +++++++++++++------------ + arch/x86/events/intel/ds.c | 4 +- + arch/x86/events/perf_event.h | 37 +- + arch/x86/hyperv/ivm.c | 10 +- + arch/x86/include/asm/bitops.h | 9 + + arch/x86/include/asm/linkage.h | 8 + + arch/x86/include/asm/nospec-branch.h | 69 ++-- + arch/x86/include/asm/processor.h | 2 - + arch/x86/include/asm/shared/tdx.h | 85 +++-- + arch/x86/include/asm/sparsemem.h | 2 + + arch/x86/include/asm/tdx.h | 11 + + arch/x86/kernel/alternative.c | 8 - + arch/x86/kernel/apic/x2apic_uv_x.c | 11 +- + arch/x86/kernel/asm-offsets.c | 33 +- + arch/x86/kernel/cpu/amd.c | 28 +- + arch/x86/kernel/cpu/bugs.c | 102 +++--- + arch/x86/kernel/smpboot.c | 12 +- + arch/x86/kernel/vmlinux.lds.S | 10 +- + arch/x86/lib/putuser.S | 4 - + arch/x86/lib/retpoline.S | 171 ++++----- + arch/x86/mm/numa.c | 80 +++++ + arch/x86/virt/Makefile | 2 + + arch/x86/virt/vmx/Makefile | 2 + + arch/x86/virt/vmx/tdx/Makefile | 2 + + arch/x86/virt/vmx/tdx/seamcall.S | 61 ++++ + arch/x86/virt/vmx/tdx/tdxcall.S | 230 +++++++++--- + drivers/acpi/numa/srat.c | 11 +- + include/linux/cleanup.h | 39 ++- + include/linux/cpu.h | 2 + + include/linux/instruction_pointer.h | 5 + + include/linux/numa.h | 7 + + include/linux/objtool.h | 3 +- + include/linux/smp.h | 2 +- + include/trace/events/csd.h | 8 +- + kernel/events/ring_buffer.c | 6 + + kernel/sched/core.c | 544 ++++++++++++----------------- + kernel/sched/fair.c | 27 +- + kernel/sched/sched.h | 5 + + kernel/smp.c | 26 +- + kernel/up.c | 2 +- + scripts/Makefile.vmlinux_o | 3 +- + tools/objtool/check.c | 3 +- + 50 files changed, 1420 insertions(+), 1200 deletions(-) + create mode 100644 arch/x86/virt/Makefile + create mode 100644 arch/x86/virt/vmx/Makefile + create mode 100644 arch/x86/virt/vmx/tdx/Makefile + create mode 100644 arch/x86/virt/vmx/tdx/seamcall.S +Merging clockevents/timers/drivers/next (0a8b07c77ea0 clocksource: Explicitly include correct DT includes) +$ 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 (ce53ad81ed36 EDAC/igen6: Fix the issue of no error events) +$ 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 (19b5a44bee16 irqchip: Add support for Amlogic-C3 SoCs) +$ 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 (fc1653abba0d Merge probes/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 +Auto-merging Documentation/filesystems/proc.rst +Auto-merging init/main.c +Merge made by the 'ort' strategy. + Documentation/filesystems/proc.rst | 5 ++++- + fs/proc/Makefile | 1 + + fs/proc/raw_cmdline.c | 25 +++++++++++++++++++++++++ + include/linux/init.h | 3 ++- + init/main.c | 2 +- + 5 files changed, 33 insertions(+), 3 deletions(-) + create mode 100644 fs/proc/raw_cmdline.c +Merging rcu/rcu/next (94e70d269433 Merge branch 'csd-lock.2023.07.14b' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Merge made by the 'ort' strategy. +Merging kvm/next (d011151616e7 Merge branch 'kvm-x86-mmu-6.6' 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 (169c0f23cacc KVM: arm64: Properly return allocated EL2 VA from hyp_alloc_private_va_range()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging arch/arm64/kvm/mmu.c +Merge made by the 'ort' strategy. + arch/arm64/kvm/mmu.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging kvms390/next (899e2206f46a KVM: s390: pv: Allow AP-instructions for pv-guests) +$ 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 (477069398ed6 KVM: riscv: selftests: Add get-reg-list test) +$ 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Already up to date. +Merging xen-tip/linux-next (475505975093 xen: simplify evtchn_do_upcall() call maze) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging arch/x86/xen/enlighten_hvm.c +Merge made by the 'ort' strategy. + arch/arm/xen/enlighten.c | 2 +- + arch/x86/entry/common.c | 2 +- + arch/x86/xen/enlighten.c | 2 +- + arch/x86/xen/enlighten_hvm.c | 2 +- + drivers/xen/events/events_base.c | 21 ++------------------- + drivers/xen/platform-pci.c | 2 +- + include/xen/events.h | 3 +-- + 7 files changed, 8 insertions(+), 26 deletions(-) +Merging percpu/for-next (3fcf62f24c80 Merge branch 'for-6.6' 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 (96796025f400 Merge branch 'for-6.6' 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 +Merge made by the 'ort' strategy. +Merging drivers-x86/for-next (2c97d3e55b70 platform/x86: asus-wmi: add support for ASUS screenpad) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpio/gpiolib-acpi.c | 30 ++++- + drivers/platform/x86/asus-wmi.c | 133 +++++++++++++++++++++ + drivers/platform/x86/asus-wmi.h | 1 + + drivers/platform/x86/x86-android-tablets/asus.c | 1 + + drivers/platform/x86/x86-android-tablets/core.c | 132 ++++++++++++-------- + drivers/platform/x86/x86-android-tablets/lenovo.c | 29 ++--- + drivers/platform/x86/x86-android-tablets/other.c | 11 +- + .../x86/x86-android-tablets/x86-android-tablets.h | 7 +- + include/linux/platform_data/x86/asus-wmi.h | 4 + + 9 files changed, 271 insertions(+), 77 deletions(-) +Merging chrome-platform/for-next (0bb80ecc33a8 Linux 6.6-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 chrome-platform-firmware/for-firmware-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (0bb80ecc33a8 Linux 6.6-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 (baca986e1f2c leds: aw2013: Enable pull-up supply for interrupt and I2C) +$ 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 +Already up to date. +Merging ipmi/for-next (b00839ca4cca ipmi: refactor deprecated strncpy) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 11 +++-------- + drivers/char/ipmi/ipmi_ssif.c | 2 +- + 2 files changed, 4 insertions(+), 9 deletions(-) +Merging driver-core/driver-core-next (0bb80ecc33a8 Linux 6.6-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 (0bb80ecc33a8 Linux 6.6-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 (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 (0bb80ecc33a8 Linux 6.6-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 (0bb80ecc33a8 Linux 6.6-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 (0bb80ecc33a8 Linux 6.6-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 (ef8b0cb1ba37 accel/habanalabs: fix ETR/ETF flush logic) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Auto-merging Documentation/ABI/testing/debugfs-driver-habanalabs +Auto-merging drivers/accel/drm_accel.c +Auto-merging drivers/accel/habanalabs/common/habanalabs.h +CONFLICT (content): Merge conflict in drivers/accel/habanalabs/common/habanalabs.h +Resolved 'drivers/accel/habanalabs/common/habanalabs.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6efe081ec179] Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/debugfs-driver-habanalabs | 82 ++--- + Documentation/ABI/testing/sysfs-driver-habanalabs | 64 ++-- + drivers/accel/drm_accel.c | 21 +- + drivers/accel/habanalabs/common/command_buffer.c | 5 +- + .../accel/habanalabs/common/command_submission.c | 374 +++++++++++++-------- + drivers/accel/habanalabs/common/context.c | 9 +- + drivers/accel/habanalabs/common/debugfs.c | 22 +- + drivers/accel/habanalabs/common/device.c | 268 +++++++-------- + drivers/accel/habanalabs/common/firmware_if.c | 13 +- + drivers/accel/habanalabs/common/habanalabs.h | 88 +++-- + drivers/accel/habanalabs/common/habanalabs_drv.c | 169 +++++----- + drivers/accel/habanalabs/common/habanalabs_ioctl.c | 98 +++--- + drivers/accel/habanalabs/common/irq.c | 17 +- + drivers/accel/habanalabs/common/memory.c | 7 +- + drivers/accel/habanalabs/gaudi/gaudi.c | 4 + + drivers/accel/habanalabs/gaudi/gaudi_coresight.c | 12 + + drivers/accel/habanalabs/gaudi2/gaudi2.c | 371 +++++++++++++++++--- + drivers/accel/habanalabs/gaudi2/gaudi2_coresight.c | 34 +- + drivers/accel/habanalabs/gaudi2/gaudi2_security.c | 21 +- + drivers/accel/habanalabs/goya/goya_coresight.c | 10 + + .../accel/habanalabs/include/common/hl_boot_if.h | 5 + + include/uapi/drm/habanalabs_accel.h | 55 +-- + 22 files changed, 1098 insertions(+), 651 deletions(-) +Merging coresight/next (c0a232f1e19e coresight: trbe: Fix TRBE 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 (1a22ec09a2c1 fpga: region: make fpga_region_class a static const structure) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (6ac3f01201fa Merge branch 'icc-debugfs' 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 +Already up to date. +Merging iio/togreg (22da192f43f7 iio: pressure: ms5637: Use i2c_get_match_data()) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 45 + + .../ABI/testing/sysfs-bus-iio-adc-mcp3564 | 53 + + .../devicetree/bindings/iio/adc/lltc,ltc2497.yaml | 20 +- + .../bindings/iio/adc/microchip,mcp3564.yaml | 205 +++ + .../bindings/iio/adc/microchip,mcp3911.yaml | 6 + + .../bindings/iio/adc/ti,twl6030-gpadc.yaml | 43 + + .../bindings/iio/amplifiers/adi,hmc425a.yaml | 12 +- + .../iio/magnetometer/asahi-kasei,ak8975.yaml | 7 - + MAINTAINERS | 7 + + drivers/iio/accel/adxl345.h | 21 +- + drivers/iio/accel/adxl345_core.c | 47 +- + drivers/iio/accel/adxl345_i2c.c | 20 +- + drivers/iio/accel/adxl345_spi.c | 20 +- + drivers/iio/accel/bma180.c | 27 +- + drivers/iio/accel/fxls8962af.h | 1 - + drivers/iio/accel/kionix-kx022a.c | 2 +- + drivers/iio/accel/mma8452.c | 28 +- + drivers/iio/accel/msa311.c | 2 +- + drivers/iio/adc/Kconfig | 29 +- + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/at91_adc.c | 108 +- + drivers/iio/adc/ltc2309.c | 246 ++++ + drivers/iio/adc/ltc2497.c | 5 +- + drivers/iio/adc/max1363.c | 87 +- + drivers/iio/adc/mcp3564.c | 1516 ++++++++++++++++++++ + drivers/iio/adc/mcp3911.c | 562 ++++++-- + drivers/iio/adc/mt6577_auxadc.c | 73 +- + drivers/iio/adc/spear_adc.c | 64 +- + drivers/iio/adc/stm32-adc-core.c | 9 +- + drivers/iio/adc/ti-adc081c.c | 12 +- + drivers/iio/adc/ti-ads1015.c | 7 +- + drivers/iio/addac/ad74413r.c | 6 +- + drivers/iio/amplifiers/hmc425a.c | 17 + + drivers/iio/chemical/atlas-ezo-sensor.c | 6 +- + drivers/iio/chemical/atlas-sensor.c | 32 +- + drivers/iio/chemical/sgp30.c | 24 +- + drivers/iio/chemical/vz89x.c | 16 +- + drivers/iio/dac/mcp4725.c | 42 +- + drivers/iio/dac/stm32-dac.c | 3 +- + drivers/iio/dac/ti-dac5571.c | 48 +- + drivers/iio/frequency/adf4350.c | 75 +- + drivers/iio/iio_core.h | 3 - + drivers/iio/imu/adis16475.c | 165 ++- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 1 - + drivers/iio/industrialio-core.c | 2 + + drivers/iio/light/opt4001.c | 2 +- + drivers/iio/magnetometer/ak8975.c | 86 +- + drivers/iio/magnetometer/yamaha-yas530.c | 4 +- + drivers/iio/potentiometer/ad5110.c | 21 +- + drivers/iio/potentiometer/ds1803.c | 13 +- + drivers/iio/pressure/ms5637.c | 6 +- + drivers/iio/proximity/sx9310.c | 46 +- + drivers/iio/temperature/mlx90614.c | 2 +- + drivers/iio/temperature/tmp117.c | 94 +- + drivers/staging/iio/frequency/ad9832.c | 15 +- + drivers/staging/iio/frequency/ad9834.c | 21 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 22 +- + include/linux/iio/sw_device.h | 3 - + include/linux/iio/sw_trigger.h | 3 - + include/uapi/linux/iio/types.h | 2 + + tools/iio/iio_event_monitor.c | 4 + + 61 files changed, 3253 insertions(+), 817 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-mcp3564 + create mode 100644 Documentation/devicetree/bindings/iio/adc/microchip,mcp3564.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,twl6030-gpadc.yaml + create mode 100644 drivers/iio/adc/ltc2309.c + create mode 100644 drivers/iio/adc/mcp3564.c +Merging phy-next/next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (0bb80ecc33a8 Linux 6.6-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 (d20a3a8a32e3 extcon: cht_wc: add POWER_SUPPLY dependency) +$ 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 (0bb80ecc33a8 Linux 6.6-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 (642265e22ecc vfio/pds: Send type for SUSPEND_STATUS command) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (0bb80ecc33a8 Linux 6.6-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 (0bb80ecc33a8 Linux 6.6-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 (631c15d5f14d counter: chrdev: remove a typo in header file comment) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Auto-merging drivers/counter/microchip-tcb-capture.c +Merge made by the 'ort' strategy. + include/uapi/linux/counter.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (78d44b824ed0 cgroup: Avoid -Wstringop-overflow warnings) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Already up to date. +Merging scsi/for-next (bd198f03568f Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Merge made by the 'ort' strategy. +Merging scsi-mkp/for-next (d32533d30e21 scsi: ufs: core: Poll HCS.UCRDY before issuing a UIC command) +$ 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/scsi/qla2xxx/qla_dfs.c +CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_dfs.c +Resolved 'drivers/scsi/qla2xxx/qla_dfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1e7f2f471a87] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git +$ git diff -M --stat --summary HEAD^.. + drivers/scsi/megaraid/megaraid_sas.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 21 +++++++++------------ + drivers/scsi/ppa.c | 4 ++-- + drivers/scsi/qedf/qedf_io.c | 10 ++++++++-- + drivers/scsi/qedf/qedf_main.c | 7 ++++++- + drivers/scsi/qla2xxx/qla_dfs.c | 6 +++--- + drivers/scsi/qla2xxx/qla_inline.h | 2 +- + drivers/scsi/qla2xxx/qla_isr.c | 6 +++--- + drivers/scsi/qla2xxx/qla_nvme.c | 10 +++++----- + drivers/scsi/qla2xxx/qla_target.c | 3 +-- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 ++-- + drivers/target/target_core_configfs.c | 24 ++++++++++++------------ + drivers/ufs/core/ufshcd.c | 13 +++++++------ + include/linux/nvme-fc-driver.h | 6 +++--- + 14 files changed, 63 insertions(+), 55 deletions(-) +Merging vhost/linux-next (1acfe2c12258 virtio_ring: fix avail_wrap_counter in virtqueue_add_packed) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (d1a8ac11ee72 remoteproc: mediatek: Refine ipi handler error message) +$ 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. + .../devicetree/bindings/remoteproc/mtk,scp.yaml | 176 ++++++- + drivers/remoteproc/mtk_common.h | 39 +- + drivers/remoteproc/mtk_scp.c | 540 ++++++++++++++++----- + drivers/remoteproc/mtk_scp_ipi.c | 4 +- + drivers/remoteproc/stm32_rproc.c | 4 +- + 5 files changed, 627 insertions(+), 136 deletions(-) +Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-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 (7777fa924754 gpio: eic-sprd: use a helper variable for &pdev->dev) +$ 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/Kconfig | 4 +- + drivers/gpio/gpio-dwapb.c | 1 - + drivers/gpio/gpio-eic-sprd.c | 73 +++++--- + drivers/gpio/gpio-f7188x.c | 138 ++++++++-------- + drivers/gpio/gpio-mb86s7x.c | 1 - + drivers/gpio/gpio-mockup.c | 88 ++++++---- + drivers/gpio/gpio-pca953x.c | 303 +++++++++++++++------------------- + drivers/gpio/gpio-sim.c | 70 +++++--- + drivers/gpio/gpio-xgene-sb.c | 1 - + drivers/gpio/gpiolib-of.c | 16 +- + drivers/gpio/gpiolib.c | 1 - + drivers/gpio/gpiolib.h | 4 +- + drivers/pinctrl/pinctrl-da9062.c | 7 +- + include/linux/gpio/consumer.h | 8 - + include/linux/gpio/driver.h | 24 +-- + include/linux/platform_data/pca953x.h | 13 -- + 16 files changed, 381 insertions(+), 371 deletions(-) +Merging gpio-intel/for-next (0bb80ecc33a8 Linux 6.6-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 (020e9c593a0d Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/pinctrl/nuvoton,npcm845-pinctrl.yaml | 216 ++ + MAINTAINERS | 1 + + drivers/pinctrl/berlin/berlin.c | 8 +- + drivers/pinctrl/mediatek/pinctrl-mt7981.c | 16 +- + drivers/pinctrl/nuvoton/Kconfig | 17 +- + drivers/pinctrl/nuvoton/Makefile | 1 + + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 15 +- + drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 2491 ++++++++++++++++++++ + drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 18 +- + drivers/pinctrl/pinctrl-cy8c95x0.c | 4 +- + drivers/pinctrl/pinctrl-lantiq.h | 1 - + drivers/pinctrl/pinctrl-single.c | 12 +- + drivers/pinctrl/pinctrl-sx150x.c | 7 +- + drivers/pinctrl/pinmux.c | 4 +- + drivers/pinctrl/qcom/pinctrl-msm8996.c | 14 + + drivers/pinctrl/qcom/pinctrl-sdm660.c | 14 + + drivers/pinctrl/qcom/pinctrl-sm6115.c | 12 + + drivers/pinctrl/qcom/pinctrl-sm6125.c | 17 + + .../pinctrl/starfive/pinctrl-starfive-jh7110-aon.c | 4 + + .../pinctrl/starfive/pinctrl-starfive-jh7110-sys.c | 4 + + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 42 +- + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h | 4 + + 22 files changed, 2864 insertions(+), 58 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/nuvoton,npcm845-pinctrl.yaml + create mode 100644 drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c +Merging pinctrl-intel/for-next (2d325e54d9e2 pinctrl: baytrail: fix debounce disable case) +$ 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 (21c11421db1f pinctrl: renesas: r8a7779: s/LSBC/LBSC/) +$ 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/pfc-r8a7779.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pinctrl-samsung/for-next (0bb80ecc33a8 Linux 6.6-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 (4aae44f65827 pwm: lpc32xx: Remove handling of PWM channels) +$ 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 +Auto-merging ipc/ipc_sysctl.c +Auto-merging ipc/mq_sysctl.c +Auto-merging kernel/ucount.c +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 (3f3f384139ed selftests: Keep symlinks, when possible) +$ 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 (0bb80ecc33a8 Linux 6.6-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 (9076bc476d7e kunit: Fix possible memory leak in kunit_filter_suites()) +$ 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 (08ca6906a4b7 nvdimm: Fix dereference after free in register_nvdimm_pmu()) +$ 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 (4cdc5dbbc1df eeprom: at24: Drop at24_get_chip_data()) +$ 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 +Merge made by the 'ort' strategy. + drivers/misc/eeprom/at24.c | 32 +++----------------------------- + 1 file changed, 3 insertions(+), 29 deletions(-) +Merging ntb/ntb-next (643982232860 ntb: Check tx descriptors outstanding instead of head/tail for tx queue) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (46822860a5a9 seccomp: Add missing kerndoc notations) +$ 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 +Already up to date. +Merging fsi/next (f04d61a379d6 fsi: fix some spelling mistakes in comment) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Already up to date. +Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (284930a0146a x86/hyperv: Remove duplicate include) +$ 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 (35b464e32c8b auxdisplay: hd44780: move cursor home after clear display command) +$ 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 (0bb80ecc33a8 Linux 6.6-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 (0724869ede9c bus: mhi: host: pci_generic: add support for Telit FE990 modem) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +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 +Auto-merging mm/memblock.c +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 (b691118f2c44 Merge remote-tracking branch 'linux-efi/urgent' into efi/next) +$ 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/slab/for-next (46a9ea668190 mm/slab_common: fix slab_caches list corruption after kmem_cache_destroy()) +$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging mm/slab_common.c +Merge made by the 'ort' strategy. + mm/slab_common.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 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 (2a2015495142 selftests/landlock: Fix a resource leak) +$ 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging sysctl/sysctl-next (53f3811dfd5e sysctl: Use ctl_table_size as stopping criteria for list macro) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (fdf0eaf11452 Linux 6.5-rc2) +$ 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 (bcafd8b927ed bitmap: Remove dead code, i.e. bitmap_copy_le()) +$ 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. + include/linux/bitmap.h | 5 --- + include/linux/cpumask.h | 113 +++++++++++++++++++++++++++++------------------- + lib/bitmap.c | 27 +----------- + lib/cpumask.c | 17 +++++--- + 4 files changed, 83 insertions(+), 79 deletions(-) +Merging hte/for-next (06c2afb862f9 Linux 6.5-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 (366c47121bf6 uapi: stddef.h: Fix header guard location) +$ 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 +Merge made by the 'ort' strategy. + include/uapi/linux/stddef.h | 8 ++++++++ + 1 file changed, 8 insertions(+) +$ git reset --hard HEAD^ +HEAD is now at 03bb732b061c Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git +Merging next-20230913 version of kspp +$ git merge -m next-20230913/kspp 5f536ac6a5a7b67351e4e5ae4f9e1e57d31268e6 +Already up to date. +Merging kspp-gustavo/for-next/kspp (4d8cbf6dbcda fs: omfs: Use flexible-array member in struct omfs_extent) +$ 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 +Already up to date. +Merging nolibc/nolibc (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc +Already up to date. +Merging iommufd/for-next (0bb80ecc33a8 Linux 6.6-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 000000000000..4db9bf6c366e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230914 |