Add linux-next specific files for 20260508 Signed-off-by: Thierry Reding <treding@nvidia.com>
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 0000000..541f94e --- /dev/null +++ b/Next/SHA1s
@@ -0,0 +1,424 @@ +Name SHA1 +---- ---- +origin 917719c412c48687d4a176965d1fa35320ec457c +ext4-fixes 981fcc5674e67158d24d23e841523eccba19d0e7 +vfs-brauner-fixes ac8777cc36224b4705d2c6efb10c56135d479b21 +fscrypt-current 254f49634ee16a731174d2ae34bc50bd5f45e731 +fsverity-current 0c8c88b8eb82a2a41bec5f17c076d6312dc40316 +btrfs-fixes 238cee9efdb735409e6bed0cb0d9280231481fb8 +vfs-fixes 49c5d168a3a8f4eb27d44a2a22b7e8a856ca601f +erofs-fixes 6e7188a8d725decabde50e86561a641b4600188b +nfsd-fixes b0bf14546bcefa4ea49f5efcd7db2a99f0cabde9 +v9fs-fixes 028ef9c96e96197026887c0f092424679298aae8 +overlayfs-fixes 1f6ee9be92f8df85a8c9a5a78c20fd39c0c21a95 +fscrypt 254f49634ee16a731174d2ae34bc50bd5f45e731 +btrfs 6bf684b8823552b99c86bf791b22f622934ee771 +ceph 49a74f6a818fbd75b777d247f48f7d9c37958f67 +cifs f98b48151cc502ada59d9778f0112d21f2586ca3 +configfs 6363844fdbbb76afe1d44d678fe0746390204a5f +ecryptfs eb5e768eaf7c5f6274319e2894ceebf0f3cb5750 +dlm 2c3a0b730012ef87aaaf35243e1fbe9880666f7c +erofs a5242d37c83abe86df95c6941e2ace9f9055ffcb +exfat ec5e84e1605d242caf401b93e879424f7498b576 +ext3 38b4aa1a24f086c911188c4ad5557a0d5c00d91e +ext4 981fcc5674e67158d24d23e841523eccba19d0e7 +f2fs 5758375b0d32f46a3fc23a931acadf92c2b7cd02 +fsverity 254f49634ee16a731174d2ae34bc50bd5f45e731 +fuse a59c5242b2800bf53dcfc96aaa9f3f6c131f256b +gfs2 f9c9ec2c319f843b70ecdf939d48b52d189bc081 +jfs dad98c5b2a05ef744af4c884c97066a3c8cdad61 +ksmbd 8ab992f815d6736b5c7a6f5fd7bfe7bc106bb3dc +nfs 7fd2df204f342fc17d1a0bfcd474b24232fb0f32 +nfs-anna 4529e0015432977af3ecc3b9f940fc2a1ef1b265 +nfsd 8ac8f70798fcae207c14249fed6cb6972d6fb78e +ntfs 788ac190a6a916f31ff5ba0ad7bf7f98fa997c46 +ntfs3 f1df9d771df47aa40de6d70949c28720ae1e430d +orangefs e61bc5e4d87433c8759e7dc92bb640ef71a8970c +overlayfs 1f6ee9be92f8df85a8c9a5a78c20fd39c0c21a95 +ubifs 11efa98bcc0d00271e8f66c7c940c284f973f39d +v9fs 8fc518e489c1386fd0cf7f4256d055960ed6a2e4 +v9fs-ericvh 028ef9c96e96197026887c0f092424679298aae8 +xfs 87e63466c9fc30c3d95b8741c3df1f1ff01d7f23 +zonefs a42938e80357a13f8b8592111e63f2e33a919863 +vfs-brauner 8ee708daac8a2ccf7019a5ef6ee1bec2937f0823 +vfs e82ff9b6cb767fc823d5e461034f32388c4092a2 +mm-hotfixes 97f23576be132c5f01709b6cf7f8bebca90e4f25 +fs-current aea95f135b5b3d906cb00bef71d3bb3f0374b455 +kbuild-current bdb0ab9747193e990d382d6a635a8011b8e65be0 +clang-fixes 4f96b7c68a9904e01049ef610d701b382dca9574 +arc-current 7aaa8047eafd0bd628065b15757d9b48c5f9c07d +arm-current 75f9a484e817adea211c73f89ed938a2b2f90953 +arm64-fixes 5cbb61bf4168859d97c068d88d364f4f1f440325 +arm-soc-fixes 7602c0ec0bbfd3985d49f4f0cad281c1414008c9 +davinci-current 254f49634ee16a731174d2ae34bc50bd5f45e731 +drivers-memory-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current cb39cf99d88e8f2c68a41fb3bb01c4f40a8fcc30 +powerpc-fixes f583bd5f64d40e083dde5bb22846c4d93e59d471 +s390-fixes 3fe7ecab1a0856aafe1026a35af1621a5c18d53f +net fcee7d82f27d6a8b1ddc5bbefda59b4e441e9bc0 +bpf 0c7ae130698e70107430254e79fbe996b4d37ab5 +ipsec 7e2a4f7ca0952820731ef7bdadfc9a9e9d3571b4 +netfilter fcee7d82f27d6a8b1ddc5bbefda59b4e441e9bc0 +ipvs bd3a4795d5744f59a1f485379f1303e5e606f377 +wireless fcee7d82f27d6a8b1ddc5bbefda59b4e441e9bc0 +ath 79240f3f6d766b342b57c32397d643e1cfa26b81 +iwlwifi 59800be48da41933e33166fa1300731231bcbc75 +wpan 8ce4f287524c74a118b0af1eebd4b24a8efca57a +rdma-fixes 0c99acbc8b6c6dd526ae475a48ee1897b61072fb +sound-current fca7401fe37f7abc6e54147ea560f37279231137 +sound-asoc-fixes 5776bcdf4dccac8edc1160482792b512da5c08b4 +regmap-fixes 4b7774eeab8d66c22f02f5c120602df154a87e12 +regulator-fixes 628497e6d925d43efb56e3ffecef0a9d217926b3 +spi-fixes 4bacec2317527ba04b7172145848f1c206999ea1 +pci-current cede9116c5e1572d38b9d357f35556d480867822 +driver-core.current 254f49634ee16a731174d2ae34bc50bd5f45e731 +tty.current 254f49634ee16a731174d2ae34bc50bd5f45e731 +usb.current b38e53cbfb9d84732e5984fbd73e128d592415c5 +usb-serial-fixes 100201d349edd226ca3470c894c92dccc67ee7a8 +phy 519a228ee40d1be3453d1da339b4577c3785e333 +staging.current bc851db06045a40c18233dd76ef0562d7f8bb6db +iio-fixes bbf04ca930ff1a34a164584593ebdc99c6f31719 +counter-current 254f49634ee16a731174d2ae34bc50bd5f45e731 +char-misc.current 7fd2df204f342fc17d1a0bfcd474b24232fb0f32 +soundwire-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +thunderbolt-fixes 7fd2df204f342fc17d1a0bfcd474b24232fb0f32 +input-current 74d695fd6f9d70df849c555f358ddfd26e2d85bf +crypto-current d1fa83ecac31093a550534a79a33bc7f4ba8fc10 +libcrypto-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +vfio-fixes e98137f0a874ab36d0946de4707aa48cb7137d1c +kselftest-fixes 465b05bae5ac553c13315681c1490dc565337771 +dmaengine-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +backlight-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +mtd-fixes 135ac3b84bcedae1860e7a9512d63166f42b736e +mfd-fixes aa6e63373d91f82628b20f6fae7ffe9b97b568a5 +v4l-dvb-fixes 646ebdd3105809d84ed04aa9e92e47e89cc44502 +reset-fixes 9797524ef2b69c6b187b55bd844eb72a8c1cbd99 +mips-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +at91-fixes 907150bbe566e23714a25d7bcb910f236c3c44c0 +omap-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +kvm-fixes 6d35786de28116ecf78797a62b84e6bf3c45aa5a +kvms390-fixes 0cfe660559e857d7c00ab86c73e4510ce069086f +kvm-arm-fixes effc0a39b8e0f30670fe24f51e44329d4324e566 +hwmon-fixes 99076a17a112ac43cbd37f6883898ae649166303 +nvdimm-fixes a8aec14230322ed8f1e8042b6d656c1631d41163 +cxl-fixes be5c5280cf2b20e363dc8e2a424dd200a29b1c77 +dma-mapping-fixes 22d0213e55fbb723c2c00dd5aa855a6eaad95b23 +drivers-x86-fixes 863810d4985ad214f70c1623f24384ccc850f2a2 +samsung-krzk-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +pinctrl-samsung-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +devicetree-fixes 4b0a3ff9f4178a0765d54c0dd09e9839526b08ba +dt-krzk-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +scsi-fixes 98f69975d4c0434ca2e6e8cfa1d8d51647a20593 +drm-fixes 5dfe9c1399633018af61f8a0d80d2913c246bd19 +drm-intel-fixes aab3d205a086233c612fee86009265451793e0c2 +mmc-fixes 8f4d20a710225ec7a565f6a0459862d3b1f32330 +rtc-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +gnss-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +hyperv-fixes 3f8c8497b4fc249e27cb335c627114d8412e584d +risc-v-fixes db909bd7986c10da074917af3dae83a60fa65093 +riscv-dt-fixes 0df8aa2b9aec5cd21e8c71d9cc1227e57bea43b3 +riscv-soc-fixes c7596f9001e2b83293e3658e4e1addde69bb335d +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx 254f49634ee16a731174d2ae34bc50bd5f45e731 +gpio-brgl-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +gpio-intel-fixes 3bb62e3f99a557d257e5f5a803200051b7de3afa +pinctrl-intel-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +auxdisplay-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +kunit-fixes 8f80b5b227ef9ea422080487715c841856339aed +memblock-fixes afd218bb1dd8b4d2ba99a84cfa71524da6dbab35 +renesas-fixes 8a78d1c454b3cc7b66d52582474e8b3732833352 +perf-current 254f49634ee16a731174d2ae34bc50bd5f45e731 +efi-fixes 2c340aab5485ebe9e33c01437dd4815ef33c8df5 +battery-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +iommufd-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +rust-fixes 2adc8664018c1cc595c7c0c98474a33c7fe32a85 +w1-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +pmdomain-fixes ec1fcddb3117d9452210e838fd37389ee61e10e8 +i2c-host-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +i2c-rust-fixes 7ca6d1cfec80ebe46cc063f3284c5896c344d9a1 +sparc-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +clk-fixes de019f203b0d472c98ead4081ad4f05d92c9b826 +thead-clk-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +tenstorrent-clk-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +pwrseq-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +thead-dt-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +ftrace-fixes 1650a1b6cb1ae6cb99bb4fce21b30ebdf9fc238e +ring-buffer-fixes 92d5a606721f759ebebf448b3bd2b7a781d50bd0 +trace-fixes b2aa3b4d64e460ac606f386c24e7d8a873ce6f1a +tracefs-fixes 07004a8c4b572171934390148ee48c4175c77eed +spacemit-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +tip-fixes 304ca1ddeb53a9a2c19f426e0f714961344e93cc +slab-fixes 5b31044e649e3e54c2caef135c09b371c2fbcd08 +kexec-fixes 028ef9c96e96197026887c0f092424679298aae8 +liveupdate-fixes 7b0b68b2b95606e65594958686833e53423f58f2 +drm-msm-fixes a972d1b864e8efcfda0b387debac8ea2875a182c +uml-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +fwctl-fixes 254f49634ee16a731174d2ae34bc50bd5f45e731 +devsec-tsm-fixes c3fd16c3b98ed726294feab2f94f876290bf7b61 +drm-rust-fixes 0a69ac25bd596d50823d530d0a2004336668c0df +tenstorrent-dt-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +nfc-fixes f040e590c035bfd9553fe79ee9585caf1b14d67b +drm-misc-fixes 459d75523b71c0ec254d153d8850d0b7008af396 +rust 254f49634ee16a731174d2ae34bc50bd5f45e731 +rust-interop 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b +rust-alloc 254f49634ee16a731174d2ae34bc50bd5f45e731 +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init 254f49634ee16a731174d2ae34bc50bd5f45e731 +rust-timekeeping ddb1444d3335129ae87d9796ab1debf41c0ee51b +rust-xarray c455f19bbe6104debd980bb15515faf716bd81b8 +rust-analyzer 254f49634ee16a731174d2ae34bc50bd5f45e731 +mm-stable 254f49634ee16a731174d2ae34bc50bd5f45e731 +mm-nonmm-stable 254f49634ee16a731174d2ae34bc50bd5f45e731 +mm-unstable ede0ea131b32ef5d953d879030f8102b7c42adf2 +mm-nonmm-unstable ed7d4f00d637e15b74b0a7704a0dfc1a6eed098b +kbuild b9d21c32dca2167a614e66c9e27999b9e1c33d55 +clang-format 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +perf 8c8f2093614373ea8179b562320212a25cf937c0 +compiler-attributes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +dma-mapping 254f49634ee16a731174d2ae34bc50bd5f45e731 +asm-generic adbbd9714f8058730f93c8df5c5bf1679456424b +nocache-cleanup 809b997a5ce945ab470f70c187048fe4f5df20bf +alpha d58041d2c63e09a1c9083e0e9f4151e487c4e16a +arm c6e61c06d6061750597e79c598acb5dead44c35b +arm64 858fbd7248bd84b2899fb2c29bc7bc2634296edf +arm-perf 47f06ebbe8dad695002e5d9a2ab436411f88e985 +arm-soc f0e3ab65a0a7997e6fbba7a9d0cf1ee06d09381c +amlogic 8b379d5e9eb7933c73e77e768d95f11ef2833c26 +asahi-soc d31647c698f632e0c08080a760e004ba4d71f8dd +at91 c96e60ae720a88b51cbfa06abcfd3e435b0e65ba +bmc b333a0f1c857411d83a02aa6f1d9ecc7666d6179 +broadcom e8f908b91550dad3274b5ab3bb0e779ca9d80aff +cix f4f1e3bdb5f9c97e7803c4372611085c32c033b0 +davinci 254f49634ee16a731174d2ae34bc50bd5f45e731 +drivers-memory dce208b5405f40c36320bb0ee07e9df8f7f2bea4 +fsl c99d8ac7b355cbbdbb3f4d8b9a9b46de05a6fee9 +imx-mxs 0f4bd8451be3f38007991ddf26d11b91803bcea0 +mediatek e6490a169f6d5f5bdea7a2e8a673890d43afadc0 +mvebu ae4fe907b7705d9f7af7a0e6114bb6607e703c13 +omap b6aefeea7b4aa9158c1dcec8c050a678af7bf9b0 +qcom ef5930fa9d5d5a1734e9e065d3e29bf1a064cbc3 +renesas 4c19caa91a1e29e4264b5536d8ff4a840d00f83c +reset d373605cd514837d8a6de3d00c786d4bae6dbaf8 +rockchip d94923f66918ad37ff7f34d00b8aa56c3467efd5 +samsung-krzk 16d9141005c9c4bbf90c7cdc80c77b4b629bb012 +scmi 59d1f69a79445b12831fe31c0755520c99504658 +sophgo 9aa6068586a9b4cd34cf04f8dee72a7283ab4ae4 +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit c580774185426ea316396b1dc3f1737a3ad3800a +stm32 515aa8b1188409f527230b93b9ea2a99e170c20a +sunxi 8245c3d4c6710c0db85d66c6b0c7e693a84ba4be +tee 31b40993bf57edd31f1233f2f43a48ffefd3e4cc +tegra 20e4d2163a23dcac417671d8cb49e7eb49e67a95 +tenstorrent-dt ad3cb813231312adc4eda9cae0787204781d9a36 +thead-dt 74ec3d52c0035b662ec295bef2bbffad68446391 +ti 8933283eb5ce63571fafc5fd70bb1e0b245c3a88 +xilinx fdee7c66c0d7b6869c36b9f9a915abf29ab5b550 +socfpga 90d083b05f057c3107a7344f652d3a1ae1a2536e +clk 9781f9635d693704e116695a3563f3059a2926e6 +clk-imx d16f57caa78776e6e8a88b96cb2597797b376138 +clk-renesas 7f0c422c7fbfd9294ff9321ada0c63561e5c6ea0 +thead-clk baf4fc7c03bd0f68c768cfe27829674bd060c6b4 +tenstorrent-clk 23c8ebc952849b3ba47d04d0ec95daf5cc136061 +csky 817d21578d51e801df58ab012654486a71073074 +loongarch 5a873d77ba792410a796595a917be6a440f9b7d2 +m68k 0ad7ed2f5a29cb5b23cbfeeb714768e5e043d33e +m68knommu b1ab4bea7704c8af7068ccb6d778188278b7bd8a +microblaze 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +mips 254f49634ee16a731174d2ae34bc50bd5f45e731 +openrisc 0dfffa5479d6260d04d021f69203b1926f73d889 +parisc-hd 7fd2df204f342fc17d1a0bfcd474b24232fb0f32 +powerpc 7fd2df204f342fc17d1a0bfcd474b24232fb0f32 +risc-v f2abc305aa93f5b12d5c929d7a9c1cf7d7fee8af +riscv-dt 48c7771b3c792b153872a2eff67e4cbcb77e4054 +riscv-soc b5865650b20972847dd932a7b75e7734b7c4400c +s390 04c480a75a1e457beb44b6a74dd17278417af452 +sh b0aa5e4b087b686575f1b31ce54048b4d059b7b8 +sparc d844152d85cfcc7d2ef9430a25882604c12da279 +uml 254f49634ee16a731174d2ae34bc50bd5f45e731 +xtensa 84477867e122251b8c47db240a8d699b0836aa6f +fs-next a873694dd37cceb7a5c494938bc4b187cf7c4572 +printk e56185668dc12983dd0e75e38ed6dea98b01d2d2 +pci e4715c055efcdfa6e5b5d0eaa01ff19505049ad7 +pstore 24b8f8dcb9a139a36cf48bfbe935e8dc1f33ed79 +hid 2acc3b265f94d433fa01426dfc5afd22a801f150 +i2c 3051cd060fa496df42954291fa2306ed2eab4ecc +i2c-host beec6b0a30da08f4d872736e1261f1213da82da6 +i2c-rust b388d1f9a51d3e1ad48e1d98bfe2ca5d022e0a83 +i3c 1d78a8fc97c133b8aee54993a83f86b68ed2fdb8 +dmi 1afafbaf749d8e8ec53f8e38efdc731131902b5b +hwmon-staging 3584b347030ecf33ffb48e8b32b114343e60e5e3 +jc_docs 709061c5d234851b7697b324829156d846cd5f35 +v4l-dvb bc1ba628e37c93cf2abeb2c79716f49087f8a024 +v4l-dvb-next adc218676eef25575469234709c2d87185ca223a +pm 3d6ebd026be6c11e0ac2b53010cfab29d04d1aba +cpufreq-arm bcb8889c4981fdde42d4fd2c29a77d510fe21da2 +cpupower 254f49634ee16a731174d2ae34bc50bd5f45e731 +devfreq 218ef5b3447402a549d8a25e28ae6de73e27ac04 +pmdomain ec1fcddb3117d9452210e838fd37389ee61e10e8 +opp f5e1cc9a284bff2510981643a5bca4bc4c21b81a +thermal bf746e2a41efd98668c97759e06d436ae5af5a82 +rdma 254f49634ee16a731174d2ae34bc50bd5f45e731 +net-next 6a4c4656b0d2d4056a1f0c35442db4e8a5cf8021 +bpf-next 9f5b3ffc3f1dac7204e32eeeff84bc5cc55c393e +ipsec-next a77d172177f3754ebd70123c78c75a6efa9eec2a +mlx5-next 02c54621e81ccdc1907e2d735bcda751f2caade1 +netfilter-next 09942ddedcb960f9e78fd817ec33f501d1040c5b +ipvs-next 09942ddedcb960f9e78fd817ec33f501d1040c5b +bluetooth 6911f19876fbf65116c61ae93a47e2316b41d5a4 +wireless-next 6a4c4656b0d2d4056a1f0c35442db4e8a5cf8021 +ath-next e12d2d3983acb150fd987d19ec6a2a530da110df +iwlwifi-next 709503c4a2102b32de4b4e64687df86503c74eba +wpan-next 1dd9291eb90378f8096669d9cb33761fd84599e0 +wpan-staging 1dd9291eb90378f8096669d9cb33761fd84599e0 +mtd 87eee18f2974c0b1d854b6228408b93c6bc91744 +nand 9e3997d3ab661f99828fb86487be56c25e166410 +spi-nor 254f49634ee16a731174d2ae34bc50bd5f45e731 +crypto f7dd32c5179d7755de18e21d5674b08f9e5cb180 +libcrypto 254f49634ee16a731174d2ae34bc50bd5f45e731 +drm f96538285cfdbb3acf5e3356e0bb88c38815790b +drm-exynos 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc c006978163fd001fbca55e5fa57bddcf49f47ad9 +amdgpu 0d831487b5be0ae59cac865a0aa87b0acc3dc717 +drm-intel 775fb670745015d679a65f948b3da0fbff3f100c +drm-msm a972d1b864e8efcfda0b387debac8ea2875a182c +drm-msm-lumag a972d1b864e8efcfda0b387debac8ea2875a182c +drm-xe e68a60f9e6a602684f335ede8af1170c13998b37 +drm-rust 37f748ed0c19e007e7c5677f5d605d6b93841792 +drm-nova 93296e9d9528f0d87f2cf3fee494599060a0f14a +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev 98992e6ba333faf2719f0a4ec5030ffd31c09695 +regmap 4b7774eeab8d66c22f02f5c120602df154a87e12 +sound 9fc9caf346085dbb5d69cb6ad71a5ff388ecc6b9 +ieee1394 fcabbf40fae501379b4f3a057febe92d4b0ebdd8 +sound-asoc a4fcf0c0e3d2459703c46eaceccce1b3d5768f58 +modules 663385f9155f27892a97a5824006f806a32eb8dc +input 7b9b6b34a6474e6f0e4e7c48e33e824131ed46d5 +block 14c30ecbd90b983d84e48aaf440c26acceedc0c2 +device-mapper b4a0774bd7fd859c1d243be0919c8df39eac20c0 +libata a3f75e5e6b023958c92ad03fa2e68e047b6169c4 +pcmcia b3c26ea81ccc522e77ed0b1707add61fc9206216 +mmc 52957cdad30f8011da1f4ef1338ba0339ca4c158 +mfd 522d62d7aa11975873051c9c51e4bb8cd1828a9d +backlight 254f49634ee16a731174d2ae34bc50bd5f45e731 +battery 254f49634ee16a731174d2ae34bc50bd5f45e731 +regulator fa6a9031a3c540a6ae86439241009b80fffd99fc +security f71ece9712b7712df98871eea9aeb60e49ca5239 +apparmor 254f49634ee16a731174d2ae34bc50bd5f45e731 +integrity 69fc6474236d9edda6983623e4282f2bdfd8e3d8 +selinux daaea417537da393d9053a6d78dea385f4fa16c7 +smack b78fede1c69a090d377bf80417ce1f7f7f314534 +tomoyo 1a83d226268cfb9ea546febe6515f39584df8fd2 +tpmdd-tpm 9ec4175a30eb5adb95e446af83ddf6cb3286a82a +tpmdd-keys 9ec4175a30eb5adb95e446af83ddf6cb3286a82a +watchdog 450517fa5aae98b857c68743fd12ce93e4b8989d +iommu 10161b4a791d5c4b7ea16512c1ddb133c3f8f953 +audit 254f49634ee16a731174d2ae34bc50bd5f45e731 +devicetree c9a7f7e6b9541450a064854ac965c1a8c8fdcfc4 +dt-krzk 254f49634ee16a731174d2ae34bc50bd5f45e731 +mailbox 6e937f4e769e60947909e3525965f0137b9039e8 +spi 554713bc0281ace09b2c815f9e80792275a53d20 +tip c7bb8eb40ddabd5c68bbfb9711de75562aa69f29 +kexec 028ef9c96e96197026887c0f092424679298aae8 +liveupdate 34e8f02817e31826e76bb2ded48bf28fe921f20b +clockevents f182fa740218dec7ead6275b2e096da1642272b5 +edac 3d63012017f17a257fc908468d97b190160de540 +ftrace 0b6bc3dbe6322b283dfe5786a8e2a13d38f469f8 +rcu ed062c41dfda2de8d1712c91e089303dae013bb7 +paulmck 48f7a50c027dd2abb9e7b8a6ecc8e531d87f2c21 +kvm 6d35786de28116ecf78797a62b84e6bf3c45aa5a +kvm-arm 94b4ae79ebb42a8a6f2124b4d4b033b15a98e4f9 +kvms390 9b8e8aad5896d66005d29920cb1643076a20b172 +kvm-ppc 7fd2df204f342fc17d1a0bfcd474b24232fb0f32 +kvm-riscv ddbf9c76c4020bf63a0799b00faad40caa3de6c2 +kvm-x86 85f871f6ba46f20d7fbc0b016b4db648c33220dd +xen-tip 3f100dd61ad4ee7c1fb6a44775a928dcdba7515b +percpu 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +workqueues a3aa37e197bb129da8e8e70e4e6879955f38a53d +sched-ext 86d30421307eb26296268aaeb3d6fef6a81f390b +drivers-x86 6cf1c1e9f21ba2e44e05e691d5241290c7d6c41a +chrome-platform a1d39fce42f6a6075615aea138065dff65723629 +chrome-platform-firmware 86e3bbc716332600e9e087f8a4889f4d9714a99c +hsi 254f49634ee16a731174d2ae34bc50bd5f45e731 +leds-lj 863ba8705529004f998744964edc65d3e0cfe1a9 +ipmi c9ccd876a06e51db1faad3cdea8696019c47b486 +driver-core f71cc65c01bdac1bc7705b1aad34f0023b41ec4d +usb 25bd55f46032656012eecdc6eabd62f2685a2ccc +thunderbolt cf0c38ee554c3e9062408cc3a38325483d52ecd0 +usb-serial 254f49634ee16a731174d2ae34bc50bd5f45e731 +tty a2083fd1fa7aa0ef5cd8fd92396da0de2d0654b0 +char-misc 7fd2df204f342fc17d1a0bfcd474b24232fb0f32 +coresight 0ec0a8785d21f63db520bd9d2a67c55e855d36a8 +fastrpc 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +fpga d4d5ad6c6039a4921bd9f708bd0539258d60e55e +icc 0436cd305d0be28cde59efb137d15d1bc6af4b12 +iio 1a27af12503afbc6ed5c39d898f9ec09eb7fc8a3 +phy-next f67ab4706ab72af29c331b21f431c463b00d447a +soundwire 35a5ab8ef7f0f00b30eab9d917f3f0f4a2bec5d6 +extcon 254f49634ee16a731174d2ae34bc50bd5f45e731 +gnss 254f49634ee16a731174d2ae34bc50bd5f45e731 +vfio 30471982cd667972ba93ce894765d4b8544958e6 +w1 254f49634ee16a731174d2ae34bc50bd5f45e731 +spmi 254f49634ee16a731174d2ae34bc50bd5f45e731 +staging 81f55766523e5293604cb96c5e98d10da345ff33 +counter-next 254f49634ee16a731174d2ae34bc50bd5f45e731 +mux 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +dmaengine 254f49634ee16a731174d2ae34bc50bd5f45e731 +cgroup c8c84430640e5210140eb0b6d7b4ae06883c0bd1 +scsi 98f69975d4c0434ca2e6e8cfa1d8d51647a20593 +scsi-mkp 254f49634ee16a731174d2ae34bc50bd5f45e731 +vhost ebcff9dacaf2c1418f8bc927388186d7d3674603 +rpmsg 54dacf6efe7196c1cd8ae4b5c691579d0510a8bd +gpio-brgl 87e4643ab19cdfa152b7d10b3418cfff19724109 +gpio-intel 3bb62e3f99a557d257e5f5a803200051b7de3afa +pinctrl 72b513357689335d268c8b473015a23ab749197c +pinctrl-intel 254f49634ee16a731174d2ae34bc50bd5f45e731 +pinctrl-renesas e572f9db7309ba97bccedef877400e716552b7dc +pinctrl-samsung 254f49634ee16a731174d2ae34bc50bd5f45e731 +pwm 90f92815cbd46dc1ea27c3cd65397d62208f48ff +ktest 932cdaf3e273a2727e77af97f79f12577174c5a0 +kselftest 5f4974231fb3656c15a82faece9f2303b8c18a14 +kunit 254f49634ee16a731174d2ae34bc50bd5f45e731 +kunit-next c12222dcce91170a8031e03559c3e88916475f14 +livepatching 8f7168335cb2e438668c5d94eea76621c9a10edd +rtc b72386864481cf7fb6153842d22561ac3032302f +nvdimm 45df9111692c62d5f09fc4345ae36dae31024797 +at24 254f49634ee16a731174d2ae34bc50bd5f45e731 +ntb 7b3302c687cae50d9506c77ad9d40f8c242e9c79 +seccomp 41fa04327384148b0e2e828c9be9862c5240e9fa +slimbus 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +nvmem 8d48419d141cb39679a3a01782db3241660704a5 +hyperv 5170a82e89211d876af17bf3d94a511fb2bb4921 +auxdisplay d25e5cbac4e2287c843fc8b45c50dd8e57e3a696 +kgdb fdbdd0ccb30af18d3b29e714ac8d5ab6163279e0 +hmm 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +cfi 254f49634ee16a731174d2ae34bc50bd5f45e731 +mhi ac12b852b4ead4a586299c8f68cdcbcaf1bf6cbc +memblock d5759519805c54786c00765ca1303e6d7a0676ca +cxl 6c724ce0ec6ed8608917673bbb363b208ce2644c +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi 48a428215782321b56956974f23593e40ce84b7a +unicode bcfee135d584714c2130031c7e28aafa91057b9a +slab 298cdbf5f7c9e19289f46710ed5ab3da4e711150 +random bb9ff576fdff48c242876f55098a3ee20a29df5d +landlock 3457a5ccacd34fdd5ebd3a4745e721b5a1239690 +sysctl f63a9df7e3f9f842945d292a19d9938924f066f9 +execve 9bf092c97b86af63694d9902b9e14047214ba76d +bitmap 1f9b1c892339ab578feeee28fb5a3ba1d09d47ef +hte 005b25ad11717139ca5c14c9f06c2a60855c2afd +kspp e0142e0de50ade58e49decc788c512fda305672a +nolibc bb2d82d41894cb30d836e9796ff67d2f9a71eccf +iommufd 254f49634ee16a731174d2ae34bc50bd5f45e731 +turbostat d052a81a8a23cfa0dac24b91931c8bc4d3779d8b +pwrseq 254f49634ee16a731174d2ae34bc50bd5f45e731 +capabilities-next 071588136007482d70fd2667b827036bc60b1f8f +ipe 028ef9c96e96197026887c0f092424679298aae8 +kcsan 07a1a6562ce29e2e0c134a57882d6e52e8758492 +crc 254f49634ee16a731174d2ae34bc50bd5f45e731 +keys-next 965e9a2cf23b066d8bdeb690dff9cd7089c5f667 +fwctl 254f49634ee16a731174d2ae34bc50bd5f45e731 +devsec-tsm 3177779ae17db4c66c851f799505fb95c7530c03 +hisilicon b419e155e31d9e23c1aa29a37182889955189382 +kthread fa39ec4f89f2637ed1cdbcde3656825951787668 +nfc cd7f6b862b5e565d97cf77ea74e4bc4c76515bcc
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 0000000..8811ec6 --- /dev/null +++ b/Next/Trees
@@ -0,0 +1,424 @@ +Trees included into this release: + +Name Url +---- --- +origin https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +ext4-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#fixes +vfs-brauner-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.fixes +fscrypt-current https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +btrfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +erofs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +nfsd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +v9fs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +overlayfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes +fscrypt https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +btrfs https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph https://github.com/ceph/ceph-client.git#master +cifs git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git#configfs-next +ecryptfs https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +dlm https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +erofs https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs https://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git#ntfs-next +ntfs3 https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git#for-next +overlayfs https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next +ubifs https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs https://github.com/martinetd/linux#9p-next +v9fs-ericvh https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +vfs-brauner https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +mm-hotfixes https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-fixes-for-next +clang-fixes https://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux.git#clang-fixes-for-next +arc-current https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#fixes +arm64-fixes https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +sophgo-fixes https://github.com/sophgo/linux.git#fixes +sophgo-soc-fixes https://github.com/sophgo/linux.git#soc-fixes +m68k-current https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +net https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/#master +ipsec https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +ath https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-current +iwlwifi https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#fixes +wpan https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-linus +tty.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +libcrypto-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-fixes +vfio-fixes https://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +dmaengine-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git://linuxtv.org/media-ci/media-pending.git#fixes +reset-fixes https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#fixes +kvm-fixes git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +kvm-arm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#fixes +hwmon-fixes https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +dma-mapping-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-fixes +drivers-x86-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes +drm-intel-fixes https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next-fixes +mmc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +risc-v-fixes https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +auxdisplay-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +kunit-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +memblock-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +renesas-fixes https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git#perf-tools +efi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +battery-fixes https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +iommufd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes https://github.com/Rust-for-Linux/linux.git#rust-fixes +w1-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +i2c-host-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-fixes +i2c-rust-fixes https://github.com/ikrtn/rust-for-linux#rust-i2c-fixes +sparc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus +clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-fixes +thead-clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-fixes +tenstorrent-clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-clk-fixes +pwrseq-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current +thead-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-fixes +ftrace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ftrace/fixes +ring-buffer-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ring-buffer/fixes +trace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#trace/fixes +tracefs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#tracefs/fixes +spacemit-fixes https://github.com/spacemit-com/linux#fixes +tip-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#tip/urgent +slab-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next-fixes +kexec-fixes https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#kexec-fixes +liveupdate-fixes https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#fixes +drm-msm-fixes https://gitlab.freedesktop.org/drm/msm.git#msm-fixes +uml-fixes https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +fwctl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-rc +devsec-tsm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#fixes +drm-rust-fixes https://gitlab.freedesktop.org/drm/rust/kernel.git#for-linux-next-fixes +tenstorrent-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-dt-fixes +nfc-fixes https://codeberg.org/linux-nfc/linux.git#for-linus +drm-misc-fixes https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes +rust https://github.com/Rust-for-Linux/linux.git#rust-next +rust-interop https://github.com/Rust-for-Linux/linux.git#interop-next +rust-alloc https://github.com/Rust-for-Linux/linux.git#alloc-next +rust-io https://github.com/Rust-for-Linux/linux.git#io-next +rust-pin-init https://github.com/Rust-for-Linux/linux.git#pin-init-next +rust-timekeeping https://github.com/Rust-for-Linux/linux.git#timekeeping-next +rust-xarray https://github.com/Rust-for-Linux/linux.git#xarray-next +rust-analyzer https://github.com/Rust-for-Linux/linux.git#rust-analyzer-next +mm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-unstable +mm-nonmm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-unstable +kbuild https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-for-next +clang-format https://github.com/ojeda/linux.git#clang-format +perf https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-for-next +asm-generic https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#master +nocache-cleanup https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#nocache-cleanup +alpha https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git#alpha-next +arm https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#for-next +arm64 https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +at91 https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +bmc https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git#for-next +broadcom https://github.com/Broadcom/stblinux.git#next +cix https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git#for-next +davinci https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +fsl https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git#soc_fsl +imx-mxs https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git#for-next +mediatek https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next +mvebu https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#for-next +qcom https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset https://git.pengutronix.de/git/pza/linux#reset/next +rockchip https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sophgo https://github.com/sophgo/linux.git#for-next +sophgo-soc https://github.com/sophgo/linux.git#soc-for-next +spacemit https://github.com/spacemit-com/linux#for-next +stm32 https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git#next +tegra https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +tenstorrent-dt https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-dt-for-next +thead-dt https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-for-next +ti https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx https://github.com/Xilinx/linux-xlnx.git#for-next +socfpga https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git#for-next +clk https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +thead-clk https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-for-next +tenstorrent-clk https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-clk-for-next +csky https://github.com/c-sky/csky-linux.git#linux-next +loongarch https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git://git.monstr.eu/linux-2.6-microblaze.git#next +mips https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc https://github.com/openrisc/linux.git#for-next +parisc-hd https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +risc-v https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +sparc https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-next +uml https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa https://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +printk https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i2c-host https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host +i2c-rust https://github.com/ikrtn/rust-for-linux#rust-i2c-next +i3c https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git://git.lwn.net/linux.git#docs-next +v4l-dvb git://linuxtv.org/media-ci/media-pending.git#next +v4l-dvb-next git://linuxtv.org/mchehab/media-next.git#master +pm https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +pmdomain https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +opp https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +rdma https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +ath-next https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-next +iwlwifi-next https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#next +wpan-next https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +libcrypto https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-next +drm https://gitlab.freedesktop.org/drm/kernel.git#drm-next +drm-exynos https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next +amdgpu https://gitlab.freedesktop.org/agd5f/linux.git#drm-next +drm-intel https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next +drm-msm https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +drm-xe https://gitlab.freedesktop.org/drm/xe/kernel.git#drm-xe-next +drm-rust https://gitlab.freedesktop.org/drm/rust/kernel.git#for-linux-next +drm-nova https://gitlab.freedesktop.org/drm/nova.git#nova-next +etnaviv https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git#modules-next +input https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git#for-next +device-mapper https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#for-next +pcmcia https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +selinux https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack https://github.com/cschaufler/smack-next#next +tomoyo git://git.code.sf.net/p/tomoyo/tomoyo.git#master +tpmdd-tpm https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#for-next-tpm +tpmdd-keys https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#for-next-keys +watchdog git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git#next +audit https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#for-next +spi https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +kexec https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#kexec-next +liveupdate https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#next +clockevents https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git#timers/drivers/next +edac https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +ftrace https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux#next +paulmck https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#non-rcu/next +kvm git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-ppc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +kvm-riscv https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 https://github.com/kvm-x86/linux.git#next +xen-tip https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sched-ext https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git#for-next +drivers-x86 https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +chrome-platform-firmware https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next +hsi https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds-lj https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi https://github.com/cminyard/linux-ipmi.git#for-next +driver-core https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-next +usb https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +coresight https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio https://github.com/awilliam/linux-vfio.git#next +w1 https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +spmi https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-next +staging https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux https://gitlab.com/peda-linux/mux.git#for-next +dmaengine https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio-brgl https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#pwm/for-next +ktest https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git#for-next +rtc https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb https://github.com/jonmason/ntb.git#ntb-next +seccomp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +slimbus https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +hyperv https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#for-next +kgdb https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd https://github.com/terrelln/linux.git#zstd-next +efi https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next +random https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +sysctl https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git#sysctl-next +execve https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap https://github.com/norov/linux.git#bitmap-for-next +hte https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +nolibc https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git#for-next +iommufd https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +turbostat https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +pwrseq https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next +capabilities-next https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git#caps-next +ipe https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git#next +kcsan https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git#next +crc https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#crc-next +keys-next https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +fwctl https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-next +devsec-tsm https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#next +hisilicon https://github.com/hisilicon/linux-hisi.git#for-next +kthread https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#for-next +nfc https://codeberg.org/linux-nfc/linux.git#for-next
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 0000000..45a3ac2 --- /dev/null +++ b/Next/merge.log
@@ -0,0 +1,6534 @@ +$ date -R +Fri, 08 May 2026 09:33:42 +0200 +$ git checkout master +Switched to branch 'master' +$ git reset --hard stable +HEAD is now at 917719c412c4 Merge tag 'selinux-pr-20260507' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux +Merging origin/master (917719c412c4 Merge tag 'selinux-pr-20260507' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Already up to date. +Merging ext4-fixes/fixes (981fcc5674e6 jbd2: fix deadlock in jbd2_journal_cancel_revoke()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes +Already up to date. +Merging vfs-brauner-fixes/vfs.fixes (ac8777cc3622 Merge patch series "eventpoll: fix ep_remove() UAF and follow-up cleanup") +$ git merge -m Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Already up to date. +Merging fscrypt-current/for-current (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (0c8c88b8eb82 ovl: fix verity lazy-load guard broken by fsverity_active() semantic change) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Merge made by the 'ort' strategy. + fs/overlayfs/util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging btrfs-fixes/next-fixes (238cee9efdb7 Merge branch 'misc-7.1' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/compression.c +Merge made by the 'ort' strategy. + fs/btrfs/block-group.c | 23 ++++++++--------------- + fs/btrfs/compression.c | 26 ++++++++++++++------------ + fs/btrfs/disk-io.c | 1 + + fs/btrfs/inode.c | 28 ++++++++++++++++++++++++++++ + fs/btrfs/transaction.c | 9 ++++----- + include/trace/events/btrfs.h | 4 +--- + 6 files changed, 56 insertions(+), 35 deletions(-) +Merging vfs-fixes/fixes (49c5d168a3a8 udf: fix nls leak on udf_fill_super() failure) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging fs/udf/super.c +Merge made by the 'ort' strategy. + fs/udf/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging erofs-fixes/fixes (6e7188a8d725 erofs: fix managed cache race for unaligned extents) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Merge made by the 'ort' strategy. + fs/erofs/zdata.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) +Merging nfsd-fixes/nfsd-fixes (b0bf14546bce nfsd: fix GET_DIR_DELEGATION when VFS leases are disabled) +$ git merge -m Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Merge made by the 'ort' strategy. + fs/nfsd/nfs4proc.c | 4 ---- + 1 file changed, 4 deletions(-) +Merging v9fs-fixes/fixes/next (028ef9c96e96 Linux 7.0) +$ git merge -m Merge branch 'fixes/next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging overlayfs-fixes/ovl-fixes (1f6ee9be92f8 ovl: make fsync after metadata copy-up opt-in mount option) +$ git merge -m Merge branch 'ovl-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging fscrypt/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging btrfs/for-next (6bf684b88235 Merge branch 'for-next-next-v7.0-20260408' into for-next-20260408) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. +Merging ceph/master (49a74f6a818f ceph: add ceph_has_realms_with_quotas() check to ceph_quota_update_statfs()) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + fs/ceph/quota.c | 37 +++++++++++++++++++++++++++---------- + fs/ceph/xattr.c | 17 +++++++++++++++++ + net/ceph/auth_x.c | 5 +++++ + net/ceph/crush/crush.c | 6 +----- + net/ceph/osdmap.c | 7 +++++-- + 5 files changed, 55 insertions(+), 17 deletions(-) +Merging cifs/for-next (f98b48151cc5 smb: client: validate dacloffset before building DACL pointers) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/smb/client/cached_dir.c | 8 ++++++++ + fs/smb/client/cifsacl.c | 37 +++++++++++++++++++++++++++++++++---- + fs/smb/client/ioctl.c | 2 +- + fs/smb/client/smb2inode.c | 12 ++++++++---- + fs/smb/client/smb2misc.c | 3 ++- + fs/smb/client/smb2pdu.c | 23 ++++++++++++++++++----- + fs/smb/client/smb2transport.c | 35 ++++++++++++++++++++++++++--------- + 7 files changed, 96 insertions(+), 24 deletions(-) +Merging configfs/configfs-next (6363844fdbbb samples: configfs: Constify struct configfs_item_operations and configfs_group_operations) +$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git configfs/configfs-next +Already up to date. +Merging ecryptfs/next (eb5e768eaf7c ecryptfs: remove redundant variable found_auth_tok) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Merge made by the 'ort' strategy. + fs/ecryptfs/keystore.c | 16 +++++----------- + 1 file changed, 5 insertions(+), 11 deletions(-) +Merging dlm/next (2c3a0b730012 dlm: Avoid -Wflex-array-member-not-at-end warning) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging erofs/dev (a5242d37c83a erofs: error out obviously illegal extents in advance) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (ec5e84e1605d exfat: simplify exfat_lookup()) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/dir.c | 4 +++- + fs/exfat/namei.c | 56 +++++++++++++------------------------------------------- + fs/exfat/nls.c | 19 +++++++++++++------ + 3 files changed, 29 insertions(+), 50 deletions(-) +Merging ext3/for_next (38b4aa1a24f0 Pull isofs doc fix.) +$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (981fcc5674e6 jbd2: fix deadlock in jbd2_journal_cancel_revoke()) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (5758375b0d32 f2fs: support to report fserror) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 3 +- + Documentation/filesystems/f2fs.rst | 50 +++++++++++++++++++++++++++++---- + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/compress.c | 2 ++ + fs/f2fs/data.c | 9 ++++-- + fs/f2fs/dir.c | 2 ++ + fs/f2fs/f2fs.h | 3 ++ + fs/f2fs/file.c | 13 +++++++-- + fs/f2fs/inline.c | 3 ++ + fs/f2fs/inode.c | 24 ++++++++++++++-- + fs/f2fs/node.c | 8 ++++++ + fs/f2fs/recovery.c | 2 ++ + fs/f2fs/segment.c | 15 ++++++++++ + fs/f2fs/super.c | 33 ++++++++++++++++++++++ + fs/f2fs/sysfs.c | 2 ++ + fs/f2fs/verity.c | 2 ++ + fs/f2fs/xattr.c | 41 ++++++++++++++++++++++++++- + fs/f2fs/xattr.h | 6 ++++ + 18 files changed, 205 insertions(+), 15 deletions(-) +Merging fsverity/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (a59c5242b280 fuse: drop redundant check in fuse_sync_bucket_alloc()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'ort' strategy. + fs/fuse/Makefile | 3 +- + fs/fuse/args.h | 65 +++ + fs/fuse/backing.c | 1 + + fs/fuse/control.c | 16 +- + fs/fuse/cuse.c | 28 +- + fs/fuse/dev.c | 1253 ++++++++++++++++++------------------------------- + fs/fuse/dev.h | 110 +++++ + fs/fuse/dev_uring.c | 143 +++--- + fs/fuse/dev_uring_i.h | 39 +- + fs/fuse/dir.c | 12 +- + fs/fuse/file.c | 146 +----- + fs/fuse/fuse_dev_i.h | 350 +++++++++++++- + fs/fuse/fuse_i.h | 860 +++++++++++---------------------- + fs/fuse/fuse_trace.h | 4 +- + fs/fuse/inode.c | 263 +++-------- + fs/fuse/notify.c | 434 +++++++++++++++++ + fs/fuse/poll.c | 141 ++++++ + fs/fuse/req.c | 99 ++++ + fs/fuse/req_timeout.c | 148 ++++++ + fs/fuse/sysctl.c | 1 + + fs/fuse/sysctl.h | 9 + + fs/fuse/virtio_fs.c | 21 +- + 22 files changed, 2291 insertions(+), 1855 deletions(-) + create mode 100644 fs/fuse/args.h + create mode 100644 fs/fuse/dev.h + create mode 100644 fs/fuse/notify.c + create mode 100644 fs/fuse/poll.c + create mode 100644 fs/fuse/req.c + create mode 100644 fs/fuse/req_timeout.c + create mode 100644 fs/fuse/sysctl.h +Merging gfs2/for-next (f9c9ec2c319f gfs2: fix use-after-free in gfs2_qd_dealloc) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/quota.c | 36 ++++++++++++++++++++++++------------ + fs/gfs2/super.c | 1 + + 2 files changed, 25 insertions(+), 12 deletions(-) +Merging jfs/jfs-next (dad98c5b2a05 jfs: avoid -Wtautological-constant-out-of-range-compare warning again) +$ git merge -m Merge branch 'jfs-next' of https://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (8ab992f815d6 Merge tag 'v7.1-rc3-ksmbd-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 (7fd2df204f34 Linux 7.1-rc2) +$ 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 (4529e0015432 NFS: Fix NFS KConfig typos) +$ 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 (8ac8f70798fc NFSD: Update my maintainer email addresses) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/netlink/specs/nfsd.yaml | 229 +++++++++ + Documentation/netlink/specs/sunrpc_cache.yaml | 149 ++++++ + MAINTAINERS | 8 +- + fs/nfs/dns_resolve.c | 2 +- + fs/nfsd/export.c | 713 +++++++++++++++++++++++++- + fs/nfsd/netlink.c | 93 ++++ + fs/nfsd/netlink.h | 18 + + fs/nfsd/nfs4idmap.c | 4 +- + fs/nfsd/nfs4state.c | 9 +- + fs/nfsd/nfsctl.c | 79 +++ + fs/nfsd/nfsd.h | 17 +- + include/linux/sunrpc/cache.h | 15 +- + include/uapi/linux/nfsd_netlink.h | 132 +++++ + include/uapi/linux/sunrpc_netlink.h | 84 +++ + net/sunrpc/Makefile | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 2 +- + net/sunrpc/cache.c | 127 ++++- + net/sunrpc/netlink.c | 97 ++++ + net/sunrpc/netlink.h | 35 ++ + net/sunrpc/sunrpc_syms.c | 10 + + net/sunrpc/svc_xprt.c | 46 +- + net/sunrpc/svcauth_unix.c | 516 ++++++++++++++++++- + 22 files changed, 2335 insertions(+), 52 deletions(-) + create mode 100644 Documentation/netlink/specs/sunrpc_cache.yaml + create mode 100644 include/uapi/linux/sunrpc_netlink.h + create mode 100644 net/sunrpc/netlink.c + create mode 100644 net/sunrpc/netlink.h +Merging ntfs/ntfs-next (788ac190a6a9 ntfs: fix out-of-bounds write in ntfs_index_walk_down()) +$ git merge -m Merge branch 'ntfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git ntfs/ntfs-next +Merge made by the 'ort' strategy. + fs/ntfs/attrib.c | 23 +++++----------- + fs/ntfs/attrlist.c | 7 +++-- + fs/ntfs/bdev-io.c | 7 +++-- + fs/ntfs/index.c | 17 ++++++++---- + fs/ntfs/inode.c | 6 ++--- + fs/ntfs/mft.c | 78 ++++++++++++++++++++++++++++++++++++------------------ + fs/ntfs/runlist.c | 9 ++++--- + fs/ntfs/super.c | 6 ++--- + 8 files changed, 89 insertions(+), 64 deletions(-) +Merging ntfs3/master (f1df9d771df4 ntfs3: validate split-point offset in indx_insert_into_buffer) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Merge made by the 'ort' strategy. + fs/ntfs3/index.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- + fs/ntfs3/lznt.c | 2 +- + 2 files changed, 43 insertions(+), 4 deletions(-) +Merging orangefs/for-next (e61bc5e4d874 bufmap: manage as folios, V2.) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (1f6ee9be92f8 ovl: make fsync after metadata copy-up opt-in mount option) +$ git merge -m Merge branch 'overlayfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (11efa98bcc0d ubi: ubi.h: fix kernel-doc warnings) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging drivers/mtd/ubi/ubi.h +Merge made by the 'ort' strategy. + drivers/mtd/ubi/ubi.h | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) +Merging v9fs/9p-next (8fc518e489c1 9p/trans_xen: replace simple_strto* with kstrtouint) +$ git merge -m Merge branch '9p-next' of https://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (028ef9c96e96 Linux 7.0) +$ git merge -m Merge branch 'ericvh/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (87e63466c9fc xfs: flush delalloc blocks on ENOSPC in xfs_trans_alloc_icreate) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_dir2_data.c | 18 +++++++++++------- + fs/xfs/libxfs/xfs_refcount.c | 3 +-- + fs/xfs/scrub/common.c | 11 +++++++++++ + fs/xfs/scrub/common.h | 2 ++ + fs/xfs/scrub/dabtree.c | 7 ++++++- + fs/xfs/scrub/dir.c | 7 ++++++- + fs/xfs/xfs_inode.c | 6 ------ + fs/xfs/xfs_trans.c | 11 +++++++++++ + fs/xfs/xfs_zone_alloc.c | 2 +- + fs/xfs/xfs_zone_gc.c | 2 +- + 10 files changed, 50 insertions(+), 19 deletions(-) +Merging zonefs/for-next (a42938e80357 zonefs: correct some spelling mistakes) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging vfs-brauner/vfs.all (8ee708daac8a Merge branch 'kernel-7.1.misc' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging fs/aio.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/netfs/buffered_write.c +Auto-merging include/uapi/linux/sched.h +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging kernel/nsproxy.c +CONFLICT (content): Merge conflict in kernel/nsproxy.c +Resolved 'kernel/fork.c' using previous resolution. +Resolved 'kernel/nsproxy.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 0487b491f61e] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + fs/netfs/buffered_read.c | 9 +++++--- + fs/netfs/buffered_write.c | 51 ++++++++++++++++++++++++++++---------------- + fs/netfs/iterator.c | 13 ++++++++--- + fs/netfs/misc.c | 8 +++++-- + fs/netfs/read_retry.c | 11 ++++++++-- + include/trace/events/netfs.h | 5 +++++ + kernel/nsproxy.c | 2 +- + 7 files changed, 70 insertions(+), 29 deletions(-) +Merging vfs/for-next (e82ff9b6cb76 Merge branches 'work.coda' and 'work.dcache-busy-wait' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Merge made by the 'ort' strategy. +Merging mm-hotfixes/mm-hotfixes-unstable (97f23576be13 mm/migrate_device: fix pgtable leak in migrate_vma_insert_huge_pmd_page) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging MAINTAINERS +Auto-merging mm/page_alloc.c +Merge made by the 'ort' strategy. + MAINTAINERS | 3 ++ + arch/arm64/include/asm/page.h | 2 +- + arch/arm64/mm/fault.c | 11 ++++--- + drivers/base/memory.c | 8 +++-- + drivers/dax/bus.c | 7 ++--- + include/linux/gfp_types.h | 10 +++---- + include/linux/highmem.h | 7 +++-- + include/trace/events/damon.h | 2 +- + ipc/shm.c | 10 ++++--- + lib/tests/kunit_iov_iter.c | 10 +++---- + mm/damon/sysfs-schemes.c | 1 + + mm/hugetlb.c | 1 + + mm/memory.c | 24 ++++++++++++--- + mm/memory_hotplug.c | 2 ++ + mm/migrate_device.c | 6 ++-- + mm/page_alloc.c | 8 ++--- + scripts/gdb/linux/mm.py | 6 ++-- + scripts/gdb/linux/slab.py | 4 +-- + tools/testing/selftests/mm/hmm-tests.c | 50 +++++++++++++++++++++++++++++++ + tools/testing/selftests/mm/run_vmtests.sh | 2 +- + 20 files changed, 129 insertions(+), 45 deletions(-) +Merging fs-current (aea95f135b5b Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. + fs/btrfs/block-group.c | 23 ++++++++--------------- + fs/btrfs/compression.c | 26 ++++++++++++++------------ + fs/btrfs/disk-io.c | 1 + + fs/btrfs/inode.c | 28 ++++++++++++++++++++++++++++ + fs/btrfs/transaction.c | 9 ++++----- + fs/erofs/zdata.c | 15 ++++++++------- + fs/nfsd/nfs4proc.c | 4 ---- + fs/overlayfs/util.c | 2 +- + fs/udf/super.c | 2 +- + include/trace/events/btrfs.h | 4 +--- + 10 files changed, 66 insertions(+), 48 deletions(-) +Merging kbuild-current/kbuild-fixes-for-next (bdb0ab974719 modpost: prevent stack buffer overflow in do_input_entry() and do_dmi_entry()) +$ git merge -m Merge branch 'kbuild-fixes-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild-current/kbuild-fixes-for-next +Merge made by the 'ort' strategy. + scripts/mod/file2alias.c | 79 ++++++++++++++++++++++++++++++++---------------- + 1 file changed, 53 insertions(+), 26 deletions(-) +Merging clang-fixes/clang-fixes-for-next (4f96b7c68a99 extract-cert: Wrap key_pass with '#ifdef USE_PKCS11_ENGINE') +$ git merge -m Merge branch 'clang-fixes-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux.git clang-fixes/clang-fixes-for-next +Already up to date. +Merging arc-current/for-curr (7aaa8047eafd Linux 7.0-rc6) +$ git merge -m Merge branch 'for-curr' of https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (75f9a484e817 ARM: 9472/1: fix race condition on PG_dcache_clean in __sync_icache_dcache()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (5cbb61bf4168 arm64/fpsimd: ptrace: zero target's fpsimd_state, not the tracer's) +$ git merge -m Merge branch 'for-next/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Merge made by the 'ort' strategy. + arch/arm64/kernel/ptrace.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging arm-soc-fixes/arm/fixes (7602c0ec0bbf firmware: psci: Set pm_set_resume/suspend_via_firmware() for SYSTEM_SUSPEND) +$ git merge -m Merge branch 'arm/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 5 +- + arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 3 - + arch/arm/boot/dts/renesas/r7s72100-rskrza1.dts | 2 - + arch/arm/boot/dts/renesas/r7s72100.dtsi | 2 +- + arch/arm/boot/dts/renesas/r8a7778.dtsi | 2 +- + arch/arm/boot/dts/renesas/r8a7779.dtsi | 2 +- + arch/arm/boot/dts/renesas/r8a7792.dtsi | 2 +- + arch/arm/mach-versatile/integrator_cp.c | 13 +- + .../dts/renesas/draak-ebisu-panel-aa104xd12.dtso | 5 + + arch/arm64/boot/dts/renesas/r8a78000.dtsi | 8 +- + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 2 + + .../boot/dts/renesas/rz-smarc-cru-csi-ov5645.dtsi | 5 + + .../boot/dts/renesas/rz-smarc-du-adv7513.dtsi | 5 + + .../boot/dts/renesas/salvator-panel-aa104xd12.dtso | 5 + + drivers/firmware/arm_ffa/bus.c | 4 +- + drivers/firmware/arm_ffa/driver.c | 146 ++++++++++++++------- + drivers/firmware/psci/psci.c | 10 ++ + 18 files changed, 154 insertions(+), 68 deletions(-) +Merging davinci-current/davinci/for-current (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'davinci/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (254f49634ee1 Linux 7.1-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 (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'soc-fixes' of https://github.com/sophgo/linux.git sophgo-soc-fixes/soc-fixes +Already up to date. +Merging m68k-current/for-linus (cb39cf99d88e m68k: sun3: Replace vsprintf() with bounded vsnprintf()) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (f583bd5f64d4 powerpc/pasemi: Drop redundant res assignment) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Merge made by the 'ort' strategy. + arch/powerpc/configs/amigaone_defconfig | 1 - + arch/powerpc/configs/chrp32_defconfig | 1 - + arch/powerpc/configs/g5_defconfig | 1 - + arch/powerpc/configs/pasemi_defconfig | 1 - + arch/powerpc/configs/powernv_defconfig | 1 - + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ppc64e_defconfig | 1 - + arch/powerpc/configs/skiroot_defconfig | 1 - + arch/powerpc/kernel/vdso/Makefile | 6 + + arch/powerpc/kexec/Makefile | 2 +- + arch/powerpc/lib/vmx-helper.c | 9 +- + arch/powerpc/perf/core-book3s.c | 5 +- + arch/powerpc/platforms/8xx/cpm1.c | 4 +- + arch/powerpc/platforms/pasemi/pci.c | 3 +- + arch/powerpc/platforms/ps3/device-init.c | 4 +- + arch/powerpc/platforms/pseries/htmdump.c | 133 +++++++++++++++++--- + arch/powerpc/platforms/pseries/papr-hvpipe.c | 181 ++++++++++++++------------- + arch/powerpc/platforms/pseries/papr-hvpipe.h | 1 - + 18 files changed, 235 insertions(+), 121 deletions(-) +Merging s390-fixes/fixes (3fe7ecab1a08 s390/pai: Disable duplicate read of kernel PAI counter value) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + arch/s390/kernel/perf_pai.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging net/main (fcee7d82f27d Merge tag 'net-7.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Already up to date. +Merging bpf/master (0c7ae130698e tools/headers: Regenerate stddef.h to fix BPF selftests) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master +Auto-merging net/core/filter.c +Merge made by the 'ort' strategy. + include/linux/bpf.h | 1 + + net/core/bpf_sk_storage.c | 14 ++++---- + net/core/filter.c | 32 ++++++++++++++++++ + net/core/sock_map.c | 39 ++++++++++++++-------- + net/ipv4/bpf_tcp_ca.c | 2 +- + tools/include/uapi/linux/stddef.h | 26 ++++++++++++++- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 4 +++ + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 4 +++ + tools/testing/selftests/bpf/progs/bpf_cubic.c | 14 ++++++++ + .../bpf/progs/test_misc_tcp_hdr_options.c | 15 ++++++++- + 10 files changed, 128 insertions(+), 23 deletions(-) +Merging ipsec/master (7e2a4f7ca095 xfrm: route MIGRATE notifications to caller's netns) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + include/net/xfrm.h | 3 ++- + net/key/af_key.c | 6 +++--- + net/xfrm/xfrm_policy.c | 2 +- + net/xfrm/xfrm_state.c | 4 ++-- + net/xfrm/xfrm_user.c | 5 ++--- + 5 files changed, 10 insertions(+), 10 deletions(-) +Merging netfilter/main (fcee7d82f27d Merge tag 'net-7.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (bd3a4795d574 selftests: tls: add test for data loss on small pipe) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (fcee7d82f27d Merge tag 'net-7.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging ath/for-current (79240f3f6d76 wifi: nl80211: re-check wiphy netns in nl80211_prepare_wdev_dump() continuation) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Already up to date. +Merging iwlwifi/fixes (59800be48da4 wifi: iwlwifi: mld: fix TSO segmentation explosion when AMSDU is disabled) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/mld/ptp.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mld/tx.c | 5 ++++- + drivers/net/wireless/intel/iwlwifi/mvm/ptp.c | 2 +- + 3 files changed, 6 insertions(+), 3 deletions(-) +Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (0c99acbc8b6c RDMA/hns: Fix unlocked call to hns_roce_qp_remove()) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (fca7401fe37f ALSA: hda: cs35l41: Put ACPI device on missing physical node) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/hda/codecs/realtek/alc269.c | 1 + + sound/hda/codecs/side-codecs/cs35l41_hda.c | 4 +++- + sound/hda/codecs/side-codecs/cs35l56_hda.c | 1 + + sound/usb/midi.c | 12 +++++++----- + sound/usb/midi2.c | 12 +++++++----- + 5 files changed, 19 insertions(+), 11 deletions(-) +Merging sound-asoc-fixes/for-linus (5776bcdf4dcc ASoC: cs35l56: Fixes for driver cleanup) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Already up to date. +Merging regmap-fixes/for-linus (4b7774eeab8d regmap: sdw-mbq: Fix spelling mistake "undeferable" -> "undeferrable") +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (628497e6d925 regulator: qcom-rpmh: Fix index for pmh0101 ldo16) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/qcom-rpmh-regulator.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi-fixes/for-linus (4bacec231752 spi: ch341: correct company name in MODULE_DESCRIPTION) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-ch341.c | 2 +- + drivers/spi/spi-imx.c | 7 ++- + drivers/spi/spi-microchip-core-qspi.c | 99 ++++++++++++++++++++++++++++------- + 3 files changed, 83 insertions(+), 25 deletions(-) +Merging pci-current/for-linus (cede9116c5e1 PCI: Initialize temporary device in new_id_store()) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/pci/pci-driver.c | 9 ++++++++- + drivers/pci/pci.c | 9 ++++----- + drivers/pci/setup-res.c | 2 ++ + 4 files changed, 15 insertions(+), 7 deletions(-) +Merging driver-core.current/driver-core-linus (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'driver-core-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (b38e53cbfb9d usb: usblp: fix uninitialized heap leak via LPGETSTATUS ioctl) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/class/usblp.c | 3 ++- + drivers/usb/common/ulpi.c | 5 ++++- + drivers/usb/dwc3/core.c | 12 ++++++------ + drivers/usb/gadget/udc/omap_udc.c | 4 ---- + drivers/usb/typec/tcpm/tcpm.c | 27 ++++++++++++++++++--------- + 5 files changed, 30 insertions(+), 21 deletions(-) +Merging usb-serial-fixes/usb-linus (100201d349ed USB: serial: option: add Telit Cinterion LE910Cx compositions) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/serial/option.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging phy/fixes (519a228ee40d phy: qcom: edp: Add PHY-specific LDO config for eDP low vdiff) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'ort' strategy. + drivers/phy/qualcomm/phy-qcom-edp.c | 224 +++++++++++++++++++++++++++++------- + 1 file changed, 181 insertions(+), 43 deletions(-) +Merging staging.current/staging-linus (bc851db06045 staging: rtl8723bs: os_dep: avoid NULL pointer dereference in rtw_cbuf_alloc) +$ git merge -m Merge branch 'staging-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Merge made by the 'ort' strategy. + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 3 ++- + drivers/staging/vme_user/vme_fake.c | 2 ++ + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging iio-fixes/fixes-togreg (bbf04ca930ff iio: gyro: itg3200: fix i2c read into the wrong stack location) +$ git merge -m Merge branch 'fixes-togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/ad4695.c | 23 ++++------- + drivers/iio/adc/meson_saradc.c | 4 +- + drivers/iio/adc/mt6359-auxadc.c | 1 + + drivers/iio/adc/npcm_adc.c | 25 ++++-------- + drivers/iio/adc/nxp-sar-adc.c | 24 +++++++++-- + drivers/iio/adc/qcom-spmi-adc5-gen3.c | 2 +- + drivers/iio/adc/xilinx-xadc-core.c | 11 ++++- + drivers/iio/buffer/industrialio-hw-consumer.c | 4 +- + drivers/iio/chemical/mhz19b.c | 17 ++++++++ + drivers/iio/chemical/scd30_core.c | 2 +- + drivers/iio/common/ssp_sensors/ssp_dev.c | 1 + + drivers/iio/dac/ad3530r.c | 54 ++++++++++++++++++------- + drivers/iio/dac/ad5686.c | 56 +++++++++++++++++++------- + drivers/iio/dac/ad5686.h | 1 + + drivers/iio/dac/max5821.c | 9 ++++- + drivers/iio/gyro/adis16260.c | 3 ++ + drivers/iio/gyro/itg3200_buffer.c | 2 +- + drivers/iio/imu/adis16550.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 2 +- + drivers/iio/industrialio-buffer.c | 1 + + drivers/iio/inkern.c | 6 ++- + drivers/iio/light/cm3323.c | 5 +-- + drivers/iio/light/veml6070.c | 14 +------ + drivers/iio/magnetometer/st_magn_core.c | 13 +++++- + drivers/iio/pressure/bmp280-core.c | 2 +- + drivers/iio/temperature/tsys01.c | 2 +- + 26 files changed, 191 insertions(+), 95 deletions(-) +Merging counter-current/counter-current (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'counter-current' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (7fd2df204f34 Linux 7.1-rc2) +$ git merge -m Merge branch 'char-misc-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (7fd2df204f34 Linux 7.1-rc2) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (74d695fd6f9d Input: fm801-gp - simplify initialisation of pci_device_id array) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/gameport/fm801-gp.c | 4 ++-- + drivers/input/joystick/xpad.c | 14 ++++++++++---- + drivers/input/mouse/elan_i2c_core.c | 8 ++++++++ + drivers/input/mouse/elan_i2c_i2c.c | 2 +- + drivers/input/touchscreen/usbtouchscreen.c | 5 +++++ + 5 files changed, 26 insertions(+), 7 deletions(-) +Merging crypto-current/master (d1fa83ecac31 rhashtable: Add bucket_table_free_atomic() helper) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Merge made by the 'ort' strategy. + include/linux/slab.h | 3 +++ + lib/rhashtable.c | 33 ++++++++++++++++++++++++++------- + mm/slub.c | 16 ++++++++++++++++ + 3 files changed, 45 insertions(+), 7 deletions(-) +Merging libcrypto-fixes/libcrypto-fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Already up to date. +Merging vfio-fixes/for-linus (e98137f0a874 vfio/pci: Fix double free in dma-buf feature) +$ git merge -m Merge branch 'for-linus' of https://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (465b05bae5ac selftests: harness: Restore order of test functions) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-backlight-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (135ac3b84bce mtd: spinand: winbond: Fix ODTR write VCR on W35NxxJW) +$ git merge -m Merge branch 'mtd/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (aa6e63373d91 mfd: ls2kbmc: Use PCI API instead of direct accesses) +$ git merge -m Merge branch 'for-mfd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Merge made by the 'ort' strategy. +Merging v4l-dvb-fixes/fixes (646ebdd31058 media: rc: ttusbir: fix inverted error logic) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + drivers/media/rc/ttusbir.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging reset-fixes/reset/fixes (9797524ef2b6 reset: amlogic: t7: Fix null reset ops) +$ 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 (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'mips-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (907150bbe566 ARM: dts: microchip: sam9x7: fix gpio-lines count for pioB) +$ git merge -m Merge branch 'at91-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (6d35786de281 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ 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 (0cfe660559e8 KVM: s390: pci: Fix aisb calculation) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Auto-merging arch/s390/kvm/interrupt.c +Merge made by the 'ort' strategy. + arch/s390/kvm/interrupt.c | 3 +-- + arch/s390/kvm/pci.c | 10 ++++------ + 2 files changed, 5 insertions(+), 8 deletions(-) +Merging kvm-arm-fixes/fixes (effc0a39b8e0 KVM: arm64: Pre-check vcpu memcache for host->guest donate) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/arm64/include/asm/kvm_nested.h | 1 + + arch/arm64/include/asm/sysreg.h | 2 +- + arch/arm64/kvm/arm.c | 21 ++++++++++++++ + arch/arm64/kvm/hyp/include/hyp/switch.h | 2 +- + arch/arm64/kvm/hyp/nvhe/clock.c | 3 ++ + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 47 +++++++++++++++++++++++++++++++- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 16 ++++++++++- + arch/arm64/kvm/hyp/vhe/switch.c | 3 +- + arch/arm64/kvm/mmu.c | 29 ++++++++++++++------ + include/linux/arm-smccc.h | 6 ++++ + tools/testing/selftests/kvm/steal_time.c | 2 ++ + 12 files changed, 120 insertions(+), 13 deletions(-) +Merging hwmon-fixes/hwmon (99076a17a112 hwmon: (ads7871) Fix endianness bug in 16-bit register reads) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + Documentation/hwmon/yogafan.rst | 2 +- + drivers/hwmon/Makefile | 1 - + drivers/hwmon/ads7871.c | 6 +++++- + drivers/hwmon/corsair-psu.c | 4 ++-- + drivers/hwmon/lm63.c | 39 ++++++++++++++++++++++++++++++--------- + drivers/hwmon/lm75.c | 10 +++++----- + drivers/hwmon/ltc2992.c | 41 ++++++++++++++++++++++++++++++++--------- + 7 files changed, 75 insertions(+), 28 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (a8aec1423032 nvdimm/bus: Fix potential use after free in asynchronous initialization) +$ git merge -m Merge branch 'libnvdimm-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (be5c5280cf2b cxl: Adjust the startup priority of cxl_pmem to be higher than that of cxl_acpi) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/dma-mapping-fixes (22d0213e55fb dma-direct: fix use of max_pfn) +$ git merge -m Merge branch 'dma-mapping-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes +Merge made by the 'ort' strategy. + kernel/dma/direct.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drivers-x86-fixes/fixes (863810d4985a platform/x86: lenovo: wmi-other: Fix uninitialized variable in lwmi_om_hwmon_write()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (4b0a3ff9f417 of: cpu: add check in __of_find_n_match_cpu_property()) +$ git merge -m Merge branch 'dt/linus' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Merge made by the 'ort' strategy. + drivers/of/cpu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging dt-krzk-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (98f69975d4c0 Merge branch '7.1/scsi-queue' into 7.1/scsi-fixes) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (5dfe9c139963 Merge tag 'amd-drm-fixes-7.1-2026-05-06' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 6 +- + drivers/accel/ivpu/ivpu_drv.c | 21 +++++ + drivers/accel/qaic/qaic_ras.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 13 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 13 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 28 +------ + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.h | 3 - + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 - + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 97 +++++++++------------- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 33 +------- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 4 +- + .../gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 13 +-- + drivers/gpu/drm/bridge/tda998x_drv.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 16 ++-- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 8 +- + drivers/gpu/drm/i915/i915_driver.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 11 ++- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c | 4 + + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c | 18 ++-- + drivers/gpu/drm/panel/Kconfig | 1 + + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 2 + + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 4 +- + drivers/gpu/drm/panel/panel-himax-hx83102.c | 2 + + drivers/gpu/drm/panel/panel-himax-hx83121a.c | 4 +- + drivers/gpu/drm/qxl/qxl_drv.c | 6 +- + drivers/gpu/drm/radeon/ci_dpm.c | 9 +- + drivers/gpu/drm/sti/sti_hda.c | 8 +- + drivers/gpu/drm/tiny/bochs.c | 10 +-- + drivers/gpu/drm/ttm/ttm_pool.c | 18 ++-- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 12 ++- + drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c | 8 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 5 +- + drivers/gpu/drm/xe/xe_lrc.c | 11 ++- + drivers/gpu/drm/xe/xe_lrc.h | 2 +- + drivers/gpu/drm/xe/xe_sriov_pf_migration.c | 7 +- + rust/kernel/drm/device.rs | 22 +++-- + rust/kernel/drm/gem/mod.rs | 13 ++- + rust/kernel/drm/gem/shmem.rs | 6 +- + 43 files changed, 230 insertions(+), 246 deletions(-) +Merging drm-intel-fixes/for-linux-next-fixes (aab3d205a086 drm/i915/display: enable ccs modifiers on dg2) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (8f4d20a71022 mmc: vub300: fix use-after-free on disconnect) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'rtc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'gnss-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (3f8c8497b4fc hv: utils: replace deprecated strcpy with strscpy in kvp_register) +$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + drivers/hv/hv_kvp.c | 27 +++++++++++++-------------- + include/hyperv/hvhdk.h | 1 + + 2 files changed, 14 insertions(+), 14 deletions(-) +Merging risc-v-fixes/fixes (db909bd7986c riscv: mm: Fixup no5lvl failure when vaddr is invalid) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'ort' strategy. + Documentation/arch/riscv/cmodx.rst | 8 ++++---- + arch/riscv/errata/mips/errata.c | 2 +- + arch/riscv/kernel/compat_signal.c | 2 ++ + arch/riscv/kernel/copy-unaligned.S | 5 +++-- + arch/riscv/kernel/cpufeature.c | 4 +--- + arch/riscv/kernel/ptrace.c | 4 ++-- + arch/riscv/kernel/vec-copy-unaligned.S | 5 +++-- + arch/riscv/mm/init.c | 25 +++++++++++++++++++++++++ + 8 files changed, 41 insertions(+), 14 deletions(-) +Merging riscv-dt-fixes/riscv-dt-fixes (0df8aa2b9aec riscv: dts: microchip: fix icicle i2c pinctrl configuration) +$ git merge -m Merge branch 'riscv-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Merge made by the 'ort' strategy. + .../boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi | 10 -------- + .../boot/dts/microchip/mpfs-icicle-kit-prod.dts | 10 ++++++++ + arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts | 19 +++++++++++++++ + arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 27 +-------------------- + arch/riscv/boot/dts/starfive/jh7110.dtsi | 28 ---------------------- + 5 files changed, 30 insertions(+), 64 deletions(-) +Merging riscv-soc-fixes/riscv-soc-fixes (c7596f9001e2 firmware: microchip: fail auto-update probe if no flash found) +$ git merge -m Merge branch 'riscv-soc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'spdx-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'gpio/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (3bb62e3f99a5 gpiolib: acpi: Only trigger ActiveBoth interrupts on boot) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Merge made by the 'ort' strategy. + drivers/gpio/gpiolib-acpi-core.c | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) +Merging pinctrl-intel-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (8f80b5b227ef kunit: config: KUNIT_DEBUGFS should depend on DEBUG_FS) +$ git merge -m Merge branch 'kunit-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Merge made by the 'ort' strategy. + lib/kunit/Kconfig | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging memblock-fixes/fixes (afd218bb1dd8 mm/fake-numa: fix under-allocation detection in uniform split) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Merge made by the 'ort' strategy. + mm/numa_emulation.c | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) +Merging renesas-fixes/fixes (8a78d1c454b3 Merge branch 'renesas-pinctrl-fixes-for-v7.1' into renesas-fixes) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 23 +++++++++++++++-------- + 1 file changed, 15 insertions(+), 8 deletions(-) +Merging perf-current/perf-tools (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'perf-tools' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (2c340aab5485 x86/efi: Restore IRQ state in EFI page fault handler) +$ git merge -m Merge branch 'urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging battery-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (2adc8664018c rust: allow `clippy::collapsible_if` globally) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Auto-merging Makefile +Merge made by the 'ort' strategy. + Makefile | 2 + + drivers/android/binder/range_alloc/array.rs | 1 - + rust/Makefile | 2 + + rust/pin-init/internal/src/init.rs | 184 +++++++++++++--------------- + rust/pin-init/src/__internal.rs | 28 +++-- + 5 files changed, 107 insertions(+), 110 deletions(-) +Merging w1-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (ec1fcddb3117 pmdomain: mediatek: fix use-after-free in scpsys_get_bus_protection_legacy()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging i2c-host-fixes/i2c/i2c-host-fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Already up to date. +Merging i2c-rust-fixes/rust-i2c-fixes (7ca6d1cfec80 Merge tag 'powerpc-7.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux) +$ git merge -m Merge branch 'rust-i2c-fixes' of https://github.com/ikrtn/rust-for-linux i2c-rust-fixes/rust-i2c-fixes +Already up to date. +Merging sparc-fixes/for-linus (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (de019f203b0d clk: rk808: fix OF node reference imbalance) +$ git merge -m Merge branch 'clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/clk/clk-eyeq.c | 60 +++++++++++-------------------------------- + drivers/clk/clk-rk808.c | 2 +- + drivers/clk/spacemit/ccu-k3.c | 2 +- + drivers/reset/reset-eyeq.c | 24 ++--------------- + 5 files changed, 20 insertions(+), 69 deletions(-) +Merging thead-clk-fixes/thead-clk-fixes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'thead-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk-fixes/thead-clk-fixes +Already up to date. +Merging tenstorrent-clk-fixes/tenstorrent-clk-fixes (6de23f81a5e0 Linux 7.0-rc1) +$ git merge -m Merge branch 'tenstorrent-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-clk-fixes/tenstorrent-clk-fixes +Already up to date. +Merging pwrseq-fixes/pwrseq/for-current (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'pwrseq/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current +Already up to date. +Merging thead-dt-fixes/thead-dt-fixes (6de23f81a5e0 Linux 7.0-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt-fixes/thead-dt-fixes +Already up to date. +Merging ftrace-fixes/ftrace/fixes (1650a1b6cb1a fgraph: Check ftrace_pids_enabled on registration for early filtering) +$ git merge -m Merge branch 'ftrace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes +Already up to date. +Merging ring-buffer-fixes/ring-buffer/fixes (92d5a606721f ring-buffer: Do not double count the reader_page) +$ git merge -m Merge branch 'ring-buffer/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ring-buffer-fixes/ring-buffer/fixes +Already up to date. +Merging trace-fixes/trace/fixes (b2aa3b4d64e4 tracing/probes: Limit size of event probe to 3K) +$ git merge -m Merge branch 'trace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes +Already up to date. +Merging tracefs-fixes/tracefs/fixes (07004a8c4b57 eventfs: Hold eventfs_mutex and SRCU when remount walks events) +$ git merge -m Merge branch 'tracefs/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes +Already up to date. +Merging spacemit-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/spacemit-com/linux spacemit-fixes/fixes +Already up to date. +Merging tip-fixes/tip/urgent (304ca1ddeb53 Merge branch into tip/master: 'x86/urgent') +$ git merge -m Merge branch 'tip/urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Merge made by the 'ort' strategy. + Documentation/userspace-api/rseq.rst | 94 ++++++++- + arch/x86/events/core.c | 13 +- + arch/x86/events/intel/core.c | 50 +++-- + arch/x86/events/perf_event.h | 10 + + arch/x86/kernel/e820.c | 6 +- + arch/x86/xen/setup.c | 13 +- + include/linux/rseq.h | 37 ++-- + include/linux/rseq_entry.h | 122 ++++++------ + include/linux/rseq_types.h | 13 +- + include/uapi/linux/rseq.h | 5 +- + kernel/events/core.c | 70 +++++-- + kernel/events/internal.h | 1 + + kernel/events/ring_buffer.c | 2 + + kernel/rseq.c | 214 +++++++++++++-------- + kernel/sched/fair.c | 44 ++++- + kernel/sched/membarrier.c | 11 +- + kernel/time/timer_migration.c | 40 ++-- + tools/testing/selftests/rseq/Makefile | 21 +- + tools/testing/selftests/rseq/check_optimized.c | 17 ++ + tools/testing/selftests/rseq/legacy_check.c | 65 +++++++ + tools/testing/selftests/rseq/param_test.c | 25 ++- + tools/testing/selftests/rseq/rseq-abi.h | 7 +- + tools/testing/selftests/rseq/rseq.c | 39 ++-- + tools/testing/selftests/rseq/rseq.h | 8 +- + tools/testing/selftests/rseq/run_legacy_check.sh | 4 + + tools/testing/selftests/rseq/run_param_test.sh | 39 ++++ + tools/testing/selftests/rseq/run_timeslice_test.sh | 14 ++ + tools/testing/selftests/rseq/slice_test.c | 12 +- + 28 files changed, 738 insertions(+), 258 deletions(-) + create mode 100644 tools/testing/selftests/rseq/check_optimized.c + create mode 100644 tools/testing/selftests/rseq/legacy_check.c + create mode 100755 tools/testing/selftests/rseq/run_legacy_check.sh + create mode 100755 tools/testing/selftests/rseq/run_timeslice_test.sh +Merging slab-fixes/slab/for-next-fixes (5b31044e649e mm/slab: return NULL early from kmalloc_nolock() in NMI on UP) +$ git merge -m Merge branch 'slab/for-next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes +Already up to date. +Merging kexec-fixes/kexec-fixes (028ef9c96e96 Linux 7.0) +$ git merge -m Merge branch 'kexec-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git kexec-fixes/kexec-fixes +Already up to date. +Merging liveupdate-fixes/fixes (7b0b68b2b956 mm/memfd_luo: document preservation of file seals) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git liveupdate-fixes/fixes +Auto-merging kernel/liveupdate/kexec_handover.c +Merge made by the 'ort' strategy. + kernel/liveupdate/kexec_handover.c | 2 +- + mm/memfd_luo.c | 25 +++++++++++++++++++------ + 2 files changed, 20 insertions(+), 7 deletions(-) +Merging drm-msm-fixes/msm-fixes (a972d1b864e8 drm/msm: Use of_get_available_child_by_name()) +$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes +Already up to date. +Merging uml-fixes/fixes (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging fwctl-fixes/for-rc (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl-fixes/for-rc +Already up to date. +Merging devsec-tsm-fixes/fixes (c3fd16c3b98e virt: tdx-guest: Fix handling of host controlled 'quote' buffer length) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm-fixes/fixes +Already up to date. +Merging drm-rust-fixes/for-linux-next-fixes (0a69ac25bd59 rust: drm: fix unsound initialization in drm::Device::new) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-fixes/for-linux-next-fixes +Already up to date. +Merging tenstorrent-dt-fixes/tenstorrent-dt-fixes (6de23f81a5e0 Linux 7.0-rc1) +$ git merge -m Merge branch 'tenstorrent-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-dt-fixes/tenstorrent-dt-fixes +Already up to date. +Merging nfc-fixes/for-linus (f040e590c035 nfc: hci: fix out-of-bounds read in HCP header parsing) +$ git merge -m Merge branch 'for-linus' of https://codeberg.org/linux-nfc/linux.git nfc-fixes/for-linus +Merge made by the 'ort' strategy. + net/nfc/hci/core.c | 10 ++++++++++ + net/nfc/llcp_core.c | 11 +++++++++++ + net/nfc/llcp_sock.c | 2 ++ + net/nfc/nci/hci.c | 10 ++++++++++ + 4 files changed, 33 insertions(+) +Merging drm-misc-fixes/for-linux-next-fixes (459d75523b71 drm/panfrost: Fix wait_bo ioctl leaking positive return from dma_resv_wait_timeout()) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/accel/rocket/rocket_gem.c | 2 ++ + drivers/gpu/drm/panfrost/panfrost_drv.c | 2 ++ + 2 files changed, 4 insertions(+) +Merging rust/rust-next (254f49634ee1 Linux 7.1-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 rust-interop/interop-next (05f7e89ab973 Linux 6.19) +$ git merge -m Merge branch 'interop-next' of https://github.com/Rust-for-Linux/linux.git rust-interop/interop-next +Already up to date. +Merging rust-alloc/alloc-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'alloc-next' of https://github.com/Rust-for-Linux/linux.git rust-alloc/alloc-next +Already up to date. +Merging rust-io/io-next (86731a2a651e Linux 6.16-rc3) +$ git merge -m Merge branch 'io-next' of https://github.com/Rust-for-Linux/linux.git rust-io/io-next +Already up to date. +Merging rust-pin-init/pin-init-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'pin-init-next' of https://github.com/Rust-for-Linux/linux.git rust-pin-init/pin-init-next +Already up to date. +Merging rust-timekeeping/timekeeping-next (ddb1444d3335 hrtimer: add usage examples to documentation) +$ git merge -m Merge branch 'timekeeping-next' of https://github.com/Rust-for-Linux/linux.git rust-timekeeping/timekeeping-next +Already up to date. +Merging rust-xarray/xarray-next (c455f19bbe61 rust: xarray: add __rust_helper to helpers) +$ git merge -m Merge branch 'xarray-next' of https://github.com/Rust-for-Linux/linux.git rust-xarray/xarray-next +Already up to date. +Merging rust-analyzer/rust-analyzer-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'rust-analyzer-next' of https://github.com/Rust-for-Linux/linux.git rust-analyzer/rust-analyzer-next +Already up to date. +Merging mm-stable/mm-stable (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm-unstable/mm-unstable (ede0ea131b32 mm/swap: remove redundant swap device reference in alloc/free) +$ git merge -m Merge branch 'mm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-unstable/mm-unstable +Auto-merging arch/riscv/mm/init.c +Auto-merging kernel/fork.c +Auto-merging mm/page_alloc.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-kernel-mm-damon | 19 ++ + Documentation/admin-guide/mm/damon/lru_sort.rst | 2 +- + Documentation/admin-guide/mm/damon/reclaim.rst | 2 +- + Documentation/admin-guide/mm/damon/usage.rst | 30 +- + Documentation/mm/damon/design.rst | 33 ++ + Documentation/mm/damon/maintainer-profile.rst | 21 ++ + Documentation/mm/page_owner.rst | 55 +++- + arch/arm64/mm/mmu.c | 5 +- + arch/loongarch/mm/init.c | 5 +- + arch/powerpc/mm/mem.c | 5 +- + arch/riscv/mm/init.c | 5 +- + arch/s390/mm/init.c | 5 +- + arch/sh/mm/cache-sh4.c | 2 +- + arch/x86/hyperv/mmu.c | 4 +- + arch/x86/include/asm/tlb.h | 19 +- + arch/x86/include/asm/tlbflush.h | 6 +- + arch/x86/kernel/smpboot.c | 1 + + arch/x86/mm/init_64.c | 5 +- + arch/x86/mm/tlb.c | 39 ++- + drivers/dax/kmem.c | 6 + + drivers/gpu/drm/drm_managed.c | 4 +- + fs/proc/task_mmu.c | 195 ++++++++--- + include/asm-generic/pgalloc.h | 2 +- + include/asm-generic/tlb.h | 17 + + include/linux/damon.h | 16 + + include/linux/gfp.h | 4 + + include/linux/gfp_types.h | 6 +- + include/linux/highmem.h | 15 + + include/linux/memory_hotplug.h | 8 +- + include/linux/mm.h | 18 - + include/linux/pagemap.h | 2 + + include/linux/swap.h | 5 +- + include/linux/thread_info.h | 2 +- + include/linux/vmpressure.h | 9 +- + include/trace/events/vmscan.h | 52 +++ + kernel/bpf/arena.c | 2 +- + kernel/fork.c | 5 +- + kernel/power/swap.c | 2 +- + kernel/power/user.c | 15 +- + mm/Kconfig | 5 +- + mm/damon/core.c | 286 ++++++++++++++-- + mm/damon/lru_sort.c | 48 ++- + mm/damon/ops-common.c | 9 +- + mm/damon/reclaim.c | 48 ++- + mm/damon/sysfs-schemes.c | 65 ++++ + mm/damon/sysfs.c | 31 ++ + mm/damon/tests/core-kunit.h | 10 + + mm/damon/vaddr.c | 3 + + mm/filemap.c | 4 + + mm/gup.c | 21 +- + mm/huge_memory.c | 107 +++--- + mm/hugetlb.c | 7 +- + mm/kfence/kfence_test.c | 2 +- + mm/khugepaged.c | 8 +- + mm/madvise.c | 29 +- + mm/memcontrol.c | 5 +- + mm/memory-failure.c | 8 +- + mm/memory.c | 57 ++-- + mm/memory_hotplug.c | 13 +- + mm/memremap.c | 4 +- + mm/migrate.c | 48 ++- + mm/migrate_device.c | 9 +- + mm/mm_init.c | 47 ++- + mm/mmap.c | 2 +- + mm/mmu_gather.c | 15 + + mm/page_alloc.c | 209 ++++++++++-- + mm/page_io.c | 42 +-- + mm/page_owner.c | 2 +- + mm/readahead.c | 6 +- + mm/rmap.c | 8 +- + mm/shmem.c | 5 +- + mm/sparse-vmemmap.c | 75 +++-- + mm/sparse.c | 68 +--- + mm/swap.c | 43 ++- + mm/swapfile.c | 205 +++++++++--- + mm/vmalloc.c | 29 +- + mm/vmpressure.c | 15 +- + mm/vmscan.c | 362 +++++++++------------ + net/rds/tcp_recv.c | 2 +- + tools/testing/selftests/cgroup/lib/cgroup_util.c | 18 +- + .../selftests/cgroup/lib/include/cgroup_util.h | 4 +- + tools/testing/selftests/cgroup/test_core.c | 2 +- + tools/testing/selftests/cgroup/test_freezer.c | 2 +- + tools/testing/selftests/cgroup/test_memcontrol.c | 19 +- + tools/testing/selftests/cgroup/test_zswap.c | 181 ++++++++--- + tools/testing/selftests/damon/_damon_sysfs.py | 31 +- + .../selftests/damon/drgn_dump_damon_status.py | 3 + + tools/testing/selftests/damon/sysfs.py | 56 +++- + tools/testing/selftests/mm/Makefile | 9 +- + tools/testing/selftests/mm/check_config.sh | 2 +- + tools/testing/selftests/mm/droppable.c | 9 +- + tools/testing/selftests/mm/mlock2-tests.c | 86 ++++- + tools/testing/selftests/mm/mremap_test.c | 109 +------ + tools/testing/selftests/mm/process_madv.c | 29 ++ + tools/testing/selftests/mm/run_vmtests.sh | 1 + + tools/testing/selftests/proc/proc-maps-race.c | 295 +++++++++++++---- + 96 files changed, 2458 insertions(+), 1008 deletions(-) +Merging mm-nonmm-unstable/mm-nonmm-unstable (ed7d4f00d637 lib/tests: extend cmdline KUnit with next_arg() tests) +$ git merge -m Merge branch 'mm-nonmm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable +Auto-merging Makefile +Auto-merging kernel/fork.c +Auto-merging mm/Kconfig +Merge made by the 'ort' strategy. + .clang-format | 2 + + Documentation/atomic_t.txt | 14 +- + Documentation/dev-tools/checkpatch.rst | 14 + + Makefile | 2 +- + arch/arc/include/asm/uaccess.h | 3 +- + arch/arm/include/asm/uaccess.h | 3 +- + arch/arm64/Kconfig | 3 + + arch/arm64/include/asm/barrier.h | 23 ++ + arch/arm64/include/asm/cmpxchg.h | 62 +++- + arch/arm64/include/asm/delay-const.h | 27 ++ + arch/arm64/include/asm/rqspinlock.h | 85 ----- + arch/arm64/include/asm/uaccess.h | 3 +- + arch/arm64/lib/delay.c | 17 +- + arch/hexagon/include/asm/uaccess.h | 3 +- + arch/loongarch/include/asm/uaccess.h | 3 +- + arch/m68k/include/asm/uaccess.h | 3 +- + arch/microblaze/include/asm/uaccess.h | 3 +- + arch/mips/include/asm/uaccess.h | 3 +- + arch/nios2/include/asm/uaccess.h | 3 +- + arch/openrisc/include/asm/uaccess.h | 3 +- + arch/parisc/include/asm/uaccess.h | 3 +- + arch/riscv/kernel/image-vars.h | 9 + + arch/s390/include/asm/uaccess.h | 3 +- + arch/sh/include/asm/uaccess.h | 3 +- + arch/sparc/include/asm/uaccess_32.h | 3 +- + arch/sparc/include/asm/uaccess_64.h | 3 +- + arch/um/include/asm/uaccess.h | 3 +- + arch/xtensa/include/asm/uaccess.h | 3 +- + certs/Kconfig | 14 +- + drivers/clocksource/arm_arch_timer.c | 2 + + drivers/cpuidle/poll_state.c | 21 +- + drivers/soc/qcom/rpmh-rsc.c | 8 +- + drivers/usb/usbip/usbip_common.h | 29 +- + drivers/usb/usbip/vhci_rx.c | 4 +- + drivers/usb/usbip/vhci_sysfs.c | 2 +- + drivers/vhost/vhost.h | 2 +- + fs/Kconfig | 6 +- + fs/fat/fat_test.c | 33 ++ + fs/ocfs2/quota_local.c | 2 +- + fs/proc/base.c | 63 ++-- + fs/proc/generic.c | 10 +- + include/asm-generic/barrier.h | 95 ++++++ + include/asm-generic/uaccess.h | 3 +- + include/linux/atomic.h | 10 + + include/linux/atomic/atomic-long.h | 18 +- + include/linux/codetag.h | 3 +- + include/linux/init.h | 2 +- + include/linux/kcov.h | 12 +- + include/linux/sched/idle.h | 29 ++ + include/linux/skbuff.h | 14 +- + include/linux/types.h | 6 + + include/linux/uaccess.h | 25 +- + init/Kconfig | 24 +- + kernel/bpf/rqspinlock.c | 77 +++-- + kernel/fork.c | 11 +- + kernel/kcov.c | 6 +- + kernel/taskstats.c | 62 ++-- + lib/Kconfig | 2 +- + lib/Kconfig.debug | 10 + + lib/alloc_tag.c | 8 +- + lib/base64.c | 5 +- + lib/cmdline.c | 30 +- + lib/codetag.c | 12 +- + lib/idr.c | 55 ++- + lib/kstrtox.c | 37 +- + lib/seq_buf.c | 1 + + lib/test-kstrtox.c | 6 + + lib/test_ida.c | 14 + + lib/tests/Makefile | 1 + + lib/tests/barrier-timeout-test.c | 125 +++++++ + lib/tests/cmdline_kunit.c | 118 +++++++ + lib/tests/seq_buf_kunit.c | 34 ++ + lib/tests/string_helpers_kunit.c | 15 +- + lib/usercopy.c | 4 +- + mm/Kconfig | 4 +- + rust/helpers/uaccess.c | 2 +- + scripts/atomic/gen-atomic-long.sh | 16 +- + scripts/checkpatch.pl | 47 ++- + scripts/get_maintainer.pl | 71 ++-- + tools/accounting/getdelays.c | 8 +- + tools/testing/selftests/acct/.gitignore | 3 +- + tools/testing/selftests/acct/Makefile | 7 +- + .../selftests/acct/taskstats_fill_stats_tgid.c | 375 +++++++++++++++++++++ + tools/testing/selftests/filelock/.gitignore | 1 + + tools/testing/selftests/filelock/ofdlocks.c | 94 +++--- + 85 files changed, 1457 insertions(+), 550 deletions(-) + create mode 100644 arch/arm64/include/asm/delay-const.h + create mode 100644 lib/tests/barrier-timeout-test.c + create mode 100644 tools/testing/selftests/acct/taskstats_fill_stats_tgid.c + create mode 100644 tools/testing/selftests/filelock/.gitignore +Merging kbuild/kbuild-for-next (b9d21c32dca2 kconfig: fix potential NULL pointer dereference in conf_askvalue) +$ git merge -m Merge branch 'kbuild-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild/kbuild-for-next +Merge made by the 'ort' strategy. + Documentation/kbuild/makefiles.rst | 41 ++++++++++++++++++++++++++++++-------- + scripts/Makefile.modfinal | 10 +--------- + scripts/kconfig/conf.c | 6 ++---- + 3 files changed, 36 insertions(+), 21 deletions(-) +Merging clang-format/clang-format (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf-tools-next (8c8f20936143 perf build: Remove NO_GTK2 build test) +$ git merge -m Merge branch 'perf-tools-next' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Merge made by the 'ort' strategy. + tools/perf/Makefile.config | 2 +- + tools/perf/Makefile.perf | 1 + + tools/perf/arch/common.c | 4 +- + tools/perf/builtin-inject.c | 3 +- + tools/perf/tests/make | 6 +- + tools/perf/util/annotate-data.c | 27 ++-- + tools/perf/util/arm-spe-decoder/Build | 2 + + tools/perf/util/arm-spe-decoder/arm-spe-decoder.c | 17 ++- + tools/perf/util/arm-spe-decoder/arm-spe-decoder.h | 3 +- + .../util/arm-spe-decoder/arm-spe-pkt-decoder.c | 144 ++++++++++++++------- + .../util/arm-spe-decoder/arm-spe-pkt-decoder.h | 5 +- + tools/perf/util/arm-spe.c | 62 ++++++--- + tools/perf/util/debuginfo.c | 9 +- + tools/perf/util/dwarf-aux.c | 39 +++--- + tools/perf/util/dwarf-aux.h | 5 + + tools/perf/util/libdw.c | 72 +++++++++-- + tools/perf/util/probe-finder.c | 102 +++++++++------ + tools/perf/util/srcline.c | 9 +- + tools/perf/util/srcline.h | 1 + + 19 files changed, 345 insertions(+), 168 deletions(-) +Merging compiler-attributes/compiler-attributes (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/dma-mapping-for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'dma-mapping-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next +Already up to date. +Merging asm-generic/master (adbbd9714f80 scripts: headers_install.sh: Remove config leak ignore machinery) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic asm-generic/master +Already up to date. +Merging nocache-cleanup/nocache-cleanup (809b997a5ce9 x86-64/arm64/powerpc: clean up and rename __copy_from_user_flushcache) +$ git merge -m Merge branch 'nocache-cleanup' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git nocache-cleanup/nocache-cleanup +Already up to date. +Merging alpha/alpha-next (d58041d2c63e MAINTAINERS: Add Magnus Lindholm as maintainer for alpha port) +$ git merge -m Merge branch 'alpha-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next +Already up to date. +Merging arm/for-next (c6e61c06d606 ARM: 9463/1: Allow to enable RT) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Already up to date. +Merging arm64/for-next/core (858fbd7248bd Merge branch 'for-next/c1-pro-erratum-4193714' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (47f06ebbe8da perf/arm-cmn: Fix resource_size_t printk specifier in arm_cmn_init_dtc()) +$ git merge -m Merge branch 'for-next/perf' of https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (f0e3ab65a0a7 soc: document merges) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 39 ++ + .../intel/ixp/intel-ixp42x-actiontec-mi424wr.dtsi | 6 +- + arch/arm/configs/at91_dt_defconfig | 1 - + arch/arm/configs/hisi_defconfig | 1 - + arch/arm/configs/multi_v5_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 103 +++-- + arch/arm/configs/pxa_defconfig | 2 - + arch/arm/configs/qcom_defconfig | 15 - + arch/arm/configs/sama5_defconfig | 1 - + arch/arm/configs/sama7_defconfig | 1 - + arch/arm/configs/socfpga_defconfig | 1 - + arch/arm/configs/spear13xx_defconfig | 1 - + arch/arm/configs/spear3xx_defconfig | 1 - + arch/arm/configs/spear6xx_defconfig | 1 - + arch/arm/mach-mv78xx0/Kconfig | 1 + + arch/arm/mach-orion5x/Kconfig | 1 + + arch/arm/mach-pxa/Kconfig | 1 + + arch/arm/mach-s3c/Kconfig.s3c64xx | 1 + + arch/arm/mach-sa1100/Kconfig | 1 + + arch/arm64/boot/dts/realtek/kent.dtsi | 20 + + arch/arm64/configs/defconfig | 418 ++++++++++----------- + 21 files changed, 307 insertions(+), 310 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging amlogic/for-next (8b379d5e9eb7 Merge branch 'v7.2/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + .../dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts | 199 +++++++++ + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 464 +++++++++++++++++++++ + .../dts/amlogic/meson-gxl-s905d-phicomm-n1.dts | 15 + + .../dts/amlogic/meson-s4-s905y4-khadas-vim1s.dts | 81 ++++ + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 45 ++ + 5 files changed, 804 insertions(+) +Merging asahi-soc/asahi-soc/for-next (d31647c698f6 Merge branch 'apple-soc/drivers-6.20' into asahi-soc/for-next) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Merge made by the 'ort' strategy. +Merging at91/at91-next (c96e60ae720a Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging bmc/for-next (b333a0f1c857 soc: aspeed: cleanup dead default for ASPEED_SOCINFO) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next +Merge made by the 'ort' strategy. + drivers/soc/aspeed/Kconfig | 1 - + 1 file changed, 1 deletion(-) +Merging broadcom/next (e8f908b91550 firmware: raspberrypi: Change dependency to ARCH_BCM2835 and COMPILE_TEST) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + drivers/firmware/Kconfig | 5 +- + drivers/soc/bcm/brcmstb/common.c | 98 +++++++++++++++++++++------------------- + 2 files changed, 55 insertions(+), 48 deletions(-) +Merging cix/for-next (f4f1e3bdb5f9 arm64: defconfig: Enable CIX Sky1 pinctrl, PCIe host, and Cadence GPIO) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git cix/for-next +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 03fac8c718cd] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git +$ git diff -M --stat --summary HEAD^.. + arch/arm64/configs/defconfig | 1 + + 1 file changed, 1 insertion(+) +Merging davinci/davinci/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'davinci/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (dce208b5405f memory: tegra: Add Tegra114 EMC driver) +$ 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/nvidia,tegra124-emc.yaml | 174 +-- + .../memory-controllers/nvidia,tegra124-mc.yaml | 31 +- + .../memory-controllers/nvidia,tegra186-mc.yaml | 31 + + drivers/memory/atmel-ebi.c | 3 +- + drivers/memory/tegra/Kconfig | 19 + + drivers/memory/tegra/Makefile | 3 + + drivers/memory/tegra/mc.c | 40 +- + drivers/memory/tegra/mc.h | 9 + + drivers/memory/tegra/tegra-emc-common.c | 143 +++ + drivers/memory/tegra/tegra-emc-common.h | 46 + + drivers/memory/tegra/tegra114-emc.c | 1353 ++++++++++++++++++++ + drivers/memory/tegra/tegra114.c | 193 +++ + drivers/memory/tegra/tegra124-emc.c | 107 +- + drivers/memory/tegra/tegra186.c | 4 +- + drivers/memory/tegra/tegra20-emc.c | 110 +- + drivers/memory/tegra/tegra234.c | 2 +- + drivers/memory/tegra/tegra238.c | 391 ++++++ + drivers/memory/tegra/tegra30-emc.c | 107 +- + include/dt-bindings/memory/nvidia,tegra238-mc.h | 74 ++ + include/dt-bindings/memory/tegra114-mc.h | 67 + + include/soc/tegra/mc.h | 2 +- + 21 files changed, 2420 insertions(+), 489 deletions(-) + create mode 100644 drivers/memory/tegra/tegra-emc-common.c + create mode 100644 drivers/memory/tegra/tegra-emc-common.h + create mode 100644 drivers/memory/tegra/tegra114-emc.c + create mode 100644 drivers/memory/tegra/tegra238.c + create mode 100644 include/dt-bindings/memory/nvidia,tegra238-mc.h +Merging fsl/soc_fsl (c99d8ac7b355 bus: fsl-mc: wait for the MC firmware to complete its boot) +$ git merge -m Merge branch 'soc_fsl' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git fsl/soc_fsl +Merge made by the 'ort' strategy. + drivers/base/platform-msi.c | 4 - + drivers/bus/fsl-mc/dprc-driver.c | 14 +-- + drivers/bus/fsl-mc/fsl-mc-bus.c | 50 ++++++++- + drivers/bus/fsl-mc/fsl-mc-msi.c | 166 +++++---------------------- + drivers/bus/fsl-mc/fsl-mc-private.h | 2 +- + drivers/irqchip/Kconfig | 6 - + drivers/irqchip/Makefile | 1 - + drivers/irqchip/irq-gic-its-msi-parent.c | 7 +- + drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c | 168 ---------------------------- + drivers/soc/fsl/qe/qe.c | 3 + + drivers/soc/fsl/qe/qe_ports_ic.c | 23 ++-- + include/linux/fsl/mc.h | 6 +- + include/linux/irqdomain_defs.h | 1 - + include/uapi/linux/fsl_hypervisor.h | 4 +- + 14 files changed, 106 insertions(+), 349 deletions(-) + delete mode 100644 drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c +Merging imx-mxs/for-next (0f4bd8451be3 Merge branches 'imx/dt', 'imx/dt64' and 'imx/firmware-ele' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/se-cdev | 44 + + Documentation/devicetree/bindings/arm/fsl.yaml | 28 +- + .../devicetree/bindings/firmware/fsl,imx-se.yaml | 91 ++ + .../driver-api/firmware/other_interfaces.rst | 133 +++ + arch/arm/boot/dts/nxp/imx/Makefile | 3 + + arch/arm/boot/dts/nxp/imx/imx25.dtsi | 1 - + arch/arm/boot/dts/nxp/imx/imx35.dtsi | 1 - + .../arm/boot/dts/nxp/imx/imx6ul-var-som-audio.dtsi | 30 + + .../boot/dts/nxp/imx/imx6ul-var-som-common.dtsi | 187 +++ + .../nxp/imx/imx6ul-var-som-concerto-common.dtsi | 215 ++++ + .../dts/nxp/imx/imx6ul-var-som-concerto-full.dts | 22 + + .../boot/dts/nxp/imx/imx6ul-var-som-concerto.dts | 318 +----- + .../arm/boot/dts/nxp/imx/imx6ul-var-som-enet1.dtsi | 44 + + .../arm/boot/dts/nxp/imx/imx6ul-var-som-enet2.dtsi | 79 ++ + .../dts/nxp/imx/imx6ul-var-som-lvds-panel.dtsi | 112 ++ + arch/arm/boot/dts/nxp/imx/imx6ul-var-som-sd.dtsi | 27 + + arch/arm/boot/dts/nxp/imx/imx6ul-var-som-wifi.dtsi | 75 ++ + arch/arm/boot/dts/nxp/imx/imx6ul-var-som.dtsi | 219 +--- + arch/arm/boot/dts/nxp/imx/imx6ul.dtsi | 1 + + .../dts/nxp/imx/imx6ull-var-som-concerto-full.dts | 22 + + .../boot/dts/nxp/imx/imx6ull-var-som-concerto.dts | 21 + + arch/arm/boot/dts/nxp/imx/imx6ull-var-som.dtsi | 36 + + arch/arm64/boot/dts/freescale/Makefile | 20 +- + .../arm64/boot/dts/freescale/imx8mm-kontron-bl.dts | 10 +- + .../boot/dts/freescale/imx8mm-kontron-osm-s.dtsi | 7 +- + .../dts/freescale/imx8mm-verdin-nonwifi-zinnia.dts | 21 + + .../dts/freescale/imx8mm-verdin-wifi-zinnia.dts | 21 + + .../boot/dts/freescale/imx8mm-verdin-zinnia.dtsi | 383 +++++++ + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 16 +- + .../dts/freescale/imx8mn-vhip4-evalboard-v1.dts | 2 +- + .../dts/freescale/imx8mn-vhip4-evalboard-v2.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mp-ab2.dts | 2 +- + .../boot/dts/freescale/imx8mp-kontron-osm-s.dtsi | 7 +- + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 62 + + .../dts/freescale/imx8mp-verdin-nonwifi-zinnia.dts | 21 + + .../dts/freescale/imx8mp-verdin-wifi-zinnia.dts | 21 + + .../boot/dts/freescale/imx8mp-verdin-zinnia.dtsi | 422 +++++++ + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 14 +- + .../boot/dts/freescale/imx8qm-tqma8qm-mba8x.dts | 871 ++++++++++++++ + arch/arm64/boot/dts/freescale/imx8qm-tqma8qm.dtsi | 325 ++++++ + arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 66 ++ + arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx91-11x11-evk.dts | 1 - + arch/arm64/boot/dts/freescale/imx91-9x9-qsb.dts | 425 +++++++ + .../boot/dts/freescale/imx91-phyboard-segin.dts | 18 + + .../boot/dts/freescale/imx91-phycore-som.dtsi | 22 + + .../boot/dts/freescale/imx91-var-dart-sonata.dts | 9 + + .../boot/dts/freescale/imx91-var-som-symphony.dts | 527 +++++++++ + arch/arm64/boot/dts/freescale/imx91-var-som.dtsi | 456 ++++++++ + .../boot/dts/freescale/imx93-11x11-evk-common.dtsi | 1 - + arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts | 1 - + .../boot/dts/freescale/imx93-phyboard-nash.dts | 31 + + .../boot/dts/freescale/imx93-phyboard-segin.dts | 18 + + .../boot/dts/freescale/imx93-phycore-som.dtsi | 22 + + .../boot/dts/freescale/imx93-var-dart-sonata.dts | 654 +++++++++++ + arch/arm64/boot/dts/freescale/imx93-var-dart.dtsi | 461 ++++++++ + arch/arm64/boot/dts/freescale/imx94.dtsi | 88 ++ + arch/arm64/boot/dts/freescale/imx943-evk.dts | 83 ++ + arch/arm64/boot/dts/freescale/imx943.dtsi | 75 ++ + arch/arm64/boot/dts/freescale/imx95-15x15-ab2.dts | 669 +++++++++++ + .../boot/dts/freescale/imx95-toradex-smarc-dev.dts | 5 + + .../boot/dts/freescale/imx95-toradex-smarc.dtsi | 44 + + .../arm64/boot/dts/freescale/imx95-verdin-ivy.dtsi | 1 - + .../dts/freescale/imx95-verdin-nonwifi-zinnia.dts | 21 + + .../dts/freescale/imx95-verdin-wifi-zinnia.dts | 21 + + .../boot/dts/freescale/imx95-verdin-zinnia.dtsi | 429 +++++++ + arch/arm64/boot/dts/freescale/imx95-verdin.dtsi | 18 +- + arch/arm64/boot/dts/freescale/imx95.dtsi | 91 +- + arch/arm64/boot/dts/freescale/imx952.dtsi | 36 + + drivers/firmware/imx/Kconfig | 13 + + drivers/firmware/imx/Makefile | 2 + + drivers/firmware/imx/ele_base_msg.c | 298 +++++ + drivers/firmware/imx/ele_base_msg.h | 117 ++ + drivers/firmware/imx/ele_common.c | 373 ++++++ + drivers/firmware/imx/ele_common.h | 51 + + drivers/firmware/imx/se_ctrl.c | 1193 ++++++++++++++++++++ + drivers/firmware/imx/se_ctrl.h | 129 +++ + include/linux/firmware/imx/se_api.h | 14 + + include/uapi/linux/se_ioctl.h | 97 ++ + 80 files changed, 9963 insertions(+), 561 deletions(-) + create mode 100644 Documentation/ABI/testing/se-cdev + create mode 100644 Documentation/devicetree/bindings/firmware/fsl,imx-se.yaml + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ul-var-som-audio.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ul-var-som-common.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ul-var-som-concerto-common.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ul-var-som-concerto-full.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ul-var-som-enet1.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ul-var-som-enet2.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ul-var-som-lvds-panel.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ul-var-som-sd.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ul-var-som-wifi.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-var-som-concerto-full.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-var-som-concerto.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6ull-var-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-nonwifi-zinnia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-wifi-zinnia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-zinnia.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-zinnia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-zinnia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-zinnia.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-tqma8qm-mba8x.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-tqma8qm.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx91-9x9-qsb.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx91-var-som-symphony.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx91-var-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-var-dart-sonata.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93-var-dart.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx95-15x15-ab2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-nonwifi-zinnia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-wifi-zinnia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-zinnia.dtsi + create mode 100644 drivers/firmware/imx/ele_base_msg.c + create mode 100644 drivers/firmware/imx/ele_base_msg.h + create mode 100644 drivers/firmware/imx/ele_common.c + create mode 100644 drivers/firmware/imx/ele_common.h + create mode 100644 drivers/firmware/imx/se_ctrl.c + create mode 100644 drivers/firmware/imx/se_ctrl.h + create mode 100644 include/linux/firmware/imx/se_api.h + create mode 100644 include/uapi/linux/se_ioctl.h +Merging mediatek/for-next (e6490a169f6d Merge branch 'v7.0-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (ae4fe907b770 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (b6aefeea7b4a ARM: dts: dm8168-evm: Set stdout-path to uart3) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/ti/omap/am335x-sl50.dts | 4 ++-- + arch/arm/boot/dts/ti/omap/dm8168-evm.dts | 4 ++++ + arch/arm/boot/dts/ti/omap/motorola-cpcap-mapphone.dtsi | 6 +++++- + arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts | 4 ++-- + 4 files changed, 13 insertions(+), 5 deletions(-) +Merging qcom/for-next (ef5930fa9d5d Merge branches 'arm64-for-7.2' and 'clk-for-7.2' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 12 +- + .../bindings/clock/qcom,milos-gxclkctl.yaml | 61 + + .../bindings/net/bluetooth/qcom,wcn6855-bt.yaml | 7 +- + arch/arm64/boot/dts/qcom/Makefile | 2 + + arch/arm64/boot/dts/qcom/glymur.dtsi | 6 +- + arch/arm64/boot/dts/qcom/hamoa.dtsi | 77 +- + arch/arm64/boot/dts/qcom/ipq5424.dtsi | 4 +- + arch/arm64/boot/dts/qcom/kaanapali-mtp.dts | 27 + + arch/arm64/boot/dts/qcom/kaanapali-qrd.dts | 27 + + arch/arm64/boot/dts/qcom/kaanapali.dtsi | 154 +++ + .../boot/dts/qcom/lemans-evk-ifp-mezzanine.dtso | 74 + + arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi | 110 ++ + arch/arm64/boot/dts/qcom/lemans.dtsi | 289 +++- + arch/arm64/boot/dts/qcom/milos-fairphone-fp6.dts | 31 +- + .../boot/dts/qcom/milos-nothing-asteroids.dts | 964 +++++++++++++ + arch/arm64/boot/dts/qcom/milos.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmh0104-glymur.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcs615-ride.dts | 2 +- + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 22 + + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 2 +- + .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 2 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 2 +- + .../boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 2 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 27 + + arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 100 ++ + arch/arm64/boot/dts/qcom/sdm670.dtsi | 46 +- + .../qcom/sdm845-db845c-navigation-mezzanine.dtso | 5 + + arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi | 31 + + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 79 +- + .../boot/dts/qcom/sdm845-samsung-starqltechn.dts | 7 +- + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 62 +- + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 16 + + .../boot/dts/qcom/sdm845-xiaomi-beryllium-ebbg.dts | 2 +- + .../dts/qcom/sdm845-xiaomi-beryllium-tianma.dts | 2 +- + .../boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts | 94 ++ + arch/arm64/boot/dts/qcom/sm7325-motorola-dubai.dts | 1456 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 2 +- + arch/arm64/boot/dts/qcom/sm8750.dtsi | 8 + + arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi | 2 +- + .../boot/dts/qcom/x1p42100-asus-zenbook-a14.dtsi | 2 +- + drivers/clk/qcom/Makefile | 2 +- + drivers/clk/qcom/gxclkctl-kaanapali.c | 1 + + 43 files changed, 3684 insertions(+), 143 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,milos-gxclkctl.yaml + create mode 100644 arch/arm64/boot/dts/qcom/milos-nothing-asteroids.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm7325-motorola-dubai.dts +Merging renesas/next (4c19caa91a1e Merge branch 'renesas-drivers-for-v7.2' into renesas-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. + .../bindings/clock/renesas,cpg-clocks.yaml | 6 +- + .../soc/renesas/renesas,r8a78000-mfis.yaml | 187 +++++++++++ + arch/arm/boot/dts/renesas/r8a7740.dtsi | 116 ++++++- + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 1 + + arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 1 + + drivers/soc/renesas/Kconfig | 9 + + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r9a08g045-sysc.c | 41 ++- + drivers/soc/renesas/r9a08g046-sysc.c | 31 +- + drivers/soc/renesas/r9a09g047-sys.c | 42 +-- + drivers/soc/renesas/r9a09g056-sys.c | 41 ++- + drivers/soc/renesas/r9a09g057-sys.c | 52 ++-- + drivers/soc/renesas/rcar-mfis.c | 344 +++++++++++++++++++++ + drivers/soc/renesas/renesas-soc.c | 8 +- + include/dt-bindings/clock/r8a7740-clock.h | 2 + + include/dt-bindings/soc/renesas,r8a78000-mfis.h | 28 ++ + 21 files changed, 784 insertions(+), 131 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/renesas/renesas,r8a78000-mfis.yaml + create mode 100644 drivers/soc/renesas/rcar-mfis.c + create mode 100644 include/dt-bindings/soc/renesas,r8a78000-mfis.h +Merging reset/reset/next (d373605cd514 Merge tag 'reset-fixes-for-v7.0-2' into reset/next) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (d94923f66918 Merge branch 'v7.2-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + .../dts/rockchip/rk3288-veyron-analog-audio.dtsi | 2 - + arch/arm/boot/dts/rockchip/rk3288-veyron.dtsi | 5 + + arch/arm64/boot/dts/rockchip/px30-cobra.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/px30-ringneck.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 5 + + arch/arm64/boot/dts/rockchip/rk3528.dtsi | 8 + + arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3568-rock-3b.dts | 20 +- + .../boot/dts/rockchip/rk3576-100ask-dshanpi-a1.dts | 10 + + .../boot/dts/rockchip/rk3576-armsom-sige5.dts | 10 + + arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts | 9 + + arch/arm64/boot/dts/rockchip/rk3576-evb2-v10.dts | 9 + + .../boot/dts/rockchip/rk3576-khadas-edge-2l.dts | 538 +++++++++++++++++++++ + .../boot/dts/rockchip/rk3576-luckfox-core3576.dtsi | 22 +- + arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts | 9 + + .../arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts | 16 +- + arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts | 10 + + arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts | 10 + + arch/arm64/boot/dts/rockchip/rk3576.dtsi | 6 +- + .../boot/dts/rockchip/rk3588-armsom-sige7.dts | 11 + + arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts | 19 + + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 64 ++- + .../boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 18 +- + .../dts/rockchip/rk3588-coolpi-cm5-genbook.dts | 12 +- + .../arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 4 + + .../boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 20 + + arch/arm64/boot/dts/rockchip/rk3588-evb2-v10.dts | 11 + + arch/arm64/boot/dts/rockchip/rk3588-fet3588-c.dtsi | 1 + + .../dts/rockchip/rk3588-firefly-core-3588j.dtsi | 1 + + .../dts/rockchip/rk3588-firefly-icore-3588q.dtsi | 1 + + .../boot/dts/rockchip/rk3588-firefly-itx-3588j.dts | 12 + + .../rockchip/rk3588-friendlyelec-cm3588-nas.dts | 18 + + .../arm64/boot/dts/rockchip/rk3588-h96-max-v58.dts | 11 + + arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts | 24 +- + .../arm64/boot/dts/rockchip/rk3588-mnt-reform2.dts | 12 + + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 21 + + .../boot/dts/rockchip/rk3588-orangepi-5-max.dts | 18 +- + .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 20 + + .../boot/dts/rockchip/rk3588-orangepi-5-ultra.dts | 11 +- + .../arm64/boot/dts/rockchip/rk3588-orangepi-5.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk3588-roc-rt.dts | 19 + + arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 47 +- + .../boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi | 19 +- + .../boot/dts/rockchip/rk3588-tiger-haikou.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 20 +- + .../arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts | 1 + + .../arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 2 + + arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 16 + + arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts | 1 + + .../boot/dts/rockchip/rk3588s-gameforce-ace.dts | 15 +- + .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 13 +- + .../boot/dts/rockchip/rk3588s-khadas-edge2.dts | 15 +- + .../arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 11 + + arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts | 10 + + .../boot/dts/rockchip/rk3588s-orangepi-5.dtsi | 11 + + .../dts/rockchip/rk3588s-orangepi-cm5-base.dts | 12 +- + .../boot/dts/rockchip/rk3588s-orangepi-cm5.dtsi | 3 + + .../boot/dts/rockchip/rk3588s-radxa-cm5-io.dts | 10 + + arch/arm64/boot/dts/rockchip/rk3588s-roc-pc.dts | 17 +- + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 13 +- + arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 13 +- + drivers/clk/rockchip/clk-rk3588.c | 16 + + drivers/clk/rockchip/clk.c | 25 +- + drivers/clk/rockchip/clk.h | 3 + + include/dt-bindings/clock/rockchip,rk3588-cru.h | 4 + + include/soc/rockchip/rk3588_grf.h | 2 + + 69 files changed, 1241 insertions(+), 95 deletions(-) +Merging samsung-krzk/for-next (16d9141005c9 Merge branch 'next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm/mach-s3c/mach-crag6410.c | 24 ++++++++++++++++-------- + arch/arm64/boot/dts/exynos/exynos850.dtsi | 7 +++++++ + 2 files changed, 23 insertions(+), 8 deletions(-) +Merging scmi/for-linux-next (59d1f69a7944 Merge branches 'for-next/ffa/fixes' and 'for-next/scmi/updates' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + drivers/clk/clk-scmi.c | 48 +--- + drivers/firmware/arm_scmi/base.c | 10 +- + drivers/firmware/arm_scmi/clock.c | 301 ++++++++++++++++----- + drivers/firmware/arm_scmi/common.h | 2 +- + drivers/firmware/arm_scmi/driver.c | 98 ++++--- + drivers/firmware/arm_scmi/protocols.h | 13 +- + drivers/firmware/arm_scmi/quirks.c | 17 +- + .../firmware/arm_scmi/vendors/imx/imx-sm-misc.c | 86 ++++++ + drivers/firmware/imx/sm-misc.c | 73 +++++ + include/linux/scmi_imx_protocol.h | 14 + + include/linux/scmi_protocol.h | 35 ++- + 11 files changed, 521 insertions(+), 176 deletions(-) +Merging sophgo/for-next (9aa6068586a9 Merge branch 'dt/riscv' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sophgo/cv180x.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sophgo-soc/soc-for-next (c8754c7deab4 soc: sophgo: cv1800: rtcsys: New driver (handling RTC only)) +$ git merge -m Merge branch 'soc-for-next' of https://github.com/sophgo/linux.git sophgo-soc/soc-for-next +Already up to date. +Merging spacemit/for-next (c58077418542 riscv: dts: spacemit: define a SPI controller node) +$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/riscv/spacemit.yaml | 1 + + arch/riscv/boot/dts/spacemit/Makefile | 1 + + arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts | 9 +- + arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts | 217 +++++++++++++++++++++ + arch/riscv/boot/dts/spacemit/k1-pinctrl.dtsi | 20 ++ + arch/riscv/boot/dts/spacemit/k1.dtsi | 15 ++ + .../dts/spacemit/k3-deepcomputing-fml13v05.dts | 31 +++ + 7 files changed, 293 insertions(+), 1 deletion(-) + create mode 100644 arch/riscv/boot/dts/spacemit/k3-deepcomputing-fml13v05.dts +Merging stm32/stm32-next (515aa8b11884 arm64: defconfig: Enable STMicroelectronics STM32 display support) +$ git merge -m Merge branch 'stm32-next' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging drivers/bus/Kconfig +Auto-merging drivers/bus/Makefile +Recorded preimage for 'arch/arm64/configs/defconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/arm64/configs/defconfig'. +[master 1552243ad2de] Merge branch 'stm32-next' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git +$ git diff -M --stat --summary HEAD^.. + +Merging sunxi/sunxi/for-next (8245c3d4c671 Merge branches 'sunxi/drivers-for-7.2' and 'sunxi/dt-for-7.2' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + .../sram/allwinner,sun4i-a10-system-control.yaml | 5 +- + Documentation/devicetree/bindings/sram/sram.yaml | 1 + + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 28 ++- + drivers/soc/sunxi/sunxi_sram.c | 196 +++++++++++++-------- + 4 files changed, 151 insertions(+), 79 deletions(-) +Merging tee/next (31b40993bf57 Merge branches 'optee_fix_for_v7.0', 'tee_fix_for_v7.1', 'tee_shm_fix_for_v7.1' and 'optee_for_v7.2' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tee/next +Merge made by the 'ort' strategy. + drivers/tee/optee/call.c | 3 +- + drivers/tee/optee/optee_msg.h | 50 +++++++++------- + drivers/tee/optee/optee_private.h | 120 ++++++++++++++++++++------------------ + drivers/tee/optee/supp.c | 107 ++++++++++++++++++++++----------- + drivers/tee/tee_shm.c | 2 +- + include/uapi/linux/tee.h | 1 + + 6 files changed, 170 insertions(+), 113 deletions(-) +Merging tegra/for-next (20e4d2163a23 Merge branch for-7.2/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 9 +++++++++ + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 24 ++++++++++++++++++++---- + drivers/bus/tegra-aconnect.c | 14 ++++++-------- + 3 files changed, 35 insertions(+), 12 deletions(-) +Merging tenstorrent-dt/tenstorrent-dt-for-next (ad3cb8132313 riscv: dts: tenstorrent: Add PMU node to blackhole for Linux perf support) +$ git merge -m Merge branch 'tenstorrent-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-dt/tenstorrent-dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/tenstorrent/blackhole.dtsi | 48 ++++++++++++++++++++++++++ + 1 file changed, 48 insertions(+) +Merging thead-dt/thead-dt-for-next (74ec3d52c003 riscv: dts: thead: beaglev-ahead: enable HDMI output) +$ git merge -m Merge branch 'thead-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt/thead-dt-for-next +Already up to date. +Merging ti/ti-next (8933283eb5ce Merge branches 'ti-k3-dts-next' and 'ti-drivers-soc-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/ti/k3.yaml | 7 + + .../devicetree/bindings/hwinfo/ti,k3-socinfo.yaml | 11 + + arch/arm64/boot/dts/ti/Makefile | 5 + + arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 1 + + .../dts/ti/k3-am62-phyboard-lyra-oldi-lcd185.dtso | 185 ++++ + .../boot/dts/ti/k3-am625-tqma62xx-mba62xx.dts | 1033 ++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-am625-tqma62xx.dtsi | 360 +++++++ + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 2 + + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 24 +- + arch/arm64/boot/dts/ti/k3-j722s-mcu.dtsi | 15 + + arch/arm64/boot/dts/ti/k3-j722s-wakeup.dtsi | 18 + + arch/arm64/boot/dts/ti/k3-j722s.dtsi | 2 + + drivers/soc/ti/k3-socinfo.c | 41 +- + include/linux/soc/ti/knav_dma.h | 11 +- + 15 files changed, 1688 insertions(+), 28 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-am62-phyboard-lyra-oldi-lcd185.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am625-tqma62xx-mba62xx.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am625-tqma62xx.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j722s-mcu.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j722s-wakeup.dtsi +Merging xilinx/for-next (fdee7c66c0d7 soc: xilinx: Shutdown and free rx mailbox channel) +$ git merge -m Merge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + drivers/soc/xilinx/zynqmp_power.c | 47 +++++++++++++++++---------------------- + 1 file changed, 20 insertions(+), 27 deletions(-) +Merging socfpga/for-next (90d083b05f05 arm64: dts: socfpga: agilex5: update data-width for dmac) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git socfpga/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/altera.yaml | 6 ++ + arch/arm/boot/dts/intel/socfpga/socfpga.dtsi | 4 +- + .../boot/dts/intel/socfpga/socfpga_arria10.dtsi | 4 +- + arch/arm64/boot/dts/intel/Makefile | 1 + + .../arm64/boot/dts/intel/socfpga_agilex3_socdk.dts | 2 + + arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi | 4 +- + .../arm64/boot/dts/intel/socfpga_agilex5_socdk.dts | 2 + + .../boot/dts/intel/socfpga_agilex5_socdk_013b.dts | 2 + + .../dts/intel/socfpga_agilex5_socdk_modular.dts | 2 + + .../boot/dts/intel/socfpga_agilex5_socdk_nand.dts | 2 + + .../boot/dts/intel/socfpga_agilex7m_socdk.dts | 103 +++++++++++++++++++++ + 11 files changed, 124 insertions(+), 8 deletions(-) + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex7m_socdk.dts +Merging clk/clk-next (9781f9635d69 Merge branch 'clk-fixes' into clk-next) +$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/marvell,pxa1908.yaml | 34 ++++++--- + drivers/clk/bcm/clk-iproc-asiu.c | 27 +++----- + drivers/clk/clk-axi-clkgen.c | 5 +- + drivers/clk/clk-bulk.c | 14 ++-- + drivers/clk/clk-max77686.c | 32 ++++----- + drivers/clk/hisilicon/clk.c | 4 +- + drivers/clk/hisilicon/clkdivider-hi6220.c | 26 +++---- + drivers/clk/mediatek/clk-mt7988-infracfg.c | 80 ++++++++++------------ + drivers/clk/mediatek/clk-mt8192.c | 4 +- + drivers/clk/mediatek/clk-mux.h | 5 ++ + drivers/clk/mmp/clk-pxa1908-apbc.c | 58 ++++++++++++---- + drivers/clk/mmp/clk-pxa1908-apbcp.c | 31 ++++++++- + drivers/clk/mvebu/common.c | 21 +++--- + drivers/clk/nxp/clk-lpc18xx-ccu.c | 14 ++-- + drivers/clk/visconti/pll.c | 17 ++--- + include/linux/adi-axi-common.h | 2 + + 16 files changed, 210 insertions(+), 164 deletions(-) +Merging clk-imx/for-next (d16f57caa787 clk: imx8mq: Correct the CSI PHY sels) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (7f0c422c7fbf clk: renesas: cpg-mssr: Add number of clock cells check) +$ git merge -m Merge branch 'renesas-clk' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/clk-r8a7740.c | 2 + + drivers/clk/renesas/r9a08g046-cpg.c | 218 +++++++++++++++++++++++++++++++++ + drivers/clk/renesas/r9a09g047-cpg.c | 84 +++++++++++++ + drivers/clk/renesas/r9a09g077-cpg.c | 1 + + drivers/clk/renesas/renesas-cpg-mssr.c | 3 + + drivers/clk/renesas/rzg2l-cpg.c | 68 +++++++++- + drivers/clk/renesas/rzg2l-cpg.h | 11 +- + drivers/clk/renesas/rzv2h-cpg.c | 181 +++++++++++++++++++++++++++ + drivers/clk/renesas/rzv2h-cpg.h | 12 ++ + include/linux/clk/renesas.h | 20 +++ + 10 files changed, 595 insertions(+), 5 deletions(-) +Merging thead-clk/thead-clk-for-next (baf4fc7c03bd clk: thead: th1520-ap: Support CPU frequency scaling) +$ git merge -m Merge branch 'thead-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk/thead-clk-for-next +Already up to date. +Merging tenstorrent-clk/tenstorrent-clk-for-next (23c8ebc95284 clk: tenstorrent: Add Atlantis clock controller driver) +$ git merge -m Merge branch 'tenstorrent-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-clk/tenstorrent-clk-for-next +Already up to date. +Merging csky/linux-next (817d21578d51 csky: Remove compile warning for CONFIG_SMP) +$ git merge -m Merge branch 'linux-next' of https://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (5a873d77ba79 LoongArch: KVM: Move unconditional delay into timer clear scenery) +$ git merge -m Merge branch 'loongarch-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (0ad7ed2f5a29 drivers: dio: use tabs and avoid continuation logging in dio_init) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'ort' strategy. + drivers/dio/dio.c | 15 ++++++++------- + drivers/nubus/nubus.c | 19 ++++++++----------- + drivers/zorro/zorro-sysfs.c | 15 ++++++++------- + 3 files changed, 24 insertions(+), 25 deletions(-) +Merging m68knommu/for-next (b1ab4bea7704 m68k: coldfire: use ColdFire specifc IO access in SoC code) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/Kconfig.cpu | 1 + + arch/m68k/Kconfig.machine | 8 +-- + arch/m68k/coldfire/amcore.c | 4 +- + arch/m68k/coldfire/clk.c | 8 +-- + arch/m68k/coldfire/device.c | 8 +-- + arch/m68k/coldfire/dma_timer.c | 12 ++-- + arch/m68k/coldfire/intc-2.c | 30 ++++----- + arch/m68k/coldfire/intc-5249.c | 10 +-- + arch/m68k/coldfire/intc-525x.c | 12 ++-- + arch/m68k/coldfire/intc-5272.c | 20 +++--- + arch/m68k/coldfire/intc-simr.c | 38 +++++------ + arch/m68k/coldfire/intc.c | 28 ++++---- + arch/m68k/coldfire/m5206.c | 2 +- + arch/m68k/coldfire/m520x.c | 26 ++++---- + arch/m68k/coldfire/m523x.c | 12 ++-- + arch/m68k/coldfire/m5249.c | 16 ++--- + arch/m68k/coldfire/m525x.c | 12 ++-- + arch/m68k/coldfire/m5272.c | 16 ++--- + arch/m68k/coldfire/m527x.c | 40 +++++------ + arch/m68k/coldfire/m528x.c | 28 ++++---- + arch/m68k/coldfire/m5307.c | 2 +- + arch/m68k/coldfire/m53xx.c | 122 +++++++++++++++++----------------- + arch/m68k/coldfire/m5407.c | 2 +- + arch/m68k/coldfire/m5441x.c | 12 ++-- + arch/m68k/coldfire/m54xx.c | 18 ++--- + arch/m68k/coldfire/nettel.c | 16 ++--- + arch/m68k/coldfire/pci.c | 56 ++++++++-------- + arch/m68k/coldfire/pit.c | 20 +++--- + arch/m68k/coldfire/reset.c | 4 +- + arch/m68k/coldfire/sltimers.c | 18 ++--- + arch/m68k/coldfire/stmark2.c | 16 ++--- + arch/m68k/coldfire/timers.c | 30 ++++----- + arch/m68k/configs/m5208evb_defconfig | 9 +-- + arch/m68k/configs/m5249evb_defconfig | 9 +-- + arch/m68k/configs/m5272c3_defconfig | 9 +-- + arch/m68k/configs/m5275evb_defconfig | 9 +-- + arch/m68k/configs/m5307c3_defconfig | 10 +-- + arch/m68k/configs/m5329evb_defconfig | 61 +++++++++++++++++ + arch/m68k/configs/m5407c3_defconfig | 9 ++- + arch/m68k/configs/m54418evb_defconfig | 70 +++++++++++++++++++ + arch/m68k/configs/m5475evb_defconfig | 12 ++-- + arch/m68k/configs/nettel_defconfig | 56 ++++++++++++++++ + arch/m68k/configs/stmark2_defconfig | 33 +++++---- + arch/m68k/include/asm/io_no.h | 16 +++++ + arch/m68k/include/asm/mcfgpio.h | 12 ++-- + arch/m68k/include/asm/nettel.h | 4 +- + 46 files changed, 590 insertions(+), 376 deletions(-) + create mode 100644 arch/m68k/configs/m5329evb_defconfig + create mode 100644 arch/m68k/configs/m54418evb_defconfig + create mode 100644 arch/m68k/configs/nettel_defconfig +Merging microblaze/next (6de23f81a5e0 Linux 7.0-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'mips-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (0dfffa5479d6 openrisc: define arch-specific version of nop()) +$ git merge -m Merge branch 'for-next' of https://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (7fd2df204f34 Linux 7.1-rc2) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Already up to date. +Merging powerpc/next (7fd2df204f34 Linux 7.1-rc2) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging risc-v/for-next (f2abc305aa93 riscv: Define __riscv_copy_{,vec_}{words,bytes}_unaligned() using SYM_TYPED_FUNC_START) +$ git merge -m Merge branch 'for-next' of https://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 (48c7771b3c79 riscv: dts: microchip: fix pic64gx gpio interrupt-cells) +$ git merge -m Merge branch 'riscv-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Merge made by the 'ort' strategy. + .../riscv/boot/dts/microchip/mpfs-beaglev-fire.dts | 36 +++++++------ + arch/riscv/boot/dts/microchip/mpfs.dtsi | 6 +-- + .../boot/dts/microchip/pic64gx-curiosity-kit.dts | 63 +++++++++++++--------- + arch/riscv/boot/dts/microchip/pic64gx.dtsi | 46 ++++++++++++---- + 4 files changed, 95 insertions(+), 56 deletions(-) +Merging riscv-soc/riscv-soc-for-next (b5865650b209 Merge branch 'riscv-soc-drivers-for-next' into riscv-soc-for-next) +$ git merge -m Merge branch 'riscv-soc-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Auto-merging Documentation/devicetree/bindings/timer/sifive,clint.yaml +Merge made by the 'ort' strategy. + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../devicetree/bindings/riscv/canaan.yaml | 8 +- + .../soc/microchip/microchip,mpfs-irqmux.yaml | 6 +- + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + arch/riscv/boot/dts/canaan/Makefile | 2 + + arch/riscv/boot/dts/canaan/k230-canmv.dts | 332 +++++++++++++++++++++ + arch/riscv/boot/dts/canaan/k230-evb.dts | 28 ++ + arch/riscv/boot/dts/canaan/k230-pinctrl.h | 18 ++ + arch/riscv/boot/dts/canaan/k230.dtsi | 157 ++++++++++ + 9 files changed, 551 insertions(+), 2 deletions(-) + create mode 100644 arch/riscv/boot/dts/canaan/k230-canmv.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230-evb.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230-pinctrl.h + create mode 100644 arch/riscv/boot/dts/canaan/k230.dtsi +Merging s390/for-next (04c480a75a1e Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. + arch/s390/include/asm/sclp.h | 1 + + arch/s390/kernel/process.c | 3 --- + drivers/s390/char/sclp_pci.c | 1 + + drivers/s390/cio/device.c | 2 +- + 4 files changed, 3 insertions(+), 4 deletions(-) +Merging sh/for-next (b0aa5e4b087b sh: Fix fallout from ZERO_PAGE consolidation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (d844152d85cf sparc: remove unused variable strtab) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (84477867e122 tty: xtensa/iss: use strnlen to improve iss_console_write) +$ git merge -m Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/platforms/iss/console.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging fs-next (a873694dd37c Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 3 +- + Documentation/filesystems/f2fs.rst | 50 +- + Documentation/netlink/specs/nfsd.yaml | 229 +++++ + Documentation/netlink/specs/sunrpc_cache.yaml | 149 +++ + MAINTAINERS | 8 +- + drivers/mtd/ubi/ubi.h | 9 +- + fs/ceph/quota.c | 37 +- + fs/ceph/xattr.c | 17 + + fs/ecryptfs/keystore.c | 16 +- + fs/exfat/dir.c | 4 +- + fs/exfat/namei.c | 56 +- + fs/exfat/nls.c | 19 +- + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/compress.c | 2 + + fs/f2fs/data.c | 9 +- + fs/f2fs/dir.c | 2 + + fs/f2fs/f2fs.h | 3 + + fs/f2fs/file.c | 13 +- + fs/f2fs/inline.c | 3 + + fs/f2fs/inode.c | 24 +- + fs/f2fs/node.c | 8 + + fs/f2fs/recovery.c | 2 + + fs/f2fs/segment.c | 15 + + fs/f2fs/super.c | 33 + + fs/f2fs/sysfs.c | 2 + + fs/f2fs/verity.c | 2 + + fs/f2fs/xattr.c | 41 +- + fs/f2fs/xattr.h | 6 + + fs/fuse/Makefile | 3 +- + fs/fuse/args.h | 65 ++ + fs/fuse/backing.c | 1 + + fs/fuse/control.c | 16 +- + fs/fuse/cuse.c | 28 +- + fs/fuse/dev.c | 1253 +++++++++---------------- + fs/fuse/dev.h | 110 +++ + fs/fuse/dev_uring.c | 143 ++- + fs/fuse/dev_uring_i.h | 39 +- + fs/fuse/dir.c | 12 +- + fs/fuse/file.c | 146 +-- + fs/fuse/fuse_dev_i.h | 350 ++++++- + fs/fuse/fuse_i.h | 860 ++++++----------- + fs/fuse/fuse_trace.h | 4 +- + fs/fuse/inode.c | 263 ++---- + fs/fuse/notify.c | 434 +++++++++ + fs/fuse/poll.c | 141 +++ + fs/fuse/req.c | 99 ++ + fs/fuse/req_timeout.c | 148 +++ + fs/fuse/sysctl.c | 1 + + fs/fuse/sysctl.h | 9 + + fs/fuse/virtio_fs.c | 21 +- + fs/gfs2/quota.c | 36 +- + fs/gfs2/super.c | 1 + + fs/netfs/buffered_read.c | 9 +- + fs/netfs/buffered_write.c | 51 +- + fs/netfs/iterator.c | 13 +- + fs/netfs/misc.c | 8 +- + fs/netfs/read_retry.c | 11 +- + fs/nfs/dns_resolve.c | 2 +- + fs/nfsd/export.c | 713 +++++++++++++- + fs/nfsd/netlink.c | 93 ++ + fs/nfsd/netlink.h | 18 + + fs/nfsd/nfs4idmap.c | 4 +- + fs/nfsd/nfs4state.c | 9 +- + fs/nfsd/nfsctl.c | 79 ++ + fs/nfsd/nfsd.h | 17 +- + fs/ntfs/attrib.c | 23 +- + fs/ntfs/attrlist.c | 7 +- + fs/ntfs/bdev-io.c | 7 +- + fs/ntfs/index.c | 17 +- + fs/ntfs/inode.c | 6 +- + fs/ntfs/mft.c | 78 +- + fs/ntfs/runlist.c | 9 +- + fs/ntfs/super.c | 6 +- + fs/ntfs3/index.c | 45 +- + fs/ntfs3/lznt.c | 2 +- + fs/smb/client/cached_dir.c | 8 + + fs/smb/client/cifsacl.c | 37 +- + fs/smb/client/ioctl.c | 2 +- + fs/smb/client/smb2inode.c | 12 +- + fs/smb/client/smb2misc.c | 3 +- + fs/smb/client/smb2pdu.c | 23 +- + fs/smb/client/smb2transport.c | 35 +- + fs/xfs/libxfs/xfs_dir2_data.c | 18 +- + fs/xfs/libxfs/xfs_refcount.c | 3 +- + fs/xfs/scrub/common.c | 11 + + fs/xfs/scrub/common.h | 2 + + fs/xfs/scrub/dabtree.c | 7 +- + fs/xfs/scrub/dir.c | 7 +- + fs/xfs/xfs_inode.c | 6 - + fs/xfs/xfs_trans.c | 11 + + fs/xfs/xfs_zone_alloc.c | 2 +- + fs/xfs/xfs_zone_gc.c | 2 +- + include/linux/sunrpc/cache.h | 15 +- + include/trace/events/netfs.h | 5 + + include/uapi/linux/nfsd_netlink.h | 132 +++ + include/uapi/linux/sunrpc_netlink.h | 84 ++ + kernel/nsproxy.c | 2 +- + net/ceph/auth_x.c | 5 + + net/ceph/crush/crush.c | 6 +- + net/ceph/osdmap.c | 7 +- + net/sunrpc/Makefile | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 2 +- + net/sunrpc/cache.c | 127 ++- + net/sunrpc/netlink.c | 97 ++ + net/sunrpc/netlink.h | 35 + + net/sunrpc/sunrpc_syms.c | 10 + + net/sunrpc/svc_xprt.c | 46 +- + net/sunrpc/svcauth_unix.c | 516 +++++++++- + 108 files changed, 5299 insertions(+), 2155 deletions(-) + create mode 100644 Documentation/netlink/specs/sunrpc_cache.yaml + create mode 100644 fs/fuse/args.h + create mode 100644 fs/fuse/dev.h + create mode 100644 fs/fuse/notify.c + create mode 100644 fs/fuse/poll.c + create mode 100644 fs/fuse/req.c + create mode 100644 fs/fuse/req_timeout.c + create mode 100644 fs/fuse/sysctl.h + create mode 100644 include/uapi/linux/sunrpc_netlink.h + create mode 100644 net/sunrpc/netlink.c + create mode 100644 net/sunrpc/netlink.h +Merging printk/for-next (e56185668dc1 lib/vsprintf: Limit the returning size to INT_MAX) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. + lib/vsprintf.c | 51 +++++++++++++++++++++++++++------------------------ + 1 file changed, 27 insertions(+), 24 deletions(-) +Merging pci/next (e4715c055efc Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/setup-res.c +Merge made by the 'ort' strategy. + Documentation/PCI/pci.rst | 2 +- + Documentation/PCI/pciebus-howto.rst | 2 +- + .../bindings/pci/sophgo,sg2042-pcie-host.yaml | 3 + + arch/alpha/include/asm/pci.h | 13 +- + arch/alpha/kernel/pci-sysfs.c | 373 +++++++------ + arch/powerpc/include/asm/machdep.h | 2 +- + arch/powerpc/include/asm/pci.h | 2 - + arch/powerpc/kernel/pci-common.c | 2 +- + arch/powerpc/platforms/powernv/pci-sriov.c | 4 +- + arch/powerpc/platforms/powernv/pci.h | 5 +- + arch/powerpc/platforms/pseries/setup.c | 5 +- + drivers/misc/pci_endpoint_test.c | 6 +- + drivers/pci/Kconfig | 57 -- + drivers/pci/bus.c | 1 - + drivers/pci/controller/dwc/pci-imx6.c | 12 +- + drivers/pci/controller/dwc/pcie-al.c | 12 +- + .../pci/controller/dwc/pcie-designware-debugfs.c | 23 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 122 ++++- + drivers/pci/controller/dwc/pcie-designware.c | 7 +- + drivers/pci/controller/dwc/pcie-designware.h | 2 + + drivers/pci/controller/dwc/pcie-eswin.c | 3 +- + drivers/pci/controller/dwc/pcie-nxp-s32g.c | 3 +- + drivers/pci/controller/dwc/pcie-qcom-common.c | 40 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 6 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 8 +- + drivers/pci/controller/pci-host-common.c | 4 + + drivers/pci/controller/pci-mvebu.c | 3 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 3 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 86 ++- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 61 ++- + drivers/pci/endpoint/pci-ep-msi.c | 175 ++++++- + drivers/pci/endpoint/pci-epc-core.c | 80 +++ + drivers/pci/ide.c | 6 +- + drivers/pci/iov.c | 16 +- + drivers/pci/msi/msi.c | 11 +- + drivers/pci/p2pdma.c | 6 +- + drivers/pci/pci-driver.c | 10 +- + drivers/pci/pci-sysfs.c | 577 ++++++++++++--------- + drivers/pci/pci.c | 16 +- + drivers/pci/pci.h | 40 +- + drivers/pci/pcie/ptm.c | 3 +- + drivers/pci/probe.c | 6 - + drivers/pci/pwrctrl/core.c | 90 ++-- + drivers/pci/quirks.c | 55 +- + drivers/pci/rebar.c | 12 +- + drivers/pci/remove.c | 3 - + drivers/pci/setup-bus.c | 50 +- + drivers/pci/setup-cardbus.c | 5 +- + drivers/pci/setup-res.c | 37 ++ + drivers/pci/switch/switchtec.c | 16 + + drivers/pci/tph.c | 10 +- + include/linux/ioport.h | 2 +- + include/linux/pci-epc.h | 54 ++ + include/linux/pci-epf.h | 31 +- + include/linux/pci.h | 49 +- + include/linux/switchtec.h | 1 + + kernel/resource.c | 2 +- + 57 files changed, 1415 insertions(+), 820 deletions(-) +Merging pstore/for-next/pstore (24b8f8dcb9a1 pstore/ftrace: Factor KASLR offset in the core kernel instruction addresses) +$ git merge -m Merge branch 'for-next/pstore' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (2acc3b265f94 Merge branch 'for-7.1/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. + drivers/hid/hid-elan.c | 1 + + drivers/hid/hid-ft260.c | 16 +++++++- + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-lenovo-go-s.c | 44 ++++++++++++++++++++++ + drivers/hid/hid-sony.c | 15 +++----- + drivers/hid/hid-uclogic-core.c | 4 +- + .../intel-quickspi/quickspi-protocol.c | 4 +- + 7 files changed, 70 insertions(+), 15 deletions(-) +Merging i2c/i2c/for-next (3051cd060fa4 i2c: smbus: reject oversized block transfers in the common path) +$ git merge -m Merge branch 'i2c/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 1 + + .../bindings/i2c/amlogic,meson6-i2c.yaml | 13 ++++++++---- + .../devicetree/bindings/i2c/apple,i2c.yaml | 4 +++- + MAINTAINERS | 24 ++++++++++------------ + drivers/i2c/busses/i2c-stm32f7.c | 6 +++--- + drivers/i2c/i2c-core-acpi.c | 1 + + drivers/i2c/i2c-core-base.c | 3 +-- + drivers/i2c/i2c-core-smbus.c | 12 +++++++++++ + drivers/i2c/i2c-dev.c | 9 ++++---- + drivers/i2c/i2c-slave-testunit.c | 4 ++-- + drivers/i2c/i2c-stub.c | 5 +++++ + 11 files changed, 53 insertions(+), 29 deletions(-) +Merging i2c-host/i2c/i2c-host (beec6b0a30da i2c: designware: Use PM_RUNTIME_ACQUIRE()/PM_RUNTIME_ACQUIRE_ERR()) +$ git merge -m Merge branch 'i2c/i2c-host' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/loongson,ls2x-i2c.yaml | 4 + + MAINTAINERS | 1 + + drivers/i2c/busses/Kconfig | 11 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-designware-common.c | 4 +- + drivers/i2c/busses/i2c-ls2x-v2.c | 544 +++++++++++++++++++++ + 6 files changed, 563 insertions(+), 2 deletions(-) + create mode 100644 drivers/i2c/busses/i2c-ls2x-v2.c +Merging i2c-rust/rust-i2c-next (b388d1f9a51d MAINTAINERS: add Rust I2C tree and update Igor Korotin's email) +$ git merge -m Merge branch 'rust-i2c-next' of https://github.com/ikrtn/rust-for-linux i2c-rust/rust-i2c-next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging drivers/i2c/busses/Kconfig +Merge made by the 'ort' strategy. +Merging i3c/i3c/next (1d78a8fc97c1 i3c: dw-i3c-master: Fix IBI count register selection for versalnet) +$ git merge -m Merge branch 'i3c/next' of https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'ort' strategy. + drivers/i3c/master.c | 26 +++++++++++++------------- + drivers/i3c/master/dw-i3c-master.c | 21 ++++++++++++++++++++- + drivers/i3c/master/dw-i3c-master.h | 1 + + drivers/i3c/master/svc-i3c-master.c | 25 +++++++++++++++++++++---- + 4 files changed, 55 insertions(+), 18 deletions(-) +Merging dmi/dmi-for-next (1afafbaf749d firmware/dmi: Include product_family info to modalias) +$ git merge -m Merge branch 'dmi-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (3584b347030e hwmon: (pmbus/max20830) add driver for max20830) + 140a22453405 ("hwmon: (ads7871) Fix endianness bug in 16-bit register reads") + ccef20232ded ("hwmon: (lm75) Fix configuration register writes.") +$ git merge -m Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/ads7871.c +Auto-merging drivers/hwmon/lm75.c +CONFLICT (content): Merge conflict in drivers/hwmon/lm75.c +Recorded preimage for 'drivers/hwmon/lm75.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/hwmon/lm75.c'. +[master 5af2960f22e4] Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/hwmon/lm75.yaml | 7 + + .../bindings/hwmon/microchip,emc2305.yaml | 8 + + .../devicetree/bindings/hwmon/nsa320-mcu.txt | 20 - + .../bindings/hwmon/pmbus/adi,max20830.yaml | 66 ++++ + .../bindings/hwmon/zyxel,nsa320-mcu.yaml | 54 +++ + .../devicetree/bindings/trivial-devices.yaml | 4 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/hwmon/index.rst | 3 + + Documentation/hwmon/lm75.rst | 16 + + Documentation/hwmon/lx1308.rst | 90 +++++ + Documentation/hwmon/max20830.rst | 49 +++ + Documentation/hwmon/mp2985.rst | 147 ++++++++ + MAINTAINERS | 16 + + drivers/hwmon/ads7871.c | 108 +++--- + drivers/hwmon/applesmc.c | 2 +- + drivers/hwmon/cros_ec_hwmon.c | 2 +- + drivers/hwmon/emc2305.c | 54 ++- + drivers/hwmon/intel-m10-bmc-hwmon.c | 2 +- + drivers/hwmon/lm75.c | 25 +- + drivers/hwmon/mcp9982.c | 25 +- + drivers/hwmon/nsa320-hwmon.c | 2 +- + drivers/hwmon/pmbus/Kconfig | 28 ++ + drivers/hwmon/pmbus/Makefile | 3 + + drivers/hwmon/pmbus/lx1308.c | 204 +++++++++++ + drivers/hwmon/pmbus/max20830.c | 110 ++++++ + drivers/hwmon/pmbus/mp2985.c | 402 +++++++++++++++++++++ + 26 files changed, 1365 insertions(+), 84 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwmon/nsa320-mcu.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/adi,max20830.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/zyxel,nsa320-mcu.yaml + create mode 100644 Documentation/hwmon/lx1308.rst + create mode 100644 Documentation/hwmon/max20830.rst + create mode 100644 Documentation/hwmon/mp2985.rst + create mode 100644 drivers/hwmon/pmbus/lx1308.c + create mode 100644 drivers/hwmon/pmbus/max20830.c + create mode 100644 drivers/hwmon/pmbus/mp2985.c +Merging jc_docs/docs-next (709061c5d234 Merge branch 'mauro' into docs-mw) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'ort' strategy. + .../RCU/Design/Requirements/Requirements.rst | 6 +- + Documentation/RCU/listRCU.rst | 2 +- + Documentation/RCU/whatisRCU.rst | 4 +- + Documentation/admin-guide/binfmt-misc.rst | 8 +- + Documentation/admin-guide/kernel-parameters.txt | 16 +- + Documentation/block/data-integrity.rst | 2 +- + Documentation/core-api/kref.rst | 4 +- + Documentation/core-api/list.rst | 6 +- + Documentation/driver-api/eisa.rst | 2 + + Documentation/driver-api/mailbox.rst | 4 +- + Documentation/driver-api/media/v4l2-fh.rst | 2 +- + Documentation/filesystems/cramfs.rst | 22 ++- + Documentation/filesystems/proc.rst | 18 +-- + Documentation/gpu/drm-uapi.rst | 2 +- + Documentation/kernel-hacking/locking.rst | 4 +- + Documentation/locking/locktypes.rst | 4 +- + .../maintainer/maintainer-entry-profile.rst | 24 +-- + Documentation/process/coding-style.rst | 8 +- + Documentation/process/deprecated.rst | 13 +- + Documentation/process/maintainer-handbooks.rst | 17 +-- + Documentation/process/maintainers.rst | 2 + + Documentation/scheduler/sched-deadline.rst | 2 +- + .../sound/kernel-api/writing-an-alsa-driver.rst | 12 +- + Documentation/sphinx/maintainers_include.py | 165 +++++++++++++++++---- + Documentation/spi/spi-summary.rst | 4 +- + Documentation/staging/crc32.rst | 2 +- + Documentation/staging/lzo.rst | 2 +- + Documentation/staging/remoteproc.rst | 2 +- + Documentation/staging/static-keys.rst | 2 +- + Documentation/trace/histogram-design.rst | 2 +- + Documentation/trace/rv/monitor_sched.rst | 7 +- + .../translations/it_IT/kernel-hacking/locking.rst | 4 +- + .../translations/it_IT/locking/locktypes.rst | 4 +- + .../translations/it_IT/process/coding-style.rst | 2 +- + .../ja_JP/process/submitting-patches.rst | 127 +++++++++++++++- + .../pt_BR/process/maintainer-handbooks.rst | 1 + + .../translations/sp_SP/process/coding-style.rst | 2 +- + Documentation/translations/zh_CN/core-api/kref.rst | 4 +- + .../translations/zh_CN/process/coding-style.rst | 2 +- + .../zh_CN/video4linux/v4l2-framework.txt | 2 +- + .../translations/zh_TW/process/coding-style.rst | 2 +- + Documentation/watchdog/mlx-wdt.rst | 4 +- + Documentation/watchdog/pcwd-watchdog.rst | 19 ++- + Documentation/watchdog/watchdog-api.rst | 38 ++--- + Documentation/watchdog/watchdog-kernel-api.rst | 20 ++- + Documentation/watchdog/watchdog-parameters.rst | 11 +- + fs/cramfs/README | 92 +----------- + tools/lib/python/kdoc/xforms_lists.py | 1 + + 48 files changed, 427 insertions(+), 278 deletions(-) +Merging v4l-dvb/next (bc1ba628e37c media: v4l2-subdev: Allow accessing routes with STREAMS client capability) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/amdisp4-1.rst | 63 ++ + Documentation/admin-guide/media/amdisp4.dot | 6 + + Documentation/admin-guide/media/v4l-drivers.rst | 1 + + .../media/allwinner,sun4i-a10-video-engine.yaml | 10 + + .../devicetree/bindings/media/renesas,fcp.yaml | 4 + + .../devicetree/bindings/media/renesas,vsp1.yaml | 2 + + .../bindings/media/rockchip,rk3568-mipi-csi2.yaml | 11 +- + Documentation/driver-api/media/camera-sensor.rst | 2 +- + Documentation/driver-api/media/tx-rx.rst | 3 +- + .../media/v4l/ext-ctrls-codec-stateless.rst | 2 +- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 6 + + .../media/v4l/ext-ctrls-image-process.rst | 5 +- + MAINTAINERS | 25 + + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 6 + + drivers/media/cec/platform/seco/seco-cec.c | 6 +- + drivers/media/common/videobuf2/videobuf2-core.c | 12 +- + drivers/media/dvb-frontends/rtl2832.c | 4 +- + drivers/media/i2c/Kconfig | 12 +- + drivers/media/i2c/dw9719.c | 10 + + drivers/media/i2c/imx219.c | 45 +- + drivers/media/i2c/imx274.c | 38 - + drivers/media/i2c/imx334.c | 93 -- + drivers/media/i2c/imx335.c | 87 -- + drivers/media/i2c/imx412.c | 82 -- + drivers/media/i2c/ov9282.c | 67 -- + drivers/media/i2c/tvp514x.c | 55 +- + drivers/media/pci/cx23885/cx23885-core.c | 14 +- + drivers/media/pci/dm1105/dm1105.c | 8 +- + drivers/media/pci/intel/ipu6/ipu6-isys-dwc-phy.c | 24 +- + drivers/media/pci/mgb4/mgb4_vin.c | 8 +- + drivers/media/pci/mgb4/mgb4_vout.c | 8 +- + drivers/media/pci/saa7134/saa7134-video.c | 25 +- + drivers/media/pci/solo6x10/Kconfig | 1 - + drivers/media/platform/Kconfig | 1 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/amd/Kconfig | 3 + + drivers/media/platform/amd/Makefile | 3 + + drivers/media/platform/amd/isp4/Kconfig | 15 + + drivers/media/platform/amd/isp4/Makefile | 10 + + drivers/media/platform/amd/isp4/isp4.c | 240 +++++ + drivers/media/platform/amd/isp4/isp4.h | 20 + + drivers/media/platform/amd/isp4/isp4_debug.c | 271 +++++ + drivers/media/platform/amd/isp4/isp4_debug.h | 41 + + drivers/media/platform/amd/isp4/isp4_fw_cmd_resp.h | 318 ++++++ + drivers/media/platform/amd/isp4/isp4_hw_reg.h | 124 +++ + drivers/media/platform/amd/isp4/isp4_interface.c | 838 ++++++++++++++++ + drivers/media/platform/amd/isp4/isp4_interface.h | 144 +++ + drivers/media/platform/amd/isp4/isp4_subdev.c | 1047 ++++++++++++++++++++ + drivers/media/platform/amd/isp4/isp4_subdev.h | 127 +++ + drivers/media/platform/amd/isp4/isp4_video.c | 797 +++++++++++++++ + drivers/media/platform/amd/isp4/isp4_video.h | 57 ++ + drivers/media/platform/aspeed/aspeed-video.c | 1 + + .../platform/chips-media/wave5/wave5-helper.c | 4 +- + .../platform/chips-media/wave5/wave5-helper.h | 2 +- + .../media/platform/chips-media/wave5/wave5-hw.c | 7 +- + .../platform/chips-media/wave5/wave5-vpu-dec.c | 47 +- + .../platform/chips-media/wave5/wave5-vpu-enc.c | 73 +- + .../platform/chips-media/wave5/wave5-vpuapi.h | 2 + + drivers/media/platform/marvell/cafe-driver.c | 1 + + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 3 +- + drivers/media/platform/nuvoton/npcm-video.c | 34 +- + drivers/media/platform/nvidia/tegra-vde/Kconfig | 1 + + .../platform/rockchip/rkvdec/rkvdec-bitwriter.h | 39 + + .../platform/rockchip/rkvdec/rkvdec-h264-common.c | 51 +- + .../platform/rockchip/rkvdec/rkvdec-h264-common.h | 40 +- + .../media/platform/rockchip/rkvdec/rkvdec-h264.c | 109 +- + .../platform/rockchip/rkvdec/rkvdec-hevc-common.c | 93 +- + .../platform/rockchip/rkvdec/rkvdec-hevc-common.h | 57 +- + .../media/platform/rockchip/rkvdec/rkvdec-hevc.c | 171 ++-- + .../platform/rockchip/rkvdec/rkvdec-vdpu383-h264.c | 337 +++---- + .../platform/rockchip/rkvdec/rkvdec-vdpu383-hevc.c | 502 +++++----- + drivers/media/platform/st/stm32/stm32-dcmi.c | 1 + + .../media/platform/synopsys/hdmirx/snps_hdmirx.c | 4 +- + drivers/media/platform/ti/davinci/vpif_capture.c | 2 +- + drivers/media/platform/ti/vpe/vip.c | 16 +- + drivers/media/platform/ti/vpe/vpe.c | 3 +- + drivers/media/platform/verisilicon/hantro_hw.h | 1 - + drivers/media/platform/verisilicon/hantro_v4l2.c | 6 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 11 +- + drivers/media/rc/imon_raw.c | 18 +- + drivers/media/rc/ir_toy.c | 23 +- + drivers/media/rc/mceusb.c | 2 + + drivers/media/test-drivers/vidtv/vidtv_bridge.c | 4 +- + drivers/media/test-drivers/vidtv/vidtv_mux.c | 8 +- + drivers/media/test-drivers/vimc/vimc-core.c | 1 + + drivers/media/test-drivers/vivid/vivid-core.c | 6 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 16 +- + drivers/media/usb/em28xx/em28xx-video.c | 4 +- + drivers/media/usb/gspca/gspca.c | 17 +- + drivers/media/usb/gspca/sonixb.c | 2 +- + drivers/media/usb/hdpvr/hdpvr-core.c | 26 +- + drivers/media/usb/s2255/s2255drv.c | 12 +- + drivers/media/v4l2-core/v4l2-common.c | 14 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 13 + + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 2 + + drivers/media/v4l2-core/v4l2-ctrls-request.c | 14 +- + drivers/media/v4l2-core/v4l2-subdev.c | 43 +- + drivers/staging/media/av7110/av7110.c | 49 +- + drivers/staging/media/av7110/av7110.h | 4 +- + drivers/staging/media/av7110/av7110_av.c | 89 +- + drivers/staging/media/av7110/av7110_ca.c | 3 +- + drivers/staging/media/av7110/av7110_hw.c | 46 - + drivers/staging/media/av7110/av7110_hw.h | 71 +- + drivers/staging/media/av7110/av7110_ir.c | 4 +- + drivers/staging/media/av7110/av7110_v4l.c | 22 +- + drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h | 78 +- + .../staging/media/ipu7/abi/ipu7_fw_common_abi.h | 4 +- + drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h | 12 +- + drivers/staging/media/ipu7/ipu7-buttress-regs.h | 10 +- + drivers/staging/media/ipu7/ipu7.c | 22 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 5 +- + drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 3 + + drivers/staging/media/tegra-video/tegra210.c | 3 +- + include/media/videobuf2-core.h | 8 +- + include/uapi/linux/v4l2-controls.h | 2 + + 115 files changed, 5333 insertions(+), 1747 deletions(-) + create mode 100644 Documentation/admin-guide/media/amdisp4-1.rst + create mode 100644 Documentation/admin-guide/media/amdisp4.dot + create mode 100644 drivers/media/platform/amd/Kconfig + create mode 100644 drivers/media/platform/amd/Makefile + create mode 100644 drivers/media/platform/amd/isp4/Kconfig + create mode 100644 drivers/media/platform/amd/isp4/Makefile + create mode 100644 drivers/media/platform/amd/isp4/isp4.c + create mode 100644 drivers/media/platform/amd/isp4/isp4.h + create mode 100644 drivers/media/platform/amd/isp4/isp4_debug.c + create mode 100644 drivers/media/platform/amd/isp4/isp4_debug.h + create mode 100644 drivers/media/platform/amd/isp4/isp4_fw_cmd_resp.h + create mode 100644 drivers/media/platform/amd/isp4/isp4_hw_reg.h + create mode 100644 drivers/media/platform/amd/isp4/isp4_interface.c + create mode 100644 drivers/media/platform/amd/isp4/isp4_interface.h + create mode 100644 drivers/media/platform/amd/isp4/isp4_subdev.c + create mode 100644 drivers/media/platform/amd/isp4/isp4_subdev.h + create mode 100644 drivers/media/platform/amd/isp4/isp4_video.c + create mode 100644 drivers/media/platform/amd/isp4/isp4_video.h + create mode 100644 drivers/media/platform/rockchip/rkvdec/rkvdec-bitwriter.h +Merging v4l-dvb-next/master (adc218676eef Linux 6.12) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (3d6ebd026be6 Merge branch 'pm-tools' into linux-next) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + tools/power/pm-graph/sleepgraph.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (bcb8889c4981 cpufreq: qcom-cpufreq-hw: Fix possible double free) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + drivers/cpufreq/Kconfig.arm | 2 +- + drivers/cpufreq/amd-pstate.c | 26 ++++++++++---------------- + drivers/cpufreq/apple-soc-cpufreq.c | 6 ++---- + drivers/cpufreq/qcom-cpufreq-hw.c | 1 - + 4 files changed, 13 insertions(+), 22 deletions(-) +Merging cpupower/cpupower (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'cpupower' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (218ef5b34474 PM / devfreq: event: rockchip-dfi: Fix missing clk_disable_unprepare() on error) +$ git merge -m Merge branch 'devfreq-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/devfreq-event.c | 23 ++++++++++++--------- + drivers/devfreq/devfreq.c | 40 ++---------------------------------- + drivers/devfreq/event/rockchip-dfi.c | 4 +++- + 3 files changed, 18 insertions(+), 49 deletions(-) +Merging pmdomain/next (ec1fcddb3117 pmdomain: mediatek: fix use-after-free in scpsys_get_bus_protection_legacy()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Already up to date. +Merging opp/opp/linux-next (f5e1cc9a284b OPP: Fix race between OPP addition and lookup) +$ git merge -m Merge branch 'opp/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Merge made by the 'ort' strategy. + drivers/opp/core.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging thermal/thermal/linux-next (bf746e2a41ef thermal: renesas: rzg3e: Remove stale @trim_offset kernel-doc entry) +$ git merge -m Merge branch 'thermal/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging rdma/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/main (6a4c4656b0d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 +- + Documentation/arch/m68k/kernel-options.rst | 24 +- + Documentation/driver-api/dpll.rst | 38 +- + Documentation/netlink/specs/dpll.yaml | 31 + + .../device_drivers/ethernet/cirrus/cs89x0.rst | 647 ---------- + .../networking/device_drivers/ethernet/index.rst | 1 - + .../networking/net_cachelines/tcp_sock.rst | 10 +- + Documentation/networking/smc-sysctl.rst | 8 +- + Documentation/networking/tcp_ao.rst | 38 +- + MAINTAINERS | 2 +- + drivers/atm/solos-pci.c | 4 +- + drivers/dpll/dpll_netlink.c | 27 + + drivers/dpll/dpll_nl.c | 3 +- + drivers/dpll/dpll_nl.h | 2 +- + drivers/dpll/zl3073x/dpll.c | 108 +- + drivers/dpll/zl3073x/regs.h | 9 +- + drivers/gpio/gpio-ath79.c | 57 +- + drivers/infiniband/hw/mlx5/counters.c | 4 +- + drivers/infiniband/hw/mlx5/ib_rep.c | 6 +- + drivers/infiniband/sw/rxe/rxe_net.c | 6 +- + drivers/infiniband/sw/rxe/rxe_ns.c | 4 +- + drivers/net/Kconfig | 7 - + drivers/net/Makefile | 1 - + drivers/net/Space.c | 237 ---- + drivers/net/amt.c | 80 +- + drivers/net/bareudp.c | 51 +- + drivers/net/dsa/mv88e6xxx/chip.c | 24 +- + drivers/net/dsa/mv88e6xxx/chip.h | 4 - + drivers/net/dsa/mv88e6xxx/port.c | 55 +- + drivers/net/dsa/mv88e6xxx/port.h | 11 +- + drivers/net/dsa/ocelot/felix.c | 3 +- + drivers/net/dsa/sja1105/sja1105_main.c | 3 +- + drivers/net/dsa/yt921x.c | 507 +++++++- + drivers/net/dsa/yt921x.h | 87 +- + drivers/net/dummy.c | 6 +- + drivers/net/ethernet/8390/Kconfig | 1 - + drivers/net/ethernet/8390/ne.c | 237 +++- + drivers/net/ethernet/airoha/airoha_eth.c | 23 +- + drivers/net/ethernet/airoha/airoha_eth.h | 6 +- + drivers/net/ethernet/airoha/airoha_ppe.c | 15 +- + drivers/net/ethernet/cirrus/Kconfig | 20 +- + drivers/net/ethernet/cirrus/cs89x0.c | 636 +-------- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 9 +- + drivers/net/ethernet/intel/i40e/i40e_register.h | 10 + + drivers/net/ethernet/intel/ice/ice_dpll.c | 2 +- + drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 +- + drivers/net/ethernet/intel/ice/ice_fw_update.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_e610.c | 73 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_e610.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 244 +++- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 30 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 2 + + drivers/net/ethernet/intel/ixgbe/ixgbe_type_e610.h | 32 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 301 ++++- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 42 + + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 4 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 7 +- + .../net/ethernet/mellanox/mlx5/core/esw/ipsec.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 66 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 13 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 331 ++++- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 169 ++- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h | 5 + + .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 18 +- + .../net/ethernet/mellanox/mlx5/core/lib/devcom.c | 8 + + .../net/ethernet/mellanox/mlx5/core/lib/devcom.h | 1 + + .../mellanox/mlx5/core/lib/ipsec_fs_roce.c | 10 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 7 + + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 3 + + .../net/ethernet/mellanox/mlx5/core/sf/devlink.c | 5 + + .../mellanox/mlx5/core/sf/mlx5_ifc_vhca_event.h | 8 - + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 7 +- + .../mellanox/mlx5/core/steering/hws/vport.c | 2 +- + drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 1 + + drivers/net/ethernet/meta/fbnic/fbnic_mdio.c | 135 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 3 + + drivers/net/ethernet/microsoft/mana/mana_bpf.c | 2 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 67 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 2 +- + drivers/net/ethernet/qualcomm/Kconfig | 4 +- + drivers/net/ethernet/realtek/rtase/rtase.h | 4 + + drivers/net/ethernet/realtek/rtase/rtase_main.c | 3 + + drivers/net/ethernet/wiznet/Kconfig | 59 +- + drivers/net/ethernet/wiznet/Makefile | 4 +- + drivers/net/ethernet/wiznet/w5100-spi.c | 2 +- + drivers/net/ethernet/wiznet/w5100.c | 412 +----- + drivers/net/ethernet/wiznet/w5100.h | 3 +- + drivers/net/ethernet/wiznet/w5300.c | 687 ---------- + drivers/net/geneve.c | 54 +- + drivers/net/gtp.c | 10 +- + drivers/net/mdio/Kconfig | 2 +- + drivers/net/ovpn/udp.c | 2 +- + drivers/net/pfcp.c | 17 +- + drivers/net/phy/aquantia/aquantia_main.c | 6 +- + drivers/net/phy/realtek/realtek_main.c | 172 ++- + drivers/net/ppp/Kconfig | 6 + + drivers/net/ppp/Makefile | 6 +- + drivers/net/ppp/pppoe.c | 12 +- + drivers/net/usb/r8152.c | 368 +++++- + drivers/net/vxlan/vxlan_core.c | 62 +- + drivers/net/vxlan/vxlan_multicast.c | 8 +- + drivers/net/wireguard/socket.c | 8 +- + drivers/net/wireless/ath/ath12k/ahb.c | 25 +- + drivers/net/wireless/ath/ath12k/core.c | 6 + + drivers/net/wireless/ath/ath12k/dp_htt.c | 2 +- + drivers/net/wireless/ath/ath12k/dp_htt.h | 2 +- + drivers/net/wireless/ath/ath12k/htc.h | 8 +- + drivers/net/wireless/ath/ath12k/wifi7/hal_rx.h | 1 - + drivers/net/wireless/ath/ath12k/wmi.c | 217 ++-- + drivers/net/wireless/ath/ath12k/wmi.h | 3 + + drivers/net/wireless/ath/ath6kl/cfg80211.c | 3 +- + drivers/net/wireless/ath/ath9k/hw.c | 33 +- + drivers/net/wireless/ath/ath9k/hw.h | 3 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 3 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 4 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.h | 3 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mld/iface.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 10 +- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 4 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 4 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 3 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 4 +- + drivers/net/wireless/realtek/rtw89/fw.c | 2 +- + drivers/net/wireless/virtual/Makefile | 2 + + drivers/net/wireless/virtual/mac80211_hwsim_i.h | 168 +++ + .../{mac80211_hwsim.c => mac80211_hwsim_main.c} | 974 +++++++------- + drivers/net/wireless/virtual/mac80211_hwsim_nan.c | 1346 ++++++++++++++++++++ + drivers/net/wireless/virtual/mac80211_hwsim_nan.h | 102 ++ + drivers/net/wwan/Kconfig | 4 +- + include/linux/dpll.h | 6 + + include/linux/ieee80211-eht.h | 129 +- + include/linux/ieee80211-uhr.h | 55 +- + include/linux/ieee80211.h | 1 + + include/linux/igmp.h | 167 ++- + include/linux/mlx5/driver.h | 9 +- + include/linux/mlx5/eswitch.h | 8 +- + include/linux/mlx5/mlx5_ifc.h | 73 +- + include/linux/mlx5/vport.h | 4 +- + include/linux/net/intel/libie/adminq.h | 1 + + include/linux/netdevice.h | 1 - + include/linux/platform_data/wiznet.h | 23 - + include/linux/tcp.h | 40 +- + include/net/Space.h | 7 - + include/net/act_api.h | 4 +- + include/net/amt.h | 2 +- + include/net/cfg80211.h | 276 +++- + include/net/dsa.h | 3 +- + include/net/mac80211.h | 74 +- + include/net/mana/mana.h | 2 +- + include/net/mld.h | 187 ++- + include/net/sch_generic.h | 15 +- + include/net/tcp.h | 52 +- + include/net/tcp_ao.h | 74 +- + include/net/udp_tunnel.h | 14 +- + include/net/vxlan.h | 5 +- + include/uapi/linux/dpll.h | 23 + + include/uapi/linux/mdio.h | 10 + + include/uapi/linux/nl80211.h | 303 ++++- + net/bridge/br_arp_nd_proxy.c | 16 +- + net/bridge/br_multicast.c | 22 +- + net/dsa/user.c | 2 +- + net/ipv4/Kconfig | 8 +- + net/ipv4/Makefile | 1 - + net/ipv4/fou_core.c | 21 +- + net/ipv4/igmp.c | 6 +- + net/ipv4/tcp.c | 22 +- + net/ipv4/tcp_ao.c | 669 +++++----- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_output.c | 22 +- + net/ipv4/tcp_sigpool.c | 366 ------ + net/ipv4/udp_tunnel_core.c | 23 +- + net/ipv6/ip6_udp_tunnel.c | 6 +- + net/ipv6/ip6mr.c | 22 +- + net/ipv6/mcast.c | 19 +- + net/ipv6/tcp_ao.c | 131 +- + net/l2tp/l2tp_core.c | 2 +- + net/mac80211/Makefile | 2 +- + net/mac80211/ap.c | 207 +++ + net/mac80211/cfg.c | 213 +++- + net/mac80211/chan.c | 168 ++- + net/mac80211/debugfs.c | 47 +- + net/mac80211/eht.c | 179 +-- + net/mac80211/he.c | 9 +- + net/mac80211/ht.c | 59 +- + net/mac80211/ibss.c | 3 + + net/mac80211/ieee80211_i.h | 56 +- + net/mac80211/iface.c | 62 +- + net/mac80211/main.c | 7 +- + net/mac80211/mesh_plink.c | 3 + + net/mac80211/mlme.c | 604 +++++---- + net/mac80211/nan.c | 126 ++ + net/mac80211/ocb.c | 5 +- + net/mac80211/offchannel.c | 13 +- + net/mac80211/parse.c | 3 + + net/mac80211/rate.c | 4 +- + net/mac80211/rx.c | 33 +- + net/mac80211/sta_info.c | 294 ++++- + net/mac80211/sta_info.h | 16 +- + net/mac80211/status.c | 9 +- + net/mac80211/tdls.c | 24 +- + net/mac80211/trace.h | 14 +- + net/mac80211/tx.c | 20 +- + net/mac80211/uhr.c | 5 +- + net/mac80211/util.c | 34 +- + net/mac80211/vht.c | 350 +---- + net/mctp/test/route-test.c | 6 - + net/netlink/af_netlink.c | 21 +- + net/psp/psp_main.c | 21 +- + net/rxrpc/local_object.c | 2 +- + net/sched/act_api.c | 2 +- + net/sched/act_bpf.c | 2 +- + net/sched/act_ife.c | 12 +- + net/sched/act_mpls.c | 2 +- + net/sched/act_police.c | 4 +- + net/sched/act_skbedit.c | 2 +- + net/sched/act_skbmod.c | 2 +- + net/sched/sch_api.c | 148 ++- + net/sched/sch_cake.c | 2 +- + net/sched/sch_fq_codel.c | 2 +- + net/sched/sch_gred.c | 2 +- + net/sched/sch_taprio.c | 42 +- + net/sctp/protocol.c | 10 +- + net/smc/smc_core.c | 4 + + net/tipc/udp_media.c | 32 +- + net/tls/tls_device.c | 11 +- + net/vmw_vsock/af_vsock.c | 16 +- + net/wireless/chan.c | 124 +- + net/wireless/core.c | 57 +- + net/wireless/core.h | 5 +- + net/wireless/mlme.c | 11 +- + net/wireless/nl80211.c | 626 +++++++-- + net/wireless/nl80211.h | 5 +- + net/wireless/pmsr.c | 190 ++- + net/wireless/rdev-ops.h | 26 +- + net/wireless/reg.c | 3 + + net/wireless/sme.c | 1 + + net/wireless/trace.h | 38 +- + net/wireless/util.c | 29 +- + net/wireless/wext-compat.c | 3 +- + tools/testing/selftests/drivers/net/.gitignore | 1 + + tools/testing/selftests/drivers/net/Makefile | 2 + + tools/testing/selftests/drivers/net/config | 2 + + tools/testing/selftests/drivers/net/gro.py | 10 + + tools/testing/selftests/drivers/net/hw/gro_hw.py | 10 + + tools/testing/selftests/drivers/net/hw/iou-zcrx.py | 12 + + tools/testing/selftests/drivers/net/hw/ntuple.py | 5 +- + tools/testing/selftests/drivers/net/hw/rss_ctx.py | 98 +- + .../selftests/drivers/net/lib/py/__init__.py | 5 +- + .../selftests/{ => drivers}/net/so_txtime.c | 25 +- + tools/testing/selftests/drivers/net/so_txtime.py | 96 ++ + tools/testing/selftests/net/.gitignore | 1 - + tools/testing/selftests/net/Makefile | 3 +- + .../selftests/net/forwarding/bridge_vlan_mcast.sh | 140 +- + tools/testing/selftests/net/getsockopt_iter.c | 213 ++++ + tools/testing/selftests/net/lib/py/__init__.py | 4 +- + tools/testing/selftests/net/lib/py/utils.py | 51 +- + .../net/packetdrill/tcp_syncookies_ip4_9k.pkt | 37 + + .../net/packetdrill/tcp_syncookies_ip6_9k.pkt | 36 + + tools/testing/selftests/net/rds/README.txt | 30 +- + tools/testing/selftests/net/rds/run.sh | 74 +- + tools/testing/selftests/net/rds/settings | 2 +- + tools/testing/selftests/net/rds/test.py | 110 +- + tools/testing/selftests/net/so_txtime.sh | 110 -- + tools/testing/selftests/net/tcp_ao/config | 4 - + .../testing/selftests/net/tcp_ao/key-management.c | 41 +- + .../selftests/net/test_bridge_neigh_suppress.sh | 126 ++ + 271 files changed, 10818 insertions(+), 6939 deletions(-) + delete mode 100644 Documentation/networking/device_drivers/ethernet/cirrus/cs89x0.rst + delete mode 100644 drivers/net/Space.c + delete mode 100644 drivers/net/ethernet/wiznet/w5300.c + create mode 100644 drivers/net/wireless/virtual/mac80211_hwsim_i.h + rename drivers/net/wireless/virtual/{mac80211_hwsim.c => mac80211_hwsim_main.c} (91%) + create mode 100644 drivers/net/wireless/virtual/mac80211_hwsim_nan.c + create mode 100644 drivers/net/wireless/virtual/mac80211_hwsim_nan.h + delete mode 100644 include/linux/platform_data/wiznet.h + delete mode 100644 include/net/Space.h + delete mode 100644 net/ipv4/tcp_sigpool.c + create mode 100644 net/mac80211/ap.c + rename tools/testing/selftests/{ => drivers}/net/so_txtime.c (96%) + create mode 100755 tools/testing/selftests/drivers/net/so_txtime.py + create mode 100644 tools/testing/selftests/net/getsockopt_iter.c + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_syncookies_ip4_9k.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_syncookies_ip6_9k.pkt + delete mode 100755 tools/testing/selftests/net/so_txtime.sh +Merging bpf-next/for-next (9f5b3ffc3f1d selftests/bpf: Rename libarena malloc/free methods) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging include/linux/bpf.h +Auto-merging kernel/events/core.c +Merge made by the 'ort' strategy. + Documentation/bpf/btf.rst | 6 +- + arch/s390/net/bpf_jit_comp.c | 37 + + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 8 +- + fs/bpf_fs_kfuncs.c | 2 +- + fs/verity/measure.c | 4 +- + include/linux/bpf.h | 63 +- + include/linux/bpf_verifier.h | 72 +- + include/linux/btf.h | 4 +- + include/linux/cnum.h | 82 + + include/linux/filter.h | 5 +- + include/linux/trace_events.h | 6 + + include/trace/bpf_probe.h | 2 - + include/uapi/linux/btf.h | 26 +- + kernel/bpf/Makefile | 2 +- + kernel/bpf/btf.c | 29 +- + kernel/bpf/cnum.c | 120 + + kernel/bpf/cnum_defs.h | 247 +++ + kernel/bpf/core.c | 4 +- + kernel/bpf/helpers.c | 36 +- + kernel/bpf/log.c | 24 +- + kernel/bpf/states.c | 11 +- + kernel/bpf/syscall.c | 5 + + kernel/bpf/trampoline.c | 1 - + kernel/bpf/verifier.c | 2318 ++++++++------------ + kernel/events/core.c | 9 + + kernel/trace/bpf_trace.c | 70 +- + kernel/trace/trace_syscalls.c | 108 +- + lib/test_bpf.c | 363 ++- + net/bpf/test_run.c | 65 +- + tools/bpf/bpftool/btf.c | 17 +- + tools/bpf/bpftool/btf_dumper.c | 4 +- + tools/bpf/bpftool/gen.c | 16 +- + tools/include/uapi/linux/btf.h | 26 +- + tools/lib/bpf/btf.c | 54 +- + tools/lib/bpf/btf.h | 2 +- + tools/lib/bpf/btf_dump.c | 24 +- + tools/lib/bpf/libbpf.c | 97 +- + tools/lib/bpf/relo_core.c | 16 +- + tools/testing/selftests/bpf/.gitignore | 1 - + tools/testing/selftests/bpf/Makefile | 56 +- + tools/testing/selftests/bpf/bpf_arena_alloc.h | 2 +- + tools/testing/selftests/bpf/bpf_arena_list.h | 2 +- + tools/testing/selftests/bpf/bpf_arena_strsearch.h | 2 +- + tools/testing/selftests/bpf/bpf_experimental.h | 84 +- + tools/testing/selftests/bpf/bpf_kfuncs.h | 8 +- + tools/testing/selftests/bpf/default.profraw | Bin 0 -> 160 bytes + tools/testing/selftests/bpf/libarena/Makefile | 92 + + .../bpf/{ => libarena/include}/bpf_arena_common.h | 0 + .../include}/bpf_arena_spin_lock.h | 11 +- + .../bpf/{ => libarena/include}/bpf_atomic.h | 4 +- + .../selftests/bpf/libarena/include/bpf_may_goto.h | 84 + + .../selftests/bpf/libarena/include/libarena/asan.h | 103 + + .../bpf/libarena/include/libarena/buddy.h | 92 + + .../bpf/libarena/include/libarena/common.h | 94 + + .../bpf/libarena/include/libarena/userspace.h | 132 ++ + .../bpf/libarena/selftests/st_asan_buddy.bpf.c | 258 +++ + .../bpf/libarena/selftests/st_asan_common.h | 52 + + .../bpf/libarena/selftests/st_buddy.bpf.c | 209 ++ + .../bpf/libarena/selftests/test_progs_compat.h | 15 + + .../testing/selftests/bpf/libarena/src/asan.bpf.c | 553 +++++ + .../testing/selftests/bpf/libarena/src/buddy.bpf.c | 903 ++++++++ + .../selftests/bpf/libarena/src/common.bpf.c | 52 + + .../selftests/bpf/prog_tests/arena_spin_lock.c | 7 - + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 22 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 8 +- + .../selftests/bpf/prog_tests/btf_dedup_split.c | 51 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 4 +- + tools/testing/selftests/bpf/prog_tests/cb_refs.c | 2 +- + .../selftests/bpf/prog_tests/cgrp_local_storage.c | 15 +- + .../testing/selftests/bpf/prog_tests/ctx_rewrite.c | 17 +- + .../testing/selftests/bpf/prog_tests/file_reader.c | 22 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 2 +- + tools/testing/selftests/bpf/prog_tests/libarena.c | 66 + + .../selftests/bpf/prog_tests/libarena_asan.c | 93 + + .../testing/selftests/bpf/prog_tests/linked_list.c | 4 +- + .../testing/selftests/bpf/prog_tests/reg_bounds.c | 90 +- + .../bpf/prog_tests/sleepable_tracepoints.c | 142 ++ + .../selftests/bpf/prog_tests/task_local_storage.c | 1 + + tools/testing/selftests/bpf/progs/arena_atomics.c | 2 +- + .../testing/selftests/bpf/progs/arena_spin_lock.c | 2 +- + .../selftests/bpf/progs/cgrp_kfunc_failure.c | 14 +- + .../selftests/bpf/progs/cgrp_ls_sleepable.c | 18 + + .../selftests/bpf/progs/compute_live_registers.c | 2 +- + .../testing/selftests/bpf/progs/cpumask_failure.c | 10 +- + .../testing/selftests/bpf/progs/cpumask_success.c | 2 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 22 +- + tools/testing/selftests/bpf/progs/dynptr_success.c | 6 +- + .../testing/selftests/bpf/progs/file_reader_fail.c | 4 +- + tools/testing/selftests/bpf/progs/irq.c | 4 +- + tools/testing/selftests/bpf/progs/iters.c | 6 +- + .../selftests/bpf/progs/iters_state_safety.c | 14 +- + tools/testing/selftests/bpf/progs/iters_testmod.c | 4 +- + .../selftests/bpf/progs/iters_testmod_seq.c | 4 +- + tools/testing/selftests/bpf/progs/lpm_trie_bench.c | 2 +- + tools/testing/selftests/bpf/progs/map_kptr_fail.c | 2 +- + .../selftests/bpf/progs/percpu_alloc_fail.c | 4 +- + tools/testing/selftests/bpf/progs/rbtree_fail.c | 6 +- + .../selftests/bpf/progs/refcounted_kptr_fail.c | 2 +- + tools/testing/selftests/bpf/progs/stream.c | 2 +- + tools/testing/selftests/bpf/progs/stream_fail.c | 2 +- + .../selftests/bpf/progs/task_kfunc_failure.c | 18 +- + .../selftests/bpf/progs/task_local_storage.c | 19 + + tools/testing/selftests/bpf/progs/task_work_fail.c | 6 +- + .../testing/selftests/bpf/progs/test_bpf_nf_fail.c | 8 +- + .../selftests/bpf/progs/test_kfunc_dynptr_param.c | 11 +- + .../bpf/progs/test_kfunc_param_nullable.c | 2 +- + .../bpf/progs/test_sleepable_tracepoints.c | 112 + + .../bpf/progs/test_sleepable_tracepoints_fail.c | 18 + + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 13 +- + tools/testing/selftests/bpf/progs/verifier_arena.c | 2 +- + .../selftests/bpf/progs/verifier_arena_globals1.c | 2 +- + .../selftests/bpf/progs/verifier_arena_globals2.c | 2 +- + .../selftests/bpf/progs/verifier_arena_large.c | 2 +- + .../selftests/bpf/progs/verifier_bits_iter.c | 4 +- + .../testing/selftests/bpf/progs/verifier_bounds.c | 116 +- + .../selftests/bpf/progs/verifier_bpf_fastcall.c | 24 +- + tools/testing/selftests/bpf/progs/verifier_ldsx.c | 2 +- + .../selftests/bpf/progs/verifier_may_goto_1.c | 12 +- + .../selftests/bpf/progs/verifier_ref_tracking.c | 6 +- + tools/testing/selftests/bpf/progs/verifier_sdiv.c | 64 +- + .../testing/selftests/bpf/progs/verifier_subreg.c | 6 +- + .../selftests/bpf/progs/verifier_vfs_reject.c | 8 +- + tools/testing/selftests/bpf/progs/wq_failures.c | 2 +- + tools/testing/selftests/bpf/progs/xdp_flowtable.c | 7 +- + tools/testing/selftests/bpf/progs/xdping_kern.c | 183 -- + tools/testing/selftests/bpf/test_loader.c | 51 +- + tools/testing/selftests/bpf/test_progs.c | 2 +- + tools/testing/selftests/bpf/test_progs.h | 2 + + tools/testing/selftests/bpf/test_xdping.sh | 103 - + tools/testing/selftests/bpf/uprobe_multi.c | 4 +- + tools/testing/selftests/bpf/verifier/calls.c | 14 +- + tools/testing/selftests/bpf/verifier/sleepable.c | 17 +- + tools/testing/selftests/bpf/xdping.c | 254 --- + tools/testing/selftests/bpf/xdping.h | 13 - + 134 files changed, 5812 insertions(+), 2771 deletions(-) + create mode 100644 include/linux/cnum.h + create mode 100644 kernel/bpf/cnum.c + create mode 100644 kernel/bpf/cnum_defs.h + create mode 100644 tools/testing/selftests/bpf/default.profraw + create mode 100644 tools/testing/selftests/bpf/libarena/Makefile + rename tools/testing/selftests/bpf/{ => libarena/include}/bpf_arena_common.h (100%) + rename tools/testing/selftests/bpf/{progs => libarena/include}/bpf_arena_spin_lock.h (98%) + rename tools/testing/selftests/bpf/{ => libarena/include}/bpf_atomic.h (98%) + create mode 100644 tools/testing/selftests/bpf/libarena/include/bpf_may_goto.h + create mode 100644 tools/testing/selftests/bpf/libarena/include/libarena/asan.h + create mode 100644 tools/testing/selftests/bpf/libarena/include/libarena/buddy.h + create mode 100644 tools/testing/selftests/bpf/libarena/include/libarena/common.h + create mode 100644 tools/testing/selftests/bpf/libarena/include/libarena/userspace.h + create mode 100644 tools/testing/selftests/bpf/libarena/selftests/st_asan_buddy.bpf.c + create mode 100644 tools/testing/selftests/bpf/libarena/selftests/st_asan_common.h + create mode 100644 tools/testing/selftests/bpf/libarena/selftests/st_buddy.bpf.c + create mode 100644 tools/testing/selftests/bpf/libarena/selftests/test_progs_compat.h + create mode 100644 tools/testing/selftests/bpf/libarena/src/asan.bpf.c + create mode 100644 tools/testing/selftests/bpf/libarena/src/buddy.bpf.c + create mode 100644 tools/testing/selftests/bpf/libarena/src/common.bpf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/libarena.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/libarena_asan.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/sleepable_tracepoints.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sleepable_tracepoints.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sleepable_tracepoints_fail.c + delete mode 100644 tools/testing/selftests/bpf/progs/xdping_kern.c + delete mode 100755 tools/testing/selftests/bpf/test_xdping.sh + delete mode 100644 tools/testing/selftests/bpf/xdping.c + delete mode 100644 tools/testing/selftests/bpf/xdping.h +$ git am -3 ../patches/0001-perf-Fixup-for-btf_vlan-API-change.patch +Applying: perf: Fixup for btf_vlan() API change +$ git reset HEAD^ +Unstaged changes after reset: +M tools/perf/builtin-trace.c +M tools/perf/util/btf.c +$ git add -A . +$ git commit -v -a --amend +[master 8f1c46492b2d] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git + Date: Fri May 8 13:10:02 2026 +0200 +Merging ipsec-next/master (a77d172177f3 xfrm: cleanup error path in xfrm_add_policy()) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Auto-merging net/xfrm/xfrm_user.c +Merge made by the 'ort' strategy. + net/xfrm/xfrm_user.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging mlx5-next/mlx5-next (02c54621e81c net/mlx5: Extend query_esw_functions output for multi-function support) +$ git merge -m Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/main (09942ddedcb9 ppp: add PPPOX symbol) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (09942ddedcb9 ppp: add PPPOX symbol) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (6911f19876fb Bluetooth: HIDP: serialise l2cap_unregister_user via hidp_session_sem) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging arch/arm/configs/pxa_defconfig +Auto-merging drivers/bluetooth/btintel_pcie.c +Auto-merging drivers/bluetooth/btintel_pcie.h +Auto-merging drivers/bluetooth/btmtk.c +Merge made by the 'ort' strategy. + arch/arm/configs/pxa_defconfig | 3 - + arch/arm/configs/spitz_defconfig | 3 - + arch/loongarch/configs/loongson32_defconfig | 3 - + arch/loongarch/configs/loongson64_defconfig | 3 - + arch/mips/configs/mtx1_defconfig | 3 - + arch/powerpc/configs/ppc6xx_defconfig | 3 - + drivers/bluetooth/Kconfig | 42 +- + drivers/bluetooth/Makefile | 3 - + drivers/bluetooth/bluecard_cs.c | 908 ---------------------------- + drivers/bluetooth/bt3c_cs.c | 749 ----------------------- + drivers/bluetooth/btintel.c | 10 +- + drivers/bluetooth/btintel.h | 7 + + drivers/bluetooth/btintel_pcie.c | 203 ++++++- + drivers/bluetooth/btintel_pcie.h | 7 + + drivers/bluetooth/btmtk.c | 23 + + drivers/bluetooth/btmtk.h | 7 + + drivers/bluetooth/btrtl.c | 13 + + drivers/bluetooth/btusb.c | 11 + + drivers/bluetooth/dtl1_cs.c | 614 ------------------- + net/bluetooth/6lowpan.c | 25 +- + net/bluetooth/Kconfig | 6 +- + net/bluetooth/smp.c | 180 ++---- + 22 files changed, 335 insertions(+), 2491 deletions(-) + delete mode 100644 drivers/bluetooth/bluecard_cs.c + delete mode 100644 drivers/bluetooth/bt3c_cs.c + delete mode 100644 drivers/bluetooth/dtl1_cs.c +Merging wireless-next/for-next (6a4c4656b0d2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging ath-next/for-next (e12d2d3983ac wifi: ath12k: add thermal cooling device support) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Auto-merging drivers/net/wireless/ath/ath12k/core.c +Auto-merging drivers/net/wireless/ath/ath12k/dp_rx.c +Auto-merging drivers/net/wireless/ath/ath12k/mac.c +Auto-merging drivers/net/wireless/ath/ath12k/wmi.c +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath10k/qmi.c | 2 +- + drivers/net/wireless/ath/ath10k/qmi_wlfw_v01.h | 1 - + drivers/net/wireless/ath/ath11k/Kconfig | 2 +- + drivers/net/wireless/ath/ath11k/mhi.c | 4 +- + drivers/net/wireless/ath/ath11k/pci.c | 8 + + drivers/net/wireless/ath/ath11k/qmi.c | 2 +- + drivers/net/wireless/ath/ath11k/qmi.h | 1 - + drivers/net/wireless/ath/ath12k/Kconfig | 6 +- + drivers/net/wireless/ath/ath12k/core.c | 50 ++-- + drivers/net/wireless/ath/ath12k/dp_rx.c | 57 +++-- + drivers/net/wireless/ath/ath12k/mac.c | 38 ++-- + drivers/net/wireless/ath/ath12k/qmi.c | 2 +- + drivers/net/wireless/ath/ath12k/qmi.h | 1 - + drivers/net/wireless/ath/ath12k/thermal.c | 252 ++++++++++++++++++--- + drivers/net/wireless/ath/ath12k/thermal.h | 35 +++ + drivers/net/wireless/ath/ath12k/wmi.c | 140 ++++++++++-- + drivers/net/wireless/ath/ath12k/wmi.h | 52 ++++- + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 6 +- + .../net/wireless/ath/ath9k/ath9k_pci_owl_loader.c | 31 +-- + drivers/net/wireless/ath/ath9k/common-init.c | 8 +- + drivers/net/wireless/ath/ath9k/init.c | 11 +- + drivers/net/wireless/ath/ath9k/recv.c | 4 +- + drivers/net/wireless/ath/ath9k/xmit.c | 7 +- + 23 files changed, 541 insertions(+), 179 deletions(-) +Merging iwlwifi-next/next (709503c4a210 wifi: iwlwifi: mvm: fix race condition in PTP removal) + 1d6907cbb502 ("wifi: iwlwifi: mld: fix race condition in PTP removal") + 709503c4a210 ("wifi: iwlwifi: mvm: fix race condition in PTP removal") +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi-next/next +Merge made by the 'ort' strategy. +Merging wpan-next/master (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Merge made by the 'ort' strategy. + net/ieee802154/core.c | 49 ++++++++++++++++++++++++++++--------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) +Merging wpan-staging/staging (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'staging' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (87eee18f2974 mtd: sm_ftl: allocate cis_buffer with main struct) +$ git merge -m Merge branch 'mtd/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + drivers/mtd/mtdoops.c | 7 +++---- + drivers/mtd/mtdsuper.c | 8 ++++---- + drivers/mtd/nand/raw/Kconfig | 2 +- + drivers/mtd/sm_ftl.c | 30 +++++++++++------------------- + drivers/mtd/sm_ftl.h | 2 +- + 5 files changed, 20 insertions(+), 29 deletions(-) +Merging nand/nand/next (9e3997d3ab66 mtd: spinand: Prevent continuous reads on some controllers) +$ git merge -m Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + drivers/mtd/nand/spi/core.c | 147 ++++++++++++------- + drivers/mtd/nand/spi/winbond.c | 317 ++++++++++++++++++++++++++++++++--------- + drivers/mtd/spi-nor/core.c | 22 +-- + drivers/spi/spi-airoha-snfi.c | 6 +- + drivers/spi/spi-aspeed-smc.c | 4 +- + drivers/spi/spi-intel.c | 6 +- + drivers/spi/spi-mem.c | 32 ++++- + drivers/spi/spi-mxic.c | 18 +-- + drivers/spi/spi-npcm-fiu.c | 16 +-- + drivers/spi/spi-rpc-if.c | 8 +- + drivers/spi/spi-stm32-ospi.c | 6 +- + drivers/spi/spi-stm32-qspi.c | 6 +- + drivers/spi/spi-wpcm-fiu.c | 2 +- + include/linux/mtd/spinand.h | 16 ++- + include/linux/spi/spi-mem.h | 12 +- + 15 files changed, 446 insertions(+), 172 deletions(-) +Merging spi-nor/spi-nor/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'spi-nor/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (f7dd32c5179d crypto: asymmetric_keys - fix OOB read in pefile_digest_pe_contents) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Merge made by the 'ort' strategy. + Documentation/crypto/api-samples.rst | 2 +- + Documentation/crypto/userspace-if.rst | 76 +- + .../devicetree/bindings/crypto/qcom,prng.yaml | 1 + + .../devicetree/bindings/crypto/qcom-qce.yaml | 3 + + Documentation/devicetree/bindings/rng/mtk-rng.yaml | 43 +- + .../devicetree/bindings/trivial-devices.yaml | 4 +- + arch/m68k/configs/amiga_defconfig | 2 - + arch/m68k/configs/apollo_defconfig | 2 - + arch/m68k/configs/atari_defconfig | 2 - + arch/m68k/configs/bvme6000_defconfig | 2 - + arch/m68k/configs/hp300_defconfig | 2 - + arch/m68k/configs/mac_defconfig | 2 - + arch/m68k/configs/multi_defconfig | 2 - + arch/m68k/configs/mvme147_defconfig | 2 - + arch/m68k/configs/mvme16x_defconfig | 2 - + arch/m68k/configs/q40_defconfig | 2 - + arch/m68k/configs/sun3_defconfig | 2 - + arch/m68k/configs/sun3x_defconfig | 2 - + arch/mips/configs/decstation_64_defconfig | 2 - + arch/mips/configs/decstation_defconfig | 2 - + arch/mips/configs/decstation_r4k_defconfig | 2 - + crypto/Kconfig | 109 +- + crypto/asymmetric_keys/Kconfig | 1 - + crypto/asymmetric_keys/verify_pefile.c | 2 + + crypto/authencesn.c | 33 +- + crypto/crypto_null.c | 35 +- + crypto/df_sp80090a.c | 8 +- + crypto/drbg.c | 1852 ++++---------------- + crypto/ecrdsa.c | 2 +- + crypto/testmgr.c | 149 +- + crypto/testmgr.h | 1264 +++++-------- + drivers/char/hw_random/mtk-rng.c | 125 +- + drivers/crypto/allwinner/Kconfig | 2 - + drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c | 8 + + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 12 + + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 12 + + drivers/crypto/atmel-ecc.c | 3 + + drivers/crypto/atmel-sha204a.c | 27 +- + drivers/crypto/caam/caamalg.c | 12 +- + drivers/crypto/caam/caamalg_qi.c | 12 +- + drivers/crypto/caam/caamalg_qi2.c | 12 +- + drivers/crypto/caam/caamhash.c | 4 +- + drivers/crypto/caam/key_gen.c | 4 +- + drivers/crypto/ccp/psp-dev.c | 12 +- + drivers/crypto/ccp/sev-dev.c | 23 +- + drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c | 25 +- + .../crypto/intel/qat/qat_common/adf_common_drv.h | 1 - + .../intel/qat/qat_common/adf_heartbeat_inject.c | 6 +- + .../crypto/intel/qat/qat_common/adf_hw_arbiter.c | 25 - + drivers/crypto/marvell/cesa/cesa.c | 11 +- + drivers/crypto/marvell/cesa/cesa.h | 42 +- + drivers/crypto/omap-aes.c | 43 +- + drivers/crypto/omap-des.c | 26 +- + drivers/crypto/omap-sham.c | 27 +- + drivers/crypto/starfive/jh7110-cryp.c | 17 +- + drivers/crypto/xilinx/xilinx-trng.c | 1 - + include/crypto/df_sp80090a.h | 25 + + include/crypto/drbg.h | 263 --- + include/crypto/internal/drbg.h | 54 - + tools/testing/crypto/chacha20-s390/test-cipher.c | 1 - + 60 files changed, 1230 insertions(+), 3219 deletions(-) + delete mode 100644 include/crypto/drbg.h + delete mode 100644 include/crypto/internal/drbg.h +Merging libcrypto/libcrypto-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Already up to date. +Merging drm/drm-next (f96538285cfd Merge tag 'drm-misc-next-2026-05-07' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next) + 0d831487b5be ("drm/amdgpu: nuke amdgpu_userq_fence_slab v2") + 1b1101a46a42 ("drm/amdgpu/gfx9: drop unnecessary 64-bit fence flag check in KIQ") + 1db15ba8f72f ("drm/amdgpu/pm: add missing revision check for CI") + 1fc6c8ab45db ("drm/amdgpu/userq: fix access to stale wptr mapping") + 4d8dcc143115 ("drm/radeon: add missing revision check for CI") + 9649528b637f ("drm/amdgpu/pm: align Hawaii mclk workaround with radeon") + b90250bd933a ("drm/amdgpu/sdma4: replace BUG_ON with WARN_ON in fence emission") + bfaf87e84ca3 ("drm/xe/hdcp: Add NULL check for media_gt in intel_hdcp_gsc_check_status()") + c1a3ff1d3278 ("drm/amdkfd: Make all TLB-flushes heavy-weight") + d12d05c4bc4c ("drm/amdkfd: Check if there are kfd porcesses using adev by kfd_processes_count") + d9af8263b82b ("drm/amdgpu: zero-initialize GART table on allocation") +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/gpu/drm-uapi.rst +Auto-merging MAINTAINERS +Auto-merging drivers/accel/ivpu/ivpu_drv.c +Auto-merging drivers/accel/qaic/qaic_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_userqueue.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_sched.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/panel/Kconfig +Auto-merging drivers/gpu/drm/panel/panel-himax-hx83102.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c +Auto-merging drivers/gpu/drm/tiny/bochs.c +Auto-merging drivers/gpu/drm/xe/xe_guc_ads.c +Auto-merging drivers/gpu/drm/xe/xe_lrc.c +Merge made by the 'ort' strategy. + Documentation/ABI/obsolete/sysfs-driver-ivpu | 30 + + Documentation/ABI/testing/sysfs-driver-ivpu | 65 + + Documentation/accel/amdxdna/amdnpu.rst | 25 + + .../bindings/display/bridge/lvds-codec.yaml | 1 + + .../bindings/display/bridge/simple-bridge.yaml | 1 + + .../bindings/display/bridge/waveshare,dsi2dpi.yaml | 9 +- + .../display/panel/chipwealth,ch13726a.yaml | 67 + + .../bindings/display/panel/focaltech,ota7290b.yaml | 70 + + .../bindings/display/panel/himax,hx83102.yaml | 2 + + .../bindings/display/panel/himax,hx8394.yaml | 2 + + .../bindings/display/panel/ilitek,ili9881c.yaml | 2 + + .../bindings/display/panel/jadard,jd9365da-h3.yaml | 6 + + .../bindings/display/panel/novatek,nt35532.yaml | 80 + + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 32 + + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/gpu/amdgpu/amdgpu-glossary.rst | 9 +- + Documentation/gpu/drm-kms.rst | 14 +- + Documentation/gpu/drm-ras.rst | 8 + + Documentation/gpu/drm-uapi.rst | 4 + + Documentation/gpu/drm-usage-stats.rst | 1 + + Documentation/gpu/komeda-kms.rst | 8 +- + Documentation/gpu/todo.rst | 23 - + Documentation/gpu/xe/index.rst | 1 + + Documentation/gpu/xe/xe_gt_stats.rst | 11 + + Documentation/netlink/specs/drm_ras.yaml | 13 +- + MAINTAINERS | 13 +- + drivers/accel/amdxdna/Makefile | 12 +- + drivers/accel/amdxdna/aie.c | 119 + + drivers/accel/amdxdna/aie.h | 111 + + drivers/accel/amdxdna/aie2_ctx.c | 86 +- + drivers/accel/amdxdna/aie2_error.c | 17 +- + drivers/accel/amdxdna/aie2_message.c | 229 +- + drivers/accel/amdxdna/aie2_msg_priv.h | 41 +- + drivers/accel/amdxdna/aie2_pci.c | 234 +- + drivers/accel/amdxdna/aie2_pci.h | 117 +- + drivers/accel/amdxdna/aie2_pm.c | 22 +- + drivers/accel/amdxdna/aie2_psp.c | 161 - + drivers/accel/amdxdna/aie2_smu.c | 156 - + drivers/accel/amdxdna/aie2_solver.c | 10 +- + drivers/accel/amdxdna/aie4_message.c | 27 + + drivers/accel/amdxdna/aie4_msg_priv.h | 49 + + drivers/accel/amdxdna/aie4_pci.c | 483 + + drivers/accel/amdxdna/aie4_pci.h | 53 + + drivers/accel/amdxdna/aie4_sriov.c | 88 + + drivers/accel/amdxdna/aie_psp.c | 235 + + drivers/accel/amdxdna/aie_smu.c | 153 + + drivers/accel/amdxdna/amdxdna_cbuf.c | 280 + + drivers/accel/amdxdna/amdxdna_cbuf.h | 18 + + drivers/accel/amdxdna/amdxdna_ctx.c | 3 +- + drivers/accel/amdxdna/amdxdna_ctx.h | 1 + + drivers/accel/amdxdna/amdxdna_debugfs.c | 129 + + drivers/accel/amdxdna/amdxdna_debugfs.h | 18 + + drivers/accel/amdxdna/amdxdna_gem.c | 95 +- + drivers/accel/amdxdna/amdxdna_iommu.c | 76 +- + drivers/accel/amdxdna/amdxdna_mailbox.c | 30 +- + drivers/accel/amdxdna/amdxdna_mailbox.h | 8 +- + drivers/accel/amdxdna/amdxdna_pci_drv.c | 134 +- + drivers/accel/amdxdna/amdxdna_pci_drv.h | 24 +- + drivers/accel/amdxdna/amdxdna_sysfs.c | 5 +- + drivers/accel/amdxdna/amdxdna_ubuf.c | 41 +- + drivers/accel/amdxdna/npu1_regs.c | 30 +- + drivers/accel/amdxdna/npu3_regs.c | 77 + + drivers/accel/amdxdna/npu4_regs.c | 71 +- + drivers/accel/amdxdna/npu5_regs.c | 10 +- + drivers/accel/amdxdna/npu6_regs.c | 10 +- + drivers/accel/ethosu/ethosu_job.c | 1 - + drivers/accel/ivpu/ivpu_drv.c | 8 +- + drivers/accel/ivpu/ivpu_hw.h | 16 +- + drivers/accel/ivpu/ivpu_hw_btrs.c | 112 +- + drivers/accel/ivpu/ivpu_hw_btrs.h | 10 +- + drivers/accel/ivpu/ivpu_hw_ip.c | 24 +- + drivers/accel/ivpu/ivpu_jsm_msg.c | 18 +- + drivers/accel/ivpu/ivpu_jsm_msg.h | 3 +- + drivers/accel/ivpu/ivpu_sysfs.c | 190 +- + drivers/accel/ivpu/vpu_jsm_api.h | 34 +- + drivers/accel/qaic/mhi_controller.c | 2 +- + drivers/accel/qaic/mhi_controller.h | 9 +- + drivers/accel/qaic/qaic.h | 9 +- + drivers/accel/qaic/qaic_control.c | 2 +- + drivers/accel/qaic/qaic_data.c | 2 +- + drivers/accel/qaic/qaic_debugfs.c | 30 +- + drivers/accel/qaic/qaic_debugfs.h | 2 +- + drivers/accel/qaic/qaic_drv.c | 2 +- + drivers/accel/qaic/qaic_ras.c | 1 - + drivers/accel/qaic/qaic_ras.h | 1 + + drivers/accel/qaic/qaic_ssr.c | 2 +- + drivers/accel/qaic/qaic_ssr.h | 9 +- + drivers/accel/qaic/qaic_timesync.c | 3 +- + drivers/accel/qaic/qaic_timesync.h | 7 +- + drivers/accel/qaic/sahara.c | 2 +- + drivers/accel/qaic/sahara.h | 2 +- + drivers/accel/rocket/rocket_job.c | 1 - + drivers/dma-buf/.kunitconfig | 2 + + drivers/dma-buf/Kconfig | 11 +- + drivers/dma-buf/Makefile | 5 +- + drivers/dma-buf/dma-fence-array.c | 13 +- + drivers/dma-buf/dma-fence-unwrap.c | 3 +- + drivers/dma-buf/dma-fence.c | 3 +- + drivers/dma-buf/dma-resv.c | 3 +- + drivers/dma-buf/selftest.c | 167 - + drivers/dma-buf/selftest.h | 30 - + drivers/dma-buf/selftests.h | 16 - + drivers/dma-buf/st-dma-fence-chain.c | 217 +- + drivers/dma-buf/st-dma-fence-unwrap.c | 292 +- + drivers/dma-buf/st-dma-fence.c | 200 +- + drivers/dma-buf/st-dma-resv.c | 145 +- + drivers/dma-buf/udmabuf.c | 58 +- + drivers/gpu/drm/adp/adp_drv.c | 14 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 29 + + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 51 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 84 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c | 18 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 69 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 328 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 127 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 9 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 8 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 5 + + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 59 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 57 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 99 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h | 415 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c | 13 + + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 34 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 75 +- + drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/imu_v12_1.c | 12 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_1.c | 147 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_3_2.c | 369 + + drivers/gpu/drm/amd/amdgpu/nbio_v6_3_2.h | 31 + + drivers/gpu/drm/amd/amdgpu/nv.c | 31 +- + drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.c | 1 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 12 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 14 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 12 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 12 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 30 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 30 +- + drivers/gpu/drm/amd/amdgpu/soc24.c | 21 +- + drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 33 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 13 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 151 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 4 +- + .../amd/amdkfd/kfd_device_queue_manager_v12_1.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 76 - + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 410 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 16 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 12 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 36 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 74 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h | 5 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 60 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_ism.c | 26 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 22 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 6 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 244 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 13 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 143 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.h | 28 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 27 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 20 +- + drivers/gpu/drm/amd/display/dc/basics/conversion.c | 2 +- + .../gpu/drm/amd/display/dc/basics/custom_float.c | 2 +- + drivers/gpu/drm/amd/display/dc/basics/dce_calcs.c | 6 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 6 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 21 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 12 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 4 +- + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 12 +- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 11 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 42 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 56 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 43 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 55 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 69 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 68 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 58 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 64 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 127 +- + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 59 +- + .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 48 +- + .../drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.c | 1 - + drivers/gpu/drm/amd/display/dc/core/dc.c | 993 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 1102 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 133 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 4 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 40 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 8 +- + drivers/gpu/drm/amd/display/dc/dc.h | 97 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 148 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 9 +- + drivers/gpu/drm/amd/display/dc/dc_fused_io.c | 6 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 16 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 42 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 54 +- + .../gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.c | 4 +- + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 20 +- + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c | 2 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 4 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 24 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 16 +- + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 2 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 3 +- + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 16 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 23 +- + .../amd/display/dc/dce80/dce80_timing_generator.c | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 16 +- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 22 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 8 +- + .../amd/display/dc/dio/dcn10/dcn10_link_encoder.c | 11 +- + .../dc/dio/dcn30/dcn30_dio_stream_encoder.c | 6 +- + .../dc/dio/dcn401/dcn401_dio_stream_encoder.c | 2 +- + .../display/dc/dio/dcn42/dcn42_dio_link_encoder.h | 2 - + .../dc/dio/dcn42/dcn42_dio_stream_encoder.c | 4 +- + .../drm/amd/display/dc/dml/calcs/dcn_calc_auto.c | 1824 +- + .../drm/amd/display/dc/dml/calcs/dcn_calc_math.c | 6 +- + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 294 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 153 +- + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 328 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 326 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 164 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 164 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 332 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 80 +- + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 90 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 411 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 82 +- + .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 25 +- + .../gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c | 18 +- + .../gpu/drm/amd/display/dc/dml/dcn303/dcn303_fpu.c | 18 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 41 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 475 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 76 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 13 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 487 +- + .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 80 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 403 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 195 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 326 +- + .../display/dc/dml/dcn32/display_rq_dlg_calc_32.c | 138 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 95 +- + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 27 +- + .../gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c | 27 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 8 +- + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 32 +- + .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 18 +- + .../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 82 +- + drivers/gpu/drm/amd/display/dc/dml2_0/README.md | 31 + + .../drm/amd/display/dc/dml2_0/display_mode_core.c | 14 +- + .../drm/amd/display/dc/dml2_0/display_mode_util.c | 20 +- + .../dc/dml2_0/dml21/dml21_translation_helper.c | 15 +- + .../drm/amd/display/dc/dml2_0/dml21/dml21_utils.c | 2 +- + .../display/dc/dml2_0/dml21/inc/dml_top_types.h | 1 - + .../dml2_0/dml21/src/dml2_core/dml2_core_factory.c | 1 - + .../dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 1 - + .../dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_dcn42.c | 2 +- + .../dml2_0/dml21/src/dml2_mcg/dml2_mcg_factory.c | 1 - + .../dml2_0/dml21/src/dml2_pmo/dml2_pmo_factory.c | 3 +- + .../dml21/src/dml2_top/dml2_top_interfaces.c | 1 - + .../dc/dml2_0/dml21/src/dml2_top/dml2_top_legacy.h | 9 - + .../drm/amd/display/dc/dml2_0/dml2_mall_phantom.c | 105 +- + .../gpu/drm/amd/display/dc/dml2_0/dml2_policy.c | 6 +- + .../display/dc/dml2_0/dml2_translation_helper.c | 4 +- + drivers/gpu/drm/amd/display/dc/dml2_0/dml2_utils.c | 40 +- + .../drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 2 +- + .../drm/amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c | 2 +- + .../gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c | 13 +- + .../drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 2 +- + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 2 +- + .../gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.c | 15 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 13 +- + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 19 +- + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c | 3 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 33 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_gpio.h | 9 + + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 2 +- + .../dc/hpo/dcn31/dcn31_hpo_dp_stream_encoder.c | 2 +- + .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c | 16 +- + .../drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.c | 28 +- + .../drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.h | 3 + + .../drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.c | 12 +- + .../drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c | 12 +- + .../drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c | 12 +- + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 7 +- + .../drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.c | 5 +- + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c | 6 +- + .../gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.c | 4 +- + .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c | 4 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 229 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h | 23 +- + .../gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.c | 78 +- + .../gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.h | 10 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 71 +- + .../drm/amd/display/dc/hwss/dce120/dce120_hwseq.c | 12 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 67 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 47 +- + .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 10 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 31 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 12 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 86 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 36 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 81 +- + .../drm/amd/display/dc/hwss/dcn351/dcn351_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 492 +- + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 517 +- + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.h | 9 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 393 +- + drivers/gpu/drm/amd/display/dc/inc/bw_fixed.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 10 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 22 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 37 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 79 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 1 + + .../drm/amd/display/dc/inc/soc_and_ip_translator.h | 19 +- + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 2 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 37 +- + .../amd/display/dc/link/hwss/link_hwss_hpo_dp.c | 4 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 10 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 26 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 8 +- + .../gpu/drm/amd/display/dc/link/link_validation.c | 4 +- + .../drm/amd/display/dc/link/protocols/link_ddc.c | 5 +- + .../display/dc/link/protocols/link_dp_capability.c | 6 +- + .../amd/display/dc/link/protocols/link_dp_dpia.c | 2 +- + .../display/dc/link/protocols/link_dp_dpia_bw.c | 12 +- + .../dc/link/protocols/link_dp_irq_handler.c | 53 +- + .../dc/link/protocols/link_dp_panel_replay.c | 27 +- + .../display/dc/link/protocols/link_dp_training.c | 4 +- + .../dc/link/protocols/link_dp_training_8b_10b.c | 10 +- + .../dc/link/protocols/link_edp_panel_control.c | 41 +- + .../amd/display/dc/mmhubbub/dcn20/dcn20_mmhubbub.c | 4 +- + .../amd/display/dc/mmhubbub/dcn32/dcn32_mmhubbub.c | 4 +- + .../gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c | 2 +- + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 177 +- + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h | 25 +- + .../gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c | 392 +- + .../gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.h | 49 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c | 2 +- + .../gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.c | 4 +- + .../gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.h | 1 - + .../drm/amd/display/dc/pg/dcn35/dcn35_pg_cntl.c | 6 +- + .../drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.c | 4 +- + .../display/dc/resource/dce110/dce110_resource.c | 4 +- + .../amd/display/dc/resource/dcn10/dcn10_resource.c | 4 +- + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 24 +- + .../amd/display/dc/resource/dcn21/dcn21_resource.c | 2 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 14 +- + .../display/dc/resource/dcn301/dcn301_resource.c | 8 +- + .../display/dc/resource/dcn302/dcn302_resource.c | 4 +- + .../display/dc/resource/dcn303/dcn303_resource.c | 4 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 4 +- + .../display/dc/resource/dcn314/dcn314_resource.c | 4 +- + .../display/dc/resource/dcn315/dcn315_resource.c | 4 +- + .../display/dc/resource/dcn316/dcn316_resource.c | 4 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 20 +- + .../dc/resource/dcn32/dcn32_resource_helpers.c | 2 +- + .../display/dc/resource/dcn321/dcn321_resource.c | 4 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 4 +- + .../display/dc/resource/dcn351/dcn351_resource.c | 4 +- + .../amd/display/dc/resource/dcn36/dcn36_resource.c | 4 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 4 +- + .../amd/display/dc/resource/dcn42/dcn42_resource.c | 58 +- + .../dcn401/dcn401_soc_and_ip_translator.c | 42 +- + .../dcn42/dcn42_soc_and_ip_translator.c | 20 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 264 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.c | 2 +- + .../drm/amd/display/modules/color/color_gamma.c | 12 +- + .../gpu/drm/amd/display/modules/inc/mod_power.h | 415 + + .../amd/display/modules/info_packet/info_packet.c | 2 +- + drivers/gpu/drm/amd/display/modules/power/Makefile | 2 +- + drivers/gpu/drm/amd/display/modules/power/power.c | 3024 ++ + .../drm/amd/display/modules/power/power_helpers.c | 16 +- + drivers/gpu/drm/amd/display/modules/vmid/vmid.c | 6 +- + drivers/gpu/drm/amd/include/amd_cper.h | 2 +- + .../drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h | 110 + + .../amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h | 455 + + .../drm/amd/include/asic_reg/gc/gc_12_1_1_offset.h | 149 + + .../amd/include/asic_reg/gc/gc_12_1_1_sh_mask.h | 377 + + .../amd/include/asic_reg/nbio/nbio_6_3_2_offset.h | 13149 +++++ + .../amd/include/asic_reg/nbio/nbio_6_3_2_sh_mask.h | 49475 +++++++++++++++++++ + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 6 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c | 215 +- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.h | 34 + + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 8 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 10 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 14 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 28 +- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 4 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 10 +- + drivers/gpu/drm/arm/malidp_crtc.c | 6 +- + drivers/gpu/drm/arm/malidp_drv.c | 4 +- + drivers/gpu/drm/arm/malidp_mw.c | 2 +- + drivers/gpu/drm/arm/malidp_mw.h | 2 +- + drivers/gpu/drm/arm/malidp_planes.c | 6 +- + drivers/gpu/drm/armada/armada_crtc.c | 10 +- + drivers/gpu/drm/armada/armada_overlay.c | 10 +- + drivers/gpu/drm/armada/armada_plane.c | 6 +- + drivers/gpu/drm/armada/armada_plane.h | 2 +- + drivers/gpu/drm/ast/ast_2000.c | 61 +- + drivers/gpu/drm/ast/ast_2100.c | 292 +- + drivers/gpu/drm/ast/ast_2300.c | 392 +- + drivers/gpu/drm/ast/ast_2500.c | 327 +- + drivers/gpu/drm/ast/ast_cursor.c | 6 +- + drivers/gpu/drm/ast/ast_dp.c | 4 +- + drivers/gpu/drm/ast/ast_dp501.c | 134 +- + drivers/gpu/drm/ast/ast_drv.c | 84 +- + drivers/gpu/drm/ast/ast_drv.h | 60 +- + drivers/gpu/drm/ast/ast_mode.c | 104 +- + drivers/gpu/drm/ast/ast_post.c | 48 +- + drivers/gpu/drm/ast/ast_post.h | 20 +- + drivers/gpu/drm/ast/ast_reg.h | 211 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 10 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 6 +- + drivers/gpu/drm/bridge/Kconfig | 10 + + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 6 +- + drivers/gpu/drm/bridge/analogix/Kconfig | 3 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 247 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 1 - + drivers/gpu/drm/bridge/analogix/anx7625.c | 4 +- + drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 15 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 6 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 6 +- + drivers/gpu/drm/bridge/fsl-ldb.c | 4 +- + drivers/gpu/drm/bridge/imx/Kconfig | 28 +- + drivers/gpu/drm/bridge/imx/Makefile | 3 +- + drivers/gpu/drm/bridge/imx/imx-legacy-bridge.c | 91 - + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c | 4 +- + .../bridge/imx/imx8mp-hdmi-tx-connector-fixup.c | 75 + + .../bridge/imx/imx8mp-hdmi-tx-connector-fixup.dtso | 30 + + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 1 + + drivers/gpu/drm/bridge/imx/imx8qm-ldb.c | 4 +- + drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c | 6 +- + .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 2 +- + drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 4 +- + drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 2 +- + drivers/gpu/drm/bridge/inno-hdmi.c | 6 +- + drivers/gpu/drm/bridge/ite-it6263.c | 33 +- + drivers/gpu/drm/bridge/ite-it6505.c | 10 +- + drivers/gpu/drm/bridge/ite-it66121.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 1 + + drivers/gpu/drm/bridge/lontium-lt9211.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 8 +- + drivers/gpu/drm/bridge/microchip-lvds.c | 63 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 4 +- + drivers/gpu/drm/bridge/of-display-mode-bridge.c | 93 + + drivers/gpu/drm/bridge/panel.c | 8 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 4 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 8 +- + drivers/gpu/drm/bridge/sii902x.c | 4 +- + drivers/gpu/drm/bridge/simple-bridge.c | 5 + + drivers/gpu/drm/bridge/ssd2825.c | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-dp.c | 8 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 4 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 55 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 6 +- + drivers/gpu/drm/bridge/tc358762.c | 6 +- + drivers/gpu/drm/bridge/tc358767.c | 8 +- + drivers/gpu/drm/bridge/tc358768.c | 210 +- + drivers/gpu/drm/bridge/tc358775.c | 6 +- + drivers/gpu/drm/bridge/ti-dlpc3433.c | 6 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 20 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 24 +- + drivers/gpu/drm/bridge/ti-tdp158.c | 4 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 2 +- + drivers/gpu/drm/bridge/waveshare-dsi.c | 5 +- + drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 20 +- + drivers/gpu/drm/display/drm_bridge_connector.c | 13 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 26 +- + drivers/gpu/drm/display/drm_dp_tunnel.c | 31 +- + drivers/gpu/drm/display/drm_hdmi_state_helper.c | 6 +- + drivers/gpu/drm/drm_atomic.c | 238 +- + drivers/gpu/drm/drm_atomic_helper.c | 172 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 2 +- + drivers/gpu/drm/drm_atomic_uapi.c | 28 +- + drivers/gpu/drm/drm_auth.c | 2 +- + drivers/gpu/drm/drm_blend.c | 8 +- + drivers/gpu/drm/drm_bridge.c | 110 +- + drivers/gpu/drm/drm_client_modeset.c | 8 +- + drivers/gpu/drm/drm_color_mgmt.c | 6 +- + drivers/gpu/drm/drm_colorop.c | 8 +- + drivers/gpu/drm/drm_connector.c | 9 +- + drivers/gpu/drm/drm_crtc_helper.c | 2 +- + drivers/gpu/drm/drm_crtc_internal.h | 10 +- + drivers/gpu/drm/drm_damage_helper.c | 10 +- + drivers/gpu/drm/drm_encoder.c | 18 +- + drivers/gpu/drm/drm_fb_helper.c | 8 +- + drivers/gpu/drm/drm_fourcc.c | 25 +- + drivers/gpu/drm/drm_framebuffer.c | 8 +- + drivers/gpu/drm/drm_gem.c | 10 + + drivers/gpu/drm/drm_gpusvm.c | 58 +- + drivers/gpu/drm/drm_gpuvm.c | 3 + + drivers/gpu/drm/drm_mipi_dbi.c | 8 +- + drivers/gpu/drm/drm_mipi_dsi.c | 28 + + drivers/gpu/drm/drm_mode_object.c | 8 +- + drivers/gpu/drm/drm_modeset_helper.c | 2 +- + drivers/gpu/drm/drm_of.c | 34 + + drivers/gpu/drm/drm_pagemap.c | 229 +- + drivers/gpu/drm/drm_panel.c | 23 + + drivers/gpu/drm/drm_ras.c | 43 +- + drivers/gpu/drm/drm_ras_nl.c | 13 + + drivers/gpu/drm/drm_ras_nl.h | 2 + + drivers/gpu/drm/drm_self_refresh_helper.c | 12 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 10 +- + drivers/gpu/drm/drm_vblank.c | 36 +- + drivers/gpu/drm/drm_vblank_helper.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 12 - + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 3 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 1 - + drivers/gpu/drm/exynos/Kconfig | 3 + + drivers/gpu/drm/exynos/exynos_dp.c | 110 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 6 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 6 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 6 +- + drivers/gpu/drm/gma500/psb_drv.c | 1 - + drivers/gpu/drm/gud/gud_connector.c | 10 +- + drivers/gpu/drm/gud/gud_internal.h | 8 +- + drivers/gpu/drm/gud/gud_pipe.c | 8 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 12 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_dp.c | 4 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 14 +- + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 6 +- + drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 2 +- + drivers/gpu/drm/i915/Kconfig.debug | 4 +- + drivers/gpu/drm/i915/Makefile | 7 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 2 +- + drivers/gpu/drm/i915/display/g4x_hdmi.h | 6 +- + drivers/gpu/drm/i915/display/i9xx_display_sr.c | 2 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 2 +- + drivers/gpu/drm/i915/display/i9xx_wm.c | 75 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 16 +- + drivers/gpu/drm/i915/display/intel_atomic.h | 12 +- + drivers/gpu/drm/i915/display/intel_audio.c | 30 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 2 +- + drivers/gpu/drm/i915/display/intel_bo.c | 27 + + drivers/gpu/drm/i915/display/intel_bo.h | 8 + + drivers/gpu/drm/i915/display/intel_bw.c | 58 +- + drivers/gpu/drm/i915/display/intel_casf.c | 102 +- + drivers/gpu/drm/i915/display/intel_casf.h | 6 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 142 +- + drivers/gpu/drm/i915/display/intel_color.c | 58 +- + drivers/gpu/drm/i915/display/intel_crt.c | 2 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 26 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 18 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 11 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.h | 3 + + drivers/gpu/drm/i915/display/intel_de.c | 8 + + drivers/gpu/drm/i915/display/intel_de.h | 17 +- + drivers/gpu/drm/i915/display/intel_display.c | 100 +- + drivers/gpu/drm/i915/display/intel_display.h | 6 +- + .../drm/i915/display/intel_display_clock_gating.c | 270 + + .../drm/i915/display/intel_display_clock_gating.h | 27 + + drivers/gpu/drm/i915/display/intel_display_core.h | 64 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 7 +- + .../gpu/drm/i915/display/intel_display_device.c | 2 +- + .../gpu/drm/i915/display/intel_display_device.h | 1 + + .../gpu/drm/i915/display/intel_display_driver.c | 8 +- + .../gpu/drm/i915/display/intel_display_driver.h | 4 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 4 + + drivers/gpu/drm/i915/display/intel_display_power.c | 14 +- + .../gpu/drm/i915/display/intel_display_power_map.c | 2 +- + .../drm/i915/display/intel_display_power_well.c | 65 +- + drivers/gpu/drm/i915/display/intel_display_regs.h | 32 + + drivers/gpu/drm/i915/display/intel_display_reset.c | 50 +- + drivers/gpu/drm/i915/display/intel_display_reset.h | 8 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 16 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 2 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 12 +- + drivers/gpu/drm/i915/display/intel_dmc_wl.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 293 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 124 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 2 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 15 +- + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 18 + + drivers/gpu/drm/i915/display/intel_dp_tunnel.h | 6 + + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 176 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 144 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 4 +- + drivers/gpu/drm/i915/display/intel_dram.c | 48 +- + drivers/gpu/drm/i915/display/intel_fb.c | 49 +- + drivers/gpu/drm/i915/display/intel_fb.h | 3 +- + drivers/gpu/drm/i915/display/intel_fb_pin.h | 27 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 13 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 40 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 118 - + drivers/gpu/drm/i915/display/intel_fbdev_fb.h | 24 - + drivers/gpu/drm/i915/display/intel_fdi.c | 13 +- + drivers/gpu/drm/i915/display/intel_flipq.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 19 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 167 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 30 +- + drivers/gpu/drm/i915/display/intel_initial_plane.c | 83 +- + drivers/gpu/drm/i915/display/intel_load_detect.c | 20 +- + drivers/gpu/drm/i915/display/intel_load_detect.h | 6 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- + drivers/gpu/drm/i915/display/intel_lt_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_mchbar.c | 78 + + drivers/gpu/drm/i915/display/intel_mchbar.h | 21 + + drivers/gpu/drm/i915/display/intel_modeset_lock.c | 2 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 9 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 2 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 10 +- + drivers/gpu/drm/i915/display/intel_parent.c | 35 +- + drivers/gpu/drm/i915/display/intel_parent.h | 8 +- + drivers/gpu/drm/i915/display/intel_pfit.c | 24 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 8 +- + drivers/gpu/drm/i915/display/intel_plane.c | 27 +- + drivers/gpu/drm/i915/display/intel_plane.h | 3 + + drivers/gpu/drm/i915/display/intel_pmdemand.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 38 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 17 + + drivers/gpu/drm/i915/display/intel_quirks.h | 1 + + drivers/gpu/drm/i915/display/intel_rom.c | 19 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_sprite_uapi.c | 8 +- + drivers/gpu/drm/i915/display/intel_tc.c | 6 +- + drivers/gpu/drm/i915/display/intel_tv.c | 4 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 4 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 16 +- + drivers/gpu/drm/i915/display/intel_wm.c | 32 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 110 +- + drivers/gpu/drm/i915/display/skl_scaler.h | 2 - + drivers/gpu/drm/i915/display/skl_universal_plane.c | 37 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 296 +- + drivers/gpu/drm/i915/display/vlv_clock.c | 13 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 20 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 38 +- + drivers/gpu/drm/i915/display/vlv_sideband.c | 136 +- + drivers/gpu/drm/i915/display/vlv_sideband.h | 166 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 1 - + drivers/gpu/drm/i915/gt/intel_llc.c | 2 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 40 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 1 - + drivers/gpu/drm/i915/gvt/cfg_space.c | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 1 - + drivers/gpu/drm/i915/i915_bo.c | 114 + + drivers/gpu/drm/i915/i915_bo.h | 6 + + drivers/gpu/drm/i915/i915_debugfs.c | 2 +- + drivers/gpu/drm/i915/i915_dpt.c | 5 +- + drivers/gpu/drm/i915/i915_driver.c | 4 +- + drivers/gpu/drm/i915/i915_drv.h | 2 + + .../i915/{display/intel_fb_pin.c => i915_fb_pin.c} | 157 +- + drivers/gpu/drm/i915/i915_freq.c | 2 +- + drivers/gpu/drm/i915/i915_gmch.c | 2 +- + drivers/gpu/drm/i915/i915_gtt_view_types.h | 15 + + drivers/gpu/drm/i915/i915_hwmon.c | 2 +- + drivers/gpu/drm/i915/i915_initial_plane.c | 33 +- + drivers/gpu/drm/i915/i915_overlay.c | 8 +- + drivers/gpu/drm/i915/i915_pci.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 31 - + drivers/gpu/drm/i915/i915_vma.c | 10 - + drivers/gpu/drm/i915/i915_vma.h | 2 - + drivers/gpu/drm/i915/intel_clock_gating.c | 230 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 1 + + drivers/gpu/drm/i915/vlv_iosf_sb.c | 8 + + drivers/gpu/drm/i915/vlv_iosf_sb.h | 16 +- + drivers/gpu/drm/imagination/pvr_fw_trace.c | 2 +- + drivers/gpu/drm/imagination/pvr_job.c | 8 +- + drivers/gpu/drm/imagination/pvr_queue.c | 155 +- + drivers/gpu/drm/imagination/pvr_queue.h | 2 +- + .../gpu/drm/imagination/pvr_rogue_fwif_shared.h | 10 +- + drivers/gpu/drm/imagination/pvr_sync.c | 8 +- + drivers/gpu/drm/imagination/pvr_sync.h | 2 +- + drivers/gpu/drm/imx/dc/dc-crtc.c | 10 +- + drivers/gpu/drm/imx/dc/dc-kms.c | 8 +- + drivers/gpu/drm/imx/dc/dc-plane.c | 6 +- + drivers/gpu/drm/imx/dcss/dcss-crtc.c | 8 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 - + drivers/gpu/drm/imx/dcss/dcss-plane.c | 6 +- + drivers/gpu/drm/imx/ipuv3/Kconfig | 6 +- + drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 4 +- + drivers/gpu/drm/imx/ipuv3/imx-drm.h | 2 +- + drivers/gpu/drm/imx/ipuv3/imx-ldb.c | 8 +- + drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c | 10 +- + drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c | 8 +- + drivers/gpu/drm/imx/ipuv3/parallel-display.c | 7 +- + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 2 - + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 26 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 10 +- + drivers/gpu/drm/kmb/kmb_crtc.c | 10 +- + drivers/gpu/drm/kmb/kmb_drv.h | 2 +- + drivers/gpu/drm/kmb/kmb_dsi.c | 8 +- + drivers/gpu/drm/kmb/kmb_dsi.h | 2 +- + drivers/gpu/drm/kmb/kmb_plane.c | 6 +- + drivers/gpu/drm/lima/lima_sched.c | 1 - + drivers/gpu/drm/logicvc/logicvc_crtc.c | 6 +- + drivers/gpu/drm/logicvc/logicvc_layer.c | 6 +- + drivers/gpu/drm/loongson/lsdc_crtc.c | 8 +- + drivers/gpu/drm/loongson/lsdc_output_7a1000.c | 2 +- + drivers/gpu/drm/loongson/lsdc_output_7a2000.c | 6 +- + drivers/gpu/drm/loongson/lsdc_plane.c | 22 +- + drivers/gpu/drm/mediatek/mtk_crtc.c | 12 +- + drivers/gpu/drm/mediatek/mtk_crtc.h | 2 +- + drivers/gpu/drm/mediatek/mtk_dp.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 1 - + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 2 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 9 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 8 +- + drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +- + drivers/gpu/drm/mediatek/mtk_plane.c | 10 +- + drivers/gpu/drm/meson/meson_crtc.c | 12 +- + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 6 +- + drivers/gpu/drm/meson/meson_encoder_dsi.c | 4 +- + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 6 +- + drivers/gpu/drm/meson/meson_overlay.c | 6 +- + drivers/gpu/drm/meson/meson_plane.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 1 - + drivers/gpu/drm/mgag200/mgag200_drv.h | 26 +- + drivers/gpu/drm/mgag200/mgag200_g200.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_g200eh.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_g200eh5.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_g200er.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_g200se.c | 23 +- + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 127 +- + drivers/gpu/drm/mgag200/mgag200_reg.h | 1 + + drivers/gpu/drm/mgag200/mgag200_vga_bmc.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 10 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 7 - + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 10 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.h | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.h | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 8 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot.h | 2 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 2 +- + drivers/gpu/drm/msm/dp/dp_display.c | 6 +- + drivers/gpu/drm/msm/dp/dp_drm.c | 8 +- + drivers/gpu/drm/msm/dp/dp_drm.h | 6 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 4 - + drivers/gpu/drm/msm/hdmi/hdmi.c | 2 - + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 4 +- + drivers/gpu/drm/msm/msm_atomic.c | 8 +- + drivers/gpu/drm/msm/msm_drv.h | 6 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 1 - + drivers/gpu/drm/msm/msm_kms.h | 4 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 1 - + drivers/gpu/drm/mxsfb/Kconfig | 2 + + drivers/gpu/drm/mxsfb/lcdif_drv.c | 61 +- + drivers/gpu/drm/mxsfb/lcdif_kms.c | 12 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 16 +- + drivers/gpu/drm/nouveau/dispnv50/atom.h | 6 +- + drivers/gpu/drm/nouveau/dispnv50/crc.c | 16 +- + drivers/gpu/drm/nouveau/dispnv50/crc.h | 16 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 70 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_encoder.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_sched.c | 4 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 4 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 4 +- + drivers/gpu/drm/omapdrm/dss/output.c | 11 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 10 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 16 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 2 +- + drivers/gpu/drm/omapdrm/omap_overlay.c | 4 +- + drivers/gpu/drm/omapdrm/omap_overlay.h | 4 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 6 +- + drivers/gpu/drm/panel/Kconfig | 58 +- + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-chipwealth-ch13726a.c | 333 + + drivers/gpu/drm/panel/panel-edp.c | 2 + + drivers/gpu/drm/panel/panel-focaltech-ota7290b.c | 225 + + drivers/gpu/drm/panel/panel-himax-hx83102.c | 144 +- + drivers/gpu/drm/panel/panel-himax-hx8394.c | 279 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 251 +- + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 1423 +- + drivers/gpu/drm/panel/panel-novatek-nt35532.c | 796 + + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 24 +- + drivers/gpu/drm/panel/panel-simple.c | 482 + + drivers/gpu/drm/panfrost/panfrost_device.c | 34 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 1 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 1 + + drivers/gpu/drm/panfrost/panfrost_job.c | 1 - + drivers/gpu/drm/panthor/Kconfig | 1 - + drivers/gpu/drm/panthor/panthor_device.c | 39 +- + drivers/gpu/drm/panthor/panthor_device.h | 165 +- + drivers/gpu/drm/panthor/panthor_drv.c | 41 +- + drivers/gpu/drm/panthor/panthor_drv.h | 2 + + drivers/gpu/drm/panthor/panthor_fw.c | 56 +- + drivers/gpu/drm/panthor/panthor_fw.h | 1 + + drivers/gpu/drm/panthor/panthor_fw_regs.h | 29 + + drivers/gpu/drm/panthor/panthor_gem.c | 1453 +- + drivers/gpu/drm/panthor/panthor_gem.h | 136 +- + drivers/gpu/drm/panthor/panthor_gpu.c | 101 +- + drivers/gpu/drm/panthor/panthor_gpu.h | 6 + + drivers/gpu/drm/panthor/panthor_gpu_regs.h | 119 + + drivers/gpu/drm/panthor/panthor_heap.c | 2 +- + drivers/gpu/drm/panthor/panthor_hw.c | 56 +- + drivers/gpu/drm/panthor/panthor_hw.h | 2 +- + drivers/gpu/drm/panthor/panthor_mmu.c | 559 +- + drivers/gpu/drm/panthor/panthor_mmu.h | 8 + + drivers/gpu/drm/panthor/panthor_mmu_regs.h | 69 + + drivers/gpu/drm/panthor/panthor_pwr.c | 95 +- + drivers/gpu/drm/panthor/panthor_pwr_regs.h | 79 + + drivers/gpu/drm/panthor/panthor_regs.h | 291 - + drivers/gpu/drm/panthor/panthor_sched.c | 90 +- + drivers/gpu/drm/qxl/qxl_display.c | 16 +- + drivers/gpu/drm/radeon/cik.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 13 +- + drivers/gpu/drm/radeon/radeon_ring.c | 4 +- + drivers/gpu/drm/radeon/si.c | 2 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c | 18 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_encoder.c | 31 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_encoder.h | 1 + + drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 6 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_plane.c | 6 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_plane.h | 2 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c | 4 +- + drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c | 6 +- + drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 6 +- + drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.h | 6 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c | 6 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 15 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 20 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.h | 2 + + drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 70 +- + drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 22 +- + drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 6 +- + drivers/gpu/drm/rockchip/Kconfig | 1 + + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 73 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 6 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 + + drivers/gpu/drm/rockchip/dw-mipi-dsi2-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/dw_dp-rockchip.c | 35 +- + drivers/gpu/drm/rockchip/dw_hdmi_qp-rockchip.c | 15 +- + drivers/gpu/drm/rockchip/inno_hdmi-rockchip.c | 5 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 22 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 18 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 6 - + drivers/gpu/drm/rockchip/rockchip_rgb.c | 9 - + drivers/gpu/drm/scheduler/Makefile | 2 +- + drivers/gpu/drm/scheduler/sched_entity.c | 175 +- + drivers/gpu/drm/scheduler/sched_fence.c | 2 +- + drivers/gpu/drm/scheduler/sched_internal.h | 70 +- + drivers/gpu/drm/scheduler/sched_main.c | 351 +- + drivers/gpu/drm/scheduler/sched_rq.c | 383 + + drivers/gpu/drm/scheduler/tests/Makefile | 3 +- + drivers/gpu/drm/scheduler/tests/mock_scheduler.c | 1 - + drivers/gpu/drm/scheduler/tests/tests_scheduler.c | 882 + + drivers/gpu/drm/sitronix/st7571.c | 10 +- + drivers/gpu/drm/sitronix/st7586.c | 6 +- + drivers/gpu/drm/sitronix/st7735r.c | 2 +- + drivers/gpu/drm/sitronix/st7920.c | 12 +- + drivers/gpu/drm/solomon/ssd130x.c | 32 +- + drivers/gpu/drm/sprd/sprd_dpu.c | 12 +- + drivers/gpu/drm/sti/sti_crtc.c | 6 +- + drivers/gpu/drm/sti/sti_cursor.c | 6 +- + drivers/gpu/drm/sti/sti_gdp.c | 6 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 6 +- + drivers/gpu/drm/stm/drv.c | 2 +- + drivers/gpu/drm/stm/ltdc.c | 12 +- + drivers/gpu/drm/stm/ltdc.h | 2 +- + drivers/gpu/drm/stm/lvds.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 10 +- + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 4 +- + drivers/gpu/drm/sun4i/sunxi_engine.h | 4 +- + drivers/gpu/drm/sysfb/corebootdrm.c | 21 + + drivers/gpu/drm/sysfb/drm_sysfb_helper.h | 8 +- + drivers/gpu/drm/sysfb/drm_sysfb_modeset.c | 8 +- + drivers/gpu/drm/sysfb/efidrm.c | 19 + + drivers/gpu/drm/sysfb/ofdrm.c | 21 +- + drivers/gpu/drm/sysfb/simpledrm.c | 21 + + drivers/gpu/drm/sysfb/vesadrm.c | 23 +- + drivers/gpu/drm/tegra/dc.c | 32 +- + drivers/gpu/drm/tegra/dc.h | 2 +- + drivers/gpu/drm/tegra/drm.c | 6 +- + drivers/gpu/drm/tegra/hdmi.c | 2 - + drivers/gpu/drm/tegra/hub.c | 12 +- + drivers/gpu/drm/tegra/hub.h | 4 +- + drivers/gpu/drm/tegra/rgb.c | 2 - + drivers/gpu/drm/tests/Makefile | 2 +- + ...tomic_state_test.c => drm_atomic_commit_test.c} | 12 +- + drivers/gpu/drm/tests/drm_bridge_test.c | 10 +- + drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 88 +- + drivers/gpu/drm/tests/drm_kunit_helpers.c | 18 +- + drivers/gpu/drm/tidss/tidss_crtc.c | 10 +- + drivers/gpu/drm/tidss/tidss_encoder.c | 8 +- + drivers/gpu/drm/tidss/tidss_kms.c | 6 +- + drivers/gpu/drm/tidss/tidss_oldi.c | 4 +- + drivers/gpu/drm/tidss/tidss_plane.c | 8 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 10 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_encoder.c | 6 - + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 4 +- + drivers/gpu/drm/tiny/appletbdrm.c | 6 +- + drivers/gpu/drm/tiny/bochs.c | 10 +- + drivers/gpu/drm/tiny/cirrus-qemu.c | 8 +- + drivers/gpu/drm/tiny/hx8357d.c | 2 +- + drivers/gpu/drm/tiny/ili9163.c | 2 +- + drivers/gpu/drm/tiny/ili9225.c | 6 +- + drivers/gpu/drm/tiny/ili9341.c | 2 +- + drivers/gpu/drm/tiny/ili9486.c | 2 +- + drivers/gpu/drm/tiny/mi0283qt.c | 2 +- + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 2 +- + drivers/gpu/drm/tiny/pixpaper.c | 10 +- + drivers/gpu/drm/tiny/sharp-memory.c | 10 +- + drivers/gpu/drm/tve200/tve200_drv.c | 6 +- + drivers/gpu/drm/udl/udl_modeset.c | 8 +- + drivers/gpu/drm/v3d/Makefile | 1 + + drivers/gpu/drm/v3d/v3d_debugfs.c | 23 +- + drivers/gpu/drm/v3d/v3d_drv.c | 160 +- + drivers/gpu/drm/v3d/v3d_drv.h | 18 + + drivers/gpu/drm/v3d/v3d_gem.c | 17 +- + drivers/gpu/drm/v3d/v3d_irq.c | 15 +- + drivers/gpu/drm/v3d/v3d_mmu.c | 10 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 18 +- + drivers/gpu/drm/v3d/v3d_power.c | 87 + + drivers/gpu/drm/v3d/v3d_sched.c | 1 - + drivers/gpu/drm/v3d/v3d_submit.c | 19 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 18 +- + drivers/gpu/drm/vc4/tests/vc4_mock.h | 4 +- + drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 4 +- + drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 50 +- + drivers/gpu/drm/vc4/vc4_bo.c | 1 - + drivers/gpu/drm/vc4/vc4_crtc.c | 10 +- + drivers/gpu/drm/vc4/vc4_drv.c | 2 - + drivers/gpu/drm/vc4/vc4_drv.h | 28 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 8 +- + drivers/gpu/drm/vc4/vc4_gem.c | 1 - + drivers/gpu/drm/vc4/vc4_hdmi.c | 12 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 10 +- + drivers/gpu/drm/vc4/vc4_irq.c | 33 +- + drivers/gpu/drm/vc4/vc4_kms.c | 30 +- + drivers/gpu/drm/vc4/vc4_plane.c | 10 +- + drivers/gpu/drm/vc4/vc4_render_cl.c | 1 - + drivers/gpu/drm/vc4/vc4_txp.c | 10 +- + drivers/gpu/drm/vc4/vc4_validate.c | 1 - + drivers/gpu/drm/vc4/vc4_vec.c | 4 +- + drivers/gpu/drm/verisilicon/vs_bridge.c | 7 +- + drivers/gpu/drm/verisilicon/vs_crtc.c | 4 +- + drivers/gpu/drm/verisilicon/vs_plane.c | 54 +- + drivers/gpu/drm/verisilicon/vs_plane.h | 18 +- + drivers/gpu/drm/verisilicon/vs_primary_plane.c | 56 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 8 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 6 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 6 +- + drivers/gpu/drm/vkms/vkms_drv.c | 4 +- + drivers/gpu/drm/vkms/vkms_plane.c | 4 +- + drivers/gpu/drm/vkms/vkms_writeback.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cursor_plane.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cursor_plane.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 78 +- + drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h | 12 +- + drivers/gpu/drm/xe/Makefile | 10 +- + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 8 + + drivers/gpu/drm/xe/abi/xe_sysctrl_abi.h | 65 + + .../xe/compat-i915-headers/intel_clock_gating.h | 10 +- + .../drm/xe/compat-i915-headers/intel_mchbar_regs.h | 6 - + .../drm/xe/compat-i915-headers/intel_pci_config.h | 6 - + .../gpu/drm/xe/compat-i915-headers/intel_step.h | 13 - + .../gpu/drm/xe/compat-i915-headers/vlv_iosf_sb.h | 42 - + .../drm/xe/compat-i915-headers/vlv_iosf_sb_reg.h | 6 - + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 120 - + drivers/gpu/drm/xe/display/xe_display.c | 11 +- + drivers/gpu/drm/xe/display/xe_display_bo.c | 120 + + drivers/gpu/drm/xe/display/xe_display_bo.h | 6 + + drivers/gpu/drm/xe/display/xe_fb_pin.c | 84 +- + drivers/gpu/drm/xe/display/xe_initial_plane.c | 32 +- + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 5 +- + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 5 + + drivers/gpu/drm/xe/regs/xe_irq_regs.h | 1 + + drivers/gpu/drm/xe/regs/xe_pcode_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_sysctrl_regs.h | 36 + + .../gpu/drm/xe/tests/xe_gt_sriov_pf_config_kunit.c | 21 +- + drivers/gpu/drm/xe/tests/xe_migrate.c | 3 +- + drivers/gpu/drm/xe/tests/xe_pci.c | 4 +- + drivers/gpu/drm/xe/xe_bo.c | 21 +- + drivers/gpu/drm/xe/xe_bo_types.h | 2 +- + drivers/gpu/drm/xe/xe_debugfs.c | 43 +- + drivers/gpu/drm/xe/xe_dep_scheduler.c | 1 - + drivers/gpu/drm/xe/xe_dep_scheduler.h | 5 + + drivers/gpu/drm/xe/xe_devcoredump.c | 10 +- + drivers/gpu/drm/xe/xe_device.c | 64 +- + drivers/gpu/drm/xe/xe_device.h | 23 +- + drivers/gpu/drm/xe/xe_device_types.h | 22 +- + drivers/gpu/drm/xe/xe_device_wa_oob.rules | 1 + + drivers/gpu/drm/xe/xe_drm_ras.c | 35 +- + drivers/gpu/drm/xe/xe_drm_ras.h | 4 +- + drivers/gpu/drm/xe/xe_eu_stall.h | 4 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 2 +- + drivers/gpu/drm/xe/xe_execlist.c | 10 - + drivers/gpu/drm/xe/xe_ggtt.c | 8 +- + drivers/gpu/drm/xe/xe_gpu_scheduler.c | 1 - + drivers/gpu/drm/xe/xe_gt.c | 1 - + drivers/gpu/drm/xe/xe_gt_mcr.c | 23 +- + drivers/gpu/drm/xe/xe_gt_mcr.h | 1 - + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 1 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 262 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 2 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c | 124 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.h | 4 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 1 - + drivers/gpu/drm/xe/xe_gt_stats.c | 41 + + drivers/gpu/drm/xe/xe_gt_stats_types.h | 118 + + drivers/gpu/drm/xe/xe_gt_types.h | 4 +- + drivers/gpu/drm/xe/xe_guc.c | 17 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 5 +- + drivers/gpu/drm/xe/xe_guc_capture.c | 2 +- + drivers/gpu/drm/xe/xe_guc_capture.h | 4 +- + drivers/gpu/drm/xe/xe_guc_capture_types.h | 6 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 38 +- + drivers/gpu/drm/xe/xe_guc_ct_types.h | 8 +- + drivers/gpu/drm/xe/xe_guc_fwif.h | 4 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 42 +- + drivers/gpu/drm/xe/xe_guc_pc.h | 2 +- + drivers/gpu/drm/xe/xe_guc_relay_types.h | 2 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 7 +- + drivers/gpu/drm/xe/xe_guc_submit_types.h | 2 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 86 +- + drivers/gpu/drm/xe/xe_hw_engine.h | 1 - + drivers/gpu/drm/xe/xe_hw_engine_types.h | 2 +- + drivers/gpu/drm/xe/xe_hw_error.h | 4 +- + drivers/gpu/drm/xe/xe_hwmon.c | 28 +- + drivers/gpu/drm/xe/xe_irq.c | 2 + + drivers/gpu/drm/xe/xe_lrc.c | 20 - + drivers/gpu/drm/xe/xe_migrate.c | 15 +- + drivers/gpu/drm/xe/xe_migrate.h | 4 +- + drivers/gpu/drm/xe/xe_nvm.h | 4 +- + drivers/gpu/drm/xe/xe_oa.c | 136 +- + drivers/gpu/drm/xe/xe_oa_types.h | 12 +- + drivers/gpu/drm/xe/xe_pagefault_types.h | 4 +- + drivers/gpu/drm/xe/xe_pat.c | 9 + + drivers/gpu/drm/xe/xe_pat.h | 8 + + drivers/gpu/drm/xe/xe_pci.c | 12 +- + drivers/gpu/drm/xe/xe_pci_sriov.c | 2 + + drivers/gpu/drm/xe/xe_pci_types.h | 2 +- + drivers/gpu/drm/xe/xe_pcode_api.h | 8 +- + drivers/gpu/drm/xe/xe_pm.c | 6 + + drivers/gpu/drm/xe/xe_pt.c | 3 +- + drivers/gpu/drm/xe/xe_pt_types.h | 2 +- + drivers/gpu/drm/xe/xe_pt_walk.h | 14 +- + drivers/gpu/drm/xe/xe_pxp.c | 6 + + drivers/gpu/drm/xe/xe_pxp.h | 6 +- + drivers/gpu/drm/xe/xe_pxp_debugfs.h | 6 +- + drivers/gpu/drm/xe/xe_pxp_submit.h | 6 +- + drivers/gpu/drm/xe/xe_pxp_types.h | 6 +- + drivers/gpu/drm/xe/xe_query.c | 7 + + drivers/gpu/drm/xe/xe_ras.c | 93 + + drivers/gpu/drm/xe/xe_ras.h | 15 + + drivers/gpu/drm/xe/xe_ras_types.h | 73 + + drivers/gpu/drm/xe/xe_reg_sr.h | 4 +- + drivers/gpu/drm/xe/xe_reg_sr_types.h | 4 +- + drivers/gpu/drm/xe/xe_reg_whitelist.h | 4 +- + drivers/gpu/drm/xe/xe_rtp.c | 15 + + drivers/gpu/drm/xe/xe_rtp.h | 28 +- + drivers/gpu/drm/xe/xe_rtp_helpers.h | 6 +- + drivers/gpu/drm/xe/xe_rtp_types.h | 4 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 6 - + drivers/gpu/drm/xe/xe_sriov_pf_helpers.h | 3 +- + drivers/gpu/drm/xe/xe_sriov_pf_provision.c | 41 + + drivers/gpu/drm/xe/xe_sriov_pf_provision.h | 1 + + drivers/gpu/drm/xe/xe_sriov_pf_types.h | 3 - + drivers/gpu/drm/xe/xe_step.c | 2 +- + drivers/gpu/drm/xe/xe_step.h | 4 +- + drivers/gpu/drm/xe/xe_step_types.h | 61 +- + drivers/gpu/drm/xe/xe_svm.c | 11 +- + drivers/gpu/drm/xe/xe_sync.c | 2 +- + drivers/gpu/drm/xe/xe_sysctrl.c | 132 + + drivers/gpu/drm/xe/xe_sysctrl.h | 24 + + drivers/gpu/drm/xe/xe_sysctrl_event.c | 88 + + drivers/gpu/drm/xe/xe_sysctrl_event_types.h | 57 + + drivers/gpu/drm/xe/xe_sysctrl_mailbox.c | 371 + + drivers/gpu/drm/xe/xe_sysctrl_mailbox.h | 31 + + drivers/gpu/drm/xe/xe_sysctrl_mailbox_types.h | 58 + + drivers/gpu/drm/xe/xe_sysctrl_types.h | 39 + + drivers/gpu/drm/xe/xe_tlb_inval.c | 2 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 6 +- + drivers/gpu/drm/xe/xe_tuning.c | 7 +- + drivers/gpu/drm/xe/xe_tuning.h | 4 +- + drivers/gpu/drm/xe/xe_uc_fw.c | 11 + + drivers/gpu/drm/xe/xe_uc_fw.h | 4 + + drivers/gpu/drm/xe/xe_uc_fw_abi.h | 4 +- + drivers/gpu/drm/xe/xe_vm.c | 14 +- + drivers/gpu/drm/xe/xe_vm_types.h | 3 +- + drivers/gpu/drm/xe/xe_vram.c | 22 + + drivers/gpu/drm/xe/xe_vram.h | 2 + + drivers/gpu/drm/xe/xe_wa.c | 13 + + drivers/gpu/drm/xe/xe_wa.h | 4 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 7 + + drivers/gpu/drm/xlnx/Kconfig | 4 +- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 56 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 6 +- + drivers/gpu/drm/xlnx/zynqmp_kms.c | 22 +- + include/drm/bridge/analogix_dp.h | 8 +- + include/drm/bridge/dw_hdmi.h | 6 + + include/drm/bridge/imx.h | 17 - + include/drm/bridge/of-display-mode-bridge.h | 17 + + include/drm/display/drm_dp_mst_helper.h | 32 +- + include/drm/display/drm_dp_tunnel.h | 30 +- + include/drm/display/drm_hdmi_state_helper.h | 6 +- + include/drm/drm_atomic.h | 158 +- + include/drm/drm_atomic_helper.h | 78 +- + include/drm/drm_atomic_state_helper.h | 4 +- + include/drm/drm_blend.h | 4 +- + include/drm/drm_bridge.h | 89 +- + include/drm/drm_colorop.h | 4 +- + include/drm/drm_connector.h | 8 +- + include/drm/drm_crtc.h | 10 +- + include/drm/drm_crtc_helper.h | 4 +- + include/drm/drm_damage_helper.h | 2 +- + include/drm/drm_debugfs_crc.h | 2 +- + include/drm/drm_encoder.h | 4 + + include/drm/drm_gpusvm.h | 12 +- + include/drm/drm_kunit_helpers.h | 2 +- + include/drm/drm_mipi_dbi.h | 8 +- + include/drm/drm_mipi_dsi.h | 1 + + include/drm/drm_mode_config.h | 38 +- + include/drm/drm_modeset_helper_vtables.h | 44 +- + include/drm/drm_of.h | 13 + + include/drm/drm_pagemap.h | 9 +- + include/drm/drm_panel.h | 1 + + include/drm/drm_plane.h | 6 +- + include/drm/drm_ras.h | 11 + + include/drm/drm_self_refresh_helper.h | 6 +- + include/drm/drm_vblank_helper.h | 8 +- + include/drm/gpu_scheduler.h | 45 +- + include/drm/intel/display_parent_interface.h | 23 +- + .../drm/intel/mchbar_regs.h | 7 +- + .../drm/intel/pci_config.h | 0 + .../drm/intel/vlv_iosf_sb_regs.h | 18 +- + include/linux/dma-fence-array.h | 6 +- + include/trace/events/amdxdna.h | 42 +- + include/trace/events/dma_fence.h | 40 +- + include/uapi/drm/amdxdna_accel.h | 3 +- + include/uapi/drm/drm.h | 27 +- + include/uapi/drm/drm_fourcc.h | 48 +- + include/uapi/drm/drm_mode.h | 19 +- + include/uapi/drm/drm_ras.h | 1 + + include/uapi/drm/drm_sarea.h | 20 +- + include/uapi/drm/xe_drm.h | 206 +- + 1246 files changed, 100736 insertions(+), 17674 deletions(-) + create mode 100644 Documentation/ABI/obsolete/sysfs-driver-ivpu + create mode 100644 Documentation/ABI/testing/sysfs-driver-ivpu + create mode 100644 Documentation/devicetree/bindings/display/panel/chipwealth,ch13726a.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/focaltech,ota7290b.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt35532.yaml + create mode 100644 Documentation/gpu/xe/xe_gt_stats.rst + create mode 100644 drivers/accel/amdxdna/aie.c + create mode 100644 drivers/accel/amdxdna/aie.h + delete mode 100644 drivers/accel/amdxdna/aie2_psp.c + delete mode 100644 drivers/accel/amdxdna/aie2_smu.c + create mode 100644 drivers/accel/amdxdna/aie4_message.c + create mode 100644 drivers/accel/amdxdna/aie4_msg_priv.h + create mode 100644 drivers/accel/amdxdna/aie4_pci.c + create mode 100644 drivers/accel/amdxdna/aie4_pci.h + create mode 100644 drivers/accel/amdxdna/aie4_sriov.c + create mode 100644 drivers/accel/amdxdna/aie_psp.c + create mode 100644 drivers/accel/amdxdna/aie_smu.c + create mode 100644 drivers/accel/amdxdna/amdxdna_cbuf.c + create mode 100644 drivers/accel/amdxdna/amdxdna_cbuf.h + create mode 100644 drivers/accel/amdxdna/amdxdna_debugfs.c + create mode 100644 drivers/accel/amdxdna/amdxdna_debugfs.h + create mode 100644 drivers/accel/amdxdna/npu3_regs.c + create mode 100644 drivers/dma-buf/.kunitconfig + delete mode 100644 drivers/dma-buf/selftest.c + delete mode 100644 drivers/dma-buf/selftest.h + delete mode 100644 drivers/dma-buf/selftests.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v6_3_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v6_3_2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/README.md + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_top/dml2_top_legacy.h + create mode 100644 drivers/gpu/drm/amd/display/modules/inc/mod_power.h + create mode 100644 drivers/gpu/drm/amd/display/modules/power/power.c + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_1_offset.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_1_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_3_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_6_3_2_sh_mask.h + delete mode 100644 drivers/gpu/drm/bridge/imx/imx-legacy-bridge.c + create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx-connector-fixup.c + create mode 100644 drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx-connector-fixup.dtso + create mode 100644 drivers/gpu/drm/bridge/of-display-mode-bridge.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_clock_gating.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_clock_gating.h + delete mode 100644 drivers/gpu/drm/i915/display/intel_fbdev_fb.c + delete mode 100644 drivers/gpu/drm/i915/display/intel_fbdev_fb.h + create mode 100644 drivers/gpu/drm/i915/display/intel_mchbar.c + create mode 100644 drivers/gpu/drm/i915/display/intel_mchbar.h + rename drivers/gpu/drm/i915/{display/intel_fb_pin.c => i915_fb_pin.c} (66%) + create mode 100644 drivers/gpu/drm/panel/panel-chipwealth-ch13726a.c + create mode 100644 drivers/gpu/drm/panel/panel-focaltech-ota7290b.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt35532.c + create mode 100644 drivers/gpu/drm/panthor/panthor_fw_regs.h + create mode 100644 drivers/gpu/drm/panthor/panthor_gpu_regs.h + create mode 100644 drivers/gpu/drm/panthor/panthor_mmu_regs.h + create mode 100644 drivers/gpu/drm/panthor/panthor_pwr_regs.h + delete mode 100644 drivers/gpu/drm/panthor/panthor_regs.h + create mode 100644 drivers/gpu/drm/scheduler/sched_rq.c + create mode 100644 drivers/gpu/drm/scheduler/tests/tests_scheduler.c + rename drivers/gpu/drm/tests/{drm_atomic_state_test.c => drm_atomic_commit_test.c} (98%) + create mode 100644 drivers/gpu/drm/v3d/v3d_power.c + create mode 100644 drivers/gpu/drm/xe/abi/xe_sysctrl_abi.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_mchbar_regs.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_pci_config.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_step.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/vlv_iosf_sb.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/vlv_iosf_sb_reg.h + delete mode 100644 drivers/gpu/drm/xe/display/intel_fbdev_fb.c + create mode 100644 drivers/gpu/drm/xe/regs/xe_sysctrl_regs.h + create mode 100644 drivers/gpu/drm/xe/xe_ras.c + create mode 100644 drivers/gpu/drm/xe/xe_ras.h + create mode 100644 drivers/gpu/drm/xe/xe_ras_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl.c + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl.h + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_event.c + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_event_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_mailbox.c + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_mailbox.h + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_mailbox_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_types.h + delete mode 100644 include/drm/bridge/imx.h + create mode 100644 include/drm/bridge/of-display-mode-bridge.h + rename drivers/gpu/drm/i915/intel_mchbar_regs.h => include/drm/intel/mchbar_regs.h (98%) + rename drivers/gpu/drm/i915/intel_pci_config.h => include/drm/intel/pci_config.h (100%) + rename drivers/gpu/drm/i915/vlv_iosf_sb_reg.h => include/drm/intel/vlv_iosf_sb_regs.h (95%) +Merging drm-exynos/for-linux-next (3a8660878839 Linux 6.18-rc1) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (c006978163fd accel/amdxdna: Add AIE4 work buffer initialization) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Merge made by the 'ort' strategy. + drivers/accel/amdxdna/Makefile | 1 + + drivers/accel/amdxdna/aie.c | 48 ++++ + drivers/accel/amdxdna/aie.h | 9 + + drivers/accel/amdxdna/aie2_ctx.c | 4 +- + drivers/accel/amdxdna/aie2_error.c | 7 +- + drivers/accel/amdxdna/aie2_message.c | 65 ++--- + drivers/accel/amdxdna/aie2_pci.c | 54 +--- + drivers/accel/amdxdna/aie2_pci.h | 36 +-- + drivers/accel/amdxdna/aie4_ctx.c | 333 +++++++++++++++++++++++++ + drivers/accel/amdxdna/aie4_host_queue.h | 24 ++ + drivers/accel/amdxdna/aie4_message.c | 56 +++++ + drivers/accel/amdxdna/aie4_msg_priv.h | 98 ++++++++ + drivers/accel/amdxdna/aie4_pci.c | 340 ++++++++++++++++++++------ + drivers/accel/amdxdna/aie4_pci.h | 38 ++- + drivers/accel/amdxdna/amdxdna_ctx.c | 40 +++ + drivers/accel/amdxdna/amdxdna_ctx.h | 7 +- + drivers/accel/amdxdna/amdxdna_gem.c | 5 +- + drivers/accel/amdxdna/amdxdna_pci_drv.c | 25 +- + drivers/accel/amdxdna/amdxdna_pci_drv.h | 4 + + drivers/accel/amdxdna/npu3_regs.c | 25 +- + drivers/gpu/drm/bridge/microchip-lvds.c | 4 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 9 + + drivers/gpu/drm/drm_gpusvm.c | 5 +- + drivers/gpu/drm/drm_pagemap.c | 5 +- + drivers/gpu/drm/panthor/panthor_mmu.c | 16 +- + include/uapi/drm/amdxdna_accel.h | 24 +- + 26 files changed, 1043 insertions(+), 239 deletions(-) + create mode 100644 drivers/accel/amdxdna/aie4_ctx.c + create mode 100644 drivers/accel/amdxdna/aie4_host_queue.h +$ git am -3 ../patches/0001-drm-bridge-microchip-lvds-Rename-drm_atomic_state-to.patch +Applying: drm/bridge: microchip-lvds: Rename drm_atomic_state to drm_atomic_commit +Using index info to reconstruct a base tree... +M drivers/gpu/drm/bridge/microchip-lvds.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging amdgpu/drm-next (0d831487b5be drm/amdgpu: nuke amdgpu_userq_fence_slab v2) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git amdgpu/drm-next +Already up to date. +$ git am -3 ../patches/0001-amdgpu-Fix-up-drm_atomic_commit-rename.patch +Applying: amdgpu: Fix up drm_atomic_commit rename +Using index info to reconstruct a base tree... +M drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +No changes -- Patch already applied. +Merging drm-intel/for-linux-next (775fb6707450 drm/xe: Respect pin_params.alignment for GGTT) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/Kconfig.debug +Auto-merging drivers/gpu/drm/xe/display/xe_fb_pin.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/Kconfig.debug | 2 +- + drivers/gpu/drm/i915/i915_irq.h | 7 ------- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 12 ++++++++++-- + 3 files changed, 11 insertions(+), 10 deletions(-) +Merging drm-msm/msm-next (a972d1b864e8 drm/msm: Use of_get_available_child_by_name()) +$ 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 (a972d1b864e8 drm/msm: Use of_get_available_child_by_name()) +$ 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 (e68a60f9e6a6 drm/xe/cri: Add new PCI IDs) + 3ec5f003f6c3 ("drm/xe/guc: Exclude indirect ring state page from ADS engine state size") + 7d9c39cfb31f ("drm/xe/pf: Fix MMIO access using PF view instead of VF view during migration") + 9d770e72e1ed ("drm/xe/pf: Fix EAGAIN sign in pf_migration_consume()") +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe/drm-xe-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/xe/xe_hw_error.c | 32 ++++++++++++++---------------- + drivers/gpu/drm/xe/xe_survivability_mode.c | 14 ++++--------- + drivers/gpu/drm/xe/xe_survivability_mode.h | 2 +- + include/drm/intel/pciids.h | 6 +++++- + 4 files changed, 25 insertions(+), 29 deletions(-) +Merging drm-rust/for-linux-next (37f748ed0c19 drm/gpuvm: rust: add RUST_DRM_GPUVM option to Kconfig) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/for-linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/drm_gpuvm.c +Merge made by the 'ort' strategy. + Documentation/gpu/nova/core/vbios.rst | 63 +- + MAINTAINERS | 2 + + drivers/gpu/drm/Kconfig | 7 + + drivers/gpu/drm/drm_gpuvm.c | 6 +- + drivers/gpu/drm/nova/Kconfig | 1 + + drivers/gpu/drm/tyr/Kconfig | 1 + + drivers/gpu/drm/tyr/driver.rs | 58 +- + drivers/gpu/drm/tyr/gem.rs | 24 +- + drivers/gpu/drm/tyr/gpu.rs | 175 ++- + drivers/gpu/drm/tyr/regs.rs | 1725 +++++++++++++++++++++++++++-- + drivers/gpu/nova-core/Kconfig | 1 + + drivers/gpu/nova-core/falcon.rs | 4 +- + drivers/gpu/nova-core/falcon/hal.rs | 24 +- + drivers/gpu/nova-core/falcon/hal/ga102.rs | 8 +- + drivers/gpu/nova-core/falcon/hal/tu102.rs | 4 +- + drivers/gpu/nova-core/fb.rs | 27 +- + drivers/gpu/nova-core/fb/hal.rs | 24 +- + drivers/gpu/nova-core/fb/hal/ga100.rs | 6 + + drivers/gpu/nova-core/fb/hal/ga102.rs | 4 + + drivers/gpu/nova-core/fb/hal/tu102.rs | 11 +- + drivers/gpu/nova-core/firmware.rs | 8 +- + drivers/gpu/nova-core/firmware/gsp.rs | 28 +- + drivers/gpu/nova-core/gfw.rs | 76 -- + drivers/gpu/nova-core/gpu.rs | 26 +- + drivers/gpu/nova-core/gpu/hal.rs | 28 + + drivers/gpu/nova-core/gpu/hal/gh100.rs | 18 + + drivers/gpu/nova-core/gpu/hal/tu102.rs | 86 ++ + drivers/gpu/nova-core/gsp/boot.rs | 18 +- + drivers/gpu/nova-core/gsp/fw.rs | 31 +- + drivers/gpu/nova-core/nova_core.rs | 1 - + drivers/gpu/nova-core/regs.rs | 7 +- + drivers/gpu/nova-core/vbios.rs | 87 +- + rust/bindings/bindings_helper.h | 1 + + rust/helpers/drm_gpuvm.c | 26 + + rust/helpers/helpers.c | 1 + + rust/kernel/drm/gpuvm/mod.rs | 328 ++++++ + rust/kernel/drm/gpuvm/sm_ops.rs | 429 +++++++ + rust/kernel/drm/gpuvm/va.rs | 168 +++ + rust/kernel/drm/gpuvm/vm_bo.rs | 249 +++++ + rust/kernel/drm/mod.rs | 1 + + 40 files changed, 3398 insertions(+), 394 deletions(-) + delete mode 100644 drivers/gpu/nova-core/gfw.rs + create mode 100644 drivers/gpu/nova-core/gpu/hal.rs + create mode 100644 drivers/gpu/nova-core/gpu/hal/gh100.rs + create mode 100644 drivers/gpu/nova-core/gpu/hal/tu102.rs + create mode 100644 rust/helpers/drm_gpuvm.c + create mode 100644 rust/kernel/drm/gpuvm/mod.rs + create mode 100644 rust/kernel/drm/gpuvm/sm_ops.rs + create mode 100644 rust/kernel/drm/gpuvm/va.rs + create mode 100644 rust/kernel/drm/gpuvm/vm_bo.rs +Merging drm-nova/nova-next (93296e9d9528 gpu: nova-core: vbios: store reference to Device where relevant) +$ git merge -m Merge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git drm-nova/nova-next +Already up to date. +Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (98992e6ba333 fbdev: remove Hercules monochrome ISA graphics adapter driver) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + CREDITS | 3 + + MAINTAINERS | 7 - + drivers/video/fbdev/Kconfig | 13 - + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/arkfb.c | 4 +- + drivers/video/fbdev/aty/aty128fb.c | 143 ++---- + drivers/video/fbdev/aty/radeon_base.c | 2 +- + drivers/video/fbdev/carminefb.c | 5 +- + drivers/video/fbdev/cirrusfb.c | 2 +- + drivers/video/fbdev/cyber2000fb.c | 24 +- + drivers/video/fbdev/geode/gx1fb_core.c | 10 +- + drivers/video/fbdev/hgafb.c | 685 --------------------------- + drivers/video/fbdev/kyro/fbdev.c | 5 +- + drivers/video/fbdev/matrox/matroxfb_base.c | 38 +- + drivers/video/fbdev/neofb.c | 29 +- + drivers/video/fbdev/nvidia/nvidia.c | 9 +- + drivers/video/fbdev/pm2fb.c | 11 +- + drivers/video/fbdev/pm3fb.c | 5 +- + drivers/video/fbdev/pvr2fb.c | 5 +- + drivers/video/fbdev/riva/fbdev.c | 128 ++--- + drivers/video/fbdev/s3fb.c | 32 +- + drivers/video/fbdev/savage/savagefb_driver.c | 140 +++--- + drivers/video/fbdev/sis/sis_main.h | 26 +- + drivers/video/fbdev/tdfxfb.c | 21 +- + drivers/video/fbdev/tridentfb.c | 44 +- + drivers/video/fbdev/vt8623fb.c | 4 +- + 26 files changed, 295 insertions(+), 1101 deletions(-) + delete mode 100644 drivers/video/fbdev/hgafb.c +$ git am -3 ../patches/0001-fix-up-for-drm-hyperv-Remove-reference-to-hyperv_fb-.patch +Applying: fix up for "drm/hyperv: Remove reference to hyperv_fb driver" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/hyperv/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 01ef68c6753e] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git + Date: Fri May 8 13:10:39 2026 +0200 +Merging regmap/for-next (4b7774eeab8d regmap: sdw-mbq: Fix spelling mistake "undeferable" -> "undeferrable") +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merging sound/for-next (9fc9caf34608 ALSA: pcm: use snd_pcm_get_state() in remaining ioctl checks) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/hda/codecs/side-codecs/tas2781_hda_spi.c +Auto-merging sound/usb/mixer.c +Merge made by the 'ort' strategy. + drivers/base/firmware_loader/main.c | 68 +++- + include/linux/firmware.h | 10 + + include/sound/snd_wavefront.h | 7 + + sound/ac97_bus.c | 4 +- + sound/core/jack.c | 13 +- + sound/core/pcm_native.c | 14 +- + sound/core/seq/oss/seq_oss_readq.c | 13 +- + sound/core/seq/oss/seq_oss_readq.h | 3 +- + sound/hda/codecs/side-codecs/tas2781_hda_i2c.c | 3 + + sound/hda/codecs/side-codecs/tas2781_hda_spi.c | 3 + + sound/hda/core/i915.c | 30 +- + sound/isa/opti9xx/miro.c | 268 ++++++++++++- + sound/isa/wavefront/wavefront.c | 61 ++- + sound/isa/wavefront/wavefront_midi.c | 47 ++- + sound/isa/wavefront/wavefront_synth.c | 96 +++++ + sound/oss/dmasound/dmasound_core.c | 10 +- + sound/pci/ali5451/ali5451.c | 4 +- + sound/pci/als300.c | 6 +- + sound/pci/als4000.c | 4 +- + sound/pci/asihpi/asihpi.c | 17 +- + sound/pci/asihpi/hpipcida.h | 18 +- + sound/pci/atiixp.c | 10 +- + sound/pci/atiixp_modem.c | 6 +- + sound/pci/au88x0/au8810.c | 4 +- + sound/pci/au88x0/au8820.c | 4 +- + sound/pci/au88x0/au8830.c | 4 +- + sound/pci/aw2/aw2-alsa.c | 5 +- + sound/pci/azt3328.c | 6 +- + sound/pci/ca0106/ca0106_main.c | 4 +- + sound/pci/cmipci.c | 12 +- + sound/pci/cs4281.c | 4 +- + sound/pci/cs46xx/cs46xx.c | 8 +- + sound/pci/ctxfi/ctmixer.c | 27 +- + sound/pci/ctxfi/ctmixer.h | 4 +- + sound/pci/echoaudio/darla20.c | 4 +- + sound/pci/echoaudio/darla24.c | 6 +- + sound/pci/echoaudio/echo3g.c | 4 +- + sound/pci/echoaudio/gina20.c | 4 +- + sound/pci/echoaudio/gina24.c | 10 +- + sound/pci/echoaudio/indigo.c | 4 +- + sound/pci/echoaudio/indigodj.c | 4 +- + sound/pci/echoaudio/indigodjx.c | 4 +- + sound/pci/echoaudio/indigoio.c | 4 +- + sound/pci/echoaudio/indigoiox.c | 4 +- + sound/pci/echoaudio/layla20.c | 6 +- + sound/pci/echoaudio/layla24.c | 4 +- + sound/pci/echoaudio/mia.c | 6 +- + sound/pci/echoaudio/mona.c | 20 +- + sound/pci/emu10k1/emu10k1.c | 8 +- + sound/pci/emu10k1/emu10k1x.c | 4 +- + sound/pci/ens1370.c | 10 +- + sound/pci/es1938.c | 4 +- + sound/pci/es1968.c | 27 +- + sound/pci/fm801.c | 15 +- + sound/pci/ice1712/ice1712.c | 4 +- + sound/pci/ice1712/ice1724.c | 4 +- + sound/pci/intel8x0.c | 118 ++++-- + sound/pci/intel8x0m.c | 88 ++++- + sound/pci/maestro3.c | 51 ++- + sound/pci/mixart/mixart.c | 4 +- + sound/pci/nm256/nm256.c | 8 +- + sound/pci/pcxhr/pcxhr.c | 70 ++-- + sound/pci/rme32.c | 8 +- + sound/pci/rme96.c | 10 +- + sound/pci/sonicvibes.c | 4 +- + sound/pci/trident/trident.c | 16 +- + sound/pci/via82xx.c | 6 +- + sound/pci/via82xx_modem.c | 4 +- + sound/pci/vx222/vx222.c | 6 +- + sound/pci/ymfpci/ymfpci.c | 14 +- + sound/usb/mixer.c | 58 +-- + sound/usb/mixer_quirks.c | 61 ++- + sound/usb/mixer_scarlett.c | 4 +- + sound/usb/mixer_scarlett2.c | 515 +++++++++++++++++++++++-- + sound/usb/mixer_us16x08.c | 127 +++--- + 75 files changed, 1653 insertions(+), 476 deletions(-) +Merging ieee1394/for-next (fcabbf40fae5 firewire: core: move allocation/reallocation paths into specific branch after isoc resource management in cdev) +$ 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-cdev.c | 376 ++++++++++++++++++++++++++----------------- + 1 file changed, 228 insertions(+), 148 deletions(-) +Merging sound-asoc/for-next (a4fcf0c0e3d2 Merge remote-tracking branch 'asoc/for-7.2' into asoc-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/fsl,sai.yaml | 7 + + .../bindings/sound/mediatek,mt2701-audio.yaml | 23 + + .../bindings/sound/mediatek,mt2701-hdmi-audio.yaml | 48 + + .../bindings/sound/mediatek,mt6351-sound.yaml | 37 + + .../bindings/sound/mediatek,mt8196-afe.yaml | 113 + + .../bindings/sound/mediatek,mt8196-nau8825.yaml | 100 + + Documentation/devicetree/bindings/sound/mt6351.txt | 16 - + .../devicetree/bindings/sound/ti,tas67524.yaml | 280 + + Documentation/sound/codecs/index.rst | 1 + + Documentation/sound/codecs/tas675x.rst | 820 ++ + MAINTAINERS | 4 + + arch/arm/mach-pxa/pxa27x.c | 9 +- + drivers/gpio/gpiolib-of.c | 8 + + include/linux/platform_data/asoc-pxa.h | 23 +- + include/sound/ac97/codec.h | 5 +- + include/sound/ac97/controller.h | 5 +- + include/sound/pxa2xx-lib.h | 50 +- + include/sound/sdca.h | 4 + + include/sound/sdca_asoc.h | 6 + + include/sound/sdca_function.h | 1 - + include/sound/sdca_jack.h | 3 + + include/sound/soc_sdw_utils.h | 4 + + sound/ac97/bus.c | 26 +- + sound/arm/Kconfig | 7 - + sound/arm/Makefile | 4 - + sound/soc/apple/mca.c | 14 +- + sound/soc/atmel/atmel-classd.c | 41 +- + sound/soc/atmel/mchp-spdifrx.c | 33 +- + sound/soc/codecs/Kconfig | 23 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/nau8825.c | 8 +- + sound/soc/codecs/rt722-sdca.c | 77 +- + sound/soc/codecs/rt722-sdca.h | 4 + + sound/soc/codecs/tac5xx2-sdw.c | 2047 ++++ + sound/soc/codecs/tac5xx2.h | 259 + + sound/soc/codecs/tas2783-sdw.c | 6 +- + sound/soc/codecs/tas675x.c | 2194 ++++ + sound/soc/codecs/tas675x.h | 367 + + sound/soc/codecs/tlv320aic3x.c | 7 + + sound/soc/codecs/wsa881x.c | 35 +- + sound/soc/fsl/fsl-asoc-card.c | 111 +- + sound/soc/fsl/fsl_micfil.c | 79 + + sound/soc/fsl/fsl_micfil.h | 1 + + sound/soc/fsl/fsl_sai.c | 7 +- + sound/soc/fsl/fsl_sai.h | 2 + + sound/soc/intel/boards/cht_bsw_rt5672.c | 73 +- + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 132 + + sound/soc/intel/common/sof-function-topology-lib.c | 11 +- + sound/soc/mediatek/Kconfig | 40 + + sound/soc/mediatek/Makefile | 1 + + .../soc/mediatek/common/mtk-afe-platform-driver.c | 54 +- + .../soc/mediatek/common/mtk-afe-platform-driver.h | 2 + + sound/soc/mediatek/mt2701/Makefile | 1 + + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c | 22 + + sound/soc/mediatek/mt2701/mt2701-afe-common.h | 6 + + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 284 +- + sound/soc/mediatek/mt2701/mt2701-hdmi.c | 114 + + sound/soc/mediatek/mt2701/mt2701-reg.h | 29 + + sound/soc/mediatek/mt8196/Makefile | 14 + + sound/soc/mediatek/mt8196/mt8196-afe-clk.c | 581 + + sound/soc/mediatek/mt8196/mt8196-afe-clk.h | 64 + + sound/soc/mediatek/mt8196/mt8196-afe-common.h | 205 + + sound/soc/mediatek/mt8196/mt8196-afe-pcm.c | 2503 ++++ + sound/soc/mediatek/mt8196/mt8196-dai-adda.c | 845 ++ + sound/soc/mediatek/mt8196/mt8196-dai-i2s.c | 2613 ++++ + sound/soc/mediatek/mt8196/mt8196-dai-tdm.c | 675 ++ + sound/soc/mediatek/mt8196/mt8196-interconnection.h | 121 + + sound/soc/mediatek/mt8196/mt8196-nau8825.c | 870 ++ + sound/soc/mediatek/mt8196/mt8196-reg.h | 12068 +++++++++++++++++++ + sound/soc/pxa/Kconfig | 6 + + sound/soc/pxa/Makefile | 4 +- + sound/soc/pxa/mmp-sspa.c | 2 +- + sound/soc/pxa/pxa-ssp.c | 2 +- + sound/{arm => soc/pxa}/pxa2xx-ac97-lib.c | 41 +- + sound/{arm => soc/pxa}/pxa2xx-ac97-regs.h | 0 + sound/soc/pxa/pxa2xx-ac97.c | 6 +- + sound/soc/pxa/pxa2xx-i2s.c | 2 +- + sound/soc/pxa/pxa2xx-lib.h | 45 + + sound/{arm => soc/pxa}/pxa2xx-pcm-lib.c | 26 +- + sound/soc/pxa/pxa2xx-pcm.c | 3 +- + sound/soc/rockchip/rk3399_gru_sound.c | 2 +- + sound/soc/rockchip/rockchip_i2s.c | 2 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 2 +- + sound/soc/samsung/i2s.c | 118 +- + sound/soc/samsung/idma.c | 26 +- + sound/soc/samsung/odroid.c | 21 +- + sound/soc/samsung/pcm.c | 99 +- + sound/soc/samsung/spdif.c | 25 +- + sound/soc/sdca/sdca_asoc.c | 106 +- + sound/soc/sdca/sdca_class.c | 7 - + sound/soc/sdca/sdca_class.h | 1 - + sound/soc/sdca/sdca_class_function.c | 23 +- + sound/soc/sdca/sdca_functions.c | 51 +- + sound/soc/sdca/sdca_interrupts.c | 3 +- + sound/soc/sdca/sdca_jack.c | 76 +- + sound/soc/sdw_utils/soc_sdw_ti_amp.c | 140 +- + sound/soc/sdw_utils/soc_sdw_utils.c | 151 + + sound/soc/soc-ops.c | 4 + + sound/soc/sof/topology.c | 55 + + sound/soc/tegra/tegra20_ac97.c | 2 +- + sound/soc/tegra/tegra20_das.c | 2 +- + sound/soc/tegra/tegra20_i2s.c | 2 +- + sound/soc/tegra/tegra210_admaif.c | 28 +- + sound/soc/tegra/tegra210_admaif.h | 2 +- + sound/soc/tegra/tegra210_adx.c | 85 +- + sound/soc/tegra/tegra210_adx.h | 5 +- + sound/soc/tegra/tegra210_amx.c | 82 +- + sound/soc/tegra/tegra210_amx.h | 5 +- + sound/soc/tegra/tegra210_mixer.c | 266 +- + sound/soc/tegra/tegra210_mixer.h | 19 +- + sound/soc/tegra/tegra210_mvc.c | 3 + + sound/soc/tegra/tegra30_ahub.c | 2 +- + sound/soc/tegra/tegra30_i2s.c | 2 +- + sound/soc/tegra/tegra_isomgr_bw.c | 20 +- + sound/soc/ti/j721e-evm.c | 22 +- + sound/soc/uniphier/aio-compress.c | 24 +- + sound/soc/uniphier/aio-dma.c | 50 +- + sound/soc/ux500/mop500_ab8500.c | 24 +- + 118 files changed, 29127 insertions(+), 818 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt2701-hdmi-audio.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt6351-sound.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt8196-afe.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt8196-nau8825.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mt6351.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,tas67524.yaml + create mode 100644 Documentation/sound/codecs/tas675x.rst + create mode 100644 sound/soc/codecs/tac5xx2-sdw.c + create mode 100644 sound/soc/codecs/tac5xx2.h + create mode 100644 sound/soc/codecs/tas675x.c + create mode 100644 sound/soc/codecs/tas675x.h + create mode 100644 sound/soc/mediatek/mt2701/mt2701-hdmi.c + create mode 100644 sound/soc/mediatek/mt8196/Makefile + create mode 100644 sound/soc/mediatek/mt8196/mt8196-afe-clk.c + create mode 100644 sound/soc/mediatek/mt8196/mt8196-afe-clk.h + create mode 100644 sound/soc/mediatek/mt8196/mt8196-afe-common.h + create mode 100644 sound/soc/mediatek/mt8196/mt8196-afe-pcm.c + create mode 100644 sound/soc/mediatek/mt8196/mt8196-dai-adda.c + create mode 100644 sound/soc/mediatek/mt8196/mt8196-dai-i2s.c + create mode 100644 sound/soc/mediatek/mt8196/mt8196-dai-tdm.c + create mode 100644 sound/soc/mediatek/mt8196/mt8196-interconnection.h + create mode 100644 sound/soc/mediatek/mt8196/mt8196-nau8825.c + create mode 100644 sound/soc/mediatek/mt8196/mt8196-reg.h + rename sound/{arm => soc/pxa}/pxa2xx-ac97-lib.c (91%) + rename sound/{arm => soc/pxa}/pxa2xx-ac97-regs.h (100%) + create mode 100644 sound/soc/pxa/pxa2xx-lib.h + rename sound/{arm => soc/pxa}/pxa2xx-pcm-lib.c (86%) +Merging modules/modules-next (663385f9155f module: Simplify warning on positive returns from module_init()) +$ git merge -m Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Already up to date. +Merging input/next (7b9b6b34a647 Input: tsc2007 - reduce I2C transactions for Z2 read) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'ort' strategy. + .../bindings/input/touchscreen/st,stmfts.yaml | 4 + + drivers/input/keyboard/lm8323.c | 2 +- + drivers/input/misc/Kconfig | 10 - + drivers/input/misc/Makefile | 1 - + drivers/input/misc/pcap_keys.c | 125 ---------- + drivers/input/touchscreen/Kconfig | 10 - + drivers/input/touchscreen/Makefile | 1 - + drivers/input/touchscreen/atmel_mxt_ts.c | 3 +- + drivers/input/touchscreen/pcap_ts.c | 252 --------------------- + drivers/input/touchscreen/stmfts.c | 160 ++++++++----- + drivers/input/touchscreen/tsc2007_core.c | 6 +- + 11 files changed, 115 insertions(+), 459 deletions(-) + delete mode 100644 drivers/input/misc/pcap_keys.c + delete mode 100644 drivers/input/touchscreen/pcap_ts.c +Merging block/for-next (14c30ecbd90b Merge branch 'io_uring-reg-buffers' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git block/for-next +Merge made by the 'ort' strategy. + block/ioctl.c | 24 ++-- + drivers/block/ublk_drv.c | 22 +++- + fs/eventpoll.c | 86 +++++++------ + include/linux/eventpoll.h | 8 ++ + include/linux/io_uring_types.h | 3 + + io_uring/epoll.c | 18 ++- + io_uring/eventfd.c | 1 + + io_uring/fdinfo.c | 2 +- + io_uring/io_uring.c | 3 + + io_uring/napi.c | 27 ++-- + io_uring/napi.h | 8 +- + io_uring/rsrc.c | 273 +++++++++++++++++++++++++++++++---------- + io_uring/rsrc.h | 7 +- + io_uring/timeout.c | 35 ++++-- + io_uring/wait.c | 6 +- + 15 files changed, 372 insertions(+), 151 deletions(-) +$ git am -3 ../patches/0001-Revert-block-remove-bio_last_bvec_all.patch +Applying: Revert "block: remove bio_last_bvec_all" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/block/biovecs.rst +M include/linux/bio.h +$ git add -A . +$ git commit -v -a --amend +[master 9da9fc184f5c] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Fri May 8 13:10:50 2026 +0200 +Merging device-mapper/for-next (b4a0774bd7fd dm: add documentation for dm-inlinecrypt target) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Merge made by the 'ort' strategy. + .../admin-guide/device-mapper/dm-inlinecrypt.rst | 123 +++++ + block/blk-crypto.c | 3 + + drivers/md/Kconfig | 11 + + drivers/md/Makefile | 1 + + drivers/md/dm-ima.c | 500 ++++++++--------- + drivers/md/dm-ima.h | 68 ++- + drivers/md/dm-inlinecrypt.c | 596 +++++++++++++++++++++ + drivers/md/dm-ioctl.c | 146 ++++- + drivers/md/dm-raid.c | 6 + + drivers/md/dm-vdo/indexer/index-layout.c | 2 +- + drivers/md/dm.c | 2 +- + drivers/md/md.h | 2 + + drivers/md/raid5.c | 7 +- + 13 files changed, 1162 insertions(+), 305 deletions(-) + create mode 100644 Documentation/admin-guide/device-mapper/dm-inlinecrypt.rst + create mode 100644 drivers/md/dm-inlinecrypt.c +Merging libata/for-next (a3f75e5e6b02 ata: ahci: Move EXPORT_SYMBOL_GPL(ahci_do_softreset)) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Merge made by the 'ort' strategy. + drivers/ata/ahci.c | 22 ++++++++++++++++++++++ + drivers/ata/libahci.c | 4 ++-- + 2 files changed, 24 insertions(+), 2 deletions(-) +Merging pcmcia/pcmcia-next (b3c26ea81ccc pcmcia: remove obsolete host controller drivers) +$ git merge -m Merge branch 'pcmcia-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (52957cdad30f mmc: sdhci-msm: Fix the wrapped key handling) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (522d62d7aa11 mfd: bd72720: Drop BUCK11 ID) +$ git merge -m Merge branch 'for-mfd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Merge made by the 'ort' strategy. + drivers/mfd/sprd-sc27xx-spi.c | 62 ++++++++++++++++++++++++++++++++++------ + drivers/mfd/tps65219.c | 14 +++++---- + drivers/mfd/tps65910.c | 16 ++++++++++- + include/linux/mfd/rohm-bd72720.h | 1 - + 4 files changed, 76 insertions(+), 17 deletions(-) +Merging backlight/for-backlight-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-backlight-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Already up to date. +Merging battery/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (fa6a9031a3c5 Merge remote-tracking branch 'regulator/for-7.2' into regulator-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/mt6360-regulator.yaml | 4 +++ + .../bindings/regulator/qcom,rpmh-regulator.yaml | 3 ++ + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 4 +++ + drivers/regulator/palmas-regulator.c | 2 +- + drivers/regulator/qcom-rpmh-regulator.c | 19 +++++++++++++ + drivers/regulator/qcom_smd-regulator.c | 33 ++++++++++++++++++++++ + 6 files changed, 64 insertions(+), 1 deletion(-) +Merging security/next (f71ece9712b7 security,fs,nfs,net: update security_inode_listsecurity() interface) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + fs/nfs/nfs4proc.c | 7 ++----- + fs/xattr.c | 11 +++++++---- + include/linux/lsm_hook_defs.h | 4 ++-- + include/linux/security.h | 5 +++-- + security/security.c | 16 ++++++++-------- + security/selinux/hooks.c | 10 +++------- + security/smack/smack_lsm.c | 13 ++++--------- + 7 files changed, 29 insertions(+), 37 deletions(-) +Merging apparmor/apparmor-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'apparmor-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (69fc6474236d ima: return error early if file xattr cannot be changed) +$ git merge -m Merge branch 'next-integrity' of https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Merge made by the 'ort' strategy. + security/integrity/ima/ima_appraise.c | 10 ++++++++-- + security/integrity/ima/ima_policy.c | 3 ++- + 2 files changed, 10 insertions(+), 3 deletions(-) +Merging selinux/next (daaea417537d Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/include/security.h | 1 + + security/selinux/selinuxfs.c | 13 +- + security/selinux/ss/avtab.c | 49 ++++- + security/selinux/ss/avtab.h | 13 ++ + security/selinux/ss/conditional.c | 39 ++-- + security/selinux/ss/constraint.h | 1 + + security/selinux/ss/ebitmap.c | 27 +++ + security/selinux/ss/ebitmap.h | 1 + + security/selinux/ss/hashtab.h | 4 +- + security/selinux/ss/mls.c | 66 ++++--- + security/selinux/ss/mls.h | 6 +- + security/selinux/ss/policydb.c | 358 +++++++++++++++++++++++++++++------- + security/selinux/ss/policydb.h | 56 ++++-- + security/selinux/ss/services.c | 13 +- + security/selinux/ss/symtab.c | 2 +- + security/selinux/ss/symtab.h | 2 +- + 16 files changed, 504 insertions(+), 147 deletions(-) +Merging smack/next (b78fede1c69a smack: simplify write handlers of sysfs entries) +$ git merge -m Merge branch 'next' of https://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + security/smack/smack_lsm.c | 2 +- + security/smack/smackfs.c | 81 +++++++++++++--------------------------------- + 2 files changed, 23 insertions(+), 60 deletions(-) +Merging tomoyo/master (1a83d226268c loop: check refcount in __loop_clr_fd() and lo_rw_aio()) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Auto-merging include/linux/netdevice.h +Auto-merging lib/Kconfig.debug +Auto-merging net/core/dev.c +Merge made by the 'ort' strategy. + drivers/block/loop.c | 15 ++++ + include/linux/netdevice.h | 15 ++++ + include/net/dst.h | 22 +++++- + include/net/sock.h | 8 +- + kernel/locking/lockdep.c | 2 + + kernel/softirq.c | 4 + + kernel/workqueue.c | 4 + + lib/Kconfig.debug | 7 ++ + net/bridge/br_nf_core.c | 1 + + net/core/dev.c | 188 ++++++++++++++++++++++++++++++++++++++++++++++ + net/core/dst.c | 85 +++++++++++++++++++++ + net/core/lock_debug.c | 1 + + net/socket.c | 32 ++++++-- + 13 files changed, 373 insertions(+), 11 deletions(-) +Merging tpmdd-tpm/for-next-tpm (9ec4175a30eb KEYS: trusted: Debugging as a feature) +$ git merge -m Merge branch 'for-next-tpm' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd-tpm/for-next-tpm +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 16 +++++++++ + include/keys/trusted-type.h | 21 +++++++----- + security/keys/Kconfig | 1 - + security/keys/trusted-keys/Kconfig | 23 +++++++++++++ + security/keys/trusted-keys/trusted_caam.c | 7 ++-- + security/keys/trusted-keys/trusted_core.c | 6 ++++ + security/keys/trusted-keys/trusted_tpm1.c | 44 ++++++++++++++----------- + 7 files changed, 87 insertions(+), 31 deletions(-) +Merging tpmdd-keys/for-next-keys (9ec4175a30eb KEYS: trusted: Debugging as a feature) +$ git merge -m Merge branch 'for-next-keys' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd-keys/for-next-keys +Already up to date. +Merging watchdog/master (450517fa5aae dt-bindings: watchdog: qcom-wdt: Document Glymur watchdog) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (10161b4a791d iommu/amd: Fix precedence order in set_dte_passthrough()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Merge made by the 'ort' strategy. + drivers/iommu/amd/amd_iommu.h | 3 + + drivers/iommu/amd/amd_iommu_types.h | 21 +++--- + drivers/iommu/amd/init.c | 133 +++++++++++++++++++++++++----------- + drivers/iommu/amd/iommu.c | 5 +- + drivers/iommu/amd/ppr.c | 8 ++- + drivers/iommu/iommu-pages.h | 2 +- + 6 files changed, 118 insertions(+), 54 deletions(-) +Merging audit/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (c9a7f7e6b954 docs: dt: submitting-patches: Remove possible confusion of combining DTS) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/sram/sram.yaml +Merge made by the 'ort' strategy. + .../bindings/display/bridge/solomon,ssd2825.yaml | 3 +- + .../bindings/i2c/opencores,i2c-ocores.yaml | 8 +++--- + .../bindings/iio/adc/st,spear600-adc.yaml | 2 +- + .../devicetree/bindings/input/atmel,maxtouch.yaml | 3 +- + .../devicetree/bindings/input/imx-keypad.yaml | 32 +++++++++++----------- + .../bindings/input/microchip,cap11xx.yaml | 12 ++++---- + .../bindings/input/touchscreen/ti,ads7843.yaml | 4 +-- + .../devicetree/bindings/leds/leds-lp55xx.yaml | 2 +- + .../bindings/media/mediatek,vcodec-encoder.yaml | 2 +- + .../media/mediatek,vcodec-subdev-decoder.yaml | 2 +- + .../memory-controllers/nvidia,tegra20-mc.yaml | 4 +-- + .../memory-controllers/samsung,exynos5422-dmc.yaml | 2 +- + .../devicetree/bindings/mfd/rockchip,rk816.yaml | 3 +- + .../devicetree/bindings/misc/fsl,qoriq-mc.yaml | 2 +- + .../devicetree/bindings/misc/qcom,fastrpc.yaml | 1 + + .../bindings/pci/mediatek-pcie-mt7623.yaml | 4 +-- + .../bindings/pci/samsung,exynos-pcie.yaml | 2 +- + .../bindings/sound/davinci-mcasp-audio.yaml | 4 +-- + .../devicetree/bindings/sound/simple-card.yaml | 6 ++-- + Documentation/devicetree/bindings/sram/sram.yaml | 1 + + .../devicetree/bindings/submitting-patches.rst | 7 +++-- + .../devicetree/bindings/usb/richtek,rt1711h.yaml | 3 +- + .../devicetree/bindings/usb/ti,j721e-usb.yaml | 8 +++--- + .../devicetree/bindings/writing-bindings.rst | 12 +++++++- + drivers/of/fdt.c | 2 -- + 25 files changed, 70 insertions(+), 61 deletions(-) +Merging dt-krzk/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/for-next (6e937f4e769e mailbox: mailbox-test: make data_ready a per-instance variable) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Already up to date. +Merging spi/for-next (554713bc0281 Merge remote-tracking branch 'spi/for-7.2' into spi-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 21 +- + .../devicetree/bindings/spi/spacemit,k1-spi.yaml | 84 +++ + drivers/spi/Kconfig | 9 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-amlogic-spisg.c | 3 +- + drivers/spi/spi-at91-usart.c | 63 +- + drivers/spi/spi-atcspi200.c | 28 +- + drivers/spi/spi-atmel.c | 34 +- + drivers/spi/spi-bcm63xx-hsspi.c | 17 +- + drivers/spi/spi-bcm63xx.c | 23 +- + drivers/spi/spi-cadence-quadspi.c | 52 +- + drivers/spi/spi-cadence.c | 40 +- + drivers/spi/spi-cavium-octeon.c | 17 +- + drivers/spi/spi-cavium-thunderx.c | 32 +- + drivers/spi/spi-coldfire-qspi.c | 28 +- + drivers/spi/spi-dln2.c | 26 +- + drivers/spi/spi-dw-pci.c | 14 +- + drivers/spi/spi-ep93xx.c | 22 +- + drivers/spi/spi-fsl-espi.c | 20 +- + drivers/spi/spi-fsl-spi.c | 14 +- + drivers/spi/spi-img-spfi.c | 40 +- + drivers/spi/spi-intel-pci.c | 66 +- + drivers/spi/spi-lantiq-ssc.c | 28 +- + drivers/spi/spi-meson-spicc.c | 43 +- + drivers/spi/spi-microchip-core-qspi.c | 3 +- + drivers/spi/spi-mpc52xx.c | 26 +- + drivers/spi/spi-mxs.c | 14 +- + drivers/spi/spi-npcm-pspi.c | 19 +- + drivers/spi/spi-omap2-mcspi.c | 42 +- + drivers/spi/spi-orion.c | 26 +- + drivers/spi/spi-pci1xxxx.c | 42 +- + drivers/spi/spi-qcom-qspi.c | 80 ++- + drivers/spi/spi-spacemit-k1.c | 789 +++++++++++++++++++++ + drivers/spi/spi-topcliff-pch.c | 8 +- + drivers/spi/spi.c | 4 +- + include/linux/platform_data/spi-s3c64xx.h | 3 +- + 36 files changed, 1261 insertions(+), 520 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spacemit,k1-spi.yaml + create mode 100644 drivers/spi/spi-spacemit-k1.c +Merging tip/master (c7bb8eb40dda Merge branch into tip/master: 'x86/tdx') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/irqchip/Makefile +Auto-merging include/asm-generic/barrier.h +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 - + Documentation/arch/x86/tdx.rst | 7 - + .../interrupt-controller/aspeed,ast2700-intc.yaml | 90 -- + .../aspeed,ast2700-interrupt.yaml | 188 +++ + ...,jh8100-intc.yaml => starfive,jhb100-intc.yaml} | 20 +- + .../devicetree/bindings/timer/fsl,imxgpt.yaml | 1 + + MAINTAINERS | 12 +- + arch/arm/include/asm/arch_gicv3.h | 4 +- + arch/x86/Kconfig | 62 +- + arch/x86/Kconfig.cpu | 54 +- + arch/x86/Kconfig.cpufeatures | 1 - + arch/x86/Makefile | 1 - + arch/x86/Makefile_32.cpu | 6 - + arch/x86/boot/compressed/kaslr.c | 3 +- + arch/x86/boot/compressed/pgtable_64.c | 1 + + arch/x86/boot/startup/sme.c | 1 + + arch/x86/boot/string.c | 30 +- + arch/x86/boot/string.h | 1 - + arch/x86/coco/sev/internal.h | 3 + + arch/x86/coco/sev/vc-handle.c | 12 +- + arch/x86/coco/tdx/tdx.c | 1 + + arch/x86/entry/entry_64.S | 4 +- + arch/x86/entry/entry_fred.c | 10 - + arch/x86/events/amd/core.c | 2 + + arch/x86/events/amd/ibs.c | 1 + + arch/x86/events/amd/lbr.c | 2 + + arch/x86/events/amd/power.c | 3 + + arch/x86/events/amd/uncore.c | 1 + + arch/x86/events/intel/core.c | 14 +- + arch/x86/events/intel/lbr.c | 1 + + arch/x86/events/perf_event.h | 4 +- + arch/x86/events/zhaoxin/core.c | 1 + + arch/x86/include/asm/acrn.h | 2 + + arch/x86/include/asm/bug.h | 4 +- + arch/x86/include/asm/fpu/api.h | 6 - + arch/x86/include/asm/idtentry.h | 29 +- + arch/x86/include/asm/microcode.h | 1 + + arch/x86/include/asm/purgatory.h | 2 +- + arch/x86/include/asm/shared/tdx.h | 1 + + .../{kvm/vmx => include/asm/shared}/tdx_errno.h | 8 +- + arch/x86/include/asm/tdx.h | 9 +- + arch/x86/include/asm/vermagic.h | 6 - + arch/x86/include/asm/xen/hypervisor.h | 1 + + arch/x86/kernel/apic/apic.c | 1 + + arch/x86/kernel/cpu/amd.c | 1 + + arch/x86/kernel/cpu/centaur.c | 1 + + arch/x86/kernel/cpu/common.c | 7 - + arch/x86/kernel/cpu/hygon.c | 1 + + arch/x86/kernel/cpu/mce/core.c | 1 + + arch/x86/kernel/cpu/mce/inject.c | 1 + + arch/x86/kernel/cpu/microcode/amd.c | 1 + + arch/x86/kernel/cpu/microcode/core.c | 1 + + arch/x86/kernel/cpu/microcode/intel-ucode-defs.h | 479 +++--- + arch/x86/kernel/cpu/microcode/intel.c | 1 + + arch/x86/kernel/cpu/mshyperv.c | 1 + + arch/x86/kernel/cpu/resctrl/core.c | 1 + + arch/x86/kernel/cpu/resctrl/monitor.c | 1 + + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/cpu/sgx/driver.c | 3 + + arch/x86/kernel/cpu/sgx/main.c | 3 + + arch/x86/kernel/cpu/topology_amd.c | 1 + + arch/x86/kernel/cpu/topology_common.c | 1 + + arch/x86/kernel/cpu/topology_ext.c | 1 + + arch/x86/kernel/cpu/transmeta.c | 3 + + arch/x86/kernel/cpu/umc.c | 26 - + arch/x86/kernel/cpu/vmware.c | 1 + + arch/x86/kernel/cpu/zhaoxin.c | 1 + + arch/x86/kernel/cpuid.c | 1 + + arch/x86/kernel/crash.c | 2 + + arch/x86/kernel/fpu/core.c | 5 - + arch/x86/kernel/fpu/init.c | 9 +- + arch/x86/kernel/jailhouse.c | 1 + + arch/x86/kernel/kvm.c | 1 + + arch/x86/kernel/machine_kexec_64.c | 16 - + arch/x86/kernel/paravirt.c | 1 + + arch/x86/kernel/traps.c | 21 - + arch/x86/kvm/mmu/mmu.c | 1 + + arch/x86/kvm/mmu/spte.c | 1 + + arch/x86/kvm/reverse_cpuid.h | 2 + + arch/x86/kvm/svm/sev.c | 1 + + arch/x86/kvm/svm/svm.c | 1 + + arch/x86/kvm/vmx/pmu_intel.c | 1 + + arch/x86/kvm/vmx/sgx.c | 1 + + arch/x86/kvm/vmx/tdx.c | 10 - + arch/x86/kvm/vmx/tdx.h | 1 - + arch/x86/kvm/vmx/vmx.c | 1 + + arch/x86/math-emu/Makefile | 30 - + arch/x86/math-emu/README | 427 ----- + arch/x86/math-emu/control_w.h | 46 - + arch/x86/math-emu/div_Xsig.S | 367 ----- + arch/x86/math-emu/div_small.S | 48 - + arch/x86/math-emu/errors.c | 686 -------- + arch/x86/math-emu/exception.h | 51 - + arch/x86/math-emu/fpu_arith.c | 153 -- + arch/x86/math-emu/fpu_asm.h | 32 - + arch/x86/math-emu/fpu_aux.c | 267 ---- + arch/x86/math-emu/fpu_emu.h | 218 --- + arch/x86/math-emu/fpu_entry.c | 718 --------- + arch/x86/math-emu/fpu_etc.c | 136 -- + arch/x86/math-emu/fpu_proto.h | 157 -- + arch/x86/math-emu/fpu_system.h | 130 -- + arch/x86/math-emu/fpu_tags.c | 116 -- + arch/x86/math-emu/fpu_trig.c | 1649 -------------------- + arch/x86/math-emu/get_address.c | 401 ----- + arch/x86/math-emu/load_store.c | 322 ---- + arch/x86/math-emu/mul_Xsig.S | 179 --- + arch/x86/math-emu/poly.h | 115 -- + arch/x86/math-emu/poly_2xm1.c | 146 -- + arch/x86/math-emu/poly_atan.c | 209 --- + arch/x86/math-emu/poly_l2.c | 245 --- + arch/x86/math-emu/poly_sin.c | 379 ----- + arch/x86/math-emu/poly_tan.c | 213 --- + arch/x86/math-emu/polynom_Xsig.S | 137 -- + arch/x86/math-emu/reg_add_sub.c | 334 ---- + arch/x86/math-emu/reg_compare.c | 479 ------ + arch/x86/math-emu/reg_constant.c | 123 -- + arch/x86/math-emu/reg_constant.h | 26 - + arch/x86/math-emu/reg_convert.c | 47 - + arch/x86/math-emu/reg_divide.c | 183 --- + arch/x86/math-emu/reg_ld_str.c | 1220 --------------- + arch/x86/math-emu/reg_mul.c | 116 -- + arch/x86/math-emu/reg_norm.S | 150 -- + arch/x86/math-emu/reg_round.S | 711 --------- + arch/x86/math-emu/reg_u_add.S | 169 -- + arch/x86/math-emu/reg_u_div.S | 474 ------ + arch/x86/math-emu/reg_u_mul.S | 150 -- + arch/x86/math-emu/reg_u_sub.S | 274 ---- + arch/x86/math-emu/round_Xsig.S | 142 -- + arch/x86/math-emu/shr_Xsig.S | 89 -- + arch/x86/math-emu/status_w.h | 68 - + arch/x86/math-emu/version.h | 12 - + arch/x86/math-emu/wm_shrx.S | 207 --- + arch/x86/math-emu/wm_sqrt.S | 472 ------ + arch/x86/mm/pti.c | 1 + + arch/x86/pci/xen.c | 1 + + arch/x86/virt/vmx/tdx/tdx.c | 66 +- + arch/x86/virt/vmx/tdx/tdx.h | 1 + + arch/x86/xen/enlighten_hvm.c | 1 + + arch/x86/xen/pmu.c | 1 + + arch/x86/xen/time.c | 1 + + drivers/char/agp/efficeon-agp.c | 1 + + drivers/clocksource/mmio.c | 11 +- + drivers/clocksource/timer-of.c | 24 +- + drivers/clocksource/timer-of.h | 5 +- + drivers/clocksource/timer-rtl-otto.c | 2 +- + drivers/clocksource/timer-sun5i.c | 3 + + drivers/cpufreq/Kconfig.x86 | 26 - + drivers/cpufreq/Makefile | 2 - + drivers/cpufreq/elanfreq.c | 226 --- + drivers/cpufreq/longrun.c | 1 + + drivers/cpufreq/powernow-k7.c | 1 + + drivers/cpufreq/powernow-k8.c | 1 + + drivers/cpufreq/sc520_freq.c | 136 -- + drivers/cpufreq/speedstep-lib.c | 1 + + drivers/firmware/efi/libstub/x86-5lvl.c | 1 + + drivers/gpu/drm/gma500/mmu.c | 2 + + drivers/hwmon/fam15h_power.c | 1 + + drivers/hwmon/k10temp.c | 2 + + drivers/hwmon/k8temp.c | 1 + + drivers/irqchip/.kunitconfig | 5 + + drivers/irqchip/Kconfig | 35 +- + drivers/irqchip/Makefile | 5 +- + drivers/irqchip/irq-aspeed-intc.c | 139 -- + drivers/irqchip/irq-ast2700-intc0-test.c | 473 ++++++ + drivers/irqchip/irq-ast2700-intc0.c | 582 +++++++ + drivers/irqchip/irq-ast2700-intc1.c | 280 ++++ + drivers/irqchip/irq-ast2700.c | 107 ++ + drivers/irqchip/irq-ast2700.h | 48 + + drivers/irqchip/irq-starfive-jh8100-intc.c | 207 --- + drivers/irqchip/irq-starfive-jhb100-intc.c | 254 +++ + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 + + drivers/power/supply/charger-manager.c | 16 +- + drivers/ras/amd/fmpm.c | 1 + + drivers/thermal/intel/intel_hfi.c | 1 + + drivers/thermal/intel/x86_pkg_temp_thermal.c | 1 + + drivers/virt/acrn/hsm.c | 1 + + drivers/watchdog/Kconfig | 2 +- + drivers/xen/events/events_base.c | 1 + + drivers/xen/grant-table.c | 1 + + drivers/xen/xenbus/xenbus_xs.c | 3 + + fs/timerfd.c | 117 +- + include/asm-generic/barrier.h | 4 +- + include/linux/alarmtimer.h | 9 +- + include/linux/clocksource.h | 12 - + include/linux/hrtimer.h | 24 +- + include/linux/irqchip/arm-gic-v3.h | 2 +- + include/linux/irqchip/arm-gic.h | 4 +- + include/linux/rtmutex.h | 22 +- + include/trace/events/timer.h | 13 + + include/trace/events/timer_migration.h | 24 +- + kernel/locking/Makefile | 1 + + kernel/locking/rtmutex.c | 5 + + kernel/locking/rtmutex_api.c | 6 + + kernel/sched/core.c | 14 +- + kernel/sched/membarrier.c | 98 +- + kernel/time/alarmtimer.c | 72 +- + kernel/time/clocksource.c | 9 +- + kernel/time/hrtimer.c | 150 +- + kernel/time/posix-cpu-timers.c | 18 +- + kernel/time/posix-timers.c | 35 +- + kernel/time/posix-timers.h | 4 +- + kernel/time/tick-sched.c | 3 +- + kernel/time/timer.c | 2 +- + kernel/time/timer_migration.c | 205 ++- + kernel/time/timer_migration.h | 19 + + lib/Kconfig.debug | 2 +- + net/netfilter/xt_IDLETIMER.c | 24 +- + scripts/Makefile.lib | 7 +- + scripts/livepatch/klp-build | 250 ++- + scripts/timer_migration_tree.py | 122 ++ + scripts/update-intel-ucode-defs.py | 130 ++ + tools/objtool/Build | 2 +- + tools/objtool/Makefile | 4 +- + tools/objtool/arch/x86/decode.c | 17 +- + tools/objtool/builtin-check.c | 26 +- + tools/objtool/builtin-klp.c | 1 + + tools/objtool/check.c | 412 ++--- + tools/objtool/disas.c | 22 +- + tools/objtool/elf.c | 124 +- + tools/objtool/include/objtool/arch.h | 3 + + tools/objtool/include/objtool/builtin.h | 7 +- + tools/objtool/include/objtool/check.h | 34 +- + tools/objtool/include/objtool/checksum.h | 53 +- + tools/objtool/include/objtool/elf.h | 59 +- + tools/objtool/include/objtool/klp.h | 1 + + tools/objtool/include/objtool/warn.h | 57 +- + tools/objtool/klp-checksum.c | 347 ++++ + tools/objtool/klp-diff.c | 826 +++++++--- + tools/objtool/objtool.c | 3 - + tools/objtool/trace.c | 8 +- + tools/testing/selftests/membarrier/Makefile | 5 +- + .../selftests/membarrier/membarrier_rseq_stress.c | 951 +++++++++++ + tools/testing/selftests/timers/posix_timers.c | 55 +- + 233 files changed, 5781 insertions(+), 15578 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2700-intc.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2700-interrupt.yaml + rename Documentation/devicetree/bindings/interrupt-controller/{starfive,jh8100-intc.yaml => starfive,jhb100-intc.yaml} (68%) + rename arch/x86/{kvm/vmx => include/asm/shared}/tdx_errno.h (90%) + delete mode 100644 arch/x86/kernel/cpu/umc.c + delete mode 100644 arch/x86/math-emu/Makefile + delete mode 100644 arch/x86/math-emu/README + delete mode 100644 arch/x86/math-emu/control_w.h + delete mode 100644 arch/x86/math-emu/div_Xsig.S + delete mode 100644 arch/x86/math-emu/div_small.S + delete mode 100644 arch/x86/math-emu/errors.c + delete mode 100644 arch/x86/math-emu/exception.h + delete mode 100644 arch/x86/math-emu/fpu_arith.c + delete mode 100644 arch/x86/math-emu/fpu_asm.h + delete mode 100644 arch/x86/math-emu/fpu_aux.c + delete mode 100644 arch/x86/math-emu/fpu_emu.h + delete mode 100644 arch/x86/math-emu/fpu_entry.c + delete mode 100644 arch/x86/math-emu/fpu_etc.c + delete mode 100644 arch/x86/math-emu/fpu_proto.h + delete mode 100644 arch/x86/math-emu/fpu_system.h + delete mode 100644 arch/x86/math-emu/fpu_tags.c + delete mode 100644 arch/x86/math-emu/fpu_trig.c + delete mode 100644 arch/x86/math-emu/get_address.c + delete mode 100644 arch/x86/math-emu/load_store.c + delete mode 100644 arch/x86/math-emu/mul_Xsig.S + delete mode 100644 arch/x86/math-emu/poly.h + delete mode 100644 arch/x86/math-emu/poly_2xm1.c + delete mode 100644 arch/x86/math-emu/poly_atan.c + delete mode 100644 arch/x86/math-emu/poly_l2.c + delete mode 100644 arch/x86/math-emu/poly_sin.c + delete mode 100644 arch/x86/math-emu/poly_tan.c + delete mode 100644 arch/x86/math-emu/polynom_Xsig.S + delete mode 100644 arch/x86/math-emu/reg_add_sub.c + delete mode 100644 arch/x86/math-emu/reg_compare.c + delete mode 100644 arch/x86/math-emu/reg_constant.c + delete mode 100644 arch/x86/math-emu/reg_constant.h + delete mode 100644 arch/x86/math-emu/reg_convert.c + delete mode 100644 arch/x86/math-emu/reg_divide.c + delete mode 100644 arch/x86/math-emu/reg_ld_str.c + delete mode 100644 arch/x86/math-emu/reg_mul.c + delete mode 100644 arch/x86/math-emu/reg_norm.S + delete mode 100644 arch/x86/math-emu/reg_round.S + delete mode 100644 arch/x86/math-emu/reg_u_add.S + delete mode 100644 arch/x86/math-emu/reg_u_div.S + delete mode 100644 arch/x86/math-emu/reg_u_mul.S + delete mode 100644 arch/x86/math-emu/reg_u_sub.S + delete mode 100644 arch/x86/math-emu/round_Xsig.S + delete mode 100644 arch/x86/math-emu/shr_Xsig.S + delete mode 100644 arch/x86/math-emu/status_w.h + delete mode 100644 arch/x86/math-emu/version.h + delete mode 100644 arch/x86/math-emu/wm_shrx.S + delete mode 100644 arch/x86/math-emu/wm_sqrt.S + delete mode 100644 drivers/cpufreq/elanfreq.c + delete mode 100644 drivers/cpufreq/sc520_freq.c + create mode 100644 drivers/irqchip/.kunitconfig + delete mode 100644 drivers/irqchip/irq-aspeed-intc.c + create mode 100644 drivers/irqchip/irq-ast2700-intc0-test.c + create mode 100644 drivers/irqchip/irq-ast2700-intc0.c + create mode 100644 drivers/irqchip/irq-ast2700-intc1.c + create mode 100644 drivers/irqchip/irq-ast2700.c + create mode 100644 drivers/irqchip/irq-ast2700.h + delete mode 100644 drivers/irqchip/irq-starfive-jh8100-intc.c + create mode 100644 drivers/irqchip/irq-starfive-jhb100-intc.c + create mode 100755 scripts/timer_migration_tree.py + create mode 100755 scripts/update-intel-ucode-defs.py + create mode 100644 tools/objtool/klp-checksum.c + create mode 100644 tools/testing/selftests/membarrier/membarrier_rseq_stress.c +Merging kexec/kexec-next (028ef9c96e96 Linux 7.0) +$ git merge -m Merge branch 'kexec-next' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git kexec/kexec-next +Already up to date. +Merging liveupdate/next (34e8f02817e3 memblock tests: define MIGRATE_CMA) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git liveupdate/next +Auto-merging kernel/liveupdate/kexec_handover.c +Auto-merging kernel/liveupdate/luo_session.c +Auto-merging mm/mm_init.c +Merge made by the 'ort' strategy. + include/linux/liveupdate.h | 9 +- + include/linux/memblock.h | 21 ++++- + include/uapi/linux/liveupdate.h | 21 +++++ + kernel/liveupdate/Kconfig | 2 - + kernel/liveupdate/kexec_handover.c | 52 +++++------ + kernel/liveupdate/luo_flb.c | 52 +++++------ + kernel/liveupdate/luo_session.c | 20 +++++ + lib/tests/liveupdate.c | 3 + + mm/memblock.c | 56 +++++------- + mm/mm_init.c | 30 ++++--- + tools/testing/memblock/linux/mmzone.h | 4 + + tools/testing/selftests/kho/vmtest.sh | 4 + + tools/testing/selftests/liveupdate/liveupdate.c | 113 ++++++++++++++++++++++++ + 13 files changed, 283 insertions(+), 104 deletions(-) +Merging clockevents/timers/drivers/next (f182fa740218 clocksource/drivers/sun5i: Add D1 hstimer support) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging Documentation/devicetree/bindings/timer/sifive,clint.yaml +Merge made by the 'ort' strategy. + .../timer/allwinner,sun5i-a13-hstimer.yaml | 9 ++- + .../devicetree/bindings/timer/renesas,rz-mtu3.yaml | 26 +++++-- + .../devicetree/bindings/timer/sifive,clint.yaml | 17 +---- + drivers/clocksource/timer-sun5i.c | 84 +++++++++++++++++----- + 4 files changed, 94 insertions(+), 42 deletions(-) +Merging edac/edac-for-next (3d63012017f1 Merge ras/edac-urgent into for-next) +$ git merge -m Merge branch 'edac-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. +Merging ftrace/for-next (0b6bc3dbe632 Merge tag 'trace-latency-v7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Already up to date. +Merging rcu/next (ed062c41dfda Merge branch 'rcu-nocb.20260123a') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux rcu/next +Already up to date. +Merging paulmck/non-rcu/next (48f7a50c027d stop_machine: Fix the documentation for a NULL cpus argument) +$ git merge -m Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Already up to date. +Merging kvm/next (6d35786de281 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (94b4ae79ebb4 Merge branch kvm-arm64/misc-7.1 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (9b8e8aad5896 KVM: s390: ucontrol: Fix memslot handling) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-ppc/topic/ppc-kvm (7fd2df204f34 Linux 7.1-rc2) +$ git merge -m Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (ddbf9c76c402 RISC-V: KVM: Fix shift-out-of-bounds in make_xfence_request()) +$ 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 (85f871f6ba46 Merge branch 'selftests_kernel_types') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Merge made by the 'ort' strategy. +Merging xen-tip/linux-next (3f100dd61ad4 xen/grant-table: guard gnttab_suspend/resume with CONFIG_HIBERNATE_CALLBACKS) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (8f0b4cce4481 Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (a3aa37e197bb Merge branch 'for-7.2' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging drivers/media/platform/synopsys/hdmirx/snps_hdmirx.c +Merge made by the 'ort' strategy. + drivers/media/pci/ddbridge/ddbridge-core.c | 2 +- + drivers/media/platform/synopsys/hdmirx/snps_hdmirx.c | 8 ++++---- + drivers/platform/cznic/turris-omnia-mcu-gpio.c | 2 +- + drivers/rapidio/rio.c | 2 +- + drivers/virt/acrn/irqfd.c | 2 +- + kernel/umh.c | 2 +- + 6 files changed, 9 insertions(+), 9 deletions(-) +Merging sched-ext/for-next (86d30421307e Merge branch 'for-7.1-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Auto-merging kernel/sched/ext.c +Merge made by the 'ort' strategy. + Documentation/scheduler/sched-ext.rst | 7 +- + include/linux/sched/ext.h | 9 + + kernel/sched/build_policy.c | 5 + + kernel/sched/ext.c | 1084 ++++++++++++++++---- + kernel/sched/ext_cid.c | 409 ++++++++ + kernel/sched/ext_cid.h | 164 +++ + kernel/sched/ext_idle.c | 9 +- + kernel/sched/ext_internal.h | 230 ++++- + kernel/sched/ext_types.h | 104 ++ + tools/sched_ext/README.md | 6 +- + tools/sched_ext/include/scx/cid.bpf.h | 666 ++++++++++++ + tools/sched_ext/include/scx/common.bpf.h | 28 + + tools/sched_ext/include/scx/compat.bpf.h | 30 +- + tools/sched_ext/include/scx/compat.h | 23 +- + tools/sched_ext/include/scx/user_exit_info.bpf.h | 3 + + tools/sched_ext/include/scx/user_exit_info.h | 2 + + .../sched_ext/include/scx/user_exit_info_common.h | 5 + + tools/sched_ext/scx_central.bpf.c | 10 +- + tools/sched_ext/scx_cpu0.bpf.c | 2 - + tools/sched_ext/scx_cpu0.c | 2 - + tools/sched_ext/scx_flatcg.c | 12 +- + tools/sched_ext/scx_qmap.bpf.c | 893 +++++++++------- + tools/sched_ext/scx_qmap.c | 109 +- + tools/sched_ext/scx_qmap.h | 73 ++ + .../selftests/sched_ext/non_scx_kfunc_deny.bpf.c | 7 +- + 25 files changed, 3237 insertions(+), 655 deletions(-) + create mode 100644 kernel/sched/ext_cid.c + create mode 100644 kernel/sched/ext_cid.h + create mode 100644 kernel/sched/ext_types.h + create mode 100644 tools/sched_ext/include/scx/cid.bpf.h + create mode 100644 tools/sched_ext/scx_qmap.h +Merging drivers-x86/for-next (6cf1c1e9f21b platform/x86/intel-uncore-freq: Expose instance ID in the sysfs) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Merge made by the 'ort' strategy. + .../pm/intel_uncore_frequency_scaling.rst | 7 ++++ + drivers/char/sonypi.c | 5 +-- + drivers/platform/x86/Kconfig | 1 + + .../x86/dell/dell-wmi-sysman/biosattr-interface.c | 8 ++--- + .../x86/dell/dell-wmi-sysman/dell-wmi-sysman.h | 4 +-- + .../dell/dell-wmi-sysman/passwordattr-interface.c | 4 +-- + drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 6 ++-- + drivers/platform/x86/dell/dell_rbu.c | 4 +-- + .../uncore-frequency/uncore-frequency-common.c | 16 +++++++-- + .../uncore-frequency/uncore-frequency-common.h | 8 +++-- + .../intel/uncore-frequency/uncore-frequency-tpmi.c | 15 +++++++- + drivers/platform/x86/lenovo/thinkpad_acpi.c | 3 +- + drivers/platform/x86/meraki-mx100.c | 41 ++++++++++------------ + 13 files changed, 76 insertions(+), 46 deletions(-) +$ git am -3 ../patches/0001-hid-Fix-up-mismerge.patch +Applying: hid: Fix up mismerge +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hid/hid-asus.c +$ git add -A . +$ git commit -v -a --amend +[master 3a64da939868] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git + Date: Fri May 8 13:11:32 2026 +0200 +Merging chrome-platform/for-next (a1d39fce42f6 Merge branch 'for-7.1' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec_sensorhub.c | 6 ++++- + drivers/platform/chrome/cros_ec_sysfs.c | 5 +++-- + drivers/platform/chrome/cros_kbd_led_backlight.c | 28 ++++++------------------ + include/linux/platform_data/cros_ec_proto.h | 2 ++ + 4 files changed, 17 insertions(+), 24 deletions(-) +Merging chrome-platform-firmware/for-firmware-next (86e3bbc71633 firmware: google: Skip failing entries instead of aborting populate) +$ git merge -m Merge branch 'for-firmware-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Merge made by the 'ort' strategy. + drivers/firmware/google/coreboot_table.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) +Merging hsi/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds-lj/for-leds-next (863ba8705529 dt-binding: leds: Publish common bindings under dual license) +$ git merge -m Merge branch 'for-leds-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/leds/irled/ir-spi-led.yaml | 2 +- + drivers/leds/leds-pca9532.c | 8 +++++--- + drivers/leds/leds-st1202.c | 1 - + include/dt-bindings/leds/common.h | 2 +- + 4 files changed, 7 insertions(+), 6 deletions(-) +Merging ipmi/for-next (c9ccd876a06e ipmi:kcs: Reduce the number of retries) +$ git merge -m Merge branch 'for-next' of https://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmi_kcs_sm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging driver-core/driver-core-next (f71cc65c01bd sysfs: upgrade OOB write by buggy .show hook into WARNing) +$ git merge -m Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core/driver-core-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/base/memory.c +Auto-merging drivers/pci/pwrctrl/core.c +Auto-merging include/acpi/acpi_bus.h +Auto-merging rust/helpers/helpers.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 +- + MAINTAINERS | 1 + + arch/arc/mm/dma.c | 4 +- + arch/arm/mach-highbank/highbank.c | 2 +- + arch/arm/mach-mvebu/coherency.c | 2 +- + arch/arm/mm/dma-mapping-nommu.c | 4 +- + arch/arm/mm/dma-mapping.c | 28 ++++---- + arch/arm64/kernel/cpufeature.c | 2 +- + arch/arm64/mm/dma-mapping.c | 2 +- + arch/mips/mm/dma-noncoherent.c | 2 +- + arch/powerpc/kernel/dma-iommu.c | 8 +-- + arch/powerpc/platforms/pseries/hotplug-memory.c | 4 +- + arch/riscv/mm/dma-noncoherent.c | 2 +- + drivers/acpi/bus.c | 6 +- + drivers/acpi/scan.c | 2 +- + drivers/base/base.h | 14 ++++ + drivers/base/bus.c | 11 ++- + drivers/base/core.c | 44 ++++++------ + drivers/base/cpu.c | 4 +- + drivers/base/dd.c | 18 +++-- + drivers/base/faux.c | 32 ++++----- + drivers/base/firmware_loader/sysfs_upload.c | 8 +-- + drivers/base/isa.c | 12 ++-- + drivers/base/memory.c | 2 +- + drivers/base/pinctrl.c | 2 +- + drivers/base/platform.c | 2 +- + drivers/dma/ti/k3-udma-glue.c | 6 +- + drivers/dma/ti/k3-udma.c | 6 +- + drivers/iommu/dma-iommu.c | 9 ++- + drivers/iommu/iommu.c | 5 +- + drivers/net/pcs/pcs-xpcs-plat.c | 2 +- + drivers/of/device.c | 6 +- + drivers/pci/of.c | 2 +- + drivers/pci/pwrctrl/core.c | 2 +- + drivers/tty/serial/serial_base_bus.c | 2 +- + drivers/usb/gadget/udc/aspeed-vhub/dev.c | 2 +- + fs/sysfs/file.c | 5 +- + include/acpi/acpi_bus.h | 11 +++ + include/linux/device.h | 91 +++++++++++-------------- + include/linux/device/class.h | 2 +- + include/linux/dma-map-ops.h | 6 +- + include/linux/dma-mapping.h | 2 +- + include/linux/iommu-dma.h | 3 +- + kernel/cpu.c | 4 +- + kernel/dma/mapping.c | 12 ++-- + mm/hmm.c | 2 +- + rust/helpers/acpi.c | 16 +++++ + rust/helpers/helpers.c | 1 + + rust/kernel/driver.rs | 74 ++++++++++++++++---- + 49 files changed, 285 insertions(+), 209 deletions(-) + create mode 100644 rust/helpers/acpi.c +Merging usb/usb-next (25bd55f46032 usb: udc: pxa: remove unused platform_data) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/usb/cdns,usb3.yaml | 10 +- + .../devicetree/bindings/usb/genesys,gl850g.yaml | 18 ++ + arch/arm/mach-pxa/devices.c | 7 - + arch/arm/mach-pxa/gumstix.c | 1 - + arch/arm/mach-pxa/udc.h | 8 - + drivers/usb/Makefile | 2 - + drivers/usb/cdns3/Kconfig | 112 +++---- + drivers/usb/cdns3/Makefile | 46 +-- + drivers/usb/cdns3/cdns3-gadget.c | 1 + + drivers/usb/cdns3/cdns3-plat.c | 27 +- + drivers/usb/cdns3/cdnsp-gadget.c | 50 ++- + drivers/usb/cdns3/cdnsp-gadget.h | 1 + + drivers/usb/cdns3/cdnsp-mem.c | 73 +++-- + drivers/usb/cdns3/cdnsp-pci.c | 209 ++++++------ + drivers/usb/cdns3/cdnsp-ring.c | 9 +- + drivers/usb/cdns3/core.c | 45 +-- + drivers/usb/cdns3/core.h | 5 +- + drivers/usb/cdns3/gadget-export.h | 10 +- + drivers/usb/cdns3/host-export.h | 4 +- + drivers/usb/gadget/udc/core.c | 7 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 41 +-- + drivers/usb/gadget/udc/pxa25x_udc.h | 2 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 35 +-- + drivers/usb/gadget/udc/pxa27x_udc.h | 2 - + drivers/usb/misc/Kconfig | 2 +- + drivers/usb/misc/onboard_usb_dev.c | 1 + + drivers/usb/misc/onboard_usb_dev.h | 8 + + drivers/usb/typec/mux/intel_pmc_mux.c | 19 +- + drivers/usb/typec/mux/ps883x.c | 350 +++++++++++---------- + include/linux/platform_data/pxa2xx_udc.h | 15 - + 30 files changed, 550 insertions(+), 570 deletions(-) + delete mode 100644 arch/arm/mach-pxa/udc.h +Merging thunderbolt/next (cf0c38ee554c thunderbolt: Don't create multiple DMA tunnels on firmware connection manager) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/debugfs.c | 8 +- + drivers/thunderbolt/dma_test.c | 20 ++--- + drivers/thunderbolt/domain.c | 33 ++++++++ + drivers/thunderbolt/icm.c | 15 ++++ + drivers/thunderbolt/nhi.c | 4 + + drivers/thunderbolt/path.c | 31 +++++-- + drivers/thunderbolt/switch.c | 14 ++++ + drivers/thunderbolt/tb.c | 65 ++++++++------- + drivers/thunderbolt/tb.h | 2 + + drivers/thunderbolt/xdomain.c | 185 +++++++++++++++++++++++++++++------------ + include/linux/thunderbolt.h | 4 + + 11 files changed, 275 insertions(+), 106 deletions(-) +Merging usb-serial/usb-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (a2083fd1fa7a serial: qcom: Unify user-visible "Qualcomm" name) +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Merge made by the 'ort' strategy. + drivers/tty/serial/Kconfig | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging char-misc/char-misc-next (7fd2df204f34 Linux 7.1-rc2) +$ git merge -m Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging coresight/next (0ec0a8785d21 coresight: etm4x: Correct TRCVMIDCCTLR1 save and restore) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Merge made by the 'ort' strategy. + .../hwtracing/coresight/coresight-cti-platform.c | 1 + + drivers/hwtracing/coresight/coresight-etm4x-core.c | 52 +++++++++++++++------- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 4 +- + 3 files changed, 39 insertions(+), 18 deletions(-) +Merging fastrpc/for-next (6de23f81a5e0 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (d4d5ad6c6039 fpga-mgr: Add Efinix SPI programming driver) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + .../bindings/fpga/efinix,trion-config.yaml | 98 ++++++++ + .../bindings/fpga/technologic,ts7300-fpga.yaml | 36 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + drivers/fpga/Kconfig | 7 + + drivers/fpga/Makefile | 1 + + drivers/fpga/efinix-spi.c | 260 +++++++++++++++++++++ + drivers/fpga/of-fpga-region.c | 3 +- + drivers/fpga/ts73xx-fpga.c | 9 + + 8 files changed, 414 insertions(+), 2 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fpga/efinix,trion-config.yaml + create mode 100644 Documentation/devicetree/bindings/fpga/technologic,ts7300-fpga.yaml + create mode 100644 drivers/fpga/efinix-spi.c +Merging icc/icc-next (0436cd305d0b MAINTAINERS: Add interconnect kunit test entry) +$ git merge -m Merge branch 'icc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (1a27af12503a iio: light: iqs621-als: prefer early error handling over if (!ret)) +$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Auto-merging drivers/iio/adc/nxp-sar-adc.c +Auto-merging drivers/iio/common/ssp_sensors/ssp_dev.c +Auto-merging drivers/iio/dac/ad5686.c +Auto-merging drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +CONFLICT (content): Merge conflict in drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +Auto-merging drivers/iio/industrialio-buffer.c +Resolved 'drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d68accf9b35e] Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 48 +- + .../devicetree/bindings/iio/adc/adi,ad4080.yaml | 53 +- + .../devicetree/bindings/iio/adc/adi,ad4130.yaml | 19 +- + .../devicetree/bindings/iio/adc/adi,ad4691.yaml | 180 ++ + .../devicetree/bindings/iio/dac/adi,ad5706r.yaml | 105 ++ + .../bindings/iio/dac/microchip,mcp47feb02.yaml | 36 +- + .../bindings/iio/gyroscope/bosch,bmg160.yaml | 6 + + .../devicetree/bindings/iio/light/tsl2772.yaml | 2 + + Documentation/driver-api/iio/buffers.rst | 7 +- + Documentation/iio/ad4691.rst | 204 +++ + Documentation/iio/iio_devbuf.rst | 3 +- + Documentation/iio/index.rst | 1 + + Documentation/misc-devices/apds990x.rst | 128 -- + Documentation/misc-devices/index.rst | 1 - + MAINTAINERS | 19 +- + drivers/iio/accel/adxl313_core.c | 10 +- + drivers/iio/accel/adxl313_i2c.c | 10 +- + drivers/iio/accel/adxl313_spi.c | 11 +- + drivers/iio/accel/adxl355_core.c | 28 +- + drivers/iio/accel/adxl355_i2c.c | 11 +- + drivers/iio/accel/adxl355_spi.c | 11 +- + drivers/iio/accel/adxl367.c | 4 +- + drivers/iio/accel/adxl372.c | 10 +- + drivers/iio/accel/adxl380.c | 4 +- + drivers/iio/adc/Kconfig | 19 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad4062.c | 7 +- + drivers/iio/adc/ad4080.c | 257 ++- + drivers/iio/adc/ad4130.c | 493 +++++- + drivers/iio/adc/ad4170-4.c | 47 +- + drivers/iio/adc/ad4691.c | 1792 ++++++++++++++++++++ + drivers/iio/adc/ad7191.c | 63 +- + drivers/iio/adc/ad7280a.c | 75 +- + drivers/iio/adc/ad7292.c | 16 +- + drivers/iio/adc/ad7625.c | 4 +- + drivers/iio/adc/ad7768-1.c | 6 +- + drivers/iio/adc/ad7780.c | 46 +- + drivers/iio/adc/ad7791.c | 19 +- + drivers/iio/adc/ad7793.c | 30 +- + drivers/iio/adc/ad7949.c | 25 +- + drivers/iio/adc/ad799x.c | 135 +- + drivers/iio/adc/ad9467.c | 9 +- + drivers/iio/adc/ltc2309.c | 16 +- + drivers/iio/adc/mcp3422.c | 65 +- + drivers/iio/adc/nxp-sar-adc.c | 6 +- + drivers/iio/adc/rtq6056.c | 10 +- + drivers/iio/adc/ti-ads7924.c | 5 +- + drivers/iio/adc/ti-ads7950.c | 256 ++- + drivers/iio/adc/ti-ads8688.c | 70 +- + drivers/iio/addac/ad74115.c | 5 +- + drivers/iio/chemical/sgp30.c | 3 +- + drivers/iio/common/ssp_sensors/ssp_dev.c | 2 +- + drivers/iio/common/ssp_sensors/ssp_spi.c | 8 +- + drivers/iio/dac/Kconfig | 11 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/ad3552r.c | 7 +- + drivers/iio/dac/ad5686.c | 4 +- + drivers/iio/dac/ad5706r.c | 253 +++ + drivers/iio/dac/ad5755.c | 5 +- + drivers/iio/dac/ad5758.c | 4 +- + drivers/iio/dac/ad7303.c | 4 +- + drivers/iio/dac/ltc2664.c | 4 +- + drivers/iio/dac/mcp4821.c | 137 +- + drivers/iio/gyro/adxrs290.c | 75 +- + drivers/iio/imu/bno055/bno055.c | 27 +- + drivers/iio/imu/st_lsm6dsx/Makefile | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 28 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 43 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 58 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_fusion.c | 241 +++ + drivers/iio/industrialio-backend.c | 53 +- + drivers/iio/industrialio-buffer.c | 48 +- + drivers/iio/industrialio-core.c | 1 + + drivers/iio/light/cm3232.c | 3 +- + drivers/iio/light/iqs621-als.c | 111 +- + drivers/iio/light/si1133.c | 70 +- + drivers/iio/light/stk3310.c | 105 +- + drivers/iio/light/tsl2772.c | 16 + + drivers/iio/light/vcnl4000.c | 276 ++- + drivers/iio/magnetometer/ak8975.c | 4 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 6 +- + drivers/iio/magnetometer/rm3100-core.c | 94 +- + drivers/iio/orientation/hid-sensor-rotation.c | 71 +- + drivers/iio/proximity/srf08.c | 17 +- + drivers/iio/temperature/maxim_thermocouple.c | 6 +- + drivers/misc/Kconfig | 10 - + drivers/misc/Makefile | 1 - + drivers/misc/apds990x.c | 1284 -------------- + drivers/staging/iio/frequency/ad9832.c | 20 +- + drivers/staging/iio/frequency/ad9834.c | 45 +- + include/linux/iio/backend.h | 1 + + include/linux/iio/buffer.h | 14 +- + include/linux/iio/iio.h | 33 +- + include/linux/platform_data/apds990x.h | 65 - + include/uapi/linux/iio/types.h | 1 + + tools/iio/iio_event_monitor.c | 1 + + tools/iio/iio_generic_buffer.c | 70 +- + tools/iio/iio_utils.c | 12 +- + tools/iio/iio_utils.h | 4 +- + 99 files changed, 4963 insertions(+), 2784 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad4691.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5706r.yaml + create mode 100644 Documentation/iio/ad4691.rst + delete mode 100644 Documentation/misc-devices/apds990x.rst + create mode 100644 drivers/iio/adc/ad4691.c + create mode 100644 drivers/iio/dac/ad5706r.c + create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_fusion.c + delete mode 100644 drivers/misc/apds990x.c + delete mode 100644 include/linux/platform_data/apds990x.h +Merging phy-next/next (f67ab4706ab7 phy: renesas: rcar-gen3-usb2: Simplify ID/VBUS detection logic) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Merge made by the 'ort' strategy. + drivers/phy/phy-airoha-pcie-regs.h | 2 +- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 10 ++++------ + 2 files changed, 5 insertions(+), 7 deletions(-) +Merging soundwire/next (35a5ab8ef7f0 soundwire: use krealloc_array to prevent integer overflow) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + drivers/soundwire/generic_bandwidth_allocation.c | 56 +++++++++++------------- + drivers/soundwire/intel_auxdevice.c | 2 + + drivers/soundwire/slave.c | 4 +- + drivers/soundwire/stream.c | 13 +++++- + 4 files changed, 42 insertions(+), 33 deletions(-) +Merging extcon/extcon-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'extcon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'gnss-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (30471982cd66 vfio/cdx: Consolidate MSI configured state onto cdx_irqs) +$ git merge -m Merge branch 'next' of https://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging spmi/spmi-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'spmi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (81f55766523e staging: rtl8723bs: remove blank line after open brace in hal_com.c) +$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Merge made by the 'ort' strategy. + .../cavium-octeon/executive/cvmx-helper-util.c | 2 +- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 8 +- + arch/mips/cavium-octeon/executive/cvmx-pko.c | 6 +- + arch/mips/cavium-octeon/executive/cvmx-spi.c | 16 +- + arch/mips/include/asm/octeon/cvmx-helper-util.h | 2 +- + arch/mips/include/asm/octeon/cvmx-helper.h | 6 +- + arch/mips/include/asm/octeon/cvmx-pip.h | 6 +- + arch/mips/include/asm/octeon/cvmx-pko.h | 26 +-- + arch/mips/include/asm/octeon/cvmx-pow.h | 12 +- + arch/mips/include/asm/octeon/cvmx-spi.h | 38 ++-- + drivers/staging/fbtft/fb_ssd1351.c | 3 +- + drivers/staging/fbtft/fbtft-core.c | 3 +- + drivers/staging/fbtft/fbtft-io.c | 7 - + drivers/staging/fbtft/fbtft.h | 1 - + .../greybus/Documentation/firmware/authenticate.c | 2 +- + .../greybus/Documentation/sysfs-bus-greybus | 2 +- + drivers/staging/most/dim2/dim2.c | 6 +- + drivers/staging/most/dim2/errors.h | 2 +- + drivers/staging/most/dim2/hal.c | 2 +- + drivers/staging/most/dim2/hal.h | 2 +- + drivers/staging/most/dim2/reg.h | 2 +- + drivers/staging/most/dim2/sysfs.h | 2 +- + drivers/staging/most/net/net.c | 12 +- + drivers/staging/most/video/video.c | 23 +-- + drivers/staging/nvec/nvec.c | 8 +- + drivers/staging/octeon/ethernet.c | 6 +- + drivers/staging/octeon/octeon-stubs.h | 48 ++--- + drivers/staging/rtl8723bs/core/rtw_ap.c | 78 +------- + drivers/staging/rtl8723bs/core/rtw_btcoex.c | 15 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 23 ++- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_io.c | 20 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 58 +++--- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 30 +-- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 88 ++------- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 107 ++++------- + drivers/staging/rtl8723bs/core/rtw_security.c | 211 ++++++++++----------- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 25 ++- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 183 +++++++++--------- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 22 ++- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 4 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 5 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 25 ++- + drivers/staging/rtl8723bs/hal/hal_com.c | 51 +---- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 15 +- + drivers/staging/rtl8723bs/hal/hal_intf.c | 45 +---- + drivers/staging/rtl8723bs/hal/hal_pwr_seq.c | 18 +- + drivers/staging/rtl8723bs/hal/odm.c | 13 +- + drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 2 +- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 32 ++-- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 20 +- + drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 14 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 85 ++++----- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 65 +++---- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 14 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 77 +++----- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 152 ++------------- + drivers/staging/rtl8723bs/include/HalVerDef.h | 85 --------- + drivers/staging/rtl8723bs/include/hal_com.h | 3 - + drivers/staging/rtl8723bs/include/hal_data.h | 4 +- + drivers/staging/rtl8723bs/include/hal_intf.h | 13 -- + drivers/staging/rtl8723bs/include/ieee80211.h | 4 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 23 --- + drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 1 - + drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_btcoex.h | 11 +- + drivers/staging/rtl8723bs/include/rtw_cmd.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_efuse.h | 14 +- + drivers/staging/rtl8723bs/include/rtw_io.h | 16 -- + drivers/staging/rtl8723bs/include/rtw_recv.h | 8 +- + drivers/staging/rtl8723bs/include/rtw_xmit.h | 1 - + drivers/staging/rtl8723bs/include/sdio_ops.h | 4 +- + drivers/staging/rtl8723bs/include/wifi.h | 16 +- + drivers/staging/rtl8723bs/include/xmit_osdep.h | 1 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 63 +++--- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 27 +-- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 20 +- + drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 4 +- + drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 18 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 15 +- + drivers/staging/sm750fb/ddk750_power.c | 17 -- + drivers/staging/sm750fb/ddk750_power.h | 5 - + drivers/staging/sm750fb/sm750.c | 20 +- + drivers/staging/sm750fb/sm750.h | 6 +- + drivers/staging/sm750fb/sm750_accel.c | 21 +- + drivers/staging/sm750fb/sm750_cursor.c | 43 ----- + drivers/staging/sm750fb/sm750_cursor.h | 2 - + drivers/staging/sm750fb/sm750_hw.c | 14 +- + 92 files changed, 757 insertions(+), 1496 deletions(-) + delete mode 100644 drivers/staging/rtl8723bs/include/HalVerDef.h +Merging counter-next/counter-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'counter-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (59b723cd2adb Linux 6.12-rc6) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (c8c84430640e Merge branch 'for-7.1-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. + kernel/cgroup/cpuset.c | 14 +++--- + kernel/cgroup/rdma.c | 116 ++++++++++++++++++++++++------------------------- + 2 files changed, 65 insertions(+), 65 deletions(-) +Merging scsi/for-next (98f69975d4c0 Merge branch '7.1/scsi-queue' into 7.1/scsi-fixes) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Already up to date. +Merging scsi-mkp/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (ebcff9dacaf2 vduse: avoid adding implicit padding) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (54dacf6efe71 Merge branch 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../bindings/remoteproc/fsl,imx-rproc.yaml | 3 + + drivers/firmware/xilinx/zynqmp.c | 28 +++++++ + drivers/remoteproc/Kconfig | 1 - + drivers/remoteproc/imx_rproc.c | 92 +++++++++++++++++++++- + drivers/remoteproc/imx_rproc.h | 2 + + drivers/remoteproc/xlnx_r5_remoteproc.c | 46 ++++++++--- + include/linux/firmware/xlnx-zynqmp.h | 21 +++++ + 7 files changed, 180 insertions(+), 13 deletions(-) +Merging gpio-brgl/gpio/for-next (87e4643ab19c gpio: amd8111: Drop useless zeros in array initialisation) +$ git merge -m Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Merge made by the 'ort' strategy. + .../bindings/gpio/fairchild,74hc595.yaml | 13 ++ + drivers/gpio/Kconfig | 4 +- + drivers/gpio/gpio-74x164.c | 17 +- + drivers/gpio/gpio-altera.c | 124 +++++---------- + drivers/gpio/gpio-amd8111.c | 4 +- + drivers/gpio/gpio-ep93xx.c | 3 +- + drivers/gpio/gpio-ixp4xx.c | 7 +- + drivers/gpio/gpio-pca953x.c | 7 +- + drivers/gpio/gpio-sim.c | 24 +-- + drivers/gpio/gpio-usbio.c | 1 + + drivers/gpio/gpio-xilinx.c | 6 +- + drivers/gpio/gpiolib-devres.c | 7 + + include/linux/gpio.h | 162 +------------------ + include/linux/gpio/legacy.h | 173 +++++++++++++++++++++ + 14 files changed, 273 insertions(+), 279 deletions(-) + create mode 100644 include/linux/gpio/legacy.h +Merging gpio-intel/for-next (3bb62e3f99a5 gpiolib: acpi: Only trigger ActiveBoth interrupts on boot) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (72b513357689 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'ort' strategy. + .../pinctrl/nvidia,tegra234-pinmux-aon.yaml | 6 +- + .../bindings/pinctrl/nvidia,tegra234-pinmux.yaml | 6 +- + .../bindings/pinctrl/qcom,eliza-tlmm.yaml | 26 +- + .../bindings/pinctrl/qcom,ipq4019-pinctrl.yaml | 5 - + .../bindings/pinctrl/qcom,ipq9650-tlmm.yaml | 118 ++ + .../bindings/pinctrl/qcom,nord-tlmm.yaml | 141 ++ + .../bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 5 - + .../pinctrl/qcom,sm6350-lpass-lpi-pinctrl.yaml | 124 ++ + .../bindings/pinctrl/qcom,tlmm-common.yaml | 6 + + drivers/pinctrl/Makefile | 8 +- + drivers/pinctrl/bcm/pinctrl-bcm4908.c | 2 +- + drivers/pinctrl/bcm/pinctrl-ns.c | 2 +- + drivers/pinctrl/mediatek/mtk-eint.c | 6 +- + drivers/pinctrl/mediatek/pinctrl-airoha.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 21 +- + drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 6 +- + drivers/pinctrl/pinconf-generic.c | 7 +- + drivers/pinctrl/pinctrl-equilibrium.c | 3 +- + drivers/pinctrl/pinctrl-ingenic.c | 3 +- + drivers/pinctrl/pinctrl-rockchip.c | 2 +- + drivers/pinctrl/pinctrl-single.c | 3 +- + drivers/pinctrl/qcom/Kconfig | 34 +- + drivers/pinctrl/qcom/Kconfig.msm | 164 +- + drivers/pinctrl/qcom/Makefile | 3 + + drivers/pinctrl/qcom/pinctrl-apq8064.c | 2 +- + drivers/pinctrl/qcom/pinctrl-apq8084.c | 2 +- + drivers/pinctrl/qcom/pinctrl-eliza.c | 194 ++- + drivers/pinctrl/qcom/pinctrl-glymur.c | 2 +- + drivers/pinctrl/qcom/pinctrl-hawi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq4019.c | 4 +- + drivers/pinctrl/qcom/pinctrl-ipq6018.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq8064.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq8074.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq9650.c | 762 +++++++++ + drivers/pinctrl/qcom/pinctrl-kaanapali.c | 2 +- + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 2 + + drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 20 + + drivers/pinctrl/qcom/pinctrl-mdm9607.c | 2 +- + drivers/pinctrl/qcom/pinctrl-mdm9615.c | 2 +- + drivers/pinctrl/qcom/pinctrl-milos.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 5 + + drivers/pinctrl/qcom/pinctrl-msm8226.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8660.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8916.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8953.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8960.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8976.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8994.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8996.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8998.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8x74.c | 2 +- + drivers/pinctrl/qcom/pinctrl-nord.c | 1770 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-qcm2290.c | 25 +- + drivers/pinctrl/qcom/pinctrl-qcs404.c | 2 +- + drivers/pinctrl/qcom/pinctrl-qcs615.c | 8 +- + drivers/pinctrl/qcom/pinctrl-qdu1000.c | 6 - + drivers/pinctrl/qcom/pinctrl-sc7180.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc7280.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdm660.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdm845.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdx55.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdx65.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm4450.c | 7 - + drivers/pinctrl/qcom/pinctrl-sm6115.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm6125.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm6350-lpass-lpi.c | 149 ++ + drivers/pinctrl/qcom/pinctrl-sm6350.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm6375.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8150.c | 10 +- + drivers/pinctrl/qcom/pinctrl-sm8250.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8350.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8450.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8550.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8650.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8750.c | 2 +- + drivers/pinctrl/qcom/pinctrl-x1e80100.c | 2 +- + drivers/pinctrl/realtek/Kconfig | 12 +- + drivers/pinctrl/sophgo/pinctrl-cv18xx.c | 14 +- + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 12 +- + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.h | 2 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 2 +- + drivers/pinctrl/tegra/Kconfig | 22 +- + drivers/pinctrl/vt8500/Kconfig | 13 +- + 83 files changed, 3542 insertions(+), 278 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq9650-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,nord-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm6350-lpass-lpi-pinctrl.yaml + create mode 100644 drivers/pinctrl/qcom/pinctrl-ipq9650.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-nord.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm6350-lpass-lpi.c +Merging pinctrl-intel/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (e572f9db7309 pinctrl: renesas: rzv2m: Fix type in .pin_config_group_get() callback) +$ git merge -m Merge branch 'renesas-pinctrl' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 35 ++ + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 577 ++++++++++++++++++++- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 3 +- + .../pinctrl/renesas,r9a08g046-pinctrl.h | 38 ++ + 4 files changed, 631 insertions(+), 22 deletions(-) + create mode 100644 include/dt-bindings/pinctrl/renesas,r9a08g046-pinctrl.h +Merging pinctrl-samsung/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/pwm/for-next (90f92815cbd4 pwm: Consistently define pci_device_ids using named initializers) +$ git merge -m Merge branch 'pwm/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/qcom,ipq6018-pwm.yaml | 51 ++++ + drivers/pwm/Kconfig | 12 + + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-dwc.c | 2 +- + drivers/pwm/pwm-ipq.c | 263 +++++++++++++++++++++ + drivers/pwm/pwm-lpss-pci.c | 18 +- + 6 files changed, 337 insertions(+), 10 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/qcom,ipq6018-pwm.yaml + create mode 100644 drivers/pwm/pwm-ipq.c +Merging ktest/for-next (932cdaf3e273 ktest: Add logfile to failure directory) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (5f4974231fb3 kselftest: fix doc for ksft_test_result_report()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging tools/testing/selftests/kselftest.h +Merge made by the 'ort' strategy. + Documentation/dev-tools/kselftest.rst | 12 +++ + tools/testing/selftests/kselftest.h | 4 +- + tools/testing/selftests/resctrl/cache.c | 30 +++--- + tools/testing/selftests/resctrl/cat_test.c | 41 ++------ + tools/testing/selftests/resctrl/cmt_test.c | 36 ++++++- + tools/testing/selftests/resctrl/fill_buf.c | 4 +- + tools/testing/selftests/resctrl/mba_test.c | 6 +- + tools/testing/selftests/resctrl/mbm_test.c | 6 +- + tools/testing/selftests/resctrl/resctrl.h | 20 ++-- + tools/testing/selftests/resctrl/resctrl_val.c | 141 +++++++++++++++++++------- + 10 files changed, 196 insertions(+), 104 deletions(-) +Merging kunit/test (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'test' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (c12222dcce91 kunit: Fix spelling mistakes in comments and messages) +$ git merge -m Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + scripts/clang-tools/gen_compile_commands.py | 2 ++ + tools/testing/kunit/kunit_kernel.py | 2 +- + tools/testing/kunit/kunit_parser.py | 2 +- + tools/testing/kunit/qemu_configs/or1k.py | 18 ++++++++++++++++++ + 4 files changed, 22 insertions(+), 2 deletions(-) + create mode 100644 tools/testing/kunit/qemu_configs/or1k.py +Merging livepatching/for-next (8f7168335cb2 selftests: livepatch: Check if stack_order sysfs attribute exists) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git livepatching/for-next +Merge made by the 'ort' strategy. + tools/testing/selftests/livepatch/functions.sh | 10 + + tools/testing/selftests/livepatch/test-kprobe.sh | 8 +- + tools/testing/selftests/livepatch/test-sysfs.sh | 213 +++++++++++---------- + .../livepatch/test_modules/test_klp_syscall.c | 27 ++- + 4 files changed, 150 insertions(+), 108 deletions(-) +Merging rtc/rtc-next (b72386864481 rtc: ab8500: replace sprintf() with sysfs_emit()) +$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + drivers/rtc/rtc-ab8500.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging nvdimm/libnvdimm-for-next (45df9111692c dax/fsdev: fix uninitialized kaddr in fsdev_dax_zero_page_range()) +$ git merge -m Merge branch 'libnvdimm-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'at24/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (7b3302c687ca ntb_hw_amd: Fix incorrect debug message in link disable path) +$ 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/amd/ntb_hw_amd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging seccomp/for-next/seccomp (41fa04327384 selftests/seccomp: Add hard-coded __NR_uprobe for x86_64) +$ git merge -m Merge branch 'for-next/seccomp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging slimbus/for-next (6de23f81a5e0 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (8d48419d141c Merge branches 'nvmem-fixes' and 'nvmem-for-7.1' into nvmem-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'ort' strategy. +Merging hyperv/hyperv-next (5170a82e8921 x86/hyperv: Skip LP/VP creation on kexec) +$ git merge -m Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/for-next (d25e5cbac4e2 auxdisplay: max6959: use regmap_assign_bits() in max6959_enable()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Merge made by the 'ort' strategy. + drivers/auxdisplay/max6959.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging kgdb/kgdb/for-next (fdbdd0ccb30a kdb: remove redundant check for scancode 0xe0) +$ git merge -m Merge branch 'kgdb/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'hmm' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'cfi/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (ac12b852b4ea bus: mhi: host: pci_generic: Add Telit FE912C04 modem support) +$ git merge -m Merge branch 'mhi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (d5759519805c x86/alternative: delay freeing of smp_locks section) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging cxl/next (6c724ce0ec6e Merge branch 'for-7.1/cxl-misc' into cxl-for-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (48a428215782 efi/capsule-loader: fix incorrect sizeof in phys array reallocation) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (bcfee135d584 utf8: Remove unused utf8_normalize) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Auto-merging fs/unicode/utf8-core.c +Merge made by the 'ort' strategy. + fs/unicode/utf8-core.c | 22 ---------------------- + include/linux/unicode.h | 3 --- + 2 files changed, 25 deletions(-) +Merging slab/slab/for-next (298cdbf5f7c9 mm, slab: add an optimistic __slab_try_return_freelist()) +$ git merge -m Merge branch 'slab/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + mm/slub.c | 355 +++++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 202 insertions(+), 153 deletions(-) +Merging random/master (bb9ff576fdff virt: vmgenid: remap memory as decrypted) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Merge made by the 'ort' strategy. + drivers/virt/vmgenid.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging landlock/next (3457a5ccacd3 landlock: Document fallocate(2) as another truncation corner case) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging sysctl/sysctl-next (f63a9df7e3f9 sysctl: fix uninitialized variable in proc_do_large_bitmap) +$ git merge -m Merge branch 'sysctl-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (9bf092c97b86 sched: update task_struct->comm comment) +$ git merge -m Merge branch 'for-next/execve' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (1f9b1c892339 bitops: use common function parameter names) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging drivers/iio/pressure/bmp280-core.c +Merge made by the 'ort' strategy. + arch/x86/include/asm/extable_fixup_types.h | 13 ++++------ + arch/x86/mm/extable.c | 2 +- + drivers/iio/adc/intel_dc_ti_adc.c | 4 ++-- + drivers/iio/magnetometer/yamaha-yas530.c | 12 +++++----- + drivers/iio/pressure/bmp280-core.c | 2 +- + drivers/iio/temperature/mcp9600.c | 2 +- + drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 4 ++-- + .../net/wireless/realtek/rtw89/rtw8852b_common.c | 4 ++-- + drivers/net/wireless/realtek/rtw89/rtw8852b_rfk.c | 4 ++-- + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 4 ++-- + drivers/ptp/ptp_fc3.c | 4 ++-- + drivers/rtc/rtc-rv3032.c | 2 +- + include/asm-generic/bitops/lock.h | 28 +++++++++++----------- + include/linux/bitfield.h | 16 +++++++++++++ + 14 files changed, 56 insertions(+), 45 deletions(-) +Merging hte/for-next (005b25ad1171 hte: tegra194: Add Tegra264 GTE support) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (e0142e0de50a Merge branch 'for-next/hardening' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Merge made by the 'ort' strategy. +Merging nolibc/for-next (bb2d82d41894 Merge tag 'v7.1-rc2' into nolibc/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Merge made by the 'ort' strategy. + tools/include/nolibc/Makefile | 4 +- + tools/include/nolibc/alloca.h | 15 ++ + tools/include/nolibc/arch-arm.h | 2 +- + tools/include/nolibc/arch-arm64.h | 2 +- + tools/include/nolibc/arch-loongarch.h | 2 +- + tools/include/nolibc/arch-m68k.h | 2 +- + tools/include/nolibc/arch-mips.h | 96 +++++++------ + tools/include/nolibc/arch-openrisc.h | 160 +++++++++++++++++++++ + tools/include/nolibc/arch-parisc.h | 185 +++++++++++++++++++++++++ + tools/include/nolibc/arch-powerpc.h | 8 +- + tools/include/nolibc/arch-riscv.h | 2 +- + tools/include/nolibc/arch-s390.h | 2 +- + tools/include/nolibc/arch-sh.h | 2 +- + tools/include/nolibc/arch-sparc.h | 2 +- + tools/include/nolibc/arch-x86.h | 74 +++++----- + tools/include/nolibc/arch.h | 4 + + tools/include/nolibc/assert.h | 36 +++++ + tools/include/nolibc/compiler.h | 4 +- + tools/include/nolibc/crt.h | 8 +- + tools/include/nolibc/fcntl.h | 14 ++ + tools/include/nolibc/nolibc.h | 2 + + tools/include/nolibc/stackprotector.h | 2 +- + tools/include/nolibc/sys.h | 32 ++++- + tools/include/nolibc/sys/mman.h | 6 +- + tools/testing/selftests/nolibc/Makefile.nolibc | 50 ++----- + tools/testing/selftests/nolibc/nolibc-test.c | 95 ++++++++++++- + tools/testing/selftests/nolibc/run-tests.sh | 10 +- + 27 files changed, 668 insertions(+), 153 deletions(-) + create mode 100644 tools/include/nolibc/alloca.h + create mode 100644 tools/include/nolibc/arch-openrisc.h + create mode 100644 tools/include/nolibc/arch-parisc.h + create mode 100644 tools/include/nolibc/assert.h +Merging iommufd/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. +Merging turbostat/next (d052a81a8a23 tools/power turbostat: Cleanup: bool force_load) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Merge made by the 'ort' strategy. + tools/power/x86/turbostat/turbostat.8 | 6 +- + tools/power/x86/turbostat/turbostat.c | 627 ++++++++++++++++++---------------- + 2 files changed, 329 insertions(+), 304 deletions(-) +Merging pwrseq/pwrseq/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'pwrseq/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next +Already up to date. +Merging capabilities-next/caps-next (071588136007 ipc: don't audit capability check in ipc_permissions()) +$ git merge -m Merge branch 'caps-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Already up to date. +Merging ipe/next (028ef9c96e96 Linux 7.0) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next +Already up to date. +Merging kcsan/next (07a1a6562ce2 kcsan: Silence -Wmaybe-uninitialized when calling __kcsan_check_access()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next +Merge made by the 'ort' strategy. + include/linux/kcsan-checks.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging crc/crc-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'crc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next +Already up to date. +Merging keys-next/keys-next (965e9a2cf23b pkcs7: Change a pr_warn() to pr_warn_once()) +$ git merge -m Merge branch 'keys-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys-next/keys-next +Already up to date. +Merging fwctl/for-next (254f49634ee1 Linux 7.1-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl/for-next +Already up to date. +Merging devsec-tsm/next (3177779ae17d virt: coco: change tsm_class to a const struct) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next +Already up to date. +Merging hisilicon/for-next (b419e155e31d Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/hisilicon/linux-hisi.git hisilicon/for-next +Merge made by the 'ort' strategy. +Merging kthread/for-next (fa39ec4f89f2 doc: Add housekeeping documentation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next +Already up to date. +Merging nfc/for-next (cd7f6b862b5e nfc: hci: fix out-of-bounds read in HCP header parsing) + cd7f6b862b5e ("nfc: hci: fix out-of-bounds read in HCP header parsing") +$ git merge -m Merge branch 'for-next' of https://codeberg.org/linux-nfc/linux.git nfc/for-next +Merge made by the 'ort' strategy. + drivers/nfc/trf7970a.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/localversion-next b/localversion-next new file mode 100644 index 0000000..f04607f --- /dev/null +++ b/localversion-next
@@ -0,0 +1 @@ +-next-20260508