diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..d1c0d2c5312a --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,384 @@ +Name SHA1 +---- ---- +origin d4560686726f7a357922f300fc81f5964be8df04 +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes 1272bf9ff24da2f89d5424a1613aff77e552cbf6 +vfs-brauner-fixes fa0e22eb97a50a468d7ee0a475d253189e2c1940 +fscrypt-current 256abd8e550ce977b728be79a74e1729438b4948 +fsverity-current 256abd8e550ce977b728be79a74e1729438b4948 +btrfs-fixes 8d8ce2d7a07fa9f57a270df2a5081ce189ad4840 +vfs-fixes 9a2fa1472083580b6c66bdaf291f591e1170123a +erofs-fixes 0c3836482481200ead7b416ca80c68a29cfdaabd +nfsd-fixes 91da337e5d506f2c065d20529d105ca40090e320 +v9fs-fixes 0c3836482481200ead7b416ca80c68a29cfdaabd +overlayfs-fixes 77a28aa476873048024ad56daf8f4f17d58ee48e +fs-current b1b8d5385d8ac2b25627f5ad05cbf4c0e4878043 +kbuild-current 33330bcf031818e60a816db0cfd3add9eecc3b28 +arc-current e67572cd2204894179d89bd7b984072f19313b03 +arm-current 0c66c6f4e21cb22220cbd8821c5c73fc157d20dc +arm64-fixes cfb00a35786414e7c0e6226b277d9f09657eae74 +arm-soc-fixes 893738d2fc996e5feb0bb27ab394e00eb190491b +davinci-current 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +sophgo-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +m68k-current 21b9e722ad28c19c2bc83f18f540b3dbd89bf762 +powerpc-fixes 8b7f59de92ac65aa21c7d779274dbfa577ae2d2c +s390-fixes 33bd8d153c337ba9b30a2e5994437ca703ab4ed8 +net 3e7917c0cdad835a5121520fc5686d954b7a61ab +bpf 92c4ee25208d0f35dafc3213cdf355fbe449e078 +ipsec 89a2aefe4b084686c2ffc1ee939585111ea4fc0f +netfilter 14ab4792ee120c022f276a7e4768f4dcb08f0cdd +ipvs 14ab4792ee120c022f276a7e4768f4dcb08f0cdd +wireless de9c2c66ad8e787abec7c9d7eff4f8c3cdd28aed +ath 38055789d15155109b41602ad719d770af507030 +wpan b8ec0dc3845f6c9089573cb5c2c4b05f7fc10728 +rdma-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +sound-current 176fd1511dd9086ab4fa9323cb232177c6235288 +sound-asoc-fixes a44b7b57ef144052cd322880c4d2b3d52e563544 +regmap-fixes c2429cc2c731c806453a20a9a879598376a2bfbe +regulator-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +spi-fixes e4c4638b6a10427d30e29d22351c375886025f47 +pci-current 5560a612c20d3daacbf5da7913deefa5c31742f4 +driver-core.current 15fffc6a5624b13b428bb1c6e9088e32a55eb82c +tty.current 6e20753da6bc651e02378a0cdb78f16c42098c88 +usb.current b1dad2f091382b0049c72dab8153779248fa8016 +usb-serial-fixes 00af4f3dda1461ec90d892edc10bec6d3c50c554 +phy 5af9b304bc6010723c02f74de0bfd24ff19b1a10 +staging.current 8400291e289ee6b2bf9779ff1c83a291501f017b +iio-fixes 61cbfb5368dd50ed0d65ce21d305aa923581db2b +counter-current 8400291e289ee6b2bf9779ff1c83a291501f017b +char-misc.current ffcf2eb4bfa24f7256de53a95182c3e3e23fdc6c +soundwire-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +thunderbolt-fixes e2006140ad2e01a02ed0aff49cc2ae3ceeb11f8d +input-current 206f533a0a7c683982af473079c4111f4a0f9f5e +crypto-current df1e9791998a92fe9f1e7d3f031b34daaad39e2f +vfio-fixes 5a88a3f67e37e39f933b38ebb4985ba5822e9eca +kselftest-fixes 170c966cbe274e664288cfc12ee919d5e706dc50 +dmaengine-fixes b53b831919a0dc4e6631ebe0497ab2a4d8bef014 +backlight-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +mtd-fixes b27d8946b5edd9827ee3c2f9ea1dd30022fb1ebe +mfd-fixes 68f860426d500cfb697b505799244c7dfff604b1 +v4l-dvb-fixes e2ed53694e5356a55fd539a4d8dc56c2fa42b2ff +reset-fixes ab35896730a5e8fdf885a23fa2e27f286c5f94b2 +mips-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +at91-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +omap-fixes 0c3836482481200ead7b416ca80c68a29cfdaabd +kvm-fixes 1773014a975919195be71646fc2c2cad1570fce4 +kvms390-fixes 4c6abb7f7b349f00c0f7ed5045bf67759c012892 +hwmon-fixes bd907ec07c7cd8e7c995271a6640bac870f47511 +nvdimm-fixes 33908660e814203e996f6e775d033c5c32fcf9a7 +cxl-fixes a0f39d51dbf72c28283bd201b97559ed82bc0fe5 +dma-mapping-fixes 75961ffb5cb3e5196f19cae7683f35cc88b50800 +drivers-x86-fixes 3114f77e9453daa292ec0906f313a715c69b5943 +samsung-krzk-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +pinctrl-samsung-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +devicetree-fixes e1cf752ede8e82c2d084868c50a1ca6cdb07c9c4 +dt-krzk-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +scsi-fixes f874d7210d882cb1c58a8e3da66f61cdc63cd4b4 +drm-fixes 27ce65f65258cf2f2855162cbeef59659a81fac4 +drm-intel-fixes 8bdd9ef7e9b1b2a73e394712b72b22055e0e26c3 +mmc-fixes 9374ae912dbb1eed8139ed75fd2c0f1b30ca454d +rtc-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +gnss-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +hyperv-fixes 3b85a2eacd3d886f4d4133a83cdfc2f3b48f06c0 +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes ee9a68394b4bea8b9044ec4bfdbaacf45297ecef +riscv-dt-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +riscv-soc-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +fpga-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +spdx a3e18a540541325a8c8848171f71e0d45ad30b2c +gpio-brgl-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +gpio-intel-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +pinctrl-intel-fixes a366e46da10d7bfa1a52c3bd31f342a3d0e8e7fe +auxdisplay-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +kunit-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +memblock-fixes 8043832e2a123fd9372007a29192f2f3ba328cd6 +renesas-fixes 8c987693dc2d292d777f1be63cb35233049ae25e +perf-current de9c2c66ad8e787abec7c9d7eff4f8c3cdd28aed +efi-fixes ae835a96d72cd025421910edb0e8faf706998727 +zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb +battery-fixes d6cca7631a4b54a8995e3bc53e5afb11d3b0c8ff +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +iommufd-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +rust-fixes 0ba521d6948ecb4acf1276494dfed127fe096ca6 +w1-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +pmdomain-fixes 50359c9c3cb3e55e840e3485f5ee37da5b2b16b6 +i2c-host-fixes b93d16bee557302d4e588375ececd833cc048acc +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +clk-fixes 39a3396558fb97e6e7d4c1eb04c2166da31904a9 +pwrseq-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +thead-dt-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +drm-misc-fixes 929725bd7eb4eea1f75197d9847f3f1ea5afdad1 +mm-stable 8400291e289ee6b2bf9779ff1c83a291501f017b +mm-nonmm-stable 8400291e289ee6b2bf9779ff1c83a291501f017b +mm 497fb60034212ae2492b29129e061c1a798b90e5 +kbuild 7809144639f6c92bcb11bd3284b7806a42cc67fe +clang-format c147f663b6a5813b9860f3917cc473fb2c462d8d +perf 7320ad972510415515d00838451c51f2db3974a7 +compiler-attributes 8400291e289ee6b2bf9779ff1c83a291501f017b +dma-mapping bd44ca3de49cc1badcff7a96010fa2c64f04868c +asm-generic b82c1d235a30622177ce10dcb94dfd691a49922f +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm ba954cad0ce7b0603823850fdf597c8b8dcf8e97 +arm64 36639013b3462c06ff8e3400a427f775b4fc97f5 +arm-perf 42bebc7cca79d545f4eb9ec131560cfdd07762e0 +arm-soc 893738d2fc996e5feb0bb27ab394e00eb190491b +amlogic 0c6580c514ec36ad9c5a3ebd615bbc6ace8e0291 +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed 73feb9cd46f1f0d1130da6961048f8e2a04fc79e +at91 8400291e289ee6b2bf9779ff1c83a291501f017b +broadcom 350006650b29f690626d88ffdf361a2e0b6f35f2 +davinci 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory 23d22b0fe6a12317e9d17bb17720285ac4ba4d54 +imx-mxs 7dd10acc08ab6d8fc2e437f29406db56a91b1206 +mediatek 9dd04bf6bf1c1eecf7227693eab833f89863a74c +mvebu ffd0d7df6bdb4755171c768d3c152aaaed6685d8 +omap 6cb1ac2b11b2f26eb4828ca5d3f0f61556acdb32 +qcom 8f2662ff28a1b439c2b1fe162371f6279c7d6dc1 +renesas 3f3b7f43c49ae8466bde2f92564a43b6737ebec8 +reset c1267e1afae60e0b1d17d3a2e55515ecccb22a3e +rockchip b937835461597baf0f786c07a90b115e5e0e762b +samsung-krzk 166203ab290cc15a7c84453b4ce3597f7a945c24 +scmi cd0e0714e5acb8be10b7387f0cbf5b5fbeb2a3f0 +sophgo d9773e09adddf5cd69889545a5feeff119dc9034 +stm32 1eafc48af859bbee2e1ea0d0bacdc213b1cdaae8 +sunxi 2873085a8cd52a55ed6ae80f94032f912a3f9a91 +tee cd88a296582cf314e04792b73ede0b39f3193fe2 +tegra 5211d93c551f039e9df1b9ececb7102eb6e099fb +thead-dt 32121e158449f0b6d6ab6b2e63b22d9d80471563 +ti 140b0b1e6e77b346c8521efc2167dd1f09362a6b +xilinx 0c559f8a91de81c9ce6ade502a10e8e56e6b16ad +clk 69bec17d289610df0358c778ecd7b1af27d341bf +clk-imx 466da3d2d967ee87d82060df2bc9c6ad4fc4af49 +clk-renesas 42b54d52ecb7a81998592c2b40f8a963e82ed02e +csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b +loongarch 48a3de6cf4c9e5dcd3848d567b447cf295448076 +m68k 21b9e722ad28c19c2bc83f18f540b3dbd89bf762 +m68knommu de9c2c66ad8e787abec7c9d7eff4f8c3cdd28aed +microblaze d829e7ee63546b580ed9ddee374ae73bb4a8c079 +mips 8400291e289ee6b2bf9779ff1c83a291501f017b +openrisc 4dc70e1aadfadf968676d983587c6f5d455aba85 +parisc-hd d173d4d9e831559a2637d81105e49482cbf29b9c +powerpc 9ff0251b2eb54d17fbe4f6aff50f6edfd837adb6 +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v dc1c8034e31b14a2e5e212104ec508aec44ce1b9 +riscv-dt 8400291e289ee6b2bf9779ff1c83a291501f017b +riscv-soc 8400291e289ee6b2bf9779ff1c83a291501f017b +s390 f24ef6ed49287149549799690e3050e421adddb7 +sh 8fe76a1c2264a02155895cda9f97a6a5a9b97d91 +sparc a3da15389112a28633e4c340e4841faab29df3b7 +uml 98ff534ec2cd02496c166614e6c1391d8e092e51 +xtensa b7cf2a1d9881823133acc48427815a48b35b49f4 +bcachefs c84469634e8234b8e1cf3dd43509232f5430b7f0 +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 256abd8e550ce977b728be79a74e1729438b4948 +afs abcbd3bfbbfe97a8912d0c929d4aa18f50d9bc52 +btrfs 787822ab08872a6d2193c8638bddbe0f765f52d6 +ceph 31634d7597d8c57894b6c98eeefc9e58cf842993 +cifs cecb49e3594c2a69163865c214b71fff26d5761d +configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b +dlm 89b01913dc73d7c4b8440b1396909ccb7ec8c4b4 +erofs 8c09c0984a7907e0127282a98fa1c069f2f898e8 +exfat 89fc548767a2155231128cb98726d6d2ea1256c9 +exportfs 0c3836482481200ead7b416ca80c68a29cfdaabd +ext3 85f22bb5d2c2a0b15b10ab34d4413423c3c97884 +ext4 8400291e289ee6b2bf9779ff1c83a291501f017b +f2fs a6c12809975bd4b1ad8bc5ea22a60c9a96b1e412 +fsverity 256abd8e550ce977b728be79a74e1729438b4948 +fuse 529395d2ae6456c556405016ea0c43081fe607f3 +gfs2 6706415bf9f3dcb425f4b60a08a3a6f1d94ec0e0 +jfs d0fa70aca54c8643248e89061da23752506ec0d4 +ksmbd 933069701c1b507825b514317d4edd5d3fd9d417 +nfs de9c2c66ad8e787abec7c9d7eff4f8c3cdd28aed +nfs-anna b9fae9f06d84ffab0f3f9118f3a96bbcdc528bf6 +nfsd 1d04bedf4e959881152d7a66ab1a9f9482e0f20e +ntfs3 8400291e289ee6b2bf9779ff1c83a291501f017b +orangefs 53e4efa470d5fc6a96662d2d3322cfc925818517 +overlayfs 004b8d1491b4bcbb7da1a3206d1e7e66822d47c6 +ubifs 92a286e90203ce3e6c3a6d945fa36da419c3671f +v9fs 2211561723a66e37596b1fc401c792ef36e3dea0 +v9fs-ericvh 0c3836482481200ead7b416ca80c68a29cfdaabd +xfs 7bf888fa26e8f22bed4bc3965ab2a2953104ff96 +zonefs df2f9708ff1f23afdf6804bb16199e1903550582 +iomap 3ac974796e5d94509b85a403449132ea660127c2 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner cb0433302c1eafd581a5e770cd4d1317a1bd04ed +vfs a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6 +fs-next 6572ba54f33bbc2b6fdbd13d05a2e45436015822 +printk b18703ea7157f62f02eb0ceb11f6fa0138e90adc +pci 79b01efa89b28b7ece838ad3a085402753a6618d +pstore de9c2c66ad8e787abec7c9d7eff4f8c3cdd28aed +hid 047c6a90b836a9fbe3ecf46e9c44b8ae4cac3a77 +i2c f17c06c6608ad4ecd2ccf321753fb511812d821b +i2c-host 3f7aed28e1dee4346c7db479fdf77be7e0f6acf1 +i3c 24168c5e6dfbdd5b414f048f47f75d64533296ca +dmi 4d1b28a8119c615f1e932520f9ee1f80bdda5204 +hwmon-staging 9a7ad76118525e13a18e3e2271b6015e5aa1d619 +jc_docs 8663dd38a7ba5b2bfd2c7b4271e6e63bc0ef1e42 +v4l-dvb 8400291e289ee6b2bf9779ff1c83a291501f017b +v4l-dvb-next 812765cd69540b1e3ed5f02e25ccb9904f6a82f7 +pm 5a4e6abbb58af6bf487158fbe7398c4f44aab869 +cpufreq-arm dca2ef2b7d916c718c6e88084170413a8a1942d0 +cpupower 8400291e289ee6b2bf9779ff1c83a291501f017b +devfreq 1d143dde76798ce6655d5de01b0a5d29f2011a38 +pmdomain 8287e9e2c7d26e9e3a6db2812fa8a1c6531b685e +opp 8400291e289ee6b2bf9779ff1c83a291501f017b +thermal 7eeb114a635a04bea2fa7d57cedbf374c714d29e +rdma 2a777679b8ccd09a9a65ea0716ef10365179caac +net-next 45160cebd6ac84fe8cc2b7f6fec2550398e144cd +bpf-next 6e083ab095cabc5fdb5c980420fe43af7753b2dd +ipsec-next 8e0c0ec9b7dc2aec84f141c26c501e24906ff765 +mlx5-next 8400291e289ee6b2bf9779ff1c83a291501f017b +netfilter-next ac26327635d643efe173e7460fa09eb39f0e5c54 +ipvs-next ac26327635d643efe173e7460fa09eb39f0e5c54 +bluetooth bd0b4dae74b0f0ee9ea37818e1c132b56a26d6dd +wireless-next 420a549395c24bf9e4755f9fb220ce72b2f4f8bd +ath-next 3f66f26703093886db81f0610b97a6794511917c +wpan-next 9187210eee7d87eea37b45ea93454a88681894a4 +wpan-staging 9187210eee7d87eea37b45ea93454a88681894a4 +mtd 78a0b13f5744bd270d0c2391973605d9960a402a +nand a503f91a3645651a39baf97f1aed90d5d9f9bda9 +spi-nor 95b9c9a7777d0bebb5dd82c9f8b1aba91d406a41 +crypto b0cd6f4c3f1963439e9f26363c2bd40a05239f0a +drm a4172af3040cdc207f1b60efffcdd219156093c9 +drm-exynos 627a24f5f25d689682f395f3df1411273be4436b +drm-misc 16c9898ac5ab00fc96efee404a1b8bcfe20ad48b +amdgpu 46142cc1b9272d664e0258e105b537735bfeeccc +drm-intel 34d0472ce1087fbf8e2ba504a4625e4c74286c63 +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm fe34394ecdad459d2d7b1f30e4a39ac27fcd77f8 +drm-msm-lumag 399af57ccca2f4bdf6feba8a41b80967b10ea9f1 +drm-xe 9cc033e07d025dee1fac178c20ba96c56f8d9a91 +etnaviv 704d3d60fec451f37706368d9d3e320322978986 +fbdev 8b05b12e86ff17c203e56e9eb84bb7bf2698cc30 +regmap b18d17d1a97b5e2c93eec6f056692faca53eb3eb +sound 901e85677ec0bb9a69fb9eab1feafe0c4eb7d07e +ieee1394 56cc34a8c179b49585b0318a49f26326ed25443d +sound-asoc 80edd74d9129e57b62e9fde35eaa2e60194a2149 +modules 61842868de13aa7fd7391c626e889f4d6f1450bf +input 63f92f11385dc3b1990e5af1d6412c22c71d7342 +block 168f25d973113e372c6dcd947ff75f77906474cd +device-mapper 7f1c4909a821dbfd258177db9ec96dda3ae91346 +libata b40824500eaa77668026b6d1ade6924901a680f9 +pcmcia 0630e3bc0e91b57288921df2927859b23184ca45 +mmc 538076ce6b8dfe5e8e8d9d250298030f165d8457 +mfd d94fc0f04121a20e4d0050cb8689a35191223ae6 +backlight fea88a13a5d14b9f56fa338b47f2044806b3e64d +battery be6299c6e55e971ffc060495708740a59aa0e45b +regulator 08b856b38c257bc23f208ef165816d7e710574e0 +security 924e19c39e8f0bbd581ab8a049f95a0ed02235b1 +apparmor 8400291e289ee6b2bf9779ff1c83a291501f017b +integrity fbf06cee60876d50f259d0689e3c03940750f0d4 +selinux 180cba7a0daf137658a73f2e6e19e6db943088dd +smack e86cac0acdb1a74f608bacefe702f2034133a047 +tomoyo dc1c8034e31b14a2e5e212104ec508aec44ce1b9 +tpmdd b4c6353606130a822bace13d94be1d95c65a6129 +watchdog 63d097d46799dc6ab4d1430482cd5ab6a409c4ec +iommu fca5b78511e98bdff2cdd55c172b23200a7b3404 +audit 8400291e289ee6b2bf9779ff1c83a291501f017b +devicetree 4e354cce395f64001e054a41769ddaaef2efe3b4 +dt-krzk 8400291e289ee6b2bf9779ff1c83a291501f017b +mailbox a8bd68e4329f9a0ad1b878733e0f80be6a971649 +spi 51181a73934f0e43eb7245553e97cb6c195df7ff +tip 9ebdc7589cbb5c976e6c8807cbe13f263d70d32c +clockevents b7625d67eb1a63d33b0a2a4518ce4897d27f7465 +edac 090786479325d85cf9f8565ef802cd6dc62c5321 +ftrace 656a95786db8248e63eb76b09e852c75ad11118b +rcu 02219caa92b5b0ed97f8d8b9cf580f6f34a9be31 +paulmck f01f18f2ed7db28c225b105b24fd3f22de90cdd9 +kvm 1773014a975919195be71646fc2c2cad1570fce4 +kvm-arm bb032b2352c33be374136889789103d724f1b613 +kvms390 7816e58967d0e6cadce05c8540b47ed027dc2499 +kvm-ppc ca8dad0415162efea3597abe06b2025f34213eb5 +kvm-riscv dd4a799bcc13992dd8be9708e5c585f55226b567 +kvm-x86 332d2c1d713e232e163386c35a3ba0c1b90df83f +xen-tip 4c006734898a113a64a528027274a571b04af95a +percpu 2d9ad81ef93570bc0d4929d05d0601ea400d6fcf +workqueues 97dd94173253d22f2a01a3da5448d71f47d08685 +sched-ext 2c390dda9e03d7936c492224453342d458e9bf98 +drivers-x86 8400291e289ee6b2bf9779ff1c83a291501f017b +chrome-platform de9c2c66ad8e787abec7c9d7eff4f8c3cdd28aed +chrome-platform-firmware 8400291e289ee6b2bf9779ff1c83a291501f017b +hsi f02cfe6950479b04fb75cf8424a852af7c50d3ad +leds-lj 3ec05e5feacdc1e8643e9c84c63e4a370e948d40 +ipmi 19a01155ddfe525e3a4e7cef734f18cce640b1ef +driver-core bfa54a793ba77ef696755b66f3ac4ed00c7d1248 +usb d483f034f03261c8c8450d106aa243837122b5f0 +thunderbolt de9c2c66ad8e787abec7c9d7eff4f8c3cdd28aed +usb-serial da74a5100a2b35ecb688fbffea25c9e96d99adfe +tty 2108aa2a01d850f850ed6ccea4e447100df9ee82 +char-misc 5c4efc60551c0e2a51371ccb0709180a1537f7f8 +accel f03eee5fc922158654405318a02db9982c0ddf07 +coresight 2e5657aa59669698f0f3bf7742d83577a18eb830 +fastrpc 8400291e289ee6b2bf9779ff1c83a291501f017b +fpga 3a0fa8e97d3024de199634667900b6a90bbe43d0 +icc 226e58b20975000960cb40b7488f55f173007489 +iio 593737c18ae789dc6e4b493510a0c00977972e2e +phy-next c4b09c562086f32588d962d30d0b7e93fe3e7cbb +soundwire 663229e24255883f010ae4d94f9f8e9c34e57d6c +extcon e508f2606c0bbe6fd051d5833acedc24a3c993b5 +gnss 8400291e289ee6b2bf9779ff1c83a291501f017b +vfio 0756bec2e45b206ccb5fc3e8791c08d696dd06f7 +w1 e940ff286ec47067cf5043fde41bea45d7ec4a5f +spmi a8f4aa75f8857ddae2e1f31f40b221c6e15e7d24 +staging 5aa0018a93bf2848f625a2eb9c531028cf690b7f +counter-next 8400291e289ee6b2bf9779ff1c83a291501f017b +siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 0204485c5a1e2de00acfd83c3931bd9dc6493c64 +cgroup 33ed8884df3dc955ef9d8756a007b5289b96e3bb +scsi 5cadf9bb8103bc758e9da088a2273bae1f519fbd +scsi-mkp 5f36bd89a9948ae23571f9ffd122d7de1ced73e0 +vhost d820e8fcea382f590a89245f1f4b0d3edd910925 +rpmsg 8749919defb874d6deabfbef24c4901d9ec76583 +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 26b95b7b588d70b5075b597ff808543503d36ac6 +gpio-intel 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +pinctrl 6fb214cdf7df78eb1be1e85d4b40b60307903ef3 +pinctrl-intel de9c2c66ad8e787abec7c9d7eff4f8c3cdd28aed +pinctrl-renesas f73f63b24491fa43641daf3b6162d2a451bd8481 +pinctrl-samsung d59c2396e0669cc657b68ef5765e2d4a1d3cef24 +pwm 2e8b1b881a36223c337e07c63a52ed6c8a47afc7 +ktest 07283c1873a4d0eaa0e822536881bfdaea853910 +kselftest 2c082b62aeb5e818d9e9588253fc7b73fc5ab81b +kunit 8400291e289ee6b2bf9779ff1c83a291501f017b +kunit-next 8400291e289ee6b2bf9779ff1c83a291501f017b +livepatching 9871e6af43db3892811f5a4ed0ed2e2d7cf6cf3c +rtc efa9c5be2caecae7dfa4f29c6ab3d4a2f341eb15 +nvdimm b0d478e34dbfccb7ce430e20cbe77d4d10593fa3 +at24 8400291e289ee6b2bf9779ff1c83a291501f017b +ntb 92aee2f6d1564aa13fc1432ca03ef041b5b6f803 +seccomp de9c2c66ad8e787abec7c9d7eff4f8c3cdd28aed +fsi c5eeb63edac9497f9a0d46d3b75cf8b293771ecf +slimbus 9b6e704955fa8db55d11f2e7be5d723c8186ffc6 +nvmem 8400291e289ee6b2bf9779ff1c83a291501f017b +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv f2580a907e5c0e8fc9354fd095b011301c64f949 +auxdisplay 2ccfe94bc3ac980d2d1df9f7a0b2c6d2137abe55 +kgdb 9bccbe7b20876a34c70b13430ea1b308fc8d5a7e +hmm 6613476e225e090cc9aad49be7fa504e290dd33d +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi 65bc58c3dcad0d9bd17762e22603894a2d2880d6 +memblock 9e3d665384fca2a1c56283c7a79a968243ef4614 +cxl a0328b397f3339d8d17a6ec356e94b3c110b010c +zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a +efi 4a2ebb082297f41803742729642961532e54079e +unicode 68318904a7758e11f16fa9d202a6df60f896e71a +slab a371d558e6f3aed977a8a7346350557de5d25190 +random c86927f528a8375bf3492898dfceaefc6fa4cb6d +landlock 8400291e289ee6b2bf9779ff1c83a291501f017b +rust de9c2c66ad8e787abec7c9d7eff4f8c3cdd28aed +sysctl acc154691fc75e1a178fc36624bdeee1420585a4 +execve fb97d2eb542faf19a8725afbd75cbc2518903210 +bitmap 7e516a1ef3f450c5e84e8882800e1d829e9765c9 +hte 9e4259716f60c96c069a38e826884ad783dc4eb4 +kspp d518b5f7f2d5de63c0b3b375188cac2c469ad21f +kspp-gustavo 6613476e225e090cc9aad49be7fa504e290dd33d +nolibc 8400291e289ee6b2bf9779ff1c83a291501f017b +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd 8400291e289ee6b2bf9779ff1c83a291501f017b +turbostat 75879bd898eeec6e977b779af704b991081c6610 +pwrseq 8400291e289ee6b2bf9779ff1c83a291501f017b +header_cleanup 5f4c01f1e3c7b0c8d1e5dd6f080531de7aa5e47b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..112f8209df29 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,386 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +vfs-brauner-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.fixes +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +overlayfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes +fs-current git linux-next +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +sophgo-fixes git https://github.com/sophgo/linux.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +ath git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-current +wpan git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git https://git.linuxtv.org/media_stage.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes +drm-intel-fixes git https://gitlab.freedesktop.org/drm/i915/kernel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +auxdisplay-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools#perf-tools +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +iommufd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes git https://github.com/Rust-for-Linux/linux.git#rust-fixes +w1-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +i2c-host-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-fixes +sparc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus +clk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-fixes +pwrseq-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current +thead-dt-fixes git https://github.com/pdp7/linux.git#thead-dt-fixes +drm-misc-fixes git https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc git https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +broadcom git https://github.com/Broadcom/stblinux.git#next +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sophgo git https://github.com/sophgo/linux.git#for-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +thead-dt git https://github.com/pdp7/linux.git#thead-dt-for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-next +uml git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +bcachefs git git://evilpiepirate.org/bcachefs.git#for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +exportfs git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#exportfs-next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +v9fs-ericvh git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs-brauner git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +fs-next git linux-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i2c-host git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +pmdomain git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +ath-next git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-next +wpan-next git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git https://gitlab.freedesktop.org/drm/kernel.git#drm-next +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc git https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git https://gitlab.freedesktop.org/drm/i915/kernel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +drm-xe git https://gitlab.freedesktop.org/drm/xe/kernel#drm-xe-next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 git https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git git://git.code.sf.net/p/tomoyo/tomoyo.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git https://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git#next +paulmck git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#non-rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +kvm-riscv git https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 git https://github.com/kvm-x86/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sched-ext git git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +chrome-platform-firmware git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc git git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +w1 git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +spmi git git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +siox git git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#siox/for-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#pwm/for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#for-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git#sysctl-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +nolibc git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#nolibc +tsm git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux#tsm-next +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +turbostat git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +pwrseq git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next +header_cleanup git git://evilpiepirate.org/bcachefs.git#header_cleanup diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..81cefb09b630 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5867 @@ +$ date -R +Wed, 07 Aug 2024 09:00:10 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at b446a2dae984 Merge tag 'linux_kselftest-fixes-6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest +Merging origin/master (d4560686726f Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating b446a2dae984..d4560686726f +Fast-forward (no commit created; -m option ignored) + Documentation/wmi/devices/msi-wmi-platform.rst | 6 +++--- + drivers/platform/x86/amd/pmc/pmc.c | 2 ++ + drivers/platform/x86/amd/pmc/pmc.h | 1 + + drivers/platform/x86/amd/pmf/core.c | 3 +++ + drivers/platform/x86/amd/pmf/pmf-quirks.c | 9 ++++++++- + drivers/platform/x86/intel/ifs/runtest.c | 2 +- + drivers/platform/x86/intel/vbtn.c | 9 +++++++++ + drivers/vhost/vdpa.c | 8 +------- + 8 files changed, 28 insertions(+), 12 deletions(-) +Merging fixes/fixes (2dde18cd1d8f Linux 6.5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (1272bf9ff24d crash: Fix riscv64 crash memory reserve dead loop) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +++- + kernel/crash_reserve.c | 9 --------- + kernel/kcov.c | 15 ++++++++++++--- + mm/list_lru.c | 28 ++++++++++++++++++++++------ + mm/memcontrol.c | 22 ++++++++++++++++++++-- + mm/migrate.c | 16 +++++++++++----- + mm/shmem.c | 14 +++++--------- + tools/testing/selftests/mm/Makefile | 2 +- + 8 files changed, 74 insertions(+), 36 deletions(-) +Merging vfs-brauner-fixes/vfs.fixes (fa0e22eb97a5 pidfd: prevent creation of pidfds for kthreads) +$ git merge -m Merge branch 'vfs.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Merge made by the 'ort' strategy. + Documentation/filesystems/caching/fscache.rst | 8 +++--- + fs/libfs.c | 35 ++++++++++++++++++--------- + fs/locks.c | 2 +- + fs/netfs/Kconfig | 2 +- + fs/netfs/buffered_write.c | 2 +- + fs/netfs/fscache_cookie.c | 4 +++ + include/uapi/linux/nsfs.h | 3 ++- + kernel/fork.c | 25 ++++++++++++++++--- + 8 files changed, 59 insertions(+), 22 deletions(-) +Merging fscrypt-current/for-current (256abd8e550c Linux 6.10-rc7) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (256abd8e550c Linux 6.10-rc7) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging btrfs-fixes/next-fixes (8d8ce2d7a07f Merge branch 'misc-6.11' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. + fs/btrfs/file.c | 5 ++++- + fs/btrfs/inode.c | 10 ++++++++++ + fs/btrfs/print-tree.c | 2 +- + fs/btrfs/scrub.c | 25 +++++++++++++++++++------ + fs/btrfs/super.c | 5 ++++- + 5 files changed, 38 insertions(+), 9 deletions(-) +Merging vfs-fixes/fixes (9a2fa1472083 fix bitmap corruption on close_range() with CLOSE_RANGE_UNSHARE) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Merge made by the 'ort' strategy. + fs/file.c | 28 +++++++++----------- + include/linux/bitmap.h | 12 +++++++++ + tools/testing/selftests/core/close_range_test.c | 35 +++++++++++++++++++++++++ + 3 files changed, 59 insertions(+), 16 deletions(-) +Merging erofs-fixes/fixes (0c3836482481 Linux 6.10) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (91da337e5d50 nfsd: don't set SVC_SOCK_ANONYMOUS when creating nfsd sockets) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Merge made by the 'ort' strategy. + fs/nfsd/nfsctl.c | 3 +-- + net/sunrpc/svc.c | 2 +- + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging v9fs-fixes/fixes/next (0c3836482481 Linux 6.10) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area()) +$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging fs-current (b1b8d5385d8a Merge branch 'nfsd-fixes' of git://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. + Documentation/filesystems/caching/fscache.rst | 8 +++--- + fs/btrfs/file.c | 5 +++- + fs/btrfs/inode.c | 10 +++++++ + fs/btrfs/print-tree.c | 2 +- + fs/btrfs/scrub.c | 25 +++++++++++++----- + fs/btrfs/super.c | 5 +++- + fs/file.c | 28 +++++++++----------- + fs/libfs.c | 35 +++++++++++++++++-------- + fs/locks.c | 2 +- + fs/netfs/Kconfig | 2 +- + fs/netfs/buffered_write.c | 2 +- + fs/netfs/fscache_cookie.c | 4 +++ + fs/nfsd/nfsctl.c | 3 +-- + include/linux/bitmap.h | 12 +++++++++ + include/uapi/linux/nsfs.h | 3 ++- + kernel/fork.c | 25 +++++++++++++++--- + net/sunrpc/svc.c | 2 +- + tools/testing/selftests/core/close_range_test.c | 35 +++++++++++++++++++++++++ + 18 files changed, 158 insertions(+), 50 deletions(-) +Merging kbuild-current/fixes (33330bcf0318 scripts: kconfig: merge_config: config files: add a trailing newline) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Merge made by the 'ort' strategy. + Makefile | 2 +- + scripts/Makefile.lib | 28 ++++++++++------------------ + scripts/kconfig/merge_config.sh | 2 ++ + 3 files changed, 13 insertions(+), 19 deletions(-) +Merging arc-current/for-curr (e67572cd2204 Linux 6.9-rc6) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (cfb00a357864 arm64: jump_label: Ensure patched jump_labels are visible to all CPUs) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (893738d2fc99 ARM: pxa/gumstix: fix attaching properties to vbus gpio device) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + .../testing/sysfs-bus-i2c-devices-turris-omnia-mcu | 6 +- + arch/arm/mach-pxa/gumstix.c | 11 +-- + arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi | 22 ------ + arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 6 -- + .../boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 25 +++---- + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 4 +- + drivers/platform/cznic/Kconfig | 80 +++++++++++++++------- + drivers/platform/cznic/Makefile | 8 +-- + drivers/platform/cznic/turris-omnia-mcu-base.c | 4 ++ + drivers/platform/cznic/turris-omnia-mcu.h | 42 +++++++++++- + 13 files changed, 129 insertions(+), 87 deletions(-) +Merging davinci-current/davinci/for-current (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (8400291e289e Linux 6.11-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 (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (21b9e722ad28 m68k: cmpxchg: Fix return value for default case in __arch_xchg()) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (8b7f59de92ac selftests/powerpc: Fix build with USERCFLAGS set) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (33bd8d153c33 s390: Keep inittext section writable) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging net/main (3e7917c0cdad net: linkwatch: use system_unbound_wq) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 2 +- + drivers/net/ethernet/google/gve/gve_main.c | 12 +++--- + drivers/net/pse-pd/tps23881.c | 4 +- + drivers/net/usb/qmi_wwan.c | 1 + + drivers/net/virtio_net.c | 14 ++++++- + net/bridge/br_multicast.c | 4 +- + net/core/link_watch.c | 4 +- + net/ipv4/tcp_ao.c | 43 +++++++++++++------ + net/mptcp/options.c | 3 +- + net/mptcp/pm_netlink.c | 47 +++++++++++++-------- + net/sctp/input.c | 19 +++++---- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 55 ++++++++++++++++++------- + 13 files changed, 141 insertions(+), 69 deletions(-) +Merging bpf/master (92c4ee25208d net: bridge: mcast: wait for previous gc cycles when removing port) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (89a2aefe4b08 xfrm: call xfrm_dev_policy_delete when kill policy) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/main (14ab4792ee12 net/tcp: Disable TCP-AO static key after RCU grace period) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (14ab4792ee12 net/tcp: Disable TCP-AO static key after RCU grace period) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (de9c2c66ad8e Linux 6.11-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging ath/for-current (38055789d151 wifi: ath12k: use 128 bytes aligned iova in transmit path for WCN7850) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath12k/dp_tx.c | 72 +++++++++++++++++++++++++++++++++ + drivers/net/wireless/ath/ath12k/hw.c | 6 +++ + drivers/net/wireless/ath/ath12k/hw.h | 4 ++ + drivers/net/wireless/ath/ath12k/mac.c | 1 + + 4 files changed, 83 insertions(+) +Merging wpan/master (b8ec0dc3845f net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (176fd1511dd9 ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/pci/hda/cs35l41_hda.c | 13 ------------- + sound/pci/hda/cs35l56_hda.c | 38 +------------------------------------- + sound/pci/hda/cs35l56_hda.h | 1 - + sound/pci/hda/patch_hdmi.c | 2 ++ + sound/usb/line6/driver.c | 5 +++++ + 5 files changed, 8 insertions(+), 51 deletions(-) +Merging sound-asoc-fixes/for-linus (a44b7b57ef14 ASoC: Extend wm_adsp so cs35l56 can suppress controls) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + include/sound/cs35l56.h | 5 +++ + include/sound/soc-component.h | 5 +++ + sound/soc/amd/yc/acp6x-mach.c | 7 ++++ + sound/soc/codecs/cs-amp-lib.c | 2 +- + sound/soc/codecs/cs35l45.c | 11 +---- + sound/soc/codecs/cs35l56-sdw.c | 77 ++++++++++++++++++++++++++++++++++ + sound/soc/codecs/cs35l56.c | 11 +++++ + sound/soc/codecs/cs42l43.c | 75 +++++++++++++++++++++++++-------- + sound/soc/codecs/cs42l43.h | 2 + + sound/soc/codecs/cs530x.c | 8 ++-- + sound/soc/codecs/lpass-va-macro.c | 2 + + sound/soc/codecs/nau8822.c | 2 +- + sound/soc/codecs/wcd937x-sdw.c | 4 +- + sound/soc/codecs/wcd938x-sdw.c | 4 +- + sound/soc/codecs/wcd939x-sdw.c | 4 +- + sound/soc/codecs/wm_adsp.c | 17 ++++++-- + sound/soc/codecs/wm_adsp.h | 3 ++ + sound/soc/codecs/wsa881x.c | 2 +- + sound/soc/codecs/wsa883x.c | 2 +- + sound/soc/codecs/wsa884x.c | 2 +- + sound/soc/fsl/fsl_micfil.c | 20 ++++++--- + sound/soc/fsl/fsl_micfil.h | 2 +- + sound/soc/soc-component.c | 42 +++++++++++++++---- + sound/soc/sof/mediatek/mt8195/mt8195.c | 2 +- + sound/soc/sti/sti_uniperif.c | 2 +- + sound/soc/sti/uniperif.h | 1 + + sound/soc/sti/uniperif_player.c | 1 + + sound/soc/sti/uniperif_reader.c | 1 + + 28 files changed, 255 insertions(+), 61 deletions(-) +Merging regmap-fixes/for-linus (c2429cc2c731 Merge remote-tracking branch 'regmap/for-6.10' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. +Merging regulator-fixes/for-linus (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (e4c4638b6a10 spi: spidev: Add missing spi_device_id for bh2228fv) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-hisi-kunpeng.c | 4 ++++ + drivers/spi/spidev.c | 1 + + 2 files changed, 5 insertions(+) +Merging pci-current/for-linus (5560a612c20d PCI: pciehp: Retain Power Indicator bits for userspace indicators) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (15fffc6a5624 driver core: Fix uevent_show() vs driver detach race) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Merge made by the 'ort' strategy. + .../process/embargoed-hardware-issues.rst | 153 +++++++++++++-------- + drivers/base/core.c | 13 +- + drivers/base/module.c | 4 + + rust/kernel/firmware.rs | 2 +- + 4 files changed, 109 insertions(+), 63 deletions(-) +Merging tty.current/tty-linus (6e20753da6bc tty: vt: conmakehash: cope with abs_srctree no longer in env) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/serial/sc16is7xx.c | 25 +++++++++++++++---------- + drivers/tty/serial/serial_core.c | 8 ++++++++ + drivers/tty/vt/conmakehash.c | 20 +++++++------------- + 3 files changed, 30 insertions(+), 23 deletions(-) +Merging usb.current/usb-linus (b1dad2f09138 usb: typec: tipd: Delete extra semi-colon) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/usb/microchip,usb2514.yaml | 1 + + drivers/usb/gadget/function/f_midi2.c | 21 +++++++---- + drivers/usb/gadget/function/u_audio.c | 42 +++++++++++++++++----- + drivers/usb/gadget/function/u_serial.c | 1 + + drivers/usb/gadget/udc/core.c | 10 +++--- + drivers/usb/serial/ch341.c | 1 + + drivers/usb/serial/garmin_gps.c | 5 ++- + drivers/usb/serial/mxuport.c | 1 + + drivers/usb/serial/navman.c | 1 + + drivers/usb/serial/qcaux.c | 1 + + drivers/usb/serial/spcp8x5.c | 10 ------ + drivers/usb/serial/symbolserial.c | 1 + + drivers/usb/serial/usb-serial-simple.c | 1 + + drivers/usb/serial/usb_debug.c | 1 + + drivers/usb/typec/mux/fsa4480.c | 14 ++++++++ + drivers/usb/typec/tcpm/tcpci.c | 2 +- + drivers/usb/typec/tipd/core.c | 4 +-- + drivers/usb/usbip/vhci_hcd.c | 9 +++-- + 18 files changed, 87 insertions(+), 39 deletions(-) +Merging usb-serial-fixes/usb-linus (00af4f3dda14 USB: serial: debug: do not echo input by default) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Auto-merging drivers/usb/serial/usb_debug.c +Merge made by the 'ort' strategy. + drivers/usb/serial/usb_debug.c | 7 +++++++ + 1 file changed, 7 insertions(+) +Merging phy/fixes (5af9b304bc60 phy: xilinx: phy-zynqmp: Fix SGMII linkup failure on resume) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'ort' strategy. + drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 2 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 23 ++++++++---- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 2 +- + drivers/phy/xilinx/phy-zynqmp.c | 56 ++++++++++++++++++++++++++++++ + 4 files changed, 74 insertions(+), 9 deletions(-) +Merging staging.current/staging-linus (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (61cbfb5368dd iio: adc: ad7124: fix DT configuration parsing) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/ad7124.c | 30 ++++++++------ + drivers/iio/adc/ad7173.c | 10 ++--- + drivers/iio/adc/ad7606.c | 28 +------------ + drivers/iio/adc/ad7606.h | 2 + + drivers/iio/adc/ad7606_par.c | 46 +++++++++++++++++++++- + drivers/iio/adc/ad_sigma_delta.c | 2 +- + drivers/iio/adc/ti-ads1119.c | 2 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 4 +- + drivers/iio/inkern.c | 8 ++-- + drivers/staging/iio/frequency/ad9834.c | 2 +- + 10 files changed, 80 insertions(+), 54 deletions(-) +Merging counter-current/counter-current (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (ffcf2eb4bfa2 spmi: pmic-arb: add missing newline in dev_err format strings) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Merge made by the 'ort' strategy. + drivers/android/binder.c | 15 +++----- + drivers/android/binder_alloc.c | 2 +- + drivers/android/dbitmap.h | 22 ++++------- + drivers/char/ds1620.c | 1 + + drivers/char/nwbutton.c | 1 + + drivers/char/nwflash.c | 1 + + drivers/fsi/fsi-core.c | 1 + + drivers/fsi/fsi-master-aspeed.c | 1 + + drivers/fsi/fsi-master-ast-cf.c | 3 +- + drivers/fsi/fsi-master-gpio.c | 1 + + drivers/fsi/fsi-master-hub.c | 1 + + drivers/fsi/fsi-scom.c | 1 + + drivers/misc/Kconfig | 2 +- + drivers/misc/eeprom/ee1004.c | 85 ++++++++++++++++++++++++----------------- + drivers/spmi/spmi-pmic-arb.c | 11 +++--- + 15 files changed, 81 insertions(+), 67 deletions(-) +Merging soundwire-fixes/fixes (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (e2006140ad2e thunderbolt: Mark XDomain as unplugged when router is removed) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Merge made by the 'ort' strategy. + drivers/thunderbolt/debugfs.c | 10 ++++++---- + drivers/thunderbolt/switch.c | 1 + + 2 files changed, 7 insertions(+), 4 deletions(-) +Merging input-current/for-linus (206f533a0a7c Input: uinput - reject requests with unreasonable number of slots) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/touchscreen/edt-ft5x06.yaml | 1 + + drivers/input/joystick/adc-joystick.c | 7 +++++-- + drivers/input/misc/uinput.c | 14 ++++++++++++++ + drivers/input/mouse/synaptics.c | 1 + + drivers/input/touchscreen/ads7846.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 6 ++++++ + 6 files changed, 28 insertions(+), 3 deletions(-) +Merging crypto-current/master (df1e9791998a hwrng: core - remove (un)register_miscdev()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (5a88a3f67e37 vfio/pci: Init the count variable in collecting hot-reset devices) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (170c966cbe27 selftests: ksft: Fix finished() helper exit code on skipped tests) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (b53b831919a0 dmaengine: stm32-dma3: Set lli_size after allocation) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Merge made by the 'ort' strategy. + drivers/dma/dw/core.c | 131 ++++++++++++++++++++++++++++++++++------- + drivers/dma/dw/dw.c | 44 ++++++++------ + drivers/dma/dw/idma32.c | 19 +++--- + drivers/dma/dw/platform.c | 20 +++---- + drivers/dma/dw/regs.h | 1 - + drivers/dma/stm32/stm32-dma3.c | 2 +- + drivers/dma/ti/omap-dma.c | 6 +- + 7 files changed, 160 insertions(+), 63 deletions(-) +Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (b27d8946b5ed mtd: rawnand: rockchip: ensure NVDDR timings are rejected) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range) +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (e2ed53694e53 Merge tag 'tags/fixes-media-uvc-20230722' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git) +$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (ab35896730a5 reset: hisilicon: hi6220: add missing MODULE_DESCRIPTION() macro) +$ 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 (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (0c3836482481 Linux 6.10) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (1773014a9759 Merge branch 'kvm-fixes' into HEAD) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (4c6abb7f7b34 KVM: s390: fix LPSWEY handling) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (bd907ec07c7c hwmon: (asus-ec-sensors) remove VRM temp X570-E GAMING) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/asus-ec-sensors.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (a0f39d51dbf7 cxl: documentation: add missing files to cxl driver-api) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (3114f77e9453 platform/x86/intel/ifs: Initialize union ifs_status to zero) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (e1cf752ede8e dt-bindings: eeprom: at25: add fujitsu,mb85rs256 compatible) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/clock/qcom,dispcc-sm6350.yaml | 2 +- + Documentation/devicetree/bindings/clock/qcom,gcc-msm8994.yaml | 2 +- + Documentation/devicetree/bindings/clock/qcom,gcc-sm6125.yaml | 2 +- + Documentation/devicetree/bindings/clock/qcom,gcc-sm6350.yaml | 2 +- + Documentation/devicetree/bindings/clock/qcom,sm6115-gpucc.yaml | 2 +- + Documentation/devicetree/bindings/clock/qcom,sm6125-gpucc.yaml | 2 +- + Documentation/devicetree/bindings/clock/qcom,sm6350-camcc.yaml | 2 +- + Documentation/devicetree/bindings/clock/qcom,sm6375-dispcc.yaml | 2 +- + Documentation/devicetree/bindings/clock/qcom,sm6375-gcc.yaml | 2 +- + Documentation/devicetree/bindings/clock/qcom,sm6375-gpucc.yaml | 2 +- + Documentation/devicetree/bindings/clock/qcom,sm8350-videocc.yaml | 2 +- + Documentation/devicetree/bindings/clock/qcom,sm8450-gpucc.yaml | 2 +- + Documentation/devicetree/bindings/display/msm/qcom,sm6375-mdss.yaml | 2 +- + .../devicetree/bindings/display/panel/asus,z00t-tm5p5-nt35596.yaml | 2 +- + Documentation/devicetree/bindings/display/panel/sony,td4353-jdi.yaml | 2 +- + Documentation/devicetree/bindings/eeprom/at25.yaml | 1 + + Documentation/devicetree/bindings/interconnect/qcom,sc7280-rpmh.yaml | 2 +- + Documentation/devicetree/bindings/interconnect/qcom,sc8280xp-rpmh.yaml | 2 +- + Documentation/devicetree/bindings/interconnect/qcom,sm8450-rpmh.yaml | 2 +- + Documentation/devicetree/bindings/iommu/qcom,iommu.yaml | 2 +- + Documentation/devicetree/bindings/pinctrl/qcom,mdm9607-tlmm.yaml | 2 +- + Documentation/devicetree/bindings/pinctrl/qcom,sm6350-tlmm.yaml | 2 +- + Documentation/devicetree/bindings/pinctrl/qcom,sm6375-tlmm.yaml | 2 +- + Documentation/devicetree/bindings/remoteproc/qcom,rpm-proc.yaml | 2 +- + Documentation/devicetree/bindings/soc/qcom/qcom,rpm-master-stats.yaml | 2 +- + 25 files changed, 25 insertions(+), 24 deletions(-) +Merging dt-krzk-fixes/fixes (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (f874d7210d88 scsi: sd: Keep the discard mode stable) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/scsi/sd.c | 15 ++++++++++----- + drivers/ufs/core/ufshcd.c | 11 ++++++++--- + 2 files changed, 18 insertions(+), 8 deletions(-) +Merging drm-fixes/drm-fixes (27ce65f65258 Revert "nouveau: rip out busy fence waits") +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (8bdd9ef7e9b1 drm/i915/gem: Fix Virtual Memory mapping boundaries calculation) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_backlight.c | 3 ++ + drivers/gpu/drm/i915/display/intel_pps.c | 3 ++ + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 55 +++++++++++++++++++++++--- + 3 files changed, 55 insertions(+), 6 deletions(-) +Merging mmc-fixes/fixes (9374ae912dbb mmc: mtk-sd: receive cmd8 data when hs400 tuning fail) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/host/mtk-sd.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +Merging rtc-fixes/rtc-fixes (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (3b85a2eacd3d Documentation: hyperv: Add overview of Confidential Computing VM support) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + Documentation/virt/hyperv/coco.rst | 260 ++++++++++++++++++++++++++++++++++++ + Documentation/virt/hyperv/index.rst | 1 + + arch/x86/kernel/cpu/mshyperv.c | 16 ++- + drivers/clocksource/hyperv_timer.c | 16 ++- + drivers/hv/hyperv_vmbus.h | 6 - + 5 files changed, 291 insertions(+), 8 deletions(-) + create mode 100644 Documentation/virt/hyperv/coco.rst +Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (ee9a68394b4b riscv: Re-introduce global icache flush in patch_text_XXX()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Merge made by the 'ort' strategy. + arch/riscv/kernel/patch.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging riscv-dt-fixes/riscv-dt-fixes (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (a3e18a540541 Merge tag 'xfs-6.10-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (a366e46da10d pinctrl: meteorlake: Add Arrow Lake-H/U ACPI ID) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-meteorlake.c | 1 + + 1 file changed, 1 insertion(+) +Merging auxdisplay-fixes/fixes (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging memblock-fixes/fixes (8043832e2a12 memblock: use numa_valid_node() helper to check for invalid node ID) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf-tools (de9c2c66ad8e Linux 6.11-rc2) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (ae835a96d72c x86/efistub: Revert to heap allocated boot_params for PE entrypoint) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Already up to date. +Merging battery-fixes/fixes (d6cca7631a4b power: supply: qcom_battmgr: Ignore extra __le32 in info payload) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Auto-merging drivers/power/supply/qcom_battmgr.c +Merge made by the 'ort' strategy. + drivers/power/supply/axp288_charger.c | 24 ++++++++++++------------ + drivers/power/supply/qcom_battmgr.c | 12 +++++++----- + drivers/power/supply/rt5033_battery.c | 1 + + 3 files changed, 20 insertions(+), 17 deletions(-) +Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (0ba521d6948e rust: macros: indent list item in `module!`'s docs) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Auto-merging init/Kconfig +Merge made by the 'ort' strategy. + init/Kconfig | 4 ++-- + rust/macros/lib.rs | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging w1-fixes/fixes (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (50359c9c3cb3 pmdomain: imx: scu-pd: Remove duplicated clocks) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pmdomain/imx/scu-pd.c | 5 ----- + 1 file changed, 5 deletions(-) +Merging i2c-host-fixes/i2c/i2c-host-fixes (b93d16bee557 i2c: qcom-geni: Add missing clk_disable_unprepare in geni_i2c_runtime_resume) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-qcom-geni.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (39a3396558fb clk: thead: fix dependency on clk_ignore_unused) +$ git merge -m Merge branch 'clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Merge made by the 'ort' strategy. + drivers/clk/thead/clk-th1520-ap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pwrseq-fixes/pwrseq/for-current (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'pwrseq/for-current' of git://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 (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of https://github.com/pdp7/linux.git thead-dt-fixes/thead-dt-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (929725bd7eb4 drm/atomic: allow no-op FB_ID updates for async flips) +$ 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. + .../bindings/display/panel/samsung,atna33xc20.yaml | 9 ++++++--- + drivers/gpu/drm/drm_atomic_uapi.c | 15 ++++----------- + drivers/gpu/drm/drm_bridge_connector.c | 8 ++------ + drivers/gpu/drm/drm_client_modeset.c | 5 +++++ + drivers/gpu/drm/omapdrm/Kconfig | 1 + + drivers/gpu/drm/tests/drm_gem_shmem_test.c | 11 +++++++++++ + 6 files changed, 29 insertions(+), 20 deletions(-) +Merging mm-stable/mm-stable (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm/mm-everything (497fb6003421 foo) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging init/Kconfig +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Auto-merging mm/slub.c +Auto-merging scripts/Makefile.lib +Merge made by the 'ort' strategy. + Documentation/admin-guide/blockdev/zram.rst | 45 +- + Documentation/admin-guide/cgroup-v2.rst | 30 +- + Documentation/admin-guide/kernel-parameters.txt | 15 + + Documentation/arch/x86/x86_64/boot-options.rst | 12 - + Documentation/mm/transhuge.rst | 6 +- + Documentation/staging/xz.rst | 141 +- + LICENSES/deprecated/0BSD | 23 + + MAINTAINERS | 28 + + arch/arm/Kconfig | 3 + + arch/arm/include/asm/crash_reserve.h | 24 + + arch/arm/kernel/setup.c | 63 +- + arch/arm/lib/xor-neon.c | 1 + + arch/arm/mm/fault-armv.c | 6 +- + arch/arm64/boot/Makefile | 5 +- + arch/arm64/include/asm/Kbuild | 1 + + arch/arm64/include/asm/crash_reserve.h | 2 + + arch/arm64/include/asm/mmzone.h | 13 - + arch/arm64/include/asm/topology.h | 1 + + arch/arm64/kvm/nested.c | 1 - + arch/loongarch/include/asm/Kbuild | 1 + + arch/loongarch/include/asm/crash_reserve.h | 2 + + arch/loongarch/include/asm/mmzone.h | 16 - + arch/loongarch/include/asm/topology.h | 1 + + arch/loongarch/kernel/numa.c | 21 - + arch/mips/Kconfig | 5 - + arch/mips/include/asm/mach-ip27/mmzone.h | 1 - + arch/mips/include/asm/mach-loongson64/mmzone.h | 4 - + arch/mips/loongson64/numa.c | 28 +- + arch/mips/sgi-ip27/ip27-memory.c | 12 +- + arch/mips/sgi-ip27/ip27-smp.c | 2 + + arch/powerpc/boot/xz_config.h | 3 - + arch/powerpc/include/asm/mmzone.h | 6 - + arch/powerpc/mm/numa.c | 22 +- + arch/powerpc/mm/pgtable.c | 6 + + arch/powerpc/platforms/pseries/papr-vpd.c | 5 +- + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 6 +- + arch/riscv/boot/Makefile | 3 + + arch/riscv/include/asm/Kbuild | 1 + + arch/riscv/include/asm/crash_reserve.h | 4 + + arch/riscv/include/asm/mmzone.h | 13 - + arch/riscv/include/asm/topology.h | 4 + + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/mmzone.h | 17 - + arch/s390/include/asm/page.h | 2 - + arch/s390/kernel/numa.c | 3 - + arch/s390/kernel/uv.c | 23 +- + arch/s390/mm/fault.c | 16 +- + arch/sh/include/asm/mmzone.h | 3 - + arch/sh/mm/init.c | 7 +- + arch/sh/mm/numa.c | 3 - + arch/sparc/include/asm/mmzone.h | 4 - + arch/sparc/mm/init_64.c | 11 +- + arch/x86/Kconfig | 9 +- + arch/x86/include/asm/Kbuild | 1 + + arch/x86/include/asm/crash_reserve.h | 1 + + arch/x86/include/asm/mmzone.h | 6 - + arch/x86/include/asm/mmzone_32.h | 17 - + arch/x86/include/asm/mmzone_64.h | 18 - + arch/x86/include/asm/numa.h | 26 +- + arch/x86/include/asm/sparsemem.h | 9 - + arch/x86/mm/Makefile | 1 - + arch/x86/mm/amdtopology.c | 1 + + arch/x86/mm/numa.c | 622 +------ + arch/x86/mm/numa_internal.h | 24 - + arch/x86/mm/testmmiotrace.c | 1 + + arch/x86/xen/mmu_pv.c | 7 +- + drivers/acpi/numa/srat.c | 1 + + drivers/base/Kconfig | 1 + + drivers/base/arch_numa.c | 224 +-- + drivers/block/zram/Kconfig | 78 +- + drivers/block/zram/Makefile | 8 + + drivers/block/zram/backend_842.c | 61 + + drivers/block/zram/backend_842.h | 10 + + drivers/block/zram/backend_deflate.c | 146 ++ + drivers/block/zram/backend_deflate.h | 10 + + drivers/block/zram/backend_lz4.c | 127 ++ + drivers/block/zram/backend_lz4.h | 10 + + drivers/block/zram/backend_lz4hc.c | 128 ++ + drivers/block/zram/backend_lz4hc.h | 10 + + drivers/block/zram/backend_lzo.c | 59 + + drivers/block/zram/backend_lzo.h | 10 + + drivers/block/zram/backend_lzorle.c | 59 + + drivers/block/zram/backend_lzorle.h | 10 + + drivers/block/zram/backend_zstd.c | 226 +++ + drivers/block/zram/backend_zstd.h | 10 + + drivers/block/zram/zcomp.c | 193 +- + drivers/block/zram/zcomp.h | 71 +- + drivers/block/zram/zram_drv.c | 117 +- + drivers/block/zram/zram_drv.h | 1 + + drivers/cpufreq/maple-cpufreq.c | 1 + + drivers/cpufreq/pasemi-cpufreq.c | 1 + + drivers/cpufreq/pmac64-cpufreq.c | 1 + + drivers/cpufreq/powernv-cpufreq.c | 1 + + drivers/cpufreq/ppc_cbe_cpufreq.c | 1 + + drivers/cxl/Kconfig | 2 +- + drivers/dax/Kconfig | 2 +- + drivers/gpu/drm/drm_exec.c | 3 +- + drivers/of/of_numa.c | 5 +- + drivers/vdpa/vdpa_user/iova_domain.c | 31 +- + drivers/vdpa/vdpa_user/iova_domain.h | 5 +- + drivers/vdpa/vdpa_user/vduse_dev.c | 4 +- + fs/Kconfig | 4 + + fs/exec.c | 81 +- + fs/ocfs2/localalloc.c | 19 + + fs/proc/task_mmu.c | 15 - + fs/userfaultfd.c | 171 +- + fs/xfs/xfs_log_recover.c | 2 +- + include/asm-generic/mmzone.h | 5 + + include/asm-generic/numa.h | 6 +- + include/linux/bits.h | 2 + + include/linux/cgroup-defs.h | 5 + + include/linux/cgroup.h | 3 + + include/linux/decompress/unxz.h | 5 +- + include/linux/gfp_types.h | 5 +- + include/linux/hugetlb.h | 8 +- + include/linux/kasan.h | 64 +- + include/linux/lru_cache.h | 4 +- + include/linux/memcontrol.h | 16 +- + include/linux/memory_hotplug.h | 48 - + include/linux/mm.h | 161 +- + include/linux/mm_types.h | 2 +- + include/linux/mm_types_task.h | 3 - + include/linux/mmzone.h | 35 +- + include/linux/numa.h | 5 + + include/linux/numa_memblks.h | 58 + + include/linux/page_counter.h | 27 +- + include/linux/pagewalk.h | 58 + + include/linux/sched/task_stack.h | 18 +- + include/linux/shmem_fs.h | 11 +- + include/linux/slab.h | 8 +- + include/linux/swap.h | 39 +- + include/linux/userfaultfd_k.h | 19 + + include/linux/vm_event_item.h | 25 + + include/linux/vmalloc.h | 4 + + include/linux/xz.h | 83 +- + include/linux/zstd.h | 167 ++ + include/linux/zswap.h | 16 +- + include/trace/events/oom.h | 4 +- + include/uapi/asm-generic/bitsperlong.h | 2 + + include/uapi/linux/bits.h | 3 + + include/uapi/linux/const.h | 1 + + init/Kconfig | 7 +- + kernel/Makefile | 1 - + kernel/cgroup/cgroup-internal.h | 2 + + kernel/cgroup/cgroup.c | 7 + + kernel/crash_reserve.c | 8 +- + kernel/exit.c | 57 + + kernel/fork.c | 4 +- + kernel/kexec_internal.h | 3 +- + kernel/locking/test-ww_mutex.c | 1 + + kernel/numa.c | 26 - + kernel/resource.c | 3 +- + kernel/sched/core.c | 4 +- + kernel/sched/fair.c | 5 +- + kernel/watchdog.c | 5 +- + lib/Kconfig.debug | 12 +- + lib/Makefile | 1 + + lib/checksum_kunit.c | 9 +- + lib/closure.c | 2 +- + lib/decompress_unxz.c | 40 +- + lib/dynamic_debug.c | 4 +- + lib/fortify_kunit.c | 3 +- + lib/lru_cache.c | 10 +- + lib/lz4/lz4hc_compress.c | 1 + + lib/math/Makefile | 1 + + lib/math/div64.c | 117 +- + lib/math/test_mul_u64_u64_div_u64.c | 99 ++ + lib/test_bits.c | 25 + + lib/test_hmm.c | 5 +- + lib/test_objpool.c | 3 +- + lib/xz/Kconfig | 13 +- + lib/xz/xz_crc32.c | 11 +- + lib/xz/xz_dec_bcj.c | 191 +- + lib/xz/xz_dec_lzma2.c | 15 +- + lib/xz/xz_dec_stream.c | 13 +- + lib/xz/xz_dec_syms.c | 14 +- + lib/xz/xz_dec_test.c | 12 +- + lib/xz/xz_lzma2.h | 5 +- + lib/xz/xz_private.h | 40 +- + lib/xz/xz_stream.h | 5 +- + lib/zstd/compress/zstd_compress.c | 2 + + lib/zstd/zstd_compress_module.c | 49 + + lib/zstd/zstd_decompress_module.c | 36 + + mm/Kconfig | 29 +- + mm/Kconfig.debug | 30 + + mm/Makefile | 8 +- + mm/cma.c | 2 +- + mm/damon/lru_sort.c | 15 +- + mm/filemap.c | 2 +- + mm/gup.c | 60 +- + mm/huge_memory.c | 34 +- + mm/hugetlb.c | 12 +- + mm/hugetlb_cgroup.c | 23 +- + mm/hugetlb_vmemmap.c | 40 +- + mm/internal.h | 174 +- + mm/kasan/common.c | 62 +- + mm/kasan/kasan_test.c | 46 + + mm/kasan/shadow.c | 14 +- + mm/kmemleak.c | 153 +- + mm/ksm.c | 127 +- + mm/memcontrol.c | 223 ++- + mm/memory-failure.c | 7 + + mm/memory-tiers.c | 19 + + mm/memory.c | 219 ++- + mm/memory_hotplug.c | 22 +- + mm/mempolicy.c | 4 +- + mm/migrate.c | 141 +- + mm/mm_init.c | 6 +- + mm/mmap.c | 1853 +------------------- + mm/mmu_notifier.c | 2 + + mm/mmzone.c | 2 +- + mm/mprotect.c | 3 +- + mm/nommu.c | 11 +- + mm/numa.c | 57 + + {arch/x86/mm => mm}/numa_emulation.c | 42 +- + mm/numa_memblks.c | 568 ++++++ + mm/page_alloc.c | 88 +- + mm/page_counter.c | 48 +- + mm/page_io.c | 11 +- + mm/pagewalk.c | 202 +++ + mm/rmap.c | 38 +- + mm/shmem.c | 93 +- + mm/shmem_quota.c | 3 - + mm/slab_common.c | 12 + + mm/slub.c | 83 +- + mm/swap.c | 296 ++-- + mm/swap.h | 5 +- + mm/swap_state.c | 70 +- + mm/swapfile.c | 966 +++++----- + mm/userfaultfd.c | 168 ++ + mm/util.c | 103 +- + mm/vma.c | 1766 +++++++++++++++++++ + mm/vma.h | 364 ++++ + mm/vma_internal.h | 49 + + mm/vmalloc.c | 104 +- + mm/vmscan.c | 49 +- + mm/vmstat.c | 27 + + mm/z3fold.c | 2 +- + mm/zswap.c | 232 ++- + samples/kmemleak/kmemleak-test.c | 2 + + scripts/Makefile.lib | 13 +- + scripts/gdb/linux/kasan.py | 44 + + scripts/gdb/linux/proc.py | 4 +- + scripts/gdb/linux/rbtree.py | 12 + + scripts/gdb/linux/stackdepot.py | 27 + + scripts/gdb/linux/timerlist.py | 31 +- + scripts/gdb/vmlinux-gdb.py | 1 + + scripts/macro_checker.py | 131 ++ + scripts/xz_wrap.sh | 160 +- + tools/testing/fault-injection/failcmd.sh | 12 + + tools/testing/radix-tree/.gitignore | 1 + + tools/testing/radix-tree/Makefile | 72 +- + tools/testing/radix-tree/xarray.c | 10 +- + tools/testing/selftests/cgroup/cgroup_util.c | 22 + + tools/testing/selftests/cgroup/cgroup_util.h | 2 + + tools/testing/selftests/cgroup/test_memcontrol.c | 264 ++- + .../{radix-tree/generated => shared}/autoconf.h | 0 + tools/testing/{radix-tree => shared}/linux.c | 0 + tools/testing/{radix-tree => shared}/linux/bug.h | 0 + tools/testing/{radix-tree => shared}/linux/cpu.h | 0 + tools/testing/{radix-tree => shared}/linux/idr.h | 0 + tools/testing/{radix-tree => shared}/linux/init.h | 0 + .../testing/{radix-tree => shared}/linux/kconfig.h | 0 + .../testing/{radix-tree => shared}/linux/kernel.h | 0 + .../{radix-tree => shared}/linux/kmemleak.h | 0 + .../{radix-tree => shared}/linux/local_lock.h | 0 + .../testing/{radix-tree => shared}/linux/lockdep.h | 0 + .../{radix-tree => shared}/linux/maple_tree.h | 0 + .../testing/{radix-tree => shared}/linux/percpu.h | 0 + .../testing/{radix-tree => shared}/linux/preempt.h | 0 + .../{radix-tree => shared}/linux/radix-tree.h | 0 + .../{radix-tree => shared}/linux/rcupdate.h | 0 + .../testing/{radix-tree => shared}/linux/xarray.h | 0 + tools/testing/shared/maple-shared.h | 9 + + tools/testing/shared/maple-shim.c | 7 + + tools/testing/shared/shared.h | 33 + + tools/testing/shared/shared.mk | 72 + + .../trace/events/maple_tree.h | 0 + tools/testing/shared/xarray-shared.c | 5 + + tools/testing/shared/xarray-shared.h | 4 + + tools/testing/vma/.gitignore | 7 + + tools/testing/vma/Makefile | 16 + + tools/testing/vma/linux/atomic.h | 12 + + tools/testing/vma/linux/mmzone.h | 38 + + tools/testing/vma/vma.c | 207 +++ + tools/testing/vma/vma_internal.h | 882 ++++++++++ + 287 files changed, 10468 insertions(+), 5551 deletions(-) + create mode 100644 LICENSES/deprecated/0BSD + create mode 100644 arch/arm/include/asm/crash_reserve.h + delete mode 100644 arch/arm64/include/asm/mmzone.h + delete mode 100644 arch/loongarch/include/asm/mmzone.h + delete mode 100644 arch/riscv/include/asm/mmzone.h + delete mode 100644 arch/s390/include/asm/mmzone.h + delete mode 100644 arch/x86/include/asm/mmzone.h + delete mode 100644 arch/x86/include/asm/mmzone_32.h + delete mode 100644 arch/x86/include/asm/mmzone_64.h + create mode 100644 drivers/block/zram/backend_842.c + create mode 100644 drivers/block/zram/backend_842.h + create mode 100644 drivers/block/zram/backend_deflate.c + create mode 100644 drivers/block/zram/backend_deflate.h + create mode 100644 drivers/block/zram/backend_lz4.c + create mode 100644 drivers/block/zram/backend_lz4.h + create mode 100644 drivers/block/zram/backend_lz4hc.c + create mode 100644 drivers/block/zram/backend_lz4hc.h + create mode 100644 drivers/block/zram/backend_lzo.c + create mode 100644 drivers/block/zram/backend_lzo.h + create mode 100644 drivers/block/zram/backend_lzorle.c + create mode 100644 drivers/block/zram/backend_lzorle.h + create mode 100644 drivers/block/zram/backend_zstd.c + create mode 100644 drivers/block/zram/backend_zstd.h + create mode 100644 include/asm-generic/mmzone.h + create mode 100644 include/linux/numa_memblks.h + delete mode 100644 kernel/numa.c + create mode 100644 lib/math/test_mul_u64_u64_div_u64.c + create mode 100644 mm/numa.c + rename {arch/x86/mm => mm}/numa_emulation.c (94%) + create mode 100644 mm/numa_memblks.c + create mode 100644 mm/vma.c + create mode 100644 mm/vma.h + create mode 100644 mm/vma_internal.h + create mode 100644 scripts/gdb/linux/kasan.py + create mode 100644 scripts/macro_checker.py + mode change 100644 => 100755 tools/testing/fault-injection/failcmd.sh + rename tools/testing/{radix-tree/generated => shared}/autoconf.h (100%) + rename tools/testing/{radix-tree => shared}/linux.c (100%) + rename tools/testing/{radix-tree => shared}/linux/bug.h (100%) + rename tools/testing/{radix-tree => shared}/linux/cpu.h (100%) + rename tools/testing/{radix-tree => shared}/linux/idr.h (100%) + rename tools/testing/{radix-tree => shared}/linux/init.h (100%) + rename tools/testing/{radix-tree => shared}/linux/kconfig.h (100%) + rename tools/testing/{radix-tree => shared}/linux/kernel.h (100%) + rename tools/testing/{radix-tree => shared}/linux/kmemleak.h (100%) + rename tools/testing/{radix-tree => shared}/linux/local_lock.h (100%) + rename tools/testing/{radix-tree => shared}/linux/lockdep.h (100%) + rename tools/testing/{radix-tree => shared}/linux/maple_tree.h (100%) + rename tools/testing/{radix-tree => shared}/linux/percpu.h (100%) + rename tools/testing/{radix-tree => shared}/linux/preempt.h (100%) + rename tools/testing/{radix-tree => shared}/linux/radix-tree.h (100%) + rename tools/testing/{radix-tree => shared}/linux/rcupdate.h (100%) + rename tools/testing/{radix-tree => shared}/linux/xarray.h (100%) + create mode 100644 tools/testing/shared/maple-shared.h + create mode 100644 tools/testing/shared/maple-shim.c + create mode 100644 tools/testing/shared/shared.h + create mode 100644 tools/testing/shared/shared.mk + rename tools/testing/{radix-tree => shared}/trace/events/maple_tree.h (100%) + create mode 100644 tools/testing/shared/xarray-shared.c + create mode 100644 tools/testing/shared/xarray-shared.h + create mode 100644 tools/testing/vma/.gitignore + create mode 100644 tools/testing/vma/Makefile + create mode 100644 tools/testing/vma/linux/atomic.h + create mode 100644 tools/testing/vma/linux/mmzone.h + create mode 100644 tools/testing/vma/vma.c + create mode 100644 tools/testing/vma/vma_internal.h +Merging kbuild/for-next (7809144639f6 kbuild: modinst: remove the multithread option from zstd compression) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Merge made by the 'ort' strategy. + scripts/Makefile.modinst | 2 +- + scripts/mod/mk_elfconfig.c | 25 ----------------- + scripts/mod/modpost.c | 36 ++++++++++++++++++++++++ + scripts/mod/modpost.h | 13 +++------ + scripts/package/install-extmod-build | 54 ++++++++++++++++++++++++++++++++---- + 5 files changed, 90 insertions(+), 40 deletions(-) +Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Merge made by the 'ort' strategy. + .clang-format | 39 ++++++++++++++++++++++++++++++--------- + 1 file changed, 30 insertions(+), 9 deletions(-) +Merging perf/perf-tools-next (7320ad972510 perf mem: Add -T/--data-type option to report subcommand) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Merge made by the 'ort' strategy. + tools/include/linux/string.h | 2 + + tools/lib/api/fs/tracing_path.c | 2 +- + tools/lib/perf/.gitignore | 5 + + tools/lib/string.c | 13 + + tools/perf/Documentation/perf-ftrace.txt | 48 +- + tools/perf/Documentation/perf-record.txt | 5 + + tools/perf/Makefile | 8 +- + tools/perf/Makefile.perf | 2 + + tools/perf/arch/arm/util/pmu.c | 3 + + tools/perf/arch/arm64/annotate/instructions.c | 3 +- + tools/perf/arch/arm64/util/arm-spe.c | 107 +-- + tools/perf/arch/loongarch/annotate/instructions.c | 6 +- + tools/perf/arch/powerpc/annotate/instructions.c | 254 ++++++ + tools/perf/arch/powerpc/util/dwarf-regs.c | 53 ++ + tools/perf/arch/s390/annotate/instructions.c | 5 +- + tools/perf/arch/x86/annotate/instructions.c | 377 +++++++++ + tools/perf/builtin-annotate.c | 4 +- + tools/perf/builtin-daemon.c | 2 +- + tools/perf/builtin-ftrace.c | 439 +++++++++- + tools/perf/builtin-inject.c | 2 +- + tools/perf/builtin-mem.c | 100 ++- + tools/perf/builtin-record.c | 23 +- + tools/perf/builtin-report.c | 4 +- + tools/perf/builtin-stat.c | 2 +- + tools/perf/builtin-top.c | 2 +- + tools/perf/builtin-trace.c | 217 ++++- + tools/perf/pmu-events/Build | 12 +- + .../pmu-events/arch/powerpc/power10/frontend.json | 5 + + .../pmu-events/arch/powerpc/power10/others.json | 100 ++- + tools/perf/pmu-events/empty-pmu-events.c | 886 +++++++++++++-------- + tools/perf/pmu-events/jevents.py | 12 +- + tools/perf/pmu-events/pmu-events.h | 9 + + tools/perf/scripts/python/arm-cs-trace-disasm.py | 9 +- + tools/perf/tests/builtin-test.c | 1 + + tools/perf/tests/pmu.c | 3 - + .../perf/tests/shell/lib/perf_metric_validation.py | 10 +- + tools/perf/tests/shell/record_bpf_filter.sh | 13 +- + tools/perf/tests/shell/script.sh | 3 + + tools/perf/tests/shell/test_task_analyzer.sh | 3 + + tools/perf/tests/shell/trace_btf_enum.sh | 61 ++ + tools/perf/tests/tests.h | 1 + + tools/perf/tests/workloads/Build | 1 + + tools/perf/tests/workloads/landlock.c | 66 ++ + tools/perf/trace/beauty/beauty.h | 1 + + tools/perf/ui/browsers/annotate.c | 2 +- + tools/perf/util/Build | 1 + + tools/perf/util/annotate-data.c | 453 +---------- + tools/perf/util/annotate-data.h | 83 ++ + tools/perf/util/annotate.c | 21 +- + tools/perf/util/annotate.h | 5 +- + tools/perf/util/bpf-filter.c | 406 +++++++++- + tools/perf/util/bpf-filter.h | 19 +- + tools/perf/util/bpf_skel/sample-filter.h | 2 + + tools/perf/util/bpf_skel/sample_filter.bpf.c | 75 +- + tools/perf/util/cs-etm.c | 8 +- + tools/perf/util/disasm.c | 619 +++++++++----- + tools/perf/util/disasm.h | 19 +- + tools/perf/util/disasm_bpf.c | 195 +++++ + tools/perf/util/disasm_bpf.h | 12 + + tools/perf/util/evlist.c | 5 +- + tools/perf/util/evlist.h | 4 +- + tools/perf/util/evsel_fprintf.c | 2 - + tools/perf/util/ftrace.h | 3 + + tools/perf/util/hist.c | 14 +- + tools/perf/util/include/dwarf-regs.h | 11 + + tools/perf/util/map_symbol.c | 18 + + tools/perf/util/map_symbol.h | 3 + + tools/perf/util/mem-info.c | 13 + + tools/perf/util/mem-info.h | 1 + + tools/perf/util/mmap.c | 4 - + tools/perf/util/pmu.c | 6 +- + tools/perf/util/print-events.c | 3 +- + tools/perf/util/print_insn.c | 14 +- + tools/perf/util/sort.c | 12 +- + tools/perf/util/sort.h | 2 +- + 75 files changed, 3671 insertions(+), 1248 deletions(-) + create mode 100644 tools/lib/perf/.gitignore + create mode 100755 tools/perf/tests/shell/trace_btf_enum.sh + create mode 100644 tools/perf/tests/workloads/landlock.c + create mode 100644 tools/perf/util/disasm_bpf.c + create mode 100644 tools/perf/util/disasm_bpf.h +Merging compiler-attributes/compiler-attributes (8400291e289e Linux 6.11-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/for-next (bd44ca3de49c dma-debug: avoid deadlock between dma debug vs printk and netconsole) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'ort' strategy. + kernel/dma/debug.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging asm-generic/master (b82c1d235a30 syscalls: add back legacy __NR_nfsservctl macro) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Merge made by the 'ort' strategy. + scripts/syscall.tbl | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (ba954cad0ce7 Merge branches 'clkdev', 'fixes' and 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (36639013b346 arm64: mm: Fix lockless walks with static and dynamic page-table folding) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (42bebc7cca79 perf: add missing MODULE_DESCRIPTION() macros) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (893738d2fc99 ARM: pxa/gumstix: fix attaching properties to vbus gpio device) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +Merging amlogic/for-next (0c6580c514ec Merge branch 'v6.11/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/amlogic/meson8b-ec100.dts | 2 - + arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi | 6 + + arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi | 10 ++ + .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 145 +++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 128 ++++++++++++++++++ + 5 files changed, 289 insertions(+), 2 deletions(-) +Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Already up to date. +Merging aspeed/for-next (73feb9cd46f1 ARM: dts: aspeed: System1: Updates to BMC board) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 2 + + arch/arm/boot/dts/aspeed/Makefile | 2 + + .../dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts | 12 +- + .../dts/aspeed/aspeed-bmc-ibm-blueridge-4u.dts | 21 + + .../boot/dts/aspeed/aspeed-bmc-ibm-blueridge.dts | 1691 +++++++++ + arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts | 3881 ++++++++++++++++++++ + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 6 +- + arch/arm/boot/dts/aspeed/ibm-power11-quad.dtsi | 1539 ++++++++ + 8 files changed, 7147 insertions(+), 7 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-blueridge-4u.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-blueridge.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts + create mode 100644 arch/arm/boot/dts/aspeed/ibm-power11-quad.dtsi +Merging at91/at91-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Already up to date. +Merging broadcom/next (350006650b29 Merge branch 'soc/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + .../bindings/soc/bcm/brcm,bcm2711-avs-monitor.yaml | 44 +++ + arch/arm/boot/dts/broadcom/bcm21664-garnet.dts | 4 + + arch/arm/boot/dts/broadcom/bcm21664.dtsi | 362 +++---------------- + arch/arm/boot/dts/broadcom/bcm2166x-common.dtsi | 334 ++++++++++++++++++ + arch/arm/boot/dts/broadcom/bcm23550.dtsi | 382 ++------------------- + .../arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts | 12 +- + .../dts/broadcom/bcm958625-meraki-mx6x-common.dtsi | 12 +- + arch/arm/mach-bcm/Kconfig | 1 + + arch/arm64/boot/dts/broadcom/Makefile | 1 + + arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 64 ++++ + arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 283 +++++++++++++++ + 11 files changed, 820 insertions(+), 679 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2711-avs-monitor.yaml + create mode 100644 arch/arm/boot/dts/broadcom/bcm2166x-common.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712.dtsi +Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (23d22b0fe6a1 memory: emif: Use of_property_read_bool()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + drivers/memory/emif.c | 13 +- + drivers/memory/tegra/tegra210-emc-cc-r21021.c | 455 ++++++-------------------- + 2 files changed, 103 insertions(+), 365 deletions(-) +Merging imx-mxs/for-next (7dd10acc08ab Merge branch 'imx/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 1 + + arch/arm/boot/dts/nxp/imx/imx6sx-udoo-neo.dtsi | 5 + + arch/arm/mach-imx/mach-imx6sx.c | 22 - + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 8 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 2 +- + .../imx8mm-phygate-tauri-l-rs232-rs232.dtso | 5 - + .../imx8mm-phygate-tauri-l-rs232-rs485.dtso | 5 - + .../imx8mm-phygate-tauri-l-rs232-rts-cts.dtso | 6 - + .../imx8mm-venice-gw72xx-0x-rs232-rts.dtso | 4 - + .../freescale/imx8mm-venice-gw72xx-0x-rs422.dtso | 4 - + .../freescale/imx8mm-venice-gw72xx-0x-rs485.dtso | 4 - + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 4 - + arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts | 468 +++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts | 2 - + arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts | 340 +++++++++++++++ + arch/arm64/boot/dts/freescale/imx95.dtsi | 366 +++++++++++++++- + 21 files changed, 1188 insertions(+), 67 deletions(-) + create mode 100644 arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts +Merging mediatek/for-next (9dd04bf6bf1c Merge branch 'v6.11-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/mediatek/mt6357.dtsi | 5 + + arch/arm64/boot/dts/mediatek/mt6358.dtsi | 5 + + arch/arm64/boot/dts/mediatek/mt6359.dtsi | 5 + + arch/arm64/boot/dts/mediatek/mt7981b.dtsi | 42 ++ + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 13 +- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 26 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 2 - + arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 328 +++++++++++++- + arch/arm64/boot/dts/mediatek/mt8188.dtsi | 482 +++++++++++++++++++++ + .../boot/dts/mediatek/mt8195-cherry-dojo-r1.dts | 11 +- + .../boot/dts/mediatek/mt8195-cherry-tomato-r2.dts | 11 +- + .../boot/dts/mediatek/mt8195-cherry-tomato-r3.dts | 11 +- + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 6 +- + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 3 +- + .../boot/dts/mediatek/mt8395-genio-1200-evk.dts | 2 - + .../dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts | 1 + + .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 2 + + drivers/soc/mediatek/mtk-mutex.c | 52 +-- + drivers/soc/mediatek/mtk-pmic-wrap.c | 118 ++--- + 20 files changed, 959 insertions(+), 168 deletions(-) +Merging mvebu/for-next (ffd0d7df6bdb Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (6cb1ac2b11b2 Merge branch 'omap-for-v6.12/drivers' into omap-reset) +$ git merge -m Merge branch 'for-next' of git://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-bone-common.dtsi | 66 +++++++++++++++-------- + arch/arm/boot/dts/ti/omap/am335x-boneblue.dts | 12 +++-- + arch/arm/boot/dts/ti/omap/am335x-regor.dtsi | 10 +++- + arch/arm/boot/dts/ti/omap/am335x-wega.dtsi | 7 ++- + arch/arm/boot/dts/ti/omap/omap3-n900.dts | 2 +- + arch/arm/mach-omap1/omap-dma.c | 13 ----- + arch/arm/mach-omap2/omap_device.c | 2 +- + drivers/bus/ti-sysc.c | 7 +-- + 8 files changed, 69 insertions(+), 50 deletions(-) +Merging qcom/for-next (8f2662ff28a1 Merge branches 'arm32-for-6.12', 'arm64-defconfig-fixes-for-6.11', 'arm64-fixes-for-6.11', 'arm64-for-6.12', 'clk-fixes-for-6.11', 'clk-for-6.12', 'drivers-fixes-for-6.11' and 'drivers-for-6.12' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 2 + + Documentation/devicetree/bindings/arm/qcom.yaml | 10 + + .../bindings/clock/qcom,sm8150-camcc.yaml | 77 + + MAINTAINERS | 7 +- + arch/arm/boot/dts/qcom/pma8084.dtsi | 16 +- + .../boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 4 - + arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts | 25 +- + arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts | 25 +- + arch/arm/boot/dts/qcom/qcom-apq8064-pins.dtsi | 394 ++-- + .../qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts | 10 +- + arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 39 +- + arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi | 34 +- + arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts | 27 +- + arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk01.1.dtsi | 26 +- + arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk04.1.dtsi | 14 +- + .../boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c1.dts | 8 +- + .../boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c2.dts | 2 +- + arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1.dtsi | 6 +- + arch/arm/boot/dts/qcom/qcom-ipq8064-ap148.dts | 11 +- + arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts | 76 +- + arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi | 116 +- + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 2 +- + .../qcom/qcom-msm8974pro-samsung-klte-common.dtsi | 13 + + arch/arm64/boot/dts/qcom/Makefile | 6 + + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 4 +- + .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 27 + + .../dts/qcom/msm8916-samsung-fortuna-common.dtsi | 2 + + .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 24 +- + arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts | 20 + + .../boot/dts/qcom/msm8916-wingtech-wt86518.dts | 87 + + .../boot/dts/qcom/msm8916-wingtech-wt86528.dts | 158 ++ + .../boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi | 215 ++ + arch/arm64/boot/dts/qcom/msm8929-pm8916.dtsi | 162 ++ + .../boot/dts/qcom/msm8929-wingtech-wt82918hd.dts | 17 + + arch/arm64/boot/dts/qcom/msm8929.dtsi | 7 + + .../boot/dts/qcom/msm8939-longcheer-l9100.dts | 26 + + arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts | 2 +- + .../boot/dts/qcom/msm8939-wingtech-wt82918.dts | 17 + + .../boot/dts/qcom/msm8939-wingtech-wt82918.dtsi | 252 +++ + .../boot/dts/qcom/msm8939-wingtech-wt82918hd.dts | 17 + + arch/arm64/boot/dts/qcom/msm8992-lg-h815.dts | 231 +++ + arch/arm64/boot/dts/qcom/pm8950.dtsi | 10 +- + arch/arm64/boot/dts/qcom/pmi8950.dtsi | 3 +- + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 3 + + arch/arm64/boot/dts/qcom/sa8155p.dtsi | 4 + + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 30 + + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 34 + + arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi | 16 +- + arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 60 + + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 181 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 16 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 16 +- + arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 343 +++- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 13 + + arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 113 +- + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 26 +- + arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 26 +- + arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 28 +- + .../boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 46 +- + arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 154 +- + .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 58 +- + arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi | 2 + + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 57 +- + arch/arm64/boot/dts/qcom/x1e80100.dtsi | 221 +- + arch/arm64/configs/defconfig | 1 + + drivers/clk/qcom/Kconfig | 23 +- + drivers/clk/qcom/Makefile | 2 +- + drivers/clk/qcom/camcc-sm8150.c | 2159 ++++++++++++++++++++ + drivers/clk/qcom/clk-alpha-pll.c | 57 +- + drivers/clk/qcom/clk-alpha-pll.h | 5 + + drivers/clk/qcom/dispcc-sm8550.c | 198 +- + drivers/clk/qcom/dispcc-sm8650.c | 1796 ---------------- + drivers/clk/qcom/gcc-ipq6018.c | 2 +- + drivers/clk/qcom/gcc-ipq806x.c | 4 +- + drivers/clk/qcom/gcc-ipq8074.c | 4 +- + drivers/clk/qcom/gcc-mdm9615.c | 4 +- + drivers/clk/qcom/gcc-msm8660.c | 4 +- + drivers/clk/qcom/gcc-msm8960.c | 6 +- + drivers/clk/qcom/gcc-msm8994.c | 54 +- + drivers/clk/qcom/gcc-msm8996.c | 2 +- + drivers/clk/qcom/gcc-msm8998.c | 2 +- + drivers/clk/qcom/gcc-sc8180x.c | 4 + + drivers/clk/qcom/gcc-sm8250.c | 6 +- + drivers/clk/qcom/gcc-sm8450.c | 4 +- + drivers/clk/qcom/lcc-ipq806x.c | 8 +- + drivers/clk/qcom/lcc-msm8960.c | 8 +- + drivers/clk/qcom/mmcc-apq8084.c | 50 +- + drivers/clk/qcom/mmcc-msm8960.c | 30 +- + drivers/clk/qcom/mmcc-msm8974.c | 52 +- + drivers/clk/qcom/mmcc-msm8994.c | 8 +- + drivers/clk/qcom/mmcc-msm8996.c | 8 +- + drivers/firmware/qcom/qcom_scm.c | 1 + + drivers/soc/qcom/Kconfig | 2 +- + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/cmd-db.c | 2 +- + drivers/soc/qcom/icc-bwmon.c | 6 +- + drivers/soc/qcom/llcc-qcom.c | 32 +- + drivers/soc/qcom/qcom_pd_mapper.c | 2 +- + drivers/soc/qcom/smp2p.c | 9 + + drivers/soc/qcom/trace-smp2p.h | 98 + + drivers/soc/qcom/trace_icc-bwmon.h | 48 + + include/dt-bindings/clock/qcom,gcc-sc8180x.h | 4 + + include/dt-bindings/clock/qcom,sm8150-camcc.h | 135 ++ + include/dt-bindings/clock/qcom,sm8650-dispcc.h | 103 +- + 104 files changed, 5781 insertions(+), 2841 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8150-camcc.yaml + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-wingtech-wt86518.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-wingtech-wt86528.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8929-pm8916.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8929-wingtech-wt82918hd.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8929.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918hd.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8992-lg-h815.dts + create mode 100644 drivers/clk/qcom/camcc-sm8150.c + delete mode 100644 drivers/clk/qcom/dispcc-sm8650.c + create mode 100644 drivers/soc/qcom/trace-smp2p.h + create mode 100644 drivers/soc/qcom/trace_icc-bwmon.h + create mode 100644 include/dt-bindings/clock/qcom,sm8150-camcc.h + mode change 100644 => 120000 include/dt-bindings/clock/qcom,sm8650-dispcc.h +Merging renesas/next (3f3b7f43c49a Merge branches 'renesas-arm-defconfig-for-v6.12' and 'renesas-dts-for-v6.12' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../bindings/power/renesas,rcar-sysc.yaml | 1 + + .../devicetree/bindings/reset/renesas,rst.yaml | 1 + + .../devicetree/bindings/soc/renesas/renesas.yaml | 12 ++ + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 6 + + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 26 ++++ + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 3 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 8 + + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 22 +++ + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 20 +++ + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 5 + + .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts | 171 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 52 +++++++ + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 38 +++++ + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 86 +++++++---- + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 43 ++++-- + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 86 +++++++---- + arch/arm64/configs/defconfig | 2 + + 22 files changed, 510 insertions(+), 80 deletions(-) +Merging reset/reset/next (c1267e1afae6 arm64: dts: renesas: rz-smarc: Replace fixed regulator for USB VBUS) +$ 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 (b93783546159 Merge branch 'v6.12-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 6 + + .../bindings/power/rockchip-io-domain.yaml | 24 + + arch/arm/boot/dts/rockchip/rk3128.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + .../boot/dts/rockchip/px30-firefly-jd4-core-mb.dts | 179 ++ + .../boot/dts/rockchip/px30-firefly-jd4-core.dtsi | 320 ++ + arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 20 + + arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 3019 +++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 1 - + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 1 - + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 - + .../{rk3399-op1-opp.dtsi => rk3399-op1.dtsi} | 2 + + arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 133 - + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 1 - + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 3 +- + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 37 +- + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 1 - + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 2 - + .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 2 +- + .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 1 - + .../rockchip/{rk3399-t-opp.dtsi => rk3399-t.dtsi} | 2 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3084 +------------------- + .../boot/dts/rockchip/rk3399pro-rock-pi-n10.dts | 1 - + .../boot/dts/rockchip/rk3568-fastrhino-r66s.dts | 2 +- + .../boot/dts/rockchip/rk3568-fastrhino-r68s.dts | 18 +- + arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 550 +++- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 7 +- + drivers/clk/rockchip/clk-rk3228.c | 2 +- + drivers/soc/rockchip/grf.c | 2 + + drivers/soc/rockchip/io-domain.c | 40 + + 46 files changed, 4316 insertions(+), 3177 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core-mb.dts + create mode 100644 arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-base.dtsi + rename arch/arm64/boot/dts/rockchip/{rk3399-op1-opp.dtsi => rk3399-op1.dtsi} (99%) + delete mode 100644 arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi + rename arch/arm64/boot/dts/rockchip/{rk3399-t-opp.dtsi => rk3399-t.dtsi} (98%) +Merging samsung-krzk/for-next (166203ab290c Merge branch 'next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 10 ++++++++++ + arch/arm/mach-s3c/mach-crag6410-module.c | 2 +- + arch/arm64/boot/dts/exynos/exynos7885-jackpotlte.dts | 2 +- + arch/arm64/boot/dts/exynos/google/gs101.dtsi | 15 +++++++++++++++ + drivers/clk/samsung/clk-exynos850.c | 7 ++++++- + include/dt-bindings/clock/exynos850.h | 1 + + 6 files changed, 34 insertions(+), 3 deletions(-) +Merging scmi/for-linux-next (cd0e0714e5ac Merge branches 'for-next/juno/updates' 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 git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/firmware/arm,scmi.yaml | 30 +++ + arch/arm64/boot/dts/arm/foundation-v8.dtsi | 4 +- + arch/arm64/boot/dts/arm/fvp-base-revc.dts | 4 +- + arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 4 +- + drivers/firmware/arm_scmi/Kconfig | 34 ++- + drivers/firmware/arm_scmi/Makefile | 9 +- + drivers/firmware/arm_scmi/common.h | 213 ++++++++++++---- + drivers/firmware/arm_scmi/driver.c | 271 ++++++++++++--------- + drivers/firmware/arm_scmi/msg.c | 32 ++- + .../{mailbox.c => scmi_transport_mailbox.c} | 72 +++--- + .../arm_scmi/{optee.c => scmi_transport_optee.c} | 130 +++++----- + .../arm_scmi/{smc.c => scmi_transport_smc.c} | 57 +++-- + .../arm_scmi/{virtio.c => scmi_transport_virtio.c} | 102 ++++---- + drivers/firmware/arm_scmi/shmem.c | 85 ++++++- + drivers/firmware/arm_scmi/voltage.c | 4 +- + 15 files changed, 668 insertions(+), 383 deletions(-) + rename drivers/firmware/arm_scmi/{mailbox.c => scmi_transport_mailbox.c} (86%) + rename drivers/firmware/arm_scmi/{optee.c => scmi_transport_optee.c} (89%) + rename drivers/firmware/arm_scmi/{smc.c => scmi_transport_smc.c} (87%) + rename drivers/firmware/arm_scmi/{virtio.c => scmi_transport_virtio.c} (94%) +Merging sophgo/for-next (d9773e09addd riscv: dts: sophgo: Add i2c device support for sg2042) +$ 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/cv1812h-huashan-pi.dts | 9 ++++ + arch/riscv/boot/dts/sophgo/cv18xx.dtsi | 16 +++++++ + arch/riscv/boot/dts/sophgo/sg2042.dtsi | 54 ++++++++++++++++++++++- + 3 files changed, 78 insertions(+), 1 deletion(-) +Merging stm32/stm32-next (1eafc48af859 arm64: stm32: enable scmi regulator for stm32) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'ort' strategy. + arch/arm/boot/dts/st/stm32mp151.dtsi | 2 ++ + 1 file changed, 2 insertions(+) +Merging sunxi/sunxi/for-next (2873085a8cd5 arm64: dts: allwinner: h700: Add Anbernic RG35XX-SP) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 9 ++++-- + arch/arm64/boot/dts/allwinner/Makefile | 3 +- + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 2 ++ + .../allwinner/sun50i-h700-anbernic-rg35xx-2024.dts | 6 ++-- + .../allwinner/sun50i-h700-anbernic-rg35xx-sp.dts | 34 ++++++++++++++++++++++ + 5 files changed, 48 insertions(+), 6 deletions(-) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h700-anbernic-rg35xx-sp.dts +Merging tee/next (cd88a296582c Merge branch 'optee_notif_wait_timeout_for_v6.11' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (5211d93c551f Merge branch for-6.11/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. +Merging thead-dt/thead-dt-for-next (32121e158449 riscv: dts: thead: add basic spi node) +$ git merge -m Merge branch 'thead-dt-for-next' of https://github.com/pdp7/linux.git thead-dt/thead-dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts | 9 +++++++++ + arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi | 4 ++++ + arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts | 5 +++++ + arch/riscv/boot/dts/thead/th1520.dtsi | 16 ++++++++++++++++ + 4 files changed, 34 insertions(+) +Merging ti/ti-next (140b0b1e6e77 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 4 ++-- + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 4 ++-- + drivers/soc/ti/k3-ringacc.c | 12 ++++++------ + drivers/soc/ti/knav_dma.c | 22 +++++----------------- + drivers/soc/ti/knav_qmss_queue.c | 5 ----- + 5 files changed, 15 insertions(+), 32 deletions(-) +Merging xilinx/for-next (0c559f8a91de drivers: soc: xilinx: add the missing kfree in xlnx_add_cb_for_suspend()) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + drivers/soc/xilinx/xlnx_event_manager.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging clk/clk-next (69bec17d2896 Merge branch 'clk-cleanup' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + Documentation/dev-tools/kunit/api/clk.rst | 10 + + Documentation/dev-tools/kunit/api/index.rst | 21 + + Documentation/dev-tools/kunit/api/of.rst | 13 + + .../dev-tools/kunit/api/platformdevice.rst | 10 + + .../devicetree/bindings/clock/nxp,lpc3220-clk.txt | 30 -- + .../devicetree/bindings/clock/nxp,lpc3220-clk.yaml | 51 +++ + .../bindings/clock/nxp,lpc3220-usb-clk.txt | 22 - + .../bindings/clock/nxp,lpc3220-usb-clk.yaml | 35 ++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + drivers/base/dd.c | 1 + + drivers/clk/.kunitconfig | 2 + + drivers/clk/Kconfig | 11 + + drivers/clk/Makefile | 11 +- + drivers/clk/at91/dt-compat.c | 5 +- + drivers/clk/clk-fixed-rate_test.c | 380 +++++++++++++++++ + drivers/clk/clk-fixed-rate_test.h | 8 + + drivers/clk/clk.c | 2 +- + drivers/clk/clk_kunit_helpers.c | 207 ++++++++++ + drivers/clk/clk_parent_data_test.h | 10 + + drivers/clk/clk_test.c | 453 ++++++++++++++++++++- + drivers/clk/davinci/da8xx-cfgchip.c | 4 +- + drivers/clk/kunit_clk_fixed_rate_test.dtso | 19 + + drivers/clk/kunit_clk_parent_data_test.dtso | 28 ++ + drivers/clk/mediatek/reset.c | 61 +-- + drivers/clk/mediatek/reset.h | 10 - + drivers/clk/renesas/clk-mstp.c | 2 +- + drivers/clk/versatile/clk-sp810.c | 2 +- + drivers/of/.kunitconfig | 1 + + drivers/of/Kconfig | 10 + + drivers/of/Makefile | 3 + + drivers/of/kunit_overlay_test.dtso | 9 + + drivers/of/of_kunit_helpers.c | 77 ++++ + drivers/of/overlay_test.c | 115 ++++++ + drivers/of/platform.c | 9 +- + include/kunit/clk.h | 28 ++ + include/kunit/of.h | 115 ++++++ + include/kunit/platform_device.h | 20 + + lib/kunit/Makefile | 4 +- + lib/kunit/platform-test.c | 224 ++++++++++ + lib/kunit/platform.c | 302 ++++++++++++++ + 40 files changed, 2191 insertions(+), 136 deletions(-) + create mode 100644 Documentation/dev-tools/kunit/api/clk.rst + create mode 100644 Documentation/dev-tools/kunit/api/of.rst + create mode 100644 Documentation/dev-tools/kunit/api/platformdevice.rst + delete mode 100644 Documentation/devicetree/bindings/clock/nxp,lpc3220-clk.txt + create mode 100644 Documentation/devicetree/bindings/clock/nxp,lpc3220-clk.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/nxp,lpc3220-usb-clk.txt + create mode 100644 Documentation/devicetree/bindings/clock/nxp,lpc3220-usb-clk.yaml + create mode 100644 drivers/clk/clk-fixed-rate_test.c + create mode 100644 drivers/clk/clk-fixed-rate_test.h + create mode 100644 drivers/clk/clk_kunit_helpers.c + create mode 100644 drivers/clk/clk_parent_data_test.h + create mode 100644 drivers/clk/kunit_clk_fixed_rate_test.dtso + create mode 100644 drivers/clk/kunit_clk_parent_data_test.dtso + create mode 100644 drivers/of/kunit_overlay_test.dtso + create mode 100644 drivers/of/of_kunit_helpers.c + create mode 100644 drivers/of/overlay_test.c + create mode 100644 include/kunit/clk.h + create mode 100644 include/kunit/of.h + create mode 100644 include/kunit/platform_device.h + create mode 100644 lib/kunit/platform-test.c + create mode 100644 lib/kunit/platform.c +Merging clk-imx/for-next (466da3d2d967 clk: imx: composite-7ulp: Use NULL instead of 0) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/imx8mp-audiomix.yaml | 3 + + drivers/clk/imx/Kconfig | 1 + + drivers/clk/imx/clk-composite-7ulp.c | 7 ++ + drivers/clk/imx/clk-composite-8m.c | 51 ++++++++++--- + drivers/clk/imx/clk-composite-93.c | 15 ++-- + drivers/clk/imx/clk-fracn-gppll.c | 6 ++ + drivers/clk/imx/clk-imx6ul.c | 4 +- + drivers/clk/imx/clk-imx7d.c | 6 +- + drivers/clk/imx/clk-imx8mm.c | 2 +- + drivers/clk/imx/clk-imx8mn.c | 1 + + drivers/clk/imx/clk-imx8mp-audiomix.c | 86 ++++++++++++++++++++-- + drivers/clk/imx/clk-imx8mp.c | 8 +- + drivers/clk/imx/clk-imx8qxp.c | 51 ++++++++----- + drivers/clk/imx/clk-imxrt1050.c | 1 + + drivers/clk/imx/clk.c | 1 + + drivers/clk/imx/clk.h | 4 + + 16 files changed, 196 insertions(+), 51 deletions(-) +Merging clk-renesas/renesas-clk (42b54d52ecb7 clk: renesas: Add RZ/V2H(P) CPG driver) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + .../bindings/clock/renesas,cpg-mssr.yaml | 1 + + .../bindings/clock/renesas,rzv2h-cpg.yaml | 80 +++ + drivers/clk/renesas/Kconfig | 9 + + drivers/clk/renesas/Makefile | 2 + + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 37 +- + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 30 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 38 +- + drivers/clk/renesas/r8a779h0-cpg-mssr.c | 40 +- + drivers/clk/renesas/r9a07g043-cpg.c | 12 + + drivers/clk/renesas/r9a08g045-cpg.c | 3 + + drivers/clk/renesas/r9a09g057-cpg.c | 80 +++ + drivers/clk/renesas/rcar-gen4-cpg.c | 208 +++++-- + drivers/clk/renesas/rcar-gen4-cpg.h | 36 +- + drivers/clk/renesas/rzg2l-cpg.c | 71 ++- + drivers/clk/renesas/rzv2h-cpg.c | 688 +++++++++++++++++++++ + drivers/clk/renesas/rzv2h-cpg.h | 151 +++++ + include/dt-bindings/clock/renesas,r9a09g057-cpg.h | 21 + + 17 files changed, 1321 insertions(+), 186 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/renesas,rzv2h-cpg.yaml + create mode 100644 drivers/clk/renesas/r9a09g057-cpg.c + create mode 100644 drivers/clk/renesas/rzv2h-cpg.c + create mode 100644 drivers/clk/renesas/rzv2h-cpg.h + create mode 100644 include/dt-bindings/clock/renesas,r9a09g057-cpg.h +Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (48a3de6cf4c9 LoongArch: KVM: Remove undefined a6 argument comment for kvm_hypercall()) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Merge made by the 'ort' strategy. + arch/loongarch/include/asm/hugetlb.h | 4 +-- + arch/loongarch/include/asm/kfence.h | 6 ++--- + arch/loongarch/include/asm/kvm_host.h | 2 -- + arch/loongarch/include/asm/kvm_para.h | 4 +-- + arch/loongarch/include/asm/pgtable.h | 50 +++++++++++++++++++++-------------- + arch/loongarch/kvm/mmu.c | 8 +++--- + arch/loongarch/mm/hugetlbpage.c | 6 ++--- + arch/loongarch/mm/init.c | 10 +++---- + arch/loongarch/mm/kasan_init.c | 10 +++---- + arch/loongarch/mm/pgtable.c | 2 +- + 10 files changed, 55 insertions(+), 47 deletions(-) +Merging m68k/for-next (21b9e722ad28 m68k: cmpxchg: Fix return value for default case in __arch_xchg()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (de9c2c66ad8e Linux 6.11-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (d829e7ee6354 microblaze: Export xmb_manager functions) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'ort' strategy. + arch/microblaze/kernel/microblaze_ksyms.c | 10 ++++++++++ + arch/microblaze/mm/init.c | 5 ----- + 2 files changed, 10 insertions(+), 5 deletions(-) +Merging mips/mips-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (d173d4d9e831 parisc: Improve monotonic clock_gettime() resolution on SMP machines) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/kernel/time.c | 55 ++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 47 insertions(+), 8 deletions(-) +Merging powerpc/next (9ff0251b2eb5 Merge branch 'topic/ppc-kvm' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (dc1c8034e31b minmax: simplify min()/max()/clamp() implementation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging riscv-dt/riscv-dt-for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Already up to date. +Merging riscv-soc/riscv-soc-for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Already up to date. +Merging s390/for-next (f24ef6ed4928 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Merge made by the 'ort' strategy. +Merging sh/for-next (8fe76a1c2264 sh: push-switch: Add missing MODULE_DESCRIPTION() macro) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (a3da15389112 sparc64: Fix prototype warnings in hibernate.c) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (98ff534ec2cd um: vector: always reset vp->opened) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging bcachefs/for-next (c84469634e82 bcachefs: quota_reserve_range() -> for_each_btree_key_in_subvolume_upto) +$ git merge -m Merge branch 'for-next' of git://evilpiepirate.org/bcachefs.git bcachefs/for-next +Auto-merging fs/bcachefs/fs.c +Auto-merging fs/bcachefs/util.c +Auto-merging fs/bcachefs/util.h +Merge made by the 'ort' strategy. + fs/bcachefs/Kconfig | 7 + + fs/bcachefs/btree_iter.c | 74 +++--- + fs/bcachefs/btree_iter.h | 44 ++-- + fs/bcachefs/btree_locking.h | 6 +- + fs/bcachefs/btree_update.c | 12 +- + fs/bcachefs/btree_update_interior.c | 2 +- + fs/bcachefs/dirent.c | 66 ++--- + fs/bcachefs/fs-io-buffered.c | 39 ++- + fs/bcachefs/fs-io-pagecache.c | 78 +++--- + fs/bcachefs/fs-io.c | 170 ++++--------- + fs/bcachefs/fs.c | 46 ++-- + fs/bcachefs/io_read.c | 4 - + fs/bcachefs/opts.c | 56 ++++- + fs/bcachefs/opts.h | 42 ++-- + fs/bcachefs/subvolume.h | 45 ++++ + fs/bcachefs/sysfs.c | 21 +- + fs/bcachefs/trace.h | 465 +++++++++++++++++++++++++++++++++++- + fs/bcachefs/util.c | 2 +- + fs/bcachefs/util.h | 2 +- + fs/bcachefs/xattr.c | 55 +---- + 20 files changed, 812 insertions(+), 424 deletions(-) +Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging fscrypt/for-next (256abd8e550c Linux 6.10-rc7) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (787822ab0887 Merge branch 'for-next-next-v6.11-20240802' into for-next-20240802) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. +Merging ceph/master (31634d7597d8 ceph: force sending a cap update msg back to MDS for revoke op) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (cecb49e3594c smb3: fix setting SecurityFlags when encryption is required) +$ 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. + Documentation/admin-guide/cifs/usage.rst | 2 +- + fs/smb/client/cifs_debug.c | 2 +- + fs/smb/client/cifsglob.h | 4 ++-- + fs/smb/client/smb2pdu.c | 3 +++ + 4 files changed, 7 insertions(+), 4 deletions(-) +Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Auto-merging fs/configfs/dir.c +Auto-merging fs/configfs/inode.c +Merge made by the 'ort' strategy. + fs/configfs/configfs_internal.h | 4 ++-- + fs/configfs/dir.c | 42 +++++++++++++++++++++++++++++++---------- + fs/configfs/inode.c | 24 ----------------------- + 3 files changed, 34 insertions(+), 36 deletions(-) +Merging dlm/next (89b01913dc73 dlm: add rcu_barrier before destroy kmem cache) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging erofs/dev (8c09c0984a79 erofs: simplify readdir operation) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'ort' strategy. + fs/erofs/dir.c | 35 ++++++++++++----------------------- + fs/erofs/internal.h | 2 +- + 2 files changed, 13 insertions(+), 24 deletions(-) +Merging exfat/dev (89fc548767a2 exfat: fix potential deadlock on __exfat_get_dentry_set) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging exportfs/exportfs-next (0c3836482481 Linux 6.10) +$ git merge -m Merge branch 'exportfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs/exportfs-next +Already up to date. +Merging ext3/for_next (85f22bb5d2c2 Merge UDF consistency fixes.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (a6c12809975b f2fs: fix to use per-inode maxbytes and cleanup) +$ git merge -m Merge branch 'dev' of git://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 | 20 +++++++ + fs/f2fs/data.c | 15 +++-- + fs/f2fs/dir.c | 3 +- + fs/f2fs/extent_cache.c | 4 +- + fs/f2fs/f2fs.h | 79 +++++++++++++++----------- + fs/f2fs/file.c | 48 +++++++++++++--- + fs/f2fs/inline.c | 23 ++++---- + fs/f2fs/inode.c | 1 - + fs/f2fs/node.c | 4 +- + fs/f2fs/segment.c | 49 +++++++++++++++-- + fs/f2fs/super.c | 98 ++++++++++++++++++++------------- + fs/f2fs/sysfs.c | 19 +++++++ + fs/f2fs/verity.c | 5 +- + fs/f2fs/xattr.c | 14 ++++- + include/trace/events/f2fs.h | 3 +- + 15 files changed, 273 insertions(+), 112 deletions(-) +Merging fsverity/for-next (256abd8e550c Linux 6.10-rc7) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (6706415bf9f3 Merge tag 'gfs2-v6.10-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Already up to date. +Merging jfs/jfs-next (d0fa70aca54c jfs: don't walk off the end of ealist) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (933069701c1b Merge tag '6.11-rc-smb3-server-fixes' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (de9c2c66ad8e Linux 6.11-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 (b9fae9f06d84 SUNRPC: Fixup gss_status tracepoint error output) +$ 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 (1d04bedf4e95 svcrdma: Handle device removal outside of the CM event handler) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/nfsd/nfsctl.c +Auto-merging net/sunrpc/svc.c +Merge made by the 'ort' strategy. + fs/lockd/host.c | 2 +- + fs/lockd/svc.c | 9 +-- + fs/nfs/callback.c | 2 + + fs/nfsd/auth.c | 14 ++-- + fs/nfsd/auth.h | 2 +- + fs/nfsd/cache.h | 2 +- + fs/nfsd/export.c | 37 ++++++--- + fs/nfsd/export.h | 7 +- + fs/nfsd/filecache.c | 32 +++++--- + fs/nfsd/filecache.h | 1 + + fs/nfsd/netns.h | 6 +- + fs/nfsd/nfs3proc.c | 44 +++++++++++ + fs/nfsd/nfs4proc.c | 38 ++++++--- + fs/nfsd/nfs4state.c | 17 ++-- + fs/nfsd/nfsctl.c | 19 +++-- + fs/nfsd/nfsd.h | 44 ++++++++--- + fs/nfsd/nfsfh.c | 58 +++++++------- + fs/nfsd/nfsfh.h | 2 + + fs/nfsd/nfsproc.c | 49 +++++++++++- + fs/nfsd/nfssvc.c | 124 ++++++----------------------- + fs/nfsd/vfs.c | 44 +++++------ + fs/nfsd/vfs.h | 4 +- + include/linux/lockd/lockd.h | 2 +- + include/linux/nfs4.h | 17 ++-- + include/linux/sunrpc/svc.h | 41 +++++++--- + include/linux/sunrpc/svc_rdma.h | 2 + + include/linux/sunrpc/svcauth.h | 1 - + include/linux/sunrpc/svcsock.h | 2 - + include/trace/events/rpcrdma.h | 23 ++++++ + include/trace/misc/nfs.h | 1 + + net/sunrpc/sunrpc.h | 4 + + net/sunrpc/svc.c | 131 ++++++++++++++++--------------- + net/sunrpc/svc_xprt.c | 9 --- + net/sunrpc/svcauth.c | 1 - + net/sunrpc/svcsock.c | 1 - + net/sunrpc/xprtrdma/svc_rdma_transport.c | 16 +++- + 36 files changed, 466 insertions(+), 342 deletions(-) +Merging ntfs3/master (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Already up to date. +Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (004b8d1491b4 ovl: fix encoding fid for lower only root) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (92a286e90203 ubi: Fix ubi_init() ubiblock_exit() section mismatch) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (2211561723a6 9p: Enable multipage folios) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Merge made by the 'ort' strategy. + fs/9p/fid.c | 5 ++--- + fs/9p/vfs_inode.c | 1 + + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging v9fs-ericvh/ericvh/for-next (0c3836482481 Linux 6.10) +$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (7bf888fa26e8 xfs: convert comma to semicolon) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (df2f9708ff1f zonefs: enable support for large folios) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter()) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Already up to date. +Merging vfs-brauner/vfs.all (cb0433302c1e Merge branch 'vfs.netfs' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging fs/bcachefs/fs-io-buffered.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/verity.c +Auto-merging fs/smb/client/cifsglob.h +Auto-merging fs/smb/client/smb2pdu.c +Auto-merging tools/testing/selftests/core/close_range_test.c +CONFLICT (content): Merge conflict in tools/testing/selftests/core/close_range_test.c +Recorded preimage for 'tools/testing/selftests/core/close_range_test.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'tools/testing/selftests/core/close_range_test.c'. +[fs-next a9e5acab586f] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 10 + + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/locking.rst | 6 +- + Documentation/filesystems/multigrain-ts.rst | 121 +++++ + Documentation/filesystems/netfs_library.rst | 1 - + Documentation/filesystems/vfs.rst | 12 +- + block/fops.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 47 +- + fs/9p/vfs_addr.c | 5 +- + fs/adfs/inode.c | 5 +- + fs/affs/file.c | 22 +- + fs/afs/file.c | 29 +- + fs/afs/fsclient.c | 9 +- + fs/afs/write.c | 4 +- + fs/afs/yfsclient.c | 9 +- + fs/aio.c | 2 +- + fs/attr.c | 52 +- + fs/autofs/inode.c | 3 +- + fs/bcachefs/fs-io-buffered.c | 8 +- + fs/bcachefs/fs-io-buffered.h | 6 +- + fs/bfs/file.c | 4 +- + fs/btrfs/file.c | 25 +- + fs/btrfs/super.c | 3 +- + fs/buffer.c | 63 ++- + fs/cachefiles/io.c | 19 +- + fs/ceph/addr.c | 85 +-- + fs/coda/inode.c | 43 +- + fs/direct-io.c | 6 - + fs/ecryptfs/mmap.c | 86 +-- + fs/exfat/file.c | 8 +- + fs/exfat/inode.c | 9 +- + fs/ext2/dir.c | 4 +- + fs/ext2/inode.c | 8 +- + fs/ext4/ext4.h | 4 +- + fs/ext4/inline.c | 14 +- + fs/ext4/inode.c | 37 +- + fs/ext4/super.c | 2 +- + fs/ext4/verity.c | 8 +- + fs/f2fs/data.c | 87 +-- + fs/f2fs/super.c | 8 +- + fs/f2fs/verity.c | 8 +- + fs/fat/inode.c | 9 +- + fs/fcntl.c | 10 + + fs/file_table.c | 5 +- + fs/fs-writeback.c | 7 +- + fs/fuse/file.c | 47 +- + fs/hfs/extent.c | 6 +- + fs/hfs/hfs_fs.h | 2 +- + fs/hfs/inode.c | 5 +- + fs/hfsplus/extents.c | 6 +- + fs/hfsplus/hfsplus_fs.h | 2 +- + fs/hfsplus/inode.c | 5 +- + fs/hostfs/hostfs_kern.c | 23 +- + fs/hpfs/file.c | 9 +- + fs/hugetlbfs/inode.c | 4 +- + fs/inode.c | 261 ++++++++- + fs/iomap/buffered-io.c | 2 +- + fs/jffs2/file.c | 66 ++- + fs/jfs/inode.c | 8 +- + fs/libfs.c | 13 +- + fs/minix/dir.c | 134 +++-- + fs/minix/inode.c | 8 +- + fs/minix/minix.h | 40 +- + fs/minix/namei.c | 32 +- + fs/mount.h | 13 + + fs/namei.c | 10 +- + fs/namespace.c | 90 +++- + fs/netfs/Makefile | 3 +- + fs/netfs/buffered_read.c | 677 ++++++++++++++++-------- + fs/netfs/buffered_write.c | 320 +++++------ + fs/netfs/direct_read.c | 147 ++++- + fs/netfs/internal.h | 33 +- + fs/netfs/io.c | 647 ---------------------- + fs/netfs/iterator.c | 50 ++ + fs/netfs/main.c | 6 +- + fs/netfs/misc.c | 94 ++++ + fs/netfs/objects.c | 16 +- + fs/netfs/read_collect.c | 540 +++++++++++++++++++ + fs/netfs/read_retry.c | 256 +++++++++ + fs/netfs/stats.c | 23 +- + fs/netfs/write_collect.c | 243 +++------ + fs/netfs/write_issue.c | 92 ++-- + fs/nfs/file.c | 7 +- + fs/nfs/fscache.c | 19 +- + fs/nfs/fscache.h | 7 +- + fs/nilfs2/dir.c | 4 +- + fs/nilfs2/inode.c | 10 +- + fs/nilfs2/recovery.c | 16 +- + fs/nsfs.c | 102 +++- + fs/ntfs3/file.c | 9 +- + fs/ntfs3/inode.c | 51 +- + fs/ntfs3/ntfs_fs.h | 5 +- + fs/ocfs2/aops.c | 12 +- + fs/ocfs2/aops.h | 2 +- + fs/ocfs2/file.c | 17 +- + fs/ocfs2/mmap.c | 6 +- + fs/omfs/file.c | 4 +- + fs/orangefs/inode.c | 39 +- + fs/proc/base.c | 54 +- + fs/qnx6/dir.c | 88 +-- + fs/qnx6/inode.c | 25 +- + fs/qnx6/namei.c | 4 +- + fs/qnx6/qnx6.h | 9 +- + fs/reiserfs/inode.c | 57 +- + fs/smb/client/cifsencrypt.c | 144 +---- + fs/smb/client/cifsglob.h | 3 +- + fs/smb/client/cifssmb.c | 6 +- + fs/smb/client/file.c | 71 ++- + fs/smb/client/smb2ops.c | 222 ++++---- + fs/smb/client/smb2pdu.c | 10 +- + fs/smb/client/smbdirect.c | 86 +-- + fs/stat.c | 39 +- + fs/super.c | 2 +- + fs/sysv/dir.c | 158 +++--- + fs/sysv/itree.c | 8 +- + fs/sysv/namei.c | 32 +- + fs/sysv/sysv.h | 20 +- + fs/ubifs/file.c | 13 +- + fs/udf/file.c | 2 +- + fs/udf/inode.c | 12 +- + fs/ufs/dir.c | 231 ++++---- + fs/ufs/inode.c | 12 +- + fs/ufs/namei.c | 39 +- + fs/ufs/ufs.h | 20 +- + fs/ufs/util.h | 6 +- + fs/vboxsf/file.c | 24 +- + fs/xfs/libxfs/xfs_trans_inode.c | 6 +- + fs/xfs/xfs_iops.c | 10 +- + fs/xfs/xfs_super.c | 2 +- + include/linux/buffer_head.h | 14 +- + include/linux/file.h | 2 + + include/linux/folio_queue.h | 138 +++++ + include/linux/fs.h | 40 +- + include/linux/iov_iter.h | 104 ++++ + include/linux/mnt_namespace.h | 4 + + include/linux/netfs.h | 44 +- + include/linux/uio.h | 18 + + include/linux/writeback.h | 4 +- + include/trace/events/netfs.h | 140 +++-- + include/trace/events/timestamp.h | 124 +++++ + include/uapi/linux/fcntl.h | 3 + + include/uapi/linux/nsfs.h | 15 + + lib/iov_iter.c | 229 +++++++- + lib/kunit_iov_iter.c | 259 +++++++++ + lib/scatterlist.c | 69 ++- + mm/filemap.c | 6 +- + mm/shmem.c | 12 +- + security/Kconfig | 32 ++ + tools/testing/selftests/core/close_range_test.c | 39 ++ + 149 files changed, 5050 insertions(+), 2830 deletions(-) + create mode 100644 Documentation/filesystems/multigrain-ts.rst + delete mode 100644 fs/netfs/io.c + create mode 100644 fs/netfs/read_collect.c + create mode 100644 fs/netfs/read_retry.c + create mode 100644 include/linux/folio_queue.h + create mode 100644 include/trace/events/timestamp.h +$ git am -3 ../patches/0001-fixup-for-fs-Convert-aops-write_end-to-take-a-folio.patch +Applying: fixup for "fs: Convert aops->write_end to take a folio" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/data.c +$ git add -A . +$ git commit -v -a --amend +[fs-next 6572ba54f33b] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git + Date: Wed Aug 7 10:02:36 2024 +1000 +Merging vfs/for-next (a38297e3fb01 Linux 6.9) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merging fs-next (6572ba54f33b Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging mm/filemap.c +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 20 + + Documentation/admin-guide/cifs/usage.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 10 + + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/locking.rst | 6 +- + Documentation/filesystems/multigrain-ts.rst | 121 +++++ + Documentation/filesystems/netfs_library.rst | 1 - + Documentation/filesystems/vfs.rst | 12 +- + block/fops.c | 12 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 47 +- + fs/9p/fid.c | 5 +- + fs/9p/vfs_addr.c | 5 +- + fs/9p/vfs_inode.c | 1 + + fs/adfs/inode.c | 5 +- + fs/affs/file.c | 22 +- + fs/afs/file.c | 29 +- + fs/afs/fsclient.c | 9 +- + fs/afs/write.c | 4 +- + fs/afs/yfsclient.c | 9 +- + fs/aio.c | 2 +- + fs/attr.c | 52 +- + fs/autofs/inode.c | 3 +- + fs/bcachefs/Kconfig | 7 + + fs/bcachefs/btree_iter.c | 74 +-- + fs/bcachefs/btree_iter.h | 44 +- + fs/bcachefs/btree_locking.h | 6 +- + fs/bcachefs/btree_update.c | 12 +- + fs/bcachefs/btree_update_interior.c | 2 +- + fs/bcachefs/dirent.c | 66 +-- + fs/bcachefs/fs-io-buffered.c | 47 +- + fs/bcachefs/fs-io-buffered.h | 6 +- + fs/bcachefs/fs-io-pagecache.c | 78 +-- + fs/bcachefs/fs-io.c | 170 ++---- + fs/bcachefs/fs.c | 46 +- + fs/bcachefs/io_read.c | 4 - + fs/bcachefs/opts.c | 56 +- + fs/bcachefs/opts.h | 42 +- + fs/bcachefs/subvolume.h | 45 ++ + fs/bcachefs/sysfs.c | 21 +- + fs/bcachefs/trace.h | 465 +++++++++++++++- + fs/bcachefs/util.c | 2 +- + fs/bcachefs/util.h | 2 +- + fs/bcachefs/xattr.c | 55 +- + fs/bfs/file.c | 4 +- + fs/btrfs/file.c | 25 +- + fs/btrfs/super.c | 3 +- + fs/buffer.c | 63 ++- + fs/cachefiles/io.c | 19 +- + fs/ceph/addr.c | 85 +-- + fs/coda/inode.c | 43 +- + fs/configfs/configfs_internal.h | 4 +- + fs/configfs/dir.c | 42 +- + fs/configfs/inode.c | 24 - + fs/direct-io.c | 6 - + fs/ecryptfs/mmap.c | 86 +-- + fs/erofs/dir.c | 35 +- + fs/erofs/internal.h | 2 +- + fs/exfat/file.c | 8 +- + fs/exfat/inode.c | 9 +- + fs/ext2/dir.c | 4 +- + fs/ext2/inode.c | 8 +- + fs/ext4/ext4.h | 4 +- + fs/ext4/inline.c | 14 +- + fs/ext4/inode.c | 37 +- + fs/ext4/super.c | 2 +- + fs/ext4/verity.c | 8 +- + fs/f2fs/data.c | 102 ++-- + fs/f2fs/dir.c | 3 +- + fs/f2fs/extent_cache.c | 4 +- + fs/f2fs/f2fs.h | 79 +-- + fs/f2fs/file.c | 48 +- + fs/f2fs/inline.c | 23 +- + fs/f2fs/inode.c | 1 - + fs/f2fs/node.c | 4 +- + fs/f2fs/segment.c | 49 +- + fs/f2fs/super.c | 106 ++-- + fs/f2fs/sysfs.c | 19 + + fs/f2fs/verity.c | 13 +- + fs/f2fs/xattr.c | 14 +- + fs/fat/inode.c | 9 +- + fs/fcntl.c | 10 + + fs/file_table.c | 5 +- + fs/fs-writeback.c | 7 +- + fs/fuse/file.c | 47 +- + fs/hfs/extent.c | 6 +- + fs/hfs/hfs_fs.h | 2 +- + fs/hfs/inode.c | 5 +- + fs/hfsplus/extents.c | 6 +- + fs/hfsplus/hfsplus_fs.h | 2 +- + fs/hfsplus/inode.c | 5 +- + fs/hostfs/hostfs_kern.c | 23 +- + fs/hpfs/file.c | 9 +- + fs/hugetlbfs/inode.c | 4 +- + fs/inode.c | 261 ++++++++- + fs/iomap/buffered-io.c | 2 +- + fs/jffs2/file.c | 66 ++- + fs/jfs/inode.c | 8 +- + fs/libfs.c | 13 +- + fs/lockd/host.c | 2 +- + fs/lockd/svc.c | 9 +- + fs/minix/dir.c | 134 +++-- + fs/minix/inode.c | 8 +- + fs/minix/minix.h | 40 +- + fs/minix/namei.c | 32 +- + fs/mount.h | 13 + + fs/namei.c | 10 +- + fs/namespace.c | 90 +++- + fs/netfs/Makefile | 3 +- + fs/netfs/buffered_read.c | 677 ++++++++++++++++-------- + fs/netfs/buffered_write.c | 320 +++++------ + fs/netfs/direct_read.c | 147 ++++- + fs/netfs/internal.h | 33 +- + fs/netfs/io.c | 647 ---------------------- + fs/netfs/iterator.c | 50 ++ + fs/netfs/main.c | 6 +- + fs/netfs/misc.c | 94 ++++ + fs/netfs/objects.c | 16 +- + fs/netfs/read_collect.c | 540 +++++++++++++++++++ + fs/netfs/read_retry.c | 256 +++++++++ + fs/netfs/stats.c | 23 +- + fs/netfs/write_collect.c | 243 +++------ + fs/netfs/write_issue.c | 92 ++-- + fs/nfs/callback.c | 2 + + fs/nfs/file.c | 7 +- + fs/nfs/fscache.c | 19 +- + fs/nfs/fscache.h | 7 +- + fs/nfsd/auth.c | 14 +- + fs/nfsd/auth.h | 2 +- + fs/nfsd/cache.h | 2 +- + fs/nfsd/export.c | 37 +- + fs/nfsd/export.h | 7 +- + fs/nfsd/filecache.c | 32 +- + fs/nfsd/filecache.h | 1 + + fs/nfsd/netns.h | 6 +- + fs/nfsd/nfs3proc.c | 44 ++ + fs/nfsd/nfs4proc.c | 38 +- + fs/nfsd/nfs4state.c | 17 +- + fs/nfsd/nfsctl.c | 19 +- + fs/nfsd/nfsd.h | 44 +- + fs/nfsd/nfsfh.c | 58 +- + fs/nfsd/nfsfh.h | 2 + + fs/nfsd/nfsproc.c | 49 +- + fs/nfsd/nfssvc.c | 124 +---- + fs/nfsd/vfs.c | 44 +- + fs/nfsd/vfs.h | 4 +- + fs/nilfs2/dir.c | 4 +- + fs/nilfs2/inode.c | 10 +- + fs/nilfs2/recovery.c | 16 +- + fs/nsfs.c | 102 +++- + fs/ntfs3/file.c | 9 +- + fs/ntfs3/inode.c | 51 +- + fs/ntfs3/ntfs_fs.h | 5 +- + fs/ocfs2/aops.c | 12 +- + fs/ocfs2/aops.h | 2 +- + fs/ocfs2/file.c | 17 +- + fs/ocfs2/mmap.c | 6 +- + fs/omfs/file.c | 4 +- + fs/orangefs/inode.c | 39 +- + fs/proc/base.c | 54 +- + fs/qnx6/dir.c | 88 +-- + fs/qnx6/inode.c | 25 +- + fs/qnx6/namei.c | 4 +- + fs/qnx6/qnx6.h | 9 +- + fs/reiserfs/inode.c | 57 +- + fs/smb/client/cifs_debug.c | 2 +- + fs/smb/client/cifsencrypt.c | 144 +---- + fs/smb/client/cifsglob.h | 7 +- + fs/smb/client/cifssmb.c | 6 +- + fs/smb/client/file.c | 71 ++- + fs/smb/client/smb2ops.c | 222 ++++---- + fs/smb/client/smb2pdu.c | 13 +- + fs/smb/client/smbdirect.c | 86 +-- + fs/stat.c | 39 +- + fs/super.c | 2 +- + fs/sysv/dir.c | 158 +++--- + fs/sysv/itree.c | 8 +- + fs/sysv/namei.c | 32 +- + fs/sysv/sysv.h | 20 +- + fs/ubifs/file.c | 13 +- + fs/udf/file.c | 2 +- + fs/udf/inode.c | 12 +- + fs/ufs/dir.c | 231 ++++---- + fs/ufs/inode.c | 12 +- + fs/ufs/namei.c | 39 +- + fs/ufs/ufs.h | 20 +- + fs/ufs/util.h | 6 +- + fs/vboxsf/file.c | 24 +- + fs/xfs/libxfs/xfs_trans_inode.c | 6 +- + fs/xfs/xfs_iops.c | 10 +- + fs/xfs/xfs_super.c | 2 +- + include/linux/buffer_head.h | 14 +- + include/linux/file.h | 2 + + include/linux/folio_queue.h | 138 +++++ + include/linux/fs.h | 40 +- + include/linux/iov_iter.h | 104 ++++ + include/linux/lockd/lockd.h | 2 +- + include/linux/mnt_namespace.h | 4 + + include/linux/netfs.h | 44 +- + include/linux/nfs4.h | 17 +- + include/linux/sunrpc/svc.h | 41 +- + include/linux/sunrpc/svc_rdma.h | 2 + + include/linux/sunrpc/svcauth.h | 1 - + include/linux/sunrpc/svcsock.h | 2 - + include/linux/uio.h | 18 + + include/linux/writeback.h | 4 +- + include/trace/events/f2fs.h | 3 +- + include/trace/events/netfs.h | 140 +++-- + include/trace/events/rpcrdma.h | 23 + + include/trace/events/timestamp.h | 124 +++++ + include/trace/misc/nfs.h | 1 + + include/uapi/linux/fcntl.h | 3 + + include/uapi/linux/nsfs.h | 15 + + lib/iov_iter.c | 229 +++++++- + lib/kunit_iov_iter.c | 259 +++++++++ + lib/scatterlist.c | 69 ++- + mm/filemap.c | 6 +- + mm/shmem.c | 12 +- + net/sunrpc/sunrpc.h | 4 + + net/sunrpc/svc.c | 131 ++--- + net/sunrpc/svc_xprt.c | 9 - + net/sunrpc/svcauth.c | 1 - + net/sunrpc/svcsock.c | 1 - + net/sunrpc/xprtrdma/svc_rdma_transport.c | 16 +- + security/Kconfig | 32 ++ + tools/testing/selftests/core/close_range_test.c | 39 ++ + 225 files changed, 6658 insertions(+), 3775 deletions(-) + create mode 100644 Documentation/filesystems/multigrain-ts.rst + delete mode 100644 fs/netfs/io.c + create mode 100644 fs/netfs/read_collect.c + create mode 100644 fs/netfs/read_retry.c + create mode 100644 include/linux/folio_queue.h + create mode 100644 include/trace/events/timestamp.h +Merging printk/for-next (b18703ea7157 Merge branch 'rework/write-atomic' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging drivers/tty/serial/8250/8250_core.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging include/linux/printk.h +Auto-merging include/linux/serial_core.h +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/panic.c +Auto-merging kernel/printk/internal.h +Auto-merging kernel/printk/printk.c +Auto-merging kernel/rcu/tree_exp.h +Auto-merging kernel/rcu/tree_stall.h +Merge made by the 'ort' strategy. + drivers/tty/serial/8250/8250_core.c | 6 +- + drivers/tty/serial/amba-pl011.c | 2 +- + drivers/tty/serial/serial_core.c | 16 +- + include/linux/console.h | 112 ++++++-- + include/linux/printk.h | 33 ++- + include/linux/serial_core.h | 117 +++++++- + kernel/locking/lockdep.c | 84 +++++- + kernel/panic.c | 9 + + kernel/printk/internal.h | 73 ++++- + kernel/printk/nbcon.c | 513 ++++++++++++++++++++++++++++++++++-- + kernel/printk/printk.c | 307 ++++++++++++++++----- + kernel/printk/printk_ringbuffer.h | 2 + + kernel/printk/printk_safe.c | 23 +- + kernel/rcu/tree_exp.h | 9 + + kernel/rcu/tree_stall.h | 11 + + 15 files changed, 1186 insertions(+), 131 deletions(-) +Merging pci/next (79b01efa89b2 Merge branch 'pci/controller/affinity') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Merge made by the 'ort' strategy. + drivers/gpu/drm/vboxvideo/vbox_main.c | 4 ++++ + drivers/pci/controller/dwc/pci-keystone.c | 7 ------- + drivers/pci/controller/dwc/pcie-designware-host.c | 12 +++--------- + drivers/pci/controller/mobiveil/pcie-mobiveil-host.c | 11 ++--------- + drivers/pci/controller/pci-aardvark.c | 10 ++-------- + drivers/pci/controller/pci-tegra.c | 10 ++-------- + drivers/pci/controller/pcie-altera-msi.c | 11 ++--------- + drivers/pci/controller/pcie-brcmstb.c | 11 ++--------- + drivers/pci/controller/pcie-mediatek-gen3.c | 13 +++---------- + drivers/pci/controller/pcie-mediatek.c | 11 ++--------- + drivers/pci/controller/pcie-rcar-host.c | 10 ++-------- + drivers/pci/controller/pcie-xilinx-dma-pl.c | 11 ++--------- + drivers/pci/controller/pcie-xilinx-nwl.c | 11 ++--------- + drivers/pci/controller/pcie-xilinx.c | 9 ++------- + drivers/pci/controller/plda/pcie-plda-host.c | 11 ++--------- + drivers/pci/controller/vmd.c | 13 +------------ + drivers/pci/devres.c | 1 + + drivers/pci/pci.h | 2 -- + include/linux/msi.h | 2 ++ + include/linux/pci.h | 1 + + kernel/irq/msi.c | 2 +- + 21 files changed, 38 insertions(+), 135 deletions(-) +Merging pstore/for-next/pstore (de9c2c66ad8e Linux 6.11-rc2) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (047c6a90b836 Merge branch 'for-6.12/elan' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. + drivers/hid/amd-sfh-hid/amd_sfh_hid.c | 4 +- + drivers/hid/hid-asus.c | 3 ++ + drivers/hid/hid-core.c | 25 ++++++++++++ + drivers/hid/hid-cougar.c | 2 +- + drivers/hid/hid-google-hammer.c | 27 +------------ + drivers/hid/hid-ids.h | 19 ++------- + drivers/hid/hid-input.c | 37 +++--------------- + drivers/hid/hid-multitouch.c | 33 ++++++++++++++++ + drivers/hid/wacom_wac.c | 74 +++++++++++++++++++++++++++++++++-- + drivers/hid/wacom_wac.h | 4 ++ + include/linux/hid.h | 2 + + 11 files changed, 151 insertions(+), 79 deletions(-) +Merging i2c/i2c/for-next (f17c06c6608a i2c: Fix conditional for substituting empty ACPI functions) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. + drivers/i2c/i2c-smbus.c | 64 +++++++++++++++++++++++++++++++++++++++++++------ + include/linux/i2c.h | 2 +- + 2 files changed, 58 insertions(+), 8 deletions(-) +Merging i2c-host/i2c/i2c-host (3f7aed28e1de i2c: mt65xx: Avoid double initialization of restart_flag in isr) +$ git merge -m Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host +Auto-merging drivers/i2c/busses/i2c-qcom-geni.c +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-ali1535.c | 3 +-- + drivers/i2c/busses/i2c-amd-mp2-plat.c | 2 +- + drivers/i2c/busses/i2c-aspeed.c | 2 +- + drivers/i2c/busses/i2c-designware-common.c | 27 +++++++++++++++++++++++-- + drivers/i2c/busses/i2c-designware-core.h | 6 ++++-- + drivers/i2c/busses/i2c-designware-master.c | 32 ++++++++++++++++++++++-------- + drivers/i2c/busses/i2c-digicolor.c | 2 +- + drivers/i2c/busses/i2c-imx-lpi2c.c | 2 +- + drivers/i2c/busses/i2c-mt65xx.c | 5 +---- + drivers/i2c/busses/i2c-omap.c | 2 +- + drivers/i2c/busses/i2c-piix4.c | 2 +- + drivers/i2c/busses/i2c-pnx.c | 2 +- + drivers/i2c/busses/i2c-pxa-pci.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/i2c/busses/i2c-qcom-geni.c | 2 +- + drivers/i2c/busses/i2c-qup.c | 2 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/i2c-core-base.c | 2 +- + 18 files changed, 68 insertions(+), 31 deletions(-) +Merging i3c/i3c/next (24168c5e6dfb dt-bindings: i3c: add header for generic I3C flags) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (9a7ad7611852 hwmon: (lm92) Update documentation) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging drivers/hwmon/adt7475.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/hwmon/adt7475.yaml | 37 +- + .../devicetree/bindings/hwmon/ti,amc6821.yaml | 86 ++ + .../devicetree/bindings/trivial-devices.yaml | 2 - + Documentation/hwmon/lm92.rst | 26 +- + Documentation/hwmon/max1619.rst | 4 - + Documentation/hwmon/oxp-sensors.rst | 2 +- + drivers/hwmon/Kconfig | 4 +- + drivers/hwmon/adt7470.c | 22 +- + drivers/hwmon/adt7475.c | 130 +++ + drivers/hwmon/adt7x10.c | 18 +- + drivers/hwmon/amc6821.c | 42 +- + drivers/hwmon/dell-smm-hwmon.c | 8 + + drivers/hwmon/lm92.c | 457 +++++++---- + drivers/hwmon/lm95234.c | 869 ++++++++------------ + drivers/hwmon/lm95245.c | 110 +-- + drivers/hwmon/ltc2947-core.c | 20 +- + drivers/hwmon/ltc2992.c | 19 +- + drivers/hwmon/max16065.c | 17 +- + drivers/hwmon/max1619.c | 495 ++++++----- + drivers/hwmon/max1668.c | 487 ++++------- + drivers/hwmon/max6639.c | 40 +- + drivers/hwmon/max6697.c | 907 +++++++++------------ + drivers/hwmon/nct7802.c | 62 +- + drivers/hwmon/tmp401.c | 17 +- + drivers/hwmon/tmp464.c | 33 +- + drivers/hwmon/vexpress-hwmon.c | 2 +- + include/linux/platform_data/max6697.h | 33 - + 27 files changed, 1915 insertions(+), 2034 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,amc6821.yaml + delete mode 100644 include/linux/platform_data/max6697.h +Merging jc_docs/docs-next (8663dd38a7ba docs/zh_CN: fix a broken reference) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/tainted-kernels.rst | 2 + + Documentation/core-api/memory-allocation.rst | 5 +- + Documentation/doc-guide/checktransupdate.rst | 54 ++++++ + Documentation/doc-guide/index.rst | 1 + + .../zh_CN/doc-guide/checktransupdate.rst | 55 ++++++ + .../translations/zh_CN/doc-guide/index.rst | 1 + + Documentation/translations/zh_CN/index.rst | 2 +- + .../translations/zh_CN/kbuild/headers_install.rst | 39 ++++ + Documentation/translations/zh_CN/kbuild/index.rst | 35 ++++ + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 1 + + scripts/checktransupdate.py | 212 ++++++++++++++------- + 12 files changed, 333 insertions(+), 75 deletions(-) + create mode 100644 Documentation/doc-guide/checktransupdate.rst + create mode 100644 Documentation/translations/zh_CN/doc-guide/checktransupdate.rst + create mode 100644 Documentation/translations/zh_CN/kbuild/headers_install.rst + create mode 100644 Documentation/translations/zh_CN/kbuild/index.rst +Merging v4l-dvb/master (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (812765cd6954 media: vivid: add support) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Merge made by the 'ort' strategy. + .../media/cec/cec-ioc-adap-g-caps.rst | 6 +++ + .../userspace-api/media/cec/cec-ioc-receive.rst | 15 +++++++ + drivers/media/cec/core/cec-adap.c | 52 +++++++++++++++------- + drivers/media/cec/core/cec-core.c | 2 +- + drivers/media/rc/ene_ir.c | 3 -- + drivers/media/rc/ite-cir.c | 1 - + drivers/media/rc/meson-ir.c | 27 +++++++++++ + drivers/media/rc/rc-loopback.c | 1 - + drivers/media/test-drivers/vivid/vivid-cec.c | 48 ++++++++++++++++++-- + include/media/cec.h | 2 + + include/media/rc-core.h | 2 - + include/uapi/linux/cec.h | 3 ++ + 12 files changed, 136 insertions(+), 26 deletions(-) +Merging pm/linux-next (5a4e6abbb58a Merge branch 'pm-cpufreq' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + drivers/cpufreq/cpufreq.c | 27 ++++----------------------- + drivers/cpufreq/intel_pstate.c | 1 + + drivers/thermal/broadcom/bcm2835_thermal.c | 7 +++---- + include/linux/cpufreq.h | 6 ------ + 4 files changed, 8 insertions(+), 33 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (dca2ef2b7d91 cpufreq: spear: Use of_property_for_each_u32() instead of open coding) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Auto-merging drivers/cpufreq/pmac64-cpufreq.c +Merge made by the 'ort' strategy. + drivers/cpufreq/cpufreq-dt.c | 11 +++-------- + drivers/cpufreq/pmac64-cpufreq.c | 2 +- + drivers/cpufreq/spear-cpufreq.c | 16 ++++++---------- + drivers/cpufreq/sti-cpufreq.c | 2 +- + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 2 +- + 5 files changed, 12 insertions(+), 21 deletions(-) +Merging cpupower/cpupower (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (1d143dde7679 PM / devfreq: exynos: Use Use devm_clk_get_enabled() helpers) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/exynos-bus.c | 22 +++++----------------- + drivers/devfreq/governor_performance.c | 1 + + drivers/devfreq/governor_powersave.c | 1 + + drivers/devfreq/governor_simpleondemand.c | 1 + + drivers/devfreq/governor_userspace.c | 1 + + 5 files changed, 9 insertions(+), 17 deletions(-) +Merging pmdomain/next (8287e9e2c7d2 pmdomain: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Merge made by the 'ort' strategy. + drivers/cpuidle/cpuidle-psci-domain.c | 10 +- + drivers/cpuidle/cpuidle-psci.c | 26 +- + drivers/pmdomain/amlogic/Kconfig | 11 - + drivers/pmdomain/amlogic/Makefile | 1 - + drivers/pmdomain/amlogic/meson-gx-pwrc-vpu.c | 380 --------------------------- + drivers/pmdomain/core.c | 75 ++++-- + include/linux/pm_domain.h | 5 +- + 7 files changed, 80 insertions(+), 428 deletions(-) + delete mode 100644 drivers/pmdomain/amlogic/meson-gx-pwrc-vpu.c +Merging opp/opp/linux-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (7eeb114a635a dt-bindings: thermal: convert hisilicon-thermal.txt to dt-schema) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/thermal/mediatek/lvts_thermal.c +Merge made by the 'ort' strategy. +Merging rdma/for-next (2a777679b8cc RDMA/mad: Improve handling of timed out WRs of mad agent) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Merge made by the 'ort' strategy. + drivers/infiniband/core/mad.c | 14 ++++--- + drivers/infiniband/hw/cxgb4/cq.c | 8 +++- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 36 +++++++++++++++++ + drivers/infiniband/hw/cxgb4/provider.c | 71 +++++++++++++++++----------------- + drivers/infiniband/hw/cxgb4/qp.c | 32 +++++++++++++-- + drivers/infiniband/sw/siw/siw.h | 2 - + drivers/infiniband/sw/siw/siw_main.c | 37 ------------------ + 7 files changed, 115 insertions(+), 85 deletions(-) +Merging net-next/main (45160cebd6ac net: veth: Disable netpoll support) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/net/dsa/mediatek,mt7530.yaml | 8 +- + .../bindings/net/dsa/vitesse,vsc73xx.yaml | 32 ++ + Documentation/networking/ip-sysctl.rst | 14 + + MAINTAINERS | 18 +- + drivers/net/dsa/mt7530-mmio.c | 1 + + drivers/net/dsa/mt7530.c | 49 +- + drivers/net/dsa/mt7530.h | 20 +- + drivers/net/dsa/vitesse-vsc73xx-core.c | 89 +++- + drivers/net/ethernet/alteon/acenic.c | 26 +- + drivers/net/ethernet/alteon/acenic.h | 8 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 30 +- + drivers/net/ethernet/amd/xgbe/xgbe-i2c.c | 16 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 16 +- + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 10 +- + drivers/net/ethernet/broadcom/cnic.c | 19 +- + drivers/net/ethernet/broadcom/cnic.h | 2 +- + drivers/net/ethernet/cadence/macb.h | 3 +- + drivers/net/ethernet/cadence/macb_main.c | 10 +- + drivers/net/ethernet/freescale/fman/fman_port.c | 6 +- + drivers/net/ethernet/ibm/ibmveth.c | 176 +++---- + drivers/net/ethernet/mediatek/airoha_eth.c | 518 +++++++++++---------- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 14 - + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 1 + + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 91 ++++ + drivers/net/ethernet/mellanox/mlx5/core/main.c | 6 + + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 16 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 43 +- + drivers/net/ethernet/meta/Kconfig | 2 + + drivers/net/ethernet/ti/icssg/icssg_prueth.c | 8 +- + drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c | 8 +- + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 5 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 28 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 11 +- + drivers/net/mdio/of_mdio.c | 5 +- + drivers/net/netconsole.c | 2 +- + drivers/net/phy/qcom/qca807x.c | 10 - + drivers/net/phy/vitesse.c | 90 ++++ + drivers/net/veth.c | 1 + + drivers/vhost/vsock.c | 4 +- + include/linux/filter.h | 4 +- + include/linux/ipv6.h | 1 + + include/linux/linkmode.h | 5 +- + include/linux/mlx5/device.h | 7 +- + include/linux/mlx5/driver.h | 2 + + include/linux/mlx5/mlx5_ifc.h | 43 ++ + include/linux/netdevice.h | 32 -- + include/linux/skbuff.h | 2 +- + include/linux/virtio_vsock.h | 6 + + include/net/addrconf.h | 10 +- + include/net/af_vsock.h | 3 + + include/net/inet6_hashtables.h | 14 +- + include/net/inet_hashtables.h | 10 +- + include/net/inet_sock.h | 3 +- + include/net/ipv6_stubs.h | 2 +- + include/net/net_namespace.h | 4 +- + include/net/sock_reuseport.h | 2 +- + include/net/udp.h | 14 +- + net/core/net_namespace.c | 86 ++-- + net/core/skbuff.c | 15 +- + net/core/sock_reuseport.c | 5 +- + net/ethtool/cmis.h | 1 - + net/ethtool/linkinfo.c | 2 +- + net/ethtool/linkmodes.c | 2 +- + net/ethtool/strset.c | 3 +- + net/ipv4/Kconfig | 3 +- + net/ipv4/inet_hashtables.c | 12 +- + net/ipv4/ip_output.c | 1 + + net/ipv4/tcp_htcp.c | 2 +- + net/ipv4/udp.c | 8 +- + net/ipv6/addrconf.c | 15 +- + net/ipv6/inet6_hashtables.c | 15 +- + net/ipv6/udp.c | 8 +- + net/l2tp/l2tp_core.c | 199 ++++---- + net/l2tp/l2tp_core.h | 14 +- + net/l2tp/l2tp_eth.c | 2 +- + net/l2tp/l2tp_ip.c | 13 +- + net/l2tp/l2tp_ip6.c | 7 +- + net/l2tp/l2tp_netlink.c | 4 +- + net/l2tp/l2tp_ppp.c | 110 ++--- + net/mctp/af_mctp.c | 3 + + net/rds/ib.h | 4 - + net/rxrpc/ar-internal.h | 2 - + net/smc/af_smc.c | 8 - + net/smc/smc_core.c | 4 +- + net/smc/smc_loopback.h | 1 - + net/tipc/bearer.c | 8 +- + net/vmw_vsock/af_vsock.c | 58 ++- + net/vmw_vsock/virtio_transport.c | 4 +- + net/vmw_vsock/virtio_transport_common.c | 35 ++ + net/vmw_vsock/vsock_loopback.c | 6 + + tools/net/ynl/lib/ynl.c | 4 +- + .../selftests/drivers/net/hw/pp_alloc_fail.py | 3 +- + tools/testing/selftests/drivers/net/lib/py/env.py | 5 +- + tools/testing/selftests/drivers/net/stats.py | 33 +- + tools/testing/selftests/net/lib/py/ksft.py | 54 ++- + tools/testing/vsock/util.c | 6 +- + tools/testing/vsock/util.h | 3 + + tools/testing/vsock/vsock_test.c | 85 ++++ + 100 files changed, 1554 insertions(+), 891 deletions(-) +Merging bpf-next/for-next (6e083ab095ca Merge branch 'bpf-introduce-new-vfs-based-bpf-kfuncs') +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging tools/testing/selftests/bpf/Makefile +Merge made by the 'ort' strategy. + arch/arm64/net/bpf_jit_comp.c | 57 +- + arch/x86/net/bpf_jit_comp.c | 107 ++- + fs/Makefile | 1 + + fs/bpf_fs_kfuncs.c | 123 +++ + include/linux/bpf.h | 14 + + include/linux/bpf_lsm.h | 8 + + include/linux/bpf_verifier.h | 18 + + include/linux/trace_events.h | 1 - + kernel/bpf/arraymap.c | 6 +- + kernel/bpf/bpf_lsm.c | 65 +- + kernel/bpf/bpf_struct_ops.c | 9 +- + kernel/bpf/btf.c | 5 +- + kernel/bpf/core.c | 21 +- + kernel/bpf/hashtab.c | 4 +- + kernel/bpf/helpers.c | 1 + + kernel/bpf/inode.c | 4 +- + kernel/bpf/local_storage.c | 4 +- + kernel/bpf/verifier.c | 836 +++++++++++++++++---- + net/core/filter.c | 21 +- + net/ipv4/bpf_tcp_ca.c | 26 - + net/xdp/xsk.c | 23 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 22 +- + tools/bpf/bpftool/bash-completion/bpftool | 2 +- + tools/bpf/bpftool/net.c | 69 +- + tools/bpf/bpftool/xlated_dumper.c | 4 +- + tools/bpf/runqslower/Makefile | 3 +- + tools/lib/bpf/libbpf.c | 23 +- + tools/testing/selftests/bpf/.gitignore | 2 +- + tools/testing/selftests/bpf/Makefile | 65 +- + tools/testing/selftests/bpf/bench.c | 1 + + tools/testing/selftests/bpf/bench.h | 1 + + tools/testing/selftests/bpf/bpf_experimental.h | 26 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 14 + + .../selftests/bpf/bpf_testmod/bpf_testmod.h | 1 + + tools/testing/selftests/bpf/disasm_helpers.c | 69 ++ + tools/testing/selftests/bpf/disasm_helpers.h | 12 + + .../selftests/bpf/map_tests/sk_storage_map.c | 2 +- + tools/testing/selftests/bpf/network_helpers.c | 102 ++- + tools/testing/selftests/bpf/network_helpers.h | 5 +- + .../selftests/bpf/prog_tests/bpf_iter_setsockopt.c | 2 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 2 +- + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 4 +- + .../testing/selftests/bpf/prog_tests/cgroup_dev.c | 125 +++ + .../testing/selftests/bpf/prog_tests/cgroup_v1v2.c | 16 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 1 + + .../selftests/bpf/prog_tests/crypto_sanity.c | 1 - + .../testing/selftests/bpf/prog_tests/ctx_rewrite.c | 74 +- + .../selftests/bpf/prog_tests/decap_sanity.c | 1 - + .../selftests/bpf/prog_tests/flow_dissector.c | 2 +- + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 1 + + .../selftests/bpf/prog_tests/lwt_redirect.c | 1 - + .../testing/selftests/bpf/prog_tests/lwt_reroute.c | 1 + + .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 2 +- + .../selftests/bpf/prog_tests/parse_tcp_hdr_opt.c | 1 + + .../testing/selftests/bpf/prog_tests/reg_bounds.c | 18 +- + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 111 +-- + tools/testing/selftests/bpf/prog_tests/sock_addr.c | 1 + + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 320 ++++++++ + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 12 +- + tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 1 + + tools/testing/selftests/bpf/prog_tests/test_lsm.c | 46 +- + .../bpf/prog_tests/test_mmap_inner_array.c | 57 ++ + .../bpf/prog_tests/test_struct_ops_module.c | 2 + + .../selftests/bpf/prog_tests/test_xdp_veth.c | 213 ++++++ + .../selftests/bpf/prog_tests/uprobe_multi_test.c | 331 ++++++++ + .../selftests/bpf/prog_tests/user_ringbuf.c | 1 + + tools/testing/selftests/bpf/prog_tests/verifier.c | 8 + + tools/testing/selftests/bpf/progs/bpf_misc.h | 13 + + .../testing/selftests/bpf/progs/cg_storage_multi.h | 2 - + tools/testing/selftests/bpf/progs/dev_cgroup.c | 4 +- + tools/testing/selftests/bpf/progs/err.h | 10 + + tools/testing/selftests/bpf/progs/lsm_tailcall.c | 34 + + .../testing/selftests/bpf/progs/mmap_inner_array.c | 57 ++ + .../bpf/progs/tailcall_bpf2bpf_hierarchy1.c | 34 + + .../bpf/progs/tailcall_bpf2bpf_hierarchy2.c | 70 ++ + .../bpf/progs/tailcall_bpf2bpf_hierarchy3.c | 62 ++ + .../bpf/progs/tailcall_bpf2bpf_hierarchy_fentry.c | 35 + + tools/testing/selftests/bpf/progs/tc_dummy.c | 12 + + .../selftests/bpf/progs/test_global_map_resize.c | 16 + + .../bpf/progs/test_libbpf_get_fd_by_id_opts.c | 1 + + .../selftests/bpf/progs/test_sig_in_xattr.c | 4 + + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 27 +- + .../selftests/bpf/progs/test_verify_pkcs7_sig.c | 8 +- + tools/testing/selftests/bpf/progs/token_lsm.c | 4 +- + .../testing/selftests/bpf/progs/unsupported_ops.c | 22 + + .../selftests/bpf/progs/uprobe_multi_consumers.c | 39 + + .../selftests/bpf/progs/verifier_global_subprogs.c | 7 +- + tools/testing/selftests/bpf/progs/verifier_ldsx.c | 112 +++ + tools/testing/selftests/bpf/progs/verifier_lsm.c | 162 ++++ + tools/testing/selftests/bpf/progs/verifier_nocsr.c | 796 ++++++++++++++++++++ + .../selftests/bpf/progs/verifier_scalar_ids.c | 336 ++++++--- + .../selftests/bpf/progs/verifier_spill_fill.c | 16 +- + .../bpf/progs/verifier_subprog_precision.c | 2 +- + .../selftests/bpf/progs/verifier_vfs_accept.c | 85 +++ + .../selftests/bpf/progs/verifier_vfs_reject.c | 161 ++++ + .../testing/selftests/bpf/progs/xdp_redirect_map.c | 6 +- + tools/testing/selftests/bpf/test_cpp.cpp | 4 + + tools/testing/selftests/bpf/test_dev_cgroup.c | 85 --- + tools/testing/selftests/bpf/test_loader.c | 219 ++++-- + tools/testing/selftests/bpf/test_lru_map.c | 3 +- + tools/testing/selftests/bpf/test_progs.c | 84 ++- + tools/testing/selftests/bpf/test_progs.h | 9 +- + tools/testing/selftests/bpf/test_xdp_veth.sh | 121 --- + tools/testing/selftests/bpf/testing_helpers.c | 5 +- + tools/testing/selftests/bpf/unpriv_helpers.c | 1 - + tools/testing/selftests/bpf/verifier/precise.c | 28 +- + tools/testing/selftests/bpf/veristat.c | 16 +- + tools/testing/selftests/bpf/xskxceiver.c | 1 + + 108 files changed, 4841 insertions(+), 1004 deletions(-) + create mode 100644 fs/bpf_fs_kfuncs.c + create mode 100644 tools/testing/selftests/bpf/disasm_helpers.c + create mode 100644 tools/testing/selftests/bpf/disasm_helpers.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_dev.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_mmap_inner_array.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c + create mode 100644 tools/testing/selftests/bpf/progs/lsm_tailcall.c + create mode 100644 tools/testing/selftests/bpf/progs/mmap_inner_array.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy1.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy2.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy3.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy_fentry.c + create mode 100644 tools/testing/selftests/bpf/progs/tc_dummy.c + create mode 100644 tools/testing/selftests/bpf/progs/unsupported_ops.c + create mode 100644 tools/testing/selftests/bpf/progs/uprobe_multi_consumers.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_lsm.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_nocsr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_vfs_accept.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_vfs_reject.c + delete mode 100644 tools/testing/selftests/bpf/test_dev_cgroup.c + delete mode 100755 tools/testing/selftests/bpf/test_xdp_veth.sh +Merging ipsec-next/master (8e0c0ec9b7dc Merge branch 'ethernet-convert-from-tasklet-to-bh-workqueue') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/main (ac26327635d6 Merge branch 'fixes-for-stm32-dwmac-driver-fails-to-probe') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (ac26327635d6 Merge branch 'fixes-for-stm32-dwmac-driver-fails-to-probe') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (bd0b4dae74b0 Bluetooth: btusb: Add MediaTek MT7925-B22M support ID 0x13d3:0x3604) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging drivers/bluetooth/btintel.c +Auto-merging net/bluetooth/hci_sync.c +Merge made by the 'ort' strategy. + drivers/bluetooth/btintel.c | 124 +++++++++++++++++++++++++++++++++++++++ + drivers/bluetooth/btintel_pcie.c | 16 +++++ + drivers/bluetooth/btusb.c | 3 + + drivers/bluetooth/hci_qca.c | 19 +++--- + include/net/bluetooth/hci.h | 5 ++ + net/bluetooth/hci_sync.c | 14 +++++ + net/bluetooth/l2cap_core.c | 1 + + 7 files changed, 172 insertions(+), 10 deletions(-) +Merging wireless-next/for-next (420a549395c2 wifi: brcmsmac: clean up unnecessary current_ampdu_cnt and related checks) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Merge made by the 'ort' strategy. + .../wireless/broadcom/brcm80211/brcmfmac/btcoex.c | 2 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 30 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwil.h | 40 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 8 +- + .../wireless/broadcom/brcm80211/brcmsmac/ampdu.c | 22 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 406 ++++++++++++++++++++- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 27 ++ + drivers/net/wireless/marvell/mwifiex/decl.h | 23 ++ + drivers/net/wireless/marvell/mwifiex/fw.h | 54 +++ + drivers/net/wireless/marvell/mwifiex/init.c | 6 + + drivers/net/wireless/marvell/mwifiex/ioctl.h | 5 + + drivers/net/wireless/marvell/mwifiex/join.c | 66 +++- + drivers/net/wireless/marvell/mwifiex/main.c | 62 ++++ + drivers/net/wireless/marvell/mwifiex/main.h | 17 + + drivers/net/wireless/marvell/mwifiex/scan.c | 6 + + drivers/net/wireless/marvell/mwifiex/sdio.c | 13 + + drivers/net/wireless/marvell/mwifiex/sdio.h | 2 + + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 2 + + drivers/net/wireless/marvell/mwifiex/sta_event.c | 36 +- + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 2 +- + drivers/net/wireless/marvell/mwifiex/sta_tx.c | 9 +- + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 171 +++++++++ + drivers/net/wireless/marvell/mwifiex/util.c | 104 ++++++ + 26 files changed, 1047 insertions(+), 74 deletions(-) +Merging ath-next/for-next (3f66f2670309 wifi: ath9k: fix possible integer overflow in ath9k_get_et_stats()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath11k/core.h | 1 + + drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +- + drivers/net/wireless/ath/ath11k/mac.c | 12 + + drivers/net/wireless/ath/ath11k/wmi.c | 4 +- + .../net/wireless/ath/ath12k/debugfs_htt_stats.c | 354 +++++++++++++++++++++ + .../net/wireless/ath/ath12k/debugfs_htt_stats.h | 126 ++++++++ + drivers/net/wireless/ath/ath12k/dp_rx.c | 2 +- + .../net/wireless/ath/ath9k/ath9k_pci_owl_loader.c | 8 +- + drivers/net/wireless/ath/ath9k/calib.c | 7 +- + drivers/net/wireless/ath/ath9k/debug.c | 4 +- + 10 files changed, 505 insertions(+), 15 deletions(-) +Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Already up to date. +Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (78a0b13f5744 Merge tag 'nand/for-6.11' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (a503f91a3645 mtd: rawnand: lpx32xx: Fix dma_request_chan() error checks) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (95b9c9a7777d mtd: spi-nor: micron-st: Add n25q064a WP support) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Merge made by the 'ort' strategy. + drivers/mtd/spi-nor/micron-st.c | 2 ++ + drivers/mtd/spi-nor/sst.c | 39 +++++++++++++++++++-------------------- + 2 files changed, 21 insertions(+), 20 deletions(-) +Merging crypto/master (b0cd6f4c3f19 Revert "crypto: arm64/poly1305 - move data to rodata section") +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Merge made by the 'ort' strategy. + arch/powerpc/crypto/curve25519-ppc64le-core.c | 1 + + crypto/xor.c | 31 ++-- + drivers/crypto/intel/iaa/iaa_crypto_main.c | 4 +- + drivers/crypto/intel/qat/qat_420xx/adf_drv.c | 4 +- + drivers/crypto/intel/qat/qat_4xxx/adf_drv.c | 4 +- + drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c | 4 +- + drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c | 4 +- + drivers/crypto/intel/qat/qat_c62x/adf_drv.c | 4 +- + drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c | 4 +- + drivers/crypto/intel/qat/qat_common/adf_aer.c | 2 +- + drivers/crypto/intel/qat/qat_common/adf_cfg.c | 29 +++ + drivers/crypto/intel/qat/qat_common/adf_cfg.h | 2 + + .../crypto/intel/qat/qat_common/adf_common_drv.h | 2 +- + drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c | 6 +- + drivers/crypto/intel/qat/qat_common/adf_init.c | 44 +---- + .../crypto/intel/qat/qat_common/adf_pfvf_pf_msg.c | 9 +- + .../crypto/intel/qat/qat_common/adf_pfvf_vf_msg.c | 14 ++ + .../crypto/intel/qat/qat_common/adf_pfvf_vf_msg.h | 1 + + drivers/crypto/intel/qat/qat_common/adf_sriov.c | 194 ++++++++++++++------- + drivers/crypto/intel/qat/qat_common/adf_sysfs.c | 4 +- + drivers/crypto/intel/qat/qat_common/adf_vf_isr.c | 4 +- + drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c | 4 +- + drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c | 4 +- + 23 files changed, 229 insertions(+), 150 deletions(-) +Merging drm/drm-next (a4172af3040c Merge tag 'drm-xe-next-2024-07-30' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_display_wa.h | 8 + + drivers/gpu/drm/i915/display/intel_fbc.c | 6 + + drivers/gpu/drm/xe/Makefile | 23 +- + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 6 +- + drivers/gpu/drm/xe/display/xe_display_wa.c | 16 + + drivers/gpu/drm/xe/display/xe_dsb_buffer.c | 8 + + drivers/gpu/drm/xe/display/xe_fb_pin.c | 3 + + drivers/gpu/drm/xe/display/xe_plane_initial.c | 6 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 15 + + drivers/gpu/drm/xe/regs/xe_regs.h | 12 +- + drivers/gpu/drm/xe/regs/xe_sriov_regs.h | 23 - + drivers/gpu/drm/xe/tests/Makefile | 6 +- + drivers/gpu/drm/xe/tests/xe_bo.c | 45 +- + drivers/gpu/drm/xe/tests/xe_bo_test.c | 21 - + drivers/gpu/drm/xe/tests/xe_bo_test.h | 14 - + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 26 +- + drivers/gpu/drm/xe/tests/xe_dma_buf_test.c | 20 - + drivers/gpu/drm/xe/tests/xe_dma_buf_test.h | 13 - + drivers/gpu/drm/xe/tests/xe_kunit_helpers.c | 39 + + drivers/gpu/drm/xe/tests/xe_kunit_helpers.h | 2 + + drivers/gpu/drm/xe/tests/xe_live_test_mod.c | 11 + + drivers/gpu/drm/xe/tests/xe_migrate.c | 424 ++++++- + drivers/gpu/drm/xe/tests/xe_migrate_test.c | 20 - + drivers/gpu/drm/xe/tests/xe_migrate_test.h | 13 - + drivers/gpu/drm/xe/tests/xe_mocs.c | 44 +- + drivers/gpu/drm/xe/tests/xe_mocs_test.c | 21 - + drivers/gpu/drm/xe/tests/xe_mocs_test.h | 14 - + drivers/gpu/drm/xe/tests/xe_pci.c | 30 + + drivers/gpu/drm/xe/tests/xe_pci_test.c | 4 +- + drivers/gpu/drm/xe/tests/xe_pci_test.h | 2 + + drivers/gpu/drm/xe/tests/xe_rtp_test.c | 219 +++- + drivers/gpu/drm/xe/tests/xe_test.h | 10 +- + drivers/gpu/drm/xe/tests/xe_wa_test.c | 1 + + drivers/gpu/drm/xe/xe_bo.c | 13 +- + drivers/gpu/drm/xe/xe_bo.h | 5 +- + drivers/gpu/drm/xe/xe_bo_types.h | 2 + + drivers/gpu/drm/xe/xe_devcoredump.c | 10 +- + drivers/gpu/drm/xe/xe_device.c | 111 +- + drivers/gpu/drm/xe/xe_device.h | 9 + + drivers/gpu/drm/xe/xe_device_types.h | 30 + + drivers/gpu/drm/xe/xe_drm_client.c | 5 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 33 +- + drivers/gpu/drm/xe/xe_exec_queue.h | 2 + + drivers/gpu/drm/xe/xe_exec_queue_types.h | 13 +- + drivers/gpu/drm/xe/xe_execlist.c | 3 +- + drivers/gpu/drm/xe/xe_gen_wa_oob.c | 16 +- + drivers/gpu/drm/xe/xe_gt.c | 54 + + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 2 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 1 + + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 28 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 203 ++-- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h | 12 +- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation_types.h | 4 + + drivers/gpu/drm/xe/xe_gt_topology.c | 27 +- + drivers/gpu/drm/xe/xe_gt_types.h | 25 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 11 +- + drivers/gpu/drm/xe/xe_guc_id_mgr.c | 4 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 56 +- + drivers/gpu/drm/xe/xe_heci_gsc.c | 28 +- + drivers/gpu/drm/xe/xe_heci_gsc.h | 10 +- + drivers/gpu/drm/xe/xe_irq.c | 2 + + drivers/gpu/drm/xe/xe_lmtt.c | 4 +- + drivers/gpu/drm/xe/xe_migrate.c | 522 ++++---- + drivers/gpu/drm/xe/xe_migrate.h | 34 +- + drivers/gpu/drm/xe/xe_mmio.c | 271 +++-- + drivers/gpu/drm/xe/xe_mmio.h | 1 - + drivers/gpu/drm/xe/xe_oa.c | 2 +- + drivers/gpu/drm/xe/xe_pat.c | 11 +- + drivers/gpu/drm/xe/xe_pci.c | 7 +- + drivers/gpu/drm/xe/xe_pm.c | 8 + + drivers/gpu/drm/xe/xe_preempt_fence.c | 12 +- + drivers/gpu/drm/xe/xe_pt.c | 1344 +++++++++++++-------- + drivers/gpu/drm/xe/xe_pt.h | 14 +- + drivers/gpu/drm/xe/xe_pt_types.h | 48 + + drivers/gpu/drm/xe/xe_query.c | 4 +- + drivers/gpu/drm/xe/xe_rtp.c | 42 +- + drivers/gpu/drm/xe/xe_rtp.h | 4 +- + drivers/gpu/drm/xe/xe_rtp_helpers.h | 6 + + drivers/gpu/drm/xe/xe_sa.c | 7 + + drivers/gpu/drm/xe/xe_sriov.c | 2 +- + drivers/gpu/drm/xe/xe_sync.c | 20 +- + drivers/gpu/drm/xe/xe_sync.h | 1 - + drivers/gpu/drm/xe/xe_trace.h | 52 + + drivers/gpu/drm/xe/xe_trace_bo.h | 10 +- + drivers/gpu/drm/xe/xe_tuning.c | 8 + + drivers/gpu/drm/xe/xe_uc_fw.c | 3 + + drivers/gpu/drm/xe/xe_vm.c | 699 +++++------ + drivers/gpu/drm/xe/xe_vm.h | 2 + + drivers/gpu/drm/xe/xe_vm_types.h | 55 +- + drivers/gpu/drm/xe/xe_wa.c | 15 + + drivers/gpu/drm/xe/xe_wa.h | 7 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 2 + + include/uapi/drm/xe_drm.h | 18 +- + 94 files changed, 3307 insertions(+), 1773 deletions(-) + create mode 100644 drivers/gpu/drm/xe/display/xe_display_wa.c + delete mode 100644 drivers/gpu/drm/xe/regs/xe_sriov_regs.h + delete mode 100644 drivers/gpu/drm/xe/tests/xe_bo_test.c + delete mode 100644 drivers/gpu/drm/xe/tests/xe_bo_test.h + delete mode 100644 drivers/gpu/drm/xe/tests/xe_dma_buf_test.c + delete mode 100644 drivers/gpu/drm/xe/tests/xe_dma_buf_test.h + delete mode 100644 drivers/gpu/drm/xe/tests/xe_migrate_test.c + delete mode 100644 drivers/gpu/drm/xe/tests/xe_migrate_test.h + delete mode 100644 drivers/gpu/drm/xe/tests/xe_mocs_test.c + delete mode 100644 drivers/gpu/drm/xe/tests/xe_mocs_test.h +Merging drm-exynos/for-linux-next (627a24f5f25d Merge tag 'amd-drm-fixes-6.11-2024-07-18' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (16c9898ac5ab drm/ci: rockchip: add tests for rockchip display driver) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/ast/ast_dp.c +Auto-merging drivers/gpu/drm/ast/ast_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/ast/ast_drv.h +Auto-merging drivers/gpu/drm/ast/ast_mode.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/gma500/cdv_intel_lvds.c +Auto-merging drivers/gpu/drm/gma500/psb_intel_lvds.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_chan.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_dmem.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_fence.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_gem.c +Auto-merging drivers/gpu/drm/panthor/panthor_sched.c +Auto-merging drivers/gpu/drm/stm/lvds.c +Auto-merging drivers/gpu/drm/tests/drm_gem_shmem_test.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/v3d/v3d_drv.h +Auto-merging drivers/gpu/drm/v3d/v3d_sched.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/v3d/v3d_sched.c +Auto-merging drivers/gpu/drm/v3d/v3d_submit.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/v3d/v3d_submit.c +Auto-merging drivers/gpu/drm/xe/xe_vm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c +Auto-merging fs/pstore/platform.c +Auto-merging kernel/panic.c +Auto-merging kernel/printk/printk.c +Resolved 'drivers/gpu/drm/ast/ast_drv.h' using previous resolution. +Resolved 'drivers/gpu/drm/v3d/v3d_sched.c' using previous resolution. +Resolved 'drivers/gpu/drm/v3d/v3d_submit.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_vm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2bc0df237c7d] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git +$ git diff -M --stat --summary HEAD^.. + Documentation/accel/qaic/qaic.rst | 6 - + .../bindings/display/bridge/toshiba,tc358767.yaml | 21 +- + .../display/panel/boe,th101mb31ig002-28a.yaml | 21 +- + .../bindings/display/panel/himax,hx8394.yaml | 17 +- + .../bindings/display/panel/ilitek,ili9806e.yaml | 1 + + .../bindings/display/panel/jadard,jd9365da-h3.yaml | 1 + + Documentation/gpu/todo.rst | 31 +- + MAINTAINERS | 10 + + arch/powerpc/kernel/nvram_64.c | 8 +- + arch/powerpc/platforms/powernv/opal-kmsg.c | 4 +- + arch/um/kernel/kmsg_dump.c | 2 +- + drivers/accel/ivpu/ivpu_fw.c | 4 + + drivers/dma-buf/dma-heap.c | 33 +- + drivers/gpu/drm/Kconfig | 2 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 + + drivers/gpu/drm/ast/ast_dp.c | 177 ++--- + drivers/gpu/drm/ast/ast_drv.h | 3 +- + drivers/gpu/drm/ast/ast_main.c | 6 +- + drivers/gpu/drm/ast/ast_mode.c | 2 + + drivers/gpu/drm/ast/ast_post.c | 2 +- + drivers/gpu/drm/ast/ast_reg.h | 22 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 5 - + drivers/gpu/drm/bridge/ite-it6505.c | 17 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 103 +-- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 7 +- + drivers/gpu/drm/bridge/tc358767.c | 45 +- + drivers/gpu/drm/ci/arm64.config | 1 + + drivers/gpu/drm/ci/gitlab-ci.yml | 7 +- + drivers/gpu/drm/ci/igt_runner.sh | 11 +- + drivers/gpu/drm/ci/test.yml | 133 +++- + drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 2 +- + drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt | 14 +- + drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 5 +- + drivers/gpu/drm/ci/xfails/i915-amly-fails.txt | 12 +- + drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt | 41 +- + drivers/gpu/drm/ci/xfails/i915-amly-skips.txt | 5 +- + drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt | 2 +- + drivers/gpu/drm/ci/xfails/i915-apl-skips.txt | 4 +- + drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 14 +- + drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 9 +- + drivers/gpu/drm/ci/xfails/i915-cml-skips.txt | 5 +- + drivers/gpu/drm/ci/xfails/i915-glk-fails.txt | 24 +- + drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt | 8 +- + drivers/gpu/drm/ci/xfails/i915-glk-skips.txt | 4 +- + drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt | 2 + + drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt | 2 +- + drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt | 4 +- + drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 25 +- + drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt | 4 +- + drivers/gpu/drm/ci/xfails/i915-whl-fails.txt | 17 +- + drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt | 2 +- + drivers/gpu/drm/ci/xfails/i915-whl-skips.txt | 5 +- + .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt | 10 +- + .../gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt | 32 +- + .../gpu/drm/ci/xfails/mediatek-mt8173-skips.txt | 5 +- + .../gpu/drm/ci/xfails/mediatek-mt8183-fails.txt | 28 +- + .../gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt | 20 + + .../gpu/drm/ci/xfails/mediatek-mt8183-skips.txt | 7 +- + drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt | 19 +- + drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt | 7 +- + drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 6 +- + drivers/gpu/drm/ci/xfails/msm-apq8016-skips.txt | 3 +- + drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt | 1 - + drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt | 2 +- + drivers/gpu/drm/ci/xfails/msm-apq8096-skips.txt | 5 +- + .../xfails/msm-sc7180-trogdor-kingoftown-fails.txt | 146 ---- + .../msm-sc7180-trogdor-kingoftown-flakes.txt | 18 +- + .../xfails/msm-sc7180-trogdor-kingoftown-skips.txt | 6 +- + .../msm-sc7180-trogdor-lazor-limozeen-fails.txt | 146 ---- + .../msm-sc7180-trogdor-lazor-limozeen-flakes.txt | 11 +- + .../msm-sc7180-trogdor-lazor-limozeen-skips.txt | 3 +- + drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt | 1 - + drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 105 ++- + drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt | 5 +- + drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt | 1 + + drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt | 23 + + .../gpu/drm/ci/xfails/panfrost-mt8183-fails.txt | 1 + + .../gpu/drm/ci/xfails/panfrost-mt8183-skips.txt | 23 + + .../gpu/drm/ci/xfails/panfrost-rk3288-fails.txt | 1 + + .../gpu/drm/ci/xfails/panfrost-rk3288-skips.txt | 26 + + .../gpu/drm/ci/xfails/panfrost-rk3399-fails.txt | 1 + + .../gpu/drm/ci/xfails/panfrost-rk3399-flakes.txt | 6 + + .../gpu/drm/ci/xfails/panfrost-rk3399-skips.txt | 26 + + .../gpu/drm/ci/xfails/rockchip-rk3288-fails.txt | 22 +- + .../gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt | 6 + + .../gpu/drm/ci/xfails/rockchip-rk3288-skips.txt | 57 +- + .../gpu/drm/ci/xfails/rockchip-rk3399-fails.txt | 90 ++- + .../gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt | 50 +- + .../gpu/drm/ci/xfails/rockchip-rk3399-skips.txt | 10 +- + .../gpu/drm/ci/xfails/virtio_gpu-none-fails.txt | 65 +- + .../gpu/drm/ci/xfails/virtio_gpu-none-skips.txt | 5 +- + drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 5 - + drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt | 21 + + drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 106 ++- + drivers/gpu/drm/display/drm_dp_helper.c | 66 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 2 +- + drivers/gpu/drm/drm_bridge.c | 9 +- + drivers/gpu/drm/drm_connector.c | 79 +- + drivers/gpu/drm/drm_crtc_internal.h | 7 + + drivers/gpu/drm/drm_fb_helper.c | 2 + + drivers/gpu/drm/drm_mode_config.c | 2 + + drivers/gpu/drm/drm_panel.c | 18 + + drivers/gpu/drm/drm_panic.c | 26 +- + drivers/gpu/drm/drm_probe_helper.c | 2 +- + drivers/gpu/drm/drm_vblank.c | 81 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 +- + drivers/gpu/drm/gma500/intel_bios.c | 22 +- + drivers/gpu/drm/gma500/intel_bios.h | 4 +- + drivers/gpu/drm/gma500/intel_gmbus.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.h | 2 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 2 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 4 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 26 +- + drivers/gpu/drm/imagination/pvr_queue.c | 4 +- + drivers/gpu/drm/lima/lima_sched.c | 2 +- + drivers/gpu/drm/loongson/lsdc_ttm.c | 8 +- + drivers/gpu/drm/mgag200/mgag200_bmc.c | 9 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 40 + + drivers/gpu/drm/mgag200/mgag200_drv.h | 45 +- + drivers/gpu/drm/mgag200/mgag200_g200.c | 5 + + drivers/gpu/drm/mgag200/mgag200_g200eh.c | 5 + + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 5 + + drivers/gpu/drm/mgag200/mgag200_g200er.c | 19 +- + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 19 +- + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 7 +- + drivers/gpu/drm/mgag200/mgag200_g200se.c | 19 +- + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 7 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 192 +++-- + drivers/gpu/drm/mgag200/mgag200_reg.h | 7 + + drivers/gpu/drm/mxsfb/lcdif_kms.c | 5 +- + drivers/gpu/drm/nouveau/Kbuild | 1 - + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 57 +- + drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 7 +- + drivers/gpu/drm/nouveau/dispnv04/disp.h | 2 +- + drivers/gpu/drm/nouveau/dispnv04/hw.c | 9 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 4 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/base507c.c | 21 +- + drivers/gpu/drm/nouveau/dispnv50/base827c.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/base907c.c | 10 +- + drivers/gpu/drm/nouveau/dispnv50/core507d.c | 8 +- + drivers/gpu/drm/nouveau/dispnv50/corec37d.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/corec57d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 4 +- + drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 4 +- + drivers/gpu/drm/nouveau/dispnv50/crcc57d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/dac507d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/dac907d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 78 +- + drivers/gpu/drm/nouveau/dispnv50/disp.h | 14 +- + drivers/gpu/drm/nouveau/dispnv50/head507d.c | 24 +- + drivers/gpu/drm/nouveau/dispnv50/head827d.c | 10 +- + drivers/gpu/drm/nouveau/dispnv50/head907d.c | 26 +- + drivers/gpu/drm/nouveau/dispnv50/head917d.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 18 +- + drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 12 +- + drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/ovly827e.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/ovly907e.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/pior507d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/sor507d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/sor907d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/sorc37d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c | 7 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 24 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 10 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc67e.c | 2 +- + drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 7 - + drivers/gpu/drm/nouveau/include/nvif/class.h | 3 - + drivers/gpu/drm/nouveau/include/nvif/client.h | 11 +- + drivers/gpu/drm/nouveau/include/nvif/device.h | 37 +- + drivers/gpu/drm/nouveau/include/nvif/driver.h | 5 - + drivers/gpu/drm/nouveau/include/nvif/if0000.h | 10 - + drivers/gpu/drm/nouveau/include/nvif/if0002.h | 39 - + drivers/gpu/drm/nouveau/include/nvif/if0003.h | 34 - + drivers/gpu/drm/nouveau/include/nvif/ioctl.h | 27 - + drivers/gpu/drm/nouveau/include/nvif/object.h | 24 +- + drivers/gpu/drm/nouveau/include/nvif/os.h | 19 + + drivers/gpu/drm/nouveau/include/nvkm/core/client.h | 1 - + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 1 - + drivers/gpu/drm/nouveau/include/nvkm/core/layout.h | 1 - + drivers/gpu/drm/nouveau/include/nvkm/core/object.h | 14 - + drivers/gpu/drm/nouveau/include/nvkm/core/oclass.h | 2 - + drivers/gpu/drm/nouveau/include/nvkm/core/os.h | 19 - + drivers/gpu/drm/nouveau/include/nvkm/core/pci.h | 1 - + drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h | 1 - + drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h | 29 - + drivers/gpu/drm/nouveau/nouveau_abi16.c | 330 ++++++-- + drivers/gpu/drm/nouveau/nouveau_abi16.h | 6 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bios.h | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 50 +- + drivers/gpu/drm/nouveau/nouveau_bo0039.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_bo5039.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_bo74c1.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo85b5.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo9039.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bo90b5.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_boa0b5.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 98 ++- + drivers/gpu/drm/nouveau/nouveau_chan.h | 8 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_dma.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 401 +++++----- + drivers/gpu/drm/nouveau/nouveau_drv.h | 61 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 17 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 46 +- + drivers/gpu/drm/nouveau/nouveau_led.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 38 +- + drivers/gpu/drm/nouveau/nouveau_mem.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_nvif.c | 2 - + drivers/gpu/drm/nouveau/nouveau_platform.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_sched.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_usif.c | 194 ----- + drivers/gpu/drm/nouveau/nouveau_usif.h | 10 - + drivers/gpu/drm/nouveau/nouveau_vga.c | 14 +- + drivers/gpu/drm/nouveau/nv04_fence.c | 2 +- + drivers/gpu/drm/nouveau/nv10_fence.c | 4 +- + drivers/gpu/drm/nouveau/nv17_fence.c | 12 +- + drivers/gpu/drm/nouveau/nv50_fence.c | 4 +- + drivers/gpu/drm/nouveau/nv84_fence.c | 16 +- + drivers/gpu/drm/nouveau/nvc0_fence.c | 4 +- + drivers/gpu/drm/nouveau/nvif/client.c | 32 +- + drivers/gpu/drm/nouveau/nvif/device.c | 15 +- + drivers/gpu/drm/nouveau/nvif/driver.c | 32 +- + drivers/gpu/drm/nouveau/nvif/object.c | 40 - + drivers/gpu/drm/nouveau/nvkm/core/client.c | 64 +- + drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | 91 +-- + drivers/gpu/drm/nouveau/nvkm/core/object.c | 50 -- + drivers/gpu/drm/nouveau/nvkm/core/oproxy.c | 42 - + drivers/gpu/drm/nouveau/nvkm/core/uevent.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/Kbuild | 1 - + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 481 +++++------- + drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | 2 - + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 93 +-- + drivers/gpu/drm/nouveau/nvkm/engine/disp/chan.c | 24 - + drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild | 11 - + drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 867 --------------------- + drivers/gpu/drm/nouveau/nvkm/engine/pm/g84.c | 165 ---- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c | 243 ------ + drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h | 20 - + drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c | 66 -- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gf117.c | 80 -- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c | 184 ----- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c | 157 ---- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c | 138 ---- + drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c | 123 --- + drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h | 15 - + drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c | 175 ----- + drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h | 105 --- + drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 2 + + .../gpu/drm/panel/panel-boe-th101mb31ig002-28a.c | 317 +++++--- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 190 ++--- + drivers/gpu/drm/panel/panel-edp.c | 37 +- + drivers/gpu/drm/panel/panel-himax-hx8394.c | 153 +++- + drivers/gpu/drm/panel/panel-ilitek-ili9806e.c | 165 ++++ + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 317 +++++++- + drivers/gpu/drm/panel/panel-novatek-nt36672e.c | 69 +- + drivers/gpu/drm/panel/panel-simple.c | 26 +- + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 29 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- + drivers/gpu/drm/panthor/panthor_mmu.c | 2 +- + drivers/gpu/drm/panthor/panthor_sched.c | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 27 +- + drivers/gpu/drm/sti/sti_dvo.c | 1 - + drivers/gpu/drm/sti/sti_hda.c | 1 - + drivers/gpu/drm/sti/sti_hdmi.c | 1 - + drivers/gpu/drm/sti/sti_hqvdp.c | 1 - + drivers/gpu/drm/sti/sti_tvout.c | 1 - + drivers/gpu/drm/sti/sti_vtg.c | 1 - + drivers/gpu/drm/stm/Kconfig | 1 + + drivers/gpu/drm/stm/drv.c | 7 +- + drivers/gpu/drm/stm/ltdc.c | 107 +-- + drivers/gpu/drm/stm/lvds.c | 1 - + drivers/gpu/drm/tegra/drm.c | 6 + + drivers/gpu/drm/tests/drm_gem_shmem_test.c | 27 +- + drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 6 +- + drivers/gpu/drm/ttm/tests/ttm_resource_test.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 462 +++++------ + drivers/gpu/drm/ttm/ttm_bo_util.c | 151 ++++ + drivers/gpu/drm/ttm/ttm_device.c | 29 +- + drivers/gpu/drm/ttm/ttm_pool.c | 2 +- + drivers/gpu/drm/ttm/ttm_resource.c | 255 ++++-- + drivers/gpu/drm/v3d/v3d_bo.c | 12 + + drivers/gpu/drm/v3d/v3d_drv.c | 11 +- + drivers/gpu/drm/v3d/v3d_drv.h | 12 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 40 +- + drivers/gpu/drm/v3d/v3d_performance_counters.h | 16 +- + drivers/gpu/drm/v3d/v3d_sched.c | 63 +- + drivers/gpu/drm/v3d/v3d_submit.c | 263 ++++--- + drivers/gpu/drm/vkms/vkms_drv.h | 1 - + drivers/gpu/drm/xe/xe_vm.c | 4 + + drivers/hv/hv_common.c | 4 +- + drivers/mtd/mtdoops.c | 6 +- + drivers/video/fbdev/core/fbcon.c | 16 +- + fs/pstore/platform.c | 10 +- + include/drm/display/drm_dp.h | 4 + + include/drm/display/drm_dp_helper.h | 3 + + include/drm/drm_connector.h | 8 - + include/drm/drm_device.h | 5 +- + include/drm/drm_vblank.h | 37 +- + include/drm/gpu_scheduler.h | 2 +- + include/drm/ttm/ttm_bo.h | 48 +- + include/drm/ttm/ttm_resource.h | 97 ++- + include/linux/dma-heap.h | 21 +- + include/linux/fb.h | 1 + + include/linux/kmsg_dump.h | 22 +- + include/uapi/linux/virtio_gpu.h | 1 + + kernel/panic.c | 2 +- + kernel/printk/printk.c | 11 +- + 323 files changed, 5046 insertions(+), 6334 deletions(-) + create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3399-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/if0002.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/if0003.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h + delete mode 100644 drivers/gpu/drm/nouveau/nouveau_usif.c + delete mode 100644 drivers/gpu/drm/nouveau/nouveau_usif.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/g84.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gf117.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h +Merging amdgpu/drm-next (46142cc1b927 drm/amdgpu: Add DCC GFX12 flag to enable address alignment) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_standalone_libraries/lib_float_math.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +Recorded preimage for 'drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c'. +[master 4814aff4538a] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 13 - + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 6 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 2 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 4 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.h | 9 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 85 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 96 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 59 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 102 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 4 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 36 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 225 +++- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 234 +++- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 260 +++- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 134 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 157 ++- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 18 + + drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c | 57 +- + drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.h | 11 + + drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c | 57 +- + drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.h | 11 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 102 ++ + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 104 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 104 ++ + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 104 ++ + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 112 ++ + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 120 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 4 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 177 ++- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 5 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 185 ++- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 77 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 20 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 9 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 230 +++- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 12 + + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 22 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 35 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 80 +- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 353 +++++ + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 12 + + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 54 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 5 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 120 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 60 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 5 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 12 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 + + drivers/gpu/drm/amd/display/dc/Makefile | 1 - + drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 27 + + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 22 +- + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 300 +++-- + drivers/gpu/drm/amd/display/dc/core/dc.c | 75 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 102 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 1 + + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 14 +- + drivers/gpu/drm/amd/display/dc/dc.h | 18 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 39 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 7 - + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 9 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + + .../gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.h | 6 +- + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c | 1356 ++++++++++++++++++++ + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 32 +- + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.h | 4 - + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 6 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 10 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 3 + + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 5 +- + .../display/dc/dce110/dce110_timing_generator.c | 1 + + .../display/dc/dce110/dce110_timing_generator.h | 1 + + .../display/dc/dce110/dce110_timing_generator_v.c | 1 + + .../display/dc/dce120/dce120_timing_generator.c | 1 + + .../amd/display/dc/dce60/dce60_timing_generator.c | 3 +- + .../amd/display/dc/dce80/dce80_timing_generator.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 6 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn303/Makefile | 13 - + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn314/Makefile | 10 - + drivers/gpu/drm/amd/display/dc/dcn401/Makefile | 10 - + drivers/gpu/drm/amd/display/dc/dio/Makefile | 18 + + .../dc/{ => dio}/dcn301/dcn301_dio_link_encoder.c | 0 + .../dc/{ => dio}/dcn301/dcn301_dio_link_encoder.h | 0 + .../{ => dio}/dcn314/dcn314_dio_stream_encoder.c | 0 + .../{ => dio}/dcn314/dcn314_dio_stream_encoder.h | 0 + .../dc/dio/dcn321/dcn321_dio_link_encoder.c | 1 - + .../dc/dio/dcn35/dcn35_dio_stream_encoder.c | 29 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 3 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 2 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 2 + + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 2 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 2 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 11 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 4 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 5 - + .../dc/dml2/dml21/dml21_translation_helper.c | 104 +- + .../dc/dml2/dml21/dml21_translation_helper.h | 1 + + .../drm/amd/display/dc/dml2/dml21/dml21_utils.c | 169 ++- + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 4 +- + .../dc/dml2/dml21/inc/bounding_boxes/dcn3_soc_bb.h | 8 +- + .../dc/dml2/dml21/inc/bounding_boxes/dcn4_soc_bb.h | 23 +- + .../drm/amd/display/dc/dml2/dml21/inc/dml_top.h | 1 - + .../dc/dml2/dml21/inc/dml_top_dchub_registers.h | 1 - + .../dc/dml2/dml21/inc/dml_top_display_cfg_types.h | 3 +- + .../dc/dml2/dml21/inc/dml_top_policy_types.h | 1 - + .../dml2/dml21/inc/dml_top_soc_parameter_types.h | 16 +- + .../amd/display/dc/dml2/dml21/inc/dml_top_types.h | 13 +- + .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c | 126 +- + .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.h | 1 - + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 448 ++++--- + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.h | 2 +- + .../dml2/dml21/src/dml2_core/dml2_core_factory.c | 1 - + .../dml2/dml21/src/dml2_core/dml2_core_factory.h | 1 - + .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.c | 218 ++-- + .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.h | 1 - + .../dml21/src/dml2_core/dml2_core_shared_types.h | 8 +- + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 131 +- + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h | 1 - + .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 1 - + .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.h | 1 - + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.c | 1 - + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.h | 1 - + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.c | 1 - + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.h | 1 - + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.c | 9 +- + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.h | 1 - + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.c | 1250 ------------------ + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.h | 25 - + .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 533 +++++--- + .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h | 1 - + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.c | 6 +- + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.h | 1 - + .../src/dml2_standalone_libraries/lib_float_math.c | 1 - + .../src/dml2_standalone_libraries/lib_float_math.h | 1 - + .../dml21/src/dml2_top/dml2_top_optimization.c | 1 - + .../dml21/src/dml2_top/dml2_top_optimization.h | 1 - + .../display/dc/dml2/dml21/src/dml2_top/dml_top.c | 14 +- + .../dc/dml2/dml21/src/dml2_top/dml_top_mcache.c | 23 +- + .../dc/dml2/dml21/src/dml2_top/dml_top_mcache.h | 1 - + .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.c | 1 - + .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.h | 1 - + .../dml21/src/inc/dml2_internal_shared_types.h | 27 +- + .../drm/amd/display/dc/dml2/dml2_internal_types.h | 1 + + .../amd/display/dc/dml2/dml2_translation_helper.c | 61 +- + .../amd/display/dc/dml2/dml2_translation_helper.h | 2 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 6 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 2 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 1 + + .../gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.c | 27 +- + .../gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.h | 3 + + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.c | 3 +- + .../drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 14 +- + drivers/gpu/drm/amd/display/dc/dwb/Makefile | 9 + + .../display/dc/{ => dwb}/dcn30/dcn30_cm_common.h | 0 + .../drm/amd/display/dc/{ => dwb}/dcn30/dcn30_dwb.c | 0 + .../drm/amd/display/dc/{ => dwb}/dcn30/dcn30_dwb.h | 0 + .../amd/display/dc/{ => dwb}/dcn30/dcn30_dwb_cm.c | 0 + .../gpu/drm/amd/display/dc/dwb/dcn35/dcn35_dwb.c | 1 - + .../amd/display/dc/gpio/dcn401/hw_factory_dcn401.c | 16 +- + drivers/gpu/drm/amd/display/dc/hpo/Makefile | 15 + + .../dc/{ => hpo}/dcn31/dcn31_hpo_dp_link_encoder.c | 0 + .../dc/{ => hpo}/dcn31/dcn31_hpo_dp_link_encoder.h | 0 + .../{ => hpo}/dcn31/dcn31_hpo_dp_stream_encoder.c | 0 + .../{ => hpo}/dcn31/dcn31_hpo_dp_stream_encoder.h | 0 + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 364 +++--- + .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.c | 3 +- + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c | 3 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 5 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 14 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 27 +- + .../gpu/drm/amd/display/dc/hwss/dcn10/dcn10_init.c | 2 - + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 55 +- + .../gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn201/dcn201_init.c | 1 - + .../gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c | 2 - + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 21 +- + .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn301/dcn301_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 4 +- + .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 2 - + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 13 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.h | 2 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c | 2 - + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 60 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.h | 2 +- + .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 25 +- + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 2 - + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 2 - + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 72 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 5 - + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 1 - + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/audio.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 4 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 13 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/optc.h | 5 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 2 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 10 - + .../amd/display/dc/link/accessories/link_dp_cts.c | 5 +- + .../drm/amd/display/dc/link/hwss/link_hwss_dio.c | 5 +- + .../amd/display/dc/link/hwss/link_hwss_hpo_dp.c | 12 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 5 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 41 +- + .../display/dc/link/protocols/link_dp_capability.c | 10 +- + drivers/gpu/drm/amd/display/dc/mmhubbub/Makefile | 9 + + .../dc/{ => mmhubbub}/dcn20/dcn20_mmhubbub.c | 0 + .../dc/{ => mmhubbub}/dcn20/dcn20_mmhubbub.h | 0 + drivers/gpu/drm/amd/display/dc/mpc/Makefile | 27 + + .../drm/amd/display/dc/{ => mpc}/dcn10/dcn10_mpc.c | 0 + .../drm/amd/display/dc/{ => mpc}/dcn10/dcn10_mpc.h | 0 + .../drm/amd/display/dc/{ => mpc}/dcn20/dcn20_mpc.c | 0 + .../drm/amd/display/dc/{ => mpc}/dcn20/dcn20_mpc.h | 0 + .../drm/amd/display/dc/{ => mpc}/dcn30/dcn30_mpc.c | 2 +- + .../drm/amd/display/dc/{ => mpc}/dcn30/dcn30_mpc.h | 0 + drivers/gpu/drm/amd/display/dc/opp/Makefile | 16 + + .../drm/amd/display/dc/{ => opp}/dcn10/dcn10_opp.c | 0 + .../drm/amd/display/dc/{ => opp}/dcn10/dcn10_opp.h | 0 + .../drm/amd/display/dc/{ => opp}/dcn20/dcn20_opp.c | 0 + .../drm/amd/display/dc/{ => opp}/dcn20/dcn20_opp.h | 0 + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c | 10 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 7 +- + .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c | 8 +- + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 36 +- + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.h | 6 +- + drivers/gpu/drm/amd/display/dc/resource/Makefile | 2 - + .../display/dc/resource/dce110/dce110_resource.c | 1 + + .../display/dc/resource/dce112/dce112_resource.c | 5 +- + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 3 +- + .../display/dc/resource/dcn201/dcn201_resource.c | 4 +- + .../amd/display/dc/resource/dcn21/dcn21_resource.c | 3 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 1 + + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 11 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.h | 5 + + .../dc/resource/dcn32/dcn32_resource_helpers.c | 14 +- + .../display/dc/resource/dcn321/dcn321_resource.c | 1 + + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 1 + + .../display/dc/resource/dcn401/dcn401_resource.c | 4 +- + .../display/dc/resource/dcn401/dcn401_resource.h | 7 +- + drivers/gpu/drm/amd/display/dc/spl/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 16 +- + drivers/gpu/drm/amd/display/dc/spl/dc_spl.h | 8 - + .../drm/amd/display/dc/spl/dc_spl_isharp_filters.c | 1 - + .../drm/amd/display/dc/spl/dc_spl_scl_filters.c | 1 - + .../amd/display/dc/spl/dc_spl_scl_filters_old.c | 25 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h | 44 +- + drivers/gpu/drm/amd/display/dc/spl/spl_os_types.h | 77 ++ + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 3 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 12 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 4 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 4 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 4 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c | 4 + + drivers/gpu/drm/amd/display/include/fixed31_32.h | 6 + + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 18 +- + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 6 + + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 4 +- + .../gpu/drm/amd/pm/swsmu/inc/smu_v14_0_2_pptable.h | 52 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 11 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 886 ++++++++++++- + drivers/gpu/drm/drm_buddy.c | 25 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- + drivers/gpu/drm/radeon/cik.c | 14 +- + drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 12 +- + drivers/gpu/drm/radeon/ni.c | 2 +- + drivers/gpu/drm/radeon/r100.c | 24 +- + drivers/gpu/drm/radeon/r300.c | 6 +- + drivers/gpu/drm/radeon/r420.c | 6 +- + drivers/gpu/drm/radeon/r520.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 12 +- + drivers/gpu/drm/radeon/r600_cs.c | 2 +- + drivers/gpu/drm/radeon/r600_dpm.c | 4 +- + drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 7 +- + drivers/gpu/drm/radeon/radeon_acpi.c | 10 +- + drivers/gpu/drm/radeon/radeon_agp.c | 2 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 38 +- + drivers/gpu/drm/radeon/radeon_audio.c | 4 +- + drivers/gpu/drm/radeon/radeon_combios.c | 38 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 7 +- + drivers/gpu/drm/radeon/radeon_device.c | 13 +- + drivers/gpu/drm/radeon/radeon_display.c | 76 +- + drivers/gpu/drm/radeon/radeon_drv.c | 27 +- + drivers/gpu/drm/radeon/radeon_fbdev.c | 26 +- + drivers/gpu/drm/radeon/radeon_fence.c | 8 +- + drivers/gpu/drm/radeon/radeon_gem.c | 4 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 2 +- + drivers/gpu/drm/radeon/radeon_ib.c | 2 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 +- + drivers/gpu/drm/radeon/radeon_kms.c | 8 +- + drivers/gpu/drm/radeon/radeon_mode.h | 4 +- + drivers/gpu/drm/radeon/radeon_object.c | 9 +- + drivers/gpu/drm/radeon/radeon_pm.c | 20 +- + drivers/gpu/drm/radeon/radeon_ring.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 6 +- + drivers/gpu/drm/radeon/rs400.c | 6 +- + drivers/gpu/drm/radeon/rs600.c | 14 +- + drivers/gpu/drm/radeon/rs690.c | 2 +- + drivers/gpu/drm/radeon/rv515.c | 4 +- + drivers/gpu/drm/radeon/rv770.c | 2 +- + drivers/gpu/drm/radeon/si.c | 4 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 2 +- + include/drm/drm_buddy.h | 2 + + include/uapi/linux/kfd_ioctl.h | 6 +- + 364 files changed, 8409 insertions(+), 3931 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/Makefile + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/Makefile + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn301/dcn301_dio_link_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn301/dcn301_dio_link_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn314/dcn314_dio_stream_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn314/dcn314_dio_stream_encoder.h (100%) + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.h + rename drivers/gpu/drm/amd/display/dc/{ => dwb}/dcn30/dcn30_cm_common.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dwb}/dcn30/dcn30_dwb.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dwb}/dcn30/dcn30_dwb.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dwb}/dcn30/dcn30_dwb_cm.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hpo}/dcn31/dcn31_hpo_dp_link_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hpo}/dcn31/dcn31_hpo_dp_link_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hpo}/dcn31/dcn31_hpo_dp_stream_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hpo}/dcn31/dcn31_hpo_dp_stream_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mmhubbub}/dcn20/dcn20_mmhubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mmhubbub}/dcn20/dcn20_mmhubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn10/dcn10_mpc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn10/dcn10_mpc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn20/dcn20_mpc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn20/dcn20_mpc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn30/dcn30_mpc.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn30/dcn30_mpc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => opp}/dcn10/dcn10_opp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => opp}/dcn10/dcn10_opp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => opp}/dcn20/dcn20_opp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => opp}/dcn20/dcn20_opp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters_old.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/spl_os_types.h +Merging drm-intel/for-linux-next (34d0472ce108 drm/i915: Remove DSC register dump) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/display/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/i915/display/intel_backlight.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbc.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/display/drm_dp_mst_topology.c | 55 ++- + drivers/gpu/drm/i915/display/dvo_ch7017.c | 14 +- + drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 18 +- + drivers/gpu/drm/i915/display/dvo_ivch.c | 16 +- + drivers/gpu/drm/i915/display/dvo_ns2501.c | 18 +- + drivers/gpu/drm/i915/display/dvo_sil164.c | 18 +- + drivers/gpu/drm/i915/display/dvo_tfp410.c | 18 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 9 +- + drivers/gpu/drm/i915/display/intel_alpm.c | 2 +- + drivers/gpu/drm/i915/display/intel_audio.c | 5 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 12 +- + drivers/gpu/drm/i915/display/intel_bios.c | 35 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 5 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 3 + + drivers/gpu/drm/i915/display/intel_ddi.c | 3 +- + drivers/gpu/drm/i915/display/intel_display.c | 33 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 2 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 8 +- + .../gpu/drm/i915/display/intel_display_driver.c | 4 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 8 + + drivers/gpu/drm/i915/display/intel_display_types.h | 45 +- + drivers/gpu/drm/i915/display/intel_dp.c | 278 +++++++---- + drivers/gpu/drm/i915/display/intel_dp.h | 3 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 11 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 132 +++-- + .../gpu/drm/i915/display/intel_dp_link_training.h | 6 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 100 +++- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 1 + + drivers/gpu/drm/i915/display/intel_dsi.h | 2 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 20 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 14 +- + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 547 ++++++++++++--------- + drivers/gpu/drm/i915/display/intel_fbc.h | 13 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 6 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 2 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 7 +- + drivers/gpu/drm/i915/display/intel_link_bw.c | 4 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 30 +- + drivers/gpu/drm/i915/display/intel_tc.c | 3 + + drivers/gpu/drm/i915/display/intel_vblank.c | 3 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 4 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 51 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 4 + + drivers/gpu/drm/i915/display/intel_vrr.c | 3 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 24 +- + drivers/gpu/drm/i915/gvt/edid.c | 28 +- + drivers/gpu/drm/i915/gvt/edid.h | 4 +- + drivers/gpu/drm/i915/gvt/opregion.c | 2 +- + drivers/gpu/drm/i915/i915_drv.h | 3 - + drivers/gpu/drm/xe/display/xe_display.c | 5 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 8 +- + include/drm/display/drm_dp_mst_helper.h | 2 + + 55 files changed, 1011 insertions(+), 648 deletions(-) +Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (fe34394ecdad dt-bindings: display/msm: dsi-controller-main: Add SM7150) +$ 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 (399af57ccca2 dt-bindings: display/msm/gpu: fix the schema being not applied) +$ 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 (9cc033e07d02 drm/xe/guc: Define GuC version v70.29.2 for BMG) +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel drm-xe/drm-xe-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/drm_print.c | 13 ++-- + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 1 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 7 ++ + drivers/gpu/drm/xe/xe_devcoredump.c | 111 +++++++++++++++++++++--------- + drivers/gpu/drm/xe/xe_devcoredump_types.h | 8 +++ + drivers/gpu/drm/xe/xe_exec_queue.c | 37 ++-------- + drivers/gpu/drm/xe/xe_guc.h | 10 +++ + drivers/gpu/drm/xe/xe_hw_engine.c | 37 ++++++++++ + drivers/gpu/drm/xe/xe_hw_engine.h | 7 ++ + drivers/gpu/drm/xe/xe_hwmon.c | 3 +- + drivers/gpu/drm/xe/xe_lrc.c | 15 +++- + drivers/gpu/drm/xe/xe_observation.c | 1 - + drivers/gpu/drm/xe/xe_pt.c | 10 +-- + drivers/gpu/drm/xe/xe_sync.c | 2 +- + drivers/gpu/drm/xe/xe_tuning.c | 13 +++- + drivers/gpu/drm/xe/xe_uc_fw.c | 28 ++++---- + include/drm/drm_print.h | 54 ++++++++++++++- + 17 files changed, 265 insertions(+), 92 deletions(-) +Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block scheduler when GPU is still active) +$ 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 (8b05b12e86ff fbdev/hpfb: Fix an error handling path in hpfb_dio_probe()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/hpfb.c | 1 + + include/video/vga.h | 58 +++++++++++++++++++++++++++++++++------------- + 2 files changed, 43 insertions(+), 16 deletions(-) +Merging regmap/for-next (b18d17d1a97b Merge branch 'regmap-linus' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. +Merging sound/for-next (901e85677ec0 ALSA: usb-audio: Add input value sanity checks for standard types) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/core/seq/seq_ports.h +Auto-merging sound/core/seq/seq_ump_convert.c +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'ort' strategy. + Documentation/sound/alsa-configuration.rst | 3 + + include/sound/control.h | 2 +- + include/sound/memalloc.h | 7 +- + include/sound/ump.h | 11 +++ + include/trace/events/asoc.h | 3 +- + include/uapi/sound/asequencer.h | 2 + + sound/core/control.c | 57 +++++++----- + sound/core/memalloc.c | 140 ++++++++++------------------- + sound/core/pcm_timer.c | 3 +- + sound/core/seq/seq_ports.c | 2 + + sound/core/seq/seq_ports.h | 2 + + sound/core/seq/seq_ump_client.c | 79 ++-------------- + sound/core/seq/seq_ump_convert.c | 11 +-- + sound/core/ump.c | 84 +++++++++++++++-- + sound/drivers/aloop.c | 3 +- + sound/pci/hda/hda_intel.c | 19 ++-- + sound/pci/hda/hda_intel.h | 1 + + sound/pci/pcxhr/pcxhr_mix22.c | 2 +- + sound/pci/rme9652/hdspm.c | 6 +- + sound/usb/mixer.c | 35 ++++++-- + sound/usb/mixer.h | 1 + + 21 files changed, 250 insertions(+), 223 deletions(-) +Merging ieee1394/for-next (56cc34a8c179 firewire: ohci: use guard macro to serialize operations for isochronous contexts) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Merge made by the 'ort' strategy. + drivers/firewire/core-card.c | 60 ++--- + drivers/firewire/core-cdev.c | 256 ++++++++---------- + drivers/firewire/core-device.c | 83 +++--- + drivers/firewire/core-iso.c | 5 +- + drivers/firewire/core-topology.c | 7 +- + drivers/firewire/core-transaction.c | 148 +++++------ + drivers/firewire/core.h | 15 +- + drivers/firewire/ohci-serdes-test.c | 66 +++++ + drivers/firewire/ohci.c | 500 +++++++++++++++++------------------- + drivers/firewire/ohci.h | 200 ++++++++++++++- + 10 files changed, 739 insertions(+), 601 deletions(-) +Merging sound-asoc/for-next (80edd74d9129 Merge remote-tracking branch 'asoc/for-6.12' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/sound/da7213.txt | 45 - + .../devicetree/bindings/sound/dlg,da7213.yaml | 103 ++ + .../bindings/sound/fsl,imx-audio-es8328.yaml | 111 ++ + .../devicetree/bindings/sound/imx-audio-es8328.txt | 60 - + .../devicetree/bindings/sound/pcm512x.txt | 53 - + .../bindings/sound/qcom,apq8016-sbc-sndcard.yaml | 205 ++++ + .../devicetree/bindings/sound/qcom,sm8250.yaml | 137 --- + .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 4 + + .../devicetree/bindings/sound/ti,pcm512x.yaml | 101 ++ + MAINTAINERS | 1 + + include/sound/soc-acpi-intel-match.h | 2 + + include/sound/soc-acpi.h | 2 + + include/sound/soc-dai.h | 5 +- + include/sound/soc-dpcm.h | 1 - + include/sound/soc.h | 3 +- + include/sound/soc_sdw_utils.h | 216 ++++ + include/sound/tas2563-tlv.h | 279 +++++ + include/sound/tas2781-tlv.h | 260 ----- + sound/soc/Kconfig | 2 + + sound/soc/Makefile | 1 + + sound/soc/amd/acp/Kconfig | 22 + + sound/soc/amd/acp/Makefile | 4 + + sound/soc/amd/acp/acp-sdw-sof-mach.c | 742 +++++++++++++ + sound/soc/amd/acp/amd-acp63-acpi-match.c | 90 ++ + sound/soc/amd/acp/soc_amd_sdw_common.h | 44 + + sound/soc/amd/mach-config.h | 1 + + sound/soc/codecs/ak4613.c | 4 +- + sound/soc/codecs/cs42l42-sdw.c | 12 +- + sound/soc/codecs/cs43130.c | 73 +- + sound/soc/codecs/es8326.c | 4 +- + sound/soc/codecs/lpass-wsa-macro.c | 25 +- + sound/soc/codecs/rt5682s.c | 4 +- + sound/soc/codecs/sti-sas.c | 21 +- + sound/soc/codecs/tas2781-comlib.c | 6 +- + sound/soc/codecs/tas2781-i2c.c | 1 + + sound/soc/codecs/wcd937x.h | 34 +- + sound/soc/codecs/wcd938x.c | 18 - + sound/soc/codecs/wcd938x.h | 4 +- + sound/soc/codecs/wcd939x.h | 6 +- + sound/soc/codecs/wsa881x.c | 44 +- + sound/soc/codecs/wsa883x.c | 75 +- + sound/soc/codecs/wsa884x.c | 39 +- + sound/soc/fsl/lpc3xxx-i2s.c | 11 +- + sound/soc/fsl/lpc3xxx-pcm.c | 2 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- + sound/soc/generic/test-component.c | 9 - + sound/soc/intel/boards/Kconfig | 1 + + sound/soc/intel/boards/Makefile | 9 - + sound/soc/intel/boards/sof_sdw.c | 1142 ++------------------ + sound/soc/intel/boards/sof_sdw_common.h | 166 +-- + sound/soc/intel/boards/sof_sdw_hdmi.c | 14 +- + sound/soc/intel/common/Makefile | 1 + + sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 145 +++ + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 4 +- + sound/soc/sdw_utils/Kconfig | 6 + + sound/soc/sdw_utils/Makefile | 11 + + .../soc_sdw_bridge_cs35l56.c} | 56 +- + .../soc_sdw_cs42l42.c} | 13 +- + .../soc_sdw_cs42l43.c} | 38 +- + .../soc_sdw_cs_amp.c} | 18 +- + .../sof_sdw_dmic.c => sdw_utils/soc_sdw_dmic.c} | 10 +- + .../sof_sdw_maxim.c => sdw_utils/soc_sdw_maxim.c} | 56 +- + .../soc_sdw_rt5682.c} | 12 +- + .../sof_sdw_rt700.c => sdw_utils/soc_sdw_rt700.c} | 12 +- + .../sof_sdw_rt711.c => sdw_utils/soc_sdw_rt711.c} | 38 +- + .../soc_sdw_rt712_sdca.c} | 10 +- + .../soc_sdw_rt722_sdca.c} | 10 +- + .../soc_sdw_rt_amp.c} | 32 +- + .../soc_sdw_rt_amp_coeff_tables.h} | 6 +- + .../soc_sdw_rt_dmic.c} | 11 +- + .../soc_sdw_rt_sdca_jack_common.c} | 40 +- + sound/soc/sdw_utils/soc_sdw_utils.c | 990 +++++++++++++++++ + sound/soc/sh/Kconfig | 1 + + sound/soc/sh/rcar/adg.c | 4 +- + sound/soc/sh/rcar/core.c | 17 - + sound/soc/sh/rcar/dma.c | 75 +- + sound/soc/sh/rcar/rsnd.h | 10 - + sound/soc/sh/rcar/ssi.c | 2 +- + sound/soc/sh/rz-ssi.c | 289 +++-- + sound/soc/soc-core.c | 21 +- + sound/soc/soc-dai.c | 20 - + sound/soc/soc-dapm.c | 3 +- + sound/soc/soc-pcm.c | 77 +- + sound/soc/sof/amd/Kconfig | 1 + + sound/soc/sof/amd/acp-common.c | 3 + + sound/soc/sof/amd/acp.c | 1 + + sound/soc/sof/amd/acp.h | 1 + + sound/soc/sof/amd/pci-acp63.c | 1 + + sound/soc/sof/intel/Kconfig | 17 + + sound/soc/sof/intel/Makefile | 2 + + sound/soc/sof/intel/hda-dsp.c | 1 + + sound/soc/sof/intel/hda-stream.c | 4 +- + sound/soc/sof/intel/hda.h | 1 + + sound/soc/sof/intel/lnl.c | 27 + + sound/soc/sof/intel/mtl.c | 16 +- + sound/soc/sof/intel/mtl.h | 2 + + sound/soc/sof/intel/pci-ptl.c | 77 ++ + sound/soc/sof/intel/shim.h | 1 + + sound/soc/sof/pcm.c | 2 +- + sound/soc/sof/sof-audio.h | 4 +- + sound/soc/sof/sof-priv.h | 16 +- + sound/soc/stm/stm32_i2s.c | 4 +- + sound/soc/tegra/tegra210_i2s.c | 16 +- + sound/soc/tegra/tegra_pcm.c | 2 +- + 104 files changed, 4018 insertions(+), 2439 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/da7213.txt + create mode 100644 Documentation/devicetree/bindings/sound/dlg,da7213.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,imx-audio-es8328.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/imx-audio-es8328.txt + delete mode 100644 Documentation/devicetree/bindings/sound/pcm512x.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,apq8016-sbc-sndcard.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm512x.yaml + create mode 100644 include/sound/soc_sdw_utils.h + create mode 100644 include/sound/tas2563-tlv.h + create mode 100644 sound/soc/amd/acp/acp-sdw-sof-mach.c + create mode 100644 sound/soc/amd/acp/amd-acp63-acpi-match.c + create mode 100644 sound/soc/amd/acp/soc_amd_sdw_common.h + create mode 100644 sound/soc/intel/common/soc-acpi-intel-ptl-match.c + create mode 100644 sound/soc/sdw_utils/Kconfig + create mode 100644 sound/soc/sdw_utils/Makefile + rename sound/soc/{intel/boards/bridge_cs35l56.c => sdw_utils/soc_sdw_bridge_cs35l56.c} (63%) + rename sound/soc/{intel/boards/sof_sdw_cs42l42.c => sdw_utils/soc_sdw_cs42l42.c} (82%) + rename sound/soc/{intel/boards/sof_sdw_cs42l43.c => sdw_utils/soc_sdw_cs42l43.c} (73%) + rename sound/soc/{intel/boards/sof_sdw_cs_amp.c => sdw_utils/soc_sdw_cs_amp.c} (66%) + rename sound/soc/{intel/boards/sof_sdw_dmic.c => sdw_utils/soc_sdw_dmic.c} (71%) + rename sound/soc/{intel/boards/sof_sdw_maxim.c => sdw_utils/soc_sdw_maxim.c} (63%) + rename sound/soc/{intel/boards/sof_sdw_rt5682.c => sdw_utils/soc_sdw_rt5682.c} (82%) + rename sound/soc/{intel/boards/sof_sdw_rt700.c => sdw_utils/soc_sdw_rt700.c} (81%) + rename sound/soc/{intel/boards/sof_sdw_rt711.c => sdw_utils/soc_sdw_rt711.c} (70%) + rename sound/soc/{intel/boards/sof_sdw_rt712_sdca.c => sdw_utils/soc_sdw_rt712_sdca.c} (74%) + rename sound/soc/{intel/boards/sof_sdw_rt722_sdca.c => sdw_utils/soc_sdw_rt722_sdca.c} (68%) + rename sound/soc/{intel/boards/sof_sdw_rt_amp.c => sdw_utils/soc_sdw_rt_amp.c} (87%) + rename sound/soc/{intel/boards/sof_sdw_amp_coeff_tables.h => sdw_utils/soc_sdw_rt_amp_coeff_tables.h} (97%) + rename sound/soc/{intel/boards/sof_sdw_rt_dmic.c => sdw_utils/soc_sdw_rt_dmic.c} (70%) + rename sound/soc/{intel/boards/sof_sdw_rt_sdca_jack_common.c => sdw_utils/soc_sdw_rt_sdca_jack_common.c} (78%) + create mode 100644 sound/soc/sdw_utils/soc_sdw_utils.c + create mode 100644 sound/soc/sof/intel/pci-ptl.c +Merging modules/modules-next (61842868de13 module: create weak dependecies) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (63f92f11385d Input: tsc2004/5 - use guard notation when acquiring mutexes/locks) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging MAINTAINERS +Auto-merging drivers/input/joystick/adc-joystick.c +Merge made by the 'ort' strategy. + .../bindings/input/touchscreen/zinitix,bt400.yaml | 10 + + MAINTAINERS | 1 - + drivers/input/joystick/adc-joystick.c | 16 +- + drivers/input/keyboard/Kconfig | 12 - + drivers/input/keyboard/Makefile | 1 - + drivers/input/keyboard/adc-keys.c | 5 +- + drivers/input/keyboard/gpio_keys.c | 4 +- + drivers/input/keyboard/gpio_keys_polled.c | 4 +- + drivers/input/keyboard/mcs_touchkey.c | 268 ------ + drivers/input/keyboard/qt1050.c | 15 +- + drivers/input/keyboard/spear-keyboard.c | 16 +- + drivers/input/keyboard/tc3589x-keypad.c | 3 +- + drivers/input/misc/iqs269a.c | 7 +- + drivers/input/misc/nxp-bbnsm-pwrkey.c | 38 + + drivers/input/mouse/Kconfig | 12 + + drivers/input/mouse/Makefile | 1 + + drivers/input/mouse/pixart_ps2.c | 300 +++++++ + drivers/input/mouse/pixart_ps2.h | 36 + + drivers/input/mouse/psmouse-base.c | 17 + + drivers/input/mouse/psmouse.h | 3 +- + drivers/input/touchscreen/Kconfig | 12 - + drivers/input/touchscreen/Makefile | 1 - + drivers/input/touchscreen/goodix_berlin.h | 1 + + drivers/input/touchscreen/goodix_berlin_core.c | 43 + + drivers/input/touchscreen/goodix_berlin_i2c.c | 1 + + drivers/input/touchscreen/goodix_berlin_spi.c | 1 + + drivers/input/touchscreen/mcs5000_ts.c | 288 ------- + drivers/input/touchscreen/tsc2004.c | 6 - + drivers/input/touchscreen/tsc2005.c | 6 - + drivers/input/touchscreen/tsc200x-core.c | 249 +++--- + drivers/input/touchscreen/tsc200x-core.h | 1 - + drivers/input/touchscreen/usbtouchscreen.c | 956 ++++++++++----------- + drivers/input/touchscreen/zinitix.c | 63 +- + include/linux/platform_data/mcs.h | 30 - + 34 files changed, 1098 insertions(+), 1329 deletions(-) + delete mode 100644 drivers/input/keyboard/mcs_touchkey.c + create mode 100644 drivers/input/mouse/pixart_ps2.c + create mode 100644 drivers/input/mouse/pixart_ps2.h + delete mode 100644 drivers/input/touchscreen/mcs5000_ts.c + delete mode 100644 include/linux/platform_data/mcs.h +Merging block/for-next (168f25d97311 Merge branch 'for-6.12/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Merge made by the 'ort' strategy. + block/blk-cgroup.c | 23 ++++--- + block/blk-ioprio.c | 57 +--------------- + block/blk-ioprio.h | 9 --- + drivers/block/drbd/drbd_int.h | 10 --- + drivers/block/drbd/drbd_main.c | 2 +- + drivers/block/nbd.c | 3 + + drivers/nvme/host/tcp.c | 2 +- + include/linux/net.h | 19 ++++++ + include/uapi/linux/nbd.h | 3 +- + io_uring/fdinfo.c | 14 +++- + io_uring/rsrc.c | 149 +++++++++++++++++++++++++++++------------ + io_uring/rsrc.h | 10 +++ + io_uring/sqpoll.c | 2 +- + 13 files changed, 172 insertions(+), 131 deletions(-) +Merging device-mapper/for-next (7f1c4909a821 dm vdo: fix a minor formatting issue in vdo.rst) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (b40824500eaa ata: libata: Remove ata_noop_qc_prep()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/ata/ahci-platform.yaml | 33 +- + .../devicetree/bindings/ata/qcom-sata.txt | 48 -- + drivers/ata/ahci.c | 2 +- + drivers/ata/ata_piix.c | 1 - + drivers/ata/libata-core.c | 603 ++++++++++++--------- + drivers/ata/libata-sata.c | 2 +- + drivers/ata/libata-scsi.c | 9 +- + drivers/ata/libata-sff.c | 11 +- + drivers/ata/libata-transport.c | 6 +- + drivers/ata/pata_cs5520.c | 6 +- + drivers/ata/pata_ep93xx.c | 2 - + drivers/ata/pata_hpt366.c | 10 +- + drivers/ata/pata_hpt37x.c | 10 +- + drivers/ata/pata_icside.c | 2 - + drivers/ata/pata_it821x.c | 4 +- + drivers/ata/pata_mpc52xx.c | 1 - + drivers/ata/pata_octeon_cf.c | 1 - + drivers/ata/pata_serverworks.c | 16 +- + drivers/ata/sata_sil.c | 14 +- + drivers/scsi/libsas/sas_ata.c | 1 - + include/linux/libata.h | 114 ++-- + 21 files changed, 485 insertions(+), 411 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/ata/qcom-sata.txt +Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (538076ce6b8d mmc: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + .../bindings/mmc/nuvoton,ma35d1-sdhci.yaml | 87 ++++++ + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 2 + + drivers/mmc/host/Kconfig | 12 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 + + drivers/mmc/host/sdhci-of-ma35d1.c | 314 +++++++++++++++++++++ + drivers/mmc/host/sdhci-pxav2.c | 2 +- + drivers/mmc/host/tmio_mmc_core.c | 7 +- + 8 files changed, 421 insertions(+), 5 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/nuvoton,ma35d1-sdhci.yaml + create mode 100644 drivers/mmc/host/sdhci-of-ma35d1.c +Merging mfd/for-mfd-next (d94fc0f04121 dt-bindings: mfd: mediatek: Add codec property for MT6357 PMIC) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/mediatek,mt6357.yaml | 21 ++++++++++++++++ + Documentation/devicetree/bindings/mfd/syscon.yaml | 1 + + MAINTAINERS | 2 +- + drivers/mfd/88pm800.c | 2 +- + drivers/mfd/88pm805.c | 4 +-- + drivers/mfd/88pm860x-core.c | 10 ++++---- + drivers/mfd/bd9571mwv.c | 4 +-- + drivers/mfd/da9062-core.c | 12 ++++----- + drivers/mfd/fsl-imx25-tsadc.c | 2 +- + drivers/mfd/gateworks-gsc.c | 2 +- + drivers/mfd/hi655x-pmic.c | 2 +- + drivers/mfd/intel-m10-bmc-pmci.c | 2 +- + drivers/mfd/intel-m10-bmc-spi.c | 2 +- + drivers/mfd/intel_soc_pmic_bxtwc.c | 14 +++++------ + drivers/mfd/mc13xxx-spi.c | 2 +- + drivers/mfd/mt6360-core.c | 23 +++++++---------- + drivers/mfd/retu-mfd.c | 12 ++++----- + drivers/mfd/rk8xx-core.c | 6 ++--- + drivers/mfd/rohm-bd71828.c | 8 +++--- + drivers/mfd/rohm-bd718x7.c | 2 +- + drivers/mfd/rohm-bd9576.c | 6 ++--- + drivers/mfd/sprd-sc27xx-spi.c | 2 +- + drivers/mfd/syscon.c | 20 ++++++--------- + drivers/mfd/tps6105x.c | 2 +- + drivers/mfd/tps65086.c | 2 +- + drivers/mfd/tps65090.c | 2 +- + drivers/mfd/tps65218.c | 2 +- + drivers/mfd/tps65219.c | 4 +-- + drivers/mfd/tps65910.c | 6 ++--- + drivers/mfd/tps65912-core.c | 2 +- + drivers/mfd/twl6040.c | 2 +- + drivers/mfd/wcd934x.c | 2 +- + include/linux/mfd/88pm80x.h | 2 +- + include/linux/mfd/ds1wm.h | 29 ---------------------- + 34 files changed, 99 insertions(+), 117 deletions(-) + delete mode 100644 include/linux/mfd/ds1wm.h +Merging backlight/for-backlight-next (fea88a13a5d1 backlight: l4f00242t03: Add check for spi_setup) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Merge made by the 'ort' strategy. + drivers/video/backlight/l4f00242t03.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging battery/for-next (be6299c6e55e power: supply: sysfs: use power_supply_property_is_writeable()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Already up to date. +Merging regulator/for-next (08b856b38c25 regulator: bd9576: Constify struct linear_range) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + drivers/regulator/act8865-regulator.c | 4 +--- + drivers/regulator/bd9576-regulator.c | 8 ++++---- + drivers/regulator/bd96801-regulator.c | 2 -- + drivers/regulator/max77857-regulator.c | 2 +- + drivers/regulator/max8997-regulator.c | 5 ++--- + drivers/regulator/rt5120-regulator.c | 4 ++-- + drivers/regulator/wm831x-isink.c | 8 ++++---- + 7 files changed, 14 insertions(+), 19 deletions(-) +Merging security/next (924e19c39e8f lsm: Refactor return value of LSM hook inode_copy_up_xattr) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Merge made by the 'ort' strategy. + fs/overlayfs/copy_up.c | 6 +- + include/linux/lsm_hook_defs.h | 10 +- + include/linux/lsm_hooks.h | 5 + + include/linux/security.h | 2 +- + security/apparmor/include/net.h | 3 +- + security/apparmor/lsm.c | 17 +-- + security/apparmor/net.c | 2 +- + security/commoncap.c | 11 +- + security/integrity/evm/evm_main.c | 2 +- + security/security.c | 210 ++++++++++++++++++++++++++------------ + security/selinux/hooks.c | 176 +++++++++++--------------------- + security/selinux/include/objsec.h | 28 +++++ + security/selinux/netlabel.c | 23 +++-- + security/smack/smack.h | 12 +++ + security/smack/smack_lsm.c | 107 +++++++++---------- + security/smack/smack_netfilter.c | 4 +- + 16 files changed, 324 insertions(+), 294 deletions(-) +Merging apparmor/apparmor-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (fbf06cee6087 ima: fix wrong zero-assignment during securityfs dentry remove) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging selinux/next (180cba7a0daf Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/selinux/netlabel.c +Merge made by the 'ort' strategy. + security/selinux/avc.c | 2 +- + security/selinux/netlabel.c | 18 +++++++++--------- + security/selinux/ss/services.c | 36 +++++++++++++++++++----------------- + 3 files changed, 29 insertions(+), 27 deletions(-) +Merging smack/next (e86cac0acdb1 smack: unix sockets: fix accept()ed socket label) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (dc1c8034e31b minmax: simplify min()/max()/clamp() implementation) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Already up to date. +Merging tpmdd/next (b4c635360613 KEYS: Remove unused declarations) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + drivers/char/tpm/tpm_ibmvtpm.c | 4 ++++ + include/keys/dns_resolver-type.h | 4 ---- + include/linux/key.h | 3 --- + security/keys/trusted-keys/trusted_dcp.c | 35 ++++++++++++++++++++------------ + 4 files changed, 26 insertions(+), 20 deletions(-) +Merging watchdog/master (63d097d46799 dt-bindings: watchdog: dlg,da9062-watchdog: Drop blank space) +$ 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 (fca5b78511e9 iommu: Restore lost return in iommu_report_device_fault()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Merge made by the 'ort' strategy. + drivers/iommu/io-pgfault.c | 1 + + 1 file changed, 1 insertion(+) +Merging audit/next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (4e354cce395f dt-bindings: soc: fsl: add missed compatible string fsl,ls*-isc) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/bus/qcom,ebi2.txt | 138 ------------ + .../devicetree/bindings/bus/qcom,ebi2.yaml | 239 +++++++++++++++++++++ + .../devicetree/bindings/rtc/fsl,ls-ftm-alarm.yaml | 2 +- + .../bindings/soc/fsl/fsl,layerscape-scfg.yaml | 3 + + .../devicetree/bindings/soc/fsl/fsl,rcpm.yaml | 96 +++++++++ + Documentation/devicetree/bindings/soc/fsl/rcpm.txt | 69 ------ + .../devicetree/bindings/trivial-devices.yaml | 1 + + drivers/of/unittest.c | 4 +- + 8 files changed, 342 insertions(+), 210 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/bus/qcom,ebi2.txt + create mode 100644 Documentation/devicetree/bindings/bus/qcom,ebi2.yaml + create mode 100644 Documentation/devicetree/bindings/soc/fsl/fsl,rcpm.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/fsl/rcpm.txt +Merging dt-krzk/for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/for-next (a8bd68e4329f mailbox: mtk-cmdq: Move devm_mbox_controller_register() after devm_pm_runtime_enable()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Already up to date. +Merging spi/for-next (51181a73934f Merge remote-tracking branch 'spi/for-6.12' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/iio/adc/adi,ad4000.yaml | 197 ++++++ + .../devicetree/bindings/spi/cdns,xspi.yaml | 32 +- + .../bindings/spi/mediatek,spi-mt65xx.yaml | 1 + + Documentation/spi/spi-summary.rst | 83 +++ + MAINTAINERS | 7 + + drivers/spi/Kconfig | 2 +- + drivers/spi/spi-axi-spi-engine.c | 17 +- + drivers/spi/spi-bitbang.c | 24 + + drivers/spi/spi-cadence-xspi.c | 692 ++++++++++++++++++++- + drivers/spi/spi-gpio.c | 12 +- + drivers/spi/spi-meson-spicc.c | 22 +- + drivers/spi/spi-mt65xx.c | 40 +- + drivers/spi/spi-ppc4xx.c | 3 + + drivers/spi/spi-rpc-if.c | 7 + + drivers/spi/spi.c | 6 + + include/linux/spi/spi.h | 19 +- + include/linux/spi/spi_bitbang.h | 1 + + include/uapi/linux/spi/spi.h | 5 +- + 18 files changed, 1115 insertions(+), 55 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad4000.yaml +Merging tip/master (9ebdc7589cbb Merge branch into tip/master: 'x86/timers') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging fs/proc/base.c +Auto-merging kernel/fork.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/fair.c +Auto-merging tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c +Auto-merging tools/testing/selftests/mm/Makefile +Merge made by the 'ort' strategy. + Documentation/core-api/cleanup.rst | 8 + + Documentation/core-api/index.rst | 1 + + MAINTAINERS | 10 + + arch/x86/Kconfig | 125 +- + arch/x86/events/core.c | 63 + + arch/x86/events/intel/pt.c | 29 +- + arch/x86/include/asm/atomic64_32.h | 6 +- + arch/x86/include/asm/fpu/api.h | 2 +- + arch/x86/include/asm/fpu/sched.h | 4 +- + arch/x86/include/asm/fpu/signal.h | 2 +- + arch/x86/include/asm/mce.h | 2 +- + arch/x86/include/asm/mmu_context.h | 8 +- + arch/x86/include/asm/processor.h | 23 +- + arch/x86/include/asm/tlbflush.h | 9 +- + arch/x86/include/uapi/asm/elf.h | 16 + + arch/x86/kernel/amd_nb.c | 3 + + arch/x86/kernel/cpu/bugs.c | 46 +- + arch/x86/kernel/cpu/mce/amd.c | 2 +- + arch/x86/kernel/cpu/mce/apei.c | 18 +- + arch/x86/kernel/cpu/mce/core.c | 38 +- + arch/x86/kernel/cpu/mce/internal.h | 2 + + arch/x86/kernel/cpu/microcode/amd.c | 192 ++- + arch/x86/kernel/cpu/mshyperv.c | 11 - + arch/x86/kernel/fpu/context.h | 4 +- + arch/x86/kernel/fpu/core.c | 80 +- + arch/x86/kernel/fpu/init.c | 21 +- + arch/x86/kernel/fpu/regset.c | 22 +- + arch/x86/kernel/fpu/signal.c | 45 +- + arch/x86/kernel/fpu/xstate.c | 129 +- + arch/x86/kernel/fpu/xstate.h | 8 +- + arch/x86/kernel/i8253.c | 11 +- + arch/x86/kernel/machine_kexec_64.c | 27 + + arch/x86/kernel/process.c | 9 +- + arch/x86/kernel/process_64.c | 42 +- + arch/x86/kernel/signal.c | 35 +- + arch/x86/kernel/signal_64.c | 6 +- + arch/x86/kernel/traps.c | 2 +- + arch/x86/kernel/tsc.c | 10 +- + arch/x86/lib/atomic64_cx8_32.S | 9 +- + arch/x86/math-emu/fpu_aux.c | 2 +- + arch/x86/math-emu/fpu_entry.c | 4 +- + arch/x86/math-emu/fpu_system.h | 2 +- + arch/x86/mm/extable.c | 2 +- + arch/x86/mm/ident_map.c | 23 +- + arch/x86/mm/tlb.c | 15 +- + drivers/clocksource/i8253.c | 53 +- + drivers/hwmon/k10temp.c | 1 + + drivers/irqchip/irq-armada-370-xp.c | 716 +++++------ + drivers/irqchip/irq-atmel-aic.c | 3 +- + drivers/irqchip/irq-atmel-aic5.c | 3 +- + drivers/irqchip/irq-clps711x.c | 2 +- + drivers/irqchip/irq-davinci-cp-intc.c | 3 +- + drivers/irqchip/irq-ftintc010.c | 2 +- + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-gic-v4.c | 2 +- + drivers/irqchip/irq-ixp4xx.c | 3 +- + drivers/irqchip/irq-omap-intc.c | 3 +- + drivers/irqchip/irq-sa11x0.c | 3 +- + drivers/irqchip/irq-versatile-fpga.c | 2 +- + fs/binfmt_elf.c | 4 +- + fs/proc/base.c | 6 +- + fs/signalfd.c | 4 +- + include/linux/cleanup.h | 136 ++ + include/linux/i8253.h | 2 +- + include/linux/pci_ids.h | 1 + + include/linux/perf_event.h | 11 +- + include/linux/posix-timers.h | 2 +- + include/linux/sched.h | 32 +- + include/linux/sched/signal.h | 7 +- + include/linux/uprobes.h | 24 +- + include/uapi/linux/elf.h | 1 + + init/init_task.c | 2 +- + kernel/cpu.c | 16 + + kernel/events/core.c | 67 +- + kernel/events/uprobes.c | 143 +-- + kernel/fork.c | 2 +- + kernel/locking/lockdep.c | 3 + + kernel/sched/core.c | 78 +- + kernel/sched/deadline.c | 449 ++++++- + kernel/sched/debug.c | 166 ++- + kernel/sched/fair.c | 116 +- + kernel/sched/features.h | 2 - + kernel/sched/idle.c | 2 + + kernel/sched/rt.c | 242 ++-- + kernel/sched/sched.h | 23 +- + kernel/sched/topology.c | 8 + + kernel/signal.c | 34 +- + kernel/time/alarmtimer.c | 7 +- + kernel/time/clocksource.c | 45 +- + kernel/time/ntp.c | 9 +- + kernel/time/posix-cpu-timers.c | 215 ++-- + kernel/time/posix-timers.c | 69 +- + kernel/time/posix-timers.h | 3 +- + kernel/time/timekeeping.c | 2 +- + kernel/trace/bpf_trace.c | 25 +- + kernel/trace/trace_uprobe.c | 31 +- + tools/arch/x86/kcpuid/cpuid.csv | 1352 ++++++++++++++------ + tools/arch/x86/kcpuid/kcpuid.c | 105 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 26 +- + tools/testing/selftests/mm/Makefile | 1 + + tools/testing/selftests/mm/pkey-helpers.h | 13 +- + tools/testing/selftests/mm/pkey_sighandler_tests.c | 481 +++++++ + tools/testing/selftests/mm/protection_keys.c | 10 - + tools/testing/selftests/timers/posix_timers.c | 548 ++++++-- + 104 files changed, 4579 insertions(+), 1872 deletions(-) + create mode 100644 Documentation/core-api/cleanup.rst + create mode 100644 arch/x86/include/uapi/asm/elf.h + create mode 100644 tools/testing/selftests/mm/pkey_sighandler_tests.c +Merging clockevents/timers/drivers/next (b7625d67eb1a Merge tag 'timers-v6.11-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (090786479325 Merge ras/edac-misc into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. + drivers/acpi/prmt.c | 24 ++++++++++++++++++ + drivers/edac/synopsys_edac.c | 35 +++++++++++++++++++++++++- + drivers/ras/amd/atl/Kconfig | 4 +++ + drivers/ras/amd/atl/Makefile | 2 ++ + drivers/ras/amd/atl/internal.h | 10 ++++++++ + drivers/ras/amd/atl/prm.c | 57 ++++++++++++++++++++++++++++++++++++++++++ + drivers/ras/amd/atl/umc.c | 5 ++++ + include/linux/prmt.h | 5 ++++ + 8 files changed, 141 insertions(+), 1 deletion(-) + create mode 100644 drivers/ras/amd/atl/prm.c +Merging ftrace/for-next (656a95786db8 Merge ring-buffer/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging kernel/trace/trace.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 9 + + include/linux/ring_buffer.h | 20 + + kernel/trace/ring_buffer.c | 884 +++++++++++++++++++++--- + kernel/trace/trace.c | 244 ++++++- + kernel/trace/trace.h | 10 +- + kernel/trace/trace_output.c | 12 +- + 6 files changed, 1060 insertions(+), 119 deletions(-) +Merging rcu/next (02219caa92b5 Merge branches 'doc.2024.06.06a', 'fixes.2024.07.04a', 'mb.2024.06.28a', 'nocb.2024.06.03a', 'rcu-tasks.2024.06.06a', 'rcutorture.2024.06.06a' and 'srcu.2024.06.18a' into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/next +Already up to date. +Merging paulmck/non-rcu/next (f01f18f2ed7d Merge branches 'cmpxchg.2024.08.06a', 'lkmm.2024.08.02a', 'kcsan.2024.08.01a' and 'misc.2024.08.02a' into HEAD) +$ git merge -m Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Auto-merging MAINTAINERS +Auto-merging kernel/exit.c +Merge made by the 'ort' strategy. + Documentation/memory-barriers.txt | 3 - + MAINTAINERS | 1 + + arch/arc/Kconfig | 1 + + arch/arc/include/asm/cmpxchg.h | 6 +- + arch/sh/Kconfig | 1 + + arch/sh/include/asm/cmpxchg.h | 3 + + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/cmpxchg.h | 2 + + kernel/exit.c | 2 +- + kernel/kcsan/debugfs.c | 2 +- + tools/memory-model/Documentation/README | 24 ++++- + .../Documentation/herd-representation.txt | 110 +++++++++++++++++++++ + tools/memory-model/Documentation/simple.txt | 2 +- + tools/memory-model/linux-kernel.def | 27 +++++ + 14 files changed, 176 insertions(+), 9 deletions(-) + create mode 100644 tools/memory-model/Documentation/herd-representation.txt +Merging kvm/next (1773014a9759 Merge branch 'kvm-fixes' into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (bb032b2352c3 Merge branch kvm-arm64/docs into kvmarm/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (7816e58967d0 kvm: s390: Reject memory region operations for ucontrol VMs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-ppc/topic/ppc-kvm (ca8dad041516 KVM: PPC: add missing MODULE_DESCRIPTION() macros) +$ git merge -m Merge branch 'topic/ppc-kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (dd4a799bcc13 KVM: riscv: selftests: Fix compile error) +$ 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 (332d2c1d713e crypto: ccp: Add the SNP_VLEK_LOAD command) +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Already up to date. +Merging xen-tip/linux-next (4c006734898a x86/xen: fix memblock_reserve() usage on PVH) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (97dd94173253 Merge branch 'for-6.12' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. + Documentation/core-api/workqueue.rst | 2 +- + kernel/workqueue.c | 66 +++++++++++++++++++++++------------- + 2 files changed, 44 insertions(+), 24 deletions(-) +Merging sched-ext/for-next (2c390dda9e03 sched_ext: Make task_can_run_on_remote_rq() use common task_allowed_on_cpu()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Auto-merging MAINTAINERS +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/sched.h +Auto-merging init/init_task.c +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/fair.c +Merge made by the 'ort' strategy. + Documentation/scheduler/index.rst | 1 + + Documentation/scheduler/sched-ext.rst | 316 + + MAINTAINERS | 13 + + drivers/tty/sysrq.c | 1 + + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/cgroup.h | 4 +- + include/linux/sched.h | 5 + + include/linux/sched/ext.h | 205 + + include/linux/sched/task.h | 3 +- + include/trace/events/sched_ext.h | 32 + + include/uapi/linux/sched.h | 1 + + init/init_task.c | 12 + + kernel/Kconfig.preempt | 25 + + kernel/fork.c | 17 +- + kernel/sched/build_policy.c | 11 + + kernel/sched/core.c | 200 +- + kernel/sched/cpufreq_schedutil.c | 50 +- + kernel/sched/debug.c | 3 + + kernel/sched/ext.c | 6526 ++++++++++++++++++++ + kernel/sched/ext.h | 69 + + kernel/sched/fair.c | 22 +- + kernel/sched/idle.c | 2 + + kernel/sched/sched.h | 178 +- + kernel/sched/syscalls.c | 26 + + lib/dump_stack.c | 1 + + tools/Makefile | 10 +- + tools/sched_ext/.gitignore | 2 + + tools/sched_ext/Makefile | 246 + + tools/sched_ext/README.md | 258 + + tools/sched_ext/include/bpf-compat/gnu/stubs.h | 11 + + tools/sched_ext/include/scx/common.bpf.h | 401 ++ + tools/sched_ext/include/scx/common.h | 75 + + tools/sched_ext/include/scx/compat.bpf.h | 28 + + tools/sched_ext/include/scx/compat.h | 186 + + tools/sched_ext/include/scx/user_exit_info.h | 111 + + tools/sched_ext/scx_central.bpf.c | 361 ++ + tools/sched_ext/scx_central.c | 135 + + tools/sched_ext/scx_qmap.bpf.c | 706 +++ + tools/sched_ext/scx_qmap.c | 144 + + tools/sched_ext/scx_show_state.py | 39 + + tools/sched_ext/scx_simple.bpf.c | 156 + + tools/sched_ext/scx_simple.c | 107 + + tools/testing/selftests/sched_ext/.gitignore | 6 + + tools/testing/selftests/sched_ext/Makefile | 218 + + tools/testing/selftests/sched_ext/config | 9 + + tools/testing/selftests/sched_ext/create_dsq.bpf.c | 58 + + tools/testing/selftests/sched_ext/create_dsq.c | 57 + + .../selftests/sched_ext/ddsp_bogus_dsq_fail.bpf.c | 42 + + .../selftests/sched_ext/ddsp_bogus_dsq_fail.c | 57 + + .../selftests/sched_ext/ddsp_vtimelocal_fail.bpf.c | 39 + + .../selftests/sched_ext/ddsp_vtimelocal_fail.c | 56 + + .../testing/selftests/sched_ext/dsp_local_on.bpf.c | 65 + + tools/testing/selftests/sched_ext/dsp_local_on.c | 58 + + .../sched_ext/enq_last_no_enq_fails.bpf.c | 21 + + .../selftests/sched_ext/enq_last_no_enq_fails.c | 60 + + .../selftests/sched_ext/enq_select_cpu_fails.bpf.c | 43 + + .../selftests/sched_ext/enq_select_cpu_fails.c | 61 + + tools/testing/selftests/sched_ext/exit.bpf.c | 84 + + tools/testing/selftests/sched_ext/exit.c | 55 + + tools/testing/selftests/sched_ext/exit_test.h | 20 + + tools/testing/selftests/sched_ext/hotplug.bpf.c | 61 + + tools/testing/selftests/sched_ext/hotplug.c | 168 + + tools/testing/selftests/sched_ext/hotplug_test.h | 15 + + .../selftests/sched_ext/init_enable_count.bpf.c | 53 + + .../selftests/sched_ext/init_enable_count.c | 166 + + tools/testing/selftests/sched_ext/maximal.bpf.c | 132 + + tools/testing/selftests/sched_ext/maximal.c | 51 + + tools/testing/selftests/sched_ext/maybe_null.bpf.c | 36 + + tools/testing/selftests/sched_ext/maybe_null.c | 49 + + .../selftests/sched_ext/maybe_null_fail_dsp.bpf.c | 25 + + .../selftests/sched_ext/maybe_null_fail_yld.bpf.c | 28 + + tools/testing/selftests/sched_ext/minimal.bpf.c | 21 + + tools/testing/selftests/sched_ext/minimal.c | 58 + + tools/testing/selftests/sched_ext/prog_run.bpf.c | 33 + + tools/testing/selftests/sched_ext/prog_run.c | 78 + + tools/testing/selftests/sched_ext/reload_loop.c | 75 + + tools/testing/selftests/sched_ext/runner.c | 201 + + tools/testing/selftests/sched_ext/scx_test.h | 131 + + .../selftests/sched_ext/select_cpu_dfl.bpf.c | 40 + + tools/testing/selftests/sched_ext/select_cpu_dfl.c | 72 + + .../sched_ext/select_cpu_dfl_nodispatch.bpf.c | 89 + + .../sched_ext/select_cpu_dfl_nodispatch.c | 72 + + .../selftests/sched_ext/select_cpu_dispatch.bpf.c | 41 + + .../selftests/sched_ext/select_cpu_dispatch.c | 70 + + .../sched_ext/select_cpu_dispatch_bad_dsq.bpf.c | 37 + + .../sched_ext/select_cpu_dispatch_bad_dsq.c | 56 + + .../sched_ext/select_cpu_dispatch_dbl_dsp.bpf.c | 38 + + .../sched_ext/select_cpu_dispatch_dbl_dsp.c | 56 + + .../selftests/sched_ext/select_cpu_vtime.bpf.c | 92 + + .../testing/selftests/sched_ext/select_cpu_vtime.c | 59 + + tools/testing/selftests/sched_ext/test_example.c | 49 + + tools/testing/selftests/sched_ext/util.c | 71 + + tools/testing/selftests/sched_ext/util.h | 13 + + 93 files changed, 13845 insertions(+), 100 deletions(-) + create mode 100644 Documentation/scheduler/sched-ext.rst + create mode 100644 include/linux/sched/ext.h + create mode 100644 include/trace/events/sched_ext.h + create mode 100644 kernel/sched/ext.c + create mode 100644 kernel/sched/ext.h + create mode 100644 tools/sched_ext/.gitignore + create mode 100644 tools/sched_ext/Makefile + create mode 100644 tools/sched_ext/README.md + create mode 100644 tools/sched_ext/include/bpf-compat/gnu/stubs.h + create mode 100644 tools/sched_ext/include/scx/common.bpf.h + create mode 100644 tools/sched_ext/include/scx/common.h + create mode 100644 tools/sched_ext/include/scx/compat.bpf.h + create mode 100644 tools/sched_ext/include/scx/compat.h + create mode 100644 tools/sched_ext/include/scx/user_exit_info.h + create mode 100644 tools/sched_ext/scx_central.bpf.c + create mode 100644 tools/sched_ext/scx_central.c + create mode 100644 tools/sched_ext/scx_qmap.bpf.c + create mode 100644 tools/sched_ext/scx_qmap.c + create mode 100644 tools/sched_ext/scx_show_state.py + create mode 100644 tools/sched_ext/scx_simple.bpf.c + create mode 100644 tools/sched_ext/scx_simple.c + create mode 100644 tools/testing/selftests/sched_ext/.gitignore + create mode 100644 tools/testing/selftests/sched_ext/Makefile + create mode 100644 tools/testing/selftests/sched_ext/config + create mode 100644 tools/testing/selftests/sched_ext/create_dsq.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/create_dsq.c + create mode 100644 tools/testing/selftests/sched_ext/ddsp_bogus_dsq_fail.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/ddsp_bogus_dsq_fail.c + create mode 100644 tools/testing/selftests/sched_ext/ddsp_vtimelocal_fail.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/ddsp_vtimelocal_fail.c + create mode 100644 tools/testing/selftests/sched_ext/dsp_local_on.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/dsp_local_on.c + create mode 100644 tools/testing/selftests/sched_ext/enq_last_no_enq_fails.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/enq_last_no_enq_fails.c + create mode 100644 tools/testing/selftests/sched_ext/enq_select_cpu_fails.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/enq_select_cpu_fails.c + create mode 100644 tools/testing/selftests/sched_ext/exit.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/exit.c + create mode 100644 tools/testing/selftests/sched_ext/exit_test.h + create mode 100644 tools/testing/selftests/sched_ext/hotplug.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/hotplug.c + create mode 100644 tools/testing/selftests/sched_ext/hotplug_test.h + create mode 100644 tools/testing/selftests/sched_ext/init_enable_count.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/init_enable_count.c + create mode 100644 tools/testing/selftests/sched_ext/maximal.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/maximal.c + create mode 100644 tools/testing/selftests/sched_ext/maybe_null.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/maybe_null.c + create mode 100644 tools/testing/selftests/sched_ext/maybe_null_fail_dsp.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/maybe_null_fail_yld.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/minimal.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/minimal.c + create mode 100644 tools/testing/selftests/sched_ext/prog_run.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/prog_run.c + create mode 100644 tools/testing/selftests/sched_ext/reload_loop.c + create mode 100644 tools/testing/selftests/sched_ext/runner.c + create mode 100644 tools/testing/selftests/sched_ext/scx_test.h + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dfl.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dfl.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dfl_nodispatch.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dfl_nodispatch.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dispatch.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dispatch.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dispatch_bad_dsq.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dispatch_bad_dsq.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dispatch_dbl_dsp.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dispatch_dbl_dsp.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_vtime.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_vtime.c + create mode 100644 tools/testing/selftests/sched_ext/test_example.c + create mode 100644 tools/testing/selftests/sched_ext/util.c + create mode 100644 tools/testing/selftests/sched_ext/util.h +Merging drivers-x86/for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (de9c2c66ad8e Linux 6.11-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging chrome-platform-firmware/for-firmware-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (f02cfe695047 HSI: ssi_protocol: Remove unused linux/gpio.h) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds-lj/for-leds-next (3ec05e5feacd leds: pca995x: Use device_for_each_child_node() to access device child nodes) +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/leds/leds-sc27xx-bltc.txt | 43 ---- + .../devicetree/bindings/leds/nxp,pca995x.yaml | 6 +- + .../devicetree/bindings/leds/sprd,sc2731-bltc.yaml | 84 +++++++ + Documentation/leds/leds-blinkm.rst | 29 ++- + Documentation/leds/well-known-leds.txt | 8 + + drivers/leds/Kconfig | 8 + + drivers/leds/flash/leds-lm3601x.c | 19 +- + drivers/leds/flash/leds-qcom-flash.c | 163 ++++++++++++- + drivers/leds/leds-bd2606mvv.c | 23 +- + drivers/leds/leds-blinkm.c | 264 ++++++++++++++------- + drivers/leds/leds-is31fl319x.c | 34 +-- + drivers/leds/leds-pca995x.c | 74 +++--- + drivers/leds/trigger/ledtrig-netdev.c | 24 +- + include/linux/leds.h | 2 + + 14 files changed, 572 insertions(+), 209 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/leds/leds-sc27xx-bltc.txt + create mode 100644 Documentation/devicetree/bindings/leds/sprd,sc2731-bltc.yaml +Merging ipmi/for-next (19a01155ddfe ipmi: Drop explicit initialization of struct i2c_device_id::driver_data to 0) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (bfa54a793ba7 driver core: bus: Fix double free in driver API bus_register()) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging drivers/base/core.c +Merge made by the 'ort' strategy. + drivers/base/base.h | 2 +- + drivers/base/bus.c | 17 +++++++++++++---- + drivers/base/core.c | 27 ++++++++++++++++++--------- + 3 files changed, 32 insertions(+), 14 deletions(-) +Merging usb/usb-next (d483f034f032 usb: dwc2: Skip clock gating on Broadcom SoCs) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging drivers/usb/gadget/function/u_serial.c +Auto-merging drivers/usb/usbip/vhci_hcd.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/configfs-usb-gadget-uac1 | 12 ++++ + .../devicetree/bindings/usb/qcom,dwc3.yaml | 17 ++++- + .../devicetree/bindings/usb/ti,j721e-usb.yaml | 3 +- + Documentation/usb/gadget-testing.rst | 12 ++++ + drivers/usb/dwc2/debugfs.c | 1 + + drivers/usb/dwc2/params.c | 2 + + drivers/usb/gadget/function/f_uac1.c | 75 +++++++++++++++++----- + drivers/usb/gadget/function/u_serial.c | 22 +++++++ + drivers/usb/gadget/function/u_uac1.h | 16 ++++- + drivers/usb/host/ohci-ppc-of.c | 4 -- + drivers/usb/misc/qcom_eud.c | 2 +- + drivers/usb/typec/ucsi/ucsi_glink.c | 2 +- + drivers/usb/usbip/vhci_hcd.c | 36 +++++------ + drivers/usb/usbip/vhci_sysfs.c | 3 +- + 14 files changed, 162 insertions(+), 45 deletions(-) +Merging thunderbolt/next (de9c2c66ad8e Linux 6.11-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (da74a5100a2b USB: serial: drop driver owner initialization) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Auto-merging drivers/usb/serial/mos7840.c +Auto-merging drivers/usb/serial/option.c +Auto-merging drivers/usb/serial/usb_debug.c +Merge made by the 'ort' strategy. + drivers/usb/serial/aircable.c | 1 - + drivers/usb/serial/ark3116.c | 1 - + drivers/usb/serial/belkin_sa.c | 1 - + drivers/usb/serial/ch341.c | 1 - + drivers/usb/serial/cp210x.c | 1 - + drivers/usb/serial/cyberjack.c | 1 - + drivers/usb/serial/cypress_m8.c | 3 --- + drivers/usb/serial/digi_acceleport.c | 2 -- + drivers/usb/serial/empeg.c | 1 - + drivers/usb/serial/f81232.c | 2 -- + drivers/usb/serial/f81534.c | 1 - + drivers/usb/serial/ftdi_sio.c | 1 - + drivers/usb/serial/garmin_gps.c | 1 - + drivers/usb/serial/generic.c | 1 - + drivers/usb/serial/io_edgeport.c | 4 ---- + drivers/usb/serial/io_ti.c | 2 -- + drivers/usb/serial/ipaq.c | 1 - + drivers/usb/serial/ipw.c | 1 - + drivers/usb/serial/ir-usb.c | 1 - + drivers/usb/serial/iuu_phoenix.c | 1 - + drivers/usb/serial/keyspan.c | 4 ---- + drivers/usb/serial/keyspan_pda.c | 2 -- + drivers/usb/serial/kl5kusb105.c | 1 - + drivers/usb/serial/kobil_sct.c | 1 - + drivers/usb/serial/mct_u232.c | 1 - + drivers/usb/serial/metro-usb.c | 1 - + drivers/usb/serial/mos7720.c | 1 - + drivers/usb/serial/mos7840.c | 1 - + drivers/usb/serial/mxuport.c | 1 - + drivers/usb/serial/navman.c | 1 - + drivers/usb/serial/omninet.c | 1 - + drivers/usb/serial/opticon.c | 1 - + drivers/usb/serial/option.c | 1 - + drivers/usb/serial/oti6858.c | 1 - + drivers/usb/serial/pl2303.c | 1 - + drivers/usb/serial/qcaux.c | 1 - + drivers/usb/serial/qcserial.c | 1 - + drivers/usb/serial/quatech2.c | 1 - + drivers/usb/serial/safe_serial.c | 1 - + drivers/usb/serial/sierra.c | 1 - + drivers/usb/serial/spcp8x5.c | 1 - + drivers/usb/serial/ssu100.c | 1 - + drivers/usb/serial/symbolserial.c | 1 - + drivers/usb/serial/ti_usb_3410_5052.c | 2 -- + drivers/usb/serial/upd78f0730.c | 1 - + drivers/usb/serial/usb-serial-simple.c | 1 - + drivers/usb/serial/usb-serial.c | 12 +++++++----- + drivers/usb/serial/usb_debug.c | 2 -- + drivers/usb/serial/visor.c | 3 --- + drivers/usb/serial/whiteheat.c | 2 -- + drivers/usb/serial/wishbone-serial.c | 1 - + drivers/usb/serial/xr_serial.c | 1 - + drivers/usb/serial/xsens_mt.c | 1 - + include/linux/usb/serial.h | 7 +++++-- + 54 files changed, 12 insertions(+), 76 deletions(-) +Merging tty/tty-next (2108aa2a01d8 dt-bindings: serial: renesas: Document RZ/G2M v3.0 (r8a774a3) scif) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging arch/arm64/boot/dts/mediatek/mt7981b.dtsi +Merge made by the 'ort' strategy. + .../bindings/serial/atmel,at91-usart.yaml | 9 ++- + .../devicetree/bindings/serial/mediatek,uart.yaml | 1 + + .../devicetree/bindings/serial/renesas,scif.yaml | 1 + + .../devicetree/bindings/serial/samsung_uart.yaml | 70 ++++++++++++++++---- + arch/arm64/boot/dts/mediatek/mt7981b.dtsi | 33 ++++++++++ + drivers/tty/serial/8250/8250_bcm2835aux.c | 37 +++++++++++ + drivers/tty/serial/8250/8250_dma.c | 19 +++--- + drivers/tty/serial/8250/8250_early.c | 11 ++++ + drivers/tty/serial/8250/8250_platform.c | 77 ++++++++++++++++++++++ + drivers/tty/serial/8250/8250_pxa.c | 16 ----- + drivers/tty/serial/st-asc.c | 10 +-- + 11 files changed, 237 insertions(+), 47 deletions(-) +Merging char-misc/char-misc-next (5c4efc60551c cxl: Use of_property_ accessor functions) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging drivers/android/binder.c +Merge made by the 'ort' strategy. + drivers/android/binder.c | 284 ++++++++++++++++++++- + drivers/android/binder_internal.h | 21 +- + drivers/android/binderfs.c | 8 + + drivers/base/cacheinfo.c | 41 +-- + drivers/cdx/controller/mcdi.c | 4 - + drivers/char/hpet.c | 2 +- + drivers/comedi/drivers/ni_atmio.c | 9 + + drivers/comedi/drivers/ni_mio_common.c | 9 - + drivers/comedi/drivers/ni_pcimio.c | 9 + + drivers/comedi/drivers/ni_stc.h | 2 - + drivers/misc/cxl/of.c | 207 ++------------- + drivers/misc/cxl/pci.c | 32 +-- + include/uapi/linux/android/binder.h | 36 +++ + .../selftests/filesystems/binderfs/binderfs_test.c | 1 + + 14 files changed, 414 insertions(+), 251 deletions(-) +Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Already up to date. +Merging coresight/next (2e5657aa5966 hwtracing: use for_each_endpoint_of_node()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fastrpc/for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (3a0fa8e97d30 fpga: altera-fpga2sdram: remove unused struct 'prop_map') +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (226e58b20975 Merge branch 'icc-rpmh-qos' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (593737c18ae7 iio: remove unneeded assignment in __iio_format_value) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/iio/adc/ad7124.c +Auto-merging drivers/iio/adc/ad7606.c +Auto-merging drivers/iio/adc/ad_sigma_delta.c +Auto-merging drivers/iio/adc/ti-ads1119.c +Auto-merging drivers/iio/buffer/industrialio-buffer-dmaengine.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-iio-backend | 20 + + Documentation/ABI/testing/sysfs-bus-iio | 9 + + .../ABI/testing/sysfs-bus-iio-adc-max9611 | 17 - + Documentation/ABI/testing/sysfs-bus-iio-dac | 61 + + .../ABI/testing/sysfs-bus-iio-dac-ltc2688 | 31 - + .../ABI/testing/sysfs-bus-iio-filter-admv8818 | 2 +- + Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc | 9 - + .../devicetree/bindings/iio/accel/adi,adxl380.yaml | 92 + + .../bindings/iio/accel/kionix,kxcjk1013.yaml | 1 + + .../devicetree/bindings/iio/adc/adi,ad4695.yaml | 256 +++ + .../devicetree/bindings/iio/adc/adi,ad7192.yaml | 33 +- + .../devicetree/bindings/iio/adc/adi,ad7380.yaml | 13 + + .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 123 +- + .../devicetree/bindings/iio/adc/adi,ad9467.yaml | 3 + + .../bindings/iio/adc/microchip,pac1921.yaml | 71 + + .../devicetree/bindings/iio/dac/adi,ltc2664.yaml | 181 ++ + .../devicetree/bindings/iio/dac/adi,ltc2672.yaml | 160 ++ + Documentation/devicetree/bindings/iio/dac/dac.yaml | 50 + + .../bindings/iio/frequency/adi,adf4377.yaml | 10 + + .../bindings/iio/light/liteon,ltrf216a.yaml | 4 +- + .../devicetree/bindings/iio/light/rohm,bh1745.yaml | 53 + + .../{rohm,bu27034.yaml => rohm,bu27034anuc.yaml} | 11 +- + .../devicetree/bindings/iio/light/stk33xx.yaml | 13 +- + .../iio/magnetometer/bosch,bmc150_magn.yaml | 3 + + .../bindings/iio/pressure/sensirion,sdp500.yaml | 46 + + .../bindings/iio/proximity/tyhx,hx9023s.yaml | 93 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/iio/ad4000.rst | 131 ++ + Documentation/iio/ad4695.rst | 155 ++ + Documentation/iio/ad7380.rst | 130 ++ + Documentation/iio/adxl380.rst | 233 +++ + Documentation/iio/index.rst | 4 + + MAINTAINERS | 56 + + drivers/iio/accel/Kconfig | 27 + + drivers/iio/accel/Makefile | 3 + + drivers/iio/accel/adxl367.c | 2 +- + drivers/iio/accel/adxl367_spi.c | 2 +- + drivers/iio/accel/adxl372.c | 2 +- + drivers/iio/accel/adxl380.c | 1905 ++++++++++++++++++++ + drivers/iio/accel/adxl380.h | 26 + + drivers/iio/accel/adxl380_i2c.c | 64 + + drivers/iio/accel/adxl380_spi.c | 66 + + drivers/iio/accel/bma180.c | 3 +- + drivers/iio/accel/bma400_core.c | 11 +- + drivers/iio/accel/bma400_spi.c | 2 +- + drivers/iio/accel/bmc150-accel-core.c | 3 +- + drivers/iio/accel/bmi088-accel-spi.c | 2 +- + drivers/iio/accel/cros_ec_accel_legacy.c | 2 +- + drivers/iio/accel/fxls8962af-core.c | 3 +- + drivers/iio/accel/kxcjk-1013.c | 8 +- + drivers/iio/accel/msa311.c | 3 +- + drivers/iio/accel/sca3300.c | 3 +- + drivers/iio/accel/stk8312.c | 3 +- + drivers/iio/accel/stk8ba50.c | 3 +- + drivers/iio/adc/Kconfig | 36 + + drivers/iio/adc/Makefile | 3 + + drivers/iio/adc/ad4000.c | 722 ++++++++ + drivers/iio/adc/ad4695.c | 734 ++++++++ + drivers/iio/adc/ad7091r8.c | 2 +- + drivers/iio/adc/ad7124.c | 34 +- + drivers/iio/adc/ad7192.c | 183 +- + drivers/iio/adc/ad7266.c | 3 +- + drivers/iio/adc/ad7280a.c | 10 +- + drivers/iio/adc/ad7298.c | 3 +- + drivers/iio/adc/ad7380.c | 523 +++++- + drivers/iio/adc/ad7606.c | 47 +- + drivers/iio/adc/ad7606_spi.c | 5 +- + drivers/iio/adc/ad7768-1.c | 5 +- + drivers/iio/adc/ad799x.c | 3 +- + drivers/iio/adc/ad9467.c | 487 ++++- + drivers/iio/adc/ad_sigma_delta.c | 6 +- + drivers/iio/adc/adi-axi-adc.c | 71 +- + drivers/iio/adc/aspeed_adc.c | 3 +- + drivers/iio/adc/at91_adc.c | 17 +- + drivers/iio/adc/cc10001_adc.c | 4 +- + drivers/iio/adc/dln2-adc.c | 8 +- + drivers/iio/adc/hx711.c | 5 +- + drivers/iio/adc/ina2xx-adc.c | 3 +- + drivers/iio/adc/max1118.c | 3 +- + drivers/iio/adc/max1363.c | 34 +- + drivers/iio/adc/mcp3564.c | 54 +- + drivers/iio/adc/mcp3911.c | 61 +- + drivers/iio/adc/mt6360-adc.c | 2 +- + drivers/iio/adc/pac1921.c | 1261 +++++++++++++ + drivers/iio/adc/rockchip_saradc.c | 2 +- + drivers/iio/adc/rtq6056.c | 2 +- + drivers/iio/adc/stm32-adc.c | 4 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 2 +- + drivers/iio/adc/ti-adc0832.c | 3 +- + drivers/iio/adc/ti-adc084s021.c | 3 +- + drivers/iio/adc/ti-adc12138.c | 3 +- + drivers/iio/adc/ti-ads1015.c | 2 +- + drivers/iio/adc/ti-ads1119.c | 4 +- + drivers/iio/adc/ti-ads124s08.c | 3 +- + drivers/iio/adc/ti-ads1298.c | 3 +- + drivers/iio/adc/ti-ads131e08.c | 2 +- + drivers/iio/adc/ti-ads8688.c | 4 +- + drivers/iio/adc/ti-tsc2046.c | 83 +- + drivers/iio/adc/vf610_adc.c | 2 +- + drivers/iio/adc/xilinx-xadc-core.c | 5 +- + drivers/iio/buffer/industrialio-buffer-cb.c | 2 +- + drivers/iio/buffer/industrialio-buffer-dma.c | 36 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 1 + + drivers/iio/buffer/industrialio-hw-consumer.c | 4 +- + drivers/iio/chemical/bme680.h | 41 +- + drivers/iio/chemical/bme680_core.c | 633 +++---- + drivers/iio/chemical/bme680_spi.c | 2 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 8 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 2 +- + drivers/iio/dac/Kconfig | 11 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/ad9739a.c | 5 +- + drivers/iio/dac/adi-axi-dac.c | 9 +- + drivers/iio/dac/ltc2664.c | 735 ++++++++ + drivers/iio/dac/ltc2688.c | 2 +- + drivers/iio/dac/mcp4728.c | 45 +- + drivers/iio/dac/mcp4922.c | 45 +- + drivers/iio/dac/ti-dac7311.c | 4 +- + drivers/iio/dummy/iio_simple_dummy_buffer.c | 2 +- + drivers/iio/frequency/adf4377.c | 35 +- + drivers/iio/health/afe4403.c | 3 +- + drivers/iio/health/afe4404.c | 3 +- + drivers/iio/health/max30102.c | 2 +- + drivers/iio/humidity/am2315.c | 3 +- + drivers/iio/imu/adis16475.c | 3 +- + drivers/iio/imu/adis16480.c | 2 +- + drivers/iio/imu/bmi160/bmi160_core.c | 3 +- + drivers/iio/imu/bmi323/bmi323.h | 1 + + drivers/iio/imu/bmi323/bmi323_core.c | 23 + + drivers/iio/imu/bmi323/bmi323_i2c.c | 3 +- + drivers/iio/imu/bmi323/bmi323_spi.c | 3 +- + drivers/iio/imu/bno055/bno055.c | 2 +- + drivers/iio/imu/bno055/bno055_ser_core.c | 2 +- + drivers/iio/imu/kmx61.c | 3 +- + drivers/iio/industrialio-backend.c | 163 +- + drivers/iio/industrialio-buffer.c | 52 +- + drivers/iio/industrialio-core.c | 46 +- + drivers/iio/industrialio-trigger.c | 26 + + drivers/iio/light/Kconfig | 13 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/adjd_s311.c | 3 +- + drivers/iio/light/bh1745.c | 906 ++++++++++ + drivers/iio/light/gp2ap002.c | 2 +- + drivers/iio/light/gp2ap020a00f.c | 9 +- + drivers/iio/light/isl29125.c | 3 +- + drivers/iio/light/ltr390.c | 138 +- + drivers/iio/light/ltrf216a.c | 53 +- + drivers/iio/light/noa1305.c | 171 +- + drivers/iio/light/rohm-bu27034.c | 337 +--- + drivers/iio/light/si1145.c | 7 +- + drivers/iio/light/stk3310.c | 7 +- + drivers/iio/light/tcs3414.c | 3 +- + drivers/iio/light/tcs3472.c | 3 +- + drivers/iio/magnetometer/rm3100-core.c | 2 +- + drivers/iio/pressure/Kconfig | 11 + + drivers/iio/pressure/Makefile | 1 + + drivers/iio/pressure/bmp280-core.c | 654 ++++++- + drivers/iio/pressure/bmp280-i2c.c | 2 +- + drivers/iio/pressure/bmp280-regmap.c | 45 +- + drivers/iio/pressure/bmp280-spi.c | 18 +- + drivers/iio/pressure/bmp280.h | 37 +- + drivers/iio/pressure/dlhl60d.c | 3 +- + drivers/iio/pressure/sdp500.c | 156 ++ + drivers/iio/proximity/Kconfig | 14 + + drivers/iio/proximity/Makefile | 1 + + drivers/iio/proximity/hx9023s.c | 1143 ++++++++++++ + drivers/iio/proximity/sx9500.c | 3 +- + drivers/iio/proximity/sx_common.c | 6 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 5 +- + include/dt-bindings/iio/adi,ad4695.h | 9 + + include/linux/iio/backend.h | 33 +- + include/linux/iio/iio.h | 39 +- + 172 files changed, 12848 insertions(+), 1634 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-iio-backend + delete mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-max9611 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dac + create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl380.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad4695.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/microchip,pac1921.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ltc2664.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ltc2672.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/dac.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/rohm,bh1745.yaml + rename Documentation/devicetree/bindings/iio/light/{rohm,bu27034.yaml => rohm,bu27034anuc.yaml} (66%) + create mode 100644 Documentation/devicetree/bindings/iio/pressure/sensirion,sdp500.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/tyhx,hx9023s.yaml + create mode 100644 Documentation/iio/ad4000.rst + create mode 100644 Documentation/iio/ad4695.rst + create mode 100644 Documentation/iio/ad7380.rst + create mode 100644 Documentation/iio/adxl380.rst + create mode 100644 drivers/iio/accel/adxl380.c + create mode 100644 drivers/iio/accel/adxl380.h + create mode 100644 drivers/iio/accel/adxl380_i2c.c + create mode 100644 drivers/iio/accel/adxl380_spi.c + create mode 100644 drivers/iio/adc/ad4000.c + create mode 100644 drivers/iio/adc/ad4695.c + create mode 100644 drivers/iio/adc/pac1921.c + create mode 100644 drivers/iio/dac/ltc2664.c + create mode 100644 drivers/iio/light/bh1745.c + create mode 100644 drivers/iio/pressure/sdp500.c + create mode 100644 drivers/iio/proximity/hx9023s.c + create mode 100644 include/dt-bindings/iio/adi,ad4695.h +Merging phy-next/next (c4b09c562086 phy: phy-rockchip-samsung-hdptx: Add clock provider support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +Auto-merging drivers/phy/samsung/phy-exynos5-usbdrd.c +Merge made by the 'ort' strategy. + .../phy/hisilicon,hi3798cv200-combphy.yaml | 56 ++ + .../bindings/phy/phy-hi3798cv200-combphy.txt | 59 -- + .../devicetree/bindings/phy/qcom,sata-phy.yaml | 55 ++ + .../devicetree/bindings/phy/qcom,usb-8x16-phy.txt | 76 --- + .../bindings/phy/qcom-apq8064-sata-phy.txt | 24 - + .../bindings/phy/qcom-ipq806x-sata-phy.txt | 23 - + .../bindings/phy/rockchip,rk3588-hdptx-phy.yaml | 3 + + drivers/phy/cadence/phy-cadence-sierra.c | 88 +-- + drivers/phy/cadence/phy-cadence-torrent.c | 683 +++++++++++---------- + drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 4 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 38 +- + drivers/phy/qualcomm/phy-qcom-qmp-common.h | 19 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 8 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 27 +- + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 12 +- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 10 +- + drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 13 +- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 206 ++++++- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 12 +- + drivers/phy/ti/phy-j721e-wiz.c | 4 +- + 20 files changed, 776 insertions(+), 644 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/hisilicon,hi3798cv200-combphy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-hi3798cv200-combphy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,sata-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-8x16-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/qcom-apq8064-sata-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/qcom-ipq806x-sata-phy.txt +Merging soundwire/next (663229e24255 soundwire: bus: clean up probe warnings) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + drivers/soundwire/bus_type.c | 19 ++++--------------- + include/linux/soundwire/sdw.h | 2 -- + 2 files changed, 4 insertions(+), 17 deletions(-) +Merging extcon/extcon-next (e508f2606c0b extcon: Add LC824206XA microUSB switch driver) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + drivers/extcon/Kconfig | 11 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-axp288.c | 2 +- + drivers/extcon/extcon-lc824206xa.c | 500 +++++++++++++++++++++++++++++++++++++ + 4 files changed, 513 insertions(+), 1 deletion(-) + create mode 100644 drivers/extcon/extcon-lc824206xa.c +Merging gnss/gnss-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (0756bec2e45b vfio-mdev: add missing MODULE_DESCRIPTION() macros) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging w1/for-next (e940ff286ec4 w1: ds2482: Drop explicit initialization of struct i2c_device_id::driver_data to 0) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Merge made by the 'ort' strategy. + drivers/w1/masters/ds2482.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging spmi/spmi-next (a8f4aa75f885 spmi: pmic-arb: add missing newline in dev_err format strings) +$ git merge -m Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Merge made by the 'ort' strategy. +Merging staging/staging-next (5aa0018a93bf staging: rtl8192e: remove duplicate macros from rtllib.h) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Merge made by the 'ort' strategy. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/fbtft/fb_ili9320.c | 2 - + drivers/staging/fbtft/fb_ra8875.c | 7 - + drivers/staging/fbtft/fb_sh1106.c | 3 - + drivers/staging/fbtft/fb_ssd1289.c | 3 - + drivers/staging/fbtft/fb_ssd1306.c | 3 - + drivers/staging/fbtft/fb_ssd1325.c | 9 - + drivers/staging/fbtft/fb_ssd1331.c | 2 - + drivers/staging/fbtft/fb_ssd1351.c | 3 - + drivers/staging/fbtft/fb_uc1611.c | 3 - + drivers/staging/fbtft/fbtft-bus.c | 9 - + drivers/staging/fbtft/fbtft-core.c | 7 - + drivers/staging/fbtft/fbtft-sysfs.c | 4 - + drivers/staging/fbtft/fbtft.h | 2 + + drivers/staging/ks7010/Kconfig | 14 - + drivers/staging/ks7010/Makefile | 4 - + drivers/staging/ks7010/TODO | 36 - + drivers/staging/ks7010/eap_packet.h | 70 - + drivers/staging/ks7010/ks7010_sdio.c | 1143 --------- + drivers/staging/ks7010/ks_hostif.c | 2312 ----------------- + drivers/staging/ks7010/ks_hostif.h | 617 ----- + drivers/staging/ks7010/ks_wlan.h | 567 ----- + drivers/staging/ks7010/ks_wlan_ioctl.h | 61 - + drivers/staging/ks7010/ks_wlan_net.c | 2676 -------------------- + .../iterator/iterator_1.0/ia_css_iterator.host.c | 3 +- + drivers/staging/most/video/video.c | 6 +- + drivers/staging/nvec/nvec.c | 14 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- + drivers/staging/rtl8192e/rtllib.h | 11 - + drivers/staging/rtl8712/rtl871x_cmd.c | 5 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 2 +- + drivers/staging/rtl8723bs/include/hal_pwr_seq.h | 2 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 4 +- + .../rtl8723bs/include/osdep_service_linux.h | 68 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 4 +- + drivers/staging/rtl8723bs/include/rtw_security.h | 3 +- + drivers/staging/vme_user/vme.c | 2 +- + drivers/staging/vme_user/vme_tsi148.c | 145 +- + 39 files changed, 128 insertions(+), 7703 deletions(-) + delete mode 100644 drivers/staging/ks7010/Kconfig + delete mode 100644 drivers/staging/ks7010/Makefile + delete mode 100644 drivers/staging/ks7010/TODO + delete mode 100644 drivers/staging/ks7010/eap_packet.h + delete mode 100644 drivers/staging/ks7010/ks7010_sdio.c + delete mode 100644 drivers/staging/ks7010/ks_hostif.c + delete mode 100644 drivers/staging/ks7010/ks_hostif.h + delete mode 100644 drivers/staging/ks7010/ks_wlan.h + delete mode 100644 drivers/staging/ks7010/ks_wlan_ioctl.h + delete mode 100644 drivers/staging/ks7010/ks_wlan_net.c +Merging counter-next/counter-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions) +$ git merge -m Merge branch 'siox/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git siox/siox/for-next +Already up to date. +Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (0204485c5a1e dt-bindings: fsl-qdma: allow compatible string fallback to fsl,ls1021a-qdma) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/fsl-qdma.yaml | 13 +++-- + .../devicetree/bindings/dma/marvell,xor-v2.yaml | 61 ++++++++++++++++++++++ + .../devicetree/bindings/dma/mv-xor-v2.txt | 28 ---------- + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 1 + + drivers/dma/dmatest.c | 2 +- + drivers/dma/idxd/perfmon.c | 4 +- + 6 files changed, 73 insertions(+), 36 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/marvell,xor-v2.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/mv-xor-v2.txt +Merging cgroup/for-next (33ed8884df3d Merge branch 'for-6.12' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging Documentation/core-api/index.rst +Auto-merging MAINTAINERS +Auto-merging include/linux/cgroup-defs.h +Auto-merging include/linux/sched.h +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/fork.c +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 12 +- + Documentation/core-api/index.rst | 1 + + Documentation/core-api/union_find.rst | 106 ++++++++++ + .../translations/zh_CN/core-api/index.rst | 1 + + .../translations/zh_CN/core-api/union_find.rst | 92 +++++++++ + MAINTAINERS | 9 + + include/linux/cgroup-defs.h | 14 ++ + include/linux/cpuset.h | 6 - + include/linux/sched.h | 1 - + include/linux/union_find.h | 41 ++++ + kernel/cgroup/cgroup.c | 55 ++++- + kernel/cgroup/cpuset.c | 222 +++++++++------------ + kernel/cgroup/pids.c | 32 +-- + kernel/fork.c | 1 - + lib/Makefile | 2 +- + lib/union_find.c | 49 +++++ + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 12 +- + 17 files changed, 488 insertions(+), 168 deletions(-) + create mode 100644 Documentation/core-api/union_find.rst + create mode 100644 Documentation/translations/zh_CN/core-api/union_find.rst + create mode 100644 include/linux/union_find.h + create mode 100644 lib/union_find.c +Merging scsi/for-next (5cadf9bb8103 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Merge made by the 'ort' strategy. + drivers/message/fusion/lsi/mpi_cnfg.h | 60 ++---------- + drivers/scsi/aacraid/aachba.c | 28 +++--- + drivers/scsi/aacraid/aacraid.h | 21 ++-- + drivers/scsi/aacraid/commctrl.c | 4 +- + drivers/scsi/aacraid/comminit.c | 3 +- + drivers/scsi/aacraid/commsup.c | 5 +- + drivers/scsi/aacraid/src.c | 2 +- + drivers/scsi/ipr.h | 4 +- + drivers/scsi/lpfc/lpfc.h | 12 ++- + drivers/scsi/lpfc/lpfc_els.c | 79 +++++++++------ + drivers/scsi/lpfc/lpfc_hbadisc.c | 14 ++- + drivers/scsi/lpfc/lpfc_nportdisc.c | 22 ++++- + drivers/scsi/lpfc/lpfc_scsi.c | 13 ++- + drivers/scsi/lpfc/lpfc_sli.c | 13 ++- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vmid.c | 3 +- + drivers/scsi/megaraid/megaraid_sas.h | 6 +- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 10 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 10 +- + drivers/scsi/smartpqi/smartpqi.h | 2 +- + drivers/scsi/smartpqi/smartpqi_init.c | 176 +++++++++++++++++++++++++++++----- + drivers/ufs/core/ufshcd.c | 29 +++++- + 22 files changed, 330 insertions(+), 188 deletions(-) +Merging scsi-mkp/for-next (5f36bd89a994 Merge patch series "smartpqi updates") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (d820e8fcea38 net: virtio: unify code to init stats) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/net/virtio_net.c +Merge made by the 'ort' strategy. + drivers/net/virtio_net.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging rpmsg/for-next (8749919defb8 remoteproc: imx_rproc: Merge TCML/U) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + drivers/remoteproc/imx_rproc.c | 37 +++++++++++++++++++++---------------- + 1 file changed, 21 insertions(+), 16 deletions(-) +Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (26b95b7b588d gpio: vf610: add get_direction() support) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/gpio/gpio_lpc32xx.txt | 43 ------------------- + .../devicetree/bindings/gpio/nxp,lpc3220-gpio.yaml | 50 ++++++++++++++++++++++ + drivers/gpio/gpio-fxl6408.c | 2 +- + drivers/gpio/gpio-max7300.c | 2 +- + drivers/gpio/gpio-vf610.c | 31 +++++++++++--- + drivers/gpio/gpiolib-of.c | 8 ++-- + tools/gpio/gpio-hammer.c | 4 +- + 7 files changed, 83 insertions(+), 57 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio_lpc32xx.txt + create mode 100644 Documentation/devicetree/bindings/gpio/nxp,lpc3220-gpio.yaml +Merging gpio-intel/for-next (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (6fb214cdf7df Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'ort' strategy. + .../bindings/pinctrl/mobileye,eyeq5-pinctrl.yaml | 242 --------- + .../bindings/pinctrl/nuvoton,npcm845-pinctrl.yaml | 70 ++- + .../devicetree/bindings/pinctrl/pincfg-node.yaml | 3 + + .../bindings/pinctrl/qcom,apq8064-pinctrl.txt | 95 ---- + .../bindings/pinctrl/qcom,apq8064-pinctrl.yaml | 110 ++++ + .../bindings/pinctrl/qcom,apq8084-pinctrl.txt | 188 ------- + .../bindings/pinctrl/qcom,apq8084-pinctrl.yaml | 129 +++++ + .../bindings/pinctrl/qcom,ipq4019-pinctrl.txt | 85 --- + .../bindings/pinctrl/qcom,ipq4019-pinctrl.yaml | 102 ++++ + .../bindings/pinctrl/qcom,ipq8064-pinctrl.txt | 101 ---- + .../bindings/pinctrl/qcom,ipq8064-pinctrl.yaml | 108 ++++ + drivers/pinctrl/Kconfig | 15 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 64 ++- + drivers/pinctrl/nxp/pinctrl-s32cc.c | 51 +- + drivers/pinctrl/pinconf-generic.c | 2 + + drivers/pinctrl/pinctrl-eyeq5.c | 575 +++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-x1e80100.c | 27 +- + drivers/pinctrl/realtek/pinctrl-rtd.c | 2 +- + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 58 +-- + include/linux/pinctrl/pinconf-generic.h | 3 + + 21 files changed, 1188 insertions(+), 843 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/mobileye,eyeq5-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.yaml + create mode 100644 drivers/pinctrl/pinctrl-eyeq5.c +Merging pinctrl-intel/for-next (de9c2c66ad8e Linux 6.11-rc2) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (f73f63b24491 pinctrl: renesas: rzg2l: Use dev_err_probe()) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 1 + + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 45 +++++++++------------- + 2 files changed, 20 insertions(+), 26 deletions(-) +Merging pinctrl-samsung/for-next (d59c2396e066 pinctrl: samsung: Use scope based of_node_put() cleanups) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 16 ++++------------ + drivers/pinctrl/samsung/pinctrl-samsung.c | 27 +++++++++------------------ + 2 files changed, 13 insertions(+), 30 deletions(-) +Merging pwm/pwm/for-next (2e8b1b881a36 pwm: Simplify pwm_capture()) +$ git merge -m Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 1 + + Documentation/devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 1 + + drivers/pwm/core.c | 13 ++++++------- + drivers/pwm/pwm-lp3943.c | 9 +++------ + include/linux/pwm.h | 10 ---------- + include/trace/events/pwm.h | 10 ++++++---- + 6 files changed, 17 insertions(+), 27 deletions(-) +Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (2c082b62aeb5 selftests: harness: rename __constructor_order for clarification) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging tools/testing/selftests/hid/hid_bpf.c +Merge made by the 'ort' strategy. + tools/testing/selftests/Makefile | 2 +- + tools/testing/selftests/acct/.gitignore | 3 + + tools/testing/selftests/acct/Makefile | 5 ++ + tools/testing/selftests/acct/acct_syscall.c | 78 ++++++++++++++++++++++ + tools/testing/selftests/cpufreq/cpufreq.sh | 15 +++++ + tools/testing/selftests/cpufreq/main.sh | 13 +++- + .../drivers/s390x/uvdevice/test_uvdevice.c | 6 -- + tools/testing/selftests/exec/execveat.c | 2 +- + tools/testing/selftests/hid/hid_bpf.c | 6 -- + tools/testing/selftests/kselftest_harness.h | 18 ++--- + tools/testing/selftests/lib/Makefile | 3 +- + tools/testing/selftests/lib/config | 1 - + tools/testing/selftests/lib/strscpy.sh | 3 - + tools/testing/selftests/rtc/rtctest.c | 7 -- + tools/testing/selftests/tpm2/test_async.sh | 2 +- + tools/testing/selftests/tpm2/test_smoke.sh | 2 +- + tools/testing/selftests/tpm2/test_space.sh | 2 +- + tools/testing/selftests/user/Makefile | 9 --- + tools/testing/selftests/user/config | 1 - + tools/testing/selftests/user/test_user_copy.sh | 18 ----- + 20 files changed, 123 insertions(+), 73 deletions(-) + create mode 100644 tools/testing/selftests/acct/.gitignore + create mode 100644 tools/testing/selftests/acct/Makefile + create mode 100644 tools/testing/selftests/acct/acct_syscall.c + delete mode 100755 tools/testing/selftests/lib/strscpy.sh + delete mode 100644 tools/testing/selftests/user/Makefile + delete mode 100644 tools/testing/selftests/user/config + delete mode 100755 tools/testing/selftests/user/test_user_copy.sh +Merging kunit/test (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging livepatching/for-next (9871e6af43db Merge branch 'for-6.11/sysfs-patch-replace' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (efa9c5be2cae rtc: stm32: add new st,stm32mp25-rtc compatible and check RIF configuration) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (b0d478e34dbf testing: nvdimm: Add MODULE_DESCRIPTION() macros) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (92aee2f6d156 NTB: ntb_transport: fix all kernel-doc warnings) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/ntb/ntb_transport.c +Merge made by the 'ort' strategy. + drivers/ntb/core.c | 4 ++-- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/ntb_transport.c | 10 ++++++---- + drivers/ntb/test/ntb_perf.c | 2 +- + 4 files changed, 10 insertions(+), 8 deletions(-) +Merging seccomp/for-next/seccomp (de9c2c66ad8e Linux 6.11-rc2) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Merge made by the 'ort' strategy. + drivers/fsi/fsi-sbefifo.c | 9 ++++++++- + drivers/fsi/i2cr-scom.c | 11 ++++++++++- + 2 files changed, 18 insertions(+), 2 deletions(-) +Merging slimbus/for-next (9b6e704955fa slimbus: generate MODULE_ALIAS() from MODULE_DEVICE_TABLE()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. + drivers/slimbus/messaging.c | 9 +++++---- + drivers/slimbus/qcom-ctrl.c | 7 ++++--- + drivers/slimbus/qcom-ngd-ctrl.c | 29 ++++++++++++++++------------- + scripts/mod/devicetable-offsets.c | 4 ++++ + scripts/mod/file2alias.c | 11 +++++++++++ + 5 files changed, 40 insertions(+), 20 deletions(-) +Merging nvmem/for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Already up to date. +Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/for-next (2ccfe94bc3ac auxdisplay: ht16k33: Drop reference after LED registration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Already up to date. +Merging kgdb/kgdb/for-next (9bccbe7b2087 kdb: Get rid of redundant kdb_curr_task()) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (65bc58c3dcad net: wwan: mhi: make default data link id configurable) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (9e3d665384fc memblock test: fix implicit declaration of function 'strscpy') +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging tools/include/linux/string.h +CONFLICT (rename/delete): tools/testing/radix-tree/linux/init.h renamed to tools/testing/shared/linux/init.h in HEAD, but deleted in memblock/for-next. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f tools/testing/shared/linux/init.h +rm 'tools/testing/shared/linux/init.h' +$ git commit --no-edit -v -a +[master 50d46ad9d404] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git +$ git diff -M --stat --summary HEAD^.. + tools/include/linux/compiler.h | 4 -- + tools/{testing/memblock => include}/linux/init.h | 19 ++++++--- + tools/include/linux/linkage.h | 2 + + tools/include/linux/mm.h | 6 +++ + tools/include/linux/string.h | 3 ++ + tools/lib/cmdline.c | 53 ++++++++++++++++++++++++ + tools/testing/memblock/Makefile | 2 +- + tools/testing/memblock/linux/kernel.h | 2 + + tools/testing/memblock/linux/mmzone.h | 1 + + tools/testing/radix-tree/maple.c | 2 +- + tools/testing/shared/linux/init.h | 2 - + 11 files changed, 83 insertions(+), 13 deletions(-) + rename tools/{testing/memblock => include}/linux/init.h (76%) + create mode 100644 tools/lib/cmdline.c + delete mode 100644 tools/testing/shared/linux/init.h +Merging cxl/next (a0328b397f33 cxl/core/pci: Move reading of control register to immediately before usage) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Auto-merging include/linux/zstd.h +Auto-merging lib/zstd/compress/zstd_compress.c +Auto-merging lib/zstd/zstd_compress_module.c +Auto-merging lib/zstd/zstd_decompress_module.c +Merge made by the 'ort' strategy. + include/linux/zstd.h | 2 +- + include/linux/zstd_errors.h | 23 +- + include/linux/zstd_lib.h | 697 ++++++++-- + lib/zstd/Makefile | 2 +- + lib/zstd/common/allocations.h | 56 + + lib/zstd/common/bits.h | 149 ++ + lib/zstd/common/bitstream.h | 53 +- + lib/zstd/common/compiler.h | 14 +- + lib/zstd/common/cpu.h | 3 +- + lib/zstd/common/debug.c | 5 +- + lib/zstd/common/debug.h | 3 +- + lib/zstd/common/entropy_common.c | 42 +- + lib/zstd/common/error_private.c | 12 +- + lib/zstd/common/error_private.h | 3 +- + lib/zstd/common/fse.h | 89 +- + lib/zstd/common/fse_decompress.c | 94 +- + lib/zstd/common/huf.h | 234 +--- + lib/zstd/common/mem.h | 2 +- + lib/zstd/common/portability_macros.h | 26 +- + lib/zstd/common/zstd_common.c | 38 +- + lib/zstd/common/zstd_deps.h | 16 +- + lib/zstd/common/zstd_internal.h | 99 +- + lib/zstd/compress/clevels.h | 3 +- + lib/zstd/compress/fse_compress.c | 59 +- + lib/zstd/compress/hist.c | 3 +- + lib/zstd/compress/hist.h | 3 +- + lib/zstd/compress/huf_compress.c | 372 +++-- + lib/zstd/compress/zstd_compress.c | 1758 +++++++++++++++++------- + lib/zstd/compress/zstd_compress_internal.h | 333 +++-- + lib/zstd/compress/zstd_compress_literals.c | 155 ++- + lib/zstd/compress/zstd_compress_literals.h | 25 +- + lib/zstd/compress/zstd_compress_sequences.c | 7 +- + lib/zstd/compress/zstd_compress_sequences.h | 3 +- + lib/zstd/compress/zstd_compress_superblock.c | 47 +- + lib/zstd/compress/zstd_compress_superblock.h | 3 +- + lib/zstd/compress/zstd_cwksp.h | 149 +- + lib/zstd/compress/zstd_double_fast.c | 129 +- + lib/zstd/compress/zstd_double_fast.h | 6 +- + lib/zstd/compress/zstd_fast.c | 578 ++++++-- + lib/zstd/compress/zstd_fast.h | 6 +- + lib/zstd/compress/zstd_lazy.c | 518 +++---- + lib/zstd/compress/zstd_lazy.h | 7 +- + lib/zstd/compress/zstd_ldm.c | 11 +- + lib/zstd/compress/zstd_ldm.h | 3 +- + lib/zstd/compress/zstd_ldm_geartab.h | 3 +- + lib/zstd/compress/zstd_opt.c | 187 +-- + lib/zstd/compress/zstd_opt.h | 3 +- + lib/zstd/decompress/huf_decompress.c | 772 +++++++---- + lib/zstd/decompress/zstd_ddict.c | 9 +- + lib/zstd/decompress/zstd_ddict.h | 3 +- + lib/zstd/decompress/zstd_decompress.c | 259 +++- + lib/zstd/decompress/zstd_decompress_block.c | 283 ++-- + lib/zstd/decompress/zstd_decompress_block.h | 8 +- + lib/zstd/decompress/zstd_decompress_internal.h | 7 +- + lib/zstd/decompress_sources.h | 2 +- + lib/zstd/zstd_common_module.c | 5 +- + lib/zstd/zstd_compress_module.c | 2 +- + lib/zstd/zstd_decompress_module.c | 4 +- + 58 files changed, 4791 insertions(+), 2596 deletions(-) + create mode 100644 lib/zstd/common/allocations.h + create mode 100644 lib/zstd/common/bits.h +Merging efi/next (4a2ebb082297 efi: Replace efi_memory_attributes_table_t 0-sized array with flexible array) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (68318904a775 unicode: add MODULE_DESCRIPTION() macros) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Already up to date. +Merging slab/slab/for-next (a371d558e6f3 mm, slub: do not call do_slab_free for kfence object) +$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Already up to date. +Merging random/master (c86927f528a8 selftests/vDSO: don't #include sodium header in chacha test) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Merge made by the 'ort' strategy. + tools/testing/selftests/vDSO/vdso_test_chacha.c | 2 +- + tools/testing/selftests/vDSO/vdso_test_getrandom.c | 67 +++++++++------------- + 2 files changed, 28 insertions(+), 41 deletions(-) +Merging landlock/next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (de9c2c66ad8e Linux 6.11-rc2) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging sysctl/sysctl-next (acc154691fc7 sysctl: Warn on an empty procname element) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (fb97d2eb542f binfmt_elf, coredump: Log the reason of the failed core dumps) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Auto-merging fs/binfmt_elf.c +CONFLICT (content): Merge conflict in fs/binfmt_elf.c +Auto-merging kernel/signal.c +Recorded preimage for 'fs/binfmt_elf.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/binfmt_elf.c'. +[master 8695b6506c68] Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git +$ git diff -M --stat --summary HEAD^.. + fs/binfmt_elf.c | 48 +++++++++++---- + fs/coredump.c | 150 ++++++++++++++++++++++++++++++++--------------- + include/linux/coredump.h | 30 +++++++++- + kernel/signal.c | 21 ++++++- + 4 files changed, 188 insertions(+), 61 deletions(-) +Merging bitmap/bitmap-for-next (7e516a1ef3f4 nodemask: Switch from inline to __always_inline) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging include/linux/bitmap.h +Auto-merging include/linux/bits.h +Auto-merging include/uapi/linux/const.h +Auto-merging lib/test_bits.c +CONFLICT (content): Merge conflict in lib/test_bits.c +Resolved 'lib/test_bits.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2fce9266c3df] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. + include/linux/bitmap.h | 140 ++++++++++++++++-------------- + include/linux/bits.h | 15 ++++ + include/linux/cpumask.h | 212 ++++++++++++++++++++++++--------------------- + include/linux/find.h | 50 +++++------ + include/linux/nodemask.h | 86 +++++++++--------- + include/uapi/linux/const.h | 17 ++++ + lib/test_bits.c | 8 +- + 7 files changed, 291 insertions(+), 237 deletions(-) +Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (d518b5f7f2d5 coccinelle: Add rules to find str_up_down() replacements) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging MAINTAINERS +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 19 ++++--- + drivers/misc/lkdtm/refcount.c | 16 ++++++ + include/linux/refcount.h | 4 +- + include/linux/string_choices.h | 5 ++ + lib/.gitignore | 2 - + lib/Makefile | 76 +-------------------------- + lib/test_fortify/.gitignore | 2 + + lib/test_fortify/Makefile | 28 ++++++++++ + {scripts => lib/test_fortify}/test_fortify.sh | 0 + lib/tests/Makefile | 37 +++++++++++++ + lib/{ => tests}/bitfield_kunit.c | 0 + lib/{ => tests}/checksum_kunit.c | 0 + lib/{ => tests}/cmdline_kunit.c | 0 + lib/{ => tests}/cpumask_kunit.c | 0 + lib/{ => tests}/fortify_kunit.c | 0 + lib/{ => tests}/hashtable_test.c | 0 + lib/{ => tests}/is_signed_type_kunit.c | 0 + lib/{ => tests}/kunit_iov_iter.c | 0 + lib/{ => tests}/list-test.c | 0 + lib/{ => tests}/memcpy_kunit.c | 0 + lib/{ => tests}/overflow_kunit.c | 0 + lib/{ => tests}/siphash_kunit.c | 0 + lib/{ => tests}/slub_kunit.c | 0 + lib/{ => tests}/stackinit_kunit.c | 0 + lib/{ => tests}/string_helpers_kunit.c | 0 + lib/{ => tests}/string_kunit.c | 0 + lib/{ => tests}/test_bits.c | 0 + lib/{ => tests}/test_fprobe.c | 0 + lib/{ => tests}/test_hash.c | 0 + lib/{ => tests}/test_kprobes.c | 0 + lib/{ => tests}/test_linear_ranges.c | 0 + lib/{ => tests}/test_list_sort.c | 0 + lib/{ => tests}/test_sort.c | 0 + lib/{ => tests}/usercopy_kunit.c | 0 + scripts/coccinelle/api/string_choices.cocci | 23 ++++++++ + scripts/gcc-plugins/randomize_layout_plugin.c | 4 -- + 36 files changed, 124 insertions(+), 92 deletions(-) + create mode 100644 lib/test_fortify/.gitignore + create mode 100644 lib/test_fortify/Makefile + rename {scripts => lib/test_fortify}/test_fortify.sh (100%) + create mode 100644 lib/tests/Makefile + rename lib/{ => tests}/bitfield_kunit.c (100%) + rename lib/{ => tests}/checksum_kunit.c (100%) + rename lib/{ => tests}/cmdline_kunit.c (100%) + rename lib/{ => tests}/cpumask_kunit.c (100%) + rename lib/{ => tests}/fortify_kunit.c (100%) + rename lib/{ => tests}/hashtable_test.c (100%) + rename lib/{ => tests}/is_signed_type_kunit.c (100%) + rename lib/{ => tests}/kunit_iov_iter.c (100%) + rename lib/{ => tests}/list-test.c (100%) + rename lib/{ => tests}/memcpy_kunit.c (100%) + rename lib/{ => tests}/overflow_kunit.c (100%) + rename lib/{ => tests}/siphash_kunit.c (100%) + rename lib/{ => tests}/slub_kunit.c (100%) + rename lib/{ => tests}/stackinit_kunit.c (100%) + rename lib/{ => tests}/string_helpers_kunit.c (100%) + rename lib/{ => tests}/string_kunit.c (100%) + rename lib/{ => tests}/test_bits.c (100%) + rename lib/{ => tests}/test_fprobe.c (100%) + rename lib/{ => tests}/test_hash.c (100%) + rename lib/{ => tests}/test_kprobes.c (100%) + rename lib/{ => tests}/test_linear_ranges.c (100%) + rename lib/{ => tests}/test_list_sort.c (100%) + rename lib/{ => tests}/test_sort.c (100%) + rename lib/{ => tests}/usercopy_kunit.c (100%) +$ git am -3 ../patches/0001-Revert-lib-Move-KUnit-tests-into-tests-subdirectory.patch +Applying: Revert "lib: Move KUnit tests into tests/ subdirectory" +$ git reset HEAD^ +Unstaged changes after reset: +M MAINTAINERS +M lib/Makefile +D lib/tests/Makefile +D lib/tests/bitfield_kunit.c +D lib/tests/checksum_kunit.c +D lib/tests/cmdline_kunit.c +D lib/tests/cpumask_kunit.c +D lib/tests/fortify_kunit.c +D lib/tests/hashtable_test.c +D lib/tests/is_signed_type_kunit.c +D lib/tests/kunit_iov_iter.c +D lib/tests/list-test.c +D lib/tests/memcpy_kunit.c +D lib/tests/overflow_kunit.c +D lib/tests/siphash_kunit.c +D lib/tests/slub_kunit.c +D lib/tests/stackinit_kunit.c +D lib/tests/string_helpers_kunit.c +D lib/tests/string_kunit.c +D lib/tests/test_bits.c +D lib/tests/test_fprobe.c +D lib/tests/test_hash.c +D lib/tests/test_kprobes.c +D lib/tests/test_linear_ranges.c +D lib/tests/test_list_sort.c +D lib/tests/test_sort.c +D lib/tests/usercopy_kunit.c +$ git add -A . +$ git commit -v -a --amend +[master ab48dbeb66f5] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git + Date: Wed Aug 7 13:13:04 2024 +1000 +Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging nolibc/nolibc (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc +Already up to date. +Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) +$ git merge -m Merge branch 'tsm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux tsm/tsm-next +Already up to date. +Merging iommufd/for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. +Merging turbostat/next (75879bd898ee tools/power turbostat: fix GCC9 build regression) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Merge made by the 'ort' strategy. + tools/power/x86/turbostat/turbostat.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) +Merging pwrseq/pwrseq/for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'pwrseq/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next +Already up to date. +Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT) +$ git merge -m Merge branch 'header_cleanup' of git://evilpiepirate.org/bcachefs.git header_cleanup/header_cleanup +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..16a26f943357 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20240807