diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-03-26 16:17:47 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-03-26 16:17:47 +1100 |
| commit | 084c8e315db34b59d38d06e684b1a0dd07d30287 (patch) | |
| tree | 1942f41df36516a206e415998f2a74a77b7ed5de | |
| parent | 08c1b26ef2188ba69c289f8d50f1738562c0679a (diff) | |
Add linux-next specific files for 20240326next-20240326
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 374 | ||||
| -rw-r--r-- | Next/Trees | 376 | ||||
| -rw-r--r-- | Next/merge.log | 3027 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 3778 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..a79b59cc34b1 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,374 @@ +Name SHA1 +---- ---- +origin 928a87efa42302a23bb9554be081a28058495f22 +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes 0deca7adb6bd6f426e6b2cfaaa394e9590be066e +kbuild-current bfa8f18691ed2e978e4dd51190569c434f93e268 +arc-current 861deac3b092f37b2c5e6871732f3e11486f7082 +arm-current 0c66c6f4e21cb22220cbd8821c5c73fc157d20dc +arm64-fixes 4cece764965020c22cff7665b18a012006359095 +arm-soc-fixes 1c7cfb6158f6678374ed42393b013b379b4c3964 +davinci-current 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory-fixes 4cece764965020c22cff7665b18a012006359095 +sophgo-fixes 4cece764965020c22cff7665b18a012006359095 +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current e8a7824856def1c8608401b0d7d05566d6e81c95 +powerpc-fixes 380cb2f4df78433f64847cbc655fad2650e4769c +s390-fixes 4cece764965020c22cff7665b18a012006359095 +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net c2deb2e971f5d9aca941ef13ee05566979e337a4 +bpf 443574b033876c85a35de4c65c14f7fe092222b2 +ipsec f411e25005928a6fd3e390a01059e1dabf3aec2b +netfilter f99c5f563c174a49ea1cbf4754539b05cfde40c4 +ipvs 7eaf837a4eb5f74561e2486972e7f5184b613f6e +wireless dbde9fd49aafc9a09480db2a827159b109042e1a +wpan b85ea95d086471afb4ad062012a4d73cd328fa86 +rdma-fixes 4cece764965020c22cff7665b18a012006359095 +sound-current cafe9c6a72cf1ffe96d2561d988a141cb5c093db +sound-asoc-fixes db0da4a4ae7e3c80007b3c193da57f453ba8ed3e +regmap-fixes 4cece764965020c22cff7665b18a012006359095 +regulator-fixes 4cece764965020c22cff7665b18a012006359095 +spi-fixes 4cece764965020c22cff7665b18a012006359095 +pci-current 4cece764965020c22cff7665b18a012006359095 +driver-core.current 4cece764965020c22cff7665b18a012006359095 +tty.current 4cece764965020c22cff7665b18a012006359095 +usb.current 4cece764965020c22cff7665b18a012006359095 +usb-serial-fixes d206a76d7d2726f3b096037f2079ce0bd3ba329b +phy 47b412c1ea77112f1148b4edd71700a388c7c80f +staging.current f37e76abd614b68987abc8e5c22d986013349771 +iio-fixes 11dadb631007324c7a8bcb2650eda88ed2b9eed0 +counter-current c83ccdc9586b3e9882da9e27507c046751999d59 +char-misc.current 4cece764965020c22cff7665b18a012006359095 +soundwire-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +thunderbolt-fixes 4cece764965020c22cff7665b18a012006359095 +input-current 57ed9567e63b59350c21ae026635ae051e247abb +crypto-current 5a7e89d3315d1be86aff8a8bf849023cda6547f7 +vfio-fixes 4ea95c04fa6b9043a1a301240996aeebe3cb28ec +kselftest-fixes 4cece764965020c22cff7665b18a012006359095 +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes 90d35da658da8cff0d4ecbb5113f5fac9d00eb72 +backlight-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +mtd-fixes b0a53dc56c145b8b2c13b43eba2c9ef0507f9840 +mfd-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +v4l-dvb-fixes 346c84e281a963437b9fe9dfcd92c531630289de +reset-fixes 4a6756f56bcf8e64c87144a626ce53aea4899c0e +mips-fixes 4cece764965020c22cff7665b18a012006359095 +at91-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +omap-fixes 9b6a51aab5f5f9f71d2fa16e8b4d530e1643dfcb +kvm-fixes bf3a69c6861ff4dc7892d895c87074af7bc1c400 +kvms390-fixes 83303a4c776ce1032d88df59e811183479acea77 +hwmon-fixes 4cece764965020c22cff7665b18a012006359095 +nvdimm-fixes 33908660e814203e996f6e775d033c5c32fcf9a7 +cxl-fixes d206a76d7d2726f3b096037f2079ce0bd3ba329b +btrfs-fixes f4eb870642000354b10f87a19376ffba8715f2b9 +vfs-fixes aa23317d0268b309bb3f0801ddd0d61813ff5afb +dma-mapping-fixes d5090484b021794271280ab64d20253883b7f6fd +drivers-x86-fixes 4cece764965020c22cff7665b18a012006359095 +samsung-krzk-fixes 4cece764965020c22cff7665b18a012006359095 +pinctrl-samsung-fixes 4cece764965020c22cff7665b18a012006359095 +devicetree-fixes 3d9b8e6db9bda4463bbf2a97411f0716215254da +dt-krzk-fixes 4cece764965020c22cff7665b18a012006359095 +scsi-fixes ee0017c3ed8a8abfa4d40e42f908fb38c31e7515 +drm-fixes 4cece764965020c22cff7665b18a012006359095 +drm-intel-fixes e8f897f4afef0031fe618a8e94127a0934896aba +mmc-fixes 03749309909935070253accab314288d332a204d +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +hyperv-fixes 1f1dc442c57ec61c08d21d47e4c5b4f16446fe00 +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes 4cece764965020c22cff7665b18a012006359095 +riscv-dt-fixes 2672031b20f6681514bef14ddcfe8c62c2757d11 +riscv-soc-fixes d206a76d7d2726f3b096037f2079ce0bd3ba329b +fpga-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +spdx 4cece764965020c22cff7665b18a012006359095 +gpio-brgl-fixes 4cece764965020c22cff7665b18a012006359095 +gpio-intel-fixes 4cece764965020c22cff7665b18a012006359095 +pinctrl-intel-fixes 4cece764965020c22cff7665b18a012006359095 +auxdisplay-fixes 4cece764965020c22cff7665b18a012006359095 +erofs-fixes 8cdac422e39781869169b1eb4b61b6d5a512233d +kunit-fixes 4cece764965020c22cff7665b18a012006359095 +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 6a9531c3a88096a26cf3ac582f7ec44f94a7dcb2 +nfsd-fixes 6978bd6a913825eaf06629a02fc820d240d5fec6 +renesas-fixes 8c987693dc2d292d777f1be63cb35233049ae25e +perf-current 0f66dfe7b91d2743cc71dfff37af503215b204ef +efi-fixes cb82ca59b616695c0037fa60f4a54f2b18ea5ae1 +zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb +battery-fixes 4cece764965020c22cff7665b18a012006359095 +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +iommufd-fixes 4cece764965020c22cff7665b18a012006359095 +rust-fixes 4cece764965020c22cff7665b18a012006359095 +v9fs-fixes 6630036b7c228f57c7893ee0403e92c2db2cd21d +w1-fixes 4cece764965020c22cff7665b18a012006359095 +pmdomain-fixes 2a93c6cbd5a703d44c414a3c3945a87ce11430ba +overlayfs-fixes 77a28aa476873048024ad56daf8f4f17d58ee48e +i2c-host-fixes a5894bc48f64caa86dbea1744d067c925303c5fc +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +drm-misc-fixes a8eb93b42d7e068306ca07f51055cbcde893fea3 +mm-stable 1dd4505cf4c8c3bffaf762d2c2d7c443a52275f0 +mm-nonmm-stable 4cece764965020c22cff7665b18a012006359095 +mm bd2a8827fe72e335f25242fb3d7e7f045e1e3514 +kbuild bfa8f18691ed2e978e4dd51190569c434f93e268 +clang-format 5a205c6a9f79d14db38006aa2d7c4f4e76b1bfc7 +perf 1bbeaf83dd7b5e3628b98bec66ff8fe2646e14aa +compiler-attributes 2993eb7a8d34aee6165e1f6676e81cdf1d22aa62 +dma-mapping 14cebf689a78e8a1c041138af221ef6eac6bc7da +asm-generic 5394f1e9b687bcf26595cabf83483e568676128d +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm 5616fee8981b838d56c8d85a63047c2c003ecc9d +arm64 1d63d1d9e5c5cb2e7c7ca75751a5eaf67c5623a7 +arm-perf b037e40a6af2b056f7f15d9aabe7e9a9a7149ff3 +arm-soc 72ebb41b88f9d7c10c5e159e0507074af0a22fe2 +amlogic 4cece764965020c22cff7665b18a012006359095 +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed 0c30853731ec7e70941cf008bf5227fb9e327810 +at91 6315946ad24244f076605a01352e0ac367b9eff8 +broadcom bbfdba3d4757f99fa0f85071f4e7346d041b1455 +davinci 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory e23359d88a81679e7c55d221e7cb4c39abf5d760 +imx-mxs edb0d16255f62fefb0bc56c87b3395dc2f866354 +mediatek ba90af39ba57b3fe3ecfdba0c87a80d20c7b788d +mvebu 6b6f1082cb46d72823b7ea99c058c601668ba1d3 +omap 69f4343fc41d51ef26f5e4ff0fc856f803ae4a8d +qcom 6d5a4668a830fc8ecfb12dcced83c806ccd0fe30 +renesas 01fdf7d6f1504ba6a93e7d8eacb27d45dc995325 +reset 6d89df61650d155b9033d9f507f3580f9177e623 +rockchip c700a8f83706b0183963fd1d861ce08df7dbd1d5 +samsung-krzk ea3ca48c0c18d20138ea64dbd89780fdcadcec38 +scmi ecafcea8fbfb07baf643f9d714303a9d83a30242 +sophgo 4cece764965020c22cff7665b18a012006359095 +stm32 a7b9ab6c880d4ce2c216f14482a6d3e24fc0c87a +sunxi c1d7282e4e920ca2caea6147162ef77ca2fdea6e +tee 746ef0fac697b952d3991436d8eafd6cc7cede6c +tegra c85c30fad06dabdefbf59911ed303553e77490f2 +ti 4cece764965020c22cff7665b18a012006359095 +xilinx 2d81f5ef567ce96f29e698939673226d2d1b0fcb +clk 3066c521be9db14964d78c6c431c97a424468ded +clk-imx 13269dc6c70444528f0093585e3559cd2f38850a +clk-renesas 81a7a88a98062ffcd8d7d5ac3b540a96dbff5490 +csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b +loongarch 18b722527e2c919769d21beb8d78fb0123a0e305 +m68k e8a7824856def1c8608401b0d7d05566d6e81c95 +m68knommu 4cece764965020c22cff7665b18a012006359095 +microblaze 6613476e225e090cc9aad49be7fa504e290dd33d +mips 4cece764965020c22cff7665b18a012006359095 +openrisc 7f1e2fc493480086fbb375f4f6d33cb93fc069d6 +parisc-hd e8f897f4afef0031fe618a8e94127a0934896aba +powerpc 5c4233cc0920cc90787aafe950b90f6c57a35b88 +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v 4cece764965020c22cff7665b18a012006359095 +riscv-dt 28ecaaa5af192fa8a3f406e5a3e5416324c4d0a5 +riscv-soc 6613476e225e090cc9aad49be7fa504e290dd33d +s390 4cece764965020c22cff7665b18a012006359095 +sh 4cece764965020c22cff7665b18a012006359095 +sparc 84b76d05828a1909e20d0f66553b876b801f98c8 +uml 83aec96c631e0fa75cfe6d6a1b113a32151aaa88 +xtensa 7ab7acb68adf053c78a2cdf32bf1a3dce95912ec +bcachefs f07bcae9353557ae32fcfaffd7f47db264aee70b +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 8c62f31eddb71c6f6878258579318c1156045247 +afs abcbd3bfbbfe97a8912d0c929d4aa18f50d9bc52 +btrfs 18f539b4e9d2e0f2b0731b7c56fc889e71c9ec7b +ceph 825b82f6b82aa38dbb771d24e135152012500e51 +cifs e215089d2910c1058a23a12d163a7ce79196732d +configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs a1bafc3109d713ed83f73d61ba5cb1e6fd80fdbc +exfat 4cece764965020c22cff7665b18a012006359095 +exportfs 42c3732fa8073717dd7d924472f1c0bc5b452fdc +ext3 9d7d0eb685f1532e8153aadfd7d3f3d1de3ec4b2 +ext4 0ecae5410ab526225293d2591ca4632b22c2fd8c +f2fs bf3a69c6861ff4dc7892d895c87074af7bc1c400 +fsverity 8e43fb06e10d2c811797740dd578c5099a3e6378 +fuse cdf6ac2a03d253f05d3e798f60f23dea1b176b92 +gfs2 6f18f897e3fffa653dd84c280d213883da385b5d +jfs e42e29cc442395d62f1a8963ec2dfb700ba6a5d7 +ksmbd 23956900041d968f9ad0f30db6dede4daccd7aa9 +nfs 719fcafe07c12646691bd62d7f8d94d657fa0766 +nfs-anna 57331a59ac0d680f606403eb24edd3c35aecba31 +nfsd ced4d7f2886e3a5eaff2f37ce6dd3da04d36cf29 +ntfs3 622cd3daa8eae37359a6fd3c07c36d19f66606b5 +orangefs 9bf93dcfc453fae192fe5d7874b89699e8f800ac +overlayfs d17bb4620f90f81d8a8a45c3d025c679a1b5efcd +ubifs b8a77b9a5f9c2ba313f2beef8440b6f9f69768e7 +v9fs 2a0505cdd8c8b12670f4b5a6eb5c996c0861c2d5 +v9fs-ericvh 6630036b7c228f57c7893ee0403e92c2db2cd21d +xfs 0c6ca06aad84bac097f5c005d911db92dba3ae94 +zonefs 567e629fd296561aacd04547a603b163de3dabbe +iomap 3ac974796e5d94509b85a403449132ea660127c2 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner 70f0231d2dc2b43c2ae616f53d3abbe22822082a +vfs 052d534373b7ed33712a63d5e17b2b6cdbce84fd +printk a2b4cab9da7746c42f87c13721d305baf0085a20 +pci 4cece764965020c22cff7665b18a012006359095 +pstore c8d25d696f526a42ad8cf615dc1131c0b00c662e +hid 139b4c37e9cb0943e51adbb9c20c45bf60e44422 +i2c e593a4a2d3ad5e1a4be338b38ed6ba7c70642d88 +i2c-host 6d7c1c58c11c6fa5e7a4380478151d0860664601 +i3c 8f06fb45853900b4deaa52e2a9e16f3d9550b011 +hwmon-staging 992a84981f16b0e6fbd444cc88d68d6306297366 +jc_docs b8cfda5c9065cd619a97c17da081cbfab3b1e756 +v4l-dvb b14257abe7057def6127f6fb2f14f9adc8acabdb +v4l-dvb-next b14257abe7057def6127f6fb2f14f9adc8acabdb +pm 4cece764965020c22cff7665b18a012006359095 +cpufreq-arm a8e949d41c72a0a860b1c3571d6b274e9b77b6bb +cpupower 4cece764965020c22cff7665b18a012006359095 +devfreq 68a8582befd4c15bd7a2dbd2324075796dd84e38 +pmdomain ccabbb6768fc72d6cb0223324925c93658d91e63 +opp 13c8cf339e1a7a3d3e48fdebbb882b3a5a90f708 +thermal 1828c1c17bb2adf3a3f26abc69cb3fe971eac0e4 +dlm c53309b912fdd652eb3c2de44626aac4b0fc9bf9 +rdma 4cece764965020c22cff7665b18a012006359095 +net-next 537c2e91d3549e5d6020bb0576cf9b54a845255f +bpf-next 14bb1e8c8d4ad5d9d2febb7d19c70a3cf536e1e5 +ipsec-next aceb147b20a2eda9a10bdd4b5650718f731ef3e1 +mlx5-next d727d27db536faea7178290c677cc0567f647231 +netfilter-next ed1f164038b50c5864aa85389f3ffd456f050cca +ipvs-next ed1f164038b50c5864aa85389f3ffd456f050cca +bluetooth 0dc3ce6b3c1f0baf3203868b5bc69a2809800e2e +wireless-next d69aef8084cc72df7b0f2583096d9b037c647ec8 +wpan-next 9187210eee7d87eea37b45ea93454a88681894a4 +wpan-staging 9187210eee7d87eea37b45ea93454a88681894a4 +mtd 1162bc2f8f5de7da23d18aa4b7fbd4e93c369c50 +nand 6819db94e1cd3ce24a432f3616cd563ed0c4eaba +spi-nor 4cece764965020c22cff7665b18a012006359095 +crypto 6a8dbd71a70620c42d4fa82509204ba18231f28d +drm 4cece764965020c22cff7665b18a012006359095 +drm-exynos 119b225f01e4d3ce974cd3b4d982c76a380c796d +drm-misc 1864c45deb770a4814006dc95876e66edf0f2fe8 +amdgpu 0355b24bdec3b69ba31375c83d94fa80ca2c7ae1 +drm-intel 1bfc03b1375244f9029bb448ee8224b3b6dae99f +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm 4be445f5b6b6810baf397b2d159bd07c3573fd75 +drm-msm-lumag 4be445f5b6b6810baf397b2d159bd07c3573fd75 +drm-xe 008aa86a09ba623e563d7777353f6ca2a391424d +etnaviv b735ee173f84d5d0d0733c53946a83c12d770d05 +fbdev ada5caa4e081b067736e872f2701e1c677290f22 +regmap aad6b35290f52639d3601063d33d9621c0948a04 +sound cafe9c6a72cf1ffe96d2561d988a141cb5c093db +ieee1394 af70611cab88fa59fcea570e62b0b261c2c18649 +sound-asoc 286036cecb7c80bf63370ce2fe881f505ad04dc4 +modules d1909c0221739356f31c721de4743e7d219a56cc +input 81c32343d04f8ca974681d5fb5d939d2e1f58851 +block 4138f02288333cb596885e9af03dd3ea2de845cb +device-mapper b4d78cfeb30476239cf08f4f40afc095c173d6e3 +libata 7c6a9783c7f0dd609d548374cc98558a6efb6143 +pcmcia ccae53aa8aa2d902242555638c5de104aab08879 +mmc d10566c8de970ec391406459b8c6013dd068af68 +mfd 78334c343bef528b911da83a6b041d15a1a72efb +backlight b49c1caca529c28712ef62bfaabdb9441162a935 +battery 4cece764965020c22cff7665b18a012006359095 +regulator cd290abbdab3fb4db403b6fc0ae4038b22268bee +security 4cece764965020c22cff7665b18a012006359095 +apparmor 8ead196be219adade3bd0d4115cc9b8506643121 +integrity 85445b96429057d87446bcb24ec0cac9ea9c7fdf +selinux 4cece764965020c22cff7665b18a012006359095 +smack 69b6d71052b54fb10feba68564ccb41c0f0ce1e9 +tomoyo 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tpmdd 2900d362b5b5a54426ee30bf6b7527c9bdfa0c66 +watchdog 6fe5aabf7fc645562faec50c79c7a21a4dd1cab6 +iommu f379a7e9c3b5c325ff550e911ea42092295695de +audit 4cece764965020c22cff7665b18a012006359095 +devicetree 57b7d5d315e2b4193199228574d613640d3f5b50 +dt-krzk 4b660dbd9ee2059850fd30e0df420ca7a38a1856 +mailbox 8df6bab6cb9abc98736ffae410a74647995873c6 +spi bdeef5dcea6b164f4bd614655821b1ef12ebec9a +tip 4e2b6e891aaed8a4dabf618aa8267f7fdbb5c69f +clockevents 8248ca30ef89f9cc74ace62ae1b9a22b5f16736c +edac bff78224e453507496ff4ccdddb462805e2b3f39 +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 8034b31464c53d6e182f65a293a87b50ddf6dd7e +drivers-x86 4cece764965020c22cff7665b18a012006359095 +chrome-platform f7496450528bfe9350c5a62d180b4926b96f571b +chrome-platform-firmware 4cece764965020c22cff7665b18a012006359095 +hsi 4cece764965020c22cff7665b18a012006359095 +leds-lj 45066c4bbe8ca25f9f282245b84568116c783f1d +ipmi 296455ade1fdcf5f8f8c033201633b60946c589a +driver-core 4cece764965020c22cff7665b18a012006359095 +usb 4cece764965020c22cff7665b18a012006359095 +thunderbolt 4cece764965020c22cff7665b18a012006359095 +usb-serial b1a8da9ff1395c4879b4bd41e55733d944f3d613 +tty 4cece764965020c22cff7665b18a012006359095 +char-misc 4cece764965020c22cff7665b18a012006359095 +accel 576d7cc5a9e29e4cc579ffb0f9afc209e34eea31 +coresight a4f3057d19ffe1f5a7b9320303471a6725f11379 +fastrpc 4cece764965020c22cff7665b18a012006359095 +fpga b1a91ca25f15b6d7b311de4465854a5981dee3d3 +icc 7af14fe58e5ee10807088aa48f176a213c13d309 +iio c5b2db5859957150ac6ed305ab41a4a92ca40cfb +phy-next 00ca8a15dafa990d391abc37f2b8256ddf909b35 +soundwire e17aae16acf53938deb4b7702aa4f6cee2c4a073 +extcon abe83c4e5e4fdb3cb6c72dfe3bbbfd61f5b935ef +gnss 54be6c6c5ae8e0d93a6c4641cb7528eb0b6ba478 +vfio 7447d911af699a15f8d050dfcb7c680a86f87012 +w1 cde37a5bdb0ed2c4c7b86ef688e5fdb697525a57 +spmi b85ea95d086471afb4ad062012a4d73cd328fa86 +staging 4cece764965020c22cff7665b18a012006359095 +counter-next eca588187f9129300c6e44d64b819545cede463d +siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 716141d366f45d62ffe4dd53a045867b26e29d19 +cgroup 20d46283f5d679338ec2bbd734f46f900557fb97 +scsi af180c0880f9df14be31807f0bb0fa6f0d34a943 +scsi-mkp 52d8210ea45d4c56fdca65ccb7541b0dfe9f416f +vhost 894452180d732413fd29fa95a4820560fa44ca4a +rpmsg 1f61cb44e5befe1990a06a2dabafca3953a41b32 +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 4cece764965020c22cff7665b18a012006359095 +gpio-intel 4cece764965020c22cff7665b18a012006359095 +pinctrl 34675dc3a7c6301c95542d70d16ea520e25e3277 +pinctrl-intel 4cece764965020c22cff7665b18a012006359095 +pinctrl-renesas a6f06b909fee72c679c565adfa7f080f9595e336 +pinctrl-samsung 4184e4912ca69d4f18a800144539af3b37c6a663 +pwm f6c29a068ed585c742efe23ea96360419f809dec +ktest 07283c1873a4d0eaa0e822536881bfdaea853910 +kselftest 4cece764965020c22cff7665b18a012006359095 +kunit 4cece764965020c22cff7665b18a012006359095 +kunit-next 4cece764965020c22cff7665b18a012006359095 +livepatching 602bf18307981f3bfd9ebf19921791a4256d3fd1 +rtc f7cee094fb3b370e56b3c8aac89038de818d7aec +nvdimm d9212b35da52109361247b66010802d43c6b1f0d +at24 4cece764965020c22cff7665b18a012006359095 +ntb 9341b37ec17a8793e8439e9b18354ba69556b786 +seccomp 56af94aace8a0489fb1a32fd6f1cf0c548fe3911 +fsi c5eeb63edac9497f9a0d46d3b75cf8b293771ecf +slimbus 4cece764965020c22cff7665b18a012006359095 +nvmem 4cece764965020c22cff7665b18a012006359095 +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv f2580a907e5c0e8fc9354fd095b011301c64f949 +auxdisplay 4cece764965020c22cff7665b18a012006359095 +kgdb 4f41d30cd6dc865c3cbc1a852372321eba6d4e4c +hmm 6613476e225e090cc9aad49be7fa504e290dd33d +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi 2ec11b5d6d900b17c7d001fbee4751fd2aa58917 +memblock 2159bd4e905704b1765b6b883ea15e51ad986a6a +cxl ed1ff2fba7afa7baca7ceb93824a4699130b8377 +zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a +efi 62b71cd73d41ddac6b1760402bbe8c4932e23531 +unicode 0131c1f3cce7c01b0eb657a9e9e1a5e42c09a68b +slab 87654cf7a9865c0be256d67229b7354125d7498e +random 1f719a2f3fa67665578c759ac34fd3d3690c1a20 +landlock a17c60e533f5cd832e77e0d194e2e0bb663371b6 +rust 4cece764965020c22cff7665b18a012006359095 +sysctl 4f1136a55dc8e2c27d51e934d0675e12331c7291 +execve 5248f4097308c1cdcf163314a6ea3c8c88c98cd9 +bitmap fd8ed16c2419e23b7496e008e5f7be98da7fe2d5 +hte b85ea95d086471afb4ad062012a4d73cd328fa86 +kspp 231dc3f0c936db142ef3fa922f1ab751dd532d70 +kspp-gustavo 6613476e225e090cc9aad49be7fa504e290dd33d +nolibc 4cece764965020c22cff7665b18a012006359095 +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd 4cece764965020c22cff7665b18a012006359095 +header_cleanup 5f4c01f1e3c7b0c8d1e5dd6f080531de7aa5e47b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..4f1809b8634b --- /dev/null +++ b/Next/Trees @@ -0,0 +1,376 @@ +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 +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.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..b93b3d2bbed7 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3027 @@ +$ date -R +Tue, 26 Mar 2024 08:42:19 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 4cece7649650 Linux 6.9-rc1 +Merging origin/master (928a87efa423 Merge tag 'gfs2-v6.8-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 4cece7649650..928a87efa423 +Fast-forward (no commit created; -m option ignored) + crypto/asymmetric_keys/mscode_parser.c | 3 ++ + crypto/asymmetric_keys/pkcs7_parser.c | 4 ++ + crypto/asymmetric_keys/public_key.c | 3 +- + crypto/asymmetric_keys/signature.c | 2 +- + crypto/asymmetric_keys/x509_cert_parser.c | 8 +++ + crypto/testmgr.h | 80 ++++++++++++++++++++++++++++++ + drivers/crypto/intel/iaa/iaa_crypto_main.c | 10 ++-- + fs/gfs2/bmap.c | 5 +- + include/linux/oid_registry.h | 4 ++ + kernel/module/Kconfig | 5 ++ + 10 files changed, 117 insertions(+), 7 deletions(-) +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 (0deca7adb6bd crash: use macro to add crashk_res into iomem early for specific arch) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + .mailmap | 3 +- + MAINTAINERS | 1 - + arch/arm/include/asm/mman.h | 14 +++++++ + arch/hexagon/kernel/vmlinux.lds.S | 1 + + arch/parisc/include/asm/mman.h | 14 +++++++ + arch/x86/include/asm/crash_reserve.h | 2 + + include/linux/mman.h | 8 ++++ + include/linux/pagevec.h | 4 +- + include/linux/secretmem.h | 2 +- + init/initramfs.c | 2 +- + kernel/crash_reserve.c | 7 ++++ + kernel/sys.c | 7 +++- + mm/filemap.c | 16 ++++++++ + mm/memory.c | 4 +- + mm/page_owner.c | 33 ++++++++++++----- + mm/shmem_quota.c | 10 +++-- + mm/userfaultfd.c | 3 +- + mm/zswap.c | 45 ++++++++++++++++++++--- + tools/Makefile | 13 +++---- + tools/testing/selftests/mm/gup_test.c | 2 +- + tools/testing/selftests/mm/protection_keys.c | 6 ++- + tools/testing/selftests/mm/soft-dirty.c | 2 +- + tools/testing/selftests/mm/split_huge_page_test.c | 2 +- + tools/testing/selftests/mm/uffd-common.c | 3 ++ + tools/testing/selftests/mm/uffd-common.h | 2 + + tools/testing/selftests/mm/uffd-unit-tests.c | 13 ++++++- + 26 files changed, 178 insertions(+), 41 deletions(-) + create mode 100644 arch/arm/include/asm/mman.h + create mode 100644 arch/parisc/include/asm/mman.h +Merging kbuild-current/fixes (bfa8f18691ed Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ 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 +Already up to date. +Merging arm64-fixes/for-next/fixes (4cece7649650 Linux 6.9-rc1) +$ 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 (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-rc1) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging 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 (c2deb2e971f5 net: mark racy access on sk->sk_rcvbuf) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 5 ++++- + net/core/sock.c | 4 ++-- + net/ipv4/nexthop.c | 4 +++- + net/ipv6/addrconf.c | 5 +++-- + net/nfc/nci/core.c | 5 +++++ + tools/net/ynl/ynl-gen-c.py | 7 +++++-- + 6 files changed, 22 insertions(+), 8 deletions(-) +Merging bpf/master (443574b03387 riscv, bpf: Fix kfunc parameters incompatibility between bpf and riscv abi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Auto-merging .mailmap +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 3 +- + MAINTAINERS | 2 +- + arch/arm64/net/bpf_jit_comp.c | 4 +- + arch/riscv/net/bpf_jit_comp64.c | 16 +++++ + arch/s390/net/bpf_jit_comp.c | 46 +++++++-------- + include/net/xdp_sock.h | 2 + + kernel/bpf/arena.c | 25 +++++--- + kernel/bpf/verifier.c | 22 ++++++- + scripts/bpf_doc.py | 4 +- + tools/bpf/bpftool/gen.c | 2 +- + tools/lib/bpf/libbpf.c | 10 +++- + 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 | 10 +++- + .../selftests/bpf/progs/verifier_arena_large.c | 68 ++++++++++++++++++++++ + 19 files changed, 184 insertions(+), 61 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/verifier_arena_large.c +Merging ipsec/master (f411e2500592 Merge tag 'linux-can-fixes-for-6.9-20240319' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/main (f99c5f563c17 Merge tag 'nf-24-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (7eaf837a4eb5 netfilter: nf_tables: Fix a memory leak in nf_tables_updchain) +$ 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 (dbde9fd49aaf kunit: fix wireless test dependencies) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging tools/testing/kunit/configs/all_tests.config +Merge made by the 'ort' strategy. + MAINTAINERS | 5 ++ + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 15 +++--- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 16 +++--- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 11 ++-- + drivers/net/wireless/intel/iwlwifi/mvm/link.c | 59 +++++++++++++++++----- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 +++- + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 7 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 4 ++ + drivers/net/wireless/intel/iwlwifi/mvm/rfi.c | 8 ++- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 20 +++----- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 5 +- + drivers/net/wireless/intel/iwlwifi/queue/tx.c | 2 +- + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 2 +- + include/net/cfg80211.h | 2 + + net/mac80211/cfg.c | 5 +- + net/mac80211/debug.h | 2 +- + net/mac80211/ieee80211_i.h | 4 +- + net/mac80211/mlme.c | 15 ++++-- + net/wireless/trace.h | 2 +- + net/wireless/wext-core.c | 7 ++- + tools/testing/kunit/configs/all_tests.config | 2 + + 21 files changed, 137 insertions(+), 65 deletions(-) +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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (cafe9c6a72cf ALSA: hda: cs35l56: Set the init_done flag before component_add()) +$ 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. + include/sound/intel-nhlt.h | 10 ++++++++++ + sound/hda/intel-nhlt.c | 26 ++++++++++++++++++++++++++ + sound/pci/hda/cs35l56_hda.c | 8 ++++---- + sound/soc/sof/ipc4-topology.c | 19 ++++++++++++++++--- + 4 files changed, 56 insertions(+), 7 deletions(-) +Merging sound-asoc-fixes/for-linus (db0da4a4ae7e 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. + sound/soc/codecs/wm_adsp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging regmap-fixes/for-linus (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (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 (f37e76abd614 staging: vc04_services: fix information leak in create_component()) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Merge made by the 'ort' strategy. + drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (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 (5a7e89d3315d crypto: iaa - Fix nr_cpus < nr_iaa case) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ 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 (b0a53dc56c14 mtd: limit OTP NVMEM Cell parse to non Nand devices) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/mtdcore.c | 2 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (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 (f4eb87064200 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/block-group.c | 3 ++- + fs/btrfs/extent_io.c | 13 +++++++++++++ + fs/btrfs/extent_map.c | 16 ++++++++-------- + fs/btrfs/scrub.c | 12 +++++++++++- + fs/btrfs/volumes.c | 27 ++++++++++++++++++++++----- + fs/btrfs/zoned.c | 14 +++++++------- + 6 files changed, 63 insertions(+), 22 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 (4cece7649650 Linux 6.9-rc1) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (4cece7649650 Linux 6.9-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 (3d9b8e6db9bd docs: dt-bindings: add missing address/size-cells to example) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/dts-coding-style.rst | 2 ++ + MAINTAINERS | 1 + + 2 files changed, 3 insertions(+) +Merging dt-krzk-fixes/fixes (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-rc1) +$ 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 (037493099099 sdhci-of-dwcmshc: disable PM runtime in dwcmshc_remove()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/core/block.c | 4 ++-- + drivers/mmc/host/sdhci-of-dwcmshc.c | 28 +++++++++++++++++----------- + drivers/mmc/host/sdhci-omap.c | 3 +++ + 3 files changed, 22 insertions(+), 13 deletions(-) +Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (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 (1f1dc442c57e mshyperv: Introduce hv_numa_node_to_pxm_info()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Auto-merging include/asm-generic/hyperv-tlfs.h +Auto-merging include/asm-generic/mshyperv.h +Merge made by the 'ort' strategy. + arch/x86/hyperv/hv_apic.c | 16 ++++++++-------- + arch/x86/hyperv/hv_proc.c | 22 ++++------------------ + include/asm-generic/hyperv-tlfs.h | 19 +++++++------------ + include/asm-generic/mshyperv.h | 14 ++++++++++++++ + 4 files changed, 33 insertions(+), 38 deletions(-) +Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (4cece7649650 Linux 6.9-rc1) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-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 (8cdac422e397 MAINTAINERS: erofs: add myself as reviewer) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + fs/erofs/super.c | 1 - + 2 files changed, 1 insertion(+), 1 deletion(-) +Merging kunit-fixes/kunit-fixes (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (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 (6978bd6a9138 SUNRPC: Revert 561141dd494382217bace4d1a51d08168420eace) +$ 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 ++- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 14 ++++++++------ + 2 files changed, 10 insertions(+), 7 deletions(-) +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 (cb82ca59b616 x86/efistub: Add missing boot_params for mixed mode compat entry) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + arch/x86/boot/compressed/efi_mixed.S | 20 +++++++++++++++----- + 1 file changed, 15 insertions(+), 5 deletions(-) +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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (6630036b7c22 fs/9p: fix uninitialized values during inode evict) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Merge made by the 'ort' strategy. + fs/9p/vfs_inode.c | 16 ++++++++++------ + fs/9p/vfs_inode_dotl.c | 6 +----- + 2 files changed, 11 insertions(+), 11 deletions(-) +Merging w1-fixes/fixes (4cece7649650 Linux 6.9-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 (a5894bc48f64 i2c: i801: Fix a refactoring that broke a touchpad on Lenovo P1) +$ 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 +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-i801.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) +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 (a8eb93b42d7e fbdev: Select I/O-memory framebuffer ops for SBus) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/dma-buf/st-dma-fence-chain.c | 6 +++--- + 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 +++++++++--- + drivers/video/fbdev/Kconfig | 3 +++ + 5 files changed, 28 insertions(+), 12 deletions(-) +Merging mm-stable/mm-stable (1dd4505cf4c8 Merge branch 'master' into mm-stable) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Merge made by the 'ort' strategy. +Merging mm-nonmm-stable/mm-nonmm-stable (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm/mm-everything (bd2a8827fe72 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 18 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 7 + + Documentation/admin-guide/sysctl/vm.rst | 16 + + Documentation/filesystems/proc.rst | 29 + + Documentation/mm/allocation-profiling.rst | 100 +++ + Documentation/mm/index.rst | 1 + + Documentation/process/coding-style.rst | 16 + + Documentation/staging/xz.rst | 122 ++-- + LICENSES/deprecated/0BSD | 23 + + MAINTAINERS | 31 + + arch/alpha/kernel/pci_iommu.c | 2 +- + arch/alpha/lib/checksum.c | 1 + + arch/alpha/lib/fpreg.c | 1 + + arch/alpha/lib/memcpy.c | 1 + + arch/arm/include/asm/pgtable-2level.h | 5 +- + arch/arm/include/asm/pgtable-3level-hwdef.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 5 +- + arch/arm/kernel/irq.c | 1 + + arch/arm/kernel/traps.c | 1 + + arch/arm/lib/uaccess_with_memcpy.c | 4 +- + arch/arm/mm/Makefile | 1 - + arch/arm/mm/hugetlbpage.c | 34 - + arch/arm64/include/asm/pgtable.h | 25 +- + arch/arm64/kernel/efi.c | 1 + + arch/arm64/mm/hugetlbpage.c | 18 +- + arch/arm64/mm/mteswap.c | 45 ++ + arch/loongarch/include/asm/kfence.h | 1 + + arch/loongarch/mm/hugetlbpage.c | 12 +- + arch/mips/include/asm/pgtable-32.h | 2 +- + arch/mips/include/asm/pgtable-64.h | 2 +- + arch/mips/jazz/jazzdma.c | 2 +- + arch/mips/mm/hugetlbpage.c | 10 - + arch/mips/mm/tlb-r4k.c | 2 +- + arch/parisc/mm/hugetlbpage.c | 11 - + arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 20 - + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 25 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 27 +- + arch/powerpc/include/asm/mmu.h | 4 - + arch/powerpc/include/asm/nohash/pgtable.h | 10 - + arch/powerpc/kernel/dma-iommu.c | 2 +- + arch/powerpc/kernel/fadump.c | 5 - + arch/powerpc/kernel/iommu.c | 1 + + arch/powerpc/mm/mem.c | 1 + + arch/powerpc/mm/pgtable_64.c | 6 +- + arch/powerpc/platforms/ps3/system-bus.c | 4 +- + arch/powerpc/platforms/pseries/vio.c | 2 +- + arch/riscv/kernel/elf_kexec.c | 1 + + arch/riscv/kernel/probes/kprobes.c | 1 + + arch/riscv/mm/hugetlbpage.c | 10 - + arch/s390/include/asm/gmap.h | 2 +- + arch/s390/include/asm/mmu.h | 5 + + arch/s390/include/asm/mmu_context.h | 1 + + arch/s390/include/asm/pgtable.h | 15 +- + arch/s390/kernel/cert_store.c | 1 + + arch/s390/kernel/ipl.c | 1 + + arch/s390/kvm/kvm-s390.c | 4 +- + arch/s390/mm/gmap.c | 163 +++-- + arch/s390/mm/hugetlbpage.c | 10 - + arch/sh/mm/hugetlbpage.c | 10 - + arch/sparc/mm/hugetlbpage.c | 12 - + arch/x86/include/asm/io.h | 1 + + arch/x86/include/asm/pgtable.h | 1 - + arch/x86/kernel/amd_gart_64.c | 2 +- + arch/x86/kernel/cpu/sgx/main.c | 1 + + arch/x86/kernel/irq_64.c | 1 + + arch/x86/kernel/setup.c | 2 - + arch/x86/lib/copy_mc.c | 21 +- + arch/x86/mm/fault.c | 1 + + arch/x86/mm/hugetlbpage.c | 26 - + arch/x86/mm/init.c | 47 -- + arch/x86/mm/pat/memtype.c | 23 +- + arch/x86/mm/pgtable.c | 4 +- + drivers/accel/ivpu/ivpu_mmu_context.c | 1 + + drivers/acpi/numa/hmat.c | 3 + + drivers/gpu/drm/gma500/mmu.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 1 + + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 1 + + drivers/gpu/drm/i915/gt/shmem_utils.c | 1 + + drivers/gpu/drm/i915/gvt/firmware.c | 1 + + drivers/gpu/drm/i915/gvt/gtt.c | 1 + + drivers/gpu/drm/i915/gvt/handlers.c | 1 + + drivers/gpu/drm/i915/gvt/mmio.c | 1 + + drivers/gpu/drm/i915/gvt/vgpu.c | 1 + + drivers/gpu/drm/i915/intel_gvt.c | 1 + + drivers/gpu/drm/imagination/pvr_vm_mips.c | 1 + + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 1 + + drivers/gpu/drm/omapdrm/omap_gem.c | 1 + + drivers/gpu/drm/v3d/v3d_bo.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 1 + + drivers/gpu/drm/xen/xen_drm_front_gem.c | 1 + + drivers/hwtracing/coresight/coresight-trbe.c | 1 + + drivers/iommu/dma-iommu.c | 2 +- + .../ethernet/marvell/octeon_ep/octep_pfvf_mbox.c | 1 + + .../ethernet/marvell/octeon_ep_vf/octep_vf_mbox.c | 1 + + drivers/net/ethernet/microsoft/mana/hw_channel.c | 1 + + drivers/parisc/ccio-dma.c | 2 +- + drivers/parisc/sba_iommu.c | 2 +- + drivers/platform/x86/uv_sysfs.c | 1 + + drivers/scsi/mpi3mr/mpi3mr_transport.c | 2 + + drivers/staging/media/atomisp/pci/hmm/hmm.c | 2 +- + drivers/vfio/pci/pds/dirty.c | 1 + + drivers/virt/acrn/mm.c | 11 +- + drivers/virtio/virtio_mem.c | 1 + + drivers/xen/grant-dma-ops.c | 2 +- + drivers/xen/swiotlb-xen.c | 2 +- + fs/fat/dir.c | 12 + + fs/ocfs2/ioctl.c | 1 + + fs/ocfs2/localalloc.c | 19 +- + fs/ocfs2/move_extents.c | 2 +- + fs/ocfs2/ocfs2_fs.h | 3 +- + fs/ocfs2/reservations.c | 2 +- + fs/ocfs2/resize.c | 7 + + fs/ocfs2/suballoc.c | 105 ++- + fs/ocfs2/suballoc.h | 6 +- + fs/proc/meminfo.c | 3 +- + fs/proc/page.c | 7 +- + include/asm-generic/codetag.lds.h | 14 + + include/asm-generic/io.h | 1 - + include/asm-generic/vmlinux.lds.h | 3 + + include/linux/alloc_tag.h | 205 ++++++ + include/linux/codetag.h | 81 +++ + include/linux/decompress/unxz.h | 5 +- + include/linux/dma-map-ops.h | 2 +- + include/linux/fortify-string.h | 5 +- + include/linux/fs.h | 6 +- + include/linux/gfp.h | 130 ++-- + include/linux/gfp_types.h | 11 + + include/linux/huge_mm.h | 15 - + include/linux/hugetlb.h | 59 +- + include/linux/instrumented.h | 35 + + include/linux/kmsan-checks.h | 15 + + include/linux/memcontrol.h | 59 +- + include/linux/memory-tiers.h | 6 + + include/linux/mempolicy.h | 5 +- + include/linux/mempool.h | 73 +- + include/linux/mm.h | 91 ++- + include/linux/mm_types.h | 4 +- + include/linux/page-flags.h | 178 +++-- + include/linux/page-isolation.h | 5 +- + include/linux/page_ext.h | 1 - + include/linux/pagemap.h | 9 +- + include/linux/pds/pds_common.h | 2 + + include/linux/percpu.h | 27 +- + include/linux/pgalloc_tag.h | 134 ++++ + include/linux/pgtable.h | 28 +- + include/linux/rhashtable-types.h | 11 +- + include/linux/sched.h | 24 + + include/linux/secretmem.h | 21 +- + include/linux/slab.h | 181 ++--- + include/linux/string.h | 4 +- + include/linux/swap.h | 5 +- + include/linux/vmalloc.h | 62 +- + include/linux/vmstat.h | 8 - + include/linux/xarray.h | 6 + + include/linux/xz.h | 5 +- + include/linux/zpool.h | 4 +- + include/linux/zswap.h | 2 +- + include/rdma/rdmavt_qp.h | 1 + + include/trace/events/mmflags.h | 3 +- + init/Kconfig | 9 +- + init/main.c | 12 +- + kernel/bpf/memalloc.c | 6 +- + kernel/dma/mapping.c | 4 +- + kernel/kallsyms_selftest.c | 2 +- + kernel/module/main.c | 29 +- + kernel/vmcore_info.c | 8 +- + lib/Kconfig.debug | 31 + + lib/Makefile | 3 + + lib/alloc_tag.c | 243 +++++++ + lib/build_OID_registry | 5 +- + lib/codetag.c | 283 ++++++++ + lib/decompress_unxz.c | 39 +- + lib/rhashtable.c | 28 +- + lib/test_hmm.c | 8 +- + lib/test_xarray.c | 89 +++ + lib/xarray.c | 53 +- + lib/xz/Kconfig | 13 +- + lib/xz/xz_crc32.c | 7 +- + lib/xz/xz_dec_bcj.c | 183 ++++- + lib/xz/xz_dec_lzma2.c | 5 +- + lib/xz/xz_dec_stream.c | 5 +- + lib/xz/xz_dec_syms.c | 16 +- + lib/xz/xz_dec_test.c | 12 +- + lib/xz/xz_lzma2.h | 5 +- + lib/xz/xz_private.h | 20 +- + lib/xz/xz_stream.h | 7 +- + mm/Makefile | 1 + + mm/backing-dev.c | 23 +- + mm/compaction.c | 7 +- + mm/debug.c | 19 +- + mm/debug_page_alloc.c | 12 +- + mm/debug_vm_pgtable.c | 1 + + mm/filemap.c | 89 ++- + mm/gup.c | 112 +-- + mm/hmm.c | 9 +- + mm/huge_memory.c | 59 +- + mm/hugetlb.c | 79 +-- + mm/internal.h | 70 +- + mm/kfence/core.c | 14 +- + mm/kfence/kfence.h | 4 +- + mm/kmemleak.c | 2 +- + mm/kmsan/hooks.c | 11 + + mm/madvise.c | 49 +- + mm/memcontrol.c | 135 ++-- + mm/memory-failure.c | 10 +- + mm/memory-tiers.c | 76 +- + mm/memory.c | 78 +- + mm/memory_hotplug.c | 1 + + mm/mempolicy.c | 106 +-- + mm/mempool.c | 36 +- + mm/migrate.c | 35 +- + mm/mm_init.c | 138 ++-- + mm/mmap.c | 113 ++- + mm/nommu.c | 85 +-- + mm/page_alloc.c | 790 ++++++++++++--------- + mm/page_ext.c | 13 + + mm/page_io.c | 2 +- + mm/page_isolation.c | 122 ++-- + mm/page_owner.c | 2 +- + mm/percpu-internal.h | 26 +- + mm/percpu-vm.c | 4 +- + mm/percpu.c | 120 ++-- + mm/readahead.c | 8 +- + mm/shmem.c | 2 +- + mm/show_mem.c | 26 + + mm/slab.h | 53 +- + mm/slab_common.c | 6 +- + mm/slub.c | 327 +++++++-- + mm/swap_slots.c | 2 +- + mm/swapfile.c | 2 +- + mm/userfaultfd.c | 35 + + mm/util.c | 44 +- + mm/vmalloc.c | 142 ++-- + mm/vmscan.c | 52 +- + mm/z3fold.c | 10 +- + mm/zbud.c | 10 +- + mm/zpool.c | 10 +- + mm/zsmalloc.c | 6 +- + mm/zswap.c | 122 ++-- + rust/helpers.c | 8 + + scripts/Makefile.lib | 13 +- + scripts/checkpatch.pl | 24 + + scripts/kallsyms.c | 13 + + scripts/module.lds.S | 7 + + scripts/xz_wrap.sh | 159 ++++- + sound/pci/hda/cs35l41_hda.c | 1 + + tools/testing/selftests/mm/memfd_secret.c | 44 +- + tools/testing/selftests/mm/mlock2-tests.c | 15 +- + tools/testing/selftests/mm/run_vmtests.sh | 10 +- + tools/testing/selftests/mm/virtual_address_range.c | 78 +- + 255 files changed, 5050 insertions(+), 2551 deletions(-) + create mode 100644 Documentation/mm/allocation-profiling.rst + create mode 100644 LICENSES/deprecated/0BSD + delete mode 100644 arch/arm/mm/hugetlbpage.c + create mode 100644 include/asm-generic/codetag.lds.h + create mode 100644 include/linux/alloc_tag.h + create mode 100644 include/linux/codetag.h + create mode 100644 include/linux/pgalloc_tag.h + create mode 100644 lib/alloc_tag.c + create mode 100644 lib/codetag.c +Merging kbuild/for-next (bfa8f18691ed Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Already up to date. +Merging clang-format/clang-format (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 (1bbeaf83dd7b Merge tag 'perf-tools-for-v6.9-2024-03-13' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools) +$ 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 +Already up to date. +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 +Merge made by the 'ort' strategy. +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 +Already up to date. +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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Already up to date. +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 (e23359d88a81 dt-bindings: memory-controllers: add Samsung S5Pv210 SoC DMC) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + .../memory-controllers/samsung,s5pv210-dmc.yaml | 33 ++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/samsung,s5pv210-dmc.yaml +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 (6d5a4668a830 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. + .../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/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 + + 31 files changed, 756 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 (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Merge made by the 'ort' strategy. + drivers/reset/reset-meson-audio-arb.c | 6 ++---- + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 6 ++---- + drivers/reset/reset-ti-sci.c | 6 ++---- + 3 files changed, 6 insertions(+), 12 deletions(-) +Merging rockchip/for-next (c700a8f83706 Merge branch 'v6.10-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. + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 37 +++++++++++++-- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 2 + + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 53 +++++++++++++++++++--- + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 41 +++++++++++++++++ + .../arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 4 +- + 6 files changed, 126 insertions(+), 15 deletions(-) +Merging samsung-krzk/for-next (ea3ca48c0c18 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/samsung/exynos3250.dtsi | 2 ++ + arch/arm/boot/dts/samsung/exynos4.dtsi | 3 +++ + arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts | 2 +- + arch/arm/boot/dts/samsung/exynos4412-origen.dts | 2 +- + arch/arm/boot/dts/samsung/exynos4412-smdk4412.dts | 12 ++++++------ + arch/arm/boot/dts/samsung/exynos5250.dtsi | 3 +++ + arch/arm/boot/dts/samsung/exynos5420.dtsi | 3 +++ + arch/arm/boot/dts/samsung/exynos5800-peach-pi.dts | 2 +- + arch/arm/boot/dts/samsung/s5pv210.dtsi | 6 ++++-- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 5 +++++ + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 12 ++++++++++++ + 11 files changed, 41 insertions(+), 11 deletions(-) +Merging scmi/for-linux-next (ecafcea8fbfb Merge branches 'for-next/scmi/fixes' and 'for-next/ffa/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 (4cece7649650 Linux 6.9-rc1) +$ 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 (746ef0fac697 Merge branch 'optee_convert_platform_remove_callback_for_v6.10' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. + drivers/tee/optee/smc_abi.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (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 +Merge made by the 'ort' strategy. +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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (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 +Already up to date. +Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging riscv-dt/riscv-dt-for-next (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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Already up to date. +Merging sh/for-next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging 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 (f07bcae93535 bcachefs: fix misplaced newline in __bch2_inode_unpacked_to_text()) +$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next +Merge made by the 'ort' strategy. + fs/bcachefs/backpointers.c | 5 +++++ + fs/bcachefs/btree_write_buffer.c | 14 ++++++++++++++ + fs/bcachefs/inode.c | 2 +- + 3 files changed, 20 insertions(+), 1 deletion(-) +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) + a9c9b8c80225 ("btrfs: zoned: don't skip block groups with 100% zone unusable") +$ 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/ctree.c | 12 ++++++------ + fs/btrfs/extent-tree.c | 2 +- + fs/btrfs/locking.c | 16 +++------------- + fs/btrfs/locking.h | 18 ++++++++++++++---- + fs/btrfs/transaction.c | 2 -- + 5 files changed, 24 insertions(+), 26 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 +Already up to date. +Merging cifs/for-next (e215089d2910 smb3: add trace event for mknod) +$ 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/dir.c | 7 +++++++ + fs/smb/client/trace.h | 4 +++- + 2 files changed, 10 insertions(+), 1 deletion(-) +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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +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 | 2 +- + 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, 42 insertions(+), 35 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 (23956900041d Merge tag 'v6.9-rc-smb3-server-fixes' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +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 (ced4d7f2886e fs: nfsd: use group allocation/free of per-cpu counters API) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Merge made by the 'ort' strategy. + fs/nfsd/export.c | 16 ++++-- + fs/nfsd/nfs4proc.c | 41 ++++++++++++++ + fs/nfsd/nfs4state.c | 154 ++++++++++++++++++++++++++++----------------------- + fs/nfsd/nfs4xdr.c | 76 ++++++++++++++++++++++++- + fs/nfsd/nfsctl.c | 5 +- + fs/nfsd/state.h | 2 +- + fs/nfsd/stats.c | 42 -------------- + fs/nfsd/stats.h | 5 -- + fs/nfsd/xdr4.h | 19 +++++++ + include/linux/nfs4.h | 6 ++ + 10 files changed, 239 insertions(+), 127 deletions(-) +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 +Already up to date. +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 (6630036b7c22 fs/9p: fix uninitialized values during inode evict) +$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (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 +Already up to date. +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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (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 (139b4c37e9cb MAINTAINERS: update Benjamin's email address) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 2 ++ + MAINTAINERS | 4 ++-- + drivers/hid/i2c-hid/i2c-hid-core.c | 9 --------- + drivers/hid/intel-ish-hid/ipc/ipc.c | 2 +- + 4 files changed, 5 insertions(+), 12 deletions(-) +Merging i2c/i2c/for-next (e593a4a2d3ad dt-bindings: i2c: qcom,i2c-cci: Fix OV7251 'data-lanes' entries) +$ 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 (6d7c1c58c11c i2c: riic: Add support for R9A09G057 SoC) +$ 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. + Documentation/devicetree/bindings/i2c/i2c-pnx.txt | 34 ------ + .../devicetree/bindings/i2c/nxp,pnx-i2c.yaml | 46 ++++++++ + .../devicetree/bindings/i2c/renesas,riic.yaml | 19 ++-- + drivers/i2c/busses/i2c-riic.c | 125 +++++++++++++++------ + 4 files changed, 146 insertions(+), 78 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-pnx.txt + create mode 100644 Documentation/devicetree/bindings/i2c/nxp,pnx-i2c.yaml +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 (992a84981f16 hwmon: (pmbus/mp2975) Use i2c_get_match_data()) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/hwmon/adc128d818.txt | 38 ------ + Documentation/devicetree/bindings/hwmon/as370.txt | 11 -- + .../devicetree/bindings/hwmon/ibm,opal-sensor.yaml | 37 ++++++ + .../devicetree/bindings/hwmon/ibm,p8-occ-hwmon.txt | 25 ---- + .../devicetree/bindings/hwmon/ibmpowernv.txt | 23 ---- + Documentation/devicetree/bindings/hwmon/lm87.txt | 30 ----- + .../devicetree/bindings/hwmon/max6650.txt | 28 ----- + .../devicetree/bindings/hwmon/maxim,max6650.yaml | 70 +++++++++++ + .../bindings/hwmon/pmbus/adi,adp1050.yaml | 49 ++++++++ + .../devicetree/bindings/hwmon/pwm-fan.txt | 1 - + .../devicetree/bindings/hwmon/st,stts751.yaml | 41 +++++++ + .../devicetree/bindings/hwmon/stts751.txt | 15 --- + .../devicetree/bindings/hwmon/syna,as370.yaml | 32 +++++ + .../devicetree/bindings/hwmon/ti,adc128d818.yaml | 63 ++++++++++ + .../devicetree/bindings/hwmon/ti,lm87.yaml | 69 +++++++++++ + .../devicetree/bindings/trivial-devices.yaml | 2 + + Documentation/hwmon/adp1050.rst | 65 ++++++++++ + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/lm70.rst | 2 +- + MAINTAINERS | 7 ++ + drivers/acpi/acpi_ipmi.c | 23 +++- + drivers/hwmon/acpi_power_meter.c | 16 +++ + drivers/hwmon/dell-smm-hwmon.c | 15 +++ + drivers/hwmon/lm70.c | 4 +- + drivers/hwmon/pmbus/Kconfig | 10 ++ + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/adp1050.c | 56 +++++++++ + drivers/hwmon/pmbus/mp2975.c | 136 +++++++++++++++++---- + include/acpi/acpi_bus.h | 5 + + 29 files changed, 675 insertions(+), 200 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwmon/adc128d818.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/as370.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/ibm,opal-sensor.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/ibm,p8-occ-hwmon.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/ibmpowernv.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/lm87.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/max6650.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/maxim,max6650.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/adi,adp1050.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/pwm-fan.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/st,stts751.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/stts751.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/syna,as370.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,adc128d818.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,lm87.yaml + create mode 100644 Documentation/hwmon/adp1050.rst + create mode 100644 drivers/hwmon/pmbus/adp1050.c +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 +Already up to date. +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 (4cece7649650 Linux 6.9-rc1) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/main (537c2e91d354 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/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 (14bb1e8c8d4a selftests/bpf: Fix flaky test btf_map_in_map/lookup_update) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging arch/s390/net/bpf_jit_comp.c +Auto-merging include/linux/trace_events.h +Auto-merging kernel/bpf/verifier.c +Auto-merging tools/bpf/bpftool/gen.c +Auto-merging tools/lib/bpf/libbpf.c +Merge made by the 'ort' strategy. + arch/arm/net/bpf_jit_32.c | 25 ++- + arch/arm64/net/bpf_jit_comp.c | 7 +- + arch/loongarch/net/bpf_jit.c | 22 ++- + arch/mips/net/bpf_jit_comp.c | 3 +- + arch/parisc/net/bpf_jit_core.c | 8 +- + arch/s390/net/bpf_jit_comp.c | 6 +- + arch/sparc/net/bpf_jit_comp_64.c | 6 +- + arch/x86/net/bpf_jit_comp.c | 10 +- + arch/x86/net/bpf_jit_comp32.c | 3 +- + include/linux/bpf.h | 9 +- + include/linux/filter.h | 20 +- + include/linux/trace_events.h | 36 ++-- + include/trace/bpf_probe.h | 3 +- + include/uapi/linux/bpf.h | 6 +- + kernel/bpf/bpf_struct_ops.c | 10 +- + kernel/bpf/cgroup.c | 2 - + kernel/bpf/core.c | 32 ++- + kernel/bpf/helpers.c | 4 + + kernel/bpf/lpm_trie.c | 18 +- + kernel/bpf/syscall.c | 22 +-- + kernel/bpf/trampoline.c | 15 +- + kernel/bpf/verifier.c | 31 +-- + kernel/trace/bpf_trace.c | 52 +++-- + net/bpf/bpf_dummy_struct_ops.c | 4 +- + net/core/filter.c | 2 - + tools/bpf/bpftool/Makefile | 14 +- + tools/bpf/bpftool/gen.c | 3 +- + tools/bpf/bpftool/pids.c | 19 +- + tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 4 +- + tools/include/linux/compiler.h | 4 + + tools/include/uapi/linux/bpf.h | 6 +- + tools/lib/bpf/bpf.c | 16 +- + tools/lib/bpf/bpf.h | 9 + + tools/lib/bpf/libbpf.c | 111 +++++++++-- + tools/lib/bpf/libbpf.h | 11 ++ + tools/lib/bpf/libbpf.map | 2 + + .../bpf/benchs/bench_local_storage_create.c | 2 +- + tools/testing/selftests/bpf/benchs/bench_trigger.c | 48 ++++- + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 114 ++++++++++- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 13 +- + .../selftests/bpf/prog_tests/btf_map_in_map.c | 26 +-- + .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 216 ++++++++++++++++++--- + .../bpf/prog_tests/test_struct_ops_module.c | 47 +++++ + tools/testing/selftests/bpf/progs/iters.c | 2 +- + .../selftests/bpf/progs/struct_ops_module.c | 16 +- + .../testing/selftests/bpf/progs/test_bpf_cookie.c | 16 ++ + .../selftests/bpf/progs/test_ns_current_pid_tgid.c | 31 ++- + tools/testing/selftests/bpf/progs/trigger_bench.c | 39 ++-- + tools/testing/selftests/bpf/test_cpp.cpp | 5 + + tools/testing/selftests/bpf/test_tc_tunnel.sh | 13 +- + 50 files changed, 868 insertions(+), 275 deletions(-) +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 (0dc3ce6b3c1f Bluetooth: hci_intel: Convert to platform remove callback returning void) +$ 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/btqcomsmd.c | 6 ++---- + drivers/bluetooth/btusb.c | 5 +++++ + drivers/bluetooth/hci_bcm.c | 6 ++---- + drivers/bluetooth/hci_intel.c | 6 ++---- + net/bluetooth/iso.c | 10 +++++++-- + 7 files changed, 68 insertions(+), 21 deletions(-) +Merging wireless-next/for-next (d69aef8084cc wifi: iwlwifi: mvm: fix check in iwl_mvm_sta_fw_id_mask) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/dbg.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/d3.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging drivers/net/wireless/realtek/rtw89/rtw8922a.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/mlme.c +Recorded preimage for 'drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c'. +[master ecd19e6247c5] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/net/wireless/brcm,bcm4329-fmac.yaml | 1 + + drivers/bcma/host_soc.c | 6 +- + drivers/net/wireless/broadcom/b43/sysfs.c | 13 +- + drivers/net/wireless/broadcom/b43legacy/sysfs.c | 16 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 15 +- + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 2 + + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 57 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 5 +- + .../net/wireless/intel/iwlwifi/fw/api/offload.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 30 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 1 + + drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 19 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 5 + + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 7 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 6 - + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 28 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 212 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 60 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 17 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 117 +- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 30 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 39 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 38 +- + .../net/wireless/intel/iwlwifi/mvm/offloading.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 16 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 48 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 292 ++- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 53 +- + drivers/net/wireless/intel/iwlwifi/tests/devinfo.c | 26 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 1 + + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 6 +- + drivers/net/wireless/quantenna/qtnfmac/bus.h | 2 +- + drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 13 +- + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 6 +- + .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 6 +- + drivers/net/wireless/realtek/rtw88/Kconfig | 22 + + drivers/net/wireless/realtek/rtw88/Makefile | 9 + + drivers/net/wireless/realtek/rtw88/mac.c | 6 + + drivers/net/wireless/realtek/rtw88/main.h | 3 + + drivers/net/wireless/realtek/rtw88/rtw8703b.c | 2109 ++++++++++++++++++++ + drivers/net/wireless/realtek/rtw88/rtw8703b.h | 102 + + .../net/wireless/realtek/rtw88/rtw8703b_tables.c | 902 +++++++++ + .../net/wireless/realtek/rtw88/rtw8703b_tables.h | 14 + + drivers/net/wireless/realtek/rtw88/rtw8723cs.c | 34 + + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 673 +------ + drivers/net/wireless/realtek/rtw88/rtw8723d.h | 269 +-- + drivers/net/wireless/realtek/rtw88/rtw8723x.c | 721 +++++++ + drivers/net/wireless/realtek/rtw88/rtw8723x.h | 518 +++++ + drivers/net/wireless/realtek/rtw88/rx.h | 2 + + drivers/net/wireless/realtek/rtw89/Kconfig | 15 + + drivers/net/wireless/realtek/rtw89/Makefile | 12 +- + drivers/net/wireless/realtek/rtw89/coex.c | 964 ++++++++- + drivers/net/wireless/realtek/rtw89/coex.h | 72 + + drivers/net/wireless/realtek/rtw89/core.h | 108 +- + drivers/net/wireless/realtek/rtw89/fw.c | 42 + + drivers/net/wireless/realtek/rtw89/fw.h | 27 + + drivers/net/wireless/realtek/rtw89/phy.c | 13 +- + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 154 ++ + drivers/net/wireless/ti/wlcore/sysfs.c | 11 +- + drivers/net/wireless/virtual/mac80211_hwsim.c | 42 +- + drivers/ssb/main.c | 6 +- + include/linux/ieee80211.h | 12 +- + include/linux/mmc/sdio_ids.h | 1 + + include/linux/ssb/ssb.h | 8 - + include/net/mac80211.h | 22 +- + include/uapi/linux/nl80211.h | 236 +-- + net/mac80211/chan.c | 34 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/drop.h | 3 +- + net/mac80211/ht.c | 2 +- + net/mac80211/ieee80211_i.h | 8 +- + net/mac80211/link.c | 7 +- + net/mac80211/mlme.c | 82 +- + net/mac80211/rx.c | 4 +- + net/mac80211/scan.c | 16 +- + net/mac80211/spectmgmt.c | 18 +- + net/mac80211/status.c | 22 +- + net/mac80211/tx.c | 6 +- + net/mac80211/util.c | 14 +- + net/rfkill/rfkill-gpio.c | 6 +- + net/wireless/scan.c | 54 +- + 85 files changed, 7107 insertions(+), 1550 deletions(-) + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b_tables.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b_tables.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723cs.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723x.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723x.h +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 (1162bc2f8f5d mtd: partitions: redboot: Added conversion of operands to a larger type) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Auto-merging drivers/mtd/mtdcore.c +Merge made by the 'ort' strategy. + .../bindings/mtd/samsung,s5pv210-onenand.yaml | 65 ++++++++++++++++++++++ + drivers/mtd/mtdcore.c | 12 +++- + drivers/mtd/parsers/redboot.c | 2 +- + 3 files changed, 75 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/samsung,s5pv210-onenand.yaml +Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/davinci_nand.c | 5 ++++- + drivers/mtd/nand/raw/nand_hynix.c | 2 +- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging spi-nor/spi-nor/next (4cece7649650 Linux 6.9-rc1) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Already up to date. +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 (1864c45deb77 drm/panel-edp: Add AUO B120XAN01.0) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/drm_gem_vram_helper.c +Auto-merging drivers/gpu/drm/imagination/pvr_vm_mips.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_abi16.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging include/drm/drm_gem_vram_helper.h +Auto-merging include/linux/fb.h +Recorded preimage for 'MAINTAINERS' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'MAINTAINERS'. +[master e3034bc75744] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-driver-panfrost-profiling | 10 + + .../bindings/display/bridge/lvds-codec.yaml | 1 + + .../bindings/display/panel/ilitek,ili9881c.yaml | 1 + + .../bindings/display/panel/novatek,nt35950.yaml | 3 +- + .../bindings/display/panel/novatek,nt36523.yaml | 25 +- + .../bindings/display/panel/panel-common-dual.yaml | 47 + + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 4 + + .../bindings/display/panel/sony,td4353-jdi.yaml | 2 + + .../bindings/gpu/arm,mali-valhall-csf.yaml | 147 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/driver-uapi.rst | 5 + + Documentation/gpu/panfrost.rst | 9 + + MAINTAINERS | 183 +- + arch/m68k/include/asm/pgtable.h | 2 + + drivers/gpu/drm/Kconfig | 15 + + drivers/gpu/drm/Makefile | 29 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 6 + + drivers/gpu/drm/bridge/ite-it66121.c | 23 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 31 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 21 +- + drivers/gpu/drm/ci/test.yml | 6 +- + .../gpu/drm/display/drm_dp_mst_topology_internal.h | 4 +- + drivers/gpu/drm/drm_bridge.c | 24 +- + drivers/gpu/drm/drm_client.c | 92 +- + drivers/gpu/drm/drm_crtc_helper_internal.h | 15 +- + drivers/gpu/drm/drm_crtc_internal.h | 7 + + drivers/gpu/drm/drm_edid.c | 147 +- + drivers/gpu/drm/drm_fbdev_generic.c | 4 +- + drivers/gpu/drm/drm_gem.c | 34 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 7 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 105 +- + drivers/gpu/drm/drm_internal.h | 7 + + drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 - + drivers/gpu/drm/imagination/pvr_vm_mips.c | 4 +- + drivers/gpu/drm/loongson/lsdc_gem.c | 13 +- + drivers/gpu/drm/msm/msm_gem.c | 20 +- + drivers/gpu/drm/msm/msm_gem.h | 4 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 20 +- + drivers/gpu/drm/mxsfb/lcdif_drv.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_abi16.h | 12 - + drivers/gpu/drm/nouveau/nouveau_bo.c | 43 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 2 + + drivers/gpu/drm/nouveau/nouveau_prime.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c | 2 +- + drivers/gpu/drm/omapdrm/Kconfig | 2 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 40 +- + drivers/gpu/drm/panel/Kconfig | 9 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-edp.c | 85 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 228 +- + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 22 +- + drivers/gpu/drm/panel/panel-samsung-s6e3fa7.c | 285 ++ + drivers/gpu/drm/panel/panel-simple.c | 58 + + drivers/gpu/drm/panfrost/Makefile | 2 - + drivers/gpu/drm/panfrost/panfrost_debugfs.c | 21 - + drivers/gpu/drm/panfrost/panfrost_debugfs.h | 14 - + drivers/gpu/drm/panfrost/panfrost_device.h | 2 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 50 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- + drivers/gpu/drm/panthor/Kconfig | 23 + + drivers/gpu/drm/panthor/Makefile | 14 + + drivers/gpu/drm/panthor/panthor_devfreq.c | 283 ++ + drivers/gpu/drm/panthor/panthor_devfreq.h | 21 + + drivers/gpu/drm/panthor/panthor_device.c | 561 ++++ + drivers/gpu/drm/panthor/panthor_device.h | 394 +++ + drivers/gpu/drm/panthor/panthor_drv.c | 1473 ++++++++ + drivers/gpu/drm/panthor/panthor_fw.c | 1362 ++++++++ + drivers/gpu/drm/panthor/panthor_fw.h | 503 +++ + drivers/gpu/drm/panthor/panthor_gem.c | 230 ++ + drivers/gpu/drm/panthor/panthor_gem.h | 142 + + drivers/gpu/drm/panthor/panthor_gpu.c | 482 +++ + drivers/gpu/drm/panthor/panthor_gpu.h | 52 + + drivers/gpu/drm/panthor/panthor_heap.c | 597 ++++ + drivers/gpu/drm/panthor/panthor_heap.h | 39 + + drivers/gpu/drm/panthor/panthor_mmu.c | 2768 ++++++++++++++++ + drivers/gpu/drm/panthor/panthor_mmu.h | 102 + + drivers/gpu/drm/panthor/panthor_regs.h | 239 ++ + drivers/gpu/drm/panthor/panthor_sched.c | 3502 ++++++++++++++++++++ + drivers/gpu/drm/panthor/panthor_sched.h | 50 + + drivers/gpu/drm/qxl/qxl_object.c | 26 +- + drivers/gpu/drm/qxl/qxl_object.h | 2 + + drivers/gpu/drm/qxl/qxl_prime.c | 4 +- + drivers/gpu/drm/radeon/radeon_prime.c | 11 - + drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 3 - + drivers/gpu/drm/tidss/tidss_kms.c | 3 +- + drivers/gpu/drm/ttm/ttm_bo.c | 235 +- + drivers/gpu/drm/ttm/ttm_resource.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 29 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 4 + + drivers/video/fbdev/core/Kconfig | 6 + + include/drm/amd_asic_type.h | 3 + + include/drm/bridge/samsung-dsim.h | 4 +- + include/drm/display/drm_dp_mst_helper.h | 1 - + include/drm/drm_client.h | 10 + + include/drm/drm_debugfs_crc.h | 8 +- + include/drm/drm_edid.h | 12 +- + include/drm/drm_encoder_slave.h | 91 +- + include/drm/drm_format_helper.h | 1 + + include/drm/drm_gem.h | 3 + + include/drm/drm_gem_shmem_helper.h | 7 +- + include/drm/drm_gem_vram_helper.h | 1 - + include/drm/drm_kunit_helpers.h | 2 +- + include/drm/drm_lease.h | 2 + + include/drm/drm_of.h | 1 + + include/drm/drm_suballoc.h | 2 +- + include/drm/i2c/ch7006.h | 1 + + include/drm/i2c/sil164.h | 1 + + include/drm/i915_gsc_proxy_mei_interface.h | 4 +- + include/drm/i915_hdcp_interface.h | 18 +- + include/drm/i915_pxp_tee_interface.h | 27 +- + include/drm/ttm/ttm_bo.h | 17 +- + include/drm/ttm/ttm_caching.h | 2 + + include/drm/ttm/ttm_execbuf_util.h | 7 +- + include/drm/ttm/ttm_kmap_iter.h | 4 +- + include/drm/ttm/ttm_pool.h | 5 +- + include/drm/ttm/ttm_resource.h | 6 +- + include/linux/fb.h | 4 + + include/uapi/drm/nouveau_drm.h | 22 + + include/uapi/drm/panthor_drm.h | 945 ++++++ + 121 files changed, 15716 insertions(+), 669 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-panfrost-profiling + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-common-dual.yaml + create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-valhall-csf.yaml + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e3fa7.c + delete mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.c + delete mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.h + create mode 100644 drivers/gpu/drm/panthor/Kconfig + create mode 100644 drivers/gpu/drm/panthor/Makefile + create mode 100644 drivers/gpu/drm/panthor/panthor_devfreq.c + create mode 100644 drivers/gpu/drm/panthor/panthor_devfreq.h + create mode 100644 drivers/gpu/drm/panthor/panthor_device.c + create mode 100644 drivers/gpu/drm/panthor/panthor_device.h + create mode 100644 drivers/gpu/drm/panthor/panthor_drv.c + create mode 100644 drivers/gpu/drm/panthor/panthor_fw.c + create mode 100644 drivers/gpu/drm/panthor/panthor_fw.h + create mode 100644 drivers/gpu/drm/panthor/panthor_gem.c + create mode 100644 drivers/gpu/drm/panthor/panthor_gem.h + create mode 100644 drivers/gpu/drm/panthor/panthor_gpu.c + create mode 100644 drivers/gpu/drm/panthor/panthor_gpu.h + create mode 100644 drivers/gpu/drm/panthor/panthor_heap.c + create mode 100644 drivers/gpu/drm/panthor/panthor_heap.h + create mode 100644 drivers/gpu/drm/panthor/panthor_mmu.c + create mode 100644 drivers/gpu/drm/panthor/panthor_mmu.h + create mode 100644 drivers/gpu/drm/panthor/panthor_regs.h + create mode 100644 drivers/gpu/drm/panthor/panthor_sched.c + create mode 100644 drivers/gpu/drm/panthor/panthor_sched.h + create mode 100644 include/uapi/drm/panthor_drm.h +Merging amdgpu/drm-next (0355b24bdec3 drm/amd: Flush GFXOFF requests in prepare stage) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 144 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 216 ++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.h | 47 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 228 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 30 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 105 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 16 - + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c | 112 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 12 - + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 48 +- + 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/gmc_v9_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 55 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 2 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 40 +- + drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.c | 62 ++ + drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.h | 30 + + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 112 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 6 - + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 35 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 42 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 18 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 25 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- + drivers/gpu/drm/amd/display/Makefile | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 2 +- + drivers/gpu/drm/amd/display/dc/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 15 +- + .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.h | 42 +- + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h | 3 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 844 ++++++++++----- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 1 - + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc.h | 177 ++-- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 138 ++- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + 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/dcn20/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 2 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 2 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 2 +- + .../amd/display/dc/dcn35/dcn35_dio_link_encoder.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 1 + + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 12 +- + .../gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c | 94 +- + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 1 + + .../drm/amd/display/dc/dml2/display_mode_core.c | 2 + + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.h | 2 + + .../amd/display/dc/dml2/dml2_translation_helper.c | 17 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 6 + + 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/dce110/dce110_hwseq.c | 3 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 16 + + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 47 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 3 + + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 3 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 22 - + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 1 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 7 + + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 3 + + .../display/dc/link/protocols/link_dp_training.c | 16 +- + .../dc/link/protocols/link_edp_panel_control.c | 64 ++ + .../dc/link/protocols/link_edp_panel_control.h | 2 + + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 6 +- + .../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/dcn20/dcn20_resource.c | 7 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 5 +- + .../display/dc/resource/dcn314/dcn314_resource.c | 21 +- + .../display/dc/resource/dcn316/dcn316_resource.c | 1 - + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 3 +- + .../display/dc/resource/dcn321/dcn321_resource.c | 4 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 4 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.h | 2 + + .../display/dc/resource/dcn351/dcn351_resource.c | 3 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 121 ++- + .../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 | 8 +- + .../amd/display/modules/info_packet/info_packet.c | 15 +- + .../amd/include/asic_reg/dcn/dcn_3_2_1_offset.h | 37 +- + .../amd/include/asic_reg/dcn/dcn_3_2_1_sh_mask.h | 16 + + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 4 + + .../include/asic_reg/smuio/smuio_14_0_2_offset.h | 511 +++++++++ + .../include/asic_reg/smuio/smuio_14_0_2_sh_mask.h | 1106 ++++++++++++++++++++ + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 59 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h | 6 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v14_0_0_ppsmc.h | 28 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 10 + + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 37 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 50 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 27 +- + include/uapi/linux/kfd_ioctl.h | 17 +- + 179 files changed, 4870 insertions(+), 1140 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.h + 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%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_14_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_14_0_2_sh_mask.h +Merging drm-intel/for-linux-next (1bfc03b13752 drm/i915: Remove special handling for !RCS_MASK()) +$ 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/drm/display/drm_dp_mst_helper.h +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 1258825a7f44] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/rfc/i915_vm_bind.h | 11 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 20 +- + 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 | 117 +++---- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 330 +++++++++--------- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 299 ++++++++-------- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 3 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 129 +++---- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 14 +- + drivers/gpu/drm/i915/display/intel_display.c | 279 ++++++++------- + drivers/gpu/drm/i915/display/intel_display.h | 7 + + .../drm/i915/display/intel_display_power_well.c | 62 ++-- + drivers/gpu/drm/i915/display/intel_display_types.h | 15 +- + 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 | 133 +++++--- + 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 | 129 +++---- + 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_hdmi.c | 80 ++--- + 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.c | 14 +- + drivers/gpu/drm/i915/display/intel_pmdemand.h | 5 +- + drivers/gpu/drm/i915/display/intel_psr.c | 53 ++- + drivers/gpu/drm/i915/display/intel_sdvo.c | 8 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 16 +- + drivers/gpu/drm/i915/display/intel_snps_phy.h | 4 +- + drivers/gpu/drm/i915/display/intel_tc.c | 33 +- + drivers/gpu/drm/i915/display/intel_tv.c | 3 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 36 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 7 +- + drivers/gpu/drm/i915/display/skl_scaler.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/gem/i915_gem_object_types.h | 2 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 4 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 8 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 5 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 40 +-- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 43 +-- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 10 +- + drivers/gpu/drm/i915/gt/intel_gsc.c | 15 - + drivers/gpu/drm/i915/gt/intel_gt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 52 +-- + drivers/gpu/drm/i915/gt/intel_gt_mcr.h | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 59 ---- + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 21 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 51 +-- + drivers/gpu/drm/i915/gt/intel_migrate.c | 22 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 52 +-- + drivers/gpu/drm/i915/gt/intel_rps.c | 6 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 13 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 183 +--------- + drivers/gpu/drm/i915/gt/intel_workarounds.c.rej | 18 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 4 - + drivers/gpu/drm/i915/i915_debugfs.c | 12 - + drivers/gpu/drm/i915/i915_driver.c | 2 +- + drivers/gpu/drm/i915/i915_drv.h | 13 - + drivers/gpu/drm/i915/i915_getparam.c | 4 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- + drivers/gpu/drm/i915/i915_hwmon.c | 43 ++- + drivers/gpu/drm/i915/i915_memcpy.c | 2 + + drivers/gpu/drm/i915/i915_pci.c | 61 +--- + drivers/gpu/drm/i915/i915_perf.c | 19 +- + drivers/gpu/drm/i915/i915_query.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 19 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 59 +--- + drivers/gpu/drm/i915/intel_device_info.c | 2 - + drivers/gpu/drm/i915/intel_device_info.h | 2 - + drivers/gpu/drm/i915/intel_step.c | 80 +---- + drivers/gpu/drm/i915/intel_uncore.c | 380 ++++++--------------- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 3 - + drivers/gpu/drm/nouveau/nouveau_dp.c | 2 +- + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 6 - + drivers/gpu/drm/xe/xe_pci.c | 1 + + include/drm/display/drm_dp_mst_helper.h | 23 +- + include/uapi/drm/i915_drm.h | 16 +- + 101 files changed, 1684 insertions(+), 2192 deletions(-) + create mode 100644 drivers/gpu/drm/i915/gt/intel_workarounds.c.rej +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 (008aa86a09ba drm/xe: Remove redundant functions to get xe) +$ 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/compat-i915-headers/i915_drv.h +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_exec_queue_types.h +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 +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c +Auto-merging include/uapi/drm/xe_drm.h +Resolved 'drivers/gpu/drm/xe/xe_vm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4f5a3415aaf8] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel +$ git diff -M --stat --summary HEAD^.. + 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 +- + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 6 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 24 +- + 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 | 42 ++-- + 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_bb.c | 6 +- + drivers/gpu/drm/xe/xe_bo.c | 78 ++----- + drivers/gpu/drm/xe/xe_bo.h | 2 + + 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 | 22 +- + 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_device_types.h | 5 +- + 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 | 56 ++--- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 8 +- + drivers/gpu/drm/xe/xe_ggtt.c | 68 ++---- + drivers/gpu/drm/xe/xe_ggtt.h | 4 +- + drivers/gpu/drm/xe/xe_gsc.c | 70 +++++- + 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 | 21 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 3 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 8 +- + drivers/gpu/drm/xe/xe_guc_debugfs.c | 9 +- + drivers/gpu/drm/xe/xe_guc_hwconfig.c | 5 +- + drivers/gpu/drm/xe/xe_guc_log.c | 3 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 83 ++----- + drivers/gpu/drm/xe/xe_guc_submit.c | 153 +++++++------ + 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 | 38 +++- + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 91 ++++++-- + 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 | 3 +- + drivers/gpu/drm/xe/xe_lmtt.c | 4 +- + drivers/gpu/drm/xe/xe_lrc.c | 171 +++++++++++++-- + drivers/gpu/drm/xe/xe_lrc.h | 5 + + drivers/gpu/drm/xe/xe_lrc_types.h | 2 + + drivers/gpu/drm/xe/xe_memirq.c | 1 + + 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_pcode.c | 2 +- + 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 | 55 ++++- + drivers/gpu/drm/xe/xe_sa.c | 3 +- + drivers/gpu/drm/xe/xe_tile_sysfs.c | 1 + + drivers/gpu/drm/xe/xe_trace.h | 6 +- + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 5 + + 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 | 40 ++-- + drivers/gpu/drm/xe/xe_vm.c | 46 ++-- + drivers/gpu/drm/xe/xe_wa.c | 27 ++- + drivers/gpu/drm/xe/xe_wa_oob.rules | 3 - + include/drm/xe_pciids.h | 3 + + include/uapi/drm/xe_drm.h | 11 +- + 107 files changed, 1760 insertions(+), 799 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 (ada5caa4e081 fbdev: omap2: replace of_graph_get_next_endpoint()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 20 +------------------- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 3 ++- + drivers/video/fbdev/pxafb.c | 2 +- + include/video/omapfb_dss.h | 3 --- + 7 files changed, 10 insertions(+), 27 deletions(-) +Merging regmap/for-next (aad6b35290f5 regmap: maple: Remove second semicolon) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/regcache-maple.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sound/for-next (cafe9c6a72cf ALSA: hda: cs35l56: Set the init_done flag before component_add()) +$ 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 (af70611cab88 firewire: core: option to log bus reset initiation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Merge made by the 'ort' strategy. + drivers/firewire/core-card.c | 10 ++++++++++ + drivers/firewire/core-transaction.c | 7 +++++++ + drivers/firewire/core.h | 4 ++++ + 3 files changed, 21 insertions(+) +Merging sound-asoc/for-next (286036cecb7c Merge remote-tracking branch 'asoc/for-6.10' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/fsl,audmix.txt | 50 --------- + .../devicetree/bindings/sound/fsl,audmix.yaml | 83 +++++++++++++++ + .../devicetree/bindings/sound/fsl,esai.txt | 68 ------------ + .../devicetree/bindings/sound/fsl,esai.yaml | 116 +++++++++++++++++++++ + .../devicetree/bindings/sound/wlf,wm8776.yaml | 41 ++++++++ + Documentation/devicetree/bindings/sound/wm8776.txt | 18 ---- + sound/soc/amd/Kconfig | 5 +- + sound/soc/codecs/cs-amp-lib.c | 5 + + sound/soc/fsl/fsl_ssi.c | 4 +- + sound/soc/fsl/imx-es8328.c | 16 +-- + sound/soc/sof/intel/hda-dsp.c | 20 +++- + sound/soc/sof/ipc4-mtrace.c | 11 +- + 12 files changed, 282 insertions(+), 155 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,audmix.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,audmix.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,esai.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,esai.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8776.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8776.txt +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 (b4d78cfeb304 dm-integrity: align the outgoing bio in integrity_recheck) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (7c6a9783c7f0 dt-bindings: ata: imx-pata: Convert to dtschema) +$ 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. + .../devicetree/bindings/ata/fsl,imx-pata.yaml | 42 ++++++++++++++++++++++ + Documentation/devicetree/bindings/ata/imx-pata.txt | 16 --------- + 2 files changed, 42 insertions(+), 16 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/fsl,imx-pata.yaml + delete mode 100644 Documentation/devicetree/bindings/ata/imx-pata.txt +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 (d10566c8de97 Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 3 + + drivers/mmc/core/block.c | 8 +- + drivers/mmc/core/host.c | 1 - + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/cqhci-core.c | 11 +- + drivers/mmc/host/cqhci.h | 4 + + drivers/mmc/host/davinci_mmc.c | 4 +- + drivers/mmc/host/dw_mmc-hi3798cv200.c | 1 - + drivers/mmc/host/dw_mmc-hi3798mv200.c | 1 - + drivers/mmc/host/mtk-sd.c | 1 - + drivers/mmc/host/sdhci-of-dwcmshc.c | 191 ++++++++++++++++++++- + drivers/mmc/host/sdhci-s3c.c | 4 +- + drivers/mmc/host/sdhci-sprd.c | 1 - + drivers/mmc/host/sdhci_am654.c | 176 +++++++++++++++---- + 14 files changed, 350 insertions(+), 57 deletions(-) +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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (cd290abbdab3 add pmic pca9451a support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/nxp,pca9450-regulator.yaml | 1 + + .../regulator/qcom,usb-vbus-regulator.yaml | 1 + + drivers/regulator/pca9450-regulator.c | 194 ++++++++++++++++++++- + include/linux/regulator/pca9450.h | 1 + + 4 files changed, 195 insertions(+), 2 deletions(-) +Merging security/next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +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 (4cece7649650 Linux 6.9-rc1) +$ 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 (2900d362b5b5 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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (57b7d5d315e2 dt-bindings: display: atmel,lcdc: convert to dtschema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Merge made by the 'ort' strategy. + .../bindings/display/atmel,lcdc-display.yaml | 103 +++++++++++++ + .../devicetree/bindings/display/atmel,lcdc.txt | 87 ----------- + .../devicetree/bindings/display/atmel,lcdc.yaml | 70 +++++++++ + .../bindings/display/exynos/exynos_dp.txt | 112 -------------- + .../display/samsung/samsung,exynos5-dp.yaml | 163 +++++++++++++++++++++ + 5 files changed, 336 insertions(+), 199 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/atmel,lcdc-display.yaml + delete mode 100644 Documentation/devicetree/bindings/display/atmel,lcdc.txt + create mode 100644 Documentation/devicetree/bindings/display/atmel,lcdc.yaml + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos_dp.txt + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos5-dp.yaml +Merging dt-krzk/for-next (4b660dbd9ee2 arm64: dts: amd: use capital "OR" for multiple licenses in SPDX) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/amd/elba-16core.dtsi | 2 +- + arch/arm64/boot/dts/amd/elba-asic-common.dtsi | 2 +- + arch/arm64/boot/dts/amd/elba-asic.dts | 2 +- + arch/arm64/boot/dts/amd/elba-flash-parts.dtsi | 2 +- + arch/arm64/boot/dts/amd/elba.dtsi | 2 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 4 ++-- + arch/arm64/boot/dts/arm/juno-scmi.dtsi | 4 ++-- + 7 files changed, 9 insertions(+), 9 deletions(-) +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 (bdeef5dcea6b spi: rspi: Get rid of unused struct rspi_plat_data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. + drivers/spi/spi-mt65xx.c | 32 ++++++++-------- + drivers/spi/spi-mt7621.c | 95 +++++++++++++++++++++++------------------------- + drivers/spi/spi-rspi.c | 12 +----- + include/linux/spi/rspi.h | 18 --------- + 4 files changed, 61 insertions(+), 96 deletions(-) + delete mode 100644 include/linux/spi/rspi.h +Merging tip/master (4e2b6e891aae Merge branch into tip/master: 'x86/shstk') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/x86/kernel/setup.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/sched.h +Auto-merging init/main.c +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/arch/x86/resctrl.rst | 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/Kconfig | 15 +- + arch/x86/boot/main.c | 4 +- + arch/x86/entry/entry_64_compat.S | 1 - + arch/x86/entry/syscalls/syscall_64.tbl | 2 +- + arch/x86/events/amd/core.c | 39 ++- + arch/x86/events/amd/lbr.c | 16 +- + arch/x86/events/rapl.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/boot.h | 5 - + arch/x86/include/asm/cpufeature.h | 10 +- + arch/x86/include/asm/cpufeatures.h | 10 +- + arch/x86/include/asm/disabled-features.h | 3 +- + arch/x86/include/asm/ia32_unistd.h | 12 - + arch/x86/include/asm/irq_stack.h | 2 +- + arch/x86/include/asm/page_types.h | 8 +- + arch/x86/include/asm/percpu.h | 110 +++--- + arch/x86/include/asm/processor.h | 12 +- + arch/x86/include/asm/required-features.h | 3 +- + arch/x86/include/asm/seccomp.h | 2 +- + arch/x86/include/asm/special_insns.h | 8 +- + arch/x86/include/asm/string_64.h | 45 +-- + arch/x86/include/asm/uaccess.h | 4 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/cpu/common.c | 17 +- + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/cpu/topology_amd.c | 19 +- + arch/x86/kernel/cpu/topology_ext.c | 15 + + arch/x86/kernel/fpu/core.c | 4 +- + arch/x86/kernel/head_32.S | 11 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/setup.c | 8 + + arch/x86/kernel/shstk.c | 4 +- + arch/x86/kernel/signal_32.c | 2 +- + arch/x86/kernel/signal_64.c | 6 + + arch/x86/kernel/topology.c | 43 --- + arch/x86/kernel/tsc.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 10 +- + arch/x86/mm/ident_map.c | 23 +- + arch/x86/tools/relocs.c | 371 +++++++++++---------- + arch/x86/virt/vmx/tdx/tdx.c | 1 - + arch/x86/xen/enlighten.c | 3 - + arch/x86/xen/xen-head.S | 2 +- + drivers/uio/uio.c | 2 +- + drivers/uio/uio_dmem_genirq.c | 4 +- + drivers/uio/uio_pruss.c | 2 +- + include/asm-generic/sections.h | 5 + + include/asm-generic/vmlinux.lds.h | 8 +- + include/linux/jump_label.h | 3 + + include/linux/sched.h | 3 +- + include/linux/sched/idle.h | 2 +- + include/linux/sched/topology.h | 2 +- + init/init_task.c | 1 + + init/main.c | 1 + + kernel/context_tracking.c | 2 +- + kernel/jump_label.c | 53 +++ + kernel/locking/lock_events.h | 4 +- + kernel/locking/qspinlock_paravirt.h | 2 +- + kernel/sched/core.c | 6 +- + kernel/sched/fair.c | 338 +++++++++++-------- + kernel/sched/loadavg.c | 2 +- + kernel/sched/pelt.c | 4 +- + kernel/sched/sched.h | 20 +- + kernel/sched/stats.c | 5 +- + kernel/sched/topology.c | 56 ++-- + kernel/time/timer.c | 2 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 2 +- + .../ftrace/test.d/ftrace/func_set_ftrace_file.tc | 2 +- + 77 files changed, 816 insertions(+), 699 deletions(-) + delete mode 100644 arch/x86/include/asm/ia32_unistd.h + delete mode 100644 arch/x86/kernel/topology.c +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 (bff78224e453 RAS/AMD/FMPM: Fix build when debugfs is not enabled) +$ 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. + drivers/ras/Kconfig | 2 +- + drivers/ras/amd/fmpm.c | 57 ++++++++++++++++++++++++++++++++++---------------- + 2 files changed, 40 insertions(+), 19 deletions(-) +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 +Auto-merging arch/x86/kernel/kvm.c +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 (8034b31464c5 workqueue: remove unnecessary import and function in wq_monitor.py) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 52 ++++- + include/trace/events/workqueue.h | 4 +- + kernel/workqueue.c | 466 +++++++++++++++++++++++---------------- + tools/workqueue/wq_monitor.py | 9 +- + 4 files changed, 332 insertions(+), 199 deletions(-) +Merging drivers-x86/for-next (4cece7649650 Linux 6.9-rc1) +$ 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 (f7496450528b platform/chrome: wilco_ec: use sysfs_emit() instead of sprintf()) +$ 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 +Merge made by the 'ort' strategy. + drivers/platform/chrome/wilco_ec/sysfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging chrome-platform-firmware/for-firmware-next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds-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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging accel/habanalabs-next (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 (4cece7649650 Linux 6.9-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 (c5b2db585995 iio: pressure: hsc030pa: Use spi_read()) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/iio/adc/adi,ad7173.yaml | 279 ++++ + .../devicetree/bindings/iio/adc/adi,ad7944.yaml | 213 +++ + .../bindings/iio/humidity/ti,hdc3020.yaml | 5 + + .../bindings/iio/light/avago,apds9300.yaml | 20 +- + .../bindings/iio/light/avago,apds9960.yaml | 44 - + Documentation/iio/ad7944.rst | 130 ++ + Documentation/iio/index.rst | 1 + + MAINTAINERS | 11 + + drivers/base/property.c | 14 - + drivers/iio/accel/adxl367.c | 2 +- + drivers/iio/accel/fxls8962af-core.c | 10 +- + drivers/iio/accel/mma8452.c | 6 +- + drivers/iio/adc/Kconfig | 27 + + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/ad7124.c | 55 +- + drivers/iio/adc/ad7173.c | 1190 +++++++++++++++++ + drivers/iio/adc/ad7192.c | 38 +- + drivers/iio/adc/ad7292.c | 13 +- + drivers/iio/adc/ad7944.c | 538 ++++++++ + drivers/iio/adc/ad_sigma_delta.c | 23 +- + drivers/iio/adc/fsl-imx25-gcq.c | 140 +- + drivers/iio/adc/hx711.c | 5 +- + drivers/iio/adc/max11410.c | 27 +- + drivers/iio/adc/rcar-gyroadc.c | 21 +- + drivers/iio/adc/rzg2l_adc.c | 11 +- + drivers/iio/adc/spear_adc.c | 25 +- + drivers/iio/adc/twl4030-madc.c | 19 +- + drivers/iio/addac/ad74413r.c | 10 +- + drivers/iio/dac/ltc2688.c | 28 +- + drivers/iio/humidity/hdc3020.c | 111 +- + drivers/iio/humidity/hts221_core.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 542 +++++++- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 36 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 17 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 83 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 +- + drivers/iio/industrialio-buffer.c | 122 +- + drivers/iio/industrialio-core.c | 49 +- + drivers/iio/industrialio-trigger.c | 71 +- + drivers/iio/inkern.c | 263 ++-- + drivers/iio/light/Kconfig | 12 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/apds9306.c | 1355 ++++++++++++++++++++ + drivers/iio/light/st_uvis25_core.c | 2 +- + drivers/iio/pressure/bmp280-core.c | 16 +- + drivers/iio/pressure/hsc030pa_spi.c | 7 +- + drivers/iio/temperature/ltc2983.c | 137 +- + include/linux/iio/adc/ad_sigma_delta.h | 3 + + include/linux/property.h | 22 +- + 49 files changed, 4915 insertions(+), 845 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7173.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7944.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/avago,apds9960.yaml + create mode 100644 Documentation/iio/ad7944.rst + create mode 100644 drivers/iio/adc/ad7173.c + create mode 100644 drivers/iio/adc/ad7944.c + create mode 100644 drivers/iio/light/apds9306.c +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 (cde37a5bdb0e w1: gpio: Don't use "proxy" headers) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Merge made by the 'ort' strategy. + drivers/w1/masters/w1-gpio.c | 62 ++++++++++++++++++-------------------------- + 1 file changed, 25 insertions(+), 37 deletions(-) +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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging counter-next/counter-next (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 +Already up to date. +Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (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 (20d46283f5d6 cgroup, docs: Clarify limitation of RT processes with cgroup v2 cpu controller) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) +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 +Already up to date. +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 (1f61cb44e5be Merge branches 'hwspinlock-next', '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 +Merge made by the 'ort' strategy. +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 (4cece7649650 Linux 6.9-rc1) +$ 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 (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-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 (4184e4912ca6 dt-bindings: pinctrl: samsung: drop unused header with register constants) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + include/dt-bindings/pinctrl/samsung.h | 95 ----------------------------------- + 2 files changed, 96 deletions(-) + delete mode 100644 include/dt-bindings/pinctrl/samsung.h +Merging pwm/pwm/for-next (f6c29a068ed5 pwm: stm32: Calculate prescaler with a division instead of a loop) +$ 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/atmel,at91sam-pwm.yaml | 3 + + drivers/hwmon/aspeed-g6-pwm-tach.c | 21 +- + drivers/pwm/Kconfig | 4 - + drivers/pwm/Makefile | 1 - + drivers/pwm/core.c | 988 ++++++++++++++++++++- + drivers/pwm/pwm-img.c | 4 +- + drivers/pwm/pwm-sti.c | 161 ++-- + drivers/pwm/pwm-stm32.c | 60 +- + drivers/pwm/sysfs.c | 545 ------------ + include/linux/pwm.h | 51 +- + include/uapi/linux/pwm.h | 23 + + 11 files changed, 1104 insertions(+), 757 deletions(-) + delete mode 100644 drivers/pwm/sysfs.c + create mode 100644 include/uapi/linux/pwm.h +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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging livepatching/for-next (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 (f7cee094fb3b MAINTAINER: Include linux-arm-msm for Qualcomm RTC patches) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (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 (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-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 (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/for-next (4cece7649650 Linux 6.9-rc1) +$ 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 (62b71cd73d41 efi: fix panic in kdump kernel) +$ 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 (87654cf7a986 mm/slub: mark racy accesses on slab->slabs) +$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging mm/slab.h +Auto-merging mm/slab_common.c +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + mm/slab.h | 3 --- + mm/slab_common.c | 2 -- + mm/slub.c | 16 +++------------- + 3 files changed, 3 insertions(+), 18 deletions(-) +Merging random/master (6fba9af4a847 x86/coco: Require seeding RNG with RDRAND on CoCo systems) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging arch/x86/kernel/setup.c +Merge made by the 'ort' strategy. + arch/x86/coco/core.c | 40 +++++++++++++++++++++++++++++++++++++++ + arch/x86/include/asm/archrandom.h | 18 +++++++----------- + arch/x86/include/asm/coco.h | 2 ++ + arch/x86/kernel/setup.c | 2 ++ + 4 files changed, 51 insertions(+), 11 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at f5b58dc680b5 Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git +Merging next-20240322 version of random +$ git merge -m next-20240322/random 1f719a2f3fa67665578c759ac34fd3d3690c1a20 +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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging sysctl/sysctl-next (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 (5248f4097308 binfmt: replace deprecated strncpy) +$ 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 +Auto-merging fs/exec.c +Merge made by the 'ort' strategy. + fs/binfmt_elf_fdpic.c | 2 +- + fs/exec.c | 1 + + 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 +++++++++++++------------- + 7 files changed, 62 insertions(+), 56 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 +Already up to date. +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 (231dc3f0c936 lkdtm/bugs: Improve warning message for compilers without counted_by support) +$ 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 +Already up to date. +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 (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-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..9d4468bb1c62 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20240326 |