diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-03-20 13:20:21 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-03-20 13:20:21 +1100 |
| commit | 72fb52fb0ac44b6a1edd9bc390e44bce3acccd26 (patch) | |
| tree | 21760a7e01c6ae7b338955ab6ce601e41df0c860 | |
| parent | 945d5e80a4dde178c1d99f7cb126e0a5c5eba465 (diff) | |
| download | linux-next-20240320.tar.gz linux-next-20240320.tar.xz | |
Add linux-next specific files for 20240320next-20240320
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 373 | ||||
| -rw-r--r-- | Next/Trees | 375 | ||||
| -rw-r--r-- | Next/merge.log | 3681 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4430 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..2aa5969ed6d8 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,373 @@ +Name SHA1 +---- ---- +origin 78c3925c048c752334873f56c3a3d1c9d53e0416 +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes ded79af42f114bb89f8e90c8e7337f5b7bb5f015 +kbuild-current b401b621758e46812da61fa58a67c3fd8d91de0d +arc-current 861deac3b092f37b2c5e6871732f3e11486f7082 +arm-current 0c66c6f4e21cb22220cbd8821c5c73fc157d20dc +arm64-fixes 2c79bd34af13de221ddab29d8dfc9d5eeca8fe9b +arm-soc-fixes 1c7cfb6158f6678374ed42393b013b379b4c3964 +davinci-current 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +sophgo-fixes 41bccc98fb7931d63d03f326a746ac4d429c1dd3 +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current e8a7824856def1c8608401b0d7d05566d6e81c95 +powerpc-fixes 380cb2f4df78433f64847cbc655fad2650e4769c +s390-fixes b0546776ad3f332e215cebc0b063ba4351971cca +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net 32fa4366cc4da1c97b725a0066adf43c6b298f37 +bpf f6e922365faf4cd576bd1cf3e64b58c8a32e1856 +ipsec 773bb766ca4a05bf363203030b72b10088869224 +netfilter d7d75124965aee23e5e4421d78376545cf070b0a +ipvs d7d75124965aee23e5e4421d78376545cf070b0a +wireless cec60af1972d830dc837da76b472cf9cce7945cf +wpan b85ea95d086471afb4ad062012a4d73cd328fa86 +rdma-fixes eb5c7465c3240151cd42a55c7ace9da0026308a1 +sound-current 1e5dc3989a20ccd703d5fe1a269d2bcedf29142c +sound-asoc-fixes 4cd1939cf2e14a1cca15c2c680afdb45a05c4974 +regmap-fixes 2f0dbb24f78a333433a2b875c0b76bf55c119cd4 +regulator-fixes a1f9fa6fcbb306b9f71523e36eeda81ddda5c8a8 +spi-fixes cf6d79a0f5769b5f4d9579ddaf88d2c30b03b873 +pci-current 705c1da8fa4816fb0159b5602fef1df5946a3ee2 +driver-core.current b401b621758e46812da61fa58a67c3fd8d91de0d +tty.current 3d9319c27ceb35fa3d2c8b15508967f3fc7e5b78 +usb.current e8f897f4afef0031fe618a8e94127a0934896aba +usb-serial-fixes d206a76d7d2726f3b096037f2079ce0bd3ba329b +phy 47b412c1ea77112f1148b4edd71700a388c7c80f +staging.current 6613476e225e090cc9aad49be7fa504e290dd33d +iio-fixes 11dadb631007324c7a8bcb2650eda88ed2b9eed0 +counter-current c83ccdc9586b3e9882da9e27507c046751999d59 +char-misc.current a0776c214d47ea4f7aaef138095beaa41cff03ef +soundwire-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +thunderbolt-fixes e8f897f4afef0031fe618a8e94127a0934896aba +input-current 57ed9567e63b59350c21ae026635ae051e247abb +crypto-current 6a8dbd71a70620c42d4fa82509204ba18231f28d +vfio-fixes 4ea95c04fa6b9043a1a301240996aeebe3cb28ec +kselftest-fixes b54761f6e9773350c0d1fb8e1e5aacaba7769d0f +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes 90d35da658da8cff0d4ecbb5113f5fac9d00eb72 +backlight-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +mtd-fixes e6a30d0c48a1e8a68f1cc413bee65302ab03ddfb +mfd-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +v4l-dvb-fixes 346c84e281a963437b9fe9dfcd92c531630289de +reset-fixes 4a6756f56bcf8e64c87144a626ce53aea4899c0e +mips-fixes b401b621758e46812da61fa58a67c3fd8d91de0d +at91-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +omap-fixes 9b6a51aab5f5f9f71d2fa16e8b4d530e1643dfcb +kvm-fixes bf3a69c6861ff4dc7892d895c87074af7bc1c400 +kvms390-fixes 83303a4c776ce1032d88df59e811183479acea77 +hwmon-fixes d206a76d7d2726f3b096037f2079ce0bd3ba329b +nvdimm-fixes 33908660e814203e996f6e775d033c5c32fcf9a7 +cxl-fixes d206a76d7d2726f3b096037f2079ce0bd3ba329b +btrfs-fixes 100b83b218ece39d30cc604578a5661c23b93d8a +vfs-fixes aa23317d0268b309bb3f0801ddd0d61813ff5afb +dma-mapping-fixes d5090484b021794271280ab64d20253883b7f6fd +drivers-x86-fixes 0314cebb29be2f961abb37bd0b01cb16899868f2 +samsung-krzk-fixes eab4f56d3e75dad697acf8dc2c8be3c341d6c63e +pinctrl-samsung-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +devicetree-fixes 7cb50f6c9fbaa1c0b80100b8971bf13db5d75d06 +dt-krzk-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +scsi-fixes ee0017c3ed8a8abfa4d40e42f908fb38c31e7515 +drm-fixes e8f897f4afef0031fe618a8e94127a0934896aba +drm-intel-fixes e8f897f4afef0031fe618a8e94127a0934896aba +mmc-fixes 4af59a8df5ea930038cd3355e822f5eedf4accc1 +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +hyperv-fixes aa707b615ce1551c25c5a3500cca2cf620e36b12 +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes a11dd49dcb9376776193e15641f84fcc1e5980c9 +riscv-dt-fixes 2672031b20f6681514bef14ddcfe8c62c2757d11 +riscv-soc-fixes d206a76d7d2726f3b096037f2079ce0bd3ba329b +fpga-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +spdx 04b8076df2534f08bb4190f90a24e0f7f8930aca +gpio-brgl-fixes 90d35da658da8cff0d4ecbb5113f5fac9d00eb72 +gpio-intel-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +pinctrl-intel-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +auxdisplay-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +erofs-fixes e8f897f4afef0031fe618a8e94127a0934896aba +kunit-fixes 829388b725f8d266ccec32a2f446717d8693eaba +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 6a9531c3a88096a26cf3ac582f7ec44f94a7dcb2 +nfsd-fixes c8d71dcaa396a014522c9d9b8af1f0ca880b2ed4 +renesas-fixes 8c987693dc2d292d777f1be63cb35233049ae25e +perf-current 0f66dfe7b91d2743cc71dfff37af503215b204ef +efi-fixes 2ce507f57ba9c78c080d4a050ebdc97263239de8 +zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb +battery-fixes 2df70149e73e79783bcbc7db4fa51ecef0e2022c +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +iommufd-fixes bb04d13353885f81c87879b2deb296bd2adb6cab +rust-fixes b401b621758e46812da61fa58a67c3fd8d91de0d +v9fs-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +w1-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +pmdomain-fixes 2a93c6cbd5a703d44c414a3c3945a87ce11430ba +overlayfs-fixes 77a28aa476873048024ad56daf8f4f17d58ee48e +i2c-host-fixes 1f78f0901011c56801ff957f59152f390e8574b9 +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +drm-misc-fixes 9cbd1dae842737bfafa4b10a87909fa209dde250 +mm-stable 270700dd06ca41a4779c19eb46608f076bb7d40e +mm-nonmm-stable 269cdf353b5bdd15f1a079671b0f889113865f20 +kbuild 097f1200bf7ea19fb39ccf538a07a153260a7763 +clang-format 5a205c6a9f79d14db38006aa2d7c4f4e76b1bfc7 +perf 0f66dfe7b91d2743cc71dfff37af503215b204ef +compiler-attributes 2993eb7a8d34aee6165e1f6676e81cdf1d22aa62 +dma-mapping 14cebf689a78e8a1c041138af221ef6eac6bc7da +asm-generic 5394f1e9b687bcf26595cabf83483e568676128d +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm 5616fee8981b838d56c8d85a63047c2c003ecc9d +arm64 1d63d1d9e5c5cb2e7c7ca75751a5eaf67c5623a7 +arm-perf b037e40a6af2b056f7f15d9aabe7e9a9a7149ff3 +arm-soc 72ebb41b88f9d7c10c5e159e0507074af0a22fe2 +amlogic 7092cfae086f0bc235baca413d0bd904f182670c +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed 0c30853731ec7e70941cf008bf5227fb9e327810 +at91 6315946ad24244f076605a01352e0ac367b9eff8 +broadcom bbfdba3d4757f99fa0f85071f4e7346d041b1455 +davinci 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory e46076906722ee6f9e7fd5abad7f909cd11a26af +imx-mxs edb0d16255f62fefb0bc56c87b3395dc2f866354 +mediatek ba90af39ba57b3fe3ecfdba0c87a80d20c7b788d +mvebu 6b6f1082cb46d72823b7ea99c058c601668ba1d3 +omap 69f4343fc41d51ef26f5e4ff0fc856f803ae4a8d +qcom 2eb303d4add3a51dd098ff09cf750cd5be39b56b +renesas 01fdf7d6f1504ba6a93e7d8eacb27d45dc995325 +reset c721f189e89c0d4db119d7bb2b46768d0fb5f6b1 +rockchip 24f3ec49401affc2fb18ec22755bf1c1e2de6a08 +samsung-krzk fb1be31d4042ed24462cebe7874ced9cd062d230 +scmi 6d3e135e2055cf37fed34ba45ba2f192cf6faa27 +sophgo 0f46e1339ef113f0dedf7ad376452cc722dbcfe6 +stm32 a7b9ab6c880d4ce2c216f14482a6d3e24fc0c87a +sunxi c1d7282e4e920ca2caea6147162ef77ca2fdea6e +tee 90d35da658da8cff0d4ecbb5113f5fac9d00eb72 +tegra c85c30fad06dabdefbf59911ed303553e77490f2 +ti 68818060efdbc68477ac58499698a38919112e8c +xilinx 2d81f5ef567ce96f29e698939673226d2d1b0fcb +clk 3066c521be9db14964d78c6c431c97a424468ded +clk-imx 13269dc6c70444528f0093585e3559cd2f38850a +clk-renesas 81a7a88a98062ffcd8d7d5ac3b540a96dbff5490 +csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b +loongarch 18b722527e2c919769d21beb8d78fb0123a0e305 +m68k e8a7824856def1c8608401b0d7d05566d6e81c95 +m68knommu b401b621758e46812da61fa58a67c3fd8d91de0d +microblaze 6613476e225e090cc9aad49be7fa504e290dd33d +mips 732932220078f6312f3ef57c17523d3d7f995655 +openrisc 7f1e2fc493480086fbb375f4f6d33cb93fc069d6 +parisc-hd e8f897f4afef0031fe618a8e94127a0934896aba +powerpc 5c4233cc0920cc90787aafe950b90f6c57a35b88 +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v 099dbac6e90c620d8ce0bbf75bbdc94da1feb4fb +riscv-dt 28ecaaa5af192fa8a3f406e5a3e5416324c4d0a5 +riscv-soc 6613476e225e090cc9aad49be7fa504e290dd33d +s390 64c3431808bdab2ccef97d7a444018c416b080b5 +sh 0a2d3ce0031f504b2e3ad47625e149ad5759ad33 +sparc 84b76d05828a1909e20d0f66553b876b801f98c8 +uml 83aec96c631e0fa75cfe6d6a1b113a32151aaa88 +xtensa 7ab7acb68adf053c78a2cdf32bf1a3dce95912ec +bcachefs 2e92d26b25432ec3399cb517beb0a79a745ec60f +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 8c62f31eddb71c6f6878258579318c1156045247 +afs abcbd3bfbbfe97a8912d0c929d4aa18f50d9bc52 +btrfs 18f539b4e9d2e0f2b0731b7c56fc889e71c9ec7b +ceph 825b82f6b82aa38dbb771d24e135152012500e51 +cifs 1b552a9c49e6c31d5948da7957be72b0133c0695 +configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs a1bafc3109d713ed83f73d61ba5cb1e6fd80fdbc +exfat dc38fdc51ba650871f12e4032bfe170f5b0e8ed0 +exportfs 42c3732fa8073717dd7d924472f1c0bc5b452fdc +ext3 9d7d0eb685f1532e8153aadfd7d3f3d1de3ec4b2 +ext4 0ecae5410ab526225293d2591ca4632b22c2fd8c +f2fs bf3a69c6861ff4dc7892d895c87074af7bc1c400 +fsverity 8e43fb06e10d2c811797740dd578c5099a3e6378 +fuse cdf6ac2a03d253f05d3e798f60f23dea1b176b92 +gfs2 6f18f897e3fffa653dd84c280d213883da385b5d +jfs e42e29cc442395d62f1a8963ec2dfb700ba6a5d7 +ksmbd def30e72d8abaf68da10682767e584519c234c4c +nfs 719fcafe07c12646691bd62d7f8d94d657fa0766 +nfs-anna 57331a59ac0d680f606403eb24edd3c35aecba31 +nfsd 9b350d3e349f2c4ba4e046001446d533471844a7 +ntfs3 622cd3daa8eae37359a6fd3c07c36d19f66606b5 +orangefs 9bf93dcfc453fae192fe5d7874b89699e8f800ac +overlayfs d17bb4620f90f81d8a8a45c3d025c679a1b5efcd +ubifs b8a77b9a5f9c2ba313f2beef8440b6f9f69768e7 +v9fs 2a0505cdd8c8b12670f4b5a6eb5c996c0861c2d5 +v9fs-ericvh acade3ac5c19d3e1a6e4934ab250b192dc787675 +xfs 0c6ca06aad84bac097f5c005d911db92dba3ae94 +zonefs 567e629fd296561aacd04547a603b163de3dabbe +iomap 3ac974796e5d94509b85a403449132ea660127c2 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner 70f0231d2dc2b43c2ae616f53d3abbe22822082a +vfs 052d534373b7ed33712a63d5e17b2b6cdbce84fd +printk a2b4cab9da7746c42f87c13721d305baf0085a20 +pci 705c1da8fa4816fb0159b5602fef1df5946a3ee2 +pstore c8d25d696f526a42ad8cf615dc1131c0b00c662e +hid f0cd2e82460c8b6c691bf553480c30144f8c32f7 +i2c 91962feb9502bb98f830d90fe197653e6f4e84a4 +i2c-host bb271301b80410592cbe0170b9f6d2f677f68171 +i3c 8f06fb45853900b4deaa52e2a9e16f3d9550b011 +hwmon-staging 8debe3c1295ef36958dae77487eed9cf6584c008 +jc_docs b8cfda5c9065cd619a97c17da081cbfab3b1e756 +v4l-dvb b14257abe7057def6127f6fb2f14f9adc8acabdb +v4l-dvb-next b14257abe7057def6127f6fb2f14f9adc8acabdb +pm fbd88dd05780ef9b0026b09edcbc57a77742cfd6 +cpufreq-arm a8e949d41c72a0a860b1c3571d6b274e9b77b6bb +cpupower a114d9f1f2cf4896d838ab0a9c30a75411736829 +devfreq 68a8582befd4c15bd7a2dbd2324075796dd84e38 +pmdomain ccabbb6768fc72d6cb0223324925c93658d91e63 +opp 13c8cf339e1a7a3d3e48fdebbb882b3a5a90f708 +thermal 1828c1c17bb2adf3a3f26abc69cb3fe971eac0e4 +dlm c53309b912fdd652eb3c2de44626aac4b0fc9bf9 +rdma 96d9cbe2f2ff7abde021bac75eafaceabe9a51fa +net-next 237bb5f7f7f55ec5f773469a974c61a49c298625 +bpf-next 9187210eee7d87eea37b45ea93454a88681894a4 +ipsec-next aceb147b20a2eda9a10bdd4b5650718f731ef3e1 +mlx5-next d727d27db536faea7178290c677cc0567f647231 +netfilter-next ed1f164038b50c5864aa85389f3ffd456f050cca +ipvs-next ed1f164038b50c5864aa85389f3ffd456f050cca +bluetooth f4a0fc6780c7c1583133a9b8f10d76f769e41d34 +wireless-next c2b25092864a16c7865e406badedece5cc25fc2b +wpan-next 9187210eee7d87eea37b45ea93454a88681894a4 +wpan-staging 9187210eee7d87eea37b45ea93454a88681894a4 +mtd 09888e973cc9d3615dbab5d178eecb58d8a0b7ab +nand 4120aa0e3961f68f1f8cfe6b4c3c809ffea31fdc +spi-nor 6a9eda34418fc4dc05c2a7d6741c475e287d418c +crypto 6a8dbd71a70620c42d4fa82509204ba18231f28d +drm 02ac43711111b9e36dbbecfe85bfd1dbfa2b49bb +drm-exynos 119b225f01e4d3ce974cd3b4d982c76a380c796d +drm-misc 5d4e8ae6e57b025802aadf55a4775c55cceb75f1 +amdgpu a0ce9e50f51ed759d7bd8886dae8696bd24c81e3 +drm-intel 4df6ac223cad36e7384ed00fe6efc114279f0df6 +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm 4be445f5b6b6810baf397b2d159bd07c3573fd75 +drm-msm-lumag 4be445f5b6b6810baf397b2d159bd07c3573fd75 +drm-xe 43c4ff3ca2d1c93a9bfa5ad60e0a06832e830ec6 +etnaviv b735ee173f84d5d0d0733c53946a83c12d770d05 +fbdev c2d953276b8b27459baed1277a4fdd5dd9bd4126 +regmap 62861ddcb27e356c6332b54d4a953e1b8c01fe73 +sound 1e5dc3989a20ccd703d5fe1a269d2bcedf29142c +ieee1394 04f082d39b99f0b7b4b1cada14280f41d99f1e1f +sound-asoc 4cd1939cf2e14a1cca15c2c680afdb45a05c4974 +modules d1909c0221739356f31c721de4743e7d219a56cc +input 81c32343d04f8ca974681d5fb5d939d2e1f58851 +block 4138f02288333cb596885e9af03dd3ea2de845cb +device-mapper 55e565c42dce81a4e49c13262d5bc4eb4c2e588a +libata c1bc6ed01c16958ec7d0704df64adefc452c99a1 +pcmcia ccae53aa8aa2d902242555638c5de104aab08879 +mmc faf3b8014c357d71c7a9414302e217a1dd1679af +mfd 78334c343bef528b911da83a6b041d15a1a72efb +backlight b49c1caca529c28712ef62bfaabdb9441162a935 +battery 4e61f1e9d58fb0765f59f47d4d1f318b36c14d95 +regulator a1f9fa6fcbb306b9f71523e36eeda81ddda5c8a8 +security 8f49397828ee61b6b3002c1de2956b120b7f832a +apparmor 8ead196be219adade3bd0d4115cc9b8506643121 +integrity 85445b96429057d87446bcb24ec0cac9ea9c7fdf +selinux a1fc79343abbdc5bebb80c2a9032063442df8b59 +smack 69b6d71052b54fb10feba68564ccb41c0f0ce1e9 +tomoyo 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tpmdd 1156e9541dc2bd66ce0bfd9e07a167fc005db52b +watchdog 6fe5aabf7fc645562faec50c79c7a21a4dd1cab6 +iommu f379a7e9c3b5c325ff550e911ea42092295695de +audit aa13b709084a0287ef250a9fbde5993e4dfc3078 +devicetree 7e98fe49f8896cc60c2a88c60bc535aa3e0e2564 +dt-krzk 8c82b4eef2972200f6171aaa260d7bba2ad29889 +mailbox 8df6bab6cb9abc98736ffae410a74647995873c6 +spi cf6d79a0f5769b5f4d9579ddaf88d2c30b03b873 +tip eb8ed5b0e9d988a75b10ea811eeb1cffc6aa95c0 +clockevents 8248ca30ef89f9cc74ace62ae1b9a22b5f16736c +edac fc8235a79d7355b4cac34778c1328105313fea61 +ftrace 7604256cecef34a82333d9f78262d3180f4eb525 +rcu 3add00be5fe5810d7aa5ec3af8b6a245ef33144b +kvm c20722c412f1cc1879e994fe169278bd0f322ad9 +kvm-arm 4a09ddb8333a3efec715f6cfd099f9dc4fbaa7cc +kvms390 00de073e2420df02ac0f1a19dbfb60ff8eb198be +kvm-ppc 41bccc98fb7931d63d03f326a746ac4d429c1dd3 +kvm-riscv d8c0831348e78fdaf67aa95070bae2ef8e819b05 +kvm-x86 964d0c614c7f71917305a5afdca9178fe8231434 +xen-tip d277f9d82802223f242cd9b60c988cfdda1d6be0 +percpu 2d9ad81ef93570bc0d4929d05d0601ea400d6fcf +workqueues b111131e3ec725685b6f793472e801f307a5506e +drivers-x86 16f8091b49175f327120cdbbdde135d38a853ae1 +chrome-platform 6613476e225e090cc9aad49be7fa504e290dd33d +chrome-platform-firmware 8a0a62941a042612f7487f6c4ff291f9054ff214 +hsi 3693760295e8c8a1a88cb3da5b178959b3cc7c75 +leds-lj 45066c4bbe8ca25f9f282245b84568116c783f1d +ipmi 296455ade1fdcf5f8f8c033201633b60946c589a +driver-core 6aeb8850e0f39869d43768603a75c0431562a429 +usb a788e53c05aee6e3d60792a59e10c0fac56b5086 +thunderbolt b8a730836c6b1788ca2fbd6bcc2ac99e97ef7de9 +usb-serial b1a8da9ff1395c4879b4bd41e55733d944f3d613 +tty d6c0d892b44cd16e0421909cf7f2883b9e625e4a +char-misc 367b3560e10bbae3660d8ba4d0a7cc92170d8398 +accel 576d7cc5a9e29e4cc579ffb0f9afc209e34eea31 +coresight a4f3057d19ffe1f5a7b9320303471a6725f11379 +fastrpc 6613476e225e090cc9aad49be7fa504e290dd33d +fpga b1a91ca25f15b6d7b311de4465854a5981dee3d3 +icc 7af14fe58e5ee10807088aa48f176a213c13d309 +iio a696ab17dafe5f137c6d0e4871d3418c8303b17e +phy-next 00ca8a15dafa990d391abc37f2b8256ddf909b35 +soundwire e17aae16acf53938deb4b7702aa4f6cee2c4a073 +extcon abe83c4e5e4fdb3cb6c72dfe3bbbfd61f5b935ef +gnss 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +vfio 7447d911af699a15f8d050dfcb7c680a86f87012 +w1 d97d263132a69a0bda54efce3df04e55fa6341f7 +spmi b85ea95d086471afb4ad062012a4d73cd328fa86 +staging 68bb540b1aefded1d58a9f956568d5316643d291 +counter-next eca588187f9129300c6e44d64b819545cede463d +siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 716141d366f45d62ffe4dd53a045867b26e29d19 +cgroup 13eb1d6e1cfcfc277d2cba521c6082ab3e16b43f +scsi af180c0880f9df14be31807f0bb0fa6f0d34a943 +scsi-mkp 52d8210ea45d4c56fdca65ccb7541b0dfe9f416f +vhost 894452180d732413fd29fa95a4820560fa44ca4a +rpmsg 929654e8f1add50b01d5a56171a31c311b0a739a +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 8636f19c2d1f8199b27b4559d9caa115b3011f06 +gpio-intel 6613476e225e090cc9aad49be7fa504e290dd33d +pinctrl 34675dc3a7c6301c95542d70d16ea520e25e3277 +pinctrl-intel 6613476e225e090cc9aad49be7fa504e290dd33d +pinctrl-renesas a6f06b909fee72c679c565adfa7f080f9595e336 +pinctrl-samsung 6613476e225e090cc9aad49be7fa504e290dd33d +pwm dd6c6d57ab61d496f6ff7d6ca38611062af142a1 +ktest 07283c1873a4d0eaa0e822536881bfdaea853910 +kselftest 5d94da7ff00ef45737a64d947e7ff45aca972782 +kunit 6613476e225e090cc9aad49be7fa504e290dd33d +kunit-next 806cb2270237ce2ec672a407d66cee17a07d3aa2 +livepatching 602bf18307981f3bfd9ebf19921791a4256d3fd1 +rtc f0109900462db14e3f213a41c7f14b350252c7e2 +nvdimm d9212b35da52109361247b66010802d43c6b1f0d +at24 6613476e225e090cc9aad49be7fa504e290dd33d +ntb 9341b37ec17a8793e8439e9b18354ba69556b786 +seccomp 56af94aace8a0489fb1a32fd6f1cf0c548fe3911 +fsi c5eeb63edac9497f9a0d46d3b75cf8b293771ecf +slimbus 6613476e225e090cc9aad49be7fa504e290dd33d +nvmem 6613476e225e090cc9aad49be7fa504e290dd33d +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv b967df6293510b6e1f53cba56e2475b2aa50be7e +auxdisplay 5d9e12972259cd86ae9c3fc0d5338b15831b9929 +kgdb 4f41d30cd6dc865c3cbc1a852372321eba6d4e4c +hmm 6613476e225e090cc9aad49be7fa504e290dd33d +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi 2ec11b5d6d900b17c7d001fbee4751fd2aa58917 +memblock 2159bd4e905704b1765b6b883ea15e51ad986a6a +cxl ed1ff2fba7afa7baca7ceb93824a4699130b8377 +zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a +efi b3810c5a2cc4a6665f7a65bed5393c75ce3f3aa2 +unicode 0131c1f3cce7c01b0eb657a9e9e1a5e42c09a68b +slab 78e2606d5f55b08260d2fa3b01c7455349d92799 +random 1f719a2f3fa67665578c759ac34fd3d3690c1a20 +landlock a17c60e533f5cd832e77e0d194e2e0bb663371b6 +rust 768409cff6cc89fe1194da880537a09857b6e4db +sysctl 4f1136a55dc8e2c27d51e934d0675e12331c7291 +execve 472874cf7bb34895ae69483338359df84e76f3e1 +bitmap fd8ed16c2419e23b7496e008e5f7be98da7fe2d5 +hte b85ea95d086471afb4ad062012a4d73cd328fa86 +kspp 8d8b79685237b15f4bb676781f6bf241beb068a8 +kspp-gustavo 6613476e225e090cc9aad49be7fa504e290dd33d +nolibc 6613476e225e090cc9aad49be7fa504e290dd33d +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd 6613476e225e090cc9aad49be7fa504e290dd33d +header_cleanup 5f4c01f1e3c7b0c8d1e5dd6f080531de7aa5e47b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..37b744775bb1 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,375 @@ +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.kernel.org/pub/scm/linux/kernel/git/rmk/linux.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 +sophgo-fixes git https://github.com/sophgo/linux.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 +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 https://gitlab.freedesktop.org/drm/kernel.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 +auxdisplay-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.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 +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.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 +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 +overlayfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes +i2c-host-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-fixes +sparc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus +drm-misc-fixes git https://gitlab.freedesktop.org/drm/misc/kernel.git#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 +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.kernel.org/pub/scm/linux/kernel/git/rmk/linux.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/mediatek/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 +sophgo git https://github.com/sophgo/linux.git#for-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 +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.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 +exportfs git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#exportfs-next +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 +i2c-host git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/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 https://gitlab.freedesktop.org/drm/kernel.git#drm-next +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc git https://gitlab.freedesktop.org/drm/misc/kernel.git#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 +drm-xe git https://gitlab.freedesktop.org/drm/xe/kernel#drm-xe-next +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/libata/linux#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 +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.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#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 +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-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +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-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 +spmi git git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-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 +siox git git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#siox/for-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/ukleinek/linux.git#pwm/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 git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#for-next +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/sysctl/sysctl.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 +tsm git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux#tsm-next +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +header_cleanup git https://evilpiepirate.org/git/bcachefs.git#header_cleanup diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..2b60c64a6ed9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3681 @@ +$ date -R +Wed, 20 Mar 2024 08:48:47 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at bf3a69c6861f Merge tag 'for-linus-6.9-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux +Merging origin/master (78c3925c048c Merge tag 'soc-late-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating bf3a69c6861f..78c3925c048c +Fast-forward (no commit created; -m option ignored) + Documentation/admin-guide/kernel-parameters.txt | 26 +- + Documentation/admin-guide/sysctl/kernel.rst | 28 +- + .../devicetree/bindings/bus/brcm,gisb-arb.yaml | 1 + + .../devicetree/bindings/pwm/opencores,pwm.yaml | 56 ++ + .../bindings/reset/sophgo,sg2042-reset.yaml | 35 + + Documentation/devicetree/bindings/riscv/cpus.yaml | 4 + + .../bindings/thermal/allwinner,sun8i-a83t-ths.yaml | 34 +- + .../devicetree/bindings/thermal/qoriq-thermal.yaml | 3 +- + .../bindings/thermal/rcar-gen3-thermal.yaml | 2 + + .../devicetree/bindings/thermal/thermal-zones.yaml | 2 - + Documentation/firmware-guide/acpi/enumeration.rst | 12 +- + Documentation/power/suspend-and-interrupts.rst | 2 +- + Documentation/trace/user_events.rst | 27 +- + MAINTAINERS | 7 +- + arch/arm/boot/dts/ti/omap/am33xx-clocks.dtsi | 39 +- + arch/arm/boot/dts/ti/omap/am35xx-clocks.dtsi | 18 +- + arch/arm/boot/dts/ti/omap/omap3430es1-clocks.dtsi | 52 +- + .../boot/dts/ti/omap/omap34xx-omap36xx-clocks.dtsi | 86 +-- + .../omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 28 +- + arch/arm/boot/dts/ti/omap/omap36xx-clocks.dtsi | 7 +- + .../ti/omap/omap36xx-omap3430es2plus-clocks.dtsi | 46 +- + arch/arm/boot/dts/ti/omap/omap3xxx-clocks.dtsi | 510 +++++++------- + arch/arm/include/debug/brcmstb.S | 8 +- + arch/arm/mach-bcm/Kconfig | 1 - + .../dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts | 13 +- + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 3 - + arch/riscv/boot/dts/microchip/mpfs.dtsi | 6 +- + .../boot/dts/starfive/jh7100-beaglev-starlight.dts | 11 + + arch/riscv/boot/dts/starfive/jh7100-common.dtsi | 108 +++ + .../dts/starfive/jh7100-starfive-visionfive-v1.dts | 22 +- + arch/riscv/boot/dts/starfive/jh7100.dtsi | 45 ++ + .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 71 ++ + arch/riscv/boot/dts/starfive/jh7110.dtsi | 76 ++ + arch/s390/Kconfig | 1 + + arch/s390/Makefile | 1 + + arch/s390/configs/debug_defconfig | 1 + + arch/s390/include/asm/ccwdev.h | 3 +- + arch/s390/include/asm/cio.h | 9 +- + arch/s390/include/asm/dma-types.h | 103 +++ + arch/s390/include/asm/eadm.h | 5 +- + arch/s390/include/asm/fcx.h | 13 +- + arch/s390/include/asm/idals.h | 176 ++--- + arch/s390/include/asm/page.h | 30 +- + arch/s390/include/asm/processor.h | 2 + + arch/s390/include/asm/ptrace.h | 2 - + arch/s390/include/asm/qdio.h | 17 +- + arch/s390/include/asm/scsw.h | 7 +- + arch/s390/kernel/entry.S | 73 +- + arch/s390/kernel/sysinfo.c | 2 +- + arch/s390/kernel/vtime.c | 4 +- + arch/s390/mm/Makefile | 1 + + arch/s390/mm/fault.c | 4 +- + arch/s390/mm/physaddr.c | 15 + + arch/x86/include/asm/xen/hypervisor.h | 5 + + arch/x86/platform/pvh/enlighten.c | 3 + + arch/x86/xen/enlighten.c | 32 + + arch/x86/xen/enlighten_pvh.c | 68 ++ + arch/x86/xen/setup.c | 44 -- + arch/x86/xen/xen-ops.h | 14 + + drivers/acpi/dock.c | 2 + + drivers/acpi/sleep.c | 24 +- + drivers/ata/ahci.c | 13 - + drivers/bus/brcmstb_gisb.c | 15 + + drivers/bus/ts-nbus.c | 81 +-- + drivers/clk/ti/apll.c | 11 +- + drivers/clk/ti/clk.c | 71 +- + drivers/clk/ti/clock.h | 1 + + drivers/clk/ti/divider.c | 5 +- + drivers/clk/ti/gate.c | 9 +- + drivers/clk/ti/interface.c | 4 +- + drivers/clk/ti/mux.c | 6 +- + drivers/cpufreq/cpufreq-dt.c | 2 +- + drivers/cpufreq/cpufreq.c | 20 +- + drivers/cpufreq/freq_table.c | 2 +- + drivers/cpufreq/scmi-cpufreq.c | 20 +- + drivers/cxl/core/trace.h | 14 +- + drivers/firmware/arm_scmi/perf.c | 3 + + drivers/gpu/drm/i915/display/intel_display_trace.h | 6 +- + drivers/infiniband/core/cm.c | 20 +- + drivers/infiniband/core/device.c | 37 +- + drivers/infiniband/core/uverbs_cmd.c | 16 +- + drivers/infiniband/core/uverbs_ioctl.c | 78 ++- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 - + drivers/infiniband/hw/efa/efa.h | 1 + + drivers/infiniband/hw/efa/efa_main.c | 32 +- + drivers/infiniband/hw/hfi1/tid_rdma.c | 25 +- + drivers/infiniband/hw/hns/hns_roce_cmd.h | 3 + + drivers/infiniband/hw/hns/hns_roce_cq.c | 11 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 35 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 95 +-- + drivers/infiniband/hw/hns/hns_roce_hem.h | 56 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 154 +++-- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 9 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 3 + + drivers/infiniband/hw/hns/hns_roce_mr.c | 341 ++++++--- + drivers/infiniband/hw/hns/hns_roce_qp.c | 60 ++ + drivers/infiniband/hw/hns/hns_roce_restrack.c | 23 +- + drivers/infiniband/hw/irdma/verbs.c | 3 +- + drivers/infiniband/hw/mana/cq.c | 29 +- + drivers/infiniband/hw/mana/main.c | 82 ++- + drivers/infiniband/hw/mana/mana_ib.h | 27 +- + drivers/infiniband/hw/mana/mr.c | 17 +- + drivers/infiniband/hw/mana/qp.c | 94 +-- + drivers/infiniband/hw/mana/wq.c | 4 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 - + drivers/infiniband/sw/rxe/rxe.c | 6 +- + drivers/infiniband/sw/rxe/rxe.h | 6 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 4 +- + drivers/infiniband/sw/rxe/rxe_cq.c | 4 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 2 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 18 +- + drivers/infiniband/sw/rxe/rxe_mw.c | 2 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 8 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 12 +- + drivers/infiniband/sw/rxe/rxe_task.c | 4 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 218 +++--- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 3 +- + drivers/infiniband/ulp/rtrs/rtrs-clt-sysfs.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 3 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_trace.h | 8 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h | 8 +- + drivers/net/virtio_net.c | 151 ++-- + drivers/powercap/intel_rapl_msr.c | 5 +- + drivers/reset/Kconfig | 12 +- + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 224 +++++- + drivers/reset/reset-gpio.c | 119 ++++ + drivers/reset/reset-simple.c | 2 + + drivers/s390/block/dasd.c | 4 +- + drivers/s390/block/dasd_3990_erp.c | 14 +- + drivers/s390/block/dasd_alias.c | 6 +- + drivers/s390/block/dasd_eckd.c | 118 ++-- + drivers/s390/block/dasd_eer.c | 2 +- + drivers/s390/block/dasd_fba.c | 32 +- + drivers/s390/block/dcssblk.c | 2 +- + drivers/s390/block/scm_blk.c | 6 +- + drivers/s390/char/con3215.c | 4 +- + drivers/s390/char/fs3270.c | 14 +- + drivers/s390/char/raw3270.c | 42 +- + drivers/s390/char/raw3270.h | 2 +- + drivers/s390/char/tape.h | 12 +- + drivers/s390/char/tape_class.c | 17 +- + drivers/s390/char/vmlogrdr.c | 18 +- + drivers/s390/char/vmur.c | 22 +- + drivers/s390/cio/ccwgroup.c | 4 +- + drivers/s390/cio/chsc.c | 12 +- + drivers/s390/cio/chsc.h | 6 +- + drivers/s390/cio/cio.c | 4 +- + drivers/s390/cio/css.c | 25 +- + drivers/s390/cio/device_fsm.c | 8 +- + drivers/s390/cio/device_id.c | 2 +- + drivers/s390/cio/device_ops.c | 5 +- + drivers/s390/cio/device_pgid.c | 8 +- + drivers/s390/cio/device_status.c | 2 +- + drivers/s390/cio/eadm_sch.c | 4 +- + drivers/s390/cio/fcx.c | 22 +- + drivers/s390/cio/orb.h | 9 +- + drivers/s390/cio/qdio_main.c | 12 +- + drivers/s390/cio/qdio_setup.c | 10 +- + drivers/s390/cio/qdio_thinint.c | 6 +- + drivers/s390/cio/vfio_ccw_cp.c | 82 ++- + drivers/s390/cio/vfio_ccw_fsm.c | 2 +- + drivers/s390/crypto/zcrypt_api.c | 39 +- + drivers/s390/net/ctcm_fsms.c | 4 +- + drivers/s390/net/ctcm_main.c | 2 +- + drivers/s390/net/ctcm_mpc.c | 20 +- + drivers/s390/net/lcs.c | 12 +- + drivers/s390/net/qeth_core_main.c | 24 +- + drivers/s390/scsi/zfcp_fsf.c | 2 +- + drivers/s390/scsi/zfcp_qdio.c | 4 +- + drivers/s390/scsi/zfcp_qdio.h | 6 +- + drivers/s390/virtio/virtio_ccw.c | 170 +++-- + drivers/soc/fsl/dpio/dpio-service.c | 2 +- + drivers/soc/sunxi/sunxi_sram.c | 22 + + drivers/thermal/Makefile | 2 +- + drivers/thermal/mediatek/auxadc_thermal.c | 3 + + drivers/thermal/mediatek/lvts_thermal.c | 4 +- + drivers/thermal/qoriq_thermal.c | 12 +- + drivers/thermal/rcar_gen3_thermal.c | 4 + + drivers/thermal/st/st_thermal.h | 18 +- + drivers/thermal/st/st_thermal_memmap.c | 2 +- + drivers/thermal/sun8i_thermal.c | 139 +++- + drivers/thermal/thermal_of.c | 14 +- + drivers/vdpa/alibaba/eni_vdpa.c | 8 + + drivers/vdpa/ifcvf/ifcvf_base.c | 11 +- + drivers/vdpa/ifcvf/ifcvf_base.h | 2 + + drivers/vdpa/ifcvf/ifcvf_main.c | 15 + + drivers/vdpa/mlx5/net/mlx5_vnet.c | 13 +- + drivers/vdpa/pds/aux_drv.c | 2 +- + drivers/vdpa/pds/vdpa_dev.c | 20 +- + drivers/vdpa/pds/vdpa_dev.h | 1 + + drivers/vdpa/vdpa.c | 214 +++++- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 15 +- + drivers/vdpa/vdpa_user/iova_domain.c | 27 +- + drivers/vdpa/vdpa_user/iova_domain.h | 8 + + drivers/vdpa/vdpa_user/vduse_dev.c | 34 + + drivers/vdpa/virtio_pci/vp_vdpa.c | 8 + + drivers/vhost/net.c | 3 + + drivers/vhost/vdpa.c | 14 + + drivers/virtio/virtio.c | 6 +- + drivers/virtio/virtio_ring.c | 6 +- + drivers/virtio/virtio_vdpa.c | 5 +- + drivers/xen/balloon.c | 2 - + drivers/xen/events/events_base.c | 22 +- + drivers/xen/evtchn.c | 6 + + drivers/xen/grant-dma-iommu.c | 6 +- + fs/dlm/dlm_internal.h | 2 +- + fs/dlm/lock.c | 114 ++- + fs/dlm/user.c | 10 +- + fs/nfsd/trace.h | 10 +- + fs/tracefs/event_inode.c | 70 +- + fs/tracefs/internal.h | 2 - + include/dt-bindings/reset/sophgo,sg2042-reset.h | 87 +++ + include/linux/clk/ti.h | 3 + + include/linux/cpufreq.h | 3 +- + include/linux/ftrace.h | 4 +- + include/linux/kernel.h | 1 + + include/linux/of.h | 16 + + include/linux/reset-controller.h | 4 + + include/linux/trace_events.h | 3 + + include/linux/tracepoint.h | 6 +- + include/linux/vdpa.h | 6 + + include/net/iucv/iucv.h | 3 +- + include/rdma/ib_verbs.h | 19 +- + include/rdma/uverbs_ioctl.h | 14 +- + include/trace/events/sunrpc.h | 12 +- + include/trace/stages/stage2_data_offsets.h | 4 +- + include/trace/stages/stage5_get_offsets.h | 25 +- + include/trace/stages/stage6_event_callback.h | 28 +- + include/uapi/linux/user_events.h | 6 +- + include/uapi/linux/vdpa.h | 17 + + include/uapi/linux/vhost.h | 7 + + include/uapi/linux/virtio_pci.h | 10 +- + include/uapi/rdma/hns-abi.h | 16 + + ipc/ipc_sysctl.c | 3 +- + kernel/power/energy_model.c | 11 + + kernel/sysctl.c | 4 +- + kernel/trace/ftrace.c | 90 +-- + kernel/trace/ring_buffer.c | 45 +- + kernel/trace/trace.c | 768 ++++++--------------- + kernel/trace/trace.h | 18 +- + kernel/trace/trace_benchmark.c | 5 +- + kernel/trace/trace_events_trigger.c | 63 +- + kernel/trace/trace_events_user.c | 209 ++++-- + kernel/trace/trace_sched_switch.c | 515 ++++++++++++++ + kernel/trace/trace_selftest.c | 2 +- + net/iucv/af_iucv.c | 8 +- + net/iucv/iucv.c | 23 +- + samples/trace_events/trace-events-sample.h | 18 +- + scripts/check-sysctl-docs | 65 +- + tools/testing/ktest/ktest.pl | 17 +- + tools/testing/selftests/user_events/abi_test.c | 134 ++++ + 252 files changed, 5542 insertions(+), 2862 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/opencores,pwm.yaml + create mode 100644 Documentation/devicetree/bindings/reset/sophgo,sg2042-reset.yaml + create mode 100644 arch/s390/include/asm/dma-types.h + create mode 100644 arch/s390/mm/physaddr.c + create mode 100644 drivers/reset/reset-gpio.c + create mode 100644 include/dt-bindings/reset/sophgo,sg2042-reset.h +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 (ded79af42f11 scripts/gdb/symbols: fix invalid escape sequence warning) +$ 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 +Already up to date. +Merging kbuild-current/fixes (b401b621758e Linux 6.8-rc5) +$ 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 (861deac3b092 Linux 6.7-rc7) +$ 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 (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Merge made by the 'ort' strategy. + arch/arm/mm/flush.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging arm64-fixes/for-next/fixes (2c79bd34af13 arm64: prohibit probing on arch_kunwind_consume_entry()) +$ 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 (1c7cfb6158f6 Merge tag 'riscv-firmware-for-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/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 (6613476e225e Linux 6.8-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 (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging sophgo-fixes/fixes (41bccc98fb79 Linux 6.8-rc2) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-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 (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (380cb2f4df78 selftests/powerpc: Fix fpu_signal failures) +$ 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 (b0546776ad3f Merge tag 'printk-for-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/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 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 (32fa4366cc4d net: phy: fix phy_read_poll_timeout argument type in genphy_loopback) +$ 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. + Documentation/networking/multi-pf-netdev.rst | 50 +++++++++++----------- + .../networking/net_cachelines/net_device.rst | 2 +- + drivers/net/dsa/mt7530.c | 14 ++---- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 ++- + drivers/net/ethernet/mediatek/mtk_ppe.c | 18 +++++--- + drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 2 +- + drivers/net/phy/phy_device.c | 4 +- + drivers/net/veth.c | 18 -------- + drivers/net/vmxnet3/vmxnet3_xdp.c | 6 +-- + drivers/net/wan/fsl_qmc_hdlc.c | 2 +- + drivers/net/wireguard/device.c | 11 +---- + drivers/net/wireguard/netlink.c | 10 ++--- + drivers/net/wireguard/receive.c | 6 +-- + drivers/soc/fsl/qbman/qman.c | 25 ++++++----- + include/linux/netdevice.h | 2 +- + include/linux/skbuff.h | 6 +-- + include/linux/socket.h | 7 --- + net/core/dev.c | 5 ++- + net/devlink/netlink.c | 13 +++--- + net/hsr/hsr_framereg.c | 4 ++ + net/hsr/hsr_main.c | 15 +++++-- + net/ipv4/inet_hashtables.c | 2 +- + net/ipv4/inet_timewait_sock.c | 45 +++++++++---------- + net/ipv4/ip_output.c | 1 - + net/ipv4/raw.c | 2 +- + net/ipv4/tcp_minisocks.c | 4 -- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/raw.c | 2 +- + net/packet/af_packet.c | 8 ++-- + net/rds/send.c | 5 +-- + net/rxrpc/sendmsg.c | 4 +- + net/rxrpc/txbuf.c | 4 +- + net/sched/sch_fq_pie.c | 2 + + net/sched/sch_taprio.c | 3 +- + net/socket.c | 14 +++--- + tools/net/ynl/Makefile.deps | 1 + + tools/perf/trace/beauty/include/linux/socket.h | 7 --- + tools/testing/selftests/net/udpgro_fwd.sh | 4 ++ + tools/testing/selftests/net/veth.sh | 24 +++++++++-- + .../selftests/wireguard/qemu/arch/riscv32.config | 1 + + .../selftests/wireguard/qemu/arch/riscv64.config | 1 + + 42 files changed, 178 insertions(+), 187 deletions(-) +Merging bpf/master (f6e922365faf xsk: Don't assume metadata is always requested in TX completion) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 3 +- + MAINTAINERS | 2 +- + include/net/xdp_sock.h | 2 + + kernel/bpf/arena.c | 25 +++++--- + kernel/bpf/verifier.c | 10 +++- + scripts/bpf_doc.py | 4 +- + tools/bpf/bpftool/gen.c | 2 +- + tools/lib/bpf/libbpf.c | 2 +- + tools/testing/selftests/bpf/bpf_arena_common.h | 2 +- + .../testing/selftests/bpf/prog_tests/arena_htab.c | 8 ++- + .../testing/selftests/bpf/prog_tests/arena_list.c | 7 ++- + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + tools/testing/selftests/bpf/progs/arena_htab.c | 2 +- + tools/testing/selftests/bpf/progs/arena_list.c | 10 ++-- + tools/testing/selftests/bpf/progs/verifier_arena.c | 4 +- + .../selftests/bpf/progs/verifier_arena_large.c | 68 ++++++++++++++++++++++ + 16 files changed, 125 insertions(+), 28 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/verifier_arena_large.c +Merging ipsec/master (773bb766ca4a xfrm: Allow UDP encapsulation only in offload modes) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Auto-merging include/linux/skbuff.h +Merge made by the 'ort' strategy. + include/linux/skbuff.h | 10 ++++++++++ + net/ipv4/esp4.c | 8 ++++---- + net/ipv6/esp6.c | 8 ++++---- + net/xfrm/xfrm_device.c | 3 ++- + 4 files changed, 20 insertions(+), 9 deletions(-) +Merging netfilter/main (d7d75124965a devlink: Fix devlink parallel commands processing) +$ 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 (d7d75124965a devlink: Fix devlink parallel commands processing) +$ 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 (cec60af1972d wifi: rtw89: coex: fix configuration for shared antenna for 8922A) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging wpan/master (b85ea95d0864 Linux 6.7-rc1) +$ 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 (eb5c7465c324 RDMA/srpt: fix function pointer cast warnings) +$ 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 (1e5dc3989a20 ALSA: hda/realtek: fix the hp playback volume issue for LG machines) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/pci/hda/patch_realtek.c | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) +Merging sound-asoc-fixes/for-linus (4cd1939cf2e1 Merge remote-tracking branch 'asoc/for-6.8' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/cirrus,cs42l43.yaml | 11 +- + sound/soc/amd/yc/acp6x-mach.c | 14 +- + sound/soc/amd/yc/pci-acp6x.c | 1 - + sound/soc/codecs/tlv320adc3xxx.c | 4 +- + sound/soc/codecs/wm_adsp.c | 3 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 352 +-------------------- + sound/soc/soc-compress.c | 4 + + sound/soc/soc-core.c | 3 + + sound/soc/sof/amd/acp-loader.c | 2 +- + sound/soc/sof/amd/acp.c | 48 +-- + sound/soc/sof/amd/acp.h | 7 +- + sound/soc/sof/amd/vangogh.c | 9 +- + 12 files changed, 70 insertions(+), 388 deletions(-) +Merging regmap-fixes/for-linus (2f0dbb24f78a regmap: kunit: Ensure that changed bytes are actually different) +$ 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 (a1f9fa6fcbb3 Merge remote-tracking branch 'regulator/for-6.8' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/core.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) +Merging spi-fixes/for-linus (cf6d79a0f576 spi: spi-imx: fix off-by-one in mx51 CPU mode burst length) +$ 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. + Documentation/spi/spi-lm70llp.rst | 4 ++-- + drivers/spi/spi-fsl-lpspi.c | 8 ++++---- + drivers/spi/spi-imx.c | 4 ++-- + drivers/spi/spi-lm70llp.c | 4 ++-- + drivers/spi/spi-mem.c | 2 +- + drivers/spi/spi.c | 24 ++++++++++++++---------- + 6 files changed, 25 insertions(+), 21 deletions(-) +Merging pci-current/for-linus (705c1da8fa48 Merge tag 'pci-v6.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ 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 (b401b621758e Linux 6.8-rc5) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (3d9319c27ceb Revert "tty: serial: simplify qcom_geni_serial_send_chunk_fifo()") +$ 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 (e8f897f4afef Linux 6.8) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (d206a76d7d27 Linux 6.8-rc6) +$ 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 (47b412c1ea77 phy: qcom-qmp-combo: fix type-c switch registration) +$ 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 (6613476e225e Linux 6.8-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 (11dadb631007 iio: accel: adxl367: fix I2C FIFO data register) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Already up to date. +Merging counter-current/counter-current (c83ccdc9586b counter: fix privdata alignment) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (a0776c214d47 mei: gsc_proxy: match component when GSC is on different bus) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (6613476e225e Linux 6.8-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 (e8f897f4afef Linux 6.8) +$ 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 (57ed9567e63b 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 (6a8dbd71a706 Revert "crypto: remove CONFIG_CRYPTO_STATS") +$ 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 (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart) +$ 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 (b54761f6e977 kselftest/seccomp: Report each expectation we assert as a KTAP test) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +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 (90d35da658da Linux 6.8-rc7) +$ 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 (6613476e225e Linux 6.8-rc1) +$ 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 (e6a30d0c48a1 mtd: rawnand: marvell: fix layouts) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (6613476e225e Linux 6.8-rc1) +$ 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 (346c84e281a9 media: pwm-ir-tx: Depend on CONFIG_HIGH_RES_TIMERS) +$ 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 (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets) +$ 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 (b401b621758e Linux 6.8-rc5) +$ 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 (6613476e225e Linux 6.8-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 (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (bf3a69c6861f Merge tag 'for-linus-6.9-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux) +$ 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 (83303a4c776c KVM: s390: fix cc for successful PQAP) +$ 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 (d206a76d7d27 Linux 6.8-rc6) +$ 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 (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size) +$ 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 (d206a76d7d27 Linux 6.8-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (100b83b218ec Merge branch 'misc-6.9' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/zoned.c +Merge made by the 'ort' strategy. + fs/btrfs/extent_map.c | 16 ++++++++-------- + fs/btrfs/scrub.c | 12 +++++++++++- + fs/btrfs/volumes.c | 10 ++++++++++ + fs/btrfs/zoned.c | 14 +++++++------- + 4 files changed, 36 insertions(+), 16 deletions(-) +Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Merge made by the 'ort' strategy. + drivers/infiniband/hw/qib/qib_fs.c | 1 + + 1 file changed, 1 insertion(+) +Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages) +$ 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 (0314cebb29be platform/x86/amd/pmf: Fix missing error code in amd_pmf_init_smart_pc()) +$ 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 (eab4f56d3e75 ARM: dts: exynos4212-tab3: add samsung,invert-vclk flag to fimd) +$ 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 (6613476e225e Linux 6.8-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 (7cb50f6c9fba of: property: fw_devlink: Fix stupid bug in remote-endpoint parsing) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (6613476e225e Linux 6.8-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 (ee0017c3ed8a scsi: mpt3sas: Prevent sending diag_reset when the controller is ready) +$ 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 (e8f897f4afef Linux 6.8) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (e8f897f4afef Linux 6.8) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (4af59a8df5ea mmc: core: Fix switch on gp3 partition) +$ 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 (54be6c6c5ae8 Linux 6.8-rc3) +$ 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 (aa707b615ce1 Drivers: hv: vmbus: make hv_bus const) +$ 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 (a11dd49dcb93 riscv: Sparse-Memory/vmemmap out-of-bounds fix) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging riscv-dt-fixes/riscv-dt-fixes (2672031b20f6 riscv: dts: Move BUILTIN_DTB_SOURCE to common Kconfig) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (d206a76d7d27 Linux 6.8-rc6) +$ 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 (6613476e225e Linux 6.8-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 (04b8076df253 Merge tag 'firewire-fixes-6.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394) +$ 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 (90d35da658da Linux 6.8-rc7) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (6613476e225e Linux 6.8-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 (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (e8f897f4afef Linux 6.8) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (829388b725f8 kunit: device: Unregister the kunit_bus on shutdown) +$ 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 (6a9531c3a880 memblock: fix crash when reserved memory is not added to memory) +$ 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 (c8d71dcaa396 nfsd: Fix error cleanup path in nfsd_rename()) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Auto-merging fs/nfsd/vfs.c +Merge made by the 'ort' strategy. + fs/nfsd/vfs.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes) +$ 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 perf-current/perf-tools (0f66dfe7b91d perf annotate: Add comments in the data structures) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (2ce507f57ba9 efivarfs: Drop 'duplicates' bool parameter on efivar_init()) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) +$ 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 (2df70149e73e power: supply: bq27xxx-i2c: Do not free non existing IRQ) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (bb04d1335388 iommufd/selftest: Don't check map/unmap pairing with HUGE_PAGES) +$ 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 (b401b621758e Linux 6.8-rc5) +$ 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 (6613476e225e Linux 6.8-rc1) +$ 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 (6613476e225e Linux 6.8-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 (2a93c6cbd5a7 pmdomain: qcom: rpmhpd: Fix enabled_corner aggregation) +$ 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 overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area()) +$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging i2c-host-fixes/i2c/i2c-host-fixes (1f78f0901011 i2c: aspeed: Fix the dummy irq expected print) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Auto-merging drivers/i2c/busses/i2c-i801.c +Auto-merging drivers/i2c/busses/i2c-imx.c +Merge made by the 'ort' strategy. +Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (9cbd1dae8427 drm/dp: Fix divide-by-zero regression on DP MST unplug with nouveau) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/display/drm_dp_helper.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/display/drm_dp_helper.c | 7 +++++++ + drivers/gpu/drm/nouveau/nouveau_dmem.c | 12 ++++++------ + drivers/gpu/drm/scheduler/sched_entity.c | 12 +++++++++--- + 3 files changed, 22 insertions(+), 9 deletions(-) +Merging mm-stable/mm-stable (270700dd06ca mm/zswap: remove the memcpy if acomp is not sleepable) +$ 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 (269cdf353b5b nilfs2: prevent kernel bug at submit_bh_wbc()) +$ 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 kbuild/for-next (097f1200bf7e kbuild: rpm-pkg: add dtb files in kernel rpm) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Makefile +Auto-merging arch/Kconfig +Auto-merging arch/alpha/Kconfig +Auto-merging arch/hexagon/Kconfig +CONFLICT (content): Merge conflict in arch/hexagon/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/x86/entry/vdso/Makefile +Auto-merging arch/x86/kvm/Kconfig +Auto-merging drivers/acpi/Kconfig +Auto-merging drivers/iommu/intel/Kconfig +Auto-merging drivers/md/Kconfig +Auto-merging include/linux/compiler_types.h +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging mm/Kconfig +Auto-merging rust/Makefile +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.lib +CONFLICT (content): Merge conflict in scripts/Makefile.lib +Auto-merging scripts/mod/modpost.c +Resolved 'arch/hexagon/Kconfig' using previous resolution. +Resolved 'scripts/Makefile.lib' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4fbc4a6c8f8d] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 1 + + Documentation/kbuild/kconfig-language.rst | 6 +- + Documentation/kbuild/kconfig.rst | 363 ++++++++++----------- + Makefile | 49 +-- + arch/Kconfig | 12 + + arch/alpha/Kconfig | 15 +- + arch/hexagon/Kconfig | 12 +- + arch/parisc/Kconfig | 4 +- + arch/riscv/kernel/tests/Kconfig.debug | 2 +- + arch/x86/entry/vdso/Makefile | 2 + + arch/x86/kvm/Kconfig | 2 +- + arch/x86/kvm/Makefile | 3 +- + arch/x86/xen/Kconfig | 1 - + drivers/acpi/Kconfig | 1 - + drivers/iommu/intel/Kconfig | 2 +- + drivers/md/Kconfig | 1 - + include/linux/compiler_types.h | 10 +- + init/Kconfig | 2 +- + kernel/module/Kconfig | 3 +- + lib/Kconfig.debug | 2 +- + mm/Kconfig | 7 +- + net/dccp/ccids/Kconfig | 2 +- + rust/Makefile | 4 +- + scripts/Kbuild.include | 6 - + scripts/Makefile.build | 22 +- + scripts/Makefile.dtbinst | 32 +- + scripts/Makefile.extrawarn | 3 +- + scripts/Makefile.lib | 26 +- + scripts/Makefile.package | 2 +- + scripts/kconfig/array_size.h | 11 + + scripts/kconfig/conf.c | 12 +- + scripts/kconfig/confdata.c | 96 +----- + scripts/kconfig/expr.h | 29 +- + scripts/kconfig/hashtable.h | 48 +++ + scripts/kconfig/internal.h | 12 + + scripts/kconfig/lexer.l | 128 ++++---- + scripts/kconfig/list.h | 254 ++++++++++---- + scripts/kconfig/list_types.h | 17 + + scripts/kconfig/lkc.h | 6 +- + scripts/kconfig/lkc_proto.h | 15 - + scripts/kconfig/lxdialog/checklist.c | 5 +- + scripts/kconfig/lxdialog/dialog.h | 4 - + scripts/kconfig/lxdialog/util.c | 20 +- + scripts/kconfig/mconf.c | 1 + + scripts/kconfig/menu.c | 48 ++- + scripts/kconfig/nconf.c | 1 + + scripts/kconfig/parser.y | 125 ++++--- + scripts/kconfig/preprocess.c | 23 +- + scripts/kconfig/preprocess.h | 19 ++ + scripts/kconfig/qconf.cc | 2 +- + scripts/kconfig/symbol.c | 49 ++- + .../tests/err_recursive_dep/expected_stderr | 24 +- + scripts/kconfig/util.c | 47 ++- + scripts/mod/modpost.c | 4 +- + scripts/package/builddeb | 48 +-- + scripts/package/debian/rules | 63 +++- + scripts/package/kernel.spec | 48 ++- + tools/lib/bpf/Makefile | 2 +- + 58 files changed, 973 insertions(+), 785 deletions(-) + create mode 100644 scripts/kconfig/array_size.h + create mode 100644 scripts/kconfig/hashtable.h + create mode 100644 scripts/kconfig/list_types.h + create mode 100644 scripts/kconfig/preprocess.h +Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) +$ 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 (0f66dfe7b91d perf annotate: Add comments in the data structures) +$ 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 (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL) +$ 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 (14cebf689a78 swiotlb: Reinstate page-alignment for mappings >= PAGE_SIZE) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Auto-merging drivers/iommu/dma-iommu.c +Merge made by the 'ort' strategy. + drivers/iommu/dma-iommu.c | 9 +++++++++ + kernel/dma/swiotlb.c | 47 ++++++++++++++++++++++++++++++++++------------- + 2 files changed, 43 insertions(+), 13 deletions(-) +Merging asm-generic/master (5394f1e9b687 arch: define CONFIG_PAGE_SIZE_*KB on all architectures) +$ 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 (5616fee8981b Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/kernel/Makefile +Auto-merging arch/arm/mm/fault.c +Auto-merging arch/arm/mm/init.c +Merge made by the 'ort' strategy. + arch/arm/Kconfig | 4 +- + arch/arm/Kconfig.debug | 3 - + arch/arm/include/asm/ptrace.h | 5 +- + arch/arm/kernel/Makefile | 2 - + arch/arm/kernel/iwmmxt.S | 51 ++++------------ + arch/arm/kernel/pj4-cp0.c | 135 ------------------------------------------ + arch/arm/kernel/traps.c | 2 +- + arch/arm/kernel/unwind.c | 2 + + arch/arm/mm/fault.c | 8 +++ + arch/arm/mm/init.c | 2 +- + 10 files changed, 30 insertions(+), 184 deletions(-) + delete mode 100644 arch/arm/kernel/pj4-cp0.c +Merging arm64/for-next/core (1d63d1d9e5c5 perf: starfive: fix 64-bit only COMPILE_TEST condition) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging arch/arm64/Kconfig +Merge made by the 'ort' strategy. + arch/arm64/Kconfig | 3 ++- + drivers/perf/Kconfig | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging arm-perf/for-next/perf (b037e40a6af2 docs: perf: Fix build warning of hisi-pcie-pmu.rst) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (72ebb41b88f9 soc: fsl: dpio: fix kcalloc() argument order) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +Merging amlogic/for-next (7092cfae086f Merge branch 'v6.9/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. +Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Already up to date. +Merging aspeed/for-next (0c30853731ec ARM: dts: aspeed: x4tf: Add dts for asus x4tf project) +$ 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/boot/dts/aspeed/aspeed-g6.dtsi +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 6 + + arch/arm/boot/dts/aspeed/Makefile | 8 +- + .../dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts | 322 ++++ + .../dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts | 324 ++++ + .../boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 377 +++++ + arch/arm/boot/dts/aspeed/aspeed-bmc-asus-x4tf.dts | 592 +++++++ + .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 620 ++++++++ + .../dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts | 265 ---- + .../dts/aspeed/aspeed-bmc-facebook-minerva.dts | 543 +++++++ + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 1623 ++++++++++++++++++++ + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 4 + + arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi | 2 + + 12 files changed, 4420 insertions(+), 266 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asus-x4tf.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts + delete mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +Merging at91/at91-next (6315946ad242 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 +Merge made by the 'ort' strategy. +Merging broadcom/next (bbfdba3d4757 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 (6613476e225e Linux 6.8-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 (e46076906722 memory: stm32-fmc2-ebi: keep power domain on) +$ 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 (edb0d16255f6 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 (ba90af39ba57 arm64: dts: mediatek: mt8183-pico6: Fix wake-on-X event node names) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Auto-merging arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +Merge made by the 'ort' strategy. + .../dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 8 +++---- + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 25 ++++++++++++---------- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 +- + drivers/soc/mediatek/Kconfig | 1 + + 4 files changed, 19 insertions(+), 17 deletions(-) +Merging mvebu/for-next (6b6f1082cb46 Merge branch 'mvebu/dt64' 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. +Merging omap/for-next (69f4343fc41d Merge branch 'omap-for-v6.9/n8x0-fixes' 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 +Auto-merging drivers/mmc/host/omap.c +Merge made by the 'ort' strategy. + arch/arm/mach-omap2/board-n8x0.c | 23 +++++++++---------- + drivers/mmc/host/omap.c | 48 ++++++++++++++++++++++++++-------------- + 2 files changed, 41 insertions(+), 30 deletions(-) +Merging qcom/for-next (2eb303d4add3 Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.8', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-for-6.9' and 'drivers-for-6.10' 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 arch/arm64/boot/dts/qcom/ipq8074.dtsi +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../bindings/soc/qcom/qcom,pmic-glink.yaml | 1 + + .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 83 ++++++------- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 19 +++ + arch/arm64/boot/dts/qcom/msm8953.dtsi | 14 +++ + arch/arm64/boot/dts/qcom/pm6150.dtsi | 46 ++++++++ + arch/arm64/boot/dts/qcom/qcm2290.dtsi | 56 ++++++++- + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 128 +++++++++++++++++++++ + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 41 +++++++ + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 60 ++++++++-- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 4 +- + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 57 ++++++--- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 50 +++++++- + arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 31 ++++- + arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 64 +++++++++++ + arch/arm64/boot/dts/qcom/sm6350.dtsi | 35 +++++- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 2 +- + .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 9 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 3 + + arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 + + arch/arm64/boot/dts/qcom/sm8650.dtsi | 8 +- + arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 42 +++++-- + arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi | 51 ++++++++ + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 22 ++++ + arch/arm64/boot/dts/qcom/x1e80100.dtsi | 48 +++++++- + arch/arm64/configs/defconfig | 2 + + drivers/firmware/qcom/qcom_scm.c | 23 ++-- + drivers/soc/qcom/cmd-db.c | 2 +- + drivers/soc/qcom/icc-bwmon.c | 8 +- + drivers/soc/qcom/qcom_stats.c | 4 + + drivers/soc/qcom/rpmh-rsc.c | 2 +- + drivers/soc/qcom/socinfo.c | 2 + + include/dt-bindings/arm/qcom,ids.h | 1 + + 33 files changed, 803 insertions(+), 123 deletions(-) + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi +Merging renesas/next (01fdf7d6f150 Merge branch 'renesas-dt-bindings-for-v6.9' 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. +Merging reset/reset/next (c721f189e89c reset: Instantiate reset GPIO controller for shared reset-gpios) +$ 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 (24f3ec49401a Merge branch 'v6.9-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. +Merging samsung-krzk/for-next (fb1be31d4042 Merge branches 'fixes', 'next/clk', 'next/drivers', 'next/dt', 'next/dt64' and 'next/soc' 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. +Merging scmi/for-linux-next (6d3e135e2055 Merge branches 'for-next/ffa/fixes' and 'for-next/scmi/fixes' 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/firmware/arm_ffa/driver.c | 2 +- + drivers/firmware/arm_scmi/powercap.c | 2 +- + drivers/firmware/arm_scmi/raw_mode.c | 7 ++++++- + 3 files changed, 8 insertions(+), 3 deletions(-) +Merging sophgo/for-next (0f46e1339ef1 MAINTAINERS: Setup proper info for SOPHGO vendor support) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Already up to date. +Merging stm32/stm32-next (a7b9ab6c880d arm64: dts: st: add video encoder support to stm32mp255) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (c1d7282e4e92 Merge branch 'sunxi/dt-for-6.9' 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 (90d35da658da Linux 6.8-rc7) +$ 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 (c85c30fad06d Merge branch for-6.9/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. +Merging ti/ti-next (68818060efdb Merge branch 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (2d81f5ef567c Merge remote-tracking branch 'git/zynqmp/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. +Merging clk/clk-next (3066c521be9d Merge branches 'clk-samsung', 'clk-imx', 'clk-rockchip', 'clk-clkdev' and 'clk-rate-exclusive' 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 +Already up to date. +Merging clk-imx/for-next (13269dc6c704 clk: imx: imx8mp: Fix SAI_MCLK_SEL definition) +$ 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 (81a7a88a9806 clk: renesas: r8a779h0: Add RPC-IF clock) +$ 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 +Already up to date. +Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ 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 (18b722527e2c Merge branch 'loongarch-kvm' into loongarch-next) +$ 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 arch/loongarch/Kconfig +CONFLICT (content): Merge conflict in arch/loongarch/Kconfig +Auto-merging arch/loongarch/Makefile +CONFLICT (content): Merge conflict in arch/loongarch/Makefile +Auto-merging arch/loongarch/include/asm/page.h +Auto-merging arch/loongarch/kernel/setup.c +Auto-merging include/linux/compiler.h +Auto-merging scripts/Makefile +Auto-merging tools/objtool/check.c +Resolved 'arch/loongarch/Kconfig' using previous resolution. +Resolved 'arch/loongarch/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a7b4fa0c32d7] Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git +$ git diff -M --stat --summary HEAD^.. + arch/loongarch/Kconfig | 8 + + arch/loongarch/Kconfig.debug | 11 + + arch/loongarch/Makefile | 23 +- + arch/loongarch/crypto/crc32-loongarch.c | 2 - + arch/loongarch/include/asm/Kbuild | 3 + + arch/loongarch/include/asm/bug.h | 1 + + arch/loongarch/include/asm/cacheflush.h | 3 - + arch/loongarch/include/asm/exception.h | 2 + + arch/loongarch/include/asm/io.h | 2 + + arch/loongarch/include/asm/module.h | 7 + + arch/loongarch/include/asm/orc_header.h | 18 + + arch/loongarch/include/asm/orc_lookup.h | 31 ++ + arch/loongarch/include/asm/orc_types.h | 58 +++ + arch/loongarch/include/asm/page.h | 3 + + arch/loongarch/include/asm/percpu.h | 7 +- + arch/loongarch/include/asm/pgtable.h | 3 - + arch/loongarch/include/asm/qspinlock.h | 18 - + arch/loongarch/include/asm/stackframe.h | 3 + + arch/loongarch/include/asm/thread_info.h | 2 + + arch/loongarch/include/asm/unwind.h | 20 +- + arch/loongarch/include/asm/unwind_hints.h | 28 ++ + arch/loongarch/kernel/Makefile | 4 + + arch/loongarch/kernel/entry.S | 5 + + arch/loongarch/kernel/fpu.S | 7 + + arch/loongarch/kernel/genex.S | 6 + + arch/loongarch/kernel/lbt.S | 3 + + arch/loongarch/kernel/mcount_dyn.S | 6 + + arch/loongarch/kernel/module.c | 22 +- + arch/loongarch/kernel/relocate_kernel.S | 7 +- + arch/loongarch/kernel/rethook_trampoline.S | 1 + + arch/loongarch/kernel/setup.c | 2 + + arch/loongarch/kernel/stacktrace.c | 41 ++ + arch/loongarch/kernel/traps.c | 42 +- + arch/loongarch/kernel/unwind_orc.c | 528 +++++++++++++++++++++ + arch/loongarch/kernel/vmlinux.lds.S | 3 + + arch/loongarch/kvm/switch.S | 9 +- + arch/loongarch/lib/clear_user.S | 3 + + arch/loongarch/lib/copy_user.S | 3 + + arch/loongarch/lib/memcpy.S | 3 + + arch/loongarch/lib/memset.S | 3 + + arch/loongarch/mm/tlb.c | 27 +- + arch/loongarch/mm/tlbex.S | 9 + + arch/loongarch/vdso/Makefile | 1 + + include/linux/compiler.h | 9 + + scripts/Makefile | 7 +- + tools/arch/loongarch/include/asm/inst.h | 161 +++++++ + tools/arch/loongarch/include/asm/orc_types.h | 58 +++ + tools/include/linux/bitops.h | 11 + + tools/objtool/Makefile | 4 + + tools/objtool/arch/loongarch/Build | 3 + + tools/objtool/arch/loongarch/decode.c | 356 ++++++++++++++ + .../objtool/arch/loongarch/include/arch/cfi_regs.h | 22 + + tools/objtool/arch/loongarch/include/arch/elf.h | 30 ++ + .../objtool/arch/loongarch/include/arch/special.h | 33 ++ + tools/objtool/arch/loongarch/orc.c | 171 +++++++ + tools/objtool/arch/loongarch/special.c | 15 + + tools/objtool/arch/x86/Build | 1 + + tools/objtool/arch/x86/orc.c | 188 ++++++++ + tools/objtool/check.c | 52 +- + tools/objtool/include/objtool/elf.h | 1 + + tools/objtool/include/objtool/orc.h | 14 + + tools/objtool/orc_dump.c | 69 +-- + tools/objtool/orc_gen.c | 113 +---- + 63 files changed, 2040 insertions(+), 266 deletions(-) + create mode 100644 arch/loongarch/include/asm/orc_header.h + create mode 100644 arch/loongarch/include/asm/orc_lookup.h + create mode 100644 arch/loongarch/include/asm/orc_types.h + delete mode 100644 arch/loongarch/include/asm/qspinlock.h + create mode 100644 arch/loongarch/include/asm/unwind_hints.h + create mode 100644 arch/loongarch/kernel/unwind_orc.c + create mode 100644 tools/arch/loongarch/include/asm/inst.h + create mode 100644 tools/arch/loongarch/include/asm/orc_types.h + create mode 100644 tools/objtool/arch/loongarch/Build + create mode 100644 tools/objtool/arch/loongarch/decode.c + create mode 100644 tools/objtool/arch/loongarch/include/arch/cfi_regs.h + create mode 100644 tools/objtool/arch/loongarch/include/arch/elf.h + create mode 100644 tools/objtool/arch/loongarch/include/arch/special.h + create mode 100644 tools/objtool/arch/loongarch/orc.c + create mode 100644 tools/objtool/arch/loongarch/special.c + create mode 100644 tools/objtool/arch/x86/orc.c + create mode 100644 tools/objtool/include/objtool/orc.h +Merging m68k/for-next (e8a7824856de m68k: defconfig: Update defconfigs for v6.8-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (b401b621758e Linux 6.8-rc5) +$ 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 (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (732932220078 mips: cm: Convert __mips_cm_phys_base() to weak function) +$ 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 (7f1e2fc49348 openrisc: Use asm-generic's version of fix_to_virt() & virt_to_fix()) +$ 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 (e8f897f4afef Linux 6.8) +$ 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 (5c4233cc0920 powerpc/kdump: Split KEXEC_CORE and CRASH_DUMP dependency) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Merge made by the 'ort' strategy. + arch/powerpc/Kconfig | 9 +- + arch/powerpc/include/asm/kexec.h | 98 ++++++------- + arch/powerpc/kernel/prom.c | 2 +- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kernel/smp.c | 4 +- + arch/powerpc/kexec/Makefile | 3 +- + arch/powerpc/kexec/core.c | 4 + + arch/powerpc/kexec/elf_64.c | 4 +- + arch/powerpc/kexec/file_load_64.c | 269 ++++++++++++++++++----------------- + arch/powerpc/mm/book3s32/mmu.c | 7 +- + arch/powerpc/mm/mmu_decl.h | 8 +- + arch/powerpc/mm/nohash/8xx.c | 33 +++-- + arch/powerpc/mm/nohash/e500.c | 10 +- + arch/powerpc/mm/pgtable_32.c | 38 +++-- + arch/powerpc/platforms/powernv/smp.c | 2 +- + include/linux/crash_core.h | 12 +- + 16 files changed, 274 insertions(+), 231 deletions(-) +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 (099dbac6e90c Merge patch series "riscv: Use Kconfig to set unaligned access speed") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging Documentation/devicetree/bindings/riscv/cpus.yaml +Auto-merging MAINTAINERS +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/boot/dts/renesas/r9a07g043f.dtsi +Auto-merging arch/riscv/include/asm/bitops.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/bitops.h +Auto-merging arch/riscv/include/asm/cpufeature.h +Auto-merging arch/riscv/include/asm/hwcap.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/tlb.h +Auto-merging arch/riscv/kernel/Makefile +Auto-merging arch/riscv/kernel/cpufeature.c +Auto-merging arch/riscv/kernel/smpboot.c +Auto-merging arch/riscv/lib/csum.c +Auto-merging arch/riscv/mm/init.c +Auto-merging crypto/Kconfig +Auto-merging drivers/perf/Kconfig +CONFLICT (content): Merge conflict in drivers/perf/Kconfig +Auto-merging drivers/perf/riscv_pmu_sbi.c +Auto-merging include/linux/mm.h +Auto-merging init/Kconfig +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/membarrier.c +Auto-merging mm/mmap.c +Resolved 'arch/riscv/include/asm/bitops.h' using previous resolution. +Recorded preimage for 'drivers/perf/Kconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/perf/Kconfig'. +[master ba23cc04ce04] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/riscv/cpus.yaml | 6 +- + .../devicetree/bindings/riscv/extensions.yaml | 7 + + .../sched/membarrier-sync-core/arch-support.txt | 18 +- + Documentation/scheduler/index.rst | 1 + + Documentation/scheduler/membarrier.rst | 39 ++ + MAINTAINERS | 4 +- + arch/riscv/Kbuild | 1 + + arch/riscv/Kconfig | 80 ++- + arch/riscv/Makefile | 5 + + arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 4 +- + arch/riscv/configs/defconfig | 2 + + arch/riscv/crypto/Kconfig | 93 ++++ + arch/riscv/crypto/Makefile | 23 + + arch/riscv/crypto/aes-macros.S | 156 ++++++ + arch/riscv/crypto/aes-riscv64-glue.c | 550 +++++++++++++++++++++ + arch/riscv/crypto/aes-riscv64-zvkned-zvbb-zvkg.S | 312 ++++++++++++ + arch/riscv/crypto/aes-riscv64-zvkned-zvkb.S | 146 ++++++ + arch/riscv/crypto/aes-riscv64-zvkned.S | 180 +++++++ + arch/riscv/crypto/chacha-riscv64-glue.c | 101 ++++ + arch/riscv/crypto/chacha-riscv64-zvkb.S | 294 +++++++++++ + arch/riscv/crypto/ghash-riscv64-glue.c | 168 +++++++ + arch/riscv/crypto/ghash-riscv64-zvkg.S | 72 +++ + arch/riscv/crypto/sha256-riscv64-glue.c | 137 +++++ + .../crypto/sha256-riscv64-zvknha_or_zvknhb-zvkb.S | 225 +++++++++ + arch/riscv/crypto/sha512-riscv64-glue.c | 133 +++++ + arch/riscv/crypto/sha512-riscv64-zvknhb-zvkb.S | 203 ++++++++ + arch/riscv/crypto/sm3-riscv64-glue.c | 112 +++++ + arch/riscv/crypto/sm3-riscv64-zvksh-zvkb.S | 123 +++++ + arch/riscv/crypto/sm4-riscv64-glue.c | 107 ++++ + arch/riscv/crypto/sm4-riscv64-zvksed-zvkb.S | 117 +++++ + arch/riscv/errata/andes/errata.c | 10 +- + arch/riscv/include/asm/asm.h | 10 + + arch/riscv/include/asm/bitops.h | 138 +----- + arch/riscv/include/asm/cpufeature.h | 31 +- + arch/riscv/include/asm/errata_list.h | 13 +- + arch/riscv/include/asm/hwcap.h | 1 + + arch/riscv/include/asm/membarrier.h | 50 ++ + arch/riscv/include/asm/pgalloc.h | 67 ++- + arch/riscv/include/asm/pgtable.h | 8 + + arch/riscv/include/asm/sync_core.h | 29 ++ + arch/riscv/include/asm/tlb.h | 18 + + arch/riscv/include/asm/vector.h | 11 + + arch/riscv/include/asm/vendorid_list.h | 2 +- + arch/riscv/kernel/Makefile | 4 +- + arch/riscv/kernel/alternative.c | 2 +- + arch/riscv/kernel/cpufeature.c | 256 +--------- + arch/riscv/kernel/entry.S | 3 + + arch/riscv/kernel/pi/Makefile | 3 + + arch/riscv/kernel/smpboot.c | 1 - + arch/riscv/kernel/sys_hwprobe.c | 13 + + arch/riscv/kernel/traps.c | 17 +- + arch/riscv/kernel/traps_misaligned.c | 17 +- + arch/riscv/kernel/unaligned_access_speed.c | 282 +++++++++++ + arch/riscv/lib/csum.c | 7 +- + arch/riscv/lib/uaccess_vector.S | 1 - + arch/riscv/mm/context.c | 2 + + arch/riscv/mm/init.c | 6 + + crypto/Kconfig | 3 + + drivers/clocksource/timer-clint.c | 2 +- + drivers/clocksource/timer-riscv.c | 2 +- + drivers/perf/Kconfig | 14 + + drivers/perf/riscv_pmu_sbi.c | 37 +- + include/asm-generic/bitops/__ffs.h | 8 +- + include/asm-generic/bitops/__fls.h | 8 +- + include/asm-generic/bitops/ffs.h | 8 +- + include/asm-generic/bitops/fls.h | 8 +- + include/linux/mm.h | 2 +- + include/linux/sync_core.h | 16 +- + init/Kconfig | 3 + + kernel/sched/core.c | 16 +- + kernel/sched/membarrier.c | 13 +- + mm/mmap.c | 2 +- + .../pmu-events/arch/riscv/andes/ax45/firmware.json | 68 +++ + .../arch/riscv/andes/ax45/instructions.json | 127 +++++ + .../pmu-events/arch/riscv/andes/ax45/memory.json | 57 +++ + .../arch/riscv/andes/ax45/microarch.json | 77 +++ + tools/perf/pmu-events/arch/riscv/mapfile.csv | 1 + + 77 files changed, 4409 insertions(+), 484 deletions(-) + create mode 100644 Documentation/scheduler/membarrier.rst + create mode 100644 arch/riscv/crypto/Kconfig + create mode 100644 arch/riscv/crypto/Makefile + create mode 100644 arch/riscv/crypto/aes-macros.S + create mode 100644 arch/riscv/crypto/aes-riscv64-glue.c + create mode 100644 arch/riscv/crypto/aes-riscv64-zvkned-zvbb-zvkg.S + create mode 100644 arch/riscv/crypto/aes-riscv64-zvkned-zvkb.S + create mode 100644 arch/riscv/crypto/aes-riscv64-zvkned.S + create mode 100644 arch/riscv/crypto/chacha-riscv64-glue.c + create mode 100644 arch/riscv/crypto/chacha-riscv64-zvkb.S + create mode 100644 arch/riscv/crypto/ghash-riscv64-glue.c + create mode 100644 arch/riscv/crypto/ghash-riscv64-zvkg.S + create mode 100644 arch/riscv/crypto/sha256-riscv64-glue.c + create mode 100644 arch/riscv/crypto/sha256-riscv64-zvknha_or_zvknhb-zvkb.S + create mode 100644 arch/riscv/crypto/sha512-riscv64-glue.c + create mode 100644 arch/riscv/crypto/sha512-riscv64-zvknhb-zvkb.S + create mode 100644 arch/riscv/crypto/sm3-riscv64-glue.c + create mode 100644 arch/riscv/crypto/sm3-riscv64-zvksh-zvkb.S + create mode 100644 arch/riscv/crypto/sm4-riscv64-glue.c + create mode 100644 arch/riscv/crypto/sm4-riscv64-zvksed-zvkb.S + create mode 100644 arch/riscv/include/asm/membarrier.h + create mode 100644 arch/riscv/include/asm/sync_core.h + create mode 100644 arch/riscv/kernel/unaligned_access_speed.c + create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/firmware.json + create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/instructions.json + create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/memory.json + create mode 100644 tools/perf/pmu-events/arch/riscv/andes/ax45/microarch.json +Merging riscv-dt/riscv-dt-for-next (28ecaaa5af19 riscv: dts: starfive: jh7110: Add camera subsystem nodes) +$ 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 (6613476e225e Linux 6.8-rc1) +$ 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 +Already up to date. +Merging s390/for-next (64c3431808bd s390/entry: compare gmap asce to determine guest/host fault) +$ 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 (0a2d3ce0031f sh: hd64461: Make setup_hd64461 static) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Merge made by the 'ort' strategy. + arch/sh/cchips/hd6446x/hd64461.c | 2 +- + arch/sh/drivers/dma/dma-sysfs.c | 2 +- + drivers/sh/intc/core.c | 2 +- + drivers/sh/intc/internals.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging sparc/for-next (84b76d05828a lib/fonts: Allow Sparc console 8x16 font for sparc64 early boot text console) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (83aec96c631e um: Mark 32bit syscall helpers as clobbering memory) +$ 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 (7ab7acb68adf xtensa: fix MAKE_PC_FROM_RA second argument) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/include/asm/processor.h | 8 ++++---- + arch/xtensa/include/asm/ptrace.h | 2 +- + arch/xtensa/kernel/process.c | 5 +++-- + arch/xtensa/kernel/stacktrace.c | 3 ++- + 4 files changed, 10 insertions(+), 8 deletions(-) +Merging bcachefs/for-next (2e92d26b2543 bcachefs: Fix lost wakeup on journal shutdown) +$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next +Auto-merging fs/bcachefs/super-io.c +Merge made by the 'ort' strategy. + fs/bcachefs/alloc_background.c | 15 +++++++------ + fs/bcachefs/alloc_foreground.c | 10 +++++---- + fs/bcachefs/bcachefs.h | 2 ++ + fs/bcachefs/btree_gc.c | 2 +- + fs/bcachefs/btree_io.c | 12 +++++----- + fs/bcachefs/btree_key_cache.c | 2 +- + fs/bcachefs/btree_update_interior.c | 44 ++++++++++++++++++++++++------------- + fs/bcachefs/btree_update_interior.h | 1 + + fs/bcachefs/btree_write_buffer.c | 2 +- + fs/bcachefs/buckets.c | 6 ++--- + fs/bcachefs/debug.c | 2 +- + fs/bcachefs/ec.c | 6 ++--- + fs/bcachefs/error.h | 4 ++-- + fs/bcachefs/extents.h | 6 ++--- + fs/bcachefs/fs.c | 3 ++- + fs/bcachefs/fsck.c | 33 ++++++++++++++++++++-------- + fs/bcachefs/journal.c | 12 +++++----- + fs/bcachefs/journal_io.c | 15 ++++++------- + fs/bcachefs/logged_ops.c | 4 ++-- + fs/bcachefs/movinggc.c | 3 +-- + fs/bcachefs/recovery.c | 6 ++++- + fs/bcachefs/recovery_types.h | 2 +- + fs/bcachefs/snapshot.c | 32 +++++++++++++++------------ + fs/bcachefs/super-io.c | 8 +++---- + fs/bcachefs/super.c | 33 ++++++++++++++-------------- + fs/bcachefs/util.h | 3 +++ + 26 files changed, 157 insertions(+), 111 deletions(-) +Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging fscrypt/for-next (8c62f31eddb7 fscrypt: shrink the size of struct fscrypt_inode_info slightly) +$ 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 (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (18f539b4e9d2 Merge branch 'for-next-next-v6.9-20240318' into for-next-20240318) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. + fs/btrfs/block-group.c | 3 ++- + fs/btrfs/ctree.c | 12 +++++------ + fs/btrfs/extent-tree.c | 2 +- + fs/btrfs/locking.c | 16 +++----------- + fs/btrfs/locking.h | 18 ++++++++++++---- + fs/btrfs/transaction.c | 2 -- + fs/btrfs/volumes.c | 58 ++++++++++++++++++++++++++++++++++++++++---------- + 7 files changed, 73 insertions(+), 38 deletions(-) +Merging ceph/master (825b82f6b82a ceph: set correct cap mask for getattr request for read) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Auto-merging fs/ceph/super.c +CONFLICT (content): Merge conflict in fs/ceph/super.c +Resolved 'fs/ceph/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ea024bc65cb4] Merge branch 'master' of git://github.com/ceph/ceph-client.git +$ git diff -M --stat --summary HEAD^.. + fs/ceph/caps.c | 8 ++++++++ + fs/ceph/file.c | 31 ++++++++++++++++++------------- + 2 files changed, 26 insertions(+), 13 deletions(-) +Merging cifs/for-next (354c620afff2 smb311: additional compression flag defined in updated protocol spec) +$ 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/cached_dir.c | 3 ++- + fs/smb/client/cifsfs.c | 4 ---- + fs/smb/client/cifsglob.h | 5 +++++ + fs/smb/client/connect.c | 9 +++++---- + fs/smb/client/file.c | 20 +++++++++++++++----- + fs/smb/client/inode.c | 26 +++++++++++++------------- + fs/smb/client/misc.c | 3 --- + fs/smb/client/sess.c | 4 ++-- + fs/smb/client/smb2ops.c | 2 ++ + fs/smb/client/smb2pdu.c | 5 +++-- + fs/smb/common/smb2pdu.h | 12 +++++++----- + 11 files changed, 54 insertions(+), 39 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at ea024bc65cb4 Merge branch 'master' of git://github.com/ceph/ceph-client.git +Merging next-20240319 version of cifs +$ git merge -m next-20240319/cifs 1b552a9c49e6c31d5948da7957be72b0133c0695 +Merge made by the 'ort' strategy. + fs/smb/client/cached_dir.c | 3 ++- + fs/smb/client/cifsfs.c | 4 ---- + fs/smb/client/cifsglob.h | 5 +++++ + fs/smb/client/connect.c | 9 +++++---- + fs/smb/client/file.c | 20 +++++++++++++++----- + fs/smb/client/inode.c | 26 +++++++++++++------------- + fs/smb/client/misc.c | 3 --- + fs/smb/client/sess.c | 4 ++-- + fs/smb/client/smb2ops.c | 2 ++ + fs/smb/client/smb2pdu.c | 5 +++-- + 10 files changed, 47 insertions(+), 34 deletions(-) +Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Auto-merging fs/configfs/inode.c +Merge made by the 'ort' strategy. + fs/configfs/configfs_internal.h | 4 ++-- + fs/configfs/dir.c | 42 +++++++++++++++++++++++++++++++---------- + fs/configfs/inode.c | 24 ----------------------- + 3 files changed, 34 insertions(+), 36 deletions(-) +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 (a1bafc3109d7 erofs: support compressed inodes over fscache) +$ 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 (dc38fdc51ba6 exfat: remove duplicate update parent dir) +$ 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 | 290 ++++++++++++++++++++++--------------------- + fs/exfat/exfat_fs.h | 25 ++-- + fs/exfat/inode.c | 2 +- + fs/exfat/namei.c | 348 ++++++++++++++++++++-------------------------------- + 4 files changed, 291 insertions(+), 374 deletions(-) +Merging exportfs/exportfs-next (42c3732fa807 fs: Create a generic is_dot_dotdot() utility) +$ git merge -m Merge branch 'exportfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs/exportfs-next +Already up to date. +Merging ext3/for_next (9d7d0eb685f1 Pull fanotify fix to allow freezing of tasks waiting for event response.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (0ecae5410ab5 ext4: initialize sbi->s_freeclusters_counter and sbi->s_dirtyclusters_counter before use in kunit test) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (bf3a69c6861f Merge tag 'for-linus-6.9-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/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 (8e43fb06e10d fsverity: remove hash page spin lock) +$ 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 (cdf6ac2a03d2 fuse: get rid of ff->readdir.lock) +$ 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 (6f18f897e3ff gfs2: Remove unnecessary gfs2_meta_check_ii argument) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/bmap.c +Merge made by the 'ort' strategy. + fs/gfs2/bmap.c | 7 ++++--- + fs/gfs2/log.c | 3 ++- + fs/gfs2/rgrp.c | 10 +++++----- + fs/gfs2/super.c | 4 ++++ + fs/gfs2/util.c | 54 ++++++++++++++++++++++++++++-------------------------- + fs/gfs2/util.h | 4 ++-- + 6 files changed, 45 insertions(+), 37 deletions(-) +Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin") +$ 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 (def30e72d8ab ksmbd: remove module version) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Auto-merging fs/smb/server/smb2pdu.c +Auto-merging fs/smb/server/vfs.c +Merge made by the 'ort' strategy. + fs/smb/server/glob.h | 2 - + fs/smb/server/ksmbd_netlink.h | 1 + + fs/smb/server/mgmt/user_session.c | 28 ++- + fs/smb/server/mgmt/user_session.h | 3 + + fs/smb/server/oplock.c | 96 +++++-- + fs/smb/server/oplock.h | 7 +- + fs/smb/server/server.c | 1 - + fs/smb/server/smb2misc.c | 26 +- + fs/smb/server/smb2ops.c | 6 + + fs/smb/server/smb2pdu.c | 509 +++++++++++++++++++++++++++++--------- + fs/smb/server/smb2pdu.h | 15 ++ + fs/smb/server/smb_common.c | 11 +- + fs/smb/server/vfs.c | 12 +- + fs/smb/server/vfs_cache.c | 137 +++++++++- + fs/smb/server/vfs_cache.h | 9 + + 15 files changed, 716 insertions(+), 147 deletions(-) +Merging nfs/linux-next (719fcafe07c1 nfs: fix panic when nfs4_ff_layout_prepare_ds() fails) +$ 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 (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (9b350d3e349f NFSD: Clean up nfsd4_encode_replay()) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Already up to date. +Merging ntfs3/master (622cd3daa8ea fs/ntfs3: Slightly simplify ntfs_inode_printk()) +$ 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 (9bf93dcfc453 Julia Lawall reported this null pointer dereference, this should fix it.) +$ 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 (d17bb4620f90 overlayfs.rst: fix ReST formatting) +$ 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 (b8a77b9a5f9c mtd: ubi: fix NVMEM over UBI volumes on 32-bit systems) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging MAINTAINERS +Auto-merging drivers/mtd/ubi/block.c +Auto-merging fs/ubifs/dir.c +Auto-merging fs/ubifs/super.c +Merge made by the 'ort' strategy. + .../bindings/mtd/partitions/linux,ubi.yaml | 75 ++++ + .../bindings/mtd/partitions/ubi-volume.yaml | 40 ++ + Documentation/mm/page_cache.rst | 10 + + MAINTAINERS | 2 + + drivers/mtd/ubi/Kconfig | 13 + + drivers/mtd/ubi/Makefile | 1 + + drivers/mtd/ubi/block.c | 136 +++---- + drivers/mtd/ubi/build.c | 168 +++++--- + drivers/mtd/ubi/eba.c | 7 + + drivers/mtd/ubi/fastmap.c | 7 +- + drivers/mtd/ubi/kapi.c | 56 ++- + drivers/mtd/ubi/nvmem.c | 191 +++++++++ + drivers/mtd/ubi/ubi.h | 3 + + drivers/mtd/ubi/vmt.c | 75 +++- + drivers/mtd/ubi/vtbl.c | 6 + + fs/ubifs/debug.c | 9 +- + fs/ubifs/dir.c | 2 + + fs/ubifs/file.c | 443 ++++++++++----------- + fs/ubifs/find.c | 32 +- + fs/ubifs/journal.c | 171 +++++++- + fs/ubifs/lprops.c | 6 +- + fs/ubifs/lpt_commit.c | 1 - + fs/ubifs/super.c | 2 + + fs/ubifs/tnc.c | 9 +- + fs/ubifs/tnc_misc.c | 22 + + fs/ubifs/ubifs.h | 5 + + include/linux/mtd/ubi.h | 2 + + 27 files changed, 1067 insertions(+), 427 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/linux,ubi.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/ubi-volume.yaml + create mode 100644 drivers/mtd/ubi/nvmem.c +Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Merge made by the 'ort' strategy. + net/9p/client.c | 10 +++++----- + net/9p/trans_fd.c | 1 - + 2 files changed, 5 insertions(+), 6 deletions(-) +Merging v9fs-ericvh/ericvh/for-next (acade3ac5c19 fs/9p: remove redundant pointer v9ses) +$ 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 +Merge made by the 'ort' strategy. + fs/9p/vfs_inode_dotl.c | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) +Merging xfs/for-next (0c6ca06aad84 xfs: quota radix tree allocations need to be NOFS on insert) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/xfs_buf_mem.c | 4 ++-- + fs/xfs/xfs_dquot.c | 18 +++++++++++++----- + fs/xfs/xfs_trace.h | 9 +++++++-- + 3 files changed, 22 insertions(+), 9 deletions(-) +Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api) +$ 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 (3ac974796e5d iomap: fix short copy in iomap_write_iter()) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (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 (70f0231d2dc2 Merge branch 'vfs.misc' 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/bcachefs/fs.c +Auto-merging fs/ext4/super.c +Merge made by the 'ort' strategy. + fs/bcachefs/fs.c | 3 +++ + fs/btrfs/inode.c | 3 +++ + fs/ext4/super.c | 4 ---- + fs/overlayfs/params.c | 4 ---- + fs/proc/proc_net.c | 1 + + fs/stat.c | 1 + + include/linux/fs_parser.h | 4 ++++ + include/linux/stat.h | 1 + + include/uapi/linux/stat.h | 4 +++- + 9 files changed, 16 insertions(+), 9 deletions(-) +Merging vfs/for-next (052d534373b7 Merge tag 'exfat-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merging printk/for-next (a2b4cab9da77 Merge branch 'for-6.10' 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 +Auto-merging kernel/printk/printk.c +Merge made by the 'ort' strategy. + include/linux/ceph/ceph_debug.h | 18 +++++++----------- + include/linux/dev_printk.h | 25 +++++++++++++------------ + include/linux/dynamic_debug.h | 4 ++-- + include/linux/printk.h | 2 +- + kernel/printk/printk.c | 6 ++++++ + 5 files changed, 29 insertions(+), 26 deletions(-) +Merging pci/next (705c1da8fa48 Merge tag 'pci-v6.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ 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 (c8d25d696f52 pstore/zone: Don't clear memory twice) +$ 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 (f0cd2e82460c Merge branch 'for-6.9/amd-sfh' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. +Merging i2c/i2c/for-next (91962feb9502 Merge tag 'i2c-host-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-mergewindow) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Already up to date. +Merging i2c-host/i2c/i2c-host (bb271301b804 i2c: nomadik: sort includes) +$ git merge -m Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/st,nomadik-i2c.yaml | 49 +- + drivers/i2c/busses/i2c-nomadik.c | 740 ++++++++++++--------- + 2 files changed, 475 insertions(+), 314 deletions(-) +Merging i3c/i3c/next (8f06fb458539 i3c: Make i3c_bus_type const) +$ 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 hwmon-staging/hwmon-next (8debe3c1295e hwmon: (dell-smm) Add XPS 9315 to fan control whitelist) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (b8cfda5c9065 docs: verify/bisect: remove a level of indenting) +$ 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/admin-guide/cifs/introduction.rst | 2 +- + .../admin-guide/reporting-regressions.rst | 2 +- + .../verify-bugs-and-bisect-regressions.rst | 381 +++++++++++---------- + Documentation/process/handling-regressions.rst | 12 +- + README | 2 +- + 5 files changed, 216 insertions(+), 183 deletions(-) +Merging v4l-dvb/master (b14257abe705 media: rcar-isp: Disallow unbind of devices) +$ 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 (b14257abe705 media: rcar-isp: Disallow unbind of devices) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (fbd88dd05780 Merge tag 'pm-6.9-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Already up to date. +Merging cpufreq-arm/cpufreq/arm/linux-next (a8e949d41c72 cpufreq: scmi: Enable boost support) +$ 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 +Already up to date. +Merging cpupower/cpupower (a114d9f1f2cf Fix cpupower-frequency-info.1 man page typo) +$ 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 (68a8582befd4 PM / devfreq: rk3399_dmc: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/event/exynos-nocp.c | 6 ++---- + drivers/devfreq/event/exynos-ppmu.c | 6 ++---- + drivers/devfreq/mtk-cci-devfreq.c | 6 ++---- + drivers/devfreq/rk3399_dmc.c | 6 ++---- + drivers/devfreq/sun8i-a33-mbus.c | 6 ++---- + 5 files changed, 10 insertions(+), 20 deletions(-) +Merging pmdomain/next (ccabbb6768fc pmdomain: renesas: rcar-gen4-sysc: Reduce atomic delays) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Already up to date. +Merging opp/opp/linux-next (13c8cf339e1a dt-bindings: opp: drop maxItems from inner items) +$ 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 (1828c1c17bb2 thermal/drivers/rcar_gen3: Add support for R-Car V4M) +$ 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 (c53309b912fd dlm: add comments about forced waiters reset) +$ 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 (96d9cbe2f2ff RDMA/cm: add timeout to cm_destroy_id wait) +$ 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 (237bb5f7f7f5 cxgb4: unnecessary check for 0 in the free_sge_txq_uld() function) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Merge made by the 'ort' strategy. + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 2 -- + 2 files changed, 1 insertion(+), 3 deletions(-) +Merging bpf-next/for-next (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ 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 +Already up to date. +Merging ipsec-next/master (aceb147b20a2 xfrm: Do not allocate stats in the driver) +$ 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 (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device) +$ 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 (ed1f164038b5 Merge 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 (ed1f164038b5 Merge 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/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (f4a0fc6780c7 Bluetooth: Add support for MediaTek MT7922 device) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btintel.c | 50 ++++++++++++++++++++++++++++++++++++++------- + drivers/bluetooth/btintel.h | 6 ++++++ + drivers/bluetooth/btusb.c | 5 +++++ + 3 files changed, 54 insertions(+), 7 deletions(-) +Merging wireless-next/for-next (c2b25092864a Merge branch 'qmc-hdlc') +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ 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 (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ 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 (09888e973cc9 Merge tag 'nand/for-6.9' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (4120aa0e3961 mtd: rawnand: Ensure continuous reads are well disabled) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (6a9eda34418f mtd: spi-nor: core: set mtd->eraseregions for non-uniform erase map) +$ 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 (6a8dbd71a706 Revert "crypto: remove CONFIG_CRYPTO_STATS") +$ 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 (02ac43711111 Merge tag 'drm-misc-next-fixes-2024-03-14' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging drivers/gpu/drm/drm_probe_helper.c +Auto-merging drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c +Auto-merging drivers/gpu/drm/xe/xe_trace.h +Auto-merging drivers/gpu/drm/xe/xe_vm.c +Auto-merging drivers/gpu/drm/xe/xe_vm_types.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/bridge/lontium-lt8912b.c | 16 +++++----- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 2 +- + drivers/gpu/drm/drm_panel.c | 17 +++++++---- + drivers/gpu/drm/drm_probe_helper.c | 7 +++++ + drivers/gpu/drm/exynos/exynos_dp.c | 7 ++--- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 +-- + drivers/gpu/drm/exynos/exynos_hdmi.c | 4 +-- + drivers/gpu/drm/imx/ipuv3/parallel-display.c | 4 +-- + drivers/gpu/drm/nouveau/nouveau_bo.c | 2 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 9 ++++++ + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- + drivers/gpu/drm/xe/xe_exec.c | 41 +++++++++++++++----------- + drivers/gpu/drm/xe/xe_gt_pagefault.c | 4 +-- + drivers/gpu/drm/xe/xe_trace.h | 2 +- + drivers/gpu/drm/xe/xe_vm.c | 32 +++++++++++++++----- + drivers/gpu/drm/xe/xe_vm_types.h | 7 ++--- + drivers/gpu/drm/xe/xe_vram_freq.c | 4 ++- + include/drm/drm_modeset_helper_vtables.h | 3 +- + 18 files changed, 104 insertions(+), 63 deletions(-) +Merging drm-exynos/for-linux-next (119b225f01e4 Merge tag 'amd-drm-next-6.9-2024-03-08-1' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (5d4e8ae6e57b nouveau/gsp: don't check devinit disable on GSP.) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/Kconfig +Merge made by the 'ort' strategy. + drivers/gpu/drm/Kconfig | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/r535.c | 1 - + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- + include/drm/drm_bridge.h | 4 ++-- + include/drm/drm_fixed.h | 3 +-- + 5 files changed, 5 insertions(+), 7 deletions(-) +Merging amdgpu/drm-next (a0ce9e50f51e drm/amd/display: Set the power_down_on_boot function pointer to null) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 18 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 33 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 12 - + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 17 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 15 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 3 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 6 + + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 7 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 8 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 6 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 14 +- + drivers/gpu/drm/amd/display/Makefile | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 22 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 2 +- + drivers/gpu/drm/amd/display/dc/Makefile | 2 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 14 + + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 823 +++++++++++++++------ + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 37 + + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc.h | 174 +++-- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 94 +++ + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 4 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 14 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 2 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 1 + + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.h | 2 + + .../amd/display/dc/dml2/dml2_translation_helper.c | 18 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 28 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 3 + + drivers/gpu/drm/amd/display/dc/dpp/Makefile | 77 ++ + .../drm/amd/display/dc/dpp/dcn10/CMakeLists.txt | 6 + + .../drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.c | 2 +- + .../drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.h | 0 + .../amd/display/dc/{ => dpp}/dcn10/dcn10_dpp_cm.c | 4 +- + .../display/dc/{ => dpp}/dcn10/dcn10_dpp_dscl.c | 2 +- + .../drm/amd/display/dc/dpp/dcn20/CMakeLists.txt | 5 + + .../drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.c | 2 +- + .../drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.h | 0 + .../amd/display/dc/{ => dpp}/dcn20/dcn20_dpp_cm.c | 2 +- + .../drm/amd/display/dc/dpp/dcn201/CMakeLists.txt | 4 + + .../amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.c | 2 +- + .../amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.h | 0 + .../drm/amd/display/dc/dpp/dcn30/CMakeLists.txt | 5 + + .../drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.c | 4 +- + .../drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.h | 0 + .../amd/display/dc/{ => dpp}/dcn30/dcn30_dpp_cm.c | 4 +- + .../drm/amd/display/dc/dpp/dcn32/CMakeLists.txt | 4 + + .../drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.c | 2 +- + .../drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.h | 0 + .../drm/amd/display/dc/dpp/dcn35/CMakeLists.txt | 4 + + .../drm/amd/display/dc/{ => dpp}/dcn35/dcn35_dpp.c | 2 +- + .../drm/amd/display/dc/{ => dpp}/dcn35/dcn35_dpp.h | 0 + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 55 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 30 + + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.h | 2 + + .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 2 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 28 + + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 3 + + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 5 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 24 +- + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 3 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 8 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 4 + + .../dc/link/protocols/link_edp_panel_control.c | 4 +- + .../dc/link/protocols/link_edp_panel_control.h | 4 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 9 +- + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 8 + + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.h | 1 + + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 165 ++++- + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.h | 6 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 3 + + .../amd/display/dc/resource/dcn32/dcn32_resource.h | 3 + + .../display/dc/resource/dcn321/dcn321_resource.c | 2 + + .../amd/display/dc/resource/dcn35/dcn35_resource.h | 2 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 56 +- + .../drm/amd/display/include/link_service_types.h | 1 - + drivers/gpu/drm/amd/display/include/logger_types.h | 1 + + .../drm/amd/display/modules/freesync/freesync.c | 6 +- + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.c | 10 + + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 3 + + drivers/gpu/drm/amd/display/modules/inc/mod_hdcp.h | 8 + + .../drm/amd/display/modules/power/power_helpers.c | 2 +- + .../drm/amd/display/modules/power/power_helpers.h | 2 +- + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 4 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 37 + + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 19 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 19 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 31 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 18 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 18 +- + 134 files changed, 1817 insertions(+), 564 deletions(-) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn10/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp_cm.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp_dscl.c (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn20/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp_cm.c (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn201/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn30/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp_cm.c (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn32/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn35/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn35/dcn35_dpp.c (98%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn35/dcn35_dpp.h (100%) +Merging drm-intel/for-linux-next (4df6ac223cad drm/i915: Add includes for BUG_ON/BUILD_BUG_ON in i915_memcpy.c) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_display_power_well.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_display_power_well.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging include/uapi/drm/i915_drm.h +Resolved 'drivers/gpu/drm/i915/display/intel_display_power_well.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9b8e21a84668] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/display/drm_dp_tunnel.c | 7 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 2 - + drivers/gpu/drm/i915/display/icl_dsi.c | 6 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 6 +- + drivers/gpu/drm/i915/display/intel_bios.c | 238 ++++++++++----- + drivers/gpu/drm/i915/display/intel_bw.h | 3 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 126 ++++++-- + drivers/gpu/drm/i915/display/intel_cdclk.h | 11 +- + .../gpu/drm/i915/display/intel_combo_phy_regs.h | 116 ++++---- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 330 ++++++++++----------- + drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- + drivers/gpu/drm/i915/display/intel_display.c | 239 +++++++-------- + .../drm/i915/display/intel_display_power_well.c | 58 ++-- + drivers/gpu/drm/i915/display/intel_display_types.h | 14 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 8 - + drivers/gpu/drm/i915/display/intel_dmc.c | 9 +- + drivers/gpu/drm/i915/display/intel_dp.c | 13 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 10 +- + drivers/gpu/drm/i915/display/intel_dp_aux.h | 1 + + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 107 +++---- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 2 + + drivers/gpu/drm/i915/display/intel_drrs.c | 14 +- + drivers/gpu/drm/i915/display/intel_drrs.h | 3 + + drivers/gpu/drm/i915/display/intel_dsb.c | 15 + + drivers/gpu/drm/i915/display/intel_fbc.c | 32 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 58 +--- + drivers/gpu/drm/i915/display/intel_opregion.h | 6 + + drivers/gpu/drm/i915/display/intel_overlay.c | 7 +- + drivers/gpu/drm/i915/display/intel_pmdemand.h | 5 +- + drivers/gpu/drm/i915/display/intel_psr.c | 46 ++- + drivers/gpu/drm/i915/display/intel_sdvo.c | 8 +- + drivers/gpu/drm/i915/display/intel_tv.c | 3 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 1 + + drivers/gpu/drm/i915/display/intel_vrr.c | 7 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 3 + + drivers/gpu/drm/i915/display/skl_watermark.c | 74 ++++- + drivers/gpu/drm/i915/display/skl_watermark.h | 8 +- + drivers/gpu/drm/i915/display/skl_watermark_regs.h | 18 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 3 +- + drivers/gpu/drm/i915/i915_hwmon.c | 37 +-- + drivers/gpu/drm/i915/i915_memcpy.c | 2 + + drivers/gpu/drm/i915/i915_reg.h | 15 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 33 --- + drivers/gpu/drm/xe/xe_pci.c | 1 + + include/uapi/drm/i915_drm.h | 16 +- + 47 files changed, 978 insertions(+), 749 deletions(-) +Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (4be445f5b6b6 drm/msm/dpu: capture snapshot on the first commit_done timeout) +$ 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 (4be445f5b6b6 drm/msm/dpu: capture snapshot on the first commit_done timeout) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging drm-xe/drm-xe-next (43c4ff3ca2d1 drm/xe/guc: Don't support older GuC 70.x releases) + 521db22a1d70 ("drm/xe: Invalidate userptr VMA on page pin fault") + 58480c1c912f ("drm/xe: Skip VMAs pin when requesting signal to the last XE_EXEC") + 989d07ac6bb7 ("drm/xe: Return if kobj creation is failed") +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel drm-xe/drm-xe-next +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/tests/xe_migrate.c +Auto-merging drivers/gpu/drm/xe/xe_bo.c +Auto-merging drivers/gpu/drm/xe/xe_drm_client.c +Auto-merging drivers/gpu/drm/xe/xe_exec.c +Auto-merging drivers/gpu/drm/xe/xe_exec_queue.c +Auto-merging drivers/gpu/drm/xe/xe_gt.c +Auto-merging drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c +Auto-merging drivers/gpu/drm/xe/xe_lrc.c +Auto-merging drivers/gpu/drm/xe/xe_mmio.c +Auto-merging drivers/gpu/drm/xe/xe_pci.c +Auto-merging drivers/gpu/drm/xe/xe_pm.c +Auto-merging drivers/gpu/drm/xe/xe_trace.h +Auto-merging drivers/gpu/drm/xe/xe_vm.c +Auto-merging include/uapi/drm/xe_drm.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 6 + + drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 7 +- + drivers/gpu/drm/xe/Makefile | 1 + + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 8 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 19 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 242 ++++++++++++++++++++- + .../drm/xe/instructions/xe_gfx_state_commands.h | 18 ++ + .../gpu/drm/xe/instructions/xe_gfxpipe_commands.h | 3 + + drivers/gpu/drm/xe/instructions/xe_instr_defs.h | 1 + + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 3 - + drivers/gpu/drm/xe/regs/xe_gsc_regs.h | 7 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 41 ++-- + drivers/gpu/drm/xe/regs/xe_guc_regs.h | 15 +- + drivers/gpu/drm/xe/regs/xe_reg_defs.h | 14 ++ + drivers/gpu/drm/xe/regs/xe_regs.h | 2 +- + drivers/gpu/drm/xe/tests/Makefile | 3 +- + drivers/gpu/drm/xe/tests/xe_bo.c | 8 +- + drivers/gpu/drm/xe/tests/xe_bo_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_dma_buf_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_live_test_mod.c | 10 + + drivers/gpu/drm/xe/tests/xe_migrate.c | 7 +- + drivers/gpu/drm/xe/tests/xe_migrate_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_mocs.c | 96 ++++---- + drivers/gpu/drm/xe/tests/xe_mocs_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_wa_test.c | 1 + + drivers/gpu/drm/xe/xe_bo.c | 70 +----- + drivers/gpu/drm/xe/xe_bo.h | 1 + + drivers/gpu/drm/xe/xe_bo_evict.c | 2 +- + drivers/gpu/drm/xe/xe_bo_types.h | 19 -- + drivers/gpu/drm/xe/xe_debugfs.c | 10 +- + drivers/gpu/drm/xe/xe_devcoredump.c | 7 +- + drivers/gpu/drm/xe/xe_device.c | 50 ++++- + drivers/gpu/drm/xe/xe_device.h | 4 +- + drivers/gpu/drm/xe/xe_device_sysfs.c | 4 + + drivers/gpu/drm/xe/xe_dma_buf.c | 5 +- + drivers/gpu/drm/xe/xe_drm_client.c | 8 +- + drivers/gpu/drm/xe/xe_exec.c | 5 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 32 +-- + drivers/gpu/drm/xe/xe_ggtt.c | 44 +--- + drivers/gpu/drm/xe/xe_gsc.c | 68 +++++- + drivers/gpu/drm/xe/xe_gsc.h | 2 + + drivers/gpu/drm/xe/xe_gsc_proxy.c | 4 +- + drivers/gpu/drm/xe/xe_gsc_proxy.h | 1 + + drivers/gpu/drm/xe/xe_gsc_submit.c | 15 ++ + drivers/gpu/drm/xe/xe_gsc_submit.h | 1 + + drivers/gpu/drm/xe/xe_gsc_types.h | 1 + + drivers/gpu/drm/xe/xe_gt.c | 21 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 53 ++++- + drivers/gpu/drm/xe/xe_gt_freq.c | 38 +++- + drivers/gpu/drm/xe/xe_gt_idle.c | 23 +- + drivers/gpu/drm/xe/xe_gt_mcr.c | 34 ++- + drivers/gpu/drm/xe/xe_gt_mcr.h | 14 ++ + drivers/gpu/drm/xe/xe_gt_throttle_sysfs.c | 3 + + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 43 +++- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h | 2 +- + drivers/gpu/drm/xe/xe_gt_topology.c | 3 - + drivers/gpu/drm/xe/xe_gt_topology.h | 11 + + drivers/gpu/drm/xe/xe_gt_types.h | 6 +- + drivers/gpu/drm/xe/xe_guc.c | 16 +- + drivers/gpu/drm/xe/xe_guc_debugfs.c | 9 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 64 +----- + drivers/gpu/drm/xe/xe_guc_submit.c | 83 ++++--- + drivers/gpu/drm/xe/xe_guc_submit.h | 2 + + drivers/gpu/drm/xe/xe_guc_submit_types.h | 13 +- + drivers/gpu/drm/xe/xe_huc_debugfs.c | 5 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 35 ++- + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 102 +++++++-- + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.h | 7 + + drivers/gpu/drm/xe/xe_hwmon.c | 25 ++- + drivers/gpu/drm/xe/xe_irq.c | 2 +- + drivers/gpu/drm/xe/xe_lmtt.c | 4 +- + drivers/gpu/drm/xe/xe_lrc.c | 148 ++++++++++++- + drivers/gpu/drm/xe/xe_lrc.h | 5 + + drivers/gpu/drm/xe/xe_lrc_types.h | 2 + + drivers/gpu/drm/xe/xe_mmio.c | 72 ++++++ + drivers/gpu/drm/xe/xe_mmio.h | 81 +------ + drivers/gpu/drm/xe/xe_mocs.c | 62 ++++-- + drivers/gpu/drm/xe/xe_pat.c | 10 - + drivers/gpu/drm/xe/xe_pci.c | 1 + + drivers/gpu/drm/xe/xe_pm.c | 213 ++++++++++++++++-- + drivers/gpu/drm/xe/xe_pm.h | 8 +- + drivers/gpu/drm/xe/xe_pt.c | 2 +- + drivers/gpu/drm/xe/xe_query.c | 50 ++++- + drivers/gpu/drm/xe/xe_tile_sysfs.c | 1 + + drivers/gpu/drm/xe/xe_trace.h | 6 +- + drivers/gpu/drm/xe/xe_ttm_sys_mgr.c | 5 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 2 +- + drivers/gpu/drm/xe/xe_tuning.c | 4 +- + drivers/gpu/drm/xe/xe_uc_fw.c | 34 ++- + drivers/gpu/drm/xe/xe_vm.c | 8 +- + drivers/gpu/drm/xe/xe_wa.c | 22 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 3 - + include/drm/xe_pciids.h | 3 + + include/uapi/drm/xe_drm.h | 11 +- + 94 files changed, 1584 insertions(+), 672 deletions(-) + create mode 100644 drivers/gpu/drm/xe/instructions/xe_gfx_state_commands.h + create mode 100644 drivers/gpu/drm/xe/tests/xe_live_test_mod.c +Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values) +$ 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 (c2d953276b8b fbmon: prevent division by zero in fb_videomode_from_videomode()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/video/fbdev/core/fbmem.c +Auto-merging include/linux/fb.h +Merge made by the 'ort' strategy. + drivers/firmware/efi/earlycon.c | 2 +- + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/arkfb.c | 15 +++++++++++---- + drivers/video/fbdev/core/fbcon.c | 16 +++++++++------- + drivers/video/fbdev/core/fbmem.c | 12 ++++++------ + drivers/video/fbdev/core/fbmon.c | 7 ++++--- + drivers/video/fbdev/core/svgalib.c | 15 +++++++++++---- + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 18 +++++++++--------- + drivers/video/fbdev/s3fb.c | 15 +++++++++++---- + drivers/video/fbdev/uvesafb.c | 2 +- + drivers/video/fbdev/vga16fb.c | 6 +++++- + drivers/video/fbdev/via/accel.c | 4 ++-- + drivers/video/fbdev/vt8623fb.c | 15 +++++++++++---- + drivers/video/sticore.c | 2 +- + include/linux/fb.h | 18 ++++++++++++------ + include/linux/font.h | 3 ++- + lib/fonts/fonts.c | 15 +++++++++------ + 17 files changed, 106 insertions(+), 61 deletions(-) +Merging regmap/for-next (62861ddcb27e Merge remote-tracking branch 'regmap/for-6.9' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. +Merging sound/for-next (1e5dc3989a20 ALSA: hda/realtek: fix the hp playback volume issue for LG machines) +$ 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 (04f082d39b99 firewire: core: fix build failure due to the caller of fw_csr_string()) +$ 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 (4cd1939cf2e1 Merge remote-tracking branch 'asoc/for-6.8' into asoc-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (d1909c022173 module: Don't ignore errors from set_memory_XX()) +$ 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 (81c32343d04f Input: xpad - add support for Snakebyte GAMEPADs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Already up to date. +Merging block/for-next (4138f0228833 Merge tag 'vfio-v6.9-rc1' of https://github.com/awilliam/linux-vfio) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Already up to date. +Merging device-mapper/for-next (55e565c42dce dm-integrity: fix a memory leak when rechecking the data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Merge made by the 'ort' strategy. + drivers/md/dm-integrity.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging libata/for-next (c1bc6ed01c16 Merge remote-tracking branch 'libata/for-6.9' into HEAD) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Merge made by the 'ort' strategy. +Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (faf3b8014c35 mmc: core: make mmc_host_class constant) +$ 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 (78334c343bef mfd: cs42l43: Fix wrong GPIO_FN_SEL and SPI_CLK_CONFIG1 defaults) +$ 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 (b49c1caca529 backlight: pandora_bl: Drop unneeded ENOMEM error message) +$ 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 (4e61f1e9d58f power: supply: core: fix charge_behaviour formatting) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (a1f9fa6fcbb3 Merge remote-tracking branch 'regulator/for-6.8' into regulator-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Already up to date. +Merging security/next (8f49397828ee Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Merge made by the 'ort' strategy. +Merging apparmor/apparmor-next (8ead196be219 apparmor: Fix memory leak in unpack_profile()) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (85445b964290 integrity: eliminate unnecessary "Problem loading X.509 certificate" msg) +$ 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 selinux/next (a1fc79343abb selinux: fix style issues in security/selinux/ss/symtab.c) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer()) +$ 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 (1156e9541dc2 keys: Fix overwrite of key expiration on instantiation) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + security/keys/gc.c | 8 -------- + security/keys/key.c | 35 ++++++++++++++++++++++++----------- + security/keys/keyctl.c | 11 ++++++----- + 3 files changed, 30 insertions(+), 24 deletions(-) +Merging watchdog/master (6fe5aabf7fc6 watchdog: intel-mid_wdt: Get platform data via dev_get_platdata()) +$ 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 (f379a7e9c3b5 Merge branches 'arm/mediatek', 'arm/renesas', 'arm/smmu', '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 (aa13b709084a audit: use KMEM_CACHE() instead of kmem_cache_create()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (7e98fe49f889 dt-bindings: soc: imx: fsl,imx-anatop: add imx6q regulators) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging dt-krzk/for-next (8c82b4eef297 ARM: dts: sti: minor whitespace cleanup around '=') +$ 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/for-next (8df6bab6cb9a mailbox: imx: support i.MX95 Generic/ELE/V2X MU) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Already up to date. +Merging spi/for-next (cf6d79a0f576 spi: spi-imx: fix off-by-one in mx51 CPU mode burst length) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/master (eb8ed5b0e9d9 Merge branch into tip/master: 'x86/fpu') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging drivers/clocksource/timer-riscv.c +Auto-merging kernel/sched/core.c +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + .../devicetree/bindings/timer/cdns,ttc.yaml | 22 +- + .../bindings/timer/nxp,sysctr-timer.yaml | 4 +- + .../bindings/timer/ralink,cevt-systick.yaml | 38 +++ + .../devicetree/bindings/timer/renesas,ostm.yaml | 2 +- + .../devicetree/bindings/timer/renesas,tmu.yaml | 18 +- + .../bindings/timer/samsung,exynos4210-mct.yaml | 2 + + Documentation/scheduler/sched-domains.rst | 12 +- + Documentation/scheduler/sched-stats.rst | 37 +-- + .../translations/zh_CN/scheduler/sched-domains.rst | 10 +- + .../translations/zh_CN/scheduler/sched-stats.rst | 30 +-- + arch/arm/kernel/topology.c | 2 +- + arch/x86/boot/main.c | 4 +- + arch/x86/include/asm/alternative.h | 22 +- + arch/x86/include/asm/apic.h | 2 +- + arch/x86/include/asm/atomic64_32.h | 2 +- + arch/x86/include/asm/cpufeature.h | 4 +- + arch/x86/include/asm/irq_stack.h | 2 +- + arch/x86/include/asm/processor.h | 6 +- + arch/x86/include/asm/special_insns.h | 4 +- + arch/x86/include/asm/uaccess.h | 4 +- + arch/x86/kernel/fpu/core.c | 4 +- + arch/x86/kernel/vmlinux.lds.S | 7 +- + drivers/clocksource/arm_global_timer.c | 35 ++- + drivers/clocksource/timer-imx-gpt.c | 3 +- + drivers/clocksource/timer-imx-sysctr.c | 121 +++++++--- + drivers/clocksource/timer-riscv.c | 3 + + drivers/clocksource/timer-stm32.c | 4 +- + drivers/clocksource/timer-ti-32k.c | 2 +- + drivers/irqchip/irq-renesas-rzg2l.c | 72 ++++-- + include/asm-generic/vmlinux.lds.h | 2 +- + include/linux/sched.h | 2 +- + include/linux/sched/idle.h | 2 +- + include/linux/sched/topology.h | 2 +- + kernel/entry/common.c | 8 +- + kernel/sched/core.c | 6 +- + kernel/sched/fair.c | 259 +++++++++++---------- + kernel/sched/loadavg.c | 2 +- + kernel/sched/pelt.c | 4 +- + kernel/sched/sched.h | 4 +- + kernel/sched/stats.c | 5 +- + kernel/time/timer.c | 2 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 2 +- + .../ftrace/test.d/ftrace/func_set_ftrace_file.tc | 2 +- + 44 files changed, 484 insertions(+), 298 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/ralink,cevt-systick.yaml +Merging clockevents/timers/drivers/next (8248ca30ef89 clocksource/drivers/timer-riscv: Clear timer interrupt on timer initialization) +$ 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 (fc8235a79d73 Merge ras/edac-misc into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. +Merging ftrace/for-next (7604256cecef tracing: Add __string_src() helper to help compilers not to get confused) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Already up to date. +Merging rcu/rcu/next (3add00be5fe5 Merge branches 'rcu-doc.2024.02.14a', 'rcu-nocb.2024.02.14a', 'rcu-exp.2024.02.14a', 'rcu-tasks.2024.02.26a' and 'rcu-misc.2024.02.14a' into rcu.2024.02.26a) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Already up to date. +Merging kvm/next (c20722c412f1 Documentation: kvm/sev: clarify usage of KVM_MEMORY_ENCRYPT_OP) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Merge made by the 'ort' strategy. + .../virt/kvm/x86/amd-memory-encryption.rst | 42 +++++++++------- + Documentation/virt/kvm/x86/msr.rst | 19 ++++--- + arch/x86/include/uapi/asm/kvm.h | 23 +++++++++ + arch/x86/include/uapi/asm/kvm_para.h | 1 - + arch/x86/kernel/kvm.c | 11 ++-- + arch/x86/kvm/svm/sev.c | 58 +++++++++++++--------- + arch/x86/kvm/trace.h | 10 ++-- + 7 files changed, 101 insertions(+), 63 deletions(-) +Merging kvm-arm/next (4a09ddb8333a Merge branch kvm-arm64/kerneldoc into kvmarm/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (00de073e2420 KVM: s390: selftest: memop: Fix undefined behavior) +$ 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-ppc/topic/ppc-kvm (41bccc98fb79 Linux 6.8-rc2) +$ git merge -m Merge branch 'topic/ppc-kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (d8c0831348e7 KVM: riscv: selftests: Add Zacas extension to 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 (964d0c614c7f Merge branch 'hyperv') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging tools/testing/selftests/kvm/include/x86_64/processor.h +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + arch/x86/kvm/cpuid.c | 44 +++++++++++++--------- + .../selftests/kvm/include/x86_64/processor.h | 9 +++++ + tools/testing/selftests/kvm/x86_64/kvm_pv_test.c | 39 +++++++++++++++++++ + 3 files changed, 75 insertions(+), 17 deletions(-) +Merging xen-tip/linux-next (d277f9d82802 xen/events: increment refcnt only if event channel is refcounted) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' 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 (b111131e3ec7 Merge branch 'for-6.9' 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 (16f8091b4917 platform/x86/intel/pmc: Improve PKGC residency counters debug) +$ 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 +Already up to date. +Merging chrome-platform/for-next (6613476e225e Linux 6.8-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 (8a0a62941a04 firmware: coreboot: Replace tag with id table in driver struct) +$ 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 (3693760295e8 HSI: ssi_protocol: fix struct members kernel-doc warnings) +$ 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-lj/for-leds-next (45066c4bbe8c leds: ncp5623: Add MS suffix to time defines) +$ 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 (296455ade1fd Merge tag 'char-misc-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (6aeb8850e0f3 device: core: Log warning for devices pending deferred probe on timeout) +$ 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 +Auto-merging drivers/base/cpu.c +Auto-merging drivers/base/platform-msi.c +Auto-merging drivers/of/property.c +Auto-merging include/linux/cpu.h +Auto-merging kernel/ksysfs.c +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + drivers/base/component.c | 4 +- + drivers/base/core.c | 72 +++++++++++++++++- + drivers/base/cpu.c | 2 +- + drivers/base/dd.c | 32 ++++---- + drivers/base/firmware_loader/main.c | 16 ++-- + drivers/base/platform-msi.c | 6 +- + drivers/base/property.c | 67 ++--------------- + drivers/base/swnode.c | 13 +++- + drivers/firmware/efi/sysfb_efi.c | 2 +- + drivers/of/property.c | 15 +++- + fs/debugfs/inode.c | 25 +++++-- + fs/kernfs/dir.c | 31 +++++--- + fs/kernfs/file.c | 8 +- + fs/kernfs/kernfs-internal.h | 2 + + fs/sysfs/group.c | 55 ++++++++++---- + include/linux/cpu.h | 2 +- + include/linux/firmware.h | 3 + + include/linux/fwnode.h | 18 +++-- + include/linux/kernfs.h | 10 ++- + include/linux/kobject.h | 2 +- + include/linux/property.h | 9 +-- + include/linux/sysfs.h | 142 +++++++++++++++++++++++++++++++++--- + kernel/ksysfs.c | 2 +- + kernel/workqueue.c | 2 +- + lib/kobject_uevent.c | 24 +++--- + 25 files changed, 387 insertions(+), 177 deletions(-) +Merging usb/usb-next (a788e53c05ae usb: usb-acpi: Fix oops due to freeing uninitialized pld pointer) + 6677138d7310 ("dt-bindings: soc: qcom: qcom,pmic-glink: document QCM6490 compatible") + f81c2f01cad6 ("arm64: dts: qcom: pm6150: define USB-C related blocks") +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml +Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,pmic-glink.yaml +Auto-merging arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +Auto-merging arch/arm64/boot/dts/qcom/sc7280.dtsi +Auto-merging drivers/phy/phy-core.c +Auto-merging drivers/phy/tegra/xusb.c +Auto-merging drivers/thunderbolt/switch.c +Auto-merging drivers/usb/core/hcd.c +Auto-merging drivers/usb/core/port.c +Auto-merging drivers/usb/host/xhci-ring.c +Auto-merging drivers/usb/typec/altmodes/displayport.c +Auto-merging drivers/usb/typec/tcpm/tcpm.c +Auto-merging drivers/usb/typec/ucsi/ucsi_glink.c +Auto-merging include/linux/phy/phy.h +Auto-merging tools/testing/selftests/Makefile +Resolved 'Documentation/devicetree/bindings/regulator/qcom,usb-vbus-regulator.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 094537a18451] Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-usb-gadget-ffs | 12 +- + Documentation/ABI/testing/sysfs-bus-usb | 10 + + Documentation/ABI/testing/sysfs-class-usb_role | 6 + + .../regulator/qcom,usb-vbus-regulator.yaml | 1 + + .../devicetree/bindings/sound/qcom,q6usb.yaml | 55 + + .../devicetree/bindings/usb/analogix,anx7411.yaml | 13 - + .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 2 +- + .../devicetree/bindings/usb/fcs,fsa4480.yaml | 12 +- + .../devicetree/bindings/usb/generic-ehci.yaml | 1 + + .../devicetree/bindings/usb/gpio-sbu-mux.yaml | 12 +- + .../bindings/usb/hisilicon,hi3798mv200-dwc3.yaml | 99 ++ + .../devicetree/bindings/usb/ite,it5205.yaml | 72 ++ + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 5 +- + .../devicetree/bindings/usb/microchip,usb5744.yaml | 2 - + .../devicetree/bindings/usb/nxp,ptn36502.yaml | 12 +- + .../devicetree/bindings/usb/nxp,ptn5110.yaml | 6 +- + .../devicetree/bindings/usb/onnn,nb7vpq904m.yaml | 13 +- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 2 +- + .../devicetree/bindings/usb/qcom,pmic-typec.yaml | 46 +- + .../bindings/usb/qcom,wcd939x-usbss.yaml | 12 +- + .../devicetree/bindings/usb/realtek,rts5411.yaml | 55 + + .../devicetree/bindings/usb/ti,am62-usb.yaml | 8 +- + .../devicetree/bindings/usb/ti,usb8020b.yaml | 69 + + .../devicetree/bindings/usb/usb-nop-xceiv.yaml | 11 +- + .../devicetree/bindings/usb/usb-switch.yaml | 67 + + Documentation/devicetree/bindings/usb/usb.yaml | 2 + + Documentation/driver-api/usb/callbacks.rst | 6 +- + Documentation/usb/functionfs.rst | 36 + + Documentation/usb/gadget-testing.rst | 8 + + arch/powerpc/boot/dts/akebono.dts | 6 +- + drivers/phy/Kconfig | 1 + + drivers/phy/Makefile | 1 + + drivers/phy/phy-core.c | 47 + + drivers/phy/realtek/Kconfig | 32 + + drivers/phy/realtek/Makefile | 3 + + drivers/phy/realtek/phy-rtk-usb2.c | 1312 ++++++++++++++++++++ + drivers/phy/realtek/phy-rtk-usb3.c | 748 +++++++++++ + drivers/phy/tegra/xusb.c | 13 + + drivers/platform/chrome/cros_ec_typec.c | 19 + + drivers/thunderbolt/Makefile | 1 + + drivers/thunderbolt/ctl.c | 19 +- + drivers/thunderbolt/ctl.h | 4 +- + drivers/thunderbolt/domain.c | 19 +- + drivers/thunderbolt/icm.c | 2 +- + drivers/thunderbolt/lc.c | 45 + + drivers/thunderbolt/nhi.c | 11 +- + drivers/thunderbolt/nvm.c | 4 +- + drivers/thunderbolt/path.c | 13 + + drivers/thunderbolt/quirks.c | 14 + + drivers/thunderbolt/retimer.c | 2 +- + drivers/thunderbolt/switch.c | 140 ++- + drivers/thunderbolt/tb.c | 904 +++++++++----- + drivers/thunderbolt/tb.h | 29 +- + drivers/thunderbolt/tb_regs.h | 6 + + drivers/thunderbolt/trace.h | 188 +++ + drivers/thunderbolt/tunnel.c | 96 +- + drivers/thunderbolt/tunnel.h | 6 + + drivers/thunderbolt/usb4.c | 43 +- + drivers/thunderbolt/usb4_port.c | 2 +- + drivers/thunderbolt/xdomain.c | 16 +- + drivers/usb/cdns3/drd.c | 2 +- + drivers/usb/core/Kconfig | 27 + + drivers/usb/core/driver.c | 8 +- + drivers/usb/core/endpoint.c | 2 +- + drivers/usb/core/hcd.c | 20 +- + drivers/usb/core/hub.c | 29 + + drivers/usb/core/message.c | 7 +- + drivers/usb/core/of.c | 71 ++ + drivers/usb/core/phy.c | 120 ++ + drivers/usb/core/phy.h | 3 + + drivers/usb/core/port.c | 4 +- + drivers/usb/core/sysfs.c | 103 +- + drivers/usb/core/usb-acpi.c | 46 +- + drivers/usb/core/usb.c | 2 +- + drivers/usb/core/usb.h | 8 +- + drivers/usb/dwc3/Kconfig | 2 +- + drivers/usb/dwc3/core.h | 2 + + drivers/usb/dwc3/dwc3-am62.c | 42 +- + drivers/usb/dwc3/dwc3-of-simple.c | 4 +- + drivers/usb/dwc3/dwc3-qcom.c | 276 +--- + drivers/usb/dwc3/ep0.c | 1 + + drivers/usb/dwc3/gadget.c | 91 +- + drivers/usb/dwc3/gadget.h | 1 + + drivers/usb/dwc3/host.c | 50 + + drivers/usb/gadget/Kconfig | 1 + + drivers/usb/gadget/function/f_fs.c | 533 +++++++- + drivers/usb/gadget/function/u_ether.c | 2 +- + drivers/usb/gadget/function/uvc_video.c | 123 +- + drivers/usb/gadget/udc/core.c | 7 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 127 +- + drivers/usb/gadget/udc/fsl_usb2_udc.h | 47 - + drivers/usb/gadget/udc/net2272.c | 2 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 1 - + drivers/usb/gadget/udc/snps_udc_plat.c | 1 - + drivers/usb/gadget/udc/tegra-xudc.c | 39 +- + drivers/usb/host/ehci-orion.c | 18 +- + drivers/usb/host/ohci-pxa27x.c | 1 - + drivers/usb/host/sl811-hcd.c | 2 + + drivers/usb/host/xhci-caps.h | 85 ++ + drivers/usb/host/xhci-dbgcap.c | 13 +- + drivers/usb/host/xhci-dbgcap.h | 2 + + drivers/usb/host/xhci-hub.c | 69 +- + drivers/usb/host/xhci-mem.c | 95 +- + drivers/usb/host/xhci-mtk-sch.c | 14 +- + drivers/usb/host/xhci-pci.c | 15 +- + drivers/usb/host/xhci-port.h | 176 +++ + drivers/usb/host/xhci-ring.c | 227 ++-- + drivers/usb/host/xhci-trace.h | 12 +- + drivers/usb/host/xhci.c | 56 +- + drivers/usb/host/xhci.h | 272 +--- + drivers/usb/image/mdc800.c | 1 - + drivers/usb/misc/onboard_usb_hub.c | 4 +- + drivers/usb/misc/onboard_usb_hub.h | 7 + + drivers/usb/mtu3/mtu3_host.c | 30 + + drivers/usb/musb/musb_gadget.c | 4 - + drivers/usb/phy/phy-generic.c | 55 +- + drivers/usb/phy/phy.c | 2 +- + drivers/usb/roles/class.c | 43 +- + drivers/usb/serial/cp210x.c | 4 + + drivers/usb/serial/ftdi_sio.c | 4 +- + drivers/usb/serial/ftdi_sio_ids.h | 6 + + drivers/usb/serial/keyspan.c | 1 - + drivers/usb/serial/option.c | 6 + + drivers/usb/serial/oti6858.c | 1 - + drivers/usb/storage/freecom.c | 1 - + drivers/usb/storage/sddr55.c | 4 +- + drivers/usb/typec/altmodes/displayport.c | 165 ++- + drivers/usb/typec/bus.c | 102 ++ + drivers/usb/typec/class.c | 61 +- + drivers/usb/typec/class.h | 7 +- + drivers/usb/typec/mux.c | 2 +- + drivers/usb/typec/mux/Kconfig | 10 + + drivers/usb/typec/mux/Makefile | 1 + + drivers/usb/typec/mux/it5205.c | 294 +++++ + drivers/usb/typec/pd.c | 30 +- + drivers/usb/typec/retimer.c | 2 +- + drivers/usb/typec/tcpm/fusb302.c | 2 +- + drivers/usb/typec/tcpm/qcom/Makefile | 3 +- + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 256 +--- + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.h | 27 + + .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 159 ++- + .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.h | 94 +- + .../typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c | 80 ++ + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c | 290 ++++- + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.h | 172 +-- + drivers/usb/typec/tcpm/tcpci.c | 27 +- + drivers/usb/typec/tcpm/tcpci_maxim.h | 1 + + drivers/usb/typec/tcpm/tcpci_maxim_core.c | 38 +- + drivers/usb/typec/tcpm/tcpm.c | 1050 +++++++++++++--- + drivers/usb/typec/tcpm/wcove.c | 2 +- + drivers/usb/typec/ucsi/ucsi.c | 294 ++++- + drivers/usb/typec/ucsi/ucsi.h | 107 +- + drivers/usb/typec/ucsi/ucsi_ccg.c | 92 +- + drivers/usb/typec/ucsi/ucsi_glink.c | 1 + + include/linux/phy/phy.h | 21 + + include/linux/phy/tegra/xusb.h | 1 + + include/linux/thunderbolt.h | 4 +- + include/linux/usb/audio-v2.h | 4 +- + include/linux/usb/gadget.h | 2 + + include/linux/usb/of.h | 7 + + include/linux/usb/pd.h | 1 + + include/linux/usb/pd_vdo.h | 13 +- + include/linux/usb/tcpci.h | 13 + + include/linux/usb/tcpm.h | 18 +- + include/linux/usb/typec.h | 7 + + include/linux/usb/typec_altmode.h | 30 + + include/linux/usb/typec_dp.h | 11 +- + include/linux/usb/typec_tbt.h | 9 +- + include/uapi/linux/usb/ch9.h | 2 + + include/uapi/linux/usb/functionfs.h | 41 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/devices/Makefile | 4 + + .../devices/boards/Dell Inc.,XPS 13 9300.yaml | 40 + + .../selftests/devices/boards/google,spherion.yaml | 50 + + tools/testing/selftests/devices/ksft.py | 90 ++ + .../selftests/devices/test_discoverable_devices.py | 318 +++++ + 176 files changed, 9044 insertions(+), 2447 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/qcom,q6usb.yaml + create mode 100644 Documentation/devicetree/bindings/usb/hisilicon,hi3798mv200-dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ite,it5205.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,usb8020b.yaml + create mode 100644 Documentation/devicetree/bindings/usb/usb-switch.yaml + create mode 100644 drivers/phy/realtek/Kconfig + create mode 100644 drivers/phy/realtek/Makefile + create mode 100644 drivers/phy/realtek/phy-rtk-usb2.c + create mode 100644 drivers/phy/realtek/phy-rtk-usb3.c + create mode 100644 drivers/thunderbolt/trace.h + create mode 100644 drivers/usb/host/xhci-caps.h + create mode 100644 drivers/usb/host/xhci-port.h + create mode 100644 drivers/usb/typec/mux/it5205.c + create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.h + create mode 100644 drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy_stub.c + create mode 100644 tools/testing/selftests/devices/Makefile + create mode 100644 tools/testing/selftests/devices/boards/Dell Inc.,XPS 13 9300.yaml + create mode 100644 tools/testing/selftests/devices/boards/google,spherion.yaml + create mode 100644 tools/testing/selftests/devices/ksft.py + create mode 100755 tools/testing/selftests/devices/test_discoverable_devices.py +Merging thunderbolt/next (b8a730836c6b thunderbolt: Constify the struct device_type usage) +$ 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 (b1a8da9ff139 USB: serial: cp210x: add pid/vid for TDK NC0110013M and MM0110113M) +$ 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 (d6c0d892b44c dt-bindings: serial: stm32: add power-domains property) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging drivers/bluetooth/btnxpuart.c +Auto-merging drivers/bluetooth/hci_serdev.c +Auto-merging drivers/mfd/rave-sp.c +Auto-merging drivers/net/ethernet/qualcomm/qca_uart.c +Auto-merging drivers/tty/serial/8250/8250_dw.c +Auto-merging drivers/tty/serial/pmac_zilog.c +Auto-merging drivers/tty/serial/qcom_geni_serial.c +Auto-merging drivers/tty/serial/serial_port.c +Auto-merging drivers/tty/vt/vt.c +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging kernel/printk/printk.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/cdns,uart.yaml | 1 + + .../devicetree/bindings/serial/fsl-lpuart.yaml | 1 + + .../devicetree/bindings/serial/renesas,hscif.yaml | 1 + + .../devicetree/bindings/serial/samsung_uart.yaml | 2 + + .../devicetree/bindings/serial/serial.yaml | 2 +- + .../devicetree/bindings/serial/st,asc.yaml | 55 + + .../devicetree/bindings/serial/st,stm32-uart.yaml | 3 + + .../devicetree/bindings/serial/st-asc.txt | 18 - + Documentation/devicetree/bindings/w1/w1-uart.yaml | 59 + + Documentation/driver-api/tty/console.rst | 45 + + Documentation/driver-api/tty/index.rst | 1 + + Documentation/w1/masters/index.rst | 1 + + Documentation/w1/masters/w1-uart.rst | 54 + + arch/m68k/amiga/config.c | 2 +- + arch/m68k/hp300/config.c | 6 +- + drivers/bluetooth/btmtkuart.c | 4 +- + drivers/bluetooth/btnxpuart.c | 4 +- + drivers/bluetooth/hci_serdev.c | 4 +- + drivers/gnss/serial.c | 2 +- + drivers/gnss/sirf.c | 2 +- + drivers/greybus/gb-beagleplay.c | 6 +- + drivers/iio/chemical/pms7003.c | 4 +- + drivers/iio/chemical/scd30_serial.c | 4 +- + drivers/iio/chemical/sps30_serial.c | 4 +- + drivers/iio/imu/bno055/bno055_ser_core.c | 4 +- + drivers/input/keyboard/amikbd.c | 6 +- + drivers/mfd/rave-sp.c | 4 +- + drivers/net/ethernet/qualcomm/qca_uart.c | 2 +- + drivers/nfc/pn533/uart.c | 4 +- + drivers/nfc/s3fwrn5/uart.c | 4 +- + drivers/platform/chrome/cros_ec_uart.c | 4 +- + drivers/platform/surface/aggregator/core.c | 4 +- + drivers/tty/Kconfig | 7 +- + drivers/tty/amiserial.c | 6 +- + drivers/tty/goldfish.c | 5 +- + drivers/tty/hvc/hvc_iucv.c | 6 +- + drivers/tty/serdev/core.c | 2 +- + drivers/tty/serdev/serdev-ttyport.c | 10 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 50 +- + drivers/tty/serial/8250/8250_bcm2835aux.c | 92 +- + drivers/tty/serial/8250/8250_bcm7271.c | 73 +- + drivers/tty/serial/8250/8250_dw.c | 121 +- + drivers/tty/serial/8250/8250_exar.c | 52 +- + drivers/tty/serial/8250/8250_ingenic.c | 20 +- + drivers/tty/serial/8250/8250_lpc18xx.c | 20 +- + drivers/tty/serial/8250/8250_of.c | 149 +- + drivers/tty/serial/8250/8250_omap.c | 29 +- + drivers/tty/serial/8250/8250_pci1xxxx.c | 175 ++- + drivers/tty/serial/8250/8250_port.c | 50 +- + drivers/tty/serial/8250/8250_pxa.c | 22 +- + drivers/tty/serial/8250/8250_tegra.c | 26 +- + drivers/tty/serial/8250/8250_uniphier.c | 17 +- + drivers/tty/serial/8250/Kconfig | 1 + + drivers/tty/serial/amba-pl011.c | 24 +- + drivers/tty/serial/ar933x_uart.c | 18 +- + drivers/tty/serial/bcm63xx_uart.c | 24 +- + drivers/tty/serial/fsl_linflexuart.c | 1 - + drivers/tty/serial/jsm/jsm_cls.c | 1 - + drivers/tty/serial/lpc32xx_hs.c | 19 +- + drivers/tty/serial/max310x.c | 327 ++--- + drivers/tty/serial/mcf.c | 27 - + drivers/tty/serial/meson_uart.c | 22 +- + drivers/tty/serial/msm_serial.c | 33 +- + drivers/tty/serial/omap-serial.c | 16 +- + drivers/tty/serial/owl-uart.c | 30 +- + drivers/tty/serial/pch_uart.c | 70 +- + drivers/tty/serial/pmac_zilog.c | 9 +- + drivers/tty/serial/pxa.c | 17 +- + drivers/tty/serial/qcom_geni_serial.c | 27 +- + drivers/tty/serial/rda-uart.c | 28 +- + drivers/tty/serial/samsung_tty.c | 276 ++-- + drivers/tty/serial/serial_base_bus.c | 2 +- + drivers/tty/serial/serial_core.c | 12 + + drivers/tty/serial/serial_port.c | 145 ++ + drivers/tty/serial/serial_txx9.c | 3 +- + drivers/tty/serial/sh-sci.c | 245 ++-- + drivers/tty/serial/sifive.c | 17 +- + drivers/tty/serial/st-asc.c | 40 +- + drivers/tty/serial/stm32-usart.c | 223 +-- + drivers/tty/serial/stm32-usart.h | 38 +- + drivers/tty/serial/sunplus-uart.c | 18 +- + drivers/tty/serial/xilinx_uartps.c | 236 ++- + drivers/tty/tty_buffer.c | 1 + + drivers/tty/vt/Makefile | 4 +- + drivers/tty/vt/selection.c | 43 +- + drivers/tty/vt/vt.c | 1531 +++++++++++--------- + drivers/tty/vt/vt_ioctl.c | 6 +- + drivers/video/console/dummycon.c | 38 +- + drivers/video/console/mdacon.c | 43 +- + drivers/video/console/newport_con.c | 69 +- + drivers/video/console/sticon.c | 79 +- + drivers/video/console/vgacon.c | 152 +- + drivers/video/fbdev/core/bitblit.c | 13 +- + drivers/video/fbdev/core/fbcon.c | 123 +- + drivers/video/fbdev/core/fbcon.h | 4 +- + drivers/video/fbdev/core/fbcon_ccw.c | 13 +- + drivers/video/fbdev/core/fbcon_cw.c | 13 +- + drivers/video/fbdev/core/fbcon_ud.c | 13 +- + drivers/video/fbdev/core/tileblit.c | 4 +- + drivers/video/fbdev/tgafb.c | 2 +- + drivers/w1/masters/Kconfig | 10 + + drivers/w1/masters/Makefile | 1 + + drivers/w1/masters/mxc_w1.c | 6 +- + drivers/w1/masters/omap_hdq.c | 6 +- + drivers/w1/masters/sgi_w1.c | 6 +- + drivers/w1/masters/w1-gpio.c | 6 +- + drivers/w1/masters/w1-uart.c | 415 ++++++ + drivers/w1/w1.c | 2 +- + include/linux/console.h | 126 +- + include/linux/console_struct.h | 1 - + include/linux/selection.h | 48 +- + include/linux/serdev.h | 8 +- + include/linux/serial_8250.h | 6 + + include/linux/serial_core.h | 14 +- + include/linux/soc/qcom/geni-se.h | 1 + + include/linux/tty.h | 1 - + include/linux/vt_kern.h | 12 +- + include/uapi/linux/fb.h | 8 +- + include/uapi/linux/vesa.h | 18 + + kernel/printk/printk.c | 21 +- + lib/Kconfig.kgdb | 2 +- + sound/drivers/serial-generic.c | 4 +- + 122 files changed, 3546 insertions(+), 2525 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/st,asc.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/st-asc.txt + create mode 100644 Documentation/devicetree/bindings/w1/w1-uart.yaml + create mode 100644 Documentation/driver-api/tty/console.rst + create mode 100644 Documentation/w1/masters/w1-uart.rst + create mode 100644 drivers/w1/masters/w1-uart.c + create mode 100644 include/uapi/linux/vesa.h +Merging char-misc/char-misc-next (367b3560e10b binder: remove redundant variable page_addr) +$ 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 +Auto-merging .mailmap +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/iio/accel/adxl367.c +Auto-merging drivers/iio/adc/ad_sigma_delta.c +Auto-merging drivers/misc/fastrpc.c +Auto-merging drivers/misc/mei/pci-me.c +Auto-merging drivers/misc/mei/vsc-tp.c +Auto-merging drivers/of/property.c +Merge made by the 'ort' strategy. + .mailmap | 2 + + .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 87 + + .../ABI/testing/sysfs-bus-iio-adc-pac1934 | 9 + + .../bindings/arm/qcom,coresight-tpdm.yaml | 40 +- + Documentation/devicetree/bindings/iio/adc/adc.yaml | 1 - + .../devicetree/bindings/iio/adc/adi,ad9467.yaml | 4 + + .../devicetree/bindings/iio/adc/adi,axi-adc.yaml | 8 +- + .../bindings/iio/adc/microchip,pac1934.yaml | 120 ++ + .../devicetree/bindings/iio/adc/nxp,imx93-adc.yaml | 4 +- + .../bindings/iio/adc/qcom,spmi-vadc.yaml | 1 - + .../bindings/iio/adc/richtek,rtq6056.yaml | 9 +- + .../devicetree/bindings/iio/adc/ti,ads1298.yaml | 80 + + .../bindings/iio/afe/voltage-divider.yaml | 11 + + .../bindings/iio/amplifiers/adi,hmc425a.yaml | 47 +- + .../bindings/iio/frequency/adi,admfm2000.yaml | 127 ++ + .../bindings/iio/gyroscope/bosch,bmg160.yaml | 8 +- + .../bindings/iio/humidity/ti,hdc2010.yaml | 3 + + .../bindings/iio/humidity/ti,hdc3020.yaml | 3 + + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 4 +- + .../devicetree/bindings/iio/light/ams,as73211.yaml | 7 +- + .../bindings/iio/light/vishay,veml6075.yaml | 1 + + .../iio/magnetometer/voltafield,af8133j.yaml | 60 + + .../bindings/iio/pressure/honeywell,hsc030pa.yaml | 3 + + .../iio/pressure/honeywell,mprls0025pa.yaml | 98 +- + .../bindings/iio/temperature/ti,tmp117.yaml | 8 + + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 3 + + .../bindings/interconnect/qcom,rpmh.yaml | 2 +- + .../bindings/interconnect/qcom,sm7150-rpmh.yaml | 84 + + .../bindings/nvmem/layouts/fixed-cell.yaml | 22 +- + .../devicetree/bindings/nvmem/nvmem-provider.yaml | 18 + + .../bindings/nvmem/xlnx,zynqmp-nvmem.txt | 46 - + .../bindings/nvmem/xlnx,zynqmp-nvmem.yaml | 42 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/iio/adis16475.rst | 407 +++++ + Documentation/iio/iio_devbuf.rst | 152 ++ + Documentation/iio/index.rst | 9 +- + MAINTAINERS | 49 +- + arch/x86/Kconfig | 4 - + drivers/accessibility/speakup/devsynth.c | 148 +- + drivers/accessibility/speakup/synth.c | 4 +- + drivers/android/binder_alloc.c | 2 - + drivers/bus/mhi/common.h | 38 +- + drivers/bus/mhi/ep/main.c | 7 +- + drivers/bus/mhi/host/boot.c | 11 +- + drivers/bus/mhi/host/init.c | 91 +- + drivers/bus/mhi/host/internal.h | 56 +- + drivers/bus/mhi/host/main.c | 19 +- + drivers/bus/mhi/host/pci_generic.c | 2 +- + drivers/bus/mhi/host/pm.c | 27 +- + drivers/bus/mhi/host/trace.h | 282 ++++ + drivers/cdx/Makefile | 4 + + drivers/cdx/cdx.c | 20 + + drivers/cdx/cdx.h | 12 + + drivers/cdx/cdx_msi.c | 192 +++ + drivers/cdx/controller/Kconfig | 1 + + drivers/cdx/controller/cdx_controller.c | 25 + + drivers/cdx/controller/mc_cdx_pcol.h | 64 + + drivers/cdx/controller/mcdi_functions.c | 33 +- + drivers/cdx/controller/mcdi_functions.h | 33 + + drivers/char/hpet.c | 1 - + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 6 +- + drivers/char/xillybus/xillybus_of.c | 6 +- + drivers/comedi/drivers/das08.c | 1 - + drivers/dio/dio-driver.c | 2 +- + drivers/firmware/xilinx/zynqmp.c | 25 + + drivers/fpga/dfl.c | 2 +- + drivers/fpga/fpga-bridge.c | 8 +- + drivers/greybus/bundle.c | 2 +- + drivers/greybus/control.c | 2 +- + drivers/greybus/core.c | 32 +- + drivers/greybus/es2.c | 8 +- + drivers/greybus/hd.c | 18 +- + drivers/greybus/interface.c | 11 +- + drivers/greybus/module.c | 2 +- + drivers/greybus/svc.c | 2 +- + drivers/hwtracing/coresight/Makefile | 20 + + drivers/hwtracing/coresight/coresight-cfg-afdo.c | 1 + + drivers/hwtracing/coresight/coresight-core.c | 496 +----- + drivers/hwtracing/coresight/coresight-cti-core.c | 2 +- + drivers/hwtracing/coresight/coresight-etb10.c | 31 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 2 +- + drivers/hwtracing/coresight/coresight-etm.h | 2 - + drivers/hwtracing/coresight/coresight-etm3x-core.c | 27 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 4 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 38 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 1 - + drivers/hwtracing/coresight/coresight-funnel.c | 4 +- + drivers/hwtracing/coresight/coresight-priv.h | 9 +- + drivers/hwtracing/coresight/coresight-replicator.c | 2 +- + drivers/hwtracing/coresight/coresight-stm.c | 32 +- + drivers/hwtracing/coresight/coresight-sysfs.c | 391 +++++ + drivers/hwtracing/coresight/coresight-tmc-core.c | 4 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 46 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 33 +- + drivers/hwtracing/coresight/coresight-tmc.h | 2 - + drivers/hwtracing/coresight/coresight-tpda.c | 151 +- + drivers/hwtracing/coresight/coresight-tpda.h | 6 + + drivers/hwtracing/coresight/coresight-tpdm.c | 459 ++++- + drivers/hwtracing/coresight/coresight-tpdm.h | 114 ++ + drivers/hwtracing/coresight/coresight-tpiu.c | 16 +- + drivers/hwtracing/coresight/ultrasoc-smb.c | 24 +- + drivers/hwtracing/coresight/ultrasoc-smb.h | 2 - + drivers/hwtracing/ptt/hisi_ptt.c | 6 +- + drivers/iio/Kconfig | 9 + + drivers/iio/Makefile | 1 + + drivers/iio/accel/Kconfig | 8 +- + drivers/iio/accel/Makefile | 1 + + drivers/iio/accel/adxl367.c | 297 ++-- + drivers/iio/accel/adxl372_spi.c | 2 +- + drivers/iio/accel/bma180.c | 2 +- + drivers/iio/accel/bmc150-accel-i2c.c | 15 +- + drivers/iio/accel/bmc150-accel-spi.c | 3 +- + drivers/iio/accel/bmi088-accel-i2c.c | 70 + + drivers/iio/accel/da280.c | 66 +- + drivers/iio/accel/kxcjk-1013.c | 120 +- + drivers/iio/accel/kxsd9-spi.c | 2 +- + drivers/iio/accel/mma9551.c | 4 +- + drivers/iio/accel/mma9553.c | 4 +- + drivers/iio/accel/mxc4005.c | 5 +- + drivers/iio/accel/mxc6255.c | 4 +- + drivers/iio/accel/st_accel_i2c.c | 5 +- + drivers/iio/accel/stk8ba50.c | 4 +- + drivers/iio/adc/Kconfig | 26 +- + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/ad4130.c | 131 +- + drivers/iio/adc/ad7091r-base.c | 25 +- + drivers/iio/adc/ad9467.c | 267 ++- + drivers/iio/adc/ad_sigma_delta.c | 7 +- + drivers/iio/adc/adi-axi-adc.c | 407 ++--- + drivers/iio/adc/max1363.c | 161 +- + drivers/iio/adc/mcp320x.c | 31 +- + drivers/iio/adc/pac1934.c | 1636 ++++++++++++++++++ + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 1 - + drivers/iio/adc/rockchip_saradc.c | 17 +- + drivers/iio/adc/rtq6056.c | 275 ++- + drivers/iio/adc/ti-adc108s102.c | 4 +- + drivers/iio/adc/ti-ads1015.c | 2 +- + drivers/iio/adc/ti-ads1298.c | 771 +++++++++ + drivers/iio/adc/ti-ads8688.c | 2 +- + drivers/iio/amplifiers/hmc425a.c | 274 ++- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 11 +- + .../iio/common/inv_sensors/inv_sensors_timestamp.c | 2 +- + drivers/iio/dac/mcp4821.c | 2 +- + drivers/iio/dummy/iio_dummy_evgen.c | 2 - + drivers/iio/dummy/iio_simple_dummy.c | 193 ++- + drivers/iio/frequency/Kconfig | 10 + + drivers/iio/frequency/Makefile | 1 + + drivers/iio/frequency/admfm2000.c | 282 ++++ + drivers/iio/gyro/bmg160_i2c.c | 4 +- + drivers/iio/health/afe4403.c | 65 +- + drivers/iio/health/afe4404.c | 65 +- + drivers/iio/humidity/hdc3020.c | 451 +++-- + drivers/iio/humidity/hts221_i2c.c | 4 +- + drivers/iio/imu/adis16475.c | 8 +- + drivers/iio/imu/adis16480.c | 9 +- + drivers/iio/imu/bmi160/bmi160_i2c.c | 9 + + drivers/iio/imu/bmi323/bmi323_core.c | 78 +- + drivers/iio/imu/bmi323/bmi323_i2c.c | 21 + + drivers/iio/imu/fxos8700_i2c.c | 3 +- + drivers/iio/imu/fxos8700_spi.c | 3 +- + drivers/iio/imu/kmx61.c | 2 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 31 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 28 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 33 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 + + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h | 5 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 21 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 6 +- + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 4 +- + drivers/iio/industrialio-backend.c | 418 +++++ + drivers/iio/industrialio-core.c | 6 +- + drivers/iio/industrialio-gts-helper.c | 15 +- + drivers/iio/light/Kconfig | 5 +- + drivers/iio/light/al3010.c | 2 +- + drivers/iio/light/al3320a.c | 1 - + drivers/iio/light/as73211.c | 142 +- + drivers/iio/light/hid-sensor-als.c | 122 +- + drivers/iio/light/jsa1212.c | 4 +- + drivers/iio/light/ltr501.c | 3 +- + drivers/iio/light/max44000.c | 6 +- + drivers/iio/light/rpr0521.c | 4 +- + drivers/iio/light/stk3310.c | 4 +- + drivers/iio/light/us5182d.c | 4 +- + drivers/iio/light/vcnl4000.c | 36 +- + drivers/iio/light/vl6180.c | 1 - + drivers/iio/magnetometer/Kconfig | 12 + + drivers/iio/magnetometer/Makefile | 1 + + drivers/iio/magnetometer/af8133j.c | 528 ++++++ + drivers/iio/magnetometer/bmc150_magn_i2c.c | 3 +- + drivers/iio/magnetometer/bmc150_magn_spi.c | 3 +- + drivers/iio/magnetometer/mmc35240.c | 4 +- + drivers/iio/potentiometer/max5487.c | 4 +- + drivers/iio/pressure/Kconfig | 16 +- + drivers/iio/pressure/Makefile | 2 + + drivers/iio/pressure/hp206c.c | 6 +- + drivers/iio/pressure/hsc030pa.c | 49 +- + drivers/iio/pressure/hsc030pa.h | 7 + + drivers/iio/pressure/hsc030pa_i2c.c | 9 +- + drivers/iio/pressure/hsc030pa_spi.c | 7 +- + drivers/iio/pressure/mprls0025pa.c | 313 ++-- + drivers/iio/pressure/mprls0025pa.h | 102 ++ + drivers/iio/pressure/mprls0025pa_i2c.c | 100 ++ + drivers/iio/pressure/mprls0025pa_spi.c | 92 + + drivers/iio/pressure/st_pressure_i2c.c | 5 +- + drivers/iio/proximity/isl29501.c | 3 +- + drivers/iio/proximity/sx9310.c | 114 +- + drivers/iio/proximity/sx9324.c | 178 +- + drivers/iio/proximity/sx9360.c | 115 +- + drivers/iio/temperature/ltc2983.c | 28 +- + drivers/iio/temperature/tmp117.c | 9 + + drivers/iio/test/Kconfig | 14 + + drivers/iio/test/Makefile | 1 + + drivers/iio/test/iio-test-gts.c | 513 ++++++ + drivers/interconnect/core.c | 4 +- + drivers/interconnect/qcom/Kconfig | 18 + + drivers/interconnect/qcom/Makefile | 4 + + drivers/interconnect/qcom/icc-common.c | 3 +- + drivers/interconnect/qcom/icc-common.h | 3 +- + drivers/interconnect/qcom/msm8909.c | 1329 +++++++++++++++ + drivers/interconnect/qcom/sa8775p.c | 56 +- + drivers/interconnect/qcom/sm6115.c | 12 +- + drivers/interconnect/qcom/sm7150.c | 1754 ++++++++++++++++++++ + drivers/interconnect/qcom/sm7150.h | 140 ++ + drivers/interconnect/qcom/sm8250.c | 2 +- + drivers/interconnect/qcom/sm8550.c | 574 ------- + drivers/interconnect/qcom/sm8550.h | 284 ++-- + drivers/interconnect/qcom/x1e80100.c | 327 +--- + drivers/interconnect/samsung/exynos.c | 2 +- + drivers/ipack/ipack.c | 2 +- + drivers/mcb/mcb-core.c | 4 +- + drivers/memory/tegra/mc.c | 2 +- + drivers/memory/tegra/tegra124-emc.c | 2 +- + drivers/memory/tegra/tegra124.c | 2 +- + drivers/memory/tegra/tegra186-emc.c | 2 +- + drivers/memory/tegra/tegra20-emc.c | 2 +- + drivers/memory/tegra/tegra20.c | 2 +- + drivers/memory/tegra/tegra30-emc.c | 2 +- + drivers/memory/tegra/tegra30.c | 2 +- + drivers/misc/atmel-ssc.c | 6 +- + drivers/misc/cxl/of.c | 5 +- + drivers/misc/eeprom/eeprom_93xx46.c | 1 - + drivers/misc/eeprom/idt_89hpesx.c | 6 +- + drivers/misc/fastrpc.c | 6 +- + drivers/misc/hi6421v600-irq.c | 1 - + drivers/misc/hisi_hikey_usb.c | 7 +- + drivers/misc/hpilo.c | 8 +- + drivers/misc/mei/gsc-me.c | 22 +- + drivers/misc/mei/hdcp/Kconfig | 2 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 14 +- + drivers/misc/mei/pci-me.c | 38 +- + drivers/misc/mei/pci-txe.c | 40 +- + drivers/misc/mei/platform-vsc.c | 6 +- + drivers/misc/mei/pxp/Kconfig | 2 +- + drivers/misc/mei/pxp/mei_pxp.c | 14 +- + drivers/misc/mei/vsc-tp.c | 33 +- + drivers/misc/open-dice.c | 5 +- + drivers/misc/sram.c | 6 +- + drivers/misc/ti-st/st_kim.c | 5 +- + drivers/misc/tifm_core.c | 2 +- + drivers/misc/vcpu_stall_detector.c | 6 +- + drivers/misc/xilinx_sdfec.c | 5 +- + drivers/misc/xilinx_tmr_inject.c | 5 +- + drivers/most/core.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 + + drivers/net/ethernet/broadcom/cnic.c | 25 +- + drivers/net/ethernet/broadcom/cnic.h | 1 + + drivers/net/ethernet/broadcom/cnic_if.h | 1 + + drivers/nvmem/core.c | 5 + + drivers/nvmem/layouts.c | 2 +- + drivers/nvmem/meson-efuse.c | 25 +- + drivers/nvmem/mtk-efuse.c | 20 +- + drivers/nvmem/zynqmp_nvmem.c | 213 ++- + drivers/of/property.c | 2 + + drivers/parport/parport_amiga.c | 5 +- + drivers/parport/parport_sunbpp.c | 6 +- + drivers/platform/goldfish/Kconfig | 1 + + drivers/pps/generators/Makefile | 4 +- + drivers/siox/siox-core.c | 6 +- + drivers/slimbus/core.c | 6 +- + drivers/slimbus/qcom-ngd-ctrl.c | 8 +- + drivers/uio/uio.c | 47 + + drivers/uio/uio_dmem_genirq.c | 22 +- + drivers/uio/uio_pruss.c | 6 +- + include/dt-bindings/interconnect/qcom,msm8909.h | 93 ++ + .../dt-bindings/interconnect/qcom,sm7150-rpmh.h | 150 ++ + .../dt-bindings/interconnect/qcom,x1e80100-rpmh.h | 24 - + include/linux/cdx/cdx_bus.h | 53 +- + include/linux/coresight.h | 148 +- + include/linux/dio.h | 2 +- + include/linux/firmware/xlnx-zynqmp.h | 8 + + include/linux/greybus.h | 44 +- + include/linux/hid-sensor-ids.h | 4 + + include/linux/iio/adc/adi-axi-adc.h | 68 - + include/linux/iio/backend.h | 72 + + include/linux/iio/buffer-dmaengine.h | 3 + + include/linux/iio/iio.h | 30 +- + include/linux/interconnect-provider.h | 11 +- + include/linux/mhi.h | 19 - + include/linux/slimbus.h | 2 +- + include/linux/uio_driver.h | 13 + + include/soc/tegra/mc.h | 7 +- + tools/iio/iio_utils.c | 2 +- + 305 files changed, 15180 insertions(+), 4508 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-pac1934 + create mode 100644 Documentation/devicetree/bindings/iio/adc/microchip,pac1934.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads1298.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,admfm2000.yaml + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/voltafield,af8133j.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sm7150-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/nvmem-provider.yaml + delete mode 100644 Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml + create mode 100644 Documentation/iio/adis16475.rst + create mode 100644 Documentation/iio/iio_devbuf.rst + create mode 100644 drivers/bus/mhi/host/trace.h + create mode 100644 drivers/cdx/cdx_msi.c + create mode 100644 drivers/iio/accel/bmi088-accel-i2c.c + create mode 100644 drivers/iio/adc/pac1934.c + create mode 100644 drivers/iio/adc/ti-ads1298.c + create mode 100644 drivers/iio/frequency/admfm2000.c + create mode 100644 drivers/iio/industrialio-backend.c + create mode 100644 drivers/iio/magnetometer/af8133j.c + create mode 100644 drivers/iio/pressure/mprls0025pa.h + create mode 100644 drivers/iio/pressure/mprls0025pa_i2c.c + create mode 100644 drivers/iio/pressure/mprls0025pa_spi.c + create mode 100644 drivers/iio/test/iio-test-gts.c + create mode 100644 drivers/interconnect/qcom/msm8909.c + create mode 100644 drivers/interconnect/qcom/sm7150.c + create mode 100644 drivers/interconnect/qcom/sm7150.h + create mode 100644 include/dt-bindings/interconnect/qcom,msm8909.h + create mode 100644 include/dt-bindings/interconnect/qcom,sm7150-rpmh.h + delete mode 100644 include/linux/iio/adc/adi-axi-adc.h + create mode 100644 include/linux/iio/backend.h +Merging accel/habanalabs-next (576d7cc5a9e2 accel: constify the struct device_type usage) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Already up to date. +Merging coresight/next (a4f3057d19ff coresight-tpda: Change qcom,dsb-element-size to qcom,dsb-elem-bits) +$ 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 (6613476e225e Linux 6.8-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 (b1a91ca25f15 fpga: remove redundant checks for bridge ops) +$ 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 (7af14fe58e5e Merge branch 'icc-fixes' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + drivers/interconnect/core.c | 8 ++++++++ + drivers/interconnect/qcom/x1e80100.c | 26 -------------------------- + 2 files changed, 8 insertions(+), 26 deletions(-) +Merging iio/togreg (a696ab17dafe Merge branch 'togreg-cleanup' into HEAD) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging drivers/base/property.c +Auto-merging include/linux/property.h +Merge made by the 'ort' strategy. + drivers/base/property.c | 14 ---- + drivers/iio/accel/fxls8962af-core.c | 10 +-- + drivers/iio/accel/mma8452.c | 6 +- + drivers/iio/adc/ad7124.c | 55 ++++++-------- + drivers/iio/adc/ad7192.c | 38 +++++----- + drivers/iio/adc/ad7292.c | 13 ++-- + drivers/iio/adc/fsl-imx25-gcq.c | 140 +++++++++++++++--------------------- + drivers/iio/adc/hx711.c | 5 +- + drivers/iio/adc/max11410.c | 27 ++----- + drivers/iio/adc/rzg2l_adc.c | 11 +-- + drivers/iio/addac/ad74413r.c | 10 +-- + drivers/iio/dac/ltc2688.c | 28 +++----- + drivers/iio/temperature/ltc2983.c | 137 +++++++++++++---------------------- + include/linux/property.h | 22 +++++- + 14 files changed, 206 insertions(+), 310 deletions(-) +Merging phy-next/next (00ca8a15dafa phy: constify of_phandle_args in xlate) +$ 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 (e17aae16acf5 soundwire: Use snd_soc_substream_to_rtd() to obtain rtd) +$ 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 (abe83c4e5e4f extcon: realtek: Remove unused of_gpio.h) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + drivers/extcon/Kconfig | 3 ++- + drivers/extcon/extcon-adc-jack.c | 6 ++---- + drivers/extcon/extcon-intel-cht-wc.c | 6 ++---- + drivers/extcon/extcon-intel-mrfld.c | 26 +++++++++----------------- + drivers/extcon/extcon-max3355.c | 6 ++---- + drivers/extcon/extcon-max77843.c | 6 ++---- + drivers/extcon/extcon-rtk-type-c.c | 1 - + drivers/extcon/extcon-usb-gpio.c | 6 ++---- + drivers/extcon/extcon-usbc-cros-ec.c | 6 ++---- + 9 files changed, 23 insertions(+), 43 deletions(-) +Merging gnss/gnss-next (54be6c6c5ae8 Linux 6.8-rc3) +$ 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 (7447d911af69 vfio/fsl-mc: Block calling interrupt handler without trigger) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (d97d263132a6 w1: w1-gpio: Convert to platform remove callback returning void) +$ 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 spmi/spmi-next (b85ea95d0864 Linux 6.7-rc1) +$ git merge -m Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (68bb540b1aef staging: greybus: Replaces directive __attribute__((packed)) by __packed as suggested by checkpatch) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/staging/fbtft/fbtft-core.c +Auto-merging drivers/staging/greybus/light.c +Merge made by the 'ort' strategy. + drivers/staging/Kconfig | 4 - + drivers/staging/Makefile | 2 - + drivers/staging/axis-fifo/axis-fifo.c | 7 +- + drivers/staging/board/Kconfig | 12 - + drivers/staging/board/Makefile | 4 - + drivers/staging/board/TODO | 2 - + drivers/staging/board/armadillo800eva.c | 88 - + drivers/staging/board/board.c | 204 -- + drivers/staging/board/board.h | 46 - + drivers/staging/board/kzm9d.c | 26 - + drivers/staging/emxx_udc/Kconfig | 11 - + drivers/staging/emxx_udc/Makefile | 2 - + drivers/staging/emxx_udc/TODO | 6 - + drivers/staging/emxx_udc/emxx_udc.c | 3223 -------------------- + drivers/staging/emxx_udc/emxx_udc.h | 554 ---- + drivers/staging/fbtft/fbtft-core.c | 2 - + drivers/staging/fieldbus/anybuss/arcx-anybus.c | 6 +- + drivers/staging/fieldbus/anybuss/host.c | 2 +- + drivers/staging/fieldbus/dev_core.c | 8 +- + drivers/staging/gdm724x/gdm_lte.c | 2 +- + drivers/staging/greybus/audio_apbridgea.h | 1 - + drivers/staging/greybus/audio_manager.c | 8 +- + drivers/staging/greybus/audio_topology.c | 3 - + drivers/staging/greybus/authentication.c | 6 +- + drivers/staging/greybus/bootrom.c | 8 +- + drivers/staging/greybus/fw-download.c | 15 +- + drivers/staging/greybus/fw-management.c | 20 +- + drivers/staging/greybus/gbphy.c | 8 +- + drivers/staging/greybus/greybus_authentication.h | 6 +- + drivers/staging/greybus/greybus_firmware.h | 8 +- + drivers/staging/greybus/light.c | 8 +- + drivers/staging/greybus/loopback.c | 6 +- + drivers/staging/greybus/raw.c | 6 +- + drivers/staging/greybus/vibrator.c | 6 +- + drivers/staging/nvec/TODO | 7 +- + drivers/staging/nvec/nvec.c | 7 +- + drivers/staging/octeon/ethernet-mdio.c | 2 - + drivers/staging/octeon/octeon-stubs.h | 2 +- + drivers/staging/pi433/pi433_if.c | 1 + + drivers/staging/pi433/rf69.c | 4 +- + drivers/staging/pi433/rf69.h | 4 - + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 103 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 1 - + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 64 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 37 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 4 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 70 +- + drivers/staging/rtl8192e/rtl819x_HT.h | 6 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 44 +- + drivers/staging/rtl8192e/rtl819x_Qos.h | 2 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 30 +- + drivers/staging/rtl8192e/rtllib.h | 98 +- + drivers/staging/rtl8192e/rtllib_rx.c | 50 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 278 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 8 +- + drivers/staging/rtl8192e/rtllib_tx.c | 18 +- + drivers/staging/rtl8192e/rtllib_wx.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 9 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 3 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 14 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 61 +- + .../vc04_services/interface/vchiq_arm/vchiq_bus.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_bus.h | 2 +- + drivers/staging/vme_user/vme.c | 2 +- + drivers/staging/vme_user/vme.h | 2 +- + drivers/staging/vme_user/vme_tsi148.h | 6 +- + drivers/staging/vt6655/card.c | 74 +- + drivers/staging/vt6655/rxtx.h | 1 - + include/linux/greybus/greybus_protocols.h | 8 +- + 72 files changed, 537 insertions(+), 4820 deletions(-) + delete mode 100644 drivers/staging/board/Kconfig + delete mode 100644 drivers/staging/board/Makefile + delete mode 100644 drivers/staging/board/TODO + delete mode 100644 drivers/staging/board/armadillo800eva.c + delete mode 100644 drivers/staging/board/board.c + delete mode 100644 drivers/staging/board/board.h + delete mode 100644 drivers/staging/board/kzm9d.c + delete mode 100644 drivers/staging/emxx_udc/Kconfig + delete mode 100644 drivers/staging/emxx_udc/Makefile + delete mode 100644 drivers/staging/emxx_udc/TODO + delete mode 100644 drivers/staging/emxx_udc/emxx_udc.c + delete mode 100644 drivers/staging/emxx_udc/emxx_udc.h +Merging counter-next/counter-next (eca588187f91 counter: ti-eqep: Convert to platform remove callback returning void) +$ 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 MAINTAINERS +Auto-merging drivers/counter/counter-core.c +Merge made by the 'ort' strategy. + MAINTAINERS | 30 +-- + drivers/counter/counter-core.c | 4 +- + drivers/counter/stm32-timer-cnt.c | 461 ++++++++++++++++++++++++++++++++++++-- + drivers/counter/ti-ecap-capture.c | 6 +- + drivers/counter/ti-eqep.c | 6 +- + include/linux/counter.h | 4 +- + include/linux/mfd/stm32-timers.h | 13 ++ + 7 files changed, 484 insertions(+), 40 deletions(-) +Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions) +$ git merge -m Merge branch 'siox/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git siox/siox/for-next +Auto-merging drivers/siox/siox-core.c +Merge made by the 'ort' strategy. + drivers/siox/siox-bus-gpio.c | 62 ++++++++++++++------------------------------ + drivers/siox/siox-core.c | 46 ++++++++++++++++++++++++++++++++ + drivers/siox/siox.h | 4 +++ + 3 files changed, 70 insertions(+), 42 deletions(-) +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 (716141d366f4 dmaengine: of: constify of_phandle_args in of_dma_find_controller()) +$ 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 (13eb1d6e1cfc Merge branch 'for-6.8-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. +Merging scsi/for-next (af180c0880f9 scsi: scsi_debug: Maintain write statistics per group number) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/scsi/scsi.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/scsi_sysfs.c +Auto-merging drivers/scsi/sd.c +Auto-merging include/scsi/scsi_device.h +Merge made by the 'ort' strategy. + drivers/scsi/Kconfig | 5 + + drivers/scsi/Makefile | 2 + + drivers/scsi/scsi.c | 2 + + drivers/scsi/scsi_debug.c | 293 +++++++++++++++++++++++++++++++---------- + drivers/scsi/scsi_proto_test.c | 56 ++++++++ + drivers/scsi/scsi_sysfs.c | 10 ++ + drivers/scsi/sd.c | 111 +++++++++++++++- + drivers/scsi/sd.h | 3 + + include/scsi/scsi_device.h | 1 + + include/scsi/scsi_proto.h | 78 +++++++++++ + 10 files changed, 490 insertions(+), 71 deletions(-) + create mode 100644 drivers/scsi/scsi_proto_test.c +Merging scsi-mkp/for-next (52d8210ea45d Merge patch series "Update lpfc to revision 14.4.0.1") +$ 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/lpfc/lpfc_scsi.c +Auto-merging drivers/ufs/host/ufs-qcom.c +Merge made by the 'ort' strategy. + drivers/scsi/ch.c | 20 ++--- + drivers/scsi/cxlflash/main.c | 17 ++-- + drivers/scsi/libsas/sas_expander.c | 51 ++++++++---- + drivers/scsi/lpfc/lpfc.h | 2 +- + drivers/scsi/lpfc/lpfc_attr.c | 4 +- + drivers/scsi/lpfc/lpfc_bsg.c | 40 +++++----- + drivers/scsi/lpfc/lpfc_debugfs.c | 12 +-- + drivers/scsi/lpfc/lpfc_els.c | 45 +++++------ + drivers/scsi/lpfc/lpfc_hbadisc.c | 33 ++++---- + drivers/scsi/lpfc/lpfc_init.c | 13 ++-- + drivers/scsi/lpfc/lpfc_mbox.c | 30 +++----- + drivers/scsi/lpfc/lpfc_nportdisc.c | 12 +-- + drivers/scsi/lpfc/lpfc_nvme.c | 4 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- + drivers/scsi/lpfc/lpfc_scsi.c | 23 +----- + drivers/scsi/lpfc/lpfc_sli.c | 99 ++++++++++++------------ + drivers/scsi/lpfc/lpfc_sli.h | 30 ++++++-- + drivers/scsi/lpfc/lpfc_sli4.h | 7 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 10 +-- + drivers/scsi/pmcraid.c | 20 ++--- + drivers/scsi/qla2xxx/qla_attr.c | 14 +++- + drivers/scsi/qla2xxx/qla_def.h | 2 +- + drivers/scsi/qla2xxx/qla_gbl.h | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 128 ++++++++++++++++--------------- + drivers/scsi/qla2xxx/qla_iocb.c | 68 ++++++++++------ + drivers/scsi/qla2xxx/qla_mbx.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 3 +- + drivers/scsi/qla2xxx/qla_target.c | 10 +++ + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/sg.c | 18 ++--- + drivers/scsi/st.c | 4 +- + drivers/target/iscsi/iscsi_target_erl1.c | 3 +- + drivers/ufs/core/ufs-mcq.c | 2 +- + drivers/ufs/host/ufs-qcom.c | 6 +- + include/ufs/ufshcd.h | 1 + + 36 files changed, 401 insertions(+), 342 deletions(-) +Merging vhost/linux-next (894452180d73 vduse: enable Virtio-net device type) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Merge made by the 'ort' strategy. + drivers/vdpa/vdpa_user/vduse_dev.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) +Merging rpmsg/for-next (929654e8f1ad Merge branches 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging drivers/remoteproc/imx_dsp_rproc.c +CONFLICT (content): Merge conflict in drivers/remoteproc/imx_dsp_rproc.c +Auto-merging drivers/remoteproc/imx_rproc.c +Resolved 'drivers/remoteproc/imx_dsp_rproc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cd6c2955f58a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/remoteproc/qcom,sm8550-pas.yaml | 45 +++++- + drivers/remoteproc/imx_dsp_rproc.c | 11 +- + drivers/remoteproc/imx_rproc.c | 16 +-- + drivers/remoteproc/qcom_q6v5_pas.c | 150 +++++++++++++++----- + drivers/remoteproc/remoteproc_core.c | 29 +++- + drivers/remoteproc/remoteproc_virtio.c | 6 +- + drivers/remoteproc/st_remoteproc.c | 15 +- + drivers/remoteproc/stm32_rproc.c | 10 +- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 156 +++++++-------------- + drivers/rpmsg/rpmsg_char.c | 12 +- + drivers/rpmsg/rpmsg_core.c | 2 +- + drivers/rpmsg/rpmsg_ctrl.c | 12 +- + 12 files changed, 271 insertions(+), 193 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 (8636f19c2d1f gpio: sysfs: repair export returning -EPERM on 1st attempt) +$ 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 +Already up to date. +Merging gpio-intel/for-next (6613476e225e Linux 6.8-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 (34675dc3a7c6 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 +Merge made by the 'ort' strategy. +Merging pinctrl-intel/for-next (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (a6f06b909fee pinctrl: renesas: Allow the compiler to optimize away sh_pfc_pm) +$ 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 +Already up to date. +Merging pinctrl-samsung/for-next (6613476e225e Linux 6.8-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/pwm/for-next (dd6c6d57ab61 pwm: imx-tpm: fix probe crash due to access registers without clock) +$ git merge -m Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Already up to date. +Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type) +$ 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 (5d94da7ff00e kselftest: Add basic test for probing the rust sample modules) +$ 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 (6613476e225e Linux 6.8-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 (806cb2270237 kunit: Annotate _MSG assertion variants with gnu printf specifiers) +$ 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 (602bf1830798 Merge branch 'for-6.7' 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 (f0109900462d dt-bindings: rtc: zynqmp: Add support for Versal/Versal NET SoCs) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/rtc/abracon,abx80x.txt | 31 -- + .../devicetree/bindings/rtc/abracon,abx80x.yaml | 98 ++++++ + .../bindings/rtc/atmel,at91sam9260-rtt.yaml | 4 +- + .../bindings/rtc/mediatek,mt2712-rtc.yaml | 39 +++ + .../bindings/rtc/mediatek,mt7622-rtc.yaml | 52 ++++ + .../devicetree/bindings/rtc/rtc-mt2712.txt | 14 - + .../devicetree/bindings/rtc/rtc-mt7622.txt | 21 -- + .../devicetree/bindings/rtc/xlnx,zynqmp-rtc.yaml | 11 +- + MAINTAINERS | 4 +- + drivers/rtc/Kconfig | 3 +- + drivers/rtc/class.c | 21 +- + drivers/rtc/interface.c | 2 +- + drivers/rtc/rtc-ds1511.c | 342 +++++++-------------- + drivers/rtc/rtc-m41t80.c | 5 +- + drivers/rtc/rtc-max31335.c | 2 +- + drivers/rtc/rtc-nct3018y.c | 6 +- + drivers/rtc/rtc-pcf8523.c | 25 ++ + include/linux/rtc.h | 2 +- + kernel/power/suspend_test.c | 2 +- + kernel/time/alarmtimer.c | 2 +- + 20 files changed, 358 insertions(+), 328 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/rtc/abracon,abx80x.txt + create mode 100644 Documentation/devicetree/bindings/rtc/abracon,abx80x.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/mediatek,mt2712-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/mediatek,mt7622-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-mt2712.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-mt7622.txt +Merging nvdimm/libnvdimm-for-next (d9212b35da52 dax: remove SLAB_MEM_SPREAD flag usage) +$ 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 (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/test/ntb_perf.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging seccomp/for-next/seccomp (56af94aace8a samples: user-trap: fix strict-aliasing warning) +$ 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 (c5eeb63edac9 fsi: Fix panic on scom file read) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Merge made by the 'ort' strategy. + drivers/fsi/fsi-sbefifo.c | 9 ++++++++- + drivers/fsi/i2cr-scom.c | 11 ++++++++++- + 2 files changed, 18 insertions(+), 2 deletions(-) +Merging slimbus/for-next (6613476e225e Linux 6.8-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 (6613476e225e Linux 6.8-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 (b967df629351 hyperv-tlfs: Rename some HV_REGISTER_* defines for consistency) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging arch/x86/hyperv/hv_vtl.c +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'ort' strategy. + arch/arm64/hyperv/hv_core.c | 14 ++-- + arch/arm64/hyperv/mshyperv.c | 20 +++-- + arch/arm64/include/asm/hyperv-tlfs.h | 45 +++++------ + arch/arm64/include/asm/mshyperv.h | 4 +- + arch/x86/hyperv/hv_init.c | 8 +- + arch/x86/hyperv/hv_vtl.c | 19 ++++- + arch/x86/include/asm/hyperv-tlfs.h | 145 ++++++++++++++++++----------------- + arch/x86/include/asm/mshyperv.h | 30 ++++---- + arch/x86/kernel/cpu/mshyperv.c | 92 +++++++++++----------- + drivers/clocksource/hyperv_timer.c | 26 +++---- + drivers/hv/Kconfig | 1 + + drivers/hv/hv.c | 36 ++++----- + drivers/hv/hv_common.c | 30 +++++--- + drivers/hv/vmbus_drv.c | 5 +- + include/asm-generic/hyperv-tlfs.h | 55 ++++++++++++- + include/asm-generic/mshyperv.h | 4 +- + 16 files changed, 299 insertions(+), 235 deletions(-) +Merging auxdisplay/for-next (5d9e12972259 auxdisplay: img-ascii-lcd: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Already up to date. +Merging kgdb/kgdb/for-next (4f41d30cd6dc kdb: Fix a potential buffer overflow in kdb_local()) +$ 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 (6613476e225e Linux 6.8-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 (2ec11b5d6d90 bus: mhi: host: pci_generic: constify modem_telit_fn980_hw_v1_config) +$ 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 (2159bd4e9057 memblock: Return NUMA_NO_NODE instead of -1 to improve code readability) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging cxl/next (ed1ff2fba7af Merge branch 'for-6.9/cxl-einj' into for-6.9/cxl) +$ 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 (3f832dfb8a8e zstd: fix g_debuglevel export warning) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Merge made by the 'ort' strategy. + include/linux/zstd.h | 2 +- + include/linux/zstd_errors.h | 23 +- + include/linux/zstd_lib.h | 697 ++++++++-- + lib/zstd/Makefile | 2 +- + lib/zstd/common/allocations.h | 56 + + lib/zstd/common/bits.h | 149 ++ + lib/zstd/common/bitstream.h | 53 +- + lib/zstd/common/compiler.h | 14 +- + lib/zstd/common/cpu.h | 3 +- + lib/zstd/common/debug.c | 5 +- + lib/zstd/common/debug.h | 3 +- + lib/zstd/common/entropy_common.c | 42 +- + lib/zstd/common/error_private.c | 12 +- + lib/zstd/common/error_private.h | 3 +- + lib/zstd/common/fse.h | 89 +- + lib/zstd/common/fse_decompress.c | 94 +- + lib/zstd/common/huf.h | 234 +--- + lib/zstd/common/mem.h | 2 +- + lib/zstd/common/portability_macros.h | 26 +- + lib/zstd/common/zstd_common.c | 38 +- + lib/zstd/common/zstd_deps.h | 16 +- + lib/zstd/common/zstd_internal.h | 99 +- + lib/zstd/compress/clevels.h | 3 +- + lib/zstd/compress/fse_compress.c | 59 +- + lib/zstd/compress/hist.c | 3 +- + lib/zstd/compress/hist.h | 3 +- + lib/zstd/compress/huf_compress.c | 372 +++-- + lib/zstd/compress/zstd_compress.c | 1758 +++++++++++++++++------- + lib/zstd/compress/zstd_compress_internal.h | 333 +++-- + lib/zstd/compress/zstd_compress_literals.c | 155 ++- + lib/zstd/compress/zstd_compress_literals.h | 25 +- + lib/zstd/compress/zstd_compress_sequences.c | 7 +- + lib/zstd/compress/zstd_compress_sequences.h | 3 +- + lib/zstd/compress/zstd_compress_superblock.c | 47 +- + lib/zstd/compress/zstd_compress_superblock.h | 3 +- + lib/zstd/compress/zstd_cwksp.h | 149 +- + lib/zstd/compress/zstd_double_fast.c | 129 +- + lib/zstd/compress/zstd_double_fast.h | 6 +- + lib/zstd/compress/zstd_fast.c | 578 ++++++-- + lib/zstd/compress/zstd_fast.h | 6 +- + lib/zstd/compress/zstd_lazy.c | 518 +++---- + lib/zstd/compress/zstd_lazy.h | 7 +- + lib/zstd/compress/zstd_ldm.c | 11 +- + lib/zstd/compress/zstd_ldm.h | 3 +- + lib/zstd/compress/zstd_ldm_geartab.h | 3 +- + lib/zstd/compress/zstd_opt.c | 187 +-- + lib/zstd/compress/zstd_opt.h | 3 +- + lib/zstd/decompress/huf_decompress.c | 772 +++++++---- + lib/zstd/decompress/zstd_ddict.c | 9 +- + lib/zstd/decompress/zstd_ddict.h | 3 +- + lib/zstd/decompress/zstd_decompress.c | 259 +++- + lib/zstd/decompress/zstd_decompress_block.c | 283 ++-- + lib/zstd/decompress/zstd_decompress_block.h | 8 +- + lib/zstd/decompress/zstd_decompress_internal.h | 7 +- + lib/zstd/decompress_sources.h | 2 +- + lib/zstd/zstd_common_module.c | 5 +- + lib/zstd/zstd_compress_module.c | 2 +- + lib/zstd/zstd_decompress_module.c | 4 +- + 58 files changed, 4791 insertions(+), 2596 deletions(-) + create mode 100644 lib/zstd/common/allocations.h + create mode 100644 lib/zstd/common/bits.h +Merging efi/next (b3810c5a2cc4 x86/efistub: Clear decompressor BSS in native EFI entrypoint) +$ 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 (0131c1f3cce7 unicode: make utf8 test count static) +$ 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/utf8-selftest.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging slab/slab/for-next (78e2606d5f55 Merge branch 'slab/for-6.9/slab-flag-cleanups' into slab/for-next) +$ 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 +Merge made by the 'ort' strategy. +Merging random/master (1f719a2f3fa6 Merge tag 'net-6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ 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 (a17c60e533f5 samples/landlock: Don't error out if a file path cannot be opened) +$ 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 (768409cff6cc rust: upgrade to Rust 1.76.0) +$ 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 (4f1136a55dc8 scripts: check-sysctl-docs: handle per-namespace sysctls) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (472874cf7bb3 selftests/exec: Convert remaining /bin/sh to /bin/bash) +$ 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 +Merge made by the 'ort' strategy. + tools/testing/selftests/exec/Makefile | 4 +- + tools/testing/selftests/exec/binfmt_script.py | 10 ++++- + tools/testing/selftests/exec/execveat.c | 12 +++--- + tools/testing/selftests/exec/load_address.c | 36 ++++++++--------- + tools/testing/selftests/exec/recursion-depth.c | 53 +++++++++++++------------- + 5 files changed, 60 insertions(+), 55 deletions(-) +Merging bitmap/bitmap-for-next (fd8ed16c2419 bitmap: Step down as a reviewer) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + include/linux/find.h | 8 ++++---- + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging hte/for-next (b85ea95d0864 Linux 6.7-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 (8d8b79685237 overflow: Change DEFINE_FLEX to take __counted_by member) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging arch/Kconfig +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + arch/Kconfig | 2 +- + arch/x86/tools/relocs.c | 10 ++++++++++ + drivers/net/ethernet/intel/ice/ice_base.c | 4 ++-- + drivers/net/ethernet/intel/ice/ice_common.c | 4 ++-- + drivers/net/ethernet/intel/ice/ice_ddp.c | 8 ++++---- + drivers/net/ethernet/intel/ice/ice_lag.c | 6 +++--- + drivers/net/ethernet/intel/ice/ice_sched.c | 4 ++-- + drivers/net/ethernet/intel/ice/ice_switch.c | 10 +++++----- + include/linux/overflow.h | 25 +++++++++++++++++++++---- + lib/Kconfig.debug | 12 ------------ + lib/Kconfig.ubsan | 2 ++ + lib/memcpy_kunit.c | 3 --- + lib/overflow_kunit.c | 19 +++++++++++++++++++ + 13 files changed, 71 insertions(+), 38 deletions(-) +Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) +$ 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 (6613476e225e Linux 6.8-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 tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) +$ git merge -m Merge branch 'tsm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux tsm/tsm-next +Already up to date. +Merging iommufd/for-next (6613476e225e Linux 6.8-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. +Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT) +$ git merge -m Merge branch 'header_cleanup' of https://evilpiepirate.org/git/bcachefs.git header_cleanup/header_cleanup +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..9cbe214c633b --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20240320 |