diff options
| author | Mark Brown <broonie@kernel.org> | 2026-03-30 21:48:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-03-30 21:48:33 +0100 |
| commit | cf7c3c02fdd0dfccf4d6611714273dcb538af2cb (patch) | |
| tree | 7c53b427ab27c5738e4fc645f5ab84831d7c2131 | |
| parent | 61909244ddbf7a7f3aad6b268fe607aa45541fe1 (diff) | |
Add linux-next specific files for 20260330next/masternext/HEAD
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | Next/SHA1s | 415 | ||||
| -rw-r--r-- | Next/Trees | 415 | ||||
| -rw-r--r-- | Next/kselftest-targets | 109 | ||||
| -rw-r--r-- | Next/merge.log | 14821 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 15761 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..b9ed359e39d9 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,415 @@ +Name SHA1 +---- ---- +origin 7aaa8047eafd0bd628065b15757d9b48c5f9c07d +ext4-fixes d250bdf531d9cd4096fedbb9f172bb2ca660c868 +vfs-brauner-fixes 0e764b9d46071668969410ec5429be0e2f38c6d3 +fscrypt-current 1f318b96cc84d7c2ab792fcc0bfd42a7ca890681 +fsverity-current 1f318b96cc84d7c2ab792fcc0bfd42a7ca890681 +btrfs-fixes 13dca98de903fbab400d02b4f47477dbadecfd47 +vfs-fixes 49c5d168a3a8f4eb27d44a2a22b7e8a856ca601f +erofs-fixes 2f0407ed923b7eb363424033fc12fe253da139c4 +nfsd-fixes 5133b61aaf437e5f25b1b396b14242a6bb0508e2 +v9fs-fixes 2014c95afecee3e76ca4a56956a936e23283f05b +overlayfs-fixes 1f6ee9be92f8df85a8c9a5a78c20fd39c0c21a95 +fscrypt 1546d3feb5e533fbee6710bd51b2847b2ec23623 +btrfs a60530451d0f750d7bbb332811da05c204b3fbfd +ceph 1ff957199bd11ece8280a29a13120dde5152aa7f +cifs 7aaa8047eafd0bd628065b15757d9b48c5f9c07d +configfs 6363844fdbbb76afe1d44d678fe0746390204a5f +ecryptfs 1601fe9e0423d813b1158a52e051bd3059f74197 +dlm 2c3a0b730012ef87aaaf35243e1fbe9880666f7c +erofs eabeee4332ac9b5d87ab602f845dbf0e9f854978 +exfat a03abd949fe2ac593906037a4d81737ea26aafcf +ext3 954ca109ca80a70e776d89ff5f260e63306d4e50 +ext4 9ee29d20aab228adfb02ca93f87fb53c56c2f3af +f2fs 62b45b0ad4cddebbba1ad5e7c48cf7b5e42c2377 +fsverity 1f318b96cc84d7c2ab792fcc0bfd42a7ca890681 +fuse 204aa22a686bfee48daca7db620c1e017615f2ff +gfs2 6e1a833df9524e05889cf0fe02879b02d85776fd +jfs dad98c5b2a05ef744af4c884c97066a3c8cdad61 +ksmbd 9751aba44436d58e0c2b84aeedd1c1fd683a4284 +nfs 11439c4635edd669ae435eec308f4ab8a0804808 +nfs-anna 4529e0015432977af3ecc3b9f940fc2a1ef1b265 +nfsd 3603bf99062c6d563df4fba3848f829d5401d959 +ntfs 77f58db7391e227f8ff6ef5d83966347d759daed +ntfs3 f9963deaa891479da24e32fc614c08f158fe1608 +orangefs 9e835108a9ae1c37aef52a6f8d53265f474904a1 +overlayfs 1f6ee9be92f8df85a8c9a5a78c20fd39c0c21a95 +ubifs 11efa98bcc0d00271e8f66c7c940c284f973f39d +v9fs da2519ee01067fe9dee9bafac407ca1d8b276af3 +v9fs-ericvh 2014c95afecee3e76ca4a56956a936e23283f05b +xfs 025b245f0bc193c81679201b95940e96f8e42133 +zonefs a42938e80357a13f8b8592111e63f2e33a919863 +vfs-brauner a4e79b1233089509af213d59f7aeef3926c15599 +vfs 0787a93baa1aab9fd0cb8500105d11d3d3a58f7a +mm-hotfixes af42d6d3650b95295a3f08fc35189998bc26c2e1 +fs-current 500fb50a42284d0705482f9d2490938a42df8caf +kbuild-current f2b35ac51508c7194ab9045630480fb7fb08cfad +arc-current d7b8f8e20813f0179d8ef519541a3527e7661d3a +arm-current 23ea2a4c72323feb6e3e025e8a6f18336513d5ad +arm64-fixes 8c6e9b60f5c7985a9fe41320556a92d7a33451df +arm-soc-fixes 55372ab135a8e82c8c976b607fe7dd3386b99df5 +davinci-current 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +drivers-memory-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current cb39cf99d88e8f2c68a41fb3bb01c4f40a8fcc30 +powerpc-fixes f338e77383789c0cae23ca3d48adcc5e9e137e3c +s390-fixes c8d46f17c2fc7d25c18e60c008928aecab26184d +net dc9e9d61e301c087bcd990dbf2fa18ad3e2e1429 +bpf c369299895a591d96745d6492d4888259b004a9e +ipsec c4ea7d8907cf72b259bf70bd8c2e791e1c4ff70f +netfilter db472c34a74770f39318ddb1efa986c0a8d5d86a +ipvs db472c34a74770f39318ddb1efa986c0a8d5d86a +wireless 45dbf8fcea4dcf28cabcf4a1778e908feadf4c90 +ath 45dbf8fcea4dcf28cabcf4a1778e908feadf4c90 +iwlwifi 687a95d204e72e52f2e6bc7a994cc82f76b2678f +wpan 8ce4f287524c74a118b0af1eebd4b24a8efca57a +rdma-fixes e37afcb56ae070477741fe2d6e61fc0c542cce2d +sound-current f025ac8c698ac7d29eb3b5025bcdaf7ad675785d +sound-asoc-fixes d40a198e2b7821197c5c77b89d0130cc90f400f5 +regmap-fixes 09e70e4f119ff650d24c96161fd2f62ac7e424b0 +regulator-fixes 8121353a4bf8e38afee26299419a78ec108e14a6 +spi-fixes b341c1176f2e001b3adf0b47154fc31589f7410e +pci-current 05f643d6f7e699198ccc47e634de3879a8ec26a3 +driver-core.current c369299895a591d96745d6492d4888259b004a9e +tty.current c369299895a591d96745d6492d4888259b004a9e +usb.current f50200dd44125e445a6164e88c217472fa79cdbc +usb-serial-fixes 0e01c3416eb863ee7f156a9d7e7421ec0a9f68a0 +phy 7aaa8047eafd0bd628065b15757d9b48c5f9c07d +staging.current f338e77383789c0cae23ca3d48adcc5e9e137e3c +iio-fixes d0b224cf9ab12e86a4d1ca55c760dfaa5c19cbe7 +counter-current 2932095c114b98cbb40ccf34fc00d613cb17cead +char-misc.current 80ffc54d0479c85324d743673c1737ed61b2b05c +soundwire-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +thunderbolt-fixes 73a505dc48144ec72e25874e2b2a72487b02d3bc +input-current 7adaaee5edd35a423ae199c41b86bd1ed60ed483 +crypto-current 62397b493e14107ae82d8b80938f293d95425bcb +libcrypto-fixes e5046823f8fa3677341b541a25af2fcb99a5b1e0 +vfio-fixes e98137f0a874ab36d0946de4707aa48cb7137d1c +kselftest-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +dmaengine-fixes 7aaa8047eafd0bd628065b15757d9b48c5f9c07d +backlight-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +mtd-fixes b9465b04de4b90228de03db9a1e0d56b00814366 +mfd-fixes aa6e63373d91f82628b20f6fae7ffe9b97b568a5 +v4l-dvb-fixes fb2d7bd146fa70d7bd10b6c0bbeff7e3db7c6c57 +reset-fixes a0e0c2f8c5f32b675f58e25a9338283cedb5ad2b +mips-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +at91-fixes 907150bbe566e23714a25d7bcb910f236c3c44c0 +omap-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +kvm-fixes df83746075778958954aa0460cca55f4b3fc9c02 +kvms390-fixes 0a28e06575b3f3b30c1e99fc08fa0907956f35a4 +kvm-arm-fixes 6f9fbd27cd2ee16c528a1c2ae0341f3735c4bcf0 +hwmon-fixes a9d2fbd3ad0e6ac588386e699beeccfe7516755f +nvdimm-fixes a8aec14230322ed8f1e8042b6d656c1631d41163 +cxl-fixes be5c5280cf2b20e363dc8e2a424dd200a29b1c77 +dma-mapping-fixes 3d48c9fd78dd0b1809669ec49c4d0997b8127512 +drivers-x86-fixes fbddf68d7b4e1e6da7a78dd7fbd8ec376536584a +samsung-krzk-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +pinctrl-samsung-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +devicetree-fixes 81122fba08fa3ccafab6ed272a5c6f2203923a7e +dt-krzk-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +scsi-fixes 01f784fc9d0ab2a6dac45ee443620e517cb2a19b +drm-fixes 7aaa8047eafd0bd628065b15757d9b48c5f9c07d +drm-intel-fixes 4dfce79e098915d8e5fc2b9e1d980bc3251dd32c +mmc-fixes 5e3486e64094c28a526543f1e8aa0d5964b7f02d +rtc-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +gnss-fixes f338e77383789c0cae23ca3d48adcc5e9e137e3c +hyperv-fixes 7b3b1e5a87b2f5e35c52b5386d7c327be869454f +risc-v-fixes 5ccc568075c91e042e843c0b6510116ab22f1a52 +riscv-dt-fixes 305f2865bd034146b2eebc77c27fc50d8d79778d +riscv-soc-fixes c7596f9001e2b83293e3658e4e1addde69bb335d +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx ebf1bafd090790704ba54c032de299fccd90a9da +gpio-brgl-fixes 6b5ef8c88854b343b733b574ea8754c9dab61f41 +gpio-intel-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +pinctrl-intel-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +auxdisplay-fixes 7f138de156b20d9f9da6f72f90b63c01941d97d3 +kunit-fixes 8b8f1d5e350acdf972b6b02e225d9e14c600f7ad +memblock-fixes f043a93fff9e3e3e648b6525483f59104b0819fa +renesas-fixes 7e8aec50597bfdea110224ddff4cf8751b97cab0 +perf-current bbeb83d3182abe0d245318e274e8531e5dd7a948 +efi-fixes 217c0a5c177a3d4f7c8497950cbf5c36756e8bbb +battery-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +iommufd-fixes 11439c4635edd669ae435eec308f4ab8a0804808 +rust-fixes 7aaa8047eafd0bd628065b15757d9b48c5f9c07d +w1-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +pmdomain-fixes b826d2c0b0ecb844c84431ba6b502e744f5d919a +i2c-host-fixes 7aaa8047eafd0bd628065b15757d9b48c5f9c07d +i2c-rust-fixes bf074eb6891be799174ff42e0051492681fdc045 +sparc-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +clk-fixes e7a45dec40c7ad963ac4beb67cb763874be54c1b +thead-clk-fixes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +tenstorrent-clk-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +pwrseq-fixes f338e77383789c0cae23ca3d48adcc5e9e137e3c +thead-dt-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +ftrace-fixes 1650a1b6cb1ae6cb99bb4fce21b30ebdf9fc238e +ring-buffer-fixes b042fdf18e89a347177a49e795d8e5184778b5b6 +trace-fixes 250ab25391edeeab8462b68be42e4904506c409c +tracefs-fixes 8b55572e51805184353ee7d587c720a51818fb82 +spacemit-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +tip-fixes 7aaa8047eafd0bd628065b15757d9b48c5f9c07d +slab-fixes 464b1c115852fe025635ae2065e00caced184d92 +drm-msm-fixes e4eb11b34d6c84f398d8f08d7cb4d6c38e739dd2 +uml-fixes df447a3b4a4b961c9979b4b3ffb74317394b9b40 +fwctl-fixes 11439c4635edd669ae435eec308f4ab8a0804808 +devsec-tsm-fixes c3fd16c3b98ed726294feab2f94f876290bf7b61 +drm-rust-fixes f338e77383789c0cae23ca3d48adcc5e9e137e3c +tenstorrent-dt-fixes 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +drm-misc-fixes 2f42c1a6161646cbd29b443459fd635d29eda634 +rust 3a2486cc1da5cf637fe5da4540929d67c4540022 +rust-interop 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b +rust-alloc 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init 09808839c7aa6695ceff5cd822c18b0d9550184d +rust-timekeeping ddb1444d3335129ae87d9796ab1debf41c0ee51b +rust-xarray c455f19bbe6104debd980bb15515faf716bd81b8 +rust-analyzer 5c8d16ac49405c5b77c955684849528f7d4d6b81 +mm-stable bc2e0d3bf965b1ee6c09b104447158725b831d84 +mm-nonmm-stable 929cc1a53a6f5a09e78451ba359e870727751f9e +mm-unstable 57e5b07deacb0a9bd7b8c9b933ff72e902d4f06b +mm-nonmm-unstable 30eae1a5db9fa32d42591958c177bb6c04c21b72 +kbuild dcc99abebfa1e9ca70f8af8695b6682ad7597bf2 +clang-format 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +perf 74e2dbe7be5037a5e5eed6bc1ad562747ac88566 +compiler-attributes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +dma-mapping ed734125ea6c7276aaac6e24b8fff72e51a47b18 +asm-generic adbbd9714f8058730f93c8df5c5bf1679456424b +alpha d58041d2c63e09a1c9083e0e9f4151e487c4e16a +arm b9cbb9e3bed3ffd40201fc28398f5f0a5f9a324a +arm64 aa9c4fb9c24a4007a86cf2ddba2efa093109d8a1 +arm-perf 47f06ebbe8dad695002e5d9a2ab436411f88e985 +arm-soc 7d3d773bd5e2479e05db450c42b3ad7a29ddd825 +amlogic 4685804bb689bbb02d08e5c71eee83a8fcc2d318 +asahi-soc d31647c698f632e0c08080a760e004ba4d71f8dd +at91 c96e60ae720a88b51cbfa06abcfd3e435b0e65ba +bmc cd44dc5ead3042f2873244b0598e39a16dc7b940 +broadcom ddfdca13def5da20b3291d50e087ed08d01b0763 +cix 517d8fc52f3c789afffb5e466334f49965b3886a +davinci 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +drivers-memory 82169065ffb07577075a5088b313d78673ded331 +fsl 0dfcabd743a33a2082c2977f95dda2e8bedd27d7 +imx-mxs 355f5e2f9791ea0dfcffee165efb640d1c08d786 +mediatek e6490a169f6d5f5bdea7a2e8a673890d43afadc0 +mvebu 242b0e86209e7f592e94809692e7a62902a1535c +omap adaad0760ba7c3c09a7671f2a846a66a65104b96 +qcom 54f966f63b379d0c62bb044b7903319776443a4a +renesas 1ba26dfafb4dec62f21a1d85c0da04548209f0c9 +reset ccef9ef0aa2b9a7814e4def6f18b25211b8ae530 +rockchip 2e930174c99bf75c71f898779f3ce777d7db6fd1 +samsung-krzk 909d9996904bf28823210bad2ae7ca910dfe6b16 +scmi dc2403ac2da03e07aad3373638e6d32f5a4ee34a +sophgo 9aa6068586a9b4cd34cf04f8dee72a7283ab4ae4 +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit 2b8bd26bbfcdeb1a06127dcd8f9101080133f2a1 +stm32 515aa8b1188409f527230b93b9ea2a99e170c20a +sunxi 57f5def66c1b4467c549a8bbbecb4f5207689dd5 +tee 68ab55bcc5f514cbde225f8628bbe43e40cdc2f3 +tegra 18a0a635f486217fbccda77f63c44ef732f53773 +tenstorrent-dt 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +thead-dt 74ec3d52c0035b662ec295bef2bbffad68446391 +ti f2f0f3b1eee9882fc3c737ed7598dedf14fa3bc9 +xilinx edacbf64eedd5ccda75dd3b90f7b4a00c2c85165 +socfpga 9d29bcefcdbec4498fe0539e6d8a4e7962d92489 +clk 18023cf0dd64f67c403b85dddaada1e9f8c00482 +clk-imx d16f57caa78776e6e8a88b96cb2597797b376138 +clk-renesas 77894661c00ab99053c9606f0f7ec673065f86ac +thead-clk baf4fc7c03bd0f68c768cfe27829674bd060c6b4 +tenstorrent-clk 23c8ebc952849b3ba47d04d0ec95daf5cc136061 +csky 817d21578d51e801df58ab012654486a71073074 +loongarch 6bcfb7f46d667b04bd1a1169ccedf5fb699c60df +m68k cb39cf99d88e8f2c68a41fb3bb01c4f40a8fcc30 +m68knommu 7aaa8047eafd0bd628065b15757d9b48c5f9c07d +microblaze 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +mips 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +openrisc 0dfffa5479d6260d04d021f69203b1926f73d889 +parisc-hd c369299895a591d96745d6492d4888259b004a9e +powerpc 07791ff060dd3aa270cc03861f2599d81a77b97f +risc-v b335bc5892a0c75dcebee6c9f890c9f15196e4d4 +riscv-dt 4a1739c30fc66a59450c1f78923f94607e786882 +riscv-soc 9a9d7b6a45f5f45ebf0e7c9352101b756956c4d2 +s390 95e95d7257b94527a9dd4b03bc2acf5fb1ee119d +sh 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +sparc d844152d85cfcc7d2ef9430a25882604c12da279 +uml 8aae2da6104ab98799b203c10cb3e0bd719fe02b +xtensa aa5903b47d4bc0e7d1fb76941731cbda32ef9cbc +fs-next e9fd8517d65f72d6b5f53b140a5dfb0ccb777efb +printk 11828908e102a4f9bd668c8938194f96f8047ff1 +pci ff6c76c8f6b57d0609a5db304bc660552ed2b0b2 +pstore bb5278a89dad28bddf3b880e68fa7847960f2fb4 +hid 72b899488862815e1d2ac60fa56162950eecdaa8 +i2c e1ec0c7eb3d6f927bb10f5d525b137d1df1e6969 +i2c-host 8461f5e3887404b19ba073fd1cc92e2f8f73185b +i2c-rust bf074eb6891be799174ff42e0051492681fdc045 +i3c 8ecd876fdaedac3d6459801b7d1d8d9638037b28 +dmi 1afafbaf749d8e8ec53f8e38efdc731131902b5b +hwmon-staging b773f2e6b4726305f1d20f12b898acd69a3783e7 +jc_docs 0a4f3ef9880e505d41817419b0255d6552776143 +v4l-dvb 4fbeef21f5387234111b5d52924e77757626faa5 +v4l-dvb-next adc218676eef25575469234709c2d87185ca223a +pm a06009b0477c2758da727c90893765480c9b6f92 +cpufreq-arm 8655a4e35cda5534f93303af393eac4e71704701 +cpupower 8bbd81ddbe174aa8488db7971fe2717cb636a46c +devfreq c297565666d74673dc0082a0b22bb62974ccfd19 +pmdomain bc330699801d3b4f99110365512caed5adcfaca3 +opp 3d2398f44a2d48fb1c575a6e0bc6b38f3e689e22 +thermal 9124e0e8f3fa39b32feb5cb756de10a265e9d8f0 +rdma 05eec2a60c7909acfbe5b6c5fbb64790d5a3ff1c +net-next cf0d9080c6f795bc6be08babbffa29b62c06e9b0 +bpf-next b6b5e0ebd429d66ce37ae5af649a74ea1f041d92 +ipsec-next be14d13625c9b070c33c423026b598ed65695225 +mlx5-next 26469110c750c8179560637dd813e5d65b8148d2 +netfilter-next e4cf6087cab382c7031e6b436ec55202fa9f2d7b +ipvs-next e4cf6087cab382c7031e6b436ec55202fa9f2d7b +bluetooth 42ee54fcd11e44651484944c052ca6a85904acd4 +wireless-next dbd94b9831bc52a1efb7ff3de841ffc3457428ce +ath-next dbd94b9831bc52a1efb7ff3de841ffc3457428ce +iwlwifi-next 709503c4a2102b32de4b4e64687df86503c74eba +wpan-next 1dd9291eb90378f8096669d9cb33761fd84599e0 +wpan-staging 1dd9291eb90378f8096669d9cb33761fd84599e0 +mtd b800359a4dfacae983cd01f8c3f1cbb6f4c9f816 +nand 3b2a422e23cf1998b85ccbcb90cabff01d17422c +spi-nor 94645aa41bf9ecb87c2ce78b1c3405bfb6074a37 +crypto be0240f65705b0b125de60d4fc952c013ef74e26 +libcrypto 7ac21b4032e5b9b8a6a312b6f1d54f4ba24d1c16 +drm a51973c5dff8a0f01cc7d1b2007306ea0004fa16 +drm-exynos 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc 6fdfd24017756bbe27ccc786051e97f3bf0c3d62 +amdgpu 68178644c35fca972ed970dc84933281b4913bff +drm-intel 4ab789c1b3c81eca56a3b1f7686f3c805add1e49 +drm-msm 6efced27f5df9d7a57e4847fe2898cdd19f72311 +drm-msm-lumag cebf747abeebbde96a43ddd646d14b55a72673a7 +drm-xe df03d7c2bbc91d1e83f8b42881ad791353df7d94 +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +drm-rust 7c50d748b4a635bc39802ea3f6b120e66b1b9067 +drm-nova 93296e9d9528f0d87f2cf3fee494599060a0f14a +fbdev caf6144053b4e1c815aa56afb54745a176f999df +regmap 10ec8c44032962ebeefa2f6d0706be6cbdbc683e +sound 66a6333ba5087b00b7d6cb9ff671f4e2739383b3 +ieee1394 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +sound-asoc 877bf4ed5b372e172dfb52367ebd83e53a00dfde +modules 55722b3f80377103bac6ac748554129108c75651 +input 79df764dbecd5c4bf1b1431b865a361ce7bebb2d +block cdd71b7feb3674d14c5edd9c133242ddf9a363f2 +device-mapper 43fd83c0b1dc127cf13b4c05303665924e63ef94 +libata 78ec06991d2cd564ff45f280e0bb57b369be7587 +pcmcia b3c26ea81ccc522e77ed0b1707add61fc9206216 +mmc 0aa7a5723c96d23a21291b5683ce90a13e2d3046 +mfd d6e0ef44688249009dfa24f1cd619d41637de060 +backlight 797cc011ae02bda26f93d25a4442d7a1a77d84df +battery aa2132799817fb052d95a87f0c23cc6af38541c0 +regulator efcc20ca0ec193fe1477c0772fd486861fcfb948 +security 20091d97d711acdff2f3a449b313307257bf4108 +apparmor 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +integrity 7a60fe48af206d34571e446d685672f5730a6b90 +selinux 8dc51459ef702bcc0ef5fb26bb4d362b38aa56c2 +smack b2faddc13112489f8f11eb40b9456db8c1b58362 +tomoyo c369299895a591d96745d6492d4888259b004a9e +tpmdd d79526b89571ae447c1a5cfd3d627efa07098348 +watchdog 450517fa5aae98b857c68743fd12ce93e4b8989d +iommu 23f3682fd3605da81b90738ad3d2a30f18c46e98 +audit 360160f75592bdc85edba8fe78fb20d90924c7e8 +devicetree 908c80894f4aca7fbd66d8f7ebc8648ec6d8a340 +dt-krzk 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +mailbox 220045247712ddfda1fcedfa61e91dae24e63bcf +spi 03f4aab0953e4f4bf571a392c978bd36daaa4b44 +tip 6e45429392a5cdd8168619d7558f7bd6cf706394 +clockevents a83f9c04be4e807d1c3961eec3fe3310c60ed9aa +edac 10d9f973f8d368e0499114226b40954a17a0bae2 +ftrace b93640faeaf2fcadc66a6ccfd01897403047f6f3 +rcu ed062c41dfda2de8d1712c91e089303dae013bb7 +paulmck 48f7a50c027dd2abb9e7b8a6ecc8e531d87f2c21 +kvm 24f9515de8778410e4b84c85b196c9850d2c1e18 +kvm-arm 5ad2ff071b5980f072a85c8114649218971c586e +kvms390 e3372ffb5f9e2dda3da259b768aab6271672b90d +kvm-ppc f338e77383789c0cae23ca3d48adcc5e9e137e3c +kvm-riscv c61ec3e8cc5d46fa269434a9ec16ca36d362e0dd +kvm-x86 3d6cdcc8883b5726513d245eef0e91cabfc397f7 +xen-tip cd7e1fef5a1ca1c4fcd232211962ac2395601636 +percpu 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +workqueues 0842bc976fd5ecafd9d055023639e06ec27c73cc +sched-ext 92c41a7c6e17fa643928af99989a39257a083644 +drivers-x86 fab7c51693e95aa874d6d9db22bfae7bd0b23c66 +chrome-platform 168e4b208ca8c2e04de20cc6cb7e2fb035dc1ec8 +chrome-platform-firmware 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +hsi 59b026da003831babb77d5155e82342bce226079 +leds-lj b727ba2560a8a806680b45c9acc5a49bc39b8e43 +ipmi 122d16da1313f1746a4cdd31a620bbb141be7060 +driver-core a1fa010b3c9f0adae252986ddb54a449df45f700 +usb 84db3719d27337b952fe382413d341fb95351130 +thunderbolt c3e7cc8bc5ca08b2fae3d43c7c86f140daa873ef +usb-serial 5a6a33b56402167ef019fd2520728e8c25614f74 +tty 6872c84dc6f5d18e02ebc34b257f4152895e236c +char-misc a8a37957f2bc4e4af250390c57de6c8371cb5edd +coresight ada4280812a7a40455a842b1de24f8450e04254e +fastrpc 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +fpga f63ddbcc3299047e7026b9324520aa826794f0c5 +icc 7a73b226c990d222773227709ba95af29a51b2a8 +iio d2a4ec19d2a2e54c23b5180e939994d3da4a6b91 +phy-next caf08514bbee0736c31d8d4f406e3415cdf726bb +soundwire b8f2d65fec19f3866905ac6ae3deb5c0c9faf162 +extcon 1bf0ba46d9d2c784120fd9cb235c08add3a6e7be +gnss f338e77383789c0cae23ca3d48adcc5e9e137e3c +vfio 2241228a5492b0c9a1870c59d3887d3a96c735c6 +w1 f2c1ae05fe82030537b36012551a5cac28d00254 +spmi 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +staging 82e1c68ac206efe42854296c462aa83f541ea22c +counter-next cbf8db23fc58db8d516ebc7aa57c4563f36532b9 +mux 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +dmaengine b7560798466a07d9c3fb011698e92c335ab28baf +cgroup 6ffdb01db6d5d785e7278c6d98fd4ef8598b0fc5 +scsi 604f9c5150f6317a3983ee3914758e4a4d677348 +scsi-mkp 2dfb80cc3580dc02be83246bcd5446e6f3a231b9 +vhost ebcff9dacaf2c1418f8bc927388186d7d3674603 +rpmsg 9e71a1ffc54e2c3963194f75aa93a1dd63922779 +gpio-brgl 802c51a83e9a0617d1e97ecd383471f4c6fd5437 +gpio-intel 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +pinctrl 58a64a4b05e1ea555490a93ee1b2cb27657e546e +pinctrl-intel 1ca468e78ea97c3365befdd408f71bda4b295134 +pinctrl-renesas 3f92867ce3ee2a274ebb7e7d5de7f6ee85da21f6 +pinctrl-samsung 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +pwm aa8f35172ab66c57d4355a8c4e28d05b44c938e3 +ktest 229517449879b3ca8ca5588593cbea6a67ba0ad2 +kselftest 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +kunit 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +kunit-next fa2c3ed5f079d41db0433a8dc829b9f6fb408aaf +livepatching 712c0756828becbfc629ff8d8b82deff5d1115e4 +rtc 5ff89ef425d17a43b1a48173482f8bfe2ce4fcd1 +nvdimm a9ba6733c7f1096c4506bf4e34a546e07242df74 +at24 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +ntb 7b3302c687cae50d9506c77ad9d40f8c242e9c79 +seccomp 7d0a66e4bb9081d75c82ec4957c50034cb0ea449 +slimbus 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +nvmem 8d48419d141cb39679a3a01782db3241660704a5 +hyperv e733a9e281805f0d066b4ade092dff44baf1ec09 +auxdisplay 7f138de156b20d9f9da6f72f90b63c01941d97d3 +kgdb fdbdd0ccb30af18d3b29e714ac8d5ab6163279e0 +hmm 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +cfi 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +mhi f2d1643ddc0f3d0b847a6877ec37f1fabacfbfed +memblock c7fc9cde41be029cf6675befbafcbb2dab40b39b +cxl a792fe15f1cb9935e966cf3262103d4b6f263fb9 +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi 56e2ef8f5f9161d08d45656d373da83d4a789be1 +unicode bcfee135d584714c2130031c7e28aafa91057b9a +slab dbc785fb4d9cfa0115e69e614fe20b4ab90f8366 +random bb9ff576fdff48c242876f55098a3ee20a29df5d +landlock a8a64ed1dd5384aed6fd75f7d6497a434912ef91 +sysctl f63a9df7e3f9f842945d292a19d9938924f066f9 +execve 4ced4cf5c9d172d91f181df3accdf949d3761aab +bitmap 95d324fb1b48434f4c659e4c245c3bdeecdff22c +hte 92dfd92f747698352b256cd9ddd7497bb7ebe9c8 +kspp 0cc96f105d77ea4e62043ec1e32dc1937e9d7113 +nolibc 6285f0881ec68034399d13552f7243e69e6e37bf +iommufd 67cb50aee082842077a8404337dc21b7d03829d7 +turbostat a23c1298f1593a42dfc78bbbbd1ecc3aabee5c26 +pwrseq 6de23f81a5e08be8fbf5e8d7e9febc72a5b5f27f +capabilities-next 071588136007482d70fd2667b827036bc60b1f8f +ipe f37070985ed913f2d73bf3368676b5f2f96e4c54 +kcsan dcb6fa37fd7bc9c3d2b066329b0d27dedf8becaa +crc 63432fd625372a0e79fb00a4009af204f4edc013 +keys-next 965e9a2cf23b066d8bdeb690dff9cd7089c5f667 +fwctl f2cfe848d5618f49c314cc76da776c9d94ed9df6 +devsec-tsm 43185067c6fd55b548ecb648a69d9569fcf622b5 +hisilicon b419e155e31d9e23c1aa29a37182889955189382 +kthread fa39ec4f89f2637ed1cdbcde3656825951787668 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..5904ab60d252 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,415 @@ +Trees included into this release: + +Name Url +---- --- +origin https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +ext4-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#fixes +vfs-brauner-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.fixes +fscrypt-current https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +btrfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +erofs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +nfsd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +v9fs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +overlayfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes +fscrypt https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +btrfs https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph https://github.com/ceph/ceph-client.git#master +cifs git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git#configfs-next +ecryptfs https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +dlm https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +erofs https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs https://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git#ntfs-next +ntfs3 https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git#for-next +overlayfs https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next +ubifs https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs https://github.com/martinetd/linux#9p-next +v9fs-ericvh https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +vfs-brauner https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +mm-hotfixes https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-fixes-for-next +arc-current https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#fixes +arm64-fixes https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +sophgo-fixes https://github.com/sophgo/linux.git#fixes +sophgo-soc-fixes https://github.com/sophgo/linux.git#soc-fixes +m68k-current https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +net https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/#master +ipsec https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +ath https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-current +iwlwifi https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#fixes +wpan https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-linus +tty.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +libcrypto-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-fixes +vfio-fixes https://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +dmaengine-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git://linuxtv.org/media-ci/media-pending.git#fixes +reset-fixes https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#fixes +kvm-fixes git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +kvm-arm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#fixes +hwmon-fixes https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +dma-mapping-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-fixes +drivers-x86-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes +drm-intel-fixes https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next-fixes +mmc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +risc-v-fixes https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +auxdisplay-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +kunit-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +memblock-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +renesas-fixes https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git#perf-tools +efi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +battery-fixes https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +iommufd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes https://github.com/Rust-for-Linux/linux.git#rust-fixes +w1-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +i2c-host-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-fixes +i2c-rust-fixes https://github.com/ikrtn/rust-for-linux#rust-i2c-fixes +sparc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus +clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-fixes +thead-clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-fixes +tenstorrent-clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-clk-fixes +pwrseq-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current +thead-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-fixes +ftrace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ftrace/fixes +ring-buffer-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ring-buffer/fixes +trace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#trace/fixes +tracefs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#tracefs/fixes +spacemit-fixes https://github.com/spacemit-com/linux#fixes +tip-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#tip/urgent +slab-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next-fixes +drm-msm-fixes https://gitlab.freedesktop.org/drm/msm.git#msm-fixes +uml-fixes https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +fwctl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-rc +devsec-tsm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#fixes +drm-rust-fixes https://gitlab.freedesktop.org/drm/rust/kernel.git#drm-rust-fixes +tenstorrent-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-dt-fixes +drm-misc-fixes https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes +rust https://github.com/Rust-for-Linux/linux.git#rust-next +rust-interop https://github.com/Rust-for-Linux/linux.git#interop-next +rust-alloc https://github.com/Rust-for-Linux/linux.git#alloc-next +rust-io https://github.com/Rust-for-Linux/linux.git#io-next +rust-pin-init https://github.com/Rust-for-Linux/linux.git#pin-init-next +rust-timekeeping https://github.com/Rust-for-Linux/linux.git#timekeeping-next +rust-xarray https://github.com/Rust-for-Linux/linux.git#xarray-next +rust-analyzer https://github.com/Rust-for-Linux/linux.git#rust-analyzer-next +mm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-unstable +mm-nonmm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-unstable +kbuild https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-for-next +clang-format https://github.com/ojeda/linux.git#clang-format +perf https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-for-next +asm-generic https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#master +alpha https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git#alpha-next +arm https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#for-next +arm64 https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +at91 https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +bmc https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git#for-next +broadcom https://github.com/Broadcom/stblinux.git#next +cix https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git#for-next +davinci https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +fsl https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git#soc_fsl +imx-mxs https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git#for-next +mediatek https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next +mvebu https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#for-next +qcom https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset https://git.pengutronix.de/git/pza/linux#reset/next +rockchip https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sophgo https://github.com/sophgo/linux.git#for-next +sophgo-soc https://github.com/sophgo/linux.git#soc-for-next +spacemit https://github.com/spacemit-com/linux#for-next +stm32 https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git#next +tegra https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +tenstorrent-dt https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-dt-for-next +thead-dt https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-for-next +ti https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx https://github.com/Xilinx/linux-xlnx.git#for-next +socfpga https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git#for-next +clk https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +thead-clk https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-for-next +tenstorrent-clk https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-clk-for-next +csky https://github.com/c-sky/csky-linux.git#linux-next +loongarch https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git://git.monstr.eu/linux-2.6-microblaze.git#next +mips https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc https://github.com/openrisc/linux.git#for-next +parisc-hd https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +risc-v https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +sparc https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-next +uml https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa https://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +printk https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i2c-host https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host +i2c-rust https://github.com/ikrtn/rust-for-linux#rust-i2c-next +i3c https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git://git.lwn.net/linux.git#docs-next +v4l-dvb git://linuxtv.org/media-ci/media-pending.git#next +v4l-dvb-next git://linuxtv.org/mchehab/media-next.git#master +pm https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +pmdomain https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +opp https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +rdma https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +ath-next https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-next +iwlwifi-next https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#next +wpan-next https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +libcrypto https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-next +drm https://gitlab.freedesktop.org/drm/kernel.git#drm-next +drm-exynos https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next +amdgpu https://gitlab.freedesktop.org/agd5f/linux.git#drm-next +drm-intel https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next +drm-msm https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +drm-xe https://gitlab.freedesktop.org/drm/xe/kernel.git#drm-xe-next +etnaviv https://git.pengutronix.de/git/lst/linux#etnaviv/next +drm-rust https://gitlab.freedesktop.org/drm/rust/kernel.git#drm-rust-next +drm-nova https://gitlab.freedesktop.org/drm/nova.git#nova-next +fbdev https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git#modules-next +input https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git#for-next +device-mapper https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#for-next +pcmcia https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +selinux https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack https://github.com/cschaufler/smack-next#next +tomoyo git://git.code.sf.net/p/tomoyo/tomoyo.git#master +tpmdd https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git#next +audit https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#for-next +spi https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git#timers/drivers/next +edac https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +ftrace https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux#next +paulmck https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#non-rcu/next +kvm git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-ppc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +kvm-riscv https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 https://github.com/kvm-x86/linux.git#next +xen-tip https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sched-ext https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git#for-next +drivers-x86 https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +chrome-platform-firmware https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next +hsi https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds-lj https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi https://github.com/cminyard/linux-ipmi.git#for-next +driver-core https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-next +usb https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +coresight https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio https://github.com/awilliam/linux-vfio.git#next +w1 https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +spmi https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-next +staging https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux https://gitlab.com/peda-linux/mux.git#for-next +dmaengine https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio-brgl https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#pwm/for-next +ktest https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git#for-next +rtc https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb https://github.com/jonmason/ntb.git#ntb-next +seccomp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +slimbus https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +hyperv https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#for-next +kgdb https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd https://github.com/terrelln/linux.git#zstd-next +efi https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next +random https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +sysctl https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git#sysctl-next +execve https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap https://github.com/norov/linux.git#bitmap-for-next +hte https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +nolibc https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git#for-next +iommufd https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +turbostat https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +pwrseq https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next +capabilities-next https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git#caps-next +ipe https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git#next +kcsan https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git#next +crc https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#crc-next +keys-next https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +fwctl https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-next +devsec-tsm https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#next +hisilicon https://github.com/hisilicon/linux-hisi.git#for-next +kthread https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#for-next diff --git a/Next/kselftest-targets b/Next/kselftest-targets new file mode 100644 index 000000000000..932bb653513e --- /dev/null +++ b/Next/kselftest-targets @@ -0,0 +1,109 @@ +acct +amd-pstate +breakpoints +cachestat +cgroup +clone3 +connector +core +coredump +cpufreq +cpu-hotplug +damon +devices/error_logs +devices/probe +dmabuf-heaps +drivers/dma-buf +drivers/net/bonding +drivers/net/team +drivers/net/virtio_net +dt +efivarfs +exec +filelock +filesystems +filesystems/binderfs +filesystems/epoll +filesystems/fat +filesystems/mount-notify +filesystems/overlayfs +filesystems/statmount +firmware +fpu +ftrace +futex +gpio +intel_pstate +iommu +ipc +ir +kcmp +kmod +kselftest_harness +kvm +landlock +lib +livepatch +lkdtm +locking +lsm +media_tests +membarrier +memory-hotplug +mincore +module +mount +mount_setattr +move_mount_set_group +mseal_system_mappings +namespaces +nci +net/can +net/forwarding +net/hsr +net/openvswitch +net/packetdrill +net/tcp_ao +pcie_bwctrl +pci_endpoint +perf_events +pidfd +pid_namespace +powerpc +power_supply +proc +pstore +ptp +ptrace +resctrl +ring-buffer +riscv +rlimits +rseq +rtc +rust +safesetid +sched +seccomp +sgx +signal +size +sparc64 +splice +static_keys +sync +syscall_user_dispatch +sysctl +tc-testing +tdx +timens +timers +tmpfs +tpm2 +tty +user_events +vDSO +verification +watchdog +x86 +zram diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..23beca5bf829 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,14821 @@ +$ date -R +Mon, 30 Mar 2026 12:45:44 +0100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 62% (5537/8911)
Updating files: 63% (5614/8911)
Updating files: 64% (5704/8911)
Updating files: 65% (5793/8911)
Updating files: 66% (5882/8911)
Updating files: 67% (5971/8911)
Updating files: 68% (6060/8911)
Updating files: 69% (6149/8911)
Updating files: 70% (6238/8911)
Updating files: 71% (6327/8911)
Updating files: 72% (6416/8911)
Updating files: 73% (6506/8911)
Updating files: 74% (6595/8911)
Updating files: 75% (6684/8911)
Updating files: 76% (6773/8911)
Updating files: 77% (6862/8911)
Updating files: 78% (6951/8911)
Updating files: 79% (7040/8911)
Updating files: 80% (7129/8911)
Updating files: 81% (7218/8911)
Updating files: 82% (7308/8911)
Updating files: 83% (7397/8911)
Updating files: 84% (7486/8911)
Updating files: 85% (7575/8911)
Updating files: 86% (7664/8911)
Updating files: 87% (7753/8911)
Updating files: 88% (7842/8911)
Updating files: 89% (7931/8911)
Updating files: 90% (8020/8911)
Updating files: 91% (8110/8911)
Updating files: 92% (8199/8911)
Updating files: 93% (8288/8911)
Updating files: 94% (8377/8911)
Updating files: 95% (8466/8911)
Updating files: 96% (8555/8911)
Updating files: 97% (8644/8911)
Updating files: 98% (8733/8911)
Updating files: 99% (8822/8911)
Updating files: 100% (8911/8911)
Updating files: 100% (8911/8911), done. +HEAD is now at 46b513250491a Merge tag 'v7.0-rc5-smb3-client-fix' of git://git.samba.org/sfrench/cifs-2.6 +Merging origin/master (7aaa8047eafd0 Linux 7.0-rc6) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 46b513250491a..7aaa8047eafd0 +Fast-forward (no commit created; -m option ignored) + .mailmap | 1 + + Documentation/PCI/pcieaer-howto.rst | 10 ++ + .../devicetree/bindings/sound/rockchip-spdif.yaml | 1 + + .../devicetree/bindings/sound/st,stm32-sai.yaml | 2 +- + Documentation/filesystems/overlayfs.rst | 50 ++++++ + Documentation/hwmon/adm1177.rst | 8 +- + Documentation/hwmon/peci-cputemp.rst | 10 +- + MAINTAINERS | 21 ++- + Makefile | 2 +- + arch/loongarch/include/asm/linkage.h | 36 ++++ + arch/loongarch/include/asm/sigframe.h | 9 + + arch/loongarch/kernel/asm-offsets.c | 2 + + arch/loongarch/kernel/env.c | 7 +- + arch/loongarch/kernel/signal.c | 6 +- + arch/loongarch/kvm/intc/eiointc.c | 16 +- + arch/loongarch/kvm/vcpu.c | 3 + + arch/loongarch/pci/pci.c | 80 +++++++++ + arch/loongarch/vdso/Makefile | 4 +- + arch/loongarch/vdso/sigreturn.S | 6 +- + arch/s390/include/asm/barrier.h | 4 +- + arch/s390/kernel/entry.S | 3 + + arch/s390/kernel/syscall.c | 5 +- + arch/s390/kvm/dat.c | 100 ++--------- + arch/s390/kvm/dat.h | 23 +-- + arch/s390/kvm/gaccess.c | 71 +++++--- + arch/s390/kvm/gmap.c | 160 ++++++++++++----- + arch/s390/kvm/gmap.h | 33 ++-- + arch/s390/kvm/kvm-s390.c | 18 +- + arch/s390/kvm/vsie.c | 4 +- + arch/x86/coco/sev/noinstr.c | 6 + + arch/x86/entry/entry_fred.c | 14 ++ + arch/x86/kernel/cpu/common.c | 33 +++- + arch/x86/kvm/mmu/mmu.c | 17 +- + arch/x86/platform/efi/quirks.c | 2 +- + drivers/accel/ivpu/ivpu_drv.h | 1 + + drivers/accel/ivpu/ivpu_hw.c | 6 +- + drivers/base/regmap/regmap.c | 30 +++- + drivers/dma/dw-edma/dw-edma-core.c | 8 +- + drivers/dma/dw-edma/dw-hdma-v0-core.c | 6 +- + drivers/dma/fsl-edma-main.c | 26 ++- + drivers/dma/idxd/cdev.c | 8 +- + drivers/dma/idxd/device.c | 45 +++-- + drivers/dma/idxd/dma.c | 18 ++ + drivers/dma/idxd/idxd.h | 1 + + drivers/dma/idxd/init.c | 14 +- + drivers/dma/idxd/irq.c | 16 ++ + drivers/dma/idxd/submit.c | 2 +- + drivers/dma/idxd/sysfs.c | 1 + + drivers/dma/sh/rz-dmac.c | 68 ++++---- + drivers/dma/xilinx/xdma.c | 4 +- + drivers/dma/xilinx/xilinx_dma.c | 46 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 45 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +- + .../display/dc/resource/dce100/dce100_resource.c | 6 +- + .../display/dc/resource/dce110/dce110_resource.c | 5 +- + .../display/dc/resource/dce112/dce112_resource.c | 5 +- + .../display/dc/resource/dce120/dce120_resource.c | 5 +- + .../amd/display/dc/resource/dce60/dce60_resource.c | 14 +- + .../amd/display/dc/resource/dce80/dce80_resource.c | 6 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 33 +++- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 21 ++- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 33 +++- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 33 +++- + drivers/gpu/drm/drm_gem_shmem_helper.c | 48 +++--- + drivers/gpu/drm/drm_syncobj.c | 4 +- + drivers/gpu/drm/i915/display/intel_display.c | 8 +- + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 20 ++- + drivers/gpu/drm/i915/display/intel_dp_tunnel.h | 11 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 4 +- + drivers/gpu/drm/i915/display/intel_plane.c | 11 +- + drivers/gpu/drm/i915/i915_wait_util.h | 2 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 9 +- + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 1 + + drivers/gpu/drm/xe/xe_pt.c | 12 +- + drivers/gpu/drm/xe/xe_sriov_packet.c | 2 + + drivers/gpu/drm/xe/xe_vm.c | 22 ++- + drivers/gpu/drm/xe/xe_vm_types.h | 4 + + drivers/gpu/drm/xe/xe_wa.c | 3 +- + drivers/hwmon/adm1177.c | 54 +++--- + drivers/hwmon/peci/cputemp.c | 4 +- + drivers/hwmon/pmbus/ina233.c | 3 +- + drivers/hwmon/pmbus/isl68137.c | 21 ++- + drivers/hwmon/pmbus/pmbus_core.c | 192 +++++++++++++++++---- + drivers/i2c/busses/i2c-designware-amdisp.c | 11 +- + drivers/i2c/busses/i2c-imx.c | 51 ++++-- + drivers/infiniband/core/rw.c | 43 +++-- + drivers/infiniband/hw/bng_re/bng_dev.c | 14 +- + drivers/infiniband/hw/efa/efa_com.c | 88 +++++----- + drivers/infiniband/hw/ionic/ionic_controlpath.c | 4 +- + drivers/infiniband/hw/irdma/cm.c | 29 ++-- + drivers/infiniband/hw/irdma/uk.c | 39 +++-- + drivers/infiniband/hw/irdma/utils.c | 2 - + drivers/infiniband/hw/irdma/verbs.c | 10 +- + drivers/irqchip/irq-qcom-mpm.c | 3 + + drivers/irqchip/irq-renesas-rzv2h.c | 2 +- + drivers/media/i2c/ccs/ccs-core.c | 2 - + drivers/media/usb/uvc/uvc_video.c | 9 +- + drivers/pci/pwrctrl/core.c | 4 +- + drivers/pci/pwrctrl/pci-pwrctrl-pwrseq.c | 12 -- + drivers/pci/pwrctrl/slot.c | 1 - + drivers/phy/Kconfig | 5 +- + drivers/phy/freescale/phy-fsl-lynx-28g.c | 2 + + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 3 +- + drivers/phy/spacemit/phy-k1-usb2.c | 14 ++ + drivers/phy/ti/phy-j721e-wiz.c | 2 + + drivers/scsi/ibmvscsi/ibmvfc.c | 3 +- + drivers/scsi/scsi_transport_sas.c | 2 +- + drivers/scsi/ses.c | 2 +- + drivers/spi/spi-fsl-lpspi.c | 3 +- + drivers/spi/spi-meson-spicc.c | 2 - + drivers/spi/spi-sn-f-ospi.c | 42 ++--- + drivers/spi/spi.c | 32 ++-- + drivers/target/loopback/tcm_loop.c | 52 +++++- + drivers/target/target_core_file.c | 2 +- + drivers/vfio/pci/vfio_pci_dmabuf.c | 5 +- + drivers/virt/coco/tdx-guest/tdx-guest.c | 12 +- + drivers/xen/privcmd.c | 3 + + fs/btrfs/block-group.c | 2 +- + fs/btrfs/disk-io.c | 4 +- + fs/btrfs/tree-log.c | 98 +++++++---- + fs/btrfs/volumes.c | 5 +- + fs/btrfs/zlib.c | 4 +- + fs/ext4/Makefile | 5 +- + fs/ext4/crypto.c | 9 +- + fs/ext4/ext4.h | 6 + + fs/ext4/ext4_extents.h | 12 ++ + fs/ext4/extents-test.c | 12 +- + fs/ext4/extents.c | 80 +++++++-- + fs/ext4/fast_commit.c | 17 +- + fs/ext4/fsync.c | 16 +- + fs/ext4/ialloc.c | 6 + + fs/ext4/inline.c | 10 +- + fs/ext4/inode.c | 75 ++++++-- + fs/ext4/mballoc-test.c | 81 ++++----- + fs/ext4/mballoc.c | 132 ++++++++++++-- + fs/ext4/mballoc.h | 30 ++++ + fs/ext4/page-io.c | 10 +- + fs/ext4/super.c | 37 +++- + fs/ext4/sysfs.c | 10 +- + fs/fs-writeback.c | 36 +++- + fs/fuse/file.c | 4 +- + fs/fuse/inode.c | 1 + + fs/iomap/bio.c | 51 +++++- + fs/iomap/buffered-io.c | 15 +- + fs/jbd2/checkpoint.c | 15 +- + fs/namei.c | 10 +- + fs/netfs/buffered_read.c | 3 +- + fs/netfs/direct_read.c | 3 +- + fs/netfs/direct_write.c | 15 +- + fs/netfs/iterator.c | 43 +++++ + fs/netfs/read_collect.c | 4 +- + fs/netfs/read_retry.c | 5 +- + fs/netfs/read_single.c | 1 - + fs/netfs/write_collect.c | 4 +- + fs/netfs/write_issue.c | 3 +- + fs/overlayfs/copy_up.c | 6 +- + fs/overlayfs/overlayfs.h | 21 +++ + fs/overlayfs/ovl_entry.h | 7 +- + fs/overlayfs/params.c | 33 +++- + fs/overlayfs/super.c | 2 +- + fs/overlayfs/util.c | 5 +- + fs/smb/server/oplock.c | 72 +++++--- + fs/smb/server/smb2pdu.c | 73 +++++--- + fs/xfs/libxfs/xfs_attr.h | 3 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 22 +++ + fs/xfs/libxfs/xfs_attr_leaf.h | 3 + + fs/xfs/libxfs/xfs_da_btree.c | 53 ++++-- + fs/xfs/libxfs/xfs_da_btree.h | 2 + + fs/xfs/scrub/quota.c | 4 +- + fs/xfs/scrub/trace.h | 12 +- + fs/xfs/xfs_attr_inactive.c | 99 ++++++----- + fs/xfs/xfs_attr_item.c | 51 +----- + fs/xfs/xfs_dquot_item.c | 9 +- + fs/xfs/xfs_handle.c | 2 +- + fs/xfs/xfs_inode.c | 3 +- + fs/xfs/xfs_inode_item.c | 9 +- + fs/xfs/xfs_mount.c | 7 +- + fs/xfs/xfs_trace.h | 47 +++-- + fs/xfs/xfs_trans_ail.c | 127 ++++++++------ + fs/xfs/xfs_verify_media.c | 18 +- + fs/xfs/xfs_xattr.c | 2 +- + include/linux/fs/super_types.h | 1 + + include/linux/leafops.h | 32 ++-- + include/linux/mempolicy.h | 1 + + include/linux/netfs.h | 1 - + include/linux/pagemap.h | 11 -- + include/linux/spi/spi.h | 5 - + include/sound/sdca_function.h | 5 - + include/trace/events/btrfs.h | 11 +- + include/trace/events/netfs.h | 8 +- + io_uring/fdinfo.c | 4 +- + kernel/futex/core.c | 2 +- + kernel/futex/pi.c | 3 +- + kernel/futex/syscalls.c | 8 + + kernel/sysctl.c | 2 +- + kernel/time/alarmtimer.c | 2 +- + kernel/trace/trace_events_trigger.c | 85 +++++++-- + kernel/trace/trace_osnoise.c | 10 +- + lib/bug.c | 7 +- + mm/damon/sysfs.c | 10 +- + mm/memory.c | 18 +- + mm/mempolicy.c | 10 +- + mm/mseal.c | 3 +- + mm/pagewalk.c | 25 ++- + mm/swap_state.c | 9 +- + rust/kernel/regulator.rs | 33 ++-- + sound/firewire/amdtp-stream.c | 2 +- + sound/hda/codecs/realtek/alc269.c | 66 ++++++- + sound/hda/controllers/intel.c | 1 - + sound/pci/asihpi/hpimsgx.c | 6 +- + sound/soc/amd/acp-config.c | 15 +- + sound/soc/amd/acp/acp-sdw-legacy-mach.c | 8 + + sound/soc/amd/acp/amd-acp70-acpi-match.c | 61 +++++++ + sound/soc/amd/yc/acp6x-mach.c | 14 ++ + sound/soc/codecs/adau1372.c | 34 ++-- + sound/soc/codecs/sma1307.c | 6 +- + sound/soc/codecs/tas2781-fmwlib.c | 3 + + sound/soc/codecs/wcd934x.c | 2 +- + sound/soc/fsl/imx-card.c | 2 + + sound/soc/generic/simple-card-utils.c | 4 +- + sound/soc/intel/catpt/device.c | 10 +- + sound/soc/intel/catpt/dsp.c | 3 - + sound/soc/sdca/sdca_functions.c | 14 +- + sound/soc/sof/ipc4-topology.c | 2 +- + sound/soc/sof/topology.c | 2 +- + sound/usb/Kconfig | 1 + + sound/usb/qcom/qc_audio_offload.c | 2 +- + sound/usb/quirks.c | 4 + + .../selftests/mount_setattr/mount_setattr_test.c | 2 +- + 236 files changed, 3076 insertions(+), 1324 deletions(-) + create mode 100644 arch/loongarch/include/asm/sigframe.h +Merging ext4-fixes/fixes (d250bdf531d9c ext4: fix iloc.bh leak in ext4_xattr_inode_update_ref) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes +Already up to date. +Merging vfs-brauner-fixes/vfs.fixes (0e764b9d46071 netfs: Fix the handling of stream->front by removing it) +$ git merge -m Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Already up to date. +Merging fscrypt-current/for-current (1f318b96cc84d Linux 7.0-rc3) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (1f318b96cc84d Linux 7.0-rc3) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging btrfs-fixes/next-fixes (13dca98de903f Merge branch 'misc-7.0' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (49c5d168a3a8f udf: fix nls leak on udf_fill_super() failure) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging fs/udf/super.c +Merge made by the 'ort' strategy. + fs/udf/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging erofs-fixes/fixes (2f0407ed923b7 erofs: fix .fadvise() for page cache sharing) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (5133b61aaf437 nfsd: fix heap overflow in NFSv4.0 LOCK replay cache) +$ git merge -m Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (2014c95afecee Linux 6.14-rc1) +$ git merge -m Merge branch 'fixes/next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging overlayfs-fixes/ovl-fixes (1f6ee9be92f8d ovl: make fsync after metadata copy-up opt-in mount option) +$ git merge -m Merge branch 'ovl-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging fscrypt/for-next (1546d3feb5e53 fscrypt: use AES library for v1 key derivation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/page-io.c +Merge made by the 'ort' strategy. + fs/buffer.c | 18 +++++++++- + fs/crypto/Kconfig | 2 +- + fs/crypto/bio.c | 38 +++++++++----------- + fs/crypto/fscrypt_private.h | 3 -- + fs/crypto/inline_crypt.c | 86 +++++--------------------------------------- + fs/crypto/keysetup.c | 2 -- + fs/crypto/keysetup_v1.c | 87 +++++++++++++++------------------------------ + fs/ext4/inode.c | 5 ++- + fs/ext4/page-io.c | 28 +++++++++++---- + fs/ext4/readpage.c | 10 +++--- + fs/f2fs/data.c | 7 ++-- + fs/f2fs/file.c | 4 ++- + fs/iomap/direct-io.c | 6 ++-- + include/linux/fscrypt.h | 37 +++++-------------- + 14 files changed, 120 insertions(+), 213 deletions(-) +Merging btrfs/for-next (a60530451d0f7 Merge branch 'for-next-next-v7.0-20260323' into for-next-20260323) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/block-group.c +Auto-merging fs/btrfs/disk-io.c +CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c +Auto-merging fs/btrfs/tree-log.c +CONFLICT (content): Merge conflict in fs/btrfs/tree-log.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/zlib.c +Auto-merging include/trace/events/btrfs.h +Resolved 'fs/btrfs/disk-io.c' using previous resolution. +Resolved 'fs/btrfs/tree-log.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next e753760fb08b5] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/Kconfig | 1 + + fs/btrfs/Makefile | 4 + + fs/btrfs/backref.c | 10 - + fs/btrfs/block-group.c | 327 ++++++++++--------- + fs/btrfs/block-group.h | 1 + + fs/btrfs/block-rsv.c | 25 ++ + fs/btrfs/compression.c | 4 +- + fs/btrfs/compression.h | 6 +- + fs/btrfs/ctree.c | 36 ++- + fs/btrfs/delayed-inode.c | 3 +- + fs/btrfs/delayed-ref.c | 28 ++ + fs/btrfs/dev-replace.c | 4 +- + fs/btrfs/dir-item.c | 4 +- + fs/btrfs/direct-io.c | 11 +- + fs/btrfs/disk-io.c | 227 ++++++-------- + fs/btrfs/disk-io.h | 7 +- + fs/btrfs/extent-io-tree.c | 184 ++++++++--- + fs/btrfs/extent-tree.c | 119 ++++--- + fs/btrfs/extent_io.c | 161 ++++++---- + fs/btrfs/extent_io.h | 31 +- + fs/btrfs/file-item.c | 6 +- + fs/btrfs/file-item.h | 6 +- + fs/btrfs/file.c | 4 +- + fs/btrfs/fs.h | 9 +- + fs/btrfs/inode.c | 298 +++++++++--------- + fs/btrfs/ioctl.c | 4 +- + fs/btrfs/lzo.c | 7 +- + fs/btrfs/messages.h | 8 +- + fs/btrfs/misc.h | 18 +- + fs/btrfs/ordered-data.c | 67 ++-- + fs/btrfs/ordered-data.h | 66 ++-- + fs/btrfs/print-tree.c | 4 - + fs/btrfs/qgroup.c | 42 ++- + fs/btrfs/qgroup.h | 42 +-- + fs/btrfs/raid-stripe-tree.c | 2 +- + fs/btrfs/raid56.c | 17 +- + fs/btrfs/reflink.c | 4 +- + fs/btrfs/relocation.c | 12 +- + fs/btrfs/scrub.c | 22 +- + fs/btrfs/send.c | 6 +- + fs/btrfs/space-info.c | 63 ++-- + fs/btrfs/space-info.h | 22 +- + fs/btrfs/super.h | 2 +- + fs/btrfs/tests/btrfs-tests.c | 3 + + fs/btrfs/tests/btrfs-tests.h | 10 + + fs/btrfs/tests/zoned-tests.c | 675 ++++++++++++++++++++++++++++++++++++++++ + fs/btrfs/transaction.c | 78 +++-- + fs/btrfs/transaction.h | 3 + + fs/btrfs/tree-checker.c | 122 ++++++++ + fs/btrfs/tree-log.c | 66 ++-- + fs/btrfs/tree-mod-log.c | 8 +- + fs/btrfs/uuid-tree.c | 7 +- + fs/btrfs/volumes.c | 216 ++++++++++++- + fs/btrfs/volumes.h | 34 ++ + fs/btrfs/zlib.c | 2 +- + fs/btrfs/zoned.c | 15 +- + fs/btrfs/zstd.c | 2 +- + include/trace/events/btrfs.h | 24 ++ + include/uapi/linux/btrfs_tree.h | 3 +- + 59 files changed, 2246 insertions(+), 946 deletions(-) + create mode 100644 fs/btrfs/tests/zoned-tests.c +Merging ceph/master (1ff957199bd11 libceph: Remove obsolete session key alignment logic) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + fs/ceph/addr.c | 4 ++++ + net/ceph/auth.c | 2 +- + net/ceph/messenger_v2.c | 13 +++++-------- + 3 files changed, 10 insertions(+), 9 deletions(-) +Merging cifs/for-next (7aaa8047eafd0 Linux 7.0-rc6) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Already up to date. +Merging configfs/configfs-next (6363844fdbbb7 samples: configfs: Constify struct configfs_item_operations and configfs_group_operations) +$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git configfs/configfs-next +Already up to date. +Merging ecryptfs/next (1601fe9e0423d ecryptfs: Log function name only once in decode_and_decrypt_filename) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Merge made by the 'ort' strategy. + fs/ecryptfs/crypto.c | 30 ++++++++++++++---------------- + fs/ecryptfs/debug.c | 5 ++--- + fs/ecryptfs/keystore.c | 6 ++---- + fs/ecryptfs/main.c | 1 + + fs/ecryptfs/messaging.c | 3 ++- + fs/ecryptfs/miscdev.c | 7 +++++-- + 6 files changed, 26 insertions(+), 26 deletions(-) +Merging dlm/next (2c3a0b730012e dlm: Avoid -Wflex-array-member-not-at-end warning) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging erofs/dev (eabeee4332ac9 erofs: verify metadata accesses for file-backed mounts) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'ort' strategy. + fs/erofs/data.c | 14 ++++++++++++++ + fs/erofs/xattr.c | 8 ++++++++ + 2 files changed, 22 insertions(+) +Merging exfat/dev (a03abd949fe2a exfat: fix s_maxbytes) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/Makefile | 2 +- + fs/exfat/balloc.c | 18 +-- + fs/exfat/dir.c | 56 +++------ + fs/exfat/exfat_fs.h | 30 ++++- + fs/exfat/exfat_raw.h | 1 + + fs/exfat/fatent.c | 121 +++++++++++++----- + fs/exfat/file.c | 291 ++++++++++++++++++++++++++++++++---------- + fs/exfat/inode.c | 349 ++++++--------------------------------------------- + fs/exfat/iomap.c | 305 ++++++++++++++++++++++++++++++++++++++++++++ + fs/exfat/iomap.h | 16 +++ + fs/exfat/misc.c | 8 +- + fs/exfat/namei.c | 12 +- + fs/exfat/super.c | 12 +- + 13 files changed, 743 insertions(+), 478 deletions(-) + create mode 100644 fs/exfat/iomap.c + create mode 100644 fs/exfat/iomap.h +Merging ext3/for_next (954ca109ca80a Pull udf writeback fix.) +$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging fs/udf/super.c +Merge made by the 'ort' strategy. + fs/ext2/balloc.c | 4 +-- + fs/ext2/inode.c | 3 ++- + fs/ext2/namei.c | 7 +++--- + fs/mpage.c | 30 ++++++++++++++++++----- + fs/notify/fanotify/fanotify.h | 5 ++-- + fs/notify/fanotify/fanotify_user.c | 50 ++++++++++++++++++-------------------- + fs/notify/inotify/inotify_user.c | 3 ++- + fs/quota/dquot.c | 38 +++++++++++++++++++++++------ + fs/udf/inode.c | 44 +++++++++++++++------------------ + fs/udf/super.c | 4 ++- + include/linux/mpage.h | 11 +++++++-- + include/linux/quotaops.h | 9 +------ + 12 files changed, 123 insertions(+), 85 deletions(-) +Merging ext4/dev (9ee29d20aab22 ext4: always drain queued discard work in ext4_mb_release()) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (62b45b0ad4cdd f2fs: fix to freeze GC and discard threads quickly) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/file.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 9 ++- + fs/f2fs/checkpoint.c | 9 --- + fs/f2fs/compress.c | 16 ++++- + fs/f2fs/data.c | 62 ++++++++++------ + fs/f2fs/debug.c | 1 + + fs/f2fs/dir.c | 2 + + fs/f2fs/f2fs.h | 38 ++++++++-- + fs/f2fs/file.c | 4 +- + fs/f2fs/gc.c | 23 +++++- + fs/f2fs/inline.c | 25 +++++-- + fs/f2fs/inode.c | 7 +- + fs/f2fs/namei.c | 1 + + fs/f2fs/node.c | 122 ++++++++++++++++++-------------- + fs/f2fs/node.h | 23 +++--- + fs/f2fs/recovery.c | 2 + + fs/f2fs/segment.c | 22 ++++-- + fs/f2fs/super.c | 61 ++++++++++++++-- + fs/f2fs/sysfs.c | 12 ++++ + fs/f2fs/verity.c | 2 + + fs/f2fs/xattr.c | 6 ++ + include/linux/f2fs_fs.h | 3 + + 21 files changed, 327 insertions(+), 123 deletions(-) +Merging fsverity/for-next (1f318b96cc84d Linux 7.0-rc3) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (204aa22a686bf fuse: abort on fatal signal during sync init) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/inode.c +Merge made by the 'ort' strategy. + fs/fuse/control.c | 4 ++-- + fs/fuse/dev.c | 61 +++++++++++++++++++++++++++++------------------------ + fs/fuse/dev_uring.c | 36 ++++++++++++++----------------- + fs/fuse/dir.c | 14 +++++++----- + fs/fuse/file.c | 18 ++++++++++------ + fs/fuse/fuse_i.h | 1 + + fs/fuse/inode.c | 1 + + fs/fuse/readdir.c | 8 +++---- + fs/fuse/virtio_fs.c | 29 +++++++++++++++++++++---- + 9 files changed, 103 insertions(+), 69 deletions(-) +Merging gfs2/for-next (6e1a833df9524 gfs2: bufdata allocation race) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/super.c +Merge made by the 'ort' strategy. + fs/gfs2/aops.c | 15 +++++----- + fs/gfs2/glops.c | 8 +++--- + fs/gfs2/inode.c | 3 +- + fs/gfs2/log.c | 80 ++++++++++++++++++++++++++++++++++++----------------- + fs/gfs2/log.h | 26 +---------------- + fs/gfs2/lops.c | 16 +++++------ + fs/gfs2/meta_io.c | 43 +++------------------------- + fs/gfs2/meta_io.h | 1 - + fs/gfs2/super.c | 83 +++++++++++++++++++++++++++++++++++++++++++------------ + fs/gfs2/trans.c | 45 ++++++++++++++++-------------- + 10 files changed, 170 insertions(+), 150 deletions(-) +Merging jfs/jfs-next (dad98c5b2a05e jfs: avoid -Wtautological-constant-out-of-range-compare warning again) +$ git merge -m Merge branch 'jfs-next' of https://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Merge made by the 'ort' strategy. + fs/jfs/jfs_dmap.c | 114 +++++++++++++++++++++++++++++- + fs/jfs/jfs_dtree.c | 192 ++++++++++++++++++++++++++++++++++++++++++++++++-- + fs/jfs/jfs_dtree.h | 4 ++ + fs/jfs/jfs_imap.c | 4 ++ + fs/jfs/jfs_logmgr.c | 34 ++++----- + fs/jfs/jfs_logmgr.h | 7 ++ + fs/jfs/jfs_metapage.c | 3 +- + fs/jfs/jfs_mount.c | 3 +- + fs/jfs/jfs_txnmgr.c | 3 +- + fs/jfs/jfs_umount.c | 10 +++ + 10 files changed, 344 insertions(+), 30 deletions(-) +Merging ksmbd/ksmbd-for-next (9751aba44436d smb: smbdirect: remove unused SMBDIRECT_USE_INLINE_C_FILES logic) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/smb/Kconfig | 1 + + fs/smb/client/Kconfig | 4 +- + fs/smb/client/cifs_debug.c | 67 +- + fs/smb/client/smb2pdu.c | 9 +- + fs/smb/client/smbdirect.c | 3116 ++---------------------- + fs/smb/client/smbdirect.h | 19 +- + fs/smb/common/Makefile | 1 + + fs/smb/common/smbdirect/Kconfig | 9 + + fs/smb/common/smbdirect/Makefile | 18 + + fs/smb/common/smbdirect/smbdirect.h | 9 + + fs/smb/common/smbdirect/smbdirect_accept.c | 857 +++++++ + fs/smb/common/smbdirect/smbdirect_connect.c | 925 +++++++ + fs/smb/common/smbdirect/smbdirect_connection.c | 2175 +++++++++++++++++ + fs/smb/common/smbdirect/smbdirect_debug.c | 88 + + fs/smb/common/smbdirect/smbdirect_devices.c | 277 +++ + fs/smb/common/smbdirect/smbdirect_internal.h | 141 ++ + fs/smb/common/smbdirect/smbdirect_listen.c | 308 +++ + fs/smb/common/smbdirect/smbdirect_main.c | 121 + + fs/smb/common/smbdirect/smbdirect_mr.c | 485 ++++ + fs/smb/common/smbdirect/smbdirect_pdu.h | 4 + + fs/smb/common/smbdirect/smbdirect_public.h | 148 ++ + fs/smb/common/smbdirect/smbdirect_rw.c | 255 ++ + fs/smb/common/smbdirect/smbdirect_socket.c | 724 ++++++ + fs/smb/common/smbdirect/smbdirect_socket.h | 303 ++- + fs/smb/server/Kconfig | 5 +- + fs/smb/server/connection.c | 5 - + fs/smb/server/connection.h | 1 - + fs/smb/server/smb2pdu.c | 122 +- + fs/smb/server/smbacl.c | 43 + + fs/smb/server/smbacl.h | 2 + + fs/smb/server/transport_rdma.c | 2958 ++-------------------- + fs/smb/server/transport_rdma.h | 4 +- + 32 files changed, 7366 insertions(+), 5838 deletions(-) + create mode 100644 fs/smb/common/smbdirect/Kconfig + create mode 100644 fs/smb/common/smbdirect/Makefile + create mode 100644 fs/smb/common/smbdirect/smbdirect_accept.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_connect.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_connection.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_debug.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_devices.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_internal.h + create mode 100644 fs/smb/common/smbdirect/smbdirect_listen.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_main.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_mr.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_public.h + create mode 100644 fs/smb/common/smbdirect/smbdirect_rw.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_socket.c +Merging nfs/linux-next (11439c4635edd Linux 7.0-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 (4529e00154329 NFS: Fix NFS KConfig typos) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (3603bf99062c6 SUNRPC: xdr.h: fix all kernel-doc warnings) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Merge made by the 'ort' strategy. + .../admin-guide/nfs/pnfs-block-server.rst | 30 + + Documentation/admin-guide/nfs/pnfs-scsi-server.rst | 31 + + Documentation/filesystems/locking.rst | 2 + + Documentation/filesystems/nfs/exporting.rst | 85 + + Documentation/netlink/specs/nfsd.yaml | 6 + + Documentation/sunrpc/xdr/nlm4.x | 211 +++ + fs/lockd/Makefile | 30 +- + fs/lockd/clnt4xdr.c | 5 +- + fs/lockd/clntlock.c | 2 +- + fs/lockd/clntproc.c | 2 +- + fs/lockd/clntxdr.c | 3 +- + fs/lockd/host.c | 31 +- + {include/linux => fs}/lockd/lockd.h | 101 +- + fs/lockd/mon.c | 2 +- + {include/linux => fs}/lockd/nlm.h | 8 +- + fs/lockd/nlm4xdr_gen.c | 724 ++++++++ + fs/lockd/nlm4xdr_gen.h | 32 + + {include/linux => fs}/lockd/share.h | 19 +- + fs/lockd/svc.c | 50 +- + fs/lockd/svc4proc.c | 1786 ++++++++++++++------ + fs/lockd/svclock.c | 21 +- + fs/lockd/svcproc.c | 126 +- + fs/lockd/svcshare.c | 40 +- + fs/lockd/svcsubs.c | 32 +- + fs/lockd/trace.h | 3 +- + fs/lockd/xdr.c | 6 +- + {include/linux => fs}/lockd/xdr.h | 15 +- + fs/lockd/xdr4.c | 347 ---- + fs/locks.c | 26 +- + fs/nfs/blocklayout/blocklayout.c | 4 +- + fs/nfs/nfs3proc.c | 1 + + fs/nfs/proc.c | 1 + + fs/nfs/sysfs.c | 4 +- + fs/nfsd/Kconfig | 12 +- + fs/nfsd/blocklayout.c | 102 +- + fs/nfsd/debugfs.c | 4 + + fs/nfsd/export.c | 5 +- + fs/nfsd/lockd.c | 50 +- + fs/nfsd/netlink.c | 5 +- + fs/nfsd/netns.h | 4 + + fs/nfsd/nfs4layouts.c | 152 +- + fs/nfsd/nfs4proc.c | 3 +- + fs/nfsd/nfs4state.c | 113 +- + fs/nfsd/nfs4xdr.c | 26 +- + fs/nfsd/nfscache.c | 3 +- + fs/nfsd/nfsctl.c | 40 +- + fs/nfsd/nfsd.h | 6 + + fs/nfsd/nfsfh.c | 83 +- + fs/nfsd/nfssvc.c | 10 +- + fs/nfsd/pnfs.h | 5 +- + fs/nfsd/state.h | 23 +- + fs/nfsd/trace.h | 23 + + include/linux/filelock.h | 1 + + include/linux/lockd/bind.h | 26 +- + include/linux/lockd/debug.h | 40 - + include/linux/lockd/xdr4.h | 43 - + include/linux/sunrpc/cache.h | 7 +- + include/linux/sunrpc/debug.h | 10 +- + include/linux/sunrpc/sched.h | 3 - + include/linux/sunrpc/svc.h | 67 +- + include/linux/sunrpc/svc_rdma.h | 23 +- + include/linux/sunrpc/xdr.h | 48 +- + include/linux/sunrpc/xdrgen/nlm4.h | 233 +++ + include/trace/events/sunrpc.h | 4 +- + include/uapi/linux/nfsd/export.h | 4 +- + include/uapi/linux/nfsd_netlink.h | 1 + + net/sunrpc/auth_gss/gss_krb5_test.c | 93 +- + net/sunrpc/cache.c | 251 ++- + net/sunrpc/svc.c | 59 +- + net/sunrpc/svc_xprt.c | 47 +- + net/sunrpc/svcsock.c | 7 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 28 +- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 151 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 194 ++- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 33 +- + 75 files changed, 4115 insertions(+), 1713 deletions(-) + create mode 100644 Documentation/sunrpc/xdr/nlm4.x + rename {include/linux => fs}/lockd/lockd.h (83%) + rename {include/linux => fs}/lockd/nlm.h (91%) + create mode 100644 fs/lockd/nlm4xdr_gen.c + create mode 100644 fs/lockd/nlm4xdr_gen.h + rename {include/linux => fs}/lockd/share.h (58%) + rename {include/linux => fs}/lockd/xdr.h (91%) + delete mode 100644 fs/lockd/xdr4.c + delete mode 100644 include/linux/lockd/debug.h + delete mode 100644 include/linux/lockd/xdr4.h + create mode 100644 include/linux/sunrpc/xdrgen/nlm4.h +Merging ntfs/ntfs-next (77f58db7391e2 ntfs: fix ignoring unreachable code warnings) +$ git merge -m Merge branch 'ntfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git ntfs/ntfs-next +Auto-merging CREDITS +Auto-merging MAINTAINERS +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/super.c +Merge made by the 'ort' strategy. + CREDITS | 9 +- + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/ntfs.rst | 159 + + MAINTAINERS | 9 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/ntfs/Kconfig | 48 + + fs/ntfs/Makefile | 10 + + fs/ntfs/aops.c | 263 ++ + fs/ntfs/attrib.c | 5424 +++++++++++++++++++++++++++++++++++ + fs/ntfs/attrib.h | 164 ++ + fs/ntfs/attrlist.c | 289 ++ + fs/ntfs/attrlist.h | 20 + + fs/ntfs/bdev-io.c | 117 + + fs/ntfs/bitmap.c | 287 ++ + fs/ntfs/bitmap.h | 100 + + fs/ntfs/collate.c | 146 + + fs/ntfs/collate.h | 36 + + fs/ntfs/compress.c | 1577 ++++++++++ + fs/ntfs/debug.c | 171 ++ + fs/ntfs/debug.h | 63 + + fs/ntfs/dir.c | 1238 ++++++++ + fs/ntfs/dir.h | 32 + + fs/ntfs/ea.c | 954 ++++++ + fs/ntfs/ea.h | 30 + + fs/ntfs/file.c | 1161 ++++++++ + fs/ntfs/index.c | 2117 ++++++++++++++ + fs/ntfs/index.h | 111 + + fs/ntfs/inode.c | 3815 ++++++++++++++++++++++++ + fs/ntfs/inode.h | 358 +++ + fs/ntfs/iomap.c | 870 ++++++ + fs/ntfs/iomap.h | 23 + + fs/ntfs/layout.h | 2346 +++++++++++++++ + fs/ntfs/lcnalloc.c | 1049 +++++++ + fs/ntfs/lcnalloc.h | 134 + + fs/ntfs/logfile.c | 778 +++++ + fs/ntfs/logfile.h | 245 ++ + fs/ntfs/malloc.h | 77 + + fs/ntfs/mft.c | 2924 +++++++++++++++++++ + fs/ntfs/mft.h | 91 + + fs/ntfs/mst.c | 194 ++ + fs/ntfs/namei.c | 1692 +++++++++++ + fs/ntfs/ntfs.h | 294 ++ + fs/ntfs/object_id.c | 158 + + fs/ntfs/object_id.h | 14 + + fs/ntfs/quota.c | 95 + + fs/ntfs/quota.h | 15 + + fs/ntfs/reparse.c | 573 ++++ + fs/ntfs/reparse.h | 20 + + fs/ntfs/runlist.c | 2066 +++++++++++++ + fs/ntfs/runlist.h | 97 + + fs/ntfs/super.c | 2771 ++++++++++++++++++ + fs/ntfs/sysctl.c | 54 + + fs/ntfs/sysctl.h | 26 + + fs/ntfs/time.h | 87 + + fs/ntfs/unistr.c | 477 +++ + fs/ntfs/upcase.c | 70 + + fs/ntfs/volume.h | 296 ++ + fs/ntfs3/Kconfig | 10 +- + fs/ntfs3/dir.c | 10 - + fs/ntfs3/file.c | 11 - + fs/ntfs3/inode.c | 16 +- + fs/ntfs3/ntfs_fs.h | 11 - + fs/ntfs3/super.c | 59 +- + include/uapi/linux/fs.h | 12 + + 65 files changed, 36258 insertions(+), 118 deletions(-) + create mode 100644 Documentation/filesystems/ntfs.rst + create mode 100644 fs/ntfs/Kconfig + create mode 100644 fs/ntfs/Makefile + create mode 100644 fs/ntfs/aops.c + create mode 100644 fs/ntfs/attrib.c + create mode 100644 fs/ntfs/attrib.h + create mode 100644 fs/ntfs/attrlist.c + create mode 100644 fs/ntfs/attrlist.h + create mode 100644 fs/ntfs/bdev-io.c + create mode 100644 fs/ntfs/bitmap.c + create mode 100644 fs/ntfs/bitmap.h + create mode 100644 fs/ntfs/collate.c + create mode 100644 fs/ntfs/collate.h + create mode 100644 fs/ntfs/compress.c + create mode 100644 fs/ntfs/debug.c + create mode 100644 fs/ntfs/debug.h + create mode 100644 fs/ntfs/dir.c + create mode 100644 fs/ntfs/dir.h + create mode 100644 fs/ntfs/ea.c + create mode 100644 fs/ntfs/ea.h + create mode 100644 fs/ntfs/file.c + create mode 100644 fs/ntfs/index.c + create mode 100644 fs/ntfs/index.h + create mode 100644 fs/ntfs/inode.c + create mode 100644 fs/ntfs/inode.h + create mode 100644 fs/ntfs/iomap.c + create mode 100644 fs/ntfs/iomap.h + create mode 100644 fs/ntfs/layout.h + create mode 100644 fs/ntfs/lcnalloc.c + create mode 100644 fs/ntfs/lcnalloc.h + create mode 100644 fs/ntfs/logfile.c + create mode 100644 fs/ntfs/logfile.h + create mode 100644 fs/ntfs/malloc.h + create mode 100644 fs/ntfs/mft.c + create mode 100644 fs/ntfs/mft.h + create mode 100644 fs/ntfs/mst.c + create mode 100644 fs/ntfs/namei.c + create mode 100644 fs/ntfs/ntfs.h + create mode 100644 fs/ntfs/object_id.c + create mode 100644 fs/ntfs/object_id.h + create mode 100644 fs/ntfs/quota.c + create mode 100644 fs/ntfs/quota.h + create mode 100644 fs/ntfs/reparse.c + create mode 100644 fs/ntfs/reparse.h + create mode 100644 fs/ntfs/runlist.c + create mode 100644 fs/ntfs/runlist.h + create mode 100644 fs/ntfs/super.c + create mode 100644 fs/ntfs/sysctl.c + create mode 100644 fs/ntfs/sysctl.h + create mode 100644 fs/ntfs/time.h + create mode 100644 fs/ntfs/unistr.c + create mode 100644 fs/ntfs/upcase.c + create mode 100644 fs/ntfs/volume.h +Merging ntfs3/master (f9963deaa8914 ntfs3: work around false-postive -Wmaybe-uninitialized warnings) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/ntfs_fs.h +Merge made by the 'ort' strategy. + fs/ntfs3/Makefile | 20 ++++++++++++++ + fs/ntfs3/attrib.c | 15 +++++++++++ + fs/ntfs3/frecord.c | 47 ++++++++++++++++++--------------- + fs/ntfs3/fslog.c | 4 +-- + fs/ntfs3/fsntfs.c | 4 +-- + fs/ntfs3/index.c | 76 +++++++++++++++++++++++++++++++++++------------------- + fs/ntfs3/inode.c | 15 +++++++---- + fs/ntfs3/ntfs_fs.h | 3 --- + 8 files changed, 124 insertions(+), 60 deletions(-) +$ git am -3 ../patches/0001-ntfs3-Fix-merge-issue-with-ntfs3.patch +Applying: ntfs3: Fix merge issue with ntfs3 +Using index info to reconstruct a base tree... +M fs/ntfs3/inode.c +Falling back to patching base and 3-way merge... +Auto-merging fs/ntfs3/inode.c +No changes -- Patch already applied. +Merging orangefs/for-next (9e835108a9ae1 fs/orangefs: Replace deprecated strcpy with memcpy + strscpy) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (1f6ee9be92f8d ovl: make fsync after metadata copy-up opt-in mount option) +$ git merge -m Merge branch 'overlayfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (11efa98bcc0d0 ubi: ubi.h: fix kernel-doc warnings) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging drivers/mtd/ubi/ubi.h +Merge made by the 'ort' strategy. + drivers/mtd/ubi/ubi.h | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) +Merging v9fs/9p-next (da2519ee01067 9p: fix memory leak in v9fs_init_fs_context error path) +$ git merge -m Merge branch '9p-next' of https://github.com/martinetd/linux v9fs/9p-next +Auto-merging fs/9p/vfs_super.c +Merge made by the 'ort' strategy. + fs/9p/vfs_super.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging v9fs-ericvh/ericvh/for-next (2014c95afecee Linux 6.14-rc1) +$ git merge -m Merge branch 'ericvh/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (025b245f0bc19 Merge branch 'xfs-7.0-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/iomap/buffered-io.c +Merge made by the 'ort' strategy. + fs/iomap/buffered-io.c | 6 +- + fs/xfs/libxfs/xfs_fs.h | 5 +- + fs/xfs/xfs_file.c | 112 ++++++++++++++++++++++++++++--------- + fs/xfs/xfs_ioctl.c | 19 +++++++ + fs/xfs/xfs_iomap.c | 146 +++++++++++++++++++++++++++++++++++++----------- + fs/xfs/xfs_mount.c | 75 ++++++++++++------------- + fs/xfs/xfs_mount.h | 3 + + fs/xfs/xfs_zone_alloc.c | 44 +++++++-------- + fs/xfs/xfs_zone_gc.c | 24 ++++++-- + fs/xfs/xfs_zone_info.c | 7 ++- + 10 files changed, 306 insertions(+), 135 deletions(-) +Merging zonefs/for-next (a42938e80357a zonefs: correct some spelling mistakes) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging vfs-brauner/vfs.all (84f524dca4b8b Merge branch 'namespaces-7.1.misc' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging MAINTAINERS +Auto-merging fs/binfmt_elf_fdpic.c +Auto-merging fs/buffer.c +Auto-merging fs/crypto/keysetup.c +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/exfat/file.c +CONFLICT (content): Merge conflict in fs/exfat/file.c +Auto-merging fs/exfat/inode.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/extents.c +Auto-merging fs/ext4/fast_commit.c +Auto-merging fs/ext4/fsync.c +CONFLICT (content): Merge conflict in fs/ext4/fsync.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/inline.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/page-io.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/compress.c +Auto-merging fs/f2fs/dir.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/gc.c +Auto-merging fs/f2fs/inline.c +Auto-merging fs/f2fs/inode.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/recovery.c +Auto-merging fs/f2fs/xattr.c +Auto-merging fs/fuse/file.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/iomap/direct-io.c +Auto-merging fs/jfs/jfs_imap.c +Auto-merging fs/jfs/jfs_metapage.c +Auto-merging fs/lockd/svclock.c +Auto-merging fs/lockd/svcsubs.c +Auto-merging fs/locks.c +Auto-merging fs/nfsd/export.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfsfh.c +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/super.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/super.c +Auto-merging fs/overlayfs/util.c +Auto-merging fs/udf/inode.c +Auto-merging fs/udf/super.c +Auto-merging fs/xfs/xfs_iomap.c +Auto-merging kernel/fork.c +Auto-merging mm/hugetlb.c +Auto-merging net/ipv4/udp.c +Auto-merging net/key/af_key.c +Auto-merging net/packet/af_packet.c +Auto-merging net/rose/af_rose.c +Auto-merging net/unix/af_unix.c +Auto-merging security/apparmor/apparmorfs.c +CONFLICT (content): Merge conflict in security/apparmor/apparmorfs.c +Resolved 'fs/exfat/file.c' using previous resolution. +Resolved 'fs/ext4/fsync.c' using previous resolution. +Resolved 'security/apparmor/apparmorfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next eac80e3459317] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/mount_api.rst | 4 - + Documentation/filesystems/porting.rst | 14 + + MAINTAINERS | 11 +- + arch/arm64/kernel/sys32.c | 2 +- + arch/mips/kernel/linux32.c | 2 +- + arch/parisc/kernel/sys_parisc.c | 4 +- + arch/powerpc/kernel/sys_ppc32.c | 2 +- + arch/sparc/kernel/sys_sparc32.c | 2 +- + arch/x86/kernel/sys_ia32.c | 3 +- + block/Makefile | 2 +- + block/bdev.c | 8 - + block/bio-integrity-auto.c | 80 +- + block/bio-integrity-fs.c | 81 ++ + block/bio-integrity.c | 64 ++ + block/bio.c | 17 +- + block/blk-mq.c | 6 +- + block/blk-settings.c | 13 - + block/blk.h | 6 +- + block/t10-pi.c | 12 +- + drivers/dma-buf/dma-buf.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- + drivers/nvdimm/btt.c | 6 +- + fs/9p/vfs_addr.c | 4 +- + fs/9p/vfs_inode.c | 6 +- + fs/9p/vfs_inode_dotl.c | 6 +- + fs/adfs/adfs.h | 4 +- + fs/adfs/dir.c | 4 +- + fs/adfs/file.c | 4 +- + fs/adfs/inode.c | 6 +- + fs/affs/affs.h | 4 +- + fs/affs/amigaffs.c | 22 +- + fs/affs/bitmap.c | 2 +- + fs/affs/dir.c | 4 +- + fs/affs/file.c | 47 +- + fs/affs/inode.c | 29 +- + fs/affs/namei.c | 23 +- + fs/affs/super.c | 1 + + fs/affs/symlink.c | 4 +- + fs/afs/dir.c | 10 +- + fs/afs/dir_search.c | 2 +- + fs/afs/dynroot.c | 2 +- + fs/afs/inode.c | 2 +- + fs/aio.c | 78 +- + fs/autofs/inode.c | 2 +- + fs/autofs/root.c | 8 +- + fs/befs/linuxvfs.c | 28 +- + fs/bfs/bfs.h | 1 + + fs/bfs/dir.c | 20 +- + fs/bfs/inode.c | 6 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/buffer.c | 462 +++----- + fs/cachefiles/io.c | 6 +- + fs/cachefiles/namei.c | 109 +- + fs/cachefiles/xattr.c | 2 +- + fs/ceph/crypto.c | 4 +- + fs/coda/dir.c | 2 +- + fs/coda/inode.c | 2 +- + fs/coredump.c | 5 + + fs/cramfs/inode.c | 2 +- + fs/crypto/crypto.c | 2 +- + fs/crypto/hooks.c | 2 +- + fs/crypto/keyring.c | 4 +- + fs/crypto/keysetup.c | 2 +- + fs/dcache.c | 8 +- + fs/ecryptfs/crypto.c | 6 +- + fs/ecryptfs/file.c | 2 +- + fs/efs/inode.c | 6 +- + fs/eventpoll.c | 2 +- + fs/exfat/inode.c | 1 - + fs/exportfs/expfs.c | 4 +- + fs/ext2/dir.c | 10 +- + fs/ext2/ext2.h | 1 + + fs/ext2/file.c | 6 +- + fs/ext2/ialloc.c | 9 +- + fs/ext2/inode.c | 19 +- + fs/ext2/super.c | 1 + + fs/ext2/trace.h | 8 +- + fs/ext2/xattr.c | 16 +- + fs/ext4/dir.c | 2 +- + fs/ext4/ext4.h | 5 +- + fs/ext4/ext4_jbd2.c | 3 +- + fs/ext4/extents.c | 8 +- + fs/ext4/extents_status.c | 28 +- + fs/ext4/fast_commit.c | 8 +- + fs/ext4/fsync.c | 5 +- + fs/ext4/ialloc.c | 10 +- + fs/ext4/indirect.c | 2 +- + fs/ext4/inline.c | 14 +- + fs/ext4/inode.c | 31 +- + fs/ext4/ioctl.c | 4 +- + fs/ext4/mballoc.c | 6 +- + fs/ext4/migrate.c | 2 +- + fs/ext4/move_extent.c | 20 +- + fs/ext4/namei.c | 10 +- + fs/ext4/orphan.c | 16 +- + fs/ext4/page-io.c | 10 +- + fs/ext4/super.c | 26 +- + fs/ext4/xattr.c | 10 +- + fs/f2fs/compress.c | 4 +- + fs/f2fs/dir.c | 2 +- + fs/f2fs/extent_cache.c | 8 +- + fs/f2fs/f2fs.h | 6 +- + fs/f2fs/file.c | 12 +- + fs/f2fs/gc.c | 2 +- + fs/f2fs/inline.c | 4 +- + fs/f2fs/inode.c | 48 +- + fs/f2fs/namei.c | 8 +- + fs/f2fs/node.c | 16 +- + fs/f2fs/recovery.c | 10 +- + fs/f2fs/segment.h | 2 +- + fs/f2fs/xattr.c | 10 +- + fs/fat/dir.c | 17 +- + fs/fat/fat.h | 1 + + fs/fat/fat_test.c | 181 +++- + fs/fat/fatent.c | 15 +- + fs/fat/file.c | 8 +- + fs/fat/inode.c | 7 +- + fs/fat/misc.c | 2 + + fs/fat/namei_msdos.c | 6 +- + fs/fat/namei_vfat.c | 2 +- + fs/freevxfs/vxfs_bmap.c | 4 +- + fs/fs_context.c | 1 - + fs/fs_parser.c | 19 +- + fs/fs_struct.c | 34 +- + fs/fserror.c | 2 +- + fs/fuse/file.c | 5 +- + fs/gfs2/glock.c | 1 - + fs/gfs2/super.c | 2 +- + fs/hfs/catalog.c | 2 +- + fs/hfs/extent.c | 4 +- + fs/hfs/inode.c | 25 +- + fs/hfsplus/attributes.c | 10 +- + fs/hfsplus/catalog.c | 2 +- + fs/hfsplus/dir.c | 6 +- + fs/hfsplus/extents.c | 6 +- + fs/hfsplus/inode.c | 8 +- + fs/hfsplus/super.c | 6 +- + fs/hfsplus/xattr.c | 10 +- + fs/hpfs/dir.c | 4 +- + fs/hpfs/dnode.c | 4 +- + fs/hpfs/ea.c | 4 +- + fs/hpfs/inode.c | 4 +- + fs/hugetlbfs/inode.c | 11 +- + fs/inode.c | 73 +- + fs/internal.h | 3 +- + fs/iomap/bio.c | 134 ++- + fs/iomap/buffered-io.c | 8 +- + fs/iomap/direct-io.c | 15 +- + fs/iomap/internal.h | 14 + + fs/iomap/ioend.c | 32 +- + fs/iomap/trace.h | 8 +- + fs/isofs/compress.c | 2 +- + fs/isofs/dir.c | 2 +- + fs/isofs/inode.c | 8 +- + fs/isofs/namei.c | 2 +- + fs/jbd2/journal.c | 4 +- + fs/jbd2/transaction.c | 2 +- + fs/jffs2/dir.c | 4 +- + fs/jffs2/file.c | 4 +- + fs/jffs2/fs.c | 18 +- + fs/jfs/inode.c | 2 +- + fs/jfs/jfs_imap.c | 2 +- + fs/jfs/jfs_metapage.c | 2 +- + fs/kernfs/dir.c | 15 +- + fs/kernfs/inode.c | 99 +- + fs/kernfs/kernfs-internal.h | 5 +- + fs/libfs.c | 40 +- + fs/lockd/svclock.c | 8 +- + fs/lockd/svcsubs.c | 2 +- + fs/locks.c | 6 +- + fs/mbcache.c | 1 + + fs/minix/dir.c | 2 +- + fs/minix/file.c | 10 +- + fs/minix/inode.c | 16 +- + fs/minix/itree_common.c | 11 +- + fs/minix/minix.h | 3 + + fs/namei.c | 70 +- + fs/namespace.c | 208 ++-- + fs/nfs/dir.c | 20 +- + fs/nfs/file.c | 8 +- + fs/nfs/filelayout/filelayout.c | 8 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 8 +- + fs/nfs/inode.c | 6 +- + fs/nfs/internal.h | 2 +- + fs/nfs/nfs4proc.c | 4 +- + fs/nfs/pnfs.c | 12 +- + fs/nfs/write.c | 3 +- + fs/nfsd/export.c | 2 +- + fs/nfsd/nfs4recover.c | 6 +- + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfsfh.c | 4 +- + fs/nfsd/vfs.c | 2 +- + fs/nilfs2/alloc.c | 10 +- + fs/nilfs2/bmap.c | 17 +- + fs/nilfs2/btnode.c | 2 +- + fs/nilfs2/btree.c | 12 +- + fs/nilfs2/dir.c | 12 +- + fs/nilfs2/direct.c | 4 +- + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/inode.c | 8 +- + fs/nilfs2/mdt.c | 2 +- + fs/nilfs2/namei.c | 2 +- + fs/nilfs2/segment.c | 2 +- + fs/notify/fdinfo.c | 4 +- + fs/nsfs.c | 4 +- + fs/ntfs3/file.c | 3 - + fs/ntfs3/inode.c | 58 +- + fs/ntfs3/super.c | 2 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.c | 4 +- + fs/ocfs2/dir.c | 8 +- + fs/ocfs2/dlmfs/dlmfs.c | 10 +- + fs/ocfs2/dlmglue.c | 1 - + fs/ocfs2/extent_map.c | 12 +- + fs/ocfs2/inode.c | 2 +- + fs/ocfs2/namei.c | 3 - + fs/ocfs2/quota_local.c | 2 +- + fs/ocfs2/refcounttree.c | 10 +- + fs/ocfs2/xattr.c | 4 +- + fs/omfs/file.c | 2 +- + fs/omfs/inode.c | 6 + + fs/open.c | 40 +- + fs/orangefs/inode.c | 2 +- + fs/overlayfs/dir.c | 51 +- + fs/overlayfs/export.c | 81 +- + fs/overlayfs/namei.c | 4 +- + fs/overlayfs/overlayfs.h | 10 +- + fs/overlayfs/super.c | 16 +- + fs/overlayfs/util.c | 27 +- + fs/pidfs.c | 114 +- + fs/pipe.c | 2 +- + fs/proc/base.c | 22 +- + fs/proc/fd.c | 8 +- + fs/proc/generic.c | 8 +- + fs/proc/internal.h | 4 +- + fs/proc/namespaces.c | 4 +- + fs/proc/proc_net.c | 2 +- + fs/proc/self.c | 3 - + fs/proc/task_mmu.c | 4 +- + fs/proc/thread_self.c | 3 - + fs/qnx4/dir.c | 2 +- + fs/qnx4/inode.c | 4 +- + fs/qnx6/dir.c | 2 +- + fs/qnx6/inode.c | 2 +- + fs/readdir.c | 103 +- + fs/select.c | 35 +- + fs/ubifs/debug.c | 8 +- + fs/ubifs/dir.c | 28 +- + fs/ubifs/file.c | 28 +- + fs/ubifs/journal.c | 6 +- + fs/ubifs/super.c | 16 +- + fs/ubifs/tnc.c | 4 +- + fs/ubifs/xattr.c | 14 +- + fs/udf/dir.c | 2 +- + fs/udf/directory.c | 23 +- + fs/udf/file.c | 11 +- + fs/udf/inode.c | 28 +- + fs/udf/namei.c | 10 +- + fs/udf/super.c | 3 +- + fs/udf/truncate.c | 2 +- + fs/udf/udf_i.h | 1 + + fs/udf/udfdecl.h | 1 + + fs/ufs/balloc.c | 6 +- + fs/ufs/dir.c | 12 +- + fs/ufs/file.c | 2 +- + fs/ufs/ialloc.c | 6 +- + fs/ufs/inode.c | 19 +- + fs/ufs/ufs_fs.h | 6 +- + fs/ufs/util.c | 2 +- + fs/verity/init.c | 2 +- + fs/xattr.c | 425 +++++--- + fs/xfs/xfs_aops.c | 47 +- + fs/xfs/xfs_iomap.c | 11 +- + fs/zonefs/super.c | 8 +- + fs/zonefs/trace.h | 18 +- + include/linux/audit.h | 2 +- + include/linux/backing-dev-defs.h | 2 +- + include/linux/backing-dev.h | 13 + + include/linux/bio-integrity.h | 12 +- + include/linux/bio.h | 2 +- + include/linux/blk-integrity.h | 28 +- + include/linux/blkdev.h | 35 +- + include/linux/buffer_head.h | 29 +- + include/linux/fs.h | 106 +- + include/linux/fs_parser.h | 8 +- + include/linux/fs_struct.h | 43 +- + include/linux/hugetlb.h | 1 + + include/linux/iomap.h | 20 +- + include/linux/kernfs.h | 2 - + include/linux/namei.h | 6 - + include/linux/ns/ns_common_types.h | 44 +- + include/linux/sched/signal.h | 1 + + include/linux/shmem_fs.h | 2 +- + include/linux/syscalls.h | 16 +- + include/linux/xattr.h | 47 +- + include/net/sock.h | 4 +- + include/trace/events/cachefiles.h | 18 +- + include/trace/events/coredump.h | 45 + + include/trace/events/ext4.h | 550 +++++----- + include/trace/events/f2fs.h | 248 ++--- + include/trace/events/filelock.h | 34 +- + include/trace/events/filemap.h | 20 +- + include/trace/events/fs_dax.h | 20 +- + include/trace/events/fsverity.h | 30 +- + include/trace/events/hugetlbfs.h | 42 +- + include/trace/events/netfs.h | 8 +- + include/trace/events/nilfs2.h | 12 +- + include/trace/events/readahead.h | 18 +- + include/trace/events/timestamp.h | 16 +- + include/trace/events/writeback.h | 162 +-- + include/uapi/linux/mount.h | 1 + + include/uapi/linux/pidfd.h | 5 + + include/uapi/linux/sched.h | 14 +- + init/initramfs.c | 2 +- + io_uring/truncate.c | 2 +- + kernel/acct.c | 2 +- + kernel/audit.h | 13 +- + kernel/audit_fsnotify.c | 4 +- + kernel/audit_watch.c | 12 +- + kernel/auditsc.c | 11 +- + kernel/events/uprobes.c | 4 +- + kernel/exit.c | 3 +- + kernel/fork.c | 78 +- + kernel/nsproxy.c | 28 +- + kernel/pid.c | 19 +- + kernel/pid_namespace.c | 9 - + kernel/ptrace.c | 3 +- + kernel/signal.c | 9 +- + mm/hugetlb.c | 10 +- + mm/shmem.c | 46 +- + net/ax25/af_ax25.c | 2 +- + net/bluetooth/af_bluetooth.c | 4 +- + net/can/bcm.c | 2 +- + net/ipv4/ping.c | 2 +- + net/ipv4/raw.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/udp.c | 2 +- + net/ipv6/datagram.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/key/af_key.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/netlink/diag.c | 2 +- + net/netrom/af_netrom.c | 4 +- + net/packet/af_packet.c | 2 +- + net/packet/diag.c | 2 +- + net/phonet/socket.c | 4 +- + net/rose/af_rose.c | 4 +- + net/sctp/proc.c | 4 +- + net/socket.c | 121 ++- + net/unix/af_unix.c | 2 +- + net/unix/diag.c | 6 +- + net/x25/x25_proc.c | 4 +- + net/xdp/xsk_diag.c | 2 +- + security/apparmor/apparmorfs.c | 38 +- + security/integrity/evm/evm_crypto.c | 6 + + security/integrity/integrity_audit.c | 2 +- + security/ipe/audit.c | 2 +- + security/lsm_audit.c | 10 +- + security/selinux/hooks.c | 10 +- + security/selinux/selinuxfs.c | 17 +- + security/smack/smack_lsm.c | 12 +- + tools/include/uapi/linux/mount.h | 14 +- + tools/testing/selftests/Makefile | 3 + + .../coredump/coredump_socket_protocol_test.c | 26 + + .../selftests/coredump/coredump_socket_test.c | 32 + + .../selftests/coredump/coredump_test_helpers.c | 6 +- + tools/testing/selftests/filesystems/devpts_pts.c | 2 - + .../selftests/filesystems/empty_mntns/.gitignore | 4 + + .../selftests/filesystems/empty_mntns/Makefile | 12 + + .../empty_mntns/clone3_empty_mntns_test.c | 938 ++++++++++++++++ + .../filesystems/empty_mntns/empty_mntns.h | 25 + + .../filesystems/empty_mntns/empty_mntns_test.c | 725 +++++++++++++ + .../empty_mntns/overmount_chroot_test.c | 225 ++++ + .../selftests/filesystems/fsmount_ns/.gitignore | 1 + + .../selftests/filesystems/fsmount_ns/Makefile | 10 + + .../filesystems/fsmount_ns/fsmount_ns_test.c | 1135 ++++++++++++++++++++ + .../selftests/filesystems/move_mount/.gitignore | 2 + + .../selftests/filesystems/move_mount/Makefile | 10 + + .../filesystems/move_mount/move_mount_test.c | 492 +++++++++ + .../selftests/filesystems/open_tree_ns/Makefile | 2 +- + .../filesystems/open_tree_ns/open_tree_ns_test.c | 43 +- + .../selftests/filesystems/statmount/statmount.h | 51 + + .../filesystems/statmount/statmount_test.c | 45 +- + .../filesystems/statmount/statmount_test_ns.c | 25 - + tools/testing/selftests/filesystems/utils.c | 4 +- + tools/testing/selftests/filesystems/utils.h | 2 + + .../testing/selftests/filesystems/xattr/.gitignore | 3 + + tools/testing/selftests/filesystems/xattr/Makefile | 6 + + .../filesystems/xattr/xattr_socket_test.c | 470 ++++++++ + .../filesystems/xattr/xattr_socket_types_test.c | 177 +++ + .../filesystems/xattr/xattr_sockfs_test.c | 363 +++++++ + tools/testing/selftests/pid_namespace/.gitignore | 1 + + tools/testing/selftests/pid_namespace/Makefile | 2 +- + .../selftests/pid_namespace/pidns_init_via_setns.c | 238 ++++ + tools/testing/selftests/pidfd/.gitignore | 1 + + tools/testing/selftests/pidfd/Makefile | 2 +- + tools/testing/selftests/pidfd/pidfd.h | 5 + + .../testing/selftests/pidfd/pidfd_autoreap_test.c | 900 ++++++++++++++++ + tools/testing/selftests/pidfd/pidfd_info_test.c | 1 + + virt/kvm/guest_memfd.c | 12 +- + 400 files changed, 9688 insertions(+), 3106 deletions(-) + create mode 100644 block/bio-integrity-fs.c + create mode 100644 include/trace/events/coredump.h + create mode 100644 tools/testing/selftests/filesystems/empty_mntns/.gitignore + create mode 100644 tools/testing/selftests/filesystems/empty_mntns/Makefile + create mode 100644 tools/testing/selftests/filesystems/empty_mntns/clone3_empty_mntns_test.c + create mode 100644 tools/testing/selftests/filesystems/empty_mntns/empty_mntns.h + create mode 100644 tools/testing/selftests/filesystems/empty_mntns/empty_mntns_test.c + create mode 100644 tools/testing/selftests/filesystems/empty_mntns/overmount_chroot_test.c + create mode 100644 tools/testing/selftests/filesystems/fsmount_ns/.gitignore + create mode 100644 tools/testing/selftests/filesystems/fsmount_ns/Makefile + create mode 100644 tools/testing/selftests/filesystems/fsmount_ns/fsmount_ns_test.c + create mode 100644 tools/testing/selftests/filesystems/move_mount/.gitignore + create mode 100644 tools/testing/selftests/filesystems/move_mount/Makefile + create mode 100644 tools/testing/selftests/filesystems/move_mount/move_mount_test.c + create mode 100644 tools/testing/selftests/filesystems/xattr/.gitignore + create mode 100644 tools/testing/selftests/filesystems/xattr/Makefile + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_socket_test.c + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_socket_types_test.c + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_sockfs_test.c + create mode 100644 tools/testing/selftests/pid_namespace/pidns_init_via_setns.c + create mode 100644 tools/testing/selftests/pidfd/pidfd_autoreap_test.c +$ git am -3 ../patches/0001-ntfs-Fixup-merge-issue-with-vfs.all-changes.patch +Applying: ntfs: Fixup merge issue with vfs.all changes +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ntfs/mft.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[fs-next 06f331c825631] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git + Date: Mon Mar 30 13:04:31 2026 +0100 +$ git reset --hard HEAD^ +HEAD is now at 00e59c8d0ae54 Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git +Merging next-20260312 version of vfs-brauner +$ git merge -m next-20260312/vfs-brauner a4e79b1233089509af213d59f7aeef3926c15599 +Auto-merging fs/binfmt_elf_fdpic.c +Auto-merging fs/crypto/keysetup.c +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/extents.c +Auto-merging fs/ext4/fast_commit.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/inline.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/page-io.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/compress.c +Auto-merging fs/f2fs/dir.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/gc.c +Auto-merging fs/f2fs/inline.c +Auto-merging fs/f2fs/inode.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/recovery.c +Auto-merging fs/f2fs/xattr.c +Auto-merging fs/fuse/file.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/iomap/bio.c +CONFLICT (content): Merge conflict in fs/iomap/bio.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/iomap/direct-io.c +Auto-merging fs/jfs/jfs_imap.c +Auto-merging fs/jfs/jfs_metapage.c +Auto-merging fs/lockd/svclock.c +Auto-merging fs/lockd/svcsubs.c +Auto-merging fs/locks.c +Auto-merging fs/namei.c +Auto-merging fs/nfsd/export.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfsfh.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/super.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/super.c +Auto-merging fs/overlayfs/util.c +Auto-merging fs/udf/inode.c +Auto-merging fs/udf/super.c +Auto-merging fs/xfs/xfs_iomap.c +Auto-merging include/trace/events/netfs.h +Auto-merging kernel/fork.c +Auto-merging net/ipv4/udp.c +Auto-merging net/key/af_key.c +Auto-merging net/packet/af_packet.c +Auto-merging net/rose/af_rose.c +Auto-merging net/unix/af_unix.c +Auto-merging security/apparmor/apparmorfs.c +CONFLICT (content): Merge conflict in security/apparmor/apparmorfs.c +Resolved 'fs/iomap/bio.c' using previous resolution. +Resolved 'security/apparmor/apparmorfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 2ad8a64f625dd] next-20260312/vfs-brauner +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/mount_api.rst | 4 - + Documentation/filesystems/porting.rst | 14 + + block/Makefile | 2 +- + block/bio-integrity-auto.c | 80 +- + block/bio-integrity-fs.c | 81 ++ + block/bio-integrity.c | 64 ++ + block/bio.c | 17 +- + block/blk-mq.c | 6 +- + block/blk-settings.c | 13 - + block/blk.h | 6 +- + block/t10-pi.c | 12 +- + drivers/dma-buf/dma-buf.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- + drivers/nvdimm/btt.c | 6 +- + fs/9p/vfs_addr.c | 4 +- + fs/9p/vfs_inode.c | 6 +- + fs/9p/vfs_inode_dotl.c | 6 +- + fs/affs/amigaffs.c | 10 +- + fs/affs/bitmap.c | 2 +- + fs/affs/dir.c | 2 +- + fs/affs/file.c | 20 +- + fs/affs/inode.c | 12 +- + fs/affs/namei.c | 14 +- + fs/affs/symlink.c | 2 +- + fs/afs/dir.c | 10 +- + fs/afs/dir_search.c | 2 +- + fs/afs/dynroot.c | 2 +- + fs/afs/inode.c | 2 +- + fs/autofs/inode.c | 2 +- + fs/befs/linuxvfs.c | 28 +- + fs/bfs/dir.c | 4 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/cachefiles/io.c | 6 +- + fs/cachefiles/namei.c | 109 +- + fs/cachefiles/xattr.c | 2 +- + fs/ceph/crypto.c | 4 +- + fs/coda/dir.c | 2 +- + fs/coda/inode.c | 2 +- + fs/cramfs/inode.c | 2 +- + fs/crypto/crypto.c | 2 +- + fs/crypto/hooks.c | 2 +- + fs/crypto/keyring.c | 4 +- + fs/crypto/keysetup.c | 2 +- + fs/dcache.c | 8 +- + fs/ecryptfs/crypto.c | 6 +- + fs/ecryptfs/file.c | 2 +- + fs/efs/inode.c | 6 +- + fs/eventpoll.c | 2 +- + fs/exportfs/expfs.c | 4 +- + fs/ext2/dir.c | 10 +- + fs/ext2/ialloc.c | 9 +- + fs/ext2/inode.c | 2 +- + fs/ext2/trace.h | 8 +- + fs/ext2/xattr.c | 16 +- + fs/ext4/dir.c | 2 +- + fs/ext4/ext4.h | 4 +- + fs/ext4/extents.c | 8 +- + fs/ext4/extents_status.c | 28 +- + fs/ext4/fast_commit.c | 8 +- + fs/ext4/ialloc.c | 10 +- + fs/ext4/indirect.c | 2 +- + fs/ext4/inline.c | 14 +- + fs/ext4/inode.c | 22 +- + fs/ext4/ioctl.c | 4 +- + fs/ext4/mballoc.c | 6 +- + fs/ext4/migrate.c | 2 +- + fs/ext4/move_extent.c | 20 +- + fs/ext4/namei.c | 10 +- + fs/ext4/orphan.c | 16 +- + fs/ext4/page-io.c | 10 +- + fs/ext4/super.c | 22 +- + fs/ext4/xattr.c | 10 +- + fs/f2fs/compress.c | 4 +- + fs/f2fs/dir.c | 2 +- + fs/f2fs/extent_cache.c | 8 +- + fs/f2fs/f2fs.h | 6 +- + fs/f2fs/file.c | 12 +- + fs/f2fs/gc.c | 2 +- + fs/f2fs/inline.c | 4 +- + fs/f2fs/inode.c | 48 +- + fs/f2fs/namei.c | 8 +- + fs/f2fs/node.c | 16 +- + fs/f2fs/recovery.c | 10 +- + fs/f2fs/segment.h | 2 +- + fs/f2fs/xattr.c | 10 +- + fs/freevxfs/vxfs_bmap.c | 4 +- + fs/fs_context.c | 1 - + fs/fs_parser.c | 19 +- + fs/fs_struct.c | 34 +- + fs/fserror.c | 2 +- + fs/fuse/file.c | 5 +- + fs/gfs2/super.c | 2 +- + fs/hfs/catalog.c | 2 +- + fs/hfs/extent.c | 4 +- + fs/hfs/inode.c | 4 +- + fs/hfsplus/attributes.c | 10 +- + fs/hfsplus/catalog.c | 2 +- + fs/hfsplus/dir.c | 6 +- + fs/hfsplus/extents.c | 6 +- + fs/hfsplus/inode.c | 8 +- + fs/hfsplus/super.c | 6 +- + fs/hfsplus/xattr.c | 10 +- + fs/hpfs/dir.c | 4 +- + fs/hpfs/dnode.c | 4 +- + fs/hpfs/ea.c | 4 +- + fs/hpfs/inode.c | 4 +- + fs/inode.c | 49 +- + fs/iomap/bio.c | 135 ++- + fs/iomap/buffered-io.c | 8 +- + fs/iomap/direct-io.c | 15 +- + fs/iomap/internal.h | 14 + + fs/iomap/ioend.c | 32 +- + fs/iomap/trace.h | 8 +- + fs/isofs/compress.c | 2 +- + fs/isofs/dir.c | 2 +- + fs/isofs/inode.c | 8 +- + fs/isofs/namei.c | 2 +- + fs/jbd2/journal.c | 4 +- + fs/jbd2/transaction.c | 2 +- + fs/jffs2/dir.c | 4 +- + fs/jffs2/file.c | 4 +- + fs/jffs2/fs.c | 18 +- + fs/jfs/inode.c | 2 +- + fs/jfs/jfs_imap.c | 2 +- + fs/jfs/jfs_metapage.c | 2 +- + fs/kernfs/dir.c | 15 +- + fs/kernfs/inode.c | 99 +- + fs/kernfs/kernfs-internal.h | 5 +- + fs/libfs.c | 3 +- + fs/lockd/svclock.c | 8 +- + fs/lockd/svcsubs.c | 2 +- + fs/locks.c | 6 +- + fs/minix/inode.c | 10 +- + fs/namei.c | 70 +- + fs/namespace.c | 125 ++- + fs/nfs/dir.c | 20 +- + fs/nfs/file.c | 8 +- + fs/nfs/filelayout/filelayout.c | 8 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 8 +- + fs/nfs/inode.c | 6 +- + fs/nfs/internal.h | 2 +- + fs/nfs/nfs4proc.c | 4 +- + fs/nfs/pnfs.c | 12 +- + fs/nfs/write.c | 3 +- + fs/nfsd/export.c | 2 +- + fs/nfsd/nfs4recover.c | 6 +- + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfsfh.c | 4 +- + fs/nfsd/vfs.c | 2 +- + fs/nilfs2/alloc.c | 10 +- + fs/nilfs2/bmap.c | 2 +- + fs/nilfs2/btnode.c | 2 +- + fs/nilfs2/btree.c | 12 +- + fs/nilfs2/dir.c | 12 +- + fs/nilfs2/direct.c | 4 +- + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/inode.c | 8 +- + fs/nilfs2/mdt.c | 2 +- + fs/nilfs2/namei.c | 2 +- + fs/nilfs2/segment.c | 2 +- + fs/notify/fdinfo.c | 4 +- + fs/nsfs.c | 4 +- + fs/ntfs3/inode.c | 57 +- + fs/ntfs3/super.c | 2 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.c | 4 +- + fs/ocfs2/dir.c | 8 +- + fs/ocfs2/dlmfs/dlmfs.c | 10 +- + fs/ocfs2/extent_map.c | 12 +- + fs/ocfs2/inode.c | 2 +- + fs/ocfs2/quota_local.c | 2 +- + fs/ocfs2/refcounttree.c | 10 +- + fs/ocfs2/xattr.c | 4 +- + fs/orangefs/inode.c | 2 +- + fs/overlayfs/dir.c | 51 +- + fs/overlayfs/export.c | 81 +- + fs/overlayfs/namei.c | 4 +- + fs/overlayfs/overlayfs.h | 10 +- + fs/overlayfs/super.c | 16 +- + fs/overlayfs/util.c | 27 +- + fs/pidfs.c | 102 +- + fs/pipe.c | 2 +- + fs/proc/fd.c | 2 +- + fs/proc/self.c | 3 - + fs/proc/task_mmu.c | 4 +- + fs/proc/thread_self.c | 3 - + fs/qnx4/inode.c | 4 +- + fs/qnx6/inode.c | 2 +- + fs/ubifs/debug.c | 8 +- + fs/ubifs/dir.c | 28 +- + fs/ubifs/file.c | 28 +- + fs/ubifs/journal.c | 6 +- + fs/ubifs/super.c | 16 +- + fs/ubifs/tnc.c | 4 +- + fs/ubifs/xattr.c | 14 +- + fs/udf/directory.c | 18 +- + fs/udf/file.c | 2 +- + fs/udf/inode.c | 12 +- + fs/udf/namei.c | 8 +- + fs/udf/super.c | 2 +- + fs/ufs/balloc.c | 6 +- + fs/ufs/dir.c | 10 +- + fs/ufs/ialloc.c | 6 +- + fs/ufs/inode.c | 18 +- + fs/ufs/ufs_fs.h | 6 +- + fs/ufs/util.c | 2 +- + fs/verity/init.c | 2 +- + fs/xattr.c | 425 +++++--- + fs/xfs/xfs_aops.c | 47 +- + fs/xfs/xfs_iomap.c | 11 +- + fs/zonefs/super.c | 8 +- + fs/zonefs/trace.h | 18 +- + include/linux/audit.h | 2 +- + include/linux/backing-dev.h | 13 + + include/linux/bio-integrity.h | 12 +- + include/linux/bio.h | 2 +- + include/linux/blk-integrity.h | 28 +- + include/linux/blkdev.h | 34 +- + include/linux/fs.h | 88 +- + include/linux/fs_parser.h | 8 +- + include/linux/fs_struct.h | 43 +- + include/linux/iomap.h | 20 +- + include/linux/kernfs.h | 2 - + include/linux/namei.h | 6 - + include/linux/sched/signal.h | 1 + + include/linux/shmem_fs.h | 2 +- + include/linux/xattr.h | 47 +- + include/net/sock.h | 4 +- + include/trace/events/cachefiles.h | 18 +- + include/trace/events/ext4.h | 550 +++++----- + include/trace/events/f2fs.h | 248 ++--- + include/trace/events/filelock.h | 34 +- + include/trace/events/filemap.h | 20 +- + include/trace/events/fs_dax.h | 20 +- + include/trace/events/fsverity.h | 30 +- + include/trace/events/hugetlbfs.h | 42 +- + include/trace/events/netfs.h | 8 +- + include/trace/events/nilfs2.h | 12 +- + include/trace/events/readahead.h | 18 +- + include/trace/events/timestamp.h | 16 +- + include/trace/events/writeback.h | 162 +-- + include/uapi/linux/mount.h | 1 + + include/uapi/linux/pidfd.h | 1 + + include/uapi/linux/sched.h | 3 + + kernel/audit.h | 13 +- + kernel/audit_fsnotify.c | 4 +- + kernel/audit_watch.c | 12 +- + kernel/auditsc.c | 11 +- + kernel/events/uprobes.c | 4 +- + kernel/fork.c | 52 +- + kernel/ptrace.c | 3 +- + kernel/signal.c | 4 + + mm/shmem.c | 46 +- + net/ax25/af_ax25.c | 2 +- + net/bluetooth/af_bluetooth.c | 4 +- + net/can/bcm.c | 2 +- + net/ipv4/ping.c | 2 +- + net/ipv4/raw.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/udp.c | 2 +- + net/ipv6/datagram.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/key/af_key.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/netlink/diag.c | 2 +- + net/netrom/af_netrom.c | 4 +- + net/packet/af_packet.c | 2 +- + net/packet/diag.c | 2 +- + net/phonet/socket.c | 4 +- + net/rose/af_rose.c | 4 +- + net/sctp/proc.c | 4 +- + net/socket.c | 121 ++- + net/unix/af_unix.c | 2 +- + net/unix/diag.c | 6 +- + net/x25/x25_proc.c | 4 +- + net/xdp/xsk_diag.c | 2 +- + security/apparmor/apparmorfs.c | 38 +- + security/integrity/integrity_audit.c | 2 +- + security/ipe/audit.c | 2 +- + security/lsm_audit.c | 10 +- + security/selinux/hooks.c | 10 +- + security/selinux/selinuxfs.c | 17 +- + security/smack/smack_lsm.c | 12 +- + tools/include/uapi/linux/mount.h | 14 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/filesystems/devpts_pts.c | 2 - + .../selftests/filesystems/fsmount_ns/.gitignore | 1 + + .../selftests/filesystems/fsmount_ns/Makefile | 10 + + .../filesystems/fsmount_ns/fsmount_ns_test.c | 1138 ++++++++++++++++++++ + .../selftests/filesystems/move_mount/.gitignore | 2 + + .../selftests/filesystems/move_mount/Makefile | 10 + + .../filesystems/move_mount/move_mount_test.c | 492 +++++++++ + .../selftests/filesystems/open_tree_ns/Makefile | 2 +- + .../filesystems/open_tree_ns/open_tree_ns_test.c | 43 +- + .../selftests/filesystems/statmount/statmount.h | 51 + + .../filesystems/statmount/statmount_test.c | 45 +- + .../testing/selftests/filesystems/xattr/.gitignore | 3 + + tools/testing/selftests/filesystems/xattr/Makefile | 6 + + .../filesystems/xattr/xattr_socket_test.c | 470 ++++++++ + .../filesystems/xattr/xattr_socket_types_test.c | 177 +++ + .../filesystems/xattr/xattr_sockfs_test.c | 363 +++++++ + tools/testing/selftests/pidfd/.gitignore | 1 + + tools/testing/selftests/pidfd/Makefile | 2 +- + .../testing/selftests/pidfd/pidfd_autoreap_test.c | 900 ++++++++++++++++ + 304 files changed, 6423 insertions(+), 2290 deletions(-) + create mode 100644 block/bio-integrity-fs.c + create mode 100644 tools/testing/selftests/filesystems/fsmount_ns/.gitignore + create mode 100644 tools/testing/selftests/filesystems/fsmount_ns/Makefile + create mode 100644 tools/testing/selftests/filesystems/fsmount_ns/fsmount_ns_test.c + create mode 100644 tools/testing/selftests/filesystems/move_mount/.gitignore + create mode 100644 tools/testing/selftests/filesystems/move_mount/Makefile + create mode 100644 tools/testing/selftests/filesystems/move_mount/move_mount_test.c + create mode 100644 tools/testing/selftests/filesystems/xattr/.gitignore + create mode 100644 tools/testing/selftests/filesystems/xattr/Makefile + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_socket_test.c + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_socket_types_test.c + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_sockfs_test.c + create mode 100644 tools/testing/selftests/pidfd/pidfd_autoreap_test.c +$ git am -3 ../patches/0001-ntfs-Fixup-merge-issue-with-vfs.all-changes.patch +Applying: ntfs: Fixup merge issue with vfs.all changes +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ntfs/mft.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[fs-next e9fd8517d65f7] next-20260312/vfs-brauner + Date: Mon Mar 30 13:09:19 2026 +0100 +Merging vfs/for-next (0787a93baa1aa sysfs(2): fs_index() argument is _not_ a pathname) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (af42d6d3650b9 mm/damon/sysfs: dealloc repeat_call_control if damon_call() fails) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + kernel/liveupdate/luo_flb.c | 16 ++++++++++++++++ + kernel/liveupdate/luo_session.c | 9 +++++++-- + mm/damon/sysfs.c | 3 ++- + mm/filemap.c | 11 ++++++++--- + mm/hugetlb.c | 1 + + mm/page-writeback.c | 21 +++++++++++++++++++++ + 6 files changed, 55 insertions(+), 6 deletions(-) +Merging fs-current (500fb50a42284 Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. + fs/udf/super.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kbuild-current/kbuild-fixes-for-next (f2b35ac51508c modpost: Declare extra_warn with unused attribute) +$ git merge -m Merge branch 'kbuild-fixes-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild-current/kbuild-fixes-for-next +Merge made by the 'ort' strategy. + scripts/Makefile.package | 3 ++- + scripts/mod/modpost.c | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging arc-current/for-curr (d7b8f8e20813f Linux 6.16-rc5) +$ git merge -m Merge branch 'for-curr' of https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (23ea2a4c72323 ARM: 9468/1: fix memset64() on big-endian) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (8c6e9b60f5c79 arm64: realm: Fix PTE_NS_SHARED for 52bit PA support) +$ git merge -m Merge branch 'for-next/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (55372ab135a8e Merge tag 'v7.0-rockchip-dtsfixes1-v2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/nxp/imx/imx6-logicpd-som.dtsi | 6 +---- + arch/arm/boot/dts/nxp/imx/imx6qdl-icore.dtsi | 6 +---- + .../boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi | 6 +---- + .../dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi | 6 +---- + arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi | 6 +---- + arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi | 6 +---- + arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts | 6 +---- + arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi | 6 +---- + .../dts/nxp/imx/imx6ul-phytec-phycore-som.dtsi | 6 +---- + arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi | 6 +---- + arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi | 12 ++++------ + .../boot/dts/nxp/imx/imx6ull-engicam-microgea.dtsi | 12 ++++------ + .../boot/dts/nxp/imx/imx6ull-myir-mys-6ulx.dtsi | 6 +---- + arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts | 6 +---- + arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi | 8 ++----- + .../arm64/boot/dts/freescale/imx8mq-librem5-r3.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 24 ++++++-------------- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx91-tqma9131.dtsi | 20 ++++++++--------- + arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts | 2 ++ + arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi | 26 +++++++++++----------- + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 18 --------------- + 22 files changed, 56 insertions(+), 142 deletions(-) +Merging davinci-current/davinci/for-current (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'davinci/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (6de23f81a5e08 Linux 7.0-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 (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b428 Linux 6.15-rc1) +$ git merge -m Merge branch 'soc-fixes' of https://github.com/sophgo/linux.git sophgo-soc-fixes/soc-fixes +Already up to date. +Merging m68k-current/for-linus (cb39cf99d88e8 m68k: sun3: Replace vsprintf() with bounded vsnprintf()) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (f338e77383789 Linux 7.0-rc4) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (c8d46f17c2fc7 s390/zcrypt: Fix memory leak with CCA cards used as accelerator) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + arch/s390/kernel/perf_cpum_sf.c | 6 +++++- + drivers/s390/crypto/zcrypt_msgtype6.c | 32 ++++++++++++++------------------ + 2 files changed, 19 insertions(+), 19 deletions(-) +Merging net/main (dc9e9d61e301c Merge branch 'net-enetc-add-more-checks-to-enetc_set_rxfh') +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 13 ++- + drivers/net/ethernet/freescale/enetc/enetc4_hw.h | 11 ++ + drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 118 ++++++++++++++++++--- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 10 +- + drivers/net/ethernet/freescale/fec_ptp.c | 3 - + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 21 +++- + drivers/net/ethernet/meta/fbnic/fbnic_debugfs.c | 2 +- + drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 6 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 7 ++ + drivers/net/ethernet/ti/icssg/icssg_common.c | 2 +- + drivers/net/phy/sfp.c | 7 +- + drivers/net/vxlan/vxlan_core.c | 6 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 15 ++- + drivers/net/wireless/ath/ath12k/dp_rx.c | 4 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 5 + + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 10 ++ + drivers/net/wireless/intel/iwlwifi/mld/iface.c | 101 ++++++++++++------ + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 19 ++++ + drivers/net/wireless/intel/iwlwifi/mld/mld.c | 1 + + drivers/net/wireless/intel/iwlwifi/mld/mlo.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mld/notif.c | 5 + + drivers/net/wireless/intel/iwlwifi/mld/scan.c | 30 +++++- + drivers/net/wireless/intel/iwlwifi/mld/scan.h | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 3 +- + drivers/net/wireless/microchip/wilc1000/hif.c | 2 +- + drivers/net/wireless/ti/wl1251/tx.c | 8 +- + drivers/net/wireless/virtual/virt_wifi.c | 1 - + include/linux/skbuff.h | 1 + + include/net/netns/mpls.h | 1 + + net/bridge/br_arp_nd_proxy.c | 18 ++-- + net/ipv6/icmp.c | 3 + + net/ipv6/ioam6.c | 4 +- + net/ipv6/ip6_tunnel.c | 5 + + net/ipv6/ndisc.c | 3 + + net/mpls/af_mpls.c | 29 ++++- + net/qrtr/af_qrtr.c | 31 +++--- + net/sched/sch_hfsc.c | 4 +- + .../tc-testing/tc-tests/infra/qdiscs.json | 25 +++++ + 40 files changed, 433 insertions(+), 118 deletions(-) +Merging bpf/master (c369299895a59 Linux 7.0-rc5) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master +Already up to date. +Merging ipsec/master (c4ea7d8907cf7 net: mana: fix use-after-free in add_adev() error path) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/main (db472c34a7477 Merge tag 'nf-26-03-26' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (db472c34a7477 Merge tag 'nf-26-03-26' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (45dbf8fcea4dc Merge tag 'wireless-2026-03-26' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging ath/for-current (45dbf8fcea4dc Merge tag 'wireless-2026-03-26' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Already up to date. +Merging iwlwifi/fixes (687a95d204e72 wifi: iwlwifi: mld: correctly set wifi generation data) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes +Already up to date. +Merging wpan/master (8ce4f287524c7 net: libwx: fix firmware mailbox abnormal return) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (e37afcb56ae07 RDMA/irdma: Harden depth calculation functions) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (f025ac8c698ac ALSA: usb-audio: Exclude Scarlett Solo 1st Gen from SKIP_IFACE_SETUP) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/hda/codecs/realtek/alc269.c | 11 +++++- + sound/hda/controllers/intel.c | 13 +++++++ + sound/pci/ctxfi/ctdaio.c | 82 ++++++++++++++++++++++++--------------- + sound/usb/caiaq/device.c | 2 +- + sound/usb/quirks.c | 3 ++ + 5 files changed, 78 insertions(+), 33 deletions(-) +Merging sound-asoc-fixes/for-linus (d40a198e2b782 ASoC: SOF: ipc4-topology: Allow bytes controls without initial payload) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Already up to date. +Merging regmap-fixes/for-linus (09e70e4f119ff regmap: Synchronize cache for the page selector) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (8121353a4bf8e rust: regulator: do not assume that regulator_get() returns non-null) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (b341c1176f2e0 spi: spi-fsl-lpspi: fix teardown order issue (UAF)) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (05f643d6f7e69 Documentation: PCI: Document PCIe TLP Header decoder for AER messages) +$ git merge -m Merge branch 'for-linus' of https://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 (c369299895a59 Linux 7.0-rc5) +$ git merge -m Merge branch 'driver-core-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (c369299895a59 Linux 7.0-rc5) +$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (f50200dd44125 usb: gadget: dummy_hcd: fix premature URB completion when ZLP follows partial transfer) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Merge made by the 'ort' strategy. + drivers/thunderbolt/nhi.c | 2 +- + drivers/usb/class/cdc-acm.c | 9 ++++++++ + drivers/usb/class/cdc-acm.h | 1 + + drivers/usb/class/usbtmc.c | 3 +++ + drivers/usb/core/hcd.c | 2 +- + drivers/usb/dwc3/dwc3-google.c | 5 +++-- + drivers/usb/gadget/function/u_ether.c | 16 +++++++------ + drivers/usb/gadget/udc/dummy_hcd.c | 42 ++++++++++++++++++++++------------- + drivers/usb/typec/ucsi/ucsi.c | 9 ++++++-- + 9 files changed, 60 insertions(+), 29 deletions(-) +Merging usb-serial-fixes/usb-linus (0e01c3416eb86 USB: serial: io_edgeport: add support for Blackbox IC135A) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/serial/io_edgeport.c | 3 +++ + drivers/usb/serial/io_usbvend.h | 1 + + drivers/usb/serial/option.c | 1 + + 3 files changed, 5 insertions(+) +Merging phy/fixes (7aaa8047eafd0 Linux 7.0-rc6) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (f338e77383789 Linux 7.0-rc4) +$ git merge -m Merge branch 'staging-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (d0b224cf9ab12 iio: light: veml6070: fix veml6070_read() return value) +$ git merge -m Merge branch 'fixes-togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/accel/adxl313_core.c | 2 + + drivers/iio/accel/adxl355_core.c | 2 +- + drivers/iio/accel/adxl380.c | 2 +- + drivers/iio/adc/ad4062.c | 8 ++-- + drivers/iio/adc/ade9000.c | 12 ++--- + drivers/iio/adc/aspeed_adc.c | 1 + + drivers/iio/adc/nxp-sar-adc.c | 9 ++-- + drivers/iio/adc/ti-adc161s626.c | 41 +++++++++-------- + drivers/iio/adc/ti-ads1018.c | 2 +- + drivers/iio/adc/ti-ads1119.c | 11 ++--- + drivers/iio/adc/ti-ads7950.c | 8 ++-- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 48 ++++++++++++-------- + drivers/iio/dac/ad5770r.c | 2 +- + drivers/iio/dac/mcp47feb02.c | 51 ++++++++++------------ + drivers/iio/gyro/mpu3050-core.c | 32 +++++++++----- + drivers/iio/imu/adis16550.c | 8 ++-- + drivers/iio/imu/bmi160/bmi160_core.c | 15 +++---- + drivers/iio/imu/bno055/bno055.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 15 ++++++- + drivers/iio/light/vcnl4035.c | 18 +++++--- + drivers/iio/light/veml6070.c | 4 +- + drivers/iio/orientation/hid-sensor-rotation.c | 24 ++++++++-- + drivers/iio/pressure/abp2030pa.c | 2 +- + drivers/iio/proximity/rfd77402.c | 7 +-- + include/linux/iio/iio.h | 12 +++++ + 25 files changed, 199 insertions(+), 139 deletions(-) +Merging counter-current/counter-current (2932095c114b9 counter: rz-mtu3-cnt: do not use struct rz_mtu3_channel's dev member) +$ git merge -m Merge branch 'counter-current' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Merge made by the 'ort' strategy. + drivers/counter/rz-mtu3-cnt.c | 67 ++++++++++++++++++++++--------------------- + 1 file changed, 35 insertions(+), 32 deletions(-) +Merging char-misc.current/char-misc-linus (80ffc54d0479c Merge tag 'iio-fixes-for-7.0c' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-linus) +$ git merge -m Merge branch 'char-misc-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Merge made by the 'ort' strategy. + drivers/interconnect/qcom/sm8450.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging soundwire-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (73a505dc48144 thunderbolt: Fix property read in nhi_wake_supported()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (7adaaee5edd35 Input: synaptics-rmi4 - fix a locking bug in an error path) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Auto-merging drivers/input/mouse/bcm5974.c +Merge made by the 'ort' strategy. + drivers/input/mouse/bcm5974.c | 42 ++++++++++++++++++++++++++++++++++- + drivers/input/rmi4/rmi_f54.c | 4 ++-- + drivers/input/serio/i8042-acpipnpio.h | 7 ++++++ + 3 files changed, 50 insertions(+), 3 deletions(-) +Merging crypto-current/master (62397b493e141 crypto: af-alg - fix NULL pointer dereference in scatterwalk) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Merge made by the 'ort' strategy. + crypto/af_alg.c | 4 +++- + crypto/deflate.c | 11 +++++++---- + drivers/crypto/caam/caamalg_qi2.c | 3 ++- + drivers/crypto/caam/caamhash.c | 3 ++- + drivers/crypto/tegra/tegra-se-aes.c | 11 +++++++---- + drivers/crypto/tegra/tegra-se-hash.c | 30 +++++++++++++++++------------- + 6 files changed, 38 insertions(+), 24 deletions(-) +Merging libcrypto-fixes/libcrypto-fixes (e5046823f8fa3 lib/crypto: chacha: Zeroize permuted_state before it leaves scope) +$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Merge made by the 'ort' strategy. + lib/crypto/chacha-block-generic.c | 4 ++++ + 1 file changed, 4 insertions(+) +Merging vfio-fixes/for-linus (e98137f0a874a vfio/pci: Fix double free in dma-buf feature) +$ git merge -m Merge branch 'for-linus' of https://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (7aaa8047eafd0 Linux 7.0-rc6) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-backlight-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (b9465b04de4b9 mtd: rawnand: pl353: make sure optimal timings are applied) +$ git merge -m Merge branch 'mtd/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (aa6e63373d91f mfd: ls2kbmc: Use PCI API instead of direct accesses) +$ git merge -m Merge branch 'for-mfd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Merge made by the 'ort' strategy. +Merging v4l-dvb-fixes/fixes (fb2d7bd146fa7 Merge remote-tracking branch 'media-pending/fixes' into HEAD) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. +Merging reset-fixes/reset/fixes (a0e0c2f8c5f32 reset: spacemit: k3: Decouple composite reset lines) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Merge made by the 'ort' strategy. + drivers/reset/core.c | 1 - + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 2 +- + drivers/reset/spacemit/reset-spacemit-k3.c | 60 +++++++++++++++----------- + include/dt-bindings/reset/spacemit,k3-resets.h | 48 +++++++++++++++------ + 4 files changed, 73 insertions(+), 38 deletions(-) +Merging mips-fixes/mips-fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'mips-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (907150bbe566e ARM: dts: microchip: sam9x7: fix gpio-lines count for pioB) +$ git merge -m Merge branch 'at91-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/microchip/sam9x7.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging omap-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (df83746075778 KVM: x86/mmu: Only WARN in direct MMUs when overwriting shadow-present SPTE) +$ 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 (0a28e06575b3f KVM: s390: Fix KVM_S390_VCPU_FAULT ioctl) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging kvm-arm-fixes/fixes (6f9fbd27cd2ee Merge branch kvm-arm64/spe-trbe-nvhe into kvmarm-master/next) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm-fixes/fixes +Auto-merging kernel/trace/ring_buffer.c +Auto-merging kernel/trace/trace.c +Auto-merging tools/include/uapi/linux/kvm.h +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Merge made by the 'ort' strategy. + Documentation/trace/index.rst | 11 + + Documentation/trace/remotes.rst | 66 + + Documentation/virt/kvm/api.rst | 6 +- + Documentation/virt/kvm/devices/arm-vgic-v5.rst | 50 + + Documentation/virt/kvm/devices/index.rst | 1 + + Documentation/virt/kvm/devices/vcpu.rst | 5 +- + arch/arm64/include/asm/el2_setup.h | 4 +- + arch/arm64/include/asm/kvm_asm.h | 13 +- + arch/arm64/include/asm/kvm_define_hypevents.h | 16 + + arch/arm64/include/asm/kvm_host.h | 48 + + arch/arm64/include/asm/kvm_hyp.h | 14 +- + arch/arm64/include/asm/kvm_hypevents.h | 60 + + arch/arm64/include/asm/kvm_hyptrace.h | 26 + + arch/arm64/include/asm/kvm_mmu.h | 4 + + arch/arm64/include/asm/sysreg.h | 13 +- + arch/arm64/include/asm/vncr_mapping.h | 3 + + arch/arm64/include/uapi/asm/kvm.h | 1 + + arch/arm64/kernel/hyp-stub.S | 1 - + arch/arm64/kernel/image-vars.h | 4 + + arch/arm64/kernel/vmlinux.lds.S | 18 + + arch/arm64/kvm/Kconfig | 68 +- + arch/arm64/kvm/Makefile | 2 + + arch/arm64/kvm/arch_timer.c | 102 +- + arch/arm64/kvm/arm.c | 56 +- + arch/arm64/kvm/config.c | 127 +- + arch/arm64/kvm/emulate-nested.c | 68 + + arch/arm64/kvm/handle_exit.c | 2 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 27 + + arch/arm64/kvm/hyp/include/nvhe/arm-smccc.h | 23 + + arch/arm64/kvm/hyp/include/nvhe/clock.h | 16 + + arch/arm64/kvm/hyp/include/nvhe/define_events.h | 14 + + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 2 - + arch/arm64/kvm/hyp/include/nvhe/trace.h | 70 + + arch/arm64/kvm/hyp/nvhe/Makefile | 8 +- + arch/arm64/kvm/hyp/nvhe/clock.c | 65 + + arch/arm64/kvm/hyp/nvhe/debug-sr.c | 116 +- + arch/arm64/kvm/hyp/nvhe/events.c | 25 + + arch/arm64/kvm/hyp/nvhe/ffa.c | 28 +- + arch/arm64/kvm/hyp/nvhe/host.S | 13 +- + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 41 +- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 103 +- + arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 6 + + arch/arm64/kvm/hyp/nvhe/mm.c | 4 +- + arch/arm64/kvm/hyp/nvhe/psci-relay.c | 45 +- + arch/arm64/kvm/hyp/nvhe/setup.c | 4 +- + arch/arm64/kvm/hyp/nvhe/stacktrace.c | 6 +- + arch/arm64/kvm/hyp/nvhe/switch.c | 22 +- + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 10 +- + arch/arm64/kvm/hyp/nvhe/trace.c | 306 +++++ + arch/arm64/kvm/hyp/vgic-v5-sr.c | 166 +++ + arch/arm64/kvm/hyp/vhe/Makefile | 2 +- + arch/arm64/kvm/hyp_trace.c | 442 +++++++ + arch/arm64/kvm/hyp_trace.h | 11 + + arch/arm64/kvm/mmu.c | 530 ++++---- + arch/arm64/kvm/nested.c | 11 +- + arch/arm64/kvm/pmu-emul.c | 20 +- + arch/arm64/kvm/ptdump.c | 79 +- + arch/arm64/kvm/stacktrace.c | 8 +- + arch/arm64/kvm/sys_regs.c | 200 ++- + arch/arm64/kvm/vgic/vgic-init.c | 232 +++- + arch/arm64/kvm/vgic/vgic-kvm-device.c | 107 +- + arch/arm64/kvm/vgic/vgic-mmio.c | 40 +- + arch/arm64/kvm/vgic/vgic-v3.c | 2 +- + arch/arm64/kvm/vgic/vgic-v5.c | 517 +++++++- + arch/arm64/kvm/vgic/vgic.c | 173 ++- + arch/arm64/kvm/vgic/vgic.h | 53 +- + arch/arm64/tools/sysreg | 480 +++++++ + drivers/irqchip/irq-gic-v5.c | 18 + + fs/tracefs/inode.c | 1 + + include/kvm/arm_arch_timer.h | 8 +- + include/kvm/arm_pmu.h | 5 +- + include/kvm/arm_vgic.h | 191 ++- + include/linux/irqchip/arm-gic-v5.h | 27 + + include/linux/kvm_host.h | 1 + + include/linux/ring_buffer.h | 58 + + include/linux/ring_buffer_types.h | 41 + + include/linux/simple_ring_buffer.h | 65 + + include/linux/trace_remote.h | 48 + + include/linux/trace_remote_event.h | 33 + + include/trace/define_remote_events.h | 73 ++ + include/uapi/linux/kvm.h | 2 + + include/uapi/linux/trace_mmap.h | 8 +- + kernel/trace/Kconfig | 14 + + kernel/trace/Makefile | 59 + + kernel/trace/remote_test.c | 261 ++++ + kernel/trace/remote_test_events.h | 10 + + kernel/trace/ring_buffer.c | 354 ++++- + kernel/trace/simple_ring_buffer.c | 517 ++++++++ + kernel/trace/trace.c | 4 +- + kernel/trace/trace.h | 7 + + kernel/trace/trace_remote.c | 1368 ++++++++++++++++++++ + tools/arch/arm64/include/uapi/asm/kvm.h | 1 + + tools/include/uapi/linux/kvm.h | 2 + + .../selftests/ftrace/test.d/remotes/buffer_size.tc | 25 + + .../selftests/ftrace/test.d/remotes/functions | 88 ++ + .../test.d/remotes/hypervisor/buffer_size.tc | 11 + + .../ftrace/test.d/remotes/hypervisor/reset.tc | 11 + + .../ftrace/test.d/remotes/hypervisor/trace.tc | 11 + + .../ftrace/test.d/remotes/hypervisor/trace_pipe.tc | 11 + + .../ftrace/test.d/remotes/hypervisor/unloading.tc | 11 + + .../selftests/ftrace/test.d/remotes/reset.tc | 90 ++ + .../selftests/ftrace/test.d/remotes/trace.tc | 127 ++ + .../selftests/ftrace/test.d/remotes/trace_pipe.tc | 127 ++ + .../selftests/ftrace/test.d/remotes/unloading.tc | 41 + + tools/testing/selftests/kvm/Makefile.kvm | 3 +- + tools/testing/selftests/kvm/arm64/no-vgic-v3.c | 177 --- + tools/testing/selftests/kvm/arm64/no-vgic.c | 297 +++++ + tools/testing/selftests/kvm/arm64/set_id_regs.c | 52 +- + tools/testing/selftests/kvm/arm64/vgic_v5.c | 228 ++++ + tools/testing/selftests/kvm/include/arm64/gic_v5.h | 150 +++ + 110 files changed, 8590 insertions(+), 862 deletions(-) + create mode 100644 Documentation/trace/remotes.rst + create mode 100644 Documentation/virt/kvm/devices/arm-vgic-v5.rst + create mode 100644 arch/arm64/include/asm/kvm_define_hypevents.h + create mode 100644 arch/arm64/include/asm/kvm_hypevents.h + create mode 100644 arch/arm64/include/asm/kvm_hyptrace.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/arm-smccc.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/clock.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/define_events.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/trace.h + create mode 100644 arch/arm64/kvm/hyp/nvhe/clock.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/events.c + create mode 100644 arch/arm64/kvm/hyp/nvhe/trace.c + create mode 100644 arch/arm64/kvm/hyp/vgic-v5-sr.c + create mode 100644 arch/arm64/kvm/hyp_trace.c + create mode 100644 arch/arm64/kvm/hyp_trace.h + create mode 100644 include/linux/ring_buffer_types.h + create mode 100644 include/linux/simple_ring_buffer.h + create mode 100644 include/linux/trace_remote.h + create mode 100644 include/linux/trace_remote_event.h + create mode 100644 include/trace/define_remote_events.h + create mode 100644 kernel/trace/remote_test.c + create mode 100644 kernel/trace/remote_test_events.h + create mode 100644 kernel/trace/simple_ring_buffer.c + create mode 100644 kernel/trace/trace_remote.c + create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/buffer_size.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/functions + create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/hypervisor/buffer_size.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/hypervisor/reset.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/hypervisor/trace.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/hypervisor/trace_pipe.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/hypervisor/unloading.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/reset.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/trace.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/trace_pipe.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/unloading.tc + delete mode 100644 tools/testing/selftests/kvm/arm64/no-vgic-v3.c + create mode 100644 tools/testing/selftests/kvm/arm64/no-vgic.c + create mode 100644 tools/testing/selftests/kvm/arm64/vgic_v5.c + create mode 100644 tools/testing/selftests/kvm/include/arm64/gic_v5.h +Merging hwmon-fixes/hwmon (a9d2fbd3ad0e6 hwmon: (ltc4286) Add missing MODULE_IMPORT_NS("PMBUS")) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/pmbus/ltc4286.c | 1 + + drivers/hwmon/pmbus/pxe1610.c | 5 ++++- + drivers/hwmon/pmbus/tps53679.c | 6 +++--- + 3 files changed, 8 insertions(+), 4 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (a8aec14230322 nvdimm/bus: Fix potential use after free in asynchronous initialization) +$ git merge -m Merge branch 'libnvdimm-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (be5c5280cf2b2 cxl: Adjust the startup priority of cxl_pmem to be higher than that of cxl_acpi) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/dma-mapping-fixes (3d48c9fd78dd0 dma-debug: suppress cacheline overlap warning when arch has no DMA alignment requirement) +$ git merge -m Merge branch 'dma-mapping-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes +Merge made by the 'ort' strategy. + kernel/dma/debug.c | 1 + + 1 file changed, 1 insertion(+) +Merging drivers-x86-fixes/fixes (fbddf68d7b4e1 platform/x86: ISST: Correct locked bit width) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (81122fba08fa3 of: fix reference count leak in of_alias_scan()) +$ git merge -m Merge branch 'dt/linus' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (01f784fc9d0ab scsi: target: file: Use kzalloc_flex for aio_cmd) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (7aaa8047eafd0 Linux 7.0-rc6) +$ 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 (4dfce79e09891 drm/i915/dsi: Don't do DSC horizontal timing adjustments in command mode) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/icl_dsi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging mmc-fixes/fixes (5e3486e64094c mmc: sdhci: fix timing selection for 1-bit bus width) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'rtc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (f338e77383789 Linux 7.0-rc4) +$ git merge -m Merge branch 'gnss-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (7b3b1e5a87b2f PCI: hv: Set default NUMA node to 0 for devices without affinity info) +$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + drivers/pci/controller/pci-hyperv.c | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging risc-v-fixes/fixes (5ccc568075c91 selftests: riscv: Add license to cfi selftest) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Auto-merging arch/riscv/kvm/vcpu_pmu.c +Merge made by the 'ort' strategy. + arch/riscv/Makefile | 4 ++-- + arch/riscv/errata/thead/errata.c | 2 +- + arch/riscv/include/asm/atomic.h | 4 ++-- + arch/riscv/include/asm/elf.h | 4 ++-- + arch/riscv/include/asm/page.h | 5 ++++- + arch/riscv/include/asm/processor.h | 2 +- + arch/riscv/include/asm/thread_info.h | 2 +- + arch/riscv/include/uapi/asm/ptrace.h | 1 + + arch/riscv/kernel/acpi.c | 2 +- + arch/riscv/kernel/ftrace.c | 2 +- + arch/riscv/kernel/head.S | 2 +- + arch/riscv/kernel/kgdb.c | 7 ++++--- + arch/riscv/kernel/mcount-dyn.S | 2 +- + arch/riscv/kernel/module-sections.c | 2 +- + arch/riscv/kernel/patch.c | 21 +++++++++++---------- + arch/riscv/kernel/probes/kprobes.c | 2 +- + arch/riscv/kernel/probes/uprobes.c | 2 +- + arch/riscv/kernel/smpboot.c | 8 ++------ + arch/riscv/kernel/soc.c | 2 +- + arch/riscv/kernel/suspend.c | 2 +- + arch/riscv/kernel/vmcore_info.c | 7 +++++++ + arch/riscv/kvm/tlb.c | 2 +- + arch/riscv/kvm/vcpu_pmu.c | 2 +- + arch/riscv/lib/csum.c | 2 +- + arch/riscv/lib/memmove.S | 4 ++-- + arch/riscv/mm/cacheflush.c | 2 +- + arch/riscv/mm/init.c | 5 ----- + arch/riscv/mm/physaddr.c | 4 ++-- + tools/testing/selftests/riscv/cfi/Makefile | 2 ++ + tools/testing/selftests/riscv/vector/Makefile | 7 +++++-- + .../selftests/riscv/vector/validate_v_ptrace.c | 1 + + 31 files changed, 63 insertions(+), 53 deletions(-) +Merging riscv-dt-fixes/riscv-dt-fixes (305f2865bd034 riscv: dts: starfive: jh7110-common: fix jh7110 SoC boot from SD-card.) +$ git merge -m Merge branch 'riscv-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 1 + + arch/riscv/boot/dts/starfive/jh7110-milkv-marscm-lite.dts | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging riscv-soc-fixes/riscv-soc-fixes (c7596f9001e2b firmware: microchip: fail auto-update probe if no flash found) +$ git merge -m Merge branch 'riscv-soc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Auto-merging drivers/firmware/microchip/mpfs-auto-update.c +Merge made by the 'ort' strategy. + drivers/firmware/microchip/mpfs-auto-update.c | 10 ++++++---- + drivers/soc/microchip/mpfs-control-scb.c | 6 ++++-- + drivers/soc/microchip/mpfs-mss-top-sysreg.c | 6 ++++-- + 3 files changed, 14 insertions(+), 8 deletions(-) +Merging fpga-fixes/fixes (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (ebf1bafd09079 LICENSES: Explicitly allow SPDX-FileCopyrightText) +$ git merge -m Merge branch 'spdx-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Merge made by the 'ort' strategy. + Documentation/process/license-rules.rst | 7 +++++-- + scripts/checkpatch.pl | 8 ++++++++ + 2 files changed, 13 insertions(+), 2 deletions(-) +Merging gpio-brgl-fixes/gpio/for-current (6b5ef8c88854b dt-bindings: gpio: fix microchip #interrupt-cells) +$ git merge -m Merge branch 'gpio/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'ort' strategy. + .../bindings/gpio/microchip,mpfs-gpio.yaml | 4 +- + drivers/gpio/gpio-mxc.c | 10 +- + drivers/gpio/gpio-qixis-fpga.c | 4 +- + drivers/gpio/gpiolib-shared.c | 57 ++++++--- + drivers/gpio/gpiolib-shared.h | 11 +- + drivers/gpio/gpiolib.c | 135 ++++++++++----------- + include/linux/gpio/gpio-nomadik.h | 12 +- + include/linux/timb_gpio.h | 6 +- + 8 files changed, 135 insertions(+), 104 deletions(-) +Merging gpio-intel-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (7f138de156b20 auxdisplay: line-display: fix NULL dereference in linedisp_release) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Merge made by the 'ort' strategy. + .../devicetree/bindings/auxdisplay/holtek,ht16k33.yaml | 2 +- + drivers/auxdisplay/lcd2s.c | 15 ++++++++++++--- + drivers/auxdisplay/line-display.c | 2 +- + 3 files changed, 14 insertions(+), 5 deletions(-) +Merging kunit-fixes/kunit-fixes (8b8f1d5e350ac kunit: Add documentation of --list_suites) +$ git merge -m Merge branch 'kunit-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging memblock-fixes/fixes (f043a93fff9e3 mm: numa_memblks: Identify the accurate NUMA ID of CFMW) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging renesas-fixes/fixes (7e8aec50597bf Merge branch 'renesas-pinctrl-fixes-for-v7.0' into renesas-fixes) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Merge made by the 'ort' strategy. + .../boot/dts/renesas/r8a779g3-sparrow-hawk.dts | 11 +++++ + drivers/clk/renesas/r9a09g056-cpg.c | 36 +++++++------- + drivers/clk/renesas/r9a09g057-cpg.c | 55 ++++++++-------------- + 3 files changed, 49 insertions(+), 53 deletions(-) +Merging perf-current/perf-tools (bbeb83d3182ab Merge tag 'kbuild-fixes-7.0-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux) +$ git merge -m Merge branch 'perf-tools' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (217c0a5c177a3 x86/efi: efi_unmap_boot_services: fix calculation of ranges_to_free size) +$ git merge -m Merge branch 'urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging battery-fixes/fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (11439c4635edd Linux 7.0-rc2) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (7aaa8047eafd0 Linux 7.0-rc6) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging w1-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (b826d2c0b0ecb pmdomain: bcm: bcm2835-power: Increase ASB control timeout) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging i2c-host-fixes/i2c/i2c-host-fixes (7aaa8047eafd0 Linux 7.0-rc6) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Already up to date. +Merging i2c-rust-fixes/rust-i2c-fixes (bf074eb6891be rust: str: improve safety comment for CString::try_from_fmt) +$ git merge -m Merge branch 'rust-i2c-fixes' of https://github.com/ikrtn/rust-for-linux i2c-rust-fixes/rust-i2c-fixes +Auto-merging rust/kernel/str.rs +Merge made by the 'ort' strategy. + .clippy.toml | 10 ++++++++++ + rust/helpers/clk.c | 24 +++++++++++++----------- + rust/helpers/jump_label.c | 2 +- + rust/kernel/i2c.rs | 13 ++++++------- + rust/kernel/str.rs | 27 +++++++++++++++++++++++---- + rust/kernel/task.rs | 7 +++---- + rust/kernel/types.rs | 2 -- + rust/kernel/usb.rs | 6 ++---- + 8 files changed, 58 insertions(+), 33 deletions(-) +Merging sparc-fixes/for-linus (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (e7a45dec40c7a Merge tag 'renesas-clk-fixes-for-v7.0-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-fixes) +$ git merge -m Merge branch 'clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Merge made by the 'ort' strategy. +Merging thead-clk-fixes/thead-clk-fixes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'thead-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk-fixes/thead-clk-fixes +Already up to date. +Merging tenstorrent-clk-fixes/tenstorrent-clk-fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'tenstorrent-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-clk-fixes/tenstorrent-clk-fixes +Already up to date. +Merging pwrseq-fixes/pwrseq/for-current (f338e77383789 Linux 7.0-rc4) +$ git merge -m Merge branch 'pwrseq/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current +Already up to date. +Merging thead-dt-fixes/thead-dt-fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt-fixes/thead-dt-fixes +Already up to date. +Merging ftrace-fixes/ftrace/fixes (1650a1b6cb1ae fgraph: Check ftrace_pids_enabled on registration for early filtering) +$ git merge -m Merge branch 'ftrace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes +Already up to date. +Merging ring-buffer-fixes/ring-buffer/fixes (b042fdf18e89a tracing: Fix WARN_ON in tracing_buffers_mmap_close for split VMAs) +$ git merge -m Merge branch 'ring-buffer/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ring-buffer-fixes/ring-buffer/fixes +Already up to date. +Merging trace-fixes/trace/fixes (250ab25391ede tracing: Drain deferred trigger frees if kthread creation fails) +$ git merge -m Merge branch 'trace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes +Already up to date. +Merging tracefs-fixes/tracefs/fixes (8b55572e51805 tracing/selftests: Add tracefs mount options test) +$ git merge -m Merge branch 'tracefs/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes +Already up to date. +Merging spacemit-fixes/fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/spacemit-com/linux spacemit-fixes/fixes +Already up to date. +Merging tip-fixes/tip/urgent (7aaa8047eafd0 Linux 7.0-rc6) +$ git merge -m Merge branch 'tip/urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Already up to date. +Merging slab-fixes/slab/for-next-fixes (464b1c115852f slab: fix memory leak when refill_sheaf() fails) +$ git merge -m Merge branch 'slab/for-next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes +Already up to date. +Merging drm-msm-fixes/msm-fixes (e4eb11b34d6c8 drm/msm/dsi: fix pclk rate calculation for bonded dsi) +$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes +Already up to date. +Merging uml-fixes/fixes (df447a3b4a4b9 um: Fix FD copy size in os_rcv_fd_msg()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging fwctl-fixes/for-rc (11439c4635edd Linux 7.0-rc2) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl-fixes/for-rc +Already up to date. +Merging devsec-tsm-fixes/fixes (c3fd16c3b98ed virt: tdx-guest: Fix handling of host controlled 'quote' buffer length) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm-fixes/fixes +Already up to date. +Merging drm-rust-fixes/drm-rust-fixes (f338e77383789 Linux 7.0-rc4) +$ git merge -m Merge branch 'drm-rust-fixes' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-fixes/drm-rust-fixes +Already up to date. +Merging tenstorrent-dt-fixes/tenstorrent-dt-fixes (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'tenstorrent-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-dt-fixes/tenstorrent-dt-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (2f42c1a616164 drm/ast: dp501: Fix initialization of SCU2C) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/accel/qaic/qaic_control.c | 47 +++++++++++++++++++++++++++++++++++++-- + drivers/gpu/drm/ast/ast_dp501.c | 2 +- + drivers/gpu/drm/drm_bridge.c | 16 ++++++++----- + drivers/gpu/drm/drm_file.c | 5 +---- + drivers/gpu/drm/drm_mode_config.c | 9 +++----- + 5 files changed, 61 insertions(+), 18 deletions(-) +Merging rust/rust-next (3a2486cc1da5c kbuild: rust: provide an option to inline C helpers into Rust) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging init/Kconfig +Auto-merging rust/Makefile +Auto-merging rust/kernel/lib.rs +Auto-merging rust/kernel/ptr.rs +Auto-merging scripts/Makefile.build +CONFLICT (content): Merge conflict in scripts/Makefile.build +Recorded preimage for 'scripts/Makefile.build' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'scripts/Makefile.build'. +[master 0823bd80eefb6] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 4 + + MAINTAINERS | 1 + + Makefile | 3 +- + init/Kconfig | 15 +++ + lib/Kconfig.debug | 17 +++ + rust/Makefile | 31 +++++- + rust/exports.c | 5 +- + rust/helpers/helpers.c | 29 +++++ + rust/kernel/alloc/kvec/errors.rs | 3 + + rust/kernel/build_assert.rs | 193 +++++++++++++++++++++++++++------ + rust/kernel/error.rs | 6 + + rust/kernel/lib.rs | 2 - + rust/kernel/list.rs | 22 +++- + rust/kernel/list/arc.rs | 1 + + rust/kernel/list/arc_field.rs | 1 + + rust/kernel/list/impl_list_item_mod.rs | 3 + + rust/kernel/num/bounded.rs | 24 ++-- + rust/kernel/prelude.rs | 9 +- + rust/kernel/ptr.rs | 12 +- + rust/kernel/static_assert.rs | 39 ------- + rust/kernel/xarray.rs | 1 + + scripts/Makefile.build | 10 +- + 22 files changed, 320 insertions(+), 111 deletions(-) + delete mode 100644 rust/kernel/static_assert.rs +Merging rust-interop/interop-next (05f7e89ab9731 Linux 6.19) +$ git merge -m Merge branch 'interop-next' of https://github.com/Rust-for-Linux/linux.git rust-interop/interop-next +Already up to date. +Merging rust-alloc/alloc-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'alloc-next' of https://github.com/Rust-for-Linux/linux.git rust-alloc/alloc-next +Already up to date. +Merging rust-io/io-next (86731a2a651e5 Linux 6.16-rc3) +$ git merge -m Merge branch 'io-next' of https://github.com/Rust-for-Linux/linux.git rust-io/io-next +Already up to date. +Merging rust-pin-init/pin-init-next (09808839c7aa6 rust: pin-init: replace `addr_of_mut!` with `&raw mut`) +$ git merge -m Merge branch 'pin-init-next' of https://github.com/Rust-for-Linux/linux.git rust-pin-init/pin-init-next +Auto-merging rust/Makefile +Merge made by the 'ort' strategy. + rust/Makefile | 4 +- + rust/pin-init/README.md | 3 +- + rust/pin-init/examples/big_struct_in_place.rs | 3 ++ + rust/pin-init/examples/linked_list.rs | 3 +- + rust/pin-init/examples/mutex.rs | 3 +- + rust/pin-init/examples/pthread_mutex.rs | 3 +- + rust/pin-init/examples/static_init.rs | 3 +- + rust/pin-init/internal/src/init.rs | 14 +++-- + rust/pin-init/internal/src/lib.rs | 2 +- + rust/pin-init/src/lib.rs | 73 ++++++++++++++++++--------- + 10 files changed, 75 insertions(+), 36 deletions(-) +Merging rust-timekeeping/timekeeping-next (ddb1444d33351 hrtimer: add usage examples to documentation) +$ git merge -m Merge branch 'timekeeping-next' of https://github.com/Rust-for-Linux/linux.git rust-timekeeping/timekeeping-next +Merge made by the 'ort' strategy. + rust/kernel/time.rs | 32 ++++- + rust/kernel/time/hrtimer.rs | 336 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 362 insertions(+), 6 deletions(-) +Merging rust-xarray/xarray-next (c455f19bbe610 rust: xarray: add __rust_helper to helpers) +$ git merge -m Merge branch 'xarray-next' of https://github.com/Rust-for-Linux/linux.git rust-xarray/xarray-next +Already up to date. +Merging rust-analyzer/rust-analyzer-next (5c8d16ac49405 scripts: generate_rust_analyzer.py: reduce cfg plumbing) +$ git merge -m Merge branch 'rust-analyzer-next' of https://github.com/Rust-for-Linux/linux.git rust-analyzer/rust-analyzer-next +Auto-merging rust/Makefile +Merge made by the 'ort' strategy. + rust/Makefile | 2 + + scripts/generate_rust_analyzer.py | 286 ++++++++++++++++++++++++++++---------- + 2 files changed, 211 insertions(+), 77 deletions(-) +Merging mm-stable/mm-stable (bc2e0d3bf965b selftests/mm: add folio_split() and filemap_get_entry() race test) +$ git merge -m Merge branch 'mm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging MAINTAINERS +Auto-merging arch/riscv/mm/init.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/page-io.c +Auto-merging init/Kconfig +Auto-merging mm/filemap.c +Auto-merging mm/hugetlb.c +Auto-merging mm/memory.c +Auto-merging mm/mempolicy.c +Auto-merging mm/page-writeback.c +Auto-merging mm/pagewalk.c +Auto-merging mm/swap_state.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-kernel-mm-damon | 6 + + Documentation/admin-guide/blockdev/zram.rst | 47 +- + Documentation/admin-guide/cgroup-v2.rst | 5 + + Documentation/admin-guide/kdump/vmcoreinfo.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 6 + + Documentation/admin-guide/mm/damon/lru_sort.rst | 13 +- + Documentation/admin-guide/mm/damon/reclaim.rst | 9 + + Documentation/admin-guide/mm/damon/stat.rst | 5 + + Documentation/admin-guide/mm/damon/usage.rst | 16 +- + Documentation/admin-guide/mm/kho.rst | 53 +- + .../admin-guide/mm/numa_memory_policy.rst | 2 +- + Documentation/core-api/kho/abi.rst | 6 + + Documentation/core-api/kho/index.rst | 18 +- + Documentation/dev-tools/kasan.rst | 3 - + Documentation/dev-tools/kfence.rst | 7 + + Documentation/mm/damon/design.rst | 33 +- + Documentation/mm/damon/index.rst | 2 +- + Documentation/mm/damon/maintainer-profile.rst | 8 +- + Documentation/mm/hugetlbfs_reserv.rst | 2 +- + Documentation/mm/vmemmap_dedup.rst | 62 +- + MAINTAINERS | 5 + + arch/alpha/include/asm/pgtable.h | 6 - + arch/arc/include/asm/pgtable.h | 3 - + arch/arc/mm/init.c | 2 - + arch/arm/include/asm/pgtable.h | 9 - + arch/arm/mm/mmu.c | 7 - + arch/arm/mm/nommu.c | 7 - + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/pgtable.h | 55 +- + arch/arm64/include/asm/pkeys.h | 3 +- + arch/arm64/mm/contpte.c | 14 +- + arch/arm64/mm/gcs.c | 14 +- + arch/arm64/mm/init.c | 5 + + arch/arm64/mm/mmu.c | 9 +- + arch/csky/include/asm/pgtable.h | 3 - + arch/csky/mm/init.c | 3 - + arch/hexagon/include/asm/pgtable.h | 6 - + arch/hexagon/kernel/head.S | 5 - + arch/hexagon/kernel/hexagon_ksyms.c | 1 - + arch/loongarch/Kconfig | 1 - + arch/loongarch/include/asm/pgtable.h | 12 +- + arch/loongarch/mm/init.c | 3 - + arch/m68k/include/asm/pgtable_mm.h | 9 - + arch/m68k/include/asm/pgtable_no.h | 7 - + arch/m68k/mm/init.c | 9 - + arch/m68k/mm/mcfmmu.c | 2 - + arch/m68k/mm/motorola.c | 6 - + arch/m68k/mm/sun3mmu.c | 2 - + arch/microblaze/include/asm/pgtable.h | 12 +- + arch/microblaze/kernel/head.S | 4 - + arch/microblaze/kernel/microblaze_ksyms.c | 2 - + arch/mips/mm/init.c | 11 +- + arch/nios2/include/asm/pgtable.h | 7 - + arch/nios2/kernel/head.S | 10 - + arch/nios2/kernel/nios2_ksyms.c | 1 - + arch/openrisc/include/asm/pgtable.h | 4 - + arch/openrisc/kernel/head.S | 3 - + arch/openrisc/kernel/or32_ksyms.c | 1 - + arch/openrisc/mm/init.c | 3 - + arch/parisc/include/asm/pgtable.h | 20 +- + arch/parisc/kernel/cache.c | 8 +- + arch/parisc/mm/init.c | 6 - + arch/powerpc/Kconfig | 1 - + arch/powerpc/include/asm/book3s/32/pgtable.h | 4 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 26 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- + arch/powerpc/include/asm/nohash/pgtable.h | 4 +- + arch/powerpc/include/asm/pgtable.h | 6 - + arch/powerpc/include/asm/pkeys.h | 8 +- + arch/powerpc/kvm/book3s_hv.c | 1 - + arch/powerpc/mm/book3s64/pgtable.c | 8 +- + arch/powerpc/mm/book3s64/pkeys.c | 3 +- + arch/powerpc/mm/mem.c | 3 - + arch/powerpc/platforms/book3s/vas-api.c | 2 +- + arch/powerpc/platforms/pseries/vas.c | 2 +- + arch/riscv/Kconfig | 1 - + arch/riscv/include/asm/pgtable.h | 23 +- + arch/riscv/kernel/usercfi.c | 12 +- + arch/riscv/mm/init.c | 7 +- + arch/riscv/mm/pgtable.c | 7 +- + arch/s390/Kconfig | 1 - + arch/s390/include/asm/pgtable.h | 16 +- + arch/s390/mm/gmap_helpers.c | 2 +- + arch/s390/mm/init.c | 4 +- + arch/sh/include/asm/pgtable.h | 8 - + arch/sh/include/asm/setup.h | 3 +- + arch/sh/kernel/head_32.S | 4 +- + arch/sh/kernel/sh_ksyms_32.c | 1 - + arch/sh/mm/init.c | 1 - + arch/sparc/include/asm/pgtable_32.h | 8 - + arch/sparc/include/asm/pgtable_64.h | 3 - + arch/sparc/include/asm/setup.h | 2 - + arch/sparc/kernel/head_32.S | 7 - + arch/sparc/mm/init_32.c | 4 - + arch/sparc/mm/init_64.c | 71 +- + arch/um/include/asm/pgtable.h | 9 - + arch/um/include/shared/kern_util.h | 1 - + arch/um/kernel/mem.c | 16 - + arch/um/kernel/um_arch.c | 1 - + arch/x86/Kconfig | 1 - + arch/x86/entry/vdso/vdso32/fake_32bit_build.h | 1 + + arch/x86/include/asm/pgtable.h | 28 +- + arch/x86/include/asm/pkeys.h | 3 +- + arch/x86/kernel/cpu/sgx/encl.c | 2 +- + arch/x86/kernel/fpu/xstate.c | 3 +- + arch/x86/kernel/head_32.S | 4 - + arch/x86/kernel/head_64.S | 7 - + arch/x86/kernel/shstk.c | 12 +- + arch/x86/kvm/mmu/spte.h | 2 +- + arch/x86/mm/pgtable.c | 28 +- + arch/x86/mm/pkeys.c | 3 +- + arch/xtensa/include/asm/pgtable.h | 13 +- + arch/xtensa/kernel/head.S | 3 - + arch/xtensa/kernel/xtensa_ksyms.c | 2 - + drivers/android/binder/page_range.rs | 4 +- + drivers/android/binder_alloc.c | 2 +- + drivers/base/memory.c | 4 +- + drivers/block/zram/backend_lz4.c | 29 +- + drivers/block/zram/zcomp.c | 9 +- + drivers/block/zram/zcomp.h | 2 +- + drivers/block/zram/zram_drv.c | 273 ++- + drivers/block/zram/zram_drv.h | 1 - + drivers/char/mem.c | 2 +- + drivers/comedi/comedi_fops.c | 2 +- + drivers/dax/device.c | 2 +- + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- + drivers/gpu/drm/i915/i915_mm.c | 4 +- + drivers/hv/hv_balloon.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 6 +- + drivers/misc/sgi-gru/grumain.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- + drivers/virtio/virtio_balloon.c | 10 +- + fs/afs/internal.h | 1 - + fs/afs/write.c | 1 - + fs/btrfs/compression.c | 2 +- + fs/btrfs/extent_io.c | 6 +- + fs/btrfs/tests/extent-io-tests.c | 2 +- + fs/buffer.c | 2 +- + fs/ceph/addr.c | 2 +- + fs/dax.c | 3 +- + fs/erofs/data.c | 3 +- + fs/ext4/file.c | 1 - + fs/ext4/inode.c | 2 +- + fs/ext4/page-io.c | 1 - + fs/ext4/readpage.c | 1 - + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/compress.c | 2 +- + fs/f2fs/data.c | 2 +- + fs/f2fs/f2fs.h | 2 - + fs/f2fs/file.c | 1 - + fs/f2fs/node.c | 2 +- + fs/gfs2/aops.c | 2 +- + fs/hugetlbfs/inode.c | 22 +- + fs/mpage.c | 1 - + fs/netfs/buffered_write.c | 1 - + fs/nfs/blocklayout/blocklayout.c | 1 - + fs/nfs/dir.c | 1 - + fs/nilfs2/btree.c | 2 +- + fs/nilfs2/page.c | 2 +- + fs/nilfs2/segment.c | 2 +- + fs/ntfs3/file.c | 2 +- + fs/ocfs2/refcounttree.c | 1 - + fs/proc/meminfo.c | 3 +- + fs/proc/vmcore.c | 2 +- + fs/pstore/ram_core.c | 2 +- + fs/ramfs/file-nommu.c | 2 +- + fs/resctrl/pseudo_lock.c | 2 +- + fs/smb/client/connect.c | 1 - + fs/smb/client/file.c | 1 - + fs/zonefs/file.c | 3 +- + include/asm-generic/tlb.h | 4 + + include/linux/damon.h | 18 +- + include/linux/dax.h | 4 +- + include/linux/{pagevec.h => folio_batch.h} | 16 +- + include/linux/folio_queue.h | 8 +- + include/linux/huge_mm.h | 5 + + include/linux/hugetlb.h | 31 +- + include/linux/hugetlb_inline.h | 4 +- + include/linux/iomap.h | 2 +- + include/linux/kasan.h | 8 +- + include/linux/kho/abi/kexec_handover.h | 144 +- + include/linux/kho/abi/memfd.h | 18 +- + include/linux/kho_radix_tree.h | 70 + + include/linux/maple_tree.h | 42 + + include/linux/memcontrol.h | 2 +- + include/linux/memfd.h | 12 + + include/linux/memory-tiers.h | 2 +- + include/linux/memory.h | 3 +- + include/linux/memory_hotplug.h | 18 +- + include/linux/mm.h | 218 +- + include/linux/mm_inline.h | 16 +- + include/linux/mm_types.h | 22 +- + include/linux/mmu_notifier.h | 130 +- + include/linux/mmzone.h | 82 +- + include/linux/page-flags.h | 177 +- + include/linux/page_ref.h | 18 +- + include/linux/page_reporting.h | 1 + + include/linux/pagewalk.h | 8 +- + include/linux/pgtable.h | 139 +- + include/linux/sunrpc/svc.h | 2 +- + include/linux/swap.h | 30 +- + include/linux/types.h | 2 +- + include/linux/vm_event_item.h | 13 - + include/linux/vmalloc.h | 3 - + include/linux/writeback.h | 2 +- + include/net/netmem.h | 15 +- + include/trace/events/huge_memory.h | 26 + + include/trace/events/vmscan.h | 95 +- + include/trace/stages/stage3_trace_output.h | 8 + + include/trace/stages/stage7_class_define.h | 19 + + init/Kconfig | 2 +- + kernel/bpf/arena.c | 3 +- + kernel/events/core.c | 2 +- + kernel/liveupdate/kexec_handover.c | 711 ++++--- + kernel/liveupdate/kexec_handover_debugfs.c | 26 +- + kernel/liveupdate/kexec_handover_internal.h | 3 - + kernel/liveupdate/luo_core.c | 12 +- + kernel/vmcore_info.c | 2 +- + lib/Makefile | 1 + + lib/maple_tree.c | 2198 +++++++++----------- + lib/test_maple_tree.c | 55 +- + lib/vdso/datastore.c | 2 +- + mm/Kconfig | 33 +- + mm/bootmem_info.c | 46 +- + mm/damon/Kconfig | 11 + + mm/damon/core.c | 362 +++- + mm/damon/lru_sort.c | 7 +- + mm/damon/ops-common.c | 2 +- + mm/damon/paddr.c | 3 +- + mm/damon/reclaim.c | 7 +- + mm/damon/sysfs-schemes.c | 58 + + mm/damon/tests/.kunitconfig | 3 + + mm/damon/tests/core-kunit.h | 100 + + mm/damon/tests/vaddr-kunit.h | 76 - + mm/damon/vaddr.c | 73 +- + mm/debug_vm_pgtable.c | 4 +- + mm/execmem.c | 55 +- + mm/fadvise.c | 2 +- + mm/filemap.c | 2 +- + mm/gup.c | 2 +- + mm/huge_memory.c | 151 +- + mm/hugetlb.c | 48 +- + mm/hugetlb_vmemmap.c | 362 ++-- + mm/internal.h | 166 +- + mm/interval_tree.c | 5 - + mm/kasan/init.c | 8 +- + mm/kasan/report.c | 13 +- + mm/kfence/core.c | 23 +- + mm/kfence/kfence.h | 16 +- + mm/kfence/report.c | 49 +- + mm/khugepaged.c | 300 +-- + mm/kmemleak.c | 6 +- + mm/ksm.c | 14 +- + mm/madvise.c | 24 +- + mm/memcontrol-v1.c | 5 +- + mm/memcontrol-v1.h | 4 +- + mm/memcontrol.c | 246 ++- + mm/memfd.c | 4 +- + mm/memfd_luo.c | 35 +- + mm/memory-tiers.c | 12 +- + mm/memory.c | 311 +-- + mm/memory_hotplug.c | 45 +- + mm/mempolicy.c | 4 +- + mm/migrate.c | 24 +- + mm/migrate_device.c | 4 + + mm/mlock.c | 12 +- + mm/mm_init.c | 34 +- + mm/mmap.c | 2 +- + mm/mmu_gather.c | 21 +- + mm/mmu_notifier.c | 41 +- + mm/mprotect.c | 2 +- + mm/mremap.c | 100 +- + mm/nommu.c | 2 +- + mm/oom_kill.c | 24 +- + mm/page-writeback.c | 4 +- + mm/page_alloc.c | 205 +- + mm/page_idle.c | 2 +- + mm/page_io.c | 4 +- + mm/page_reporting.c | 7 +- + mm/page_vma_mapped.c | 11 +- + mm/pagewalk.c | 40 +- + mm/pgtable-generic.c | 14 +- + mm/rmap.c | 38 +- + mm/secretmem.c | 2 +- + mm/shmem.c | 17 +- + mm/shrinker.c | 14 +- + mm/slab.h | 8 +- + mm/sparse-vmemmap.c | 416 +++- + mm/sparse.c | 544 +---- + mm/swap.c | 4 +- + mm/swap.h | 22 +- + mm/swap_state.c | 76 +- + mm/swap_table.h | 140 +- + mm/swapfile.c | 1156 +++++----- + mm/truncate.c | 8 +- + mm/userfaultfd.c | 6 +- + mm/util.c | 45 +- + mm/vma.c | 31 +- + mm/vmalloc.c | 58 +- + mm/vmscan.c | 157 +- + mm/vmstat.c | 29 +- + mm/workingset.c | 49 +- + mm/zsmalloc.c | 15 +- + mm/zswap.c | 19 +- + net/core/netmem_priv.h | 23 +- + net/core/page_pool.c | 24 +- + net/ipv4/tcp.c | 7 +- + rust/kernel/mm/virt.rs | 6 +- + tools/testing/radix-tree/maple.c | 308 ++- + tools/testing/selftests/cgroup/test_memcontrol.c | 11 +- + tools/testing/selftests/cgroup/test_zswap.c | 136 ++ + tools/testing/selftests/damon/_damon_sysfs.py | 12 +- + tools/testing/selftests/damon/config | 1 + + .../selftests/damon/drgn_dump_damon_status.py | 1 + + tools/testing/selftests/damon/sysfs.py | 7 + + tools/testing/selftests/kho/init.c | 20 - + tools/testing/selftests/mm/.gitignore | 1 + + tools/testing/selftests/mm/Makefile | 1 + + tools/testing/selftests/mm/folio_split_race_test.c | 297 +++ + tools/testing/selftests/mm/memory-failure.c | 1 - + tools/testing/selftests/mm/migration.c | 3 +- + tools/testing/selftests/mm/mlock2-tests.c | 80 +- + tools/testing/selftests/mm/pagemap_ioctl.c | 20 +- + tools/testing/selftests/mm/run_vmtests.sh | 2 + + tools/testing/vma/include/custom.h | 13 +- + tools/testing/vma/include/dup.h | 59 +- + tools/testing/vma/include/stubs.h | 5 + + tools/testing/vma/main.c | 2 + + tools/testing/vma/tests/vma.c | 58 +- + virt/kvm/kvm_main.c | 32 +- + 333 files changed, 7147 insertions(+), 5996 deletions(-) + rename include/linux/{pagevec.h => folio_batch.h} (89%) + create mode 100644 include/linux/kho_radix_tree.h + create mode 100644 tools/testing/selftests/mm/folio_split_race_test.c +Merging mm-nonmm-stable/mm-nonmm-stable (929cc1a53a6f5 fork: zero vmap stack using clear_pages() instead of memset()) +$ git merge -m Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging kernel/vmcore_info.c +Auto-merging lib/Makefile +Auto-merging lib/bug.c +Auto-merging scripts/checkpatch.pl +Merge made by the 'ort' strategy. + .mailmap | 5 +- + CREDITS | 7 +- + Documentation/admin-guide/lockup-watchdogs.rst | 142 +++++++-- + Documentation/admin-guide/sysctl/kernel.rst | 3 +- + MAINTAINERS | 1 + + fs/ocfs2/aops.c | 3 +- + fs/ocfs2/dlm/dlmdomain.c | 10 +- + fs/ocfs2/dlm/dlmmaster.c | 1 - + fs/ocfs2/quota_global.c | 16 +- + fs/ocfs2/quota_local.c | 4 +- + fs/proc/array.c | 2 +- + include/linux/nmi.h | 1 + + kernel/crash_core.c | 2 - + kernel/crash_dump_dm_crypt.c | 15 +- + kernel/crash_reserve.c | 2 - + kernel/exit.c | 8 +- + kernel/fork.c | 30 +- + kernel/hung_task.c | 106 +++++-- + kernel/kexec_core.c | 1 - + kernel/panic.c | 47 ++- + kernel/pid.c | 18 +- + kernel/signal.c | 12 +- + kernel/vmcore_info.c | 2 - + kernel/watchdog.c | 158 +++++----- + kernel/watchdog_buddy.c | 9 +- + lib/Kconfig | 3 - + lib/Makefile | 2 - + lib/bch.c | 6 +- + lib/bug.c | 6 +- + lib/decompress_bunzip2.c | 4 +- + lib/glob.c | 11 +- + lib/inflate.c | 13 +- + lib/math/Kconfig | 3 + + lib/math/Makefile | 1 + + lib/{ => math}/polynomial.c | 23 +- + lib/ts_bm.c | 18 +- + lib/ts_kmp.c | 18 +- + lib/uuid.c | 2 +- + scripts/bloat-o-meter | 6 +- + scripts/checkpatch.pl | 10 + + scripts/decode_stacktrace.sh | 26 +- + scripts/decodecode | 3 +- + scripts/gdb/linux/symbols.py | 2 +- + scripts/get_maintainer.pl | 9 +- + scripts/spelling.txt | 336 +++++++++++---------- + tools/accounting/Makefile | 2 +- + tools/include/uapi/linux/taskstats.h | 291 ++++++++++++++++++ + tools/testing/selftests/breakpoints/Makefile | 4 +- + tools/testing/selftests/fchmodat2/fchmodat2_test.c | 158 +++++++--- + tools/testing/selftests/ipc/Makefile | 8 +- + tools/testing/selftests/ipc/msgque.c | 3 + + tools/testing/selftests/prctl/Makefile | 4 +- + tools/testing/selftests/sparc64/Makefile | 4 +- + .../selftests/thermal/intel/power_floor/Makefile | 4 +- + .../selftests/thermal/intel/workload_hint/Makefile | 4 +- + 55 files changed, 1114 insertions(+), 475 deletions(-) + rename lib/{ => math}/polynomial.c (88%) + create mode 100644 tools/include/uapi/linux/taskstats.h +Merging mm-unstable/mm-unstable (57e5b07deacb0 lib/maple_tree: fix swapped arguments in mas_safe_pivot() call) +$ git merge -m Merge branch 'mm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-unstable/mm-unstable +Auto-merging MAINTAINERS +Auto-merging arch/riscv/include/asm/page.h +Auto-merging fs/fs-writeback.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/mm/kho.rst | 41 +- + Documentation/driver-api/vme.rst | 2 +- + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/mmap_prepare.rst | 168 +++++ + MAINTAINERS | 8 +- + arch/arc/include/asm/page.h | 2 +- + arch/arm/include/asm/page.h | 2 +- + arch/arm64/include/asm/page.h | 7 +- + arch/hexagon/include/asm/page.h | 2 +- + arch/loongarch/include/asm/page.h | 2 +- + arch/mips/include/asm/page.h | 2 +- + arch/nios2/include/asm/page.h | 2 +- + arch/powerpc/include/asm/page.h | 4 +- + arch/powerpc/include/asm/page_32.h | 2 +- + arch/powerpc/include/asm/page_64.h | 12 +- + arch/riscv/include/asm/page.h | 2 +- + arch/s390/include/asm/page.h | 2 +- + arch/x86/include/asm/page_types.h | 2 +- + arch/x86/um/asm/vm-flags.h | 4 +- + drivers/char/hpet.c | 12 +- + drivers/hv/hyperv_vmbus.h | 4 +- + drivers/hv/vmbus_drv.c | 31 +- + drivers/hwtracing/stm/core.c | 31 +- + drivers/misc/open-dice.c | 19 +- + drivers/mtd/mtdchar.c | 21 +- + drivers/staging/vme_user/vme.c | 20 +- + drivers/staging/vme_user/vme.h | 2 +- + drivers/staging/vme_user/vme_user.c | 51 +- + drivers/target/target_core_user.c | 26 +- + drivers/uio/uio.c | 10 +- + drivers/uio/uio_hv_generic.c | 11 +- + fs/afs/file.c | 36 +- + fs/binfmt_elf.c | 3 +- + fs/buffer.c | 4 +- + fs/fs-writeback.c | 22 +- + fs/hugetlbfs/inode.c | 5 + + include/linux/fs.h | 14 +- + include/linux/huge_mm.h | 14 +- + include/linux/hyperv.h | 4 +- + include/linux/kexec_handover.h | 13 +- + include/linux/kho/abi/kexec_handover.h | 20 +- + include/linux/kho/abi/kexec_metadata.h | 46 ++ + include/linux/ksm.h | 10 +- + include/linux/leafops.h | 39 +- + include/linux/list_lru.h | 46 ++ + include/linux/memcontrol.h | 197 +++--- + include/linux/mm.h | 531 ++++++++++++---- + include/linux/mm_inline.h | 6 + + include/linux/mm_types.h | 69 +- + include/linux/mman.h | 49 -- + include/linux/mmzone.h | 29 +- + include/linux/sched.h | 2 +- + include/linux/shmem_fs.h | 14 - + include/linux/swap.h | 30 +- + include/linux/uio_driver.h | 4 +- + include/linux/userfaultfd_k.h | 76 +-- + include/trace/events/memcg.h | 10 +- + include/trace/events/writeback.h | 3 + + kernel/cgroup/cgroup.c | 9 +- + kernel/liveupdate/kexec_handover.c | 158 ++++- + kernel/liveupdate/kexec_handover_debugfs.c | 55 +- + kernel/liveupdate/kexec_handover_internal.h | 15 +- + kernel/liveupdate/luo_core.c | 5 +- + kernel/power/swap.c | 2 +- + kernel/power/user.c | 15 +- + lib/maple_tree.c | 2 +- + lib/test_kho.c | 5 +- + mm/Kconfig.debug | 11 + + mm/compaction.c | 43 +- + mm/filemap.c | 1 + + mm/huge_memory.c | 499 +++++++-------- + mm/hugetlb.c | 15 + + mm/internal.h | 55 +- + mm/khugepaged.c | 7 + + mm/kmemleak.c | 2 +- + mm/ksm.c | 43 +- + mm/list_lru.c | 200 +++--- + mm/madvise.c | 10 +- + mm/memblock.c | 4 +- + mm/memcontrol-v1.c | 31 +- + mm/memcontrol-v1.h | 7 + + mm/memcontrol.c | 727 +++++++++++++++------- + mm/memory.c | 278 ++++++--- + mm/migrate.c | 2 + + mm/mlock.c | 40 +- + mm/mm_init.c | 15 - + mm/mmap.c | 19 +- + mm/mprotect.c | 195 +++--- + mm/mremap.c | 6 +- + mm/mseal.c | 11 +- + mm/page_io.c | 10 +- + mm/percpu-internal.h | 2 +- + mm/percpu.c | 2 +- + mm/shmem.c | 186 +++--- + mm/shrinker.c | 6 +- + mm/swap.c | 59 +- + mm/swapfile.c | 205 ++++-- + mm/userfaultfd.c | 719 ++++++++++++--------- + mm/util.c | 249 +++++--- + mm/vma.c | 258 ++++---- + mm/vma.h | 86 ++- + mm/vma_exec.c | 5 +- + mm/vmscan.c | 277 ++++++--- + mm/workingset.c | 30 +- + mm/zswap.c | 205 +++--- + security/selinux/hooks.c | 4 +- + tools/include/linux/bitmap.h | 24 + + tools/lib/bitmap.c | 10 + + tools/testing/selftests/kvm/guest_memfd_test.c | 191 ++++++ + tools/testing/selftests/mm/guard-regions.c | 4 + + tools/testing/selftests/mm/soft-dirty.c | 4 +- + tools/testing/selftests/mm/split_huge_page_test.c | 19 +- + tools/testing/selftests/mm/thp_settings.c | 35 +- + tools/testing/selftests/mm/thp_settings.h | 1 - + tools/testing/selftests/mm/transhuge-stress.c | 4 + + tools/testing/selftests/mm/uffd-unit-tests.c | 100 +++ + tools/testing/selftests/mm/vm_util.c | 36 ++ + tools/testing/selftests/mm/vm_util.h | 3 + + tools/testing/vma/include/custom.h | 25 - + tools/testing/vma/include/dup.h | 441 +++++++++---- + tools/testing/vma/include/stubs.h | 19 +- + tools/testing/vma/shared.c | 8 +- + tools/testing/vma/shared.h | 22 +- + tools/testing/vma/tests/merge.c | 311 ++++----- + tools/testing/vma/tests/mmap.c | 18 +- + tools/testing/vma/tests/vma.c | 359 +++++++++-- + tools/testing/vma/vma_internal.h | 6 + + virt/kvm/guest_memfd.c | 84 ++- + 128 files changed, 5579 insertions(+), 2736 deletions(-) + create mode 100644 Documentation/filesystems/mmap_prepare.rst + create mode 100644 include/linux/kho/abi/kexec_metadata.h +Merging mm-nonmm-unstable/mm-nonmm-unstable (30eae1a5db9fa lib: kunit_iov_iter: add tests for extract_iter_to_sg) +$ git merge -m Merge branch 'mm-nonmm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable +Auto-merging MAINTAINERS +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/kallsyms-lineinfo.rst | 97 +++ + MAINTAINERS | 9 + + arch/arm/lib/Makefile | 5 - + arch/arm64/include/asm/xor.h | 73 -- + arch/arm64/kernel/machine_kexec_file.c | 4 + + arch/arm64/lib/Makefile | 6 - + arch/loongarch/include/asm/xor.h | 68 -- + arch/loongarch/include/asm/xor_simd.h | 34 - + arch/loongarch/lib/Makefile | 2 - + arch/loongarch/lib/xor_simd_glue.c | 72 -- + arch/powerpc/include/asm/xor.h | 47 -- + arch/powerpc/include/asm/xor_altivec.h | 22 - + arch/powerpc/kexec/elf_64.c | 4 + + arch/powerpc/lib/Makefile | 5 - + arch/powerpc/lib/xor_vmx.h | 22 - + arch/powerpc/lib/xor_vmx_glue.c | 63 -- + arch/riscv/include/asm/xor.h | 68 -- + arch/riscv/lib/Makefile | 1 - + arch/s390/include/asm/xor.h | 21 - + arch/s390/lib/Makefile | 2 +- + arch/sparc/include/asm/asm-prototypes.h | 1 - + arch/sparc/include/asm/xor.h | 9 - + arch/sparc/lib/Makefile | 2 +- + arch/um/include/asm/xor.h | 24 - + arch/x86/include/asm/xor_64.h | 28 - + arch/x86/kernel/kexec-bzimage64.c | 6 +- + crypto/Kconfig | 2 - + crypto/Makefile | 1 - + crypto/async_tx/async_xor.c | 34 +- + crypto/xor.c | 174 ----- + drivers/of/fdt.c | 21 + + drivers/of/kexec.c | 19 + + fs/btrfs/raid56.c | 27 +- + fs/ubifs/gc.c | 2 - + fs/ubifs/replay.c | 1 - + include/asm-generic/Kbuild | 1 - + include/asm-generic/xor.h | 738 ------------------ + include/linux/crash_core.h | 14 +- + include/linux/kallsyms.h | 17 +- + include/linux/mod_lineinfo.h | 243 ++++++ + include/linux/module.h | 5 + + include/linux/raid/xor.h | 27 +- + init/Kconfig | 35 + + kernel/crash_dump_dm_crypt.c | 7 +- + kernel/fork.c | 11 +- + kernel/kallsyms.c | 58 ++ + kernel/kallsyms_internal.h | 11 + + kernel/module/kallsyms.c | 80 ++ + kernel/module/main.c | 3 + + lib/Kconfig | 1 + + lib/Kconfig.debug | 10 + + lib/Makefile | 2 +- + lib/cmdline.c | 30 +- + lib/idr.c | 55 +- + lib/kstrtox.c | 37 +- + lib/list_sort.c | 10 - + lib/parser.c | 2 +- + lib/raid/.kunitconfig | 3 + + lib/raid/Kconfig | 30 + + lib/raid/Makefile | 3 + + lib/raid/xor/Makefile | 42 + + .../include/asm/xor.h => lib/raid/xor/alpha/xor.c | 48 +- + lib/raid/xor/alpha/xor_arch.h | 22 + + lib/raid/xor/arm/xor-neon-glue.c | 19 + + {arch/arm/lib => lib/raid/xor/arm}/xor-neon.c | 22 +- + .../include/asm/xor.h => lib/raid/xor/arm/xor.c | 107 +-- + lib/raid/xor/arm/xor_arch.h | 22 + + lib/raid/xor/arm64/xor-neon-glue.c | 26 + + {arch/arm64/lib => lib/raid/xor/arm64}/xor-neon.c | 94 +-- + lib/raid/xor/arm64/xor-neon.h | 6 + + lib/raid/xor/arm64/xor_arch.h | 21 + + lib/raid/xor/loongarch/xor_arch.h | 33 + + .../lib => lib/raid/xor/loongarch}/xor_simd.c | 0 + .../lib => lib/raid/xor/loongarch}/xor_simd.h | 0 + lib/raid/xor/loongarch/xor_simd_glue.c | 37 + + .../lib => lib/raid/xor/loongarch}/xor_template.c | 0 + lib/raid/xor/powerpc/xor_arch.h | 22 + + .../powerpc/lib => lib/raid/xor/powerpc}/xor_vmx.c | 40 +- + lib/raid/xor/powerpc/xor_vmx.h | 10 + + lib/raid/xor/powerpc/xor_vmx_glue.c | 28 + + lib/raid/xor/riscv/xor-glue.c | 25 + + {arch/riscv/lib => lib/raid/xor/riscv}/xor.S | 4 - + lib/raid/xor/riscv/xor_arch.h | 17 + + {arch/s390/lib => lib/raid/xor/s390}/xor.c | 15 +- + lib/raid/xor/s390/xor_arch.h | 13 + + .../xor_32.h => lib/raid/xor/sparc/xor-sparc32.c | 32 +- + .../raid/xor/sparc/xor-sparc64-glue.c | 48 +- + .../lib/xor.S => lib/raid/xor/sparc/xor-sparc64.S | 10 - + lib/raid/xor/sparc/xor_arch.h | 35 + + lib/raid/xor/tests/Makefile | 3 + + lib/raid/xor/tests/xor_kunit.c | 187 +++++ + lib/raid/xor/um/xor_arch.h | 2 + + .../asm/xor_avx.h => lib/raid/xor/x86/xor-avx.c | 52 +- + .../asm/xor_32.h => lib/raid/xor/x86/xor-mmx.c | 122 +-- + .../asm/xor.h => lib/raid/xor/x86/xor-sse.c | 105 +-- + lib/raid/xor/x86/xor_arch.h | 36 + + lib/raid/xor/xor-32regs-prefetch.c | 267 +++++++ + lib/raid/xor/xor-32regs.c | 217 ++++++ + lib/raid/xor/xor-8regs-prefetch.c | 146 ++++ + lib/raid/xor/xor-8regs.c | 103 +++ + lib/raid/xor/xor-core.c | 193 +++++ + lib/raid/xor/xor_impl.h | 56 ++ + lib/scatterlist.c | 8 +- + lib/test-kstrtox.c | 6 + + lib/test_ida.c | 14 + + lib/tests/Makefile | 3 + + lib/tests/cmdline_kunit.c | 118 +++ + lib/tests/kunit_iov_iter.c | 224 +++++- + lib/tests/lineinfo_kunit.c | 813 ++++++++++++++++++++ + scripts/.gitignore | 1 + + scripts/Makefile | 3 + + scripts/Makefile.modfinal | 6 + + scripts/empty_lineinfo.S | 38 + + scripts/gen-mod-lineinfo.sh | 48 ++ + scripts/gen_lineinfo.c | 848 +++++++++++++++++++++ + scripts/kallsyms.c | 17 + + scripts/link-vmlinux.sh | 43 +- + 118 files changed, 4712 insertions(+), 2175 deletions(-) + create mode 100644 Documentation/admin-guide/kallsyms-lineinfo.rst + delete mode 100644 arch/arm64/include/asm/xor.h + delete mode 100644 arch/loongarch/include/asm/xor.h + delete mode 100644 arch/loongarch/include/asm/xor_simd.h + delete mode 100644 arch/loongarch/lib/xor_simd_glue.c + delete mode 100644 arch/powerpc/include/asm/xor.h + delete mode 100644 arch/powerpc/include/asm/xor_altivec.h + delete mode 100644 arch/powerpc/lib/xor_vmx.h + delete mode 100644 arch/powerpc/lib/xor_vmx_glue.c + delete mode 100644 arch/riscv/include/asm/xor.h + delete mode 100644 arch/s390/include/asm/xor.h + delete mode 100644 arch/sparc/include/asm/xor.h + delete mode 100644 arch/um/include/asm/xor.h + delete mode 100644 arch/x86/include/asm/xor_64.h + delete mode 100644 crypto/xor.c + delete mode 100644 include/asm-generic/xor.h + create mode 100644 include/linux/mod_lineinfo.h + create mode 100644 lib/raid/.kunitconfig + create mode 100644 lib/raid/Kconfig + create mode 100644 lib/raid/Makefile + create mode 100644 lib/raid/xor/Makefile + rename arch/alpha/include/asm/xor.h => lib/raid/xor/alpha/xor.c (95%) + create mode 100644 lib/raid/xor/alpha/xor_arch.h + create mode 100644 lib/raid/xor/arm/xor-neon-glue.c + rename {arch/arm/lib => lib/raid/xor/arm}/xor-neon.c (53%) + rename arch/arm/include/asm/xor.h => lib/raid/xor/arm/xor.c (59%) + create mode 100644 lib/raid/xor/arm/xor_arch.h + create mode 100644 lib/raid/xor/arm64/xor-neon-glue.c + rename {arch/arm64/lib => lib/raid/xor/arm64}/xor-neon.c (76%) + create mode 100644 lib/raid/xor/arm64/xor-neon.h + create mode 100644 lib/raid/xor/arm64/xor_arch.h + create mode 100644 lib/raid/xor/loongarch/xor_arch.h + rename {arch/loongarch/lib => lib/raid/xor/loongarch}/xor_simd.c (100%) + rename {arch/loongarch/lib => lib/raid/xor/loongarch}/xor_simd.h (100%) + create mode 100644 lib/raid/xor/loongarch/xor_simd_glue.c + rename {arch/loongarch/lib => lib/raid/xor/loongarch}/xor_template.c (100%) + create mode 100644 lib/raid/xor/powerpc/xor_arch.h + rename {arch/powerpc/lib => lib/raid/xor/powerpc}/xor_vmx.c (69%) + create mode 100644 lib/raid/xor/powerpc/xor_vmx.h + create mode 100644 lib/raid/xor/powerpc/xor_vmx_glue.c + create mode 100644 lib/raid/xor/riscv/xor-glue.c + rename {arch/riscv/lib => lib/raid/xor/riscv}/xor.S (92%) + create mode 100644 lib/raid/xor/riscv/xor_arch.h + rename {arch/s390/lib => lib/raid/xor/s390}/xor.c (93%) + create mode 100644 lib/raid/xor/s390/xor_arch.h + rename arch/sparc/include/asm/xor_32.h => lib/raid/xor/sparc/xor-sparc32.c (92%) + rename arch/sparc/include/asm/xor_64.h => lib/raid/xor/sparc/xor-sparc64-glue.c (63%) + rename arch/sparc/lib/xor.S => lib/raid/xor/sparc/xor-sparc64.S (98%) + create mode 100644 lib/raid/xor/sparc/xor_arch.h + create mode 100644 lib/raid/xor/tests/Makefile + create mode 100644 lib/raid/xor/tests/xor_kunit.c + create mode 100644 lib/raid/xor/um/xor_arch.h + rename arch/x86/include/asm/xor_avx.h => lib/raid/xor/x86/xor-avx.c (84%) + rename arch/x86/include/asm/xor_32.h => lib/raid/xor/x86/xor-mmx.c (87%) + rename arch/x86/include/asm/xor.h => lib/raid/xor/x86/xor-sse.c (90%) + create mode 100644 lib/raid/xor/x86/xor_arch.h + create mode 100644 lib/raid/xor/xor-32regs-prefetch.c + create mode 100644 lib/raid/xor/xor-32regs.c + create mode 100644 lib/raid/xor/xor-8regs-prefetch.c + create mode 100644 lib/raid/xor/xor-8regs.c + create mode 100644 lib/raid/xor/xor-core.c + create mode 100644 lib/raid/xor/xor_impl.h + create mode 100644 lib/tests/lineinfo_kunit.c + create mode 100644 scripts/empty_lineinfo.S + create mode 100755 scripts/gen-mod-lineinfo.sh + create mode 100644 scripts/gen_lineinfo.c +Merging kbuild/kbuild-for-next (dcc99abebfa1e kbuild: uapi: also test UAPI headers against C++ compilers) +$ git merge -m Merge branch 'kbuild-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild/kbuild-for-next +Auto-merging Makefile +Auto-merging arch/loongarch/vdso/Makefile +Auto-merging arch/x86/boot/compressed/Makefile +Auto-merging init/Kconfig +Merge made by the 'ort' strategy. + Documentation/kbuild/llvm.rst | 4 -- + Makefile | 31 ++++++++--- + arch/arm64/kernel/vdso32/Makefile | 3 +- + arch/hexagon/include/uapi/asm/sigcontext.h | 2 +- + arch/loongarch/vdso/Makefile | 2 +- + arch/parisc/boot/compressed/Makefile | 2 +- + arch/powerpc/boot/Makefile | 3 +- + arch/s390/Makefile | 3 +- + arch/s390/purgatory/Makefile | 3 +- + arch/x86/Makefile | 6 +- + arch/x86/boot/compressed/Makefile | 6 +- + drivers/firmware/efi/libstub/Makefile | 3 +- + init/Kconfig | 5 ++ + scripts/Makefile.warn | 5 -- + scripts/check-uapi.sh | 19 ++++--- + scripts/kconfig/lexer.l | 4 +- + scripts/kconfig/lkc.h | 3 +- + scripts/kconfig/tests/err_repeated_inc/Kconfig | 3 + + .../kconfig/tests/err_repeated_inc/Kconfig.inc1 | 4 ++ + .../kconfig/tests/err_repeated_inc/Kconfig.inc2 | 3 + + .../kconfig/tests/err_repeated_inc/Kconfig.inc3 | 1 + + scripts/kconfig/tests/err_repeated_inc/__init__.py | 10 ++++ + .../kconfig/tests/err_repeated_inc/expected_stderr | 2 + + scripts/kconfig/util.c | 33 +++++++++-- + tools/scripts/Makefile.include | 2 + + usr/dummy-include/endian.h | 0 + usr/dummy-include/limits.h | 8 +++ + usr/dummy-include/netinet/if_ether.h | 0 + usr/dummy-include/netinet/in.h | 0 + usr/dummy-include/stdbool.h | 7 --- + usr/dummy-include/stddef.h | 13 +++++ + usr/dummy-include/stdint.h | 17 ++++++ + usr/dummy-include/stdlib.h | 7 --- + usr/dummy-include/string.h | 12 ++++ + usr/dummy-include/sys/ioctl.h | 0 + usr/dummy-include/sys/socket.h | 12 ++++ + usr/dummy-include/sys/time.h | 3 + + usr/dummy-include/sys/types.h | 0 + usr/dummy-include/time.h | 0 + usr/dummy-include/unistd.h | 0 + usr/include/Makefile | 65 ++++++++++++++-------- + 41 files changed, 213 insertions(+), 93 deletions(-) + create mode 100644 scripts/kconfig/tests/err_repeated_inc/Kconfig + create mode 100644 scripts/kconfig/tests/err_repeated_inc/Kconfig.inc1 + create mode 100644 scripts/kconfig/tests/err_repeated_inc/Kconfig.inc2 + create mode 100644 scripts/kconfig/tests/err_repeated_inc/Kconfig.inc3 + create mode 100644 scripts/kconfig/tests/err_repeated_inc/__init__.py + create mode 100644 scripts/kconfig/tests/err_repeated_inc/expected_stderr + create mode 100644 usr/dummy-include/endian.h + create mode 100644 usr/dummy-include/limits.h + create mode 100644 usr/dummy-include/netinet/if_ether.h + create mode 100644 usr/dummy-include/netinet/in.h + delete mode 100644 usr/dummy-include/stdbool.h + create mode 100644 usr/dummy-include/stddef.h + create mode 100644 usr/dummy-include/stdint.h + delete mode 100644 usr/dummy-include/stdlib.h + create mode 100644 usr/dummy-include/string.h + create mode 100644 usr/dummy-include/sys/ioctl.h + create mode 100644 usr/dummy-include/sys/socket.h + create mode 100644 usr/dummy-include/sys/time.h + create mode 100644 usr/dummy-include/sys/types.h + create mode 100644 usr/dummy-include/time.h + create mode 100644 usr/dummy-include/unistd.h +Merging clang-format/clang-format (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf-tools-next (74e2dbe7be503 perf tools: Add --pmu-filter option for filtering PMUs) +$ git merge -m Merge branch 'perf-tools-next' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Merge made by the 'ort' strategy. + tools/build/feature/Makefile | 10 +- + tools/perf/Documentation/perf-annotate.txt | 7 +- + tools/perf/Documentation/perf-bench.txt | 4 + + tools/perf/Documentation/perf-diff.txt | 7 +- + tools/perf/Documentation/perf-kwork.txt | 7 +- + tools/perf/Documentation/perf-probe.txt | 6 + + tools/perf/Documentation/perf-report.txt | 10 +- + tools/perf/Documentation/perf-sched.txt | 7 +- + tools/perf/Documentation/perf-script.txt | 7 +- + tools/perf/Documentation/perf-stat.txt | 4 + + tools/perf/Documentation/perf-timechart.txt | 7 +- + tools/perf/Documentation/tips.txt | 2 +- + tools/perf/arch/x86/util/pmu.c | 12 +- + tools/perf/bench/mem-functions.c | 109 +++- + tools/perf/builtin-annotate.c | 3 +- + tools/perf/builtin-diff.c | 3 +- + tools/perf/builtin-kwork.c | 4 +- + tools/perf/builtin-lock.c | 2 +- + tools/perf/builtin-probe.c | 4 +- + tools/perf/builtin-record.c | 82 +-- + tools/perf/builtin-report.c | 3 +- + tools/perf/builtin-sched.c | 4 +- + tools/perf/builtin-script.c | 15 +- + tools/perf/builtin-stat.c | 62 +- + tools/perf/builtin-timechart.c | 3 +- + tools/perf/builtin-top.c | 46 +- + tools/perf/builtin-trace.c | 22 +- + tools/perf/perf.c | 12 +- + .../arch/arm64/common-and-microarch.json | 85 +++ + tools/perf/pmu-events/arch/arm64/mapfile.csv | 1 + + .../pmu-events/arch/arm64/nvidia/t410/branch.json | 45 ++ + .../pmu-events/arch/arm64/nvidia/t410/brbe.json | 6 + + .../pmu-events/arch/arm64/nvidia/t410/bus.json | 48 ++ + .../arch/arm64/nvidia/t410/exception.json | 62 ++ + .../arch/arm64/nvidia/t410/fp_operation.json | 78 +++ + .../pmu-events/arch/arm64/nvidia/t410/general.json | 15 + + .../arch/arm64/nvidia/t410/l1d_cache.json | 122 ++++ + .../arch/arm64/nvidia/t410/l1i_cache.json | 114 ++++ + .../arch/arm64/nvidia/t410/l2d_cache.json | 134 ++++ + .../arch/arm64/nvidia/t410/ll_cache.json | 107 +++ + .../pmu-events/arch/arm64/nvidia/t410/memory.json | 46 ++ + .../pmu-events/arch/arm64/nvidia/t410/metrics.json | 722 +++++++++++++++++++++ + .../pmu-events/arch/arm64/nvidia/t410/misc.json | 642 ++++++++++++++++++ + .../pmu-events/arch/arm64/nvidia/t410/retired.json | 94 +++ + .../pmu-events/arch/arm64/nvidia/t410/spe.json | 42 ++ + .../arch/arm64/nvidia/t410/spec_operation.json | 230 +++++++ + .../pmu-events/arch/arm64/nvidia/t410/stall.json | 145 +++++ + .../pmu-events/arch/arm64/nvidia/t410/tlb.json | 158 +++++ + .../perf/pmu-events/arch/x86/alderlake/cache.json | 27 +- + .../pmu-events/arch/x86/alderlake/frontend.json | 18 + + .../pmu-events/arch/x86/alderlake/pipeline.json | 66 +- + .../perf/pmu-events/arch/x86/alderlaken/cache.json | 27 +- + .../pmu-events/arch/x86/alderlaken/pipeline.json | 60 +- + .../perf/pmu-events/arch/x86/arrowlake/cache.json | 103 ++- + .../pmu-events/arch/x86/arrowlake/frontend.json | 18 + + .../pmu-events/arch/x86/arrowlake/pipeline.json | 40 +- + .../pmu-events/arch/x86/emeraldrapids/cache.json | 4 +- + .../arch/x86/emeraldrapids/frontend.json | 16 + + .../arch/x86/emeraldrapids/uncore-cache.json | 4 +- + .../arch/x86/emeraldrapids/uncore-io.json | 17 +- + .../perf/pmu-events/arch/x86/grandridge/cache.json | 42 +- + .../pmu-events/arch/x86/grandridge/pipeline.json | 42 +- + .../arch/x86/graniterapids/frontend.json | 16 + + .../arch/x86/graniterapids/gnr-metrics.json | 27 + + .../perf/pmu-events/arch/x86/lunarlake/cache.json | 36 +- + .../pmu-events/arch/x86/lunarlake/frontend.json | 27 + + .../pmu-events/arch/x86/lunarlake/pipeline.json | 10 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 22 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 67 +- + .../pmu-events/arch/x86/meteorlake/frontend.json | 18 + + .../pmu-events/arch/x86/meteorlake/pipeline.json | 46 +- + .../pmu-events/arch/x86/pantherlake/cache.json | 159 ++++- + .../arch/x86/pantherlake/floating-point.json | 28 + + .../pmu-events/arch/x86/pantherlake/frontend.json | 36 + + .../pmu-events/arch/x86/pantherlake/memory.json | 27 + + .../pmu-events/arch/x86/pantherlake/other.json | 10 + + .../pmu-events/arch/x86/pantherlake/pipeline.json | 200 +++++- + .../arch/x86/pantherlake/virtual-memory.json | 30 + + .../pmu-events/arch/x86/sapphirerapids/cache.json | 4 +- + .../arch/x86/sapphirerapids/frontend.json | 16 + + .../arch/x86/sapphirerapids/uncore-cache.json | 4 +- + .../arch/x86/sapphirerapids/uncore-io.json | 17 +- + .../pmu-events/arch/x86/sierraforest/cache.json | 22 +- + .../pmu-events/arch/x86/sierraforest/pipeline.json | 42 +- + tools/perf/tests/event_update.c | 4 +- + tools/perf/tests/expand-cgroup.c | 4 +- + tools/perf/tests/perf-record.c | 7 +- + tools/perf/tests/shell/data_type_profiling.sh | 2 +- + tools/perf/tests/topology.c | 4 +- + tools/perf/tests/workloads/datasym.c | 6 +- + tools/perf/util/Build | 2 - + tools/perf/util/annotate-arch/annotate-x86.c | 69 +- + tools/perf/util/annotate-data.c | 119 ++-- + tools/perf/util/annotate-data.h | 3 + + tools/perf/util/bpf_map.c | 70 -- + tools/perf/util/bpf_map.h | 23 - + tools/perf/util/bpf_skel/syscall_summary.bpf.c | 18 +- + tools/perf/util/branch.h | 3 + + tools/perf/util/callchain.c | 73 ++- + tools/perf/util/callchain.h | 12 +- + tools/perf/util/cpu-set-sched.h | 50 -- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 56 +- + tools/perf/util/disasm.c | 8 +- + tools/perf/util/drm_pmu.c | 36 +- + tools/perf/util/dump-insn.c | 23 - + tools/perf/util/dwarf-aux.c | 149 +++-- + tools/perf/util/dwarf-aux.h | 9 +- + tools/perf/util/evlist.c | 32 +- + tools/perf/util/evlist.h | 2 +- + tools/perf/util/evsel.c | 70 +- + tools/perf/util/evsel.h | 10 +- + tools/perf/util/hist.c | 3 + + tools/perf/util/hist.h | 2 + + tools/perf/util/intel-tpebs.c | 1 - + tools/perf/util/llvm.c | 10 +- + tools/perf/util/metricgroup.c | 18 +- + tools/perf/util/parse-events.c | 2 +- + tools/perf/util/perf-regs-arch/perf_regs_s390.c | 78 +++ + tools/perf/util/perf_regs.c | 3 + + tools/perf/util/perf_regs.h | 1 + + tools/perf/util/sort.c | 114 ++++ + tools/perf/util/sort.h | 2 + + tools/perf/util/symbol-elf.c | 12 +- + tools/perf/util/symbol.c | 36 +- + tools/perf/util/symbol.h | 19 +- + tools/perf/util/symbol_conf.h | 1 + + tools/perf/util/target.h | 12 +- + 127 files changed, 5074 insertions(+), 812 deletions(-) + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/branch.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/brbe.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/bus.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/exception.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/fp_operation.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/general.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/l1d_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/l1i_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/l2d_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/ll_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/memory.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/metrics.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/misc.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/retired.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/spe.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/spec_operation.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/stall.json + create mode 100644 tools/perf/pmu-events/arch/arm64/nvidia/t410/tlb.json + delete mode 100644 tools/perf/util/bpf_map.c + delete mode 100644 tools/perf/util/bpf_map.h + delete mode 100644 tools/perf/util/cpu-set-sched.h + delete mode 100644 tools/perf/util/dump-insn.c +Merging compiler-attributes/compiler-attributes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/dma-mapping-for-next (ed734125ea6c7 Merge branch 'dt-reserved-mem-cleanups' into dma-mapping-for-next) +$ git merge -m Merge branch 'dma-mapping-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next +Auto-merging arch/arm64/Kconfig +Auto-merging drivers/of/fdt.c +Merge made by the 'ort' strategy. + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/assembler.h | 25 ++- + arch/arm64/include/asm/cache.h | 5 + + arch/arm64/include/asm/cacheflush.h | 2 + + arch/arm64/kernel/relocate_kernel.S | 3 +- + arch/arm64/mm/cache.S | 57 ++++- + arch/arm64/mm/dma-mapping.c | 4 +- + drivers/iommu/dma-iommu.c | 35 ++- + drivers/memory/tegra/tegra210-emc-table.c | 19 +- + drivers/of/fdt.c | 2 +- + drivers/of/of_private.h | 2 +- + drivers/of/of_reserved_mem.c | 340 +++++++++++++++++------------- + drivers/xen/swiotlb-xen.c | 24 ++- + include/linux/cma.h | 10 - + include/linux/dma-map-ops.h | 9 +- + include/linux/dma-mapping.h | 2 +- + include/linux/of_reserved_mem.h | 16 +- + include/uapi/linux/map_benchmark.h | 13 +- + kernel/dma/Kconfig | 3 + + kernel/dma/coherent.c | 19 +- + kernel/dma/contiguous.c | 90 +++++--- + kernel/dma/direct.c | 23 +- + kernel/dma/direct.h | 21 +- + kernel/dma/map_benchmark.c | 250 +++++++++++++++++++--- + kernel/dma/mapping.c | 6 +- + kernel/dma/swiotlb.c | 26 ++- + tools/dma/dma_map_benchmark.c | 23 +- + 27 files changed, 725 insertions(+), 305 deletions(-) +Merging asm-generic/master (adbbd9714f805 scripts: headers_install.sh: Remove config leak ignore machinery) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic asm-generic/master +Already up to date. +Merging alpha/alpha-next (d58041d2c63e0 MAINTAINERS: Add Magnus Lindholm as maintainer for alpha port) +$ git merge -m Merge branch 'alpha-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next +Already up to date. +Merging arm/for-next (b9cbb9e3bed3f Merge branches 'fixes' and 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of https://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 (aa9c4fb9c24a4 Merge branches 'for-next/misc', 'for-next/tlbflush', 'for-next/ttbr-macros-cleanup', 'for-next/kselftest', 'for-next/feat_lsui' and 'for-next/mpam', remote-tracking branch 'arm64/for-next/read-once' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/el2_setup.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kvm/at.c +CONFLICT (content): Merge conflict in arch/arm64/kvm/at.c +Auto-merging arch/arm64/kvm/hyp/include/hyp/switch.h +Auto-merging arch/arm64/kvm/hyp/nvhe/hyp-init.S +Auto-merging arch/arm64/kvm/hyp/nvhe/mm.c +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging arch/arm64/mm/contpte.c +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/tools/sysreg +Auto-merging drivers/resctrl/mpam_devices.c +Auto-merging tools/testing/selftests/kvm/arm64/set_id_regs.c +Resolved 'arch/arm64/kvm/at.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f0ea0f048635e] Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/arch/arm64/index.rst | 1 + + Documentation/arch/arm64/mpam.rst | 72 + + Documentation/arch/arm64/silicon-errata.rst | 9 + + arch/arm64/Kconfig | 52 +- + arch/arm64/include/asm/asm-uaccess.h | 2 +- + arch/arm64/include/asm/cpucaps.h | 2 + + arch/arm64/include/asm/el2_setup.h | 3 +- + arch/arm64/include/asm/futex.h | 311 ++++- + arch/arm64/include/asm/hugetlb.h | 12 +- + arch/arm64/include/asm/lsui.h | 27 + + arch/arm64/include/asm/mmu.h | 1 - + arch/arm64/include/asm/mmu_context.h | 3 +- + arch/arm64/include/asm/mpam.h | 96 ++ + arch/arm64/include/asm/pgtable-hwdef.h | 9 +- + arch/arm64/include/asm/pgtable.h | 32 +- + arch/arm64/include/asm/resctrl.h | 2 + + arch/arm64/include/asm/rwonce.h | 24 +- + arch/arm64/include/asm/scs.h | 8 + + arch/arm64/include/asm/thread_info.h | 3 + + arch/arm64/include/asm/tlb.h | 6 +- + arch/arm64/include/asm/tlbflush.h | 471 ++++--- + arch/arm64/include/asm/uaccess.h | 6 +- + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/armv8_deprecated.c | 14 + + arch/arm64/kernel/cpufeature.c | 31 +- + arch/arm64/kernel/entry.S | 6 +- + arch/arm64/kernel/mpam.c | 62 + + arch/arm64/kernel/mte.c | 4 +- + arch/arm64/kernel/process.c | 7 + + arch/arm64/kernel/sys_compat.c | 2 +- + arch/arm64/kvm/at.c | 34 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 12 +- + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 4 +- + arch/arm64/kvm/hyp/nvhe/mm.c | 2 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 2 - + arch/arm64/kvm/hyp/pgtable.c | 4 +- + arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 16 + + arch/arm64/kvm/hyp/vhe/tlb.c | 2 - + arch/arm64/kvm/sys_regs.c | 5 +- + arch/arm64/mm/context.c | 8 +- + arch/arm64/mm/contpte.c | 12 +- + arch/arm64/mm/fault.c | 30 +- + arch/arm64/mm/hugetlbpage.c | 10 +- + arch/arm64/mm/mmu.c | 4 +- + arch/arm64/tools/cpucaps | 1 + + arch/arm64/tools/sysreg | 8 + + drivers/resctrl/Kconfig | 9 +- + drivers/resctrl/Makefile | 1 + + drivers/resctrl/mpam_devices.c | 305 +++- + drivers/resctrl/mpam_internal.h | 108 +- + drivers/resctrl/mpam_resctrl.c | 1704 +++++++++++++++++++++++ + drivers/resctrl/test_mpam_resctrl.c | 315 +++++ + include/linux/arm_mpam.h | 32 + + tools/testing/selftests/arm64/abi/hwcap.c | 3 +- + tools/testing/selftests/kvm/arm64/set_id_regs.c | 1 + + 55 files changed, 3485 insertions(+), 426 deletions(-) + create mode 100644 Documentation/arch/arm64/mpam.rst + create mode 100644 arch/arm64/include/asm/lsui.h + create mode 100644 arch/arm64/include/asm/mpam.h + create mode 100644 arch/arm64/include/asm/resctrl.h + create mode 100644 arch/arm64/kernel/mpam.c + create mode 100644 drivers/resctrl/mpam_resctrl.c + create mode 100644 drivers/resctrl/test_mpam_resctrl.c +Merging arm-perf/for-next/perf (47f06ebbe8dad perf/arm-cmn: Fix resource_size_t printk specifier in arm_cmn_init_dtc()) +$ git merge -m Merge branch 'for-next/perf' of https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Auto-merging arch/arm64/kernel/cpufeature.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/perf/index.rst | 3 +- + .../{nvidia-pmu.rst => nvidia-tegra241-pmu.rst} | 8 +- + .../admin-guide/perf/nvidia-tegra410-pmu.rst | 522 ++++++++++ + arch/arm/include/asm/arm_pmuv3.h | 7 + + arch/arm64/kernel/cpufeature.c | 16 +- + arch/arm64/kvm/debug.c | 5 +- + drivers/perf/Kconfig | 14 + + drivers/perf/Makefile | 2 + + drivers/perf/arm-cmn.c | 70 +- + drivers/perf/arm_cspmu/arm_cspmu.c | 19 +- + drivers/perf/arm_cspmu/arm_cspmu.h | 17 +- + drivers/perf/arm_cspmu/nvidia_cspmu.c | 618 +++++++++++- + drivers/perf/nvidia_t410_c2c_pmu.c | 1051 ++++++++++++++++++++ + drivers/perf/nvidia_t410_cmem_latency_pmu.c | 736 ++++++++++++++ + 14 files changed, 3023 insertions(+), 65 deletions(-) + rename Documentation/admin-guide/perf/{nvidia-pmu.rst => nvidia-tegra241-pmu.rst} (98%) + create mode 100644 Documentation/admin-guide/perf/nvidia-tegra410-pmu.rst + create mode 100644 drivers/perf/nvidia_t410_c2c_pmu.c + create mode 100644 drivers/perf/nvidia_t410_cmem_latency_pmu.c +Merging arm-soc/for-next (7d3d773bd5e24 soc: document merges) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk.dts +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/arm,corstone1000.yaml | 15 +- + .../devicetree/bindings/arm/arm,vexpress-juno.yaml | 10 + + .../bindings/arm/marvell/armada-7k-8k.yaml | 11 + + .../bindings/arm/mediatek/mediatek,audsys.yaml | 59 +- + .../devicetree/bindings/arm/rockchip.yaml | 9 +- + .../devicetree/bindings/npu/arm,ethos.yaml | 2 +- + .../bindings/soc/renesas/renesas,rzg2l-sysc.yaml | 1 + + .../devicetree/bindings/soc/renesas/renesas.yaml | 13 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/arm-soc-for-next-contents.txt | 54 + + arch/arm/boot/dts/arm/arm-realview-eb.dtsi | 2 +- + arch/arm/boot/dts/arm/arm-realview-pb1176.dts | 2 +- + arch/arm/boot/dts/arm/arm-realview-pb11mp.dts | 2 +- + arch/arm/boot/dts/arm/arm-realview-pbx.dtsi | 2 +- + arch/arm/boot/dts/mediatek/mt7623.dtsi | 2 +- + .../boot/dts/renesas/r8a7740-armadillo800eva.dts | 32 + + .../arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts | 111 +- + arch/arm/boot/dts/renesas/r9a06g032.dtsi | 47 + + arch/arm/configs/shmobile_defconfig | 11 +- + arch/arm64/boot/dts/arm/Makefile | 2 + + arch/arm64/boot/dts/arm/corstone1000-a320-fvp.dts | 15 + + arch/arm64/boot/dts/arm/corstone1000-a320.dtsi | 91 ++ + arch/arm64/boot/dts/arm/corstone1000-fvp.dts | 90 +- + arch/arm64/boot/dts/arm/corstone1000-fvp.dtsi | 44 + + arch/arm64/boot/dts/arm/corstone1000-mps3.dts | 13 + + arch/arm64/boot/dts/arm/corstone1000.dtsi | 13 - + arch/arm64/boot/dts/arm/zena-css-fvp.dts | 63 ++ + arch/arm64/boot/dts/arm/zena-css.dtsi | 769 ++++++++++++++ + arch/arm64/boot/dts/mediatek/mt6359.dtsi | 4 +- + arch/arm64/boot/dts/mediatek/mt6795.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt7981b.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 2 +- + .../mediatek/mt7988a-bananapi-bpi-r4-pro-4e.dts | 2 +- + .../mediatek/mt7988a-bananapi-bpi-r4-pro-8x.dts | 2 +- + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 70 +- + .../boot/dts/mediatek/mt8195-cherry-dojo-r1.dts | 38 + + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 58 +- + arch/arm64/boot/dts/mediatek/mt8365-evk.dts | 4 +- + arch/arm64/boot/dts/mediatek/mt8365.dtsi | 5 +- + .../boot/dts/mediatek/mt8395-genio-common.dtsi | 4 +- + .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 4 +- + arch/arm64/boot/dts/renesas/ebisu.dtsi | 43 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 20 + + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 20 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 20 + + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 20 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 27 + + .../boot/dts/renesas/r8a779g3-sparrow-hawk.dts | 5 + + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 36 + + .../boot/dts/renesas/r9a09g056n48-rzv2n-evk.dts | 4 + + arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 21 + + arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 16 + + arch/arm64/boot/dts/renesas/r9a09g087.dtsi | 16 + + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 28 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 21 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 13 + + arch/arm64/boot/dts/rockchip/Makefile | 22 + + .../boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts | 17 - + arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 3 +- + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 2 + + .../boot/dts/rockchip/rk3399-nanopc-t4-hd702e.dtso | 96 ++ + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 2 + + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 2 - + .../dts/rockchip/rk3399-sapphire-excavator.dts | 2 + + .../dts/rockchip/rk3566-onething-edge-cube.dts | 342 +++++++ + arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 31 + + .../dts/rockchip/rk3566-qnap-ts133-pcb-13.dtso | 64 ++ + .../boot/dts/rockchip/rk3568-anbernic-rg-ds.dts | 44 +- + .../dts/rockchip/rk3568-qnap-ts233-pcb-12-11.dtso | 93 ++ + .../dts/rockchip/rk3568-qnap-ts433-pcb-12-10.dtso | 151 +++ + .../rk3568-wolfvision-pf5-io-expander.dtso | 20 + + arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 27 +- + arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts | 1 + + arch/arm64/boot/dts/rockchip/rk3576-evb2-v10.dts | 1071 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3576.dtsi | 28 + + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 8 +- + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 16 + + arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts | 21 +- + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 39 + + arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 27 +- + arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts | 16 + + arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts | 25 + + arch/riscv/boot/dts/thead/th1520.dtsi | 66 ++ + drivers/soc/renesas/Kconfig | 12 + + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r9a08g046-sysc.c | 91 ++ + drivers/soc/renesas/rz-sysc.c | 3 + + drivers/soc/renesas/rz-sysc.h | 1 + + 88 files changed, 4079 insertions(+), 259 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm64/boot/dts/arm/corstone1000-a320-fvp.dts + create mode 100644 arch/arm64/boot/dts/arm/corstone1000-a320.dtsi + create mode 100644 arch/arm64/boot/dts/arm/corstone1000-fvp.dtsi + create mode 100644 arch/arm64/boot/dts/arm/zena-css-fvp.dts + create mode 100644 arch/arm64/boot/dts/arm/zena-css.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4-hd702e.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-onething-edge-cube.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-qnap-ts133-pcb-13.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-qnap-ts233-pcb-12-11.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433-pcb-12-10.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-evb2-v10.dts + create mode 100644 drivers/soc/renesas/r9a08g046-sysc.c +Merging amlogic/for-next (4685804bb689b Merge branch 'v7.1/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi | 10 +- + .../dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts | 96 ++++++++- + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 238 ++++++++++++++++++++- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 + + .../dts/amlogic/meson-gxl-s905d-phicomm-n1.dts | 15 ++ + .../dts/amlogic/meson-s4-s905y4-khadas-vim1s.dts | 81 +++++++ + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 45 ++++ + 7 files changed, 483 insertions(+), 8 deletions(-) +Merging asahi-soc/asahi-soc/for-next (d31647c698f63 Merge branch 'apple-soc/drivers-6.20' into asahi-soc/for-next) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Merge made by the 'ort' strategy. +Merging at91/at91-next (c96e60ae720a8 Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. + .../bindings/arm/atmel,at91rm9200-sdramc.yaml | 66 ++ + .../bindings/arm/atmel,at91rm9200-st.yaml | 69 ++ + .../bindings/arm/atmel,at91sam9260-pit.yaml | 49 ++ + .../devicetree/bindings/arm/atmel-at91.yaml | 6 + + .../devicetree/bindings/arm/atmel-sysregs.txt | 48 -- + .../bindings/arm/microchip,sam9x60-pit64b.yaml | 68 ++ + .../bindings/arm/microchip,sama7g5-chipid.yaml | 41 ++ + arch/arm/boot/dts/microchip/sam9x60.dtsi | 2 - + arch/arm/boot/dts/microchip/sama7d65.dtsi | 40 ++ + arch/arm/configs/sama7_defconfig | 10 + + arch/arm64/Kconfig.platforms | 10 +- + arch/arm64/boot/dts/microchip/Makefile | 1 + + arch/arm64/boot/dts/microchip/clk-lan9691.h | 24 + + arch/arm64/boot/dts/microchip/lan9691.dtsi | 488 +++++++++++++ + arch/arm64/boot/dts/microchip/lan9696-ev23x71a.dts | 756 +++++++++++++++++++++ + arch/arm64/configs/defconfig | 1 + + drivers/clk/microchip/clk-mpfs-ccc.c | 6 +- + 17 files changed, 1628 insertions(+), 57 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/atmel,at91rm9200-sdramc.yaml + create mode 100644 Documentation/devicetree/bindings/arm/atmel,at91rm9200-st.yaml + create mode 100644 Documentation/devicetree/bindings/arm/atmel,at91sam9260-pit.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/atmel-sysregs.txt + create mode 100644 Documentation/devicetree/bindings/arm/microchip,sam9x60-pit64b.yaml + create mode 100644 Documentation/devicetree/bindings/arm/microchip,sama7g5-chipid.yaml + create mode 100644 arch/arm64/boot/dts/microchip/clk-lan9691.h + create mode 100644 arch/arm64/boot/dts/microchip/lan9691.dtsi + create mode 100644 arch/arm64/boot/dts/microchip/lan9696-ev23x71a.dts +Merging bmc/for-next (cd44dc5ead304 Merge branches 'aspeed/arm/dt', 'aspeed/fixes/drivers' and 'nuvoton/arm64/dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 2 + + arch/arm/boot/dts/aspeed/Makefile | 2 + + .../aspeed/aspeed-bmc-asrock-paul-ipmi-card.dts | 131 +++++++++++++++++++++ + .../aspeed/aspeed-bmc-asus-kommando-ipmi-card.dts | 117 ++++++++++++++++++ + .../dts/aspeed/aspeed-bmc-facebook-anacapa.dts | 22 ++++ + .../boot/dts/aspeed/aspeed-bmc-nvidia-msx4-bmc.dts | 1 + + .../dts/aspeed/openbmc-flash-layout-128-alt.dtsi | 32 +++++ + .../boot/dts/nuvoton/nuvoton-common-npcm8xx.dtsi | 3 - + drivers/soc/aspeed/Kconfig | 1 - + drivers/soc/aspeed/aspeed-socinfo.c | 2 +- + 10 files changed, 308 insertions(+), 5 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-paul-ipmi-card.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asus-kommando-ipmi-card.dts + create mode 100644 arch/arm/boot/dts/aspeed/openbmc-flash-layout-128-alt.dtsi +Merging broadcom/next (ddfdca13def5d Merge branch 'devicetree-arm64/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 58 +++++++++++- + arch/arm/boot/dts/broadcom/bcm2835-common.dtsi | 7 +- + arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi | 16 ++-- + .../boot/dts/broadcom/bcm4709-linksys-ea9200.dts | 100 ++++++++++++++++++++ + .../boot/dts/broadcom/bcm4709-netgear-r8000.dts | 73 ++++++-------- + .../boot/dts/broadcom/bcm47094-asus-rt-ac3100.dtsi | 7 ++ + .../boot/dts/broadcom/bcm47094-asus-rt-ac5300.dts | 3 + + .../dts/broadcom/bcm47094-linksys-panamera.dts | 7 ++ + .../boot/dts/broadcom/bcm47094-luxul-xap-1610.dts | 36 ++----- + .../dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts | 36 ++----- + arch/arm/boot/dts/broadcom/bcm63138.dtsi | 11 ++- + arch/arm/boot/dts/broadcom/bcm63148.dtsi | 11 ++- + arch/arm/boot/dts/broadcom/bcm6846.dtsi | 9 ++ + arch/arm/boot/dts/broadcom/bcm6855.dtsi | 18 ++++ + arch/arm/boot/dts/broadcom/bcm6878.dtsi | 11 ++- + arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts | 14 +++ + .../boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi | 55 +++++------ + arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 24 +++++ + arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 29 +++++- + arch/arm64/boot/dts/broadcom/rp1-common.dtsi | 105 +++++++++++++++++++++ + 20 files changed, 485 insertions(+), 145 deletions(-) +Merging cix/for-next (517d8fc52f3c7 arm64: defconfig: Enable CIX Sky1 pinctrl, PCIe host, and Cadence GPIO) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git cix/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/cix/sky1-orion-o6.dts | 28 ++++++ + arch/arm64/boot/dts/cix/sky1-power.h | 33 +++++++ + arch/arm64/boot/dts/cix/sky1.dtsi | 152 ++++++++++++++++++++++++++++++ + arch/arm64/configs/defconfig | 3 + + 4 files changed, 216 insertions(+) + create mode 100644 arch/arm64/boot/dts/cix/sky1-power.h +Merging davinci/davinci/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'davinci/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (82169065ffb07 memory: tegra: Add MC error logging support for Tegra264) +$ 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. + .../bindings/cache/baikal,bt1-l2-ctl.yaml | 63 ---- + drivers/memory/Kconfig | 11 - + drivers/memory/Makefile | 1 - + drivers/memory/brcmstb_memc.c | 8 +- + drivers/memory/bt1-l2-ctl.c | 323 ---------------- + drivers/memory/renesas-rpc-if.c | 8 +- + drivers/memory/tegra/mc.c | 135 ++++--- + drivers/memory/tegra/mc.h | 155 +++++--- + drivers/memory/tegra/tegra114.c | 18 +- + drivers/memory/tegra/tegra124-emc.c | 2 +- + drivers/memory/tegra/tegra124.c | 40 +- + drivers/memory/tegra/tegra186-emc.c | 8 + + drivers/memory/tegra/tegra186.c | 22 +- + drivers/memory/tegra/tegra194.c | 22 +- + drivers/memory/tegra/tegra20.c | 31 +- + drivers/memory/tegra/tegra210.c | 21 +- + drivers/memory/tegra/tegra234.c | 22 +- + drivers/memory/tegra/tegra264.c | 420 ++++++++++++++++++++- + drivers/memory/tegra/tegra30-emc.c | 6 +- + drivers/memory/tegra/tegra30.c | 18 +- + include/soc/tegra/mc.h | 40 +- + 21 files changed, 809 insertions(+), 565 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/cache/baikal,bt1-l2-ctl.yaml + delete mode 100644 drivers/memory/bt1-l2-ctl.c +Merging fsl/soc_fsl (0dfcabd743a33 soc: fsl: qe: panic on ioremap() failure in qe_reset()) +$ git merge -m Merge branch 'soc_fsl' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git fsl/soc_fsl +Merge made by the 'ort' strategy. + drivers/base/platform-msi.c | 4 - + drivers/bus/fsl-mc/dprc-driver.c | 14 +-- + drivers/bus/fsl-mc/fsl-mc-bus.c | 47 ++------ + drivers/bus/fsl-mc/fsl-mc-msi.c | 166 +++++---------------------- + drivers/bus/fsl-mc/fsl-mc-private.h | 2 +- + drivers/irqchip/Kconfig | 6 - + drivers/irqchip/Makefile | 1 - + drivers/irqchip/irq-gic-its-msi-parent.c | 7 +- + drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c | 168 ---------------------------- + drivers/soc/fsl/qe/qe.c | 3 + + drivers/soc/fsl/qe/qe_ports_ic.c | 23 ++-- + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 4 +- + include/linux/fsl/mc.h | 10 +- + include/linux/irqdomain_defs.h | 1 - + include/uapi/linux/fsl_hypervisor.h | 4 +- + 15 files changed, 68 insertions(+), 392 deletions(-) + delete mode 100644 drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c +Merging imx-mxs/for-next (355f5e2f9791e Merge branches 'imx/bindings', 'imx/dt', 'imx/dt64', 'imx/fixes' and 'imx/soc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git imx-mxs/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/arm/freescale/fsl,imx7ulp-pm.yaml | 5 + + Documentation/devicetree/bindings/arm/fsl.yaml | 86 ++ + .../devicetree/bindings/arm/nxp/lpc32xx.yaml | 22 + + .../interrupt-controller/fsl,irqsteer.yaml | 4 +- + .../bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml | 78 ++ + MAINTAINERS | 3 +- + arch/arm/boot/dts/nxp/imx/Makefile | 37 + + arch/arm/boot/dts/nxp/imx/imx1-ads.dts | 100 +- + arch/arm/boot/dts/nxp/imx/imx1-apf9328.dts | 92 +- + arch/arm/boot/dts/nxp/imx/imx1.dtsi | 2 +- + .../boot/dts/nxp/imx/imx25-eukrea-cpuimx25.dtsi | 38 +- + .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 6 +- + .../nxp/imx/imx25-eukrea-mbimxsd25-baseboard.dts | 134 ++- + arch/arm/boot/dts/nxp/imx/imx25-pdk.dts | 190 ++-- + arch/arm/boot/dts/nxp/imx/imx25.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx27-apf27.dts | 56 +- + arch/arm/boot/dts/nxp/imx/imx27-apf27dev.dts | 194 ++-- + .../boot/dts/nxp/imx/imx27-eukrea-cpuimx27.dtsi | 244 ++-- + .../nxp/imx/imx27-eukrea-mbimxsd27-baseboard.dts | 196 ++-- + arch/arm/boot/dts/nxp/imx/imx27-pdk.dts | 132 ++- + .../dts/nxp/imx/imx27-phytec-phycard-s-rdk.dts | 92 +- + .../dts/nxp/imx/imx27-phytec-phycard-s-som.dtsi | 162 ++- + .../boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts | 206 ++-- + .../boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi | 154 ++- + arch/arm/boot/dts/nxp/imx/imx27.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx31.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx35.dtsi | 30 +- + arch/arm/boot/dts/nxp/imx/imx51-babbage.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx51-ts4800.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx53-qsb.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx53-smd.dts | 18 + + .../arm/boot/dts/nxp/imx/imx53-voipac-dmm-668.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6dl-alti6p.dts | 4 +- + .../boot/dts/nxp/imx/imx6dl-eckelmann-ci4x10.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6dl-lanmcu.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6dl-plybas.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6dl-plym2m.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6dl-prtmvt.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6dl-qmx6.dtsi | 5 +- + arch/arm/boot/dts/nxp/imx/imx6dl-victgo.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6q-b450v3.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6q-b650v3.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6q-b850v3.dts | 53 +- + arch/arm/boot/dts/nxp/imx/imx6q-bx50v3.dtsi | 4 + + arch/arm/boot/dts/nxp/imx/imx6q-prtwd2.dts | 4 +- + ...mx6qdl-dhcom-overlay-panel-dpi-ch101olhlwh.dtsi | 75 ++ + .../nxp/imx/imx6qdl-dhcom-overlay-panel-dpi.dtsi | 61 + + .../imx6qdl-dhcom-pdk2-overlay-497-200-x12.dtso | 28 + + ...dhcom-pdk2-overlay-505-200-x12-ch101olhlwh.dtso | 26 + + .../imx6qdl-dhcom-pdk2-overlay-531-100-x21.dtso | 32 + + .../imx6qdl-dhcom-pdk2-overlay-531-100-x22.dtso | 32 + + .../imx6qdl-dhcom-pdk2-overlay-560-200-x12.dtso | 39 + + ...com-picoitx-overlay-626-100-x2-ch101olhlwh.dtso | 8 + + arch/arm/boot/dts/nxp/imx/imx6qdl-dhcom-som.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi | 12 + + arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-sr-som-ti.dtsi | 8 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi | 11 + + arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi | 5 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi | 24 +- + arch/arm/boot/dts/nxp/imx/imx6sx.dtsi | 4 +- + .../boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi | 10 + + arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2.dtsi | 1 + + .../boot/dts/nxp/imx/imx6ul-tqma6ul2l-mba6ulx.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6ul-tqma6ul2l.dtsi | 1 + + .../boot/dts/nxp/imx/imx6ul-tqma6ulx-common.dtsi | 1 + + .../boot/dts/nxp/imx/imx6ul-tqma6ulxl-common.dtsi | 1 + + arch/arm/boot/dts/nxp/imx/imx6ul.dtsi | 7 + + arch/arm/boot/dts/nxp/imx/imx6ull-dhcor-som.dtsi | 4 +- + .../dts/nxp/imx/imx6ull-engicam-microgea-bmm.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2.dtsi | 1 + + .../dts/nxp/imx/imx6ull-tqma6ull2l-mba6ulx.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6ull-tqma6ull2l.dtsi | 3 +- + arch/arm/boot/dts/nxp/imx/imx6ull.dtsi | 1 + + arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi | 13 + + arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi | 5 + + arch/arm/boot/dts/nxp/imx/imx7s-warp.dts | 2 - + arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 5 + + arch/arm/boot/dts/nxp/imx/imx7ulp.dtsi | 28 + + arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi | 6 + + arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx23.dtsi | 6 +- + arch/arm/boot/dts/nxp/mxs/imx28-apf28dev.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-apx4devkit.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-cfa10036.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-cfa10049.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-cfa10055.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-cfa10056.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-duckbill-2-485.dts | 4 +- + .../boot/dts/nxp/mxs/imx28-duckbill-2-enocean.dts | 6 +- + arch/arm/boot/dts/nxp/mxs/imx28-duckbill-2.dts | 4 +- + arch/arm/boot/dts/nxp/mxs/imx28-duckbill.dts | 4 +- + arch/arm/boot/dts/nxp/mxs/imx28-evk.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-m28cu3.dts | 4 +- + arch/arm/boot/dts/nxp/mxs/imx28-sps1.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-tx28.dts | 9 +- + arch/arm64/boot/dts/freescale/Makefile | 74 ++ + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 15 +- + .../arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi | 10 +- + .../dts/freescale/fsl-lx2160a-clearfog-itx.dtsi | 2 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 185 +++- + .../boot/dts/freescale/fsl-lx2162a-clearfog.dts | 10 + + .../boot/dts/freescale/fsl-lx2162a-sr-som.dtsi | 19 +- + .../arm64/boot/dts/freescale/imx8-apalis-eval.dtsi | 4 - + .../boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi | 10 +- + .../boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi | 10 +- + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 114 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 78 +- + .../dts/freescale/imx8mm-hummingboard-ripple.dts | 335 ++++++ + arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h | 33 + + arch/arm64/boot/dts/freescale/imx8mm-sr-som.dtsi | 393 +++++++ + .../imx8mm-tqma8mqml-mba8mx-lvds-g133han01.dtso | 86 ++ + .../imx8mm-tqma8mqml-mba8mx-lvds-tm070jvhg33.dtso | 9 +- + .../boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts | 1 - + .../imx8mm-tx8m-1610-moduline-iv-306-d.dts | 799 ++++++++++++++ + .../imx8mm-tx8m-1610-moduline-mini-111.dts | 687 ++++++++++++ + .../arm64/boot/dts/freescale/imx8mm-tx8m-1610.dtsi | 444 ++++++++ + .../freescale/imx8mm-var-som-symphony-legacy.dts | 19 + + .../boot/dts/freescale/imx8mm-var-som-symphony.dts | 214 +++- + .../freescale/imx8mm-var-som-wifi-brcm-legacy.dtsi | 12 + + .../freescale/imx8mm-var-som-wifi-bt-iw61x.dtsi | 45 + + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 372 ++++--- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 19 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 4 + + .../dts/freescale/imx8mn-solidsense-n8-compact.dts | 851 ++++++++++++++ + .../imx8mn-tqma8mqnl-mba8mx-lvds-tm070jvhg33.dtso | 7 +- + .../boot/dts/freescale/imx8mn-tqma8mqnl-mba8mx.dts | 1 - + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 11 +- + arch/arm64/boot/dts/freescale/imx8mp-ab2.dts | 912 +++++++++++++++ + .../freescale/imx8mp-aristainetos3a-som-v1.dtsi | 2 +- + .../arm64/boot/dts/freescale/imx8mp-beacon-kit.dts | 3 +- + .../boot/dts/freescale/imx8mp-beacon-som.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mp-cubox-m.dts | 2 +- + .../dts/freescale/imx8mp-data-modul-edm-sbc.dts | 2 +- + .../boot/dts/freescale/imx8mp-debix-model-a.dts | 2 +- + .../dts/freescale/imx8mp-debix-som-a-bmb-08.dts | 2 +- + .../boot/dts/freescale/imx8mp-debix-som-a.dtsi | 2 +- + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk3.dts | 2 +- + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mp-edm-g.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 98 +- + arch/arm64/boot/dts/freescale/imx8mp-frdm.dts | 538 ++++++++- + ...hummingboard-iiot-panel-dsi-WJ70N3TYJHMNG0.dtso | 67 ++ + ...ummingboard-iiot-panel-lvds-WF70A8SYJHLNGA.dtso | 97 ++ + .../imx8mp-hummingboard-iiot-rs485-a.dtso | 18 + + .../imx8mp-hummingboard-iiot-rs485-b.dtso | 18 + + .../dts/freescale/imx8mp-hummingboard-iiot.dts | 716 ++++++++++++ + .../imx8mp-hummingboard-pulse-common.dtsi | 2 +- + .../imx8mp-hummingboard-pulse-mini-hdmi.dtsi | 13 +- + .../boot/dts/freescale/imx8mp-icore-mx8mp.dtsi | 2 +- + .../boot/dts/freescale/imx8mp-kontron-dl.dtso | 26 +- + .../boot/dts/freescale/imx8mp-kontron-osm-s.dtsi | 6 + + .../imx8mp-kontron-smarc-eval-carrier.dts | 1 - + arch/arm64/boot/dts/freescale/imx8mp-navqp.dts | 2 +- + .../boot/dts/freescale/imx8mp-nitrogen-som.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mp-pinfunc.h | 2 +- + arch/arm64/boot/dts/freescale/imx8mp-sr-som.dtsi | 4 +- + .../freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 72 +- + .../imx8mp-tqma8mpql-mba8mpxl-lvds-g133han01.dtso | 6 +- + ...imx8mp-tqma8mpql-mba8mpxl-lvds-tm070jvhg33.dtso | 6 +- + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 67 ++ + ...x8p-ml81-moduline-display-106-av101hdt-a10.dtso | 1 + + .../imx8mp-tx8p-ml81-moduline-display-106.dts | 16 +- + .../arm64/boot/dts/freescale/imx8mp-tx8p-ml81.dtsi | 8 +- + .../boot/dts/freescale/imx8mp-ultra-mach-sbc.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 11 +- + .../imx8mq-tqma8mq-mba8mx-lvds-tm070jvhg33.dtso | 6 +- + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 10 +- + arch/arm64/boot/dts/freescale/imx8qm-ss-hsio.dtsi | 5 +- + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 10 +- + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx91-11x11-evk.dts | 98 ++ + .../boot/dts/freescale/imx91-11x11-frdm-s.dts | 769 +++++++++++++ + .../boot/dts/freescale/imx91-var-dart-sonata.dts | 471 ++++++++ + arch/arm64/boot/dts/freescale/imx91-var-dart.dtsi | 468 ++++++++ + arch/arm64/boot/dts/freescale/imx91.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx91_93_common.dtsi | 64 +- + .../boot/dts/freescale/imx93-11x11-evk-common.dtsi | 861 +++++++++++++++ + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 855 +------------- + .../dts/freescale/imx93-11x11-frdm-pixpaper.dtso | 50 + + arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts | 12 + + .../imx93-9x9-qsb-ontat-kd50g21-40nt-a1.dtso | 110 ++ + arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts | 6 + + .../boot/dts/freescale/imx93-phyboard-nash.dts | 12 +- + .../freescale/imx93-phyboard-segin-peb-av-02.dtso | 146 +++ + .../boot/dts/freescale/imx93-phyboard-segin.dts | 12 +- + .../boot/dts/freescale/imx93-phycore-som.dtsi | 12 +- + .../imx93-tqma9352-mba91xxca-lvds-tm070jvhg33.dtso | 56 + + .../imx93-tqma9352-mba91xxca-rgb-cdtech-dc44.dtso | 66 ++ + .../dts/freescale/imx93-tqma9352-mba91xxca.dts | 4 +- + .../dts/freescale/imx93-tqma9352-mba93xxca.dts | 4 +- + .../imx93-tqma9352-mba93xxla-mini-ezurio-wlan.dtso | 35 + + .../freescale/imx93-tqma9352-mba93xxla-mini.dts | 598 ++++++++++ + .../dts/freescale/imx93-tqma9352-mba93xxla.dts | 4 +- + arch/arm64/boot/dts/freescale/imx93.dtsi | 36 + + arch/arm64/boot/dts/freescale/imx93w-evk.dts | 28 + + arch/arm64/boot/dts/freescale/imx93w.dtsi | 110 ++ + arch/arm64/boot/dts/freescale/imx94-pinfunc.h | 12 + + arch/arm64/boot/dts/freescale/imx94.dtsi | 127 ++- + arch/arm64/boot/dts/freescale/imx943-evk.dts | 292 +++++ + arch/arm64/boot/dts/freescale/imx943.dtsi | 64 ++ + arch/arm64/boot/dts/freescale/imx95-15x15-evk.dts | 1 - + arch/arm64/boot/dts/freescale/imx95-15x15-frdm.dts | 73 ++ + .../boot/dts/freescale/imx95-19x19-evk-sof.dts | 7 +- + arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts | 2 +- + .../boot/dts/freescale/imx95-toradex-smarc.dtsi | 49 +- + .../boot/dts/freescale/imx95-var-dart-sonata.dts | 595 ++++++++++ + arch/arm64/boot/dts/freescale/imx95-var-dart.dtsi | 425 +++++++ + .../boot/dts/freescale/imx95-verdin-dahlia.dtsi | 270 +++++ + .../arm64/boot/dts/freescale/imx95-verdin-dev.dtsi | 250 +++++ + .../arm64/boot/dts/freescale/imx95-verdin-ivy.dtsi | 515 +++++++++ + .../boot/dts/freescale/imx95-verdin-mallow.dtsi | 223 ++++ + .../dts/freescale/imx95-verdin-nonwifi-dahlia.dts | 21 + + .../dts/freescale/imx95-verdin-nonwifi-dev.dts | 21 + + .../dts/freescale/imx95-verdin-nonwifi-ivy.dts | 21 + + .../dts/freescale/imx95-verdin-nonwifi-mallow.dts | 21 + + .../dts/freescale/imx95-verdin-nonwifi-yavia.dts | 21 + + .../boot/dts/freescale/imx95-verdin-nonwifi.dtsi | 16 + + .../dts/freescale/imx95-verdin-wifi-dahlia.dts | 21 + + .../boot/dts/freescale/imx95-verdin-wifi-dev.dts | 21 + + .../boot/dts/freescale/imx95-verdin-wifi-ivy.dts | 21 + + .../dts/freescale/imx95-verdin-wifi-mallow.dts | 21 + + .../boot/dts/freescale/imx95-verdin-wifi-yavia.dts | 21 + + .../boot/dts/freescale/imx95-verdin-wifi.dtsi | 50 + + .../boot/dts/freescale/imx95-verdin-yavia.dtsi | 217 ++++ + arch/arm64/boot/dts/freescale/imx95-verdin.dtsi | 1162 ++++++++++++++++++++ + arch/arm64/boot/dts/freescale/imx95.dtsi | 109 +- + arch/arm64/boot/dts/freescale/imx952-evk.dts | 273 +++++ + arch/arm64/boot/dts/freescale/imx952.dtsi | 232 +++- + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 4 +- + arch/arm64/boot/dts/freescale/s32n79-rdb.dts | 70 ++ + arch/arm64/boot/dts/freescale/s32n79.dtsi | 362 ++++++ + drivers/bus/imx-aipstz.c | 15 + + 234 files changed, 18597 insertions(+), 2490 deletions(-) + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-dhcom-overlay-panel-dpi-ch101olhlwh.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-dhcom-overlay-panel-dpi.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-dhcom-pdk2-overlay-497-200-x12.dtso + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-dhcom-pdk2-overlay-505-200-x12-ch101olhlwh.dtso + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-dhcom-pdk2-overlay-531-100-x21.dtso + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-dhcom-pdk2-overlay-531-100-x22.dtso + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-dhcom-pdk2-overlay-560-200-x12.dtso + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-dhcom-picoitx-overlay-626-100-x2-ch101olhlwh.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-hummingboard-ripple.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-sr-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-tqma8mqml-mba8mx-lvds-g133han01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-tx8m-1610-moduline-iv-306-d.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-tx8m-1610-moduline-mini-111.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-tx8m-1610.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-var-som-symphony-legacy.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-var-som-wifi-brcm-legacy.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-var-som-wifi-bt-iw61x.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-solidsense-n8-compact.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-ab2.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-hummingboard-iiot-panel-dsi-WJ70N3TYJHMNG0.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-hummingboard-iiot-panel-lvds-WF70A8SYJHLNGA.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-hummingboard-iiot-rs485-a.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-hummingboard-iiot-rs485-b.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-hummingboard-iiot.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx91-11x11-frdm-s.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx91-var-dart-sonata.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx91-var-dart.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-11x11-evk-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-11x11-frdm-pixpaper.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx93-9x9-qsb-ontat-kd50g21-40nt-a1.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx93-phyboard-segin-peb-av-02.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx93-tqma9352-mba91xxca-lvds-tm070jvhg33.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx93-tqma9352-mba91xxca-rgb-cdtech-dc44.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla-mini-ezurio-wlan.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla-mini.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93w-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93w.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx95-var-dart-sonata.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-var-dart.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-dahlia.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-dev.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-ivy.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-mallow.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-nonwifi-dahlia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-nonwifi-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-nonwifi-ivy.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-nonwifi-mallow.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-nonwifi-yavia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-nonwifi.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-wifi-dahlia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-wifi-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-wifi-ivy.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-wifi-mallow.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-wifi-yavia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-wifi.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin-yavia.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx95-verdin.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/s32n79-rdb.dts + create mode 100644 arch/arm64/boot/dts/freescale/s32n79.dtsi +Merging mediatek/for-next (e6490a169f6d5 Merge branch 'v7.0-next/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (242b0e86209e7 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + arch/arm/boot/dts/marvell/armada-380.dtsi | 148 --------------------- + .../boot/dts/marvell/armada-3720-atlas-v5.dts | 1 - + .../boot/dts/marvell/armada-3720-espressobin.dtsi | 1 - + arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi | 5 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 5 +- + .../boot/dts/marvell/armada-7020-comexpress.dtsi | 2 +- + arch/arm64/boot/dts/marvell/armada-8020.dtsi | 20 --- + .../boot/dts/marvell/cn9130-db-comexpress.dtsi | 96 ------------- + 9 files changed, 7 insertions(+), 272 deletions(-) + delete mode 100644 arch/arm/boot/dts/marvell/armada-380.dtsi + delete mode 100644 arch/arm64/boot/dts/marvell/armada-8020.dtsi + delete mode 100644 arch/arm64/boot/dts/marvell/cn9130-db-comexpress.dtsi +Merging omap/for-next (adaad0760ba7c Merge branch 'omap-for-v7.1/soc' into tmp/omap-next-20260312.172622) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/ti/omap.yaml | 2 + + .../bindings/display/bridge/lvds-codec.yaml | 1 + + .../bindings/display/panel/panel-lvds.yaml | 4 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/ti/omap/Makefile | 10 + + arch/arm/boot/dts/ti/omap/dm816x.dtsi | 4 +- + arch/arm/boot/dts/ti/omap/dra7-l4.dtsi | 4 +- + arch/arm/boot/dts/ti/omap/omap4-l4.dtsi | 4 +- + .../dts/ti/omap/omap4-samsung-espresso-common.dtsi | 744 +++++++++++++++++++++ + .../boot/dts/ti/omap/omap4-samsung-espresso10.dts | 101 +++ + .../boot/dts/ti/omap/omap4-samsung-espresso7.dts | 70 ++ + arch/arm/boot/dts/ti/omap/omap5-l4.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/twl6032.dtsi | 77 +++ + arch/arm/configs/multi_v7_defconfig | 28 + + arch/arm/configs/omap2plus_defconfig | 1 + + arch/arm/mach-omap2/id.c | 3 +- + include/linux/platform_data/voltage-omap.h | 4 +- + 17 files changed, 1051 insertions(+), 10 deletions(-) + create mode 100644 arch/arm/boot/dts/ti/omap/omap4-samsung-espresso-common.dtsi + create mode 100644 arch/arm/boot/dts/ti/omap/omap4-samsung-espresso10.dts + create mode 100644 arch/arm/boot/dts/ti/omap/omap4-samsung-espresso7.dts + create mode 100644 arch/arm/boot/dts/ti/omap/twl6032.dtsi +Merging qcom/for-next (54f966f63b379 Merge branches 'arm32-for-7.1', 'arm64-defconfig-for-7.1', 'arm64-fixes-for-7.0', 'arm64-for-7.1', 'clk-fixes-for-7.0', 'clk-for-7.1', 'drivers-fixes-for-7.0' and 'drivers-for-7.1' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 7 + + Documentation/devicetree/bindings/arm/qcom.yaml | 44 + + .../devicetree/bindings/cache/qcom,llcc.yaml | 2 + + .../bindings/clock/qcom,eliza-dispcc.yaml | 96 + + .../bindings/clock/qcom,glymur-dispcc.yaml | 4 +- + .../bindings/clock/qcom,ipq5210-gcc.yaml | 62 + + .../bindings/clock/qcom,kaanapali-gxclkctl.yaml | 1 + + .../devicetree/bindings/clock/qcom,milos-gcc.yaml | 9 +- + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + + .../bindings/clock/qcom,sm8450-gpucc.yaml | 4 +- + .../bindings/clock/qcom,sm8450-videocc.yaml | 3 + + .../bindings/clock/qcom,sm8550-tcsr.yaml | 2 + + .../bindings/display/msm/qcom,qcm2290-mdss.yaml | 6 +- + .../devicetree/bindings/firmware/qcom,scm.yaml | 3 + + .../bindings/interconnect/qcom,eliza-rpmh.yaml | 142 + + .../bindings/interconnect/qcom,osm-l3.yaml | 1 + + .../bindings/media/qcom,qcm2290-venus.yaml | 7 +- + .../bindings/soc/qcom/qcom,pmic-glink.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + arch/arm/boot/dts/qcom/Makefile | 2 - + arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts | 34 - + arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts | 23 - + arch/arm/boot/dts/qcom/qcom-apq8084.dtsi | 852 --- + arch/arm/boot/dts/qcom/qcom-ipq8062-smb208.dtsi | 37 - + arch/arm/boot/dts/qcom/qcom-ipq8062.dtsi | 8 - + arch/arm/boot/dts/qcom/qcom-ipq8064-smb208.dtsi | 37 - + .../boot/dts/qcom/qcom-ipq8064-v2.0-smb208.dtsi | 37 - + arch/arm/boot/dts/qcom/qcom-ipq8065-smb208.dtsi | 37 - + arch/arm/boot/dts/qcom/qcom-ipq8065.dtsi | 8 - + arch/arm64/boot/dts/qcom/Makefile | 44 +- + arch/arm64/boot/dts/qcom/agatti.dtsi | 19 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 1126 +-- + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 1133 ++++ + arch/arm64/boot/dts/qcom/apq8096sg-db820c.dts | 15 + + arch/arm64/boot/dts/qcom/eliza-mtp.dts | 407 ++ + arch/arm64/boot/dts/qcom/eliza.dtsi | 1324 ++++ + arch/arm64/boot/dts/qcom/glymur-crd.dts | 417 ++ + arch/arm64/boot/dts/qcom/glymur-crd.dtsi | 697 ++ + arch/arm64/boot/dts/qcom/glymur.dtsi | 7135 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts | 141 +- + arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi | 30 +- + arch/arm64/boot/dts/qcom/hamoa.dtsi | 526 +- + arch/arm64/boot/dts/qcom/ipq5210-rdp504.dts | 79 + + arch/arm64/boot/dts/qcom/ipq5210.dtsi | 311 + + arch/arm64/boot/dts/qcom/ipq5332-rdp-common.dtsi | 44 + + arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts | 34 - + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 33 + + arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts | 44 +- + arch/arm64/boot/dts/qcom/ipq5424.dtsi | 33 + + arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi | 66 +- + arch/arm64/boot/dts/qcom/ipq9574-rdp418-emmc.dts | 20 + + arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts | 44 +- + .../arm64/boot/dts/qcom/ipq9574-rdp433-common.dtsi | 121 + + arch/arm64/boot/dts/qcom/ipq9574-rdp433-emmc.dts | 20 + + arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts | 114 +- + arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts | 4 + + arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts | 4 + + arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts | 4 + + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 13 +- + arch/arm64/boot/dts/qcom/kaanapali-mtp.dts | 571 +- + arch/arm64/boot/dts/qcom/kaanapali-qrd.dts | 106 + + arch/arm64/boot/dts/qcom/kaanapali.dtsi | 5406 ++++++++++++++- + arch/arm64/boot/dts/qcom/kodiak.dtsi | 121 +- + arch/arm64/boot/dts/qcom/lemans-el2.dtso | 4 + + .../boot/dts/qcom/lemans-evk-ifp-mezzanine.dtso | 263 + + arch/arm64/boot/dts/qcom/lemans-evk.dts | 102 +- + arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi | 26 - + arch/arm64/boot/dts/qcom/lemans.dtsi | 37 +- + arch/arm64/boot/dts/qcom/mahua-crd.dts | 21 + + arch/arm64/boot/dts/qcom/mahua.dtsi | 299 + + arch/arm64/boot/dts/qcom/milos-fairphone-fp6.dts | 39 +- + arch/arm64/boot/dts/qcom/milos.dtsi | 473 +- + arch/arm64/boot/dts/qcom/monaco-arduino-monza.dts | 466 ++ + arch/arm64/boot/dts/qcom/monaco-el2.dtso | 29 + + .../boot/dts/qcom/monaco-evk-camera-imx577.dtso | 66 + + .../boot/dts/qcom/monaco-evk-ifp-mezzanine.dtso | 149 + + arch/arm64/boot/dts/qcom/monaco-evk.dts | 307 +- + arch/arm64/boot/dts/qcom/monaco-monza-som.dtsi | 323 + + arch/arm64/boot/dts/qcom/monaco.dtsi | 577 +- + arch/arm64/boot/dts/qcom/msm8916-wiko-chuppito.dts | 314 + + arch/arm64/boot/dts/qcom/msm8917-xiaomi-riva.dts | 310 +- + arch/arm64/boot/dts/qcom/msm8917-xiaomi-rolex.dts | 15 + + arch/arm64/boot/dts/qcom/msm8917-xiaomi-tiare.dts | 20 + + .../boot/dts/qcom/msm8917-xiaomi-wingtech.dtsi | 331 + + arch/arm64/boot/dts/qcom/msm8937-xiaomi-land.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8939-asus-z00t.dts | 18 + + arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts | 2 +- + .../boot/dts/qcom/msm8996-oneplus-common.dtsi | 9 +- + arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi | 63 - + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 11 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 2 +- + .../boot/dts/qcom/msm8996pro-xiaomi-natrium.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts | 9 +- + arch/arm64/boot/dts/qcom/pm6125.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm8010-kaanapali.dtsi | 93 + + arch/arm64/boot/dts/qcom/pmcx0102.dtsi | 187 + + arch/arm64/boot/dts/qcom/pmd8028-kaanapali.dtsi | 62 + + arch/arm64/boot/dts/qcom/pmh0101.dtsi | 68 + + arch/arm64/boot/dts/qcom/pmh0104-glymur.dtsi | 144 + + arch/arm64/boot/dts/qcom/pmh0104-kaanapali.dtsi | 63 + + arch/arm64/boot/dts/qcom/pmh0110-glymur.dtsi | 144 + + arch/arm64/boot/dts/qcom/pmh0110-kaanapali.dtsi | 213 + + arch/arm64/boot/dts/qcom/pmih0108-kaanapali.dtsi | 68 + + arch/arm64/boot/dts/qcom/pmk8550.dtsi | 10 + + arch/arm64/boot/dts/qcom/pmk8850.dtsi | 70 + + arch/arm64/boot/dts/qcom/pmr735d-kaanapali.dtsi | 63 + + arch/arm64/boot/dts/qcom/purwa-iot-evk.dts | 1572 +++++ + arch/arm64/boot/dts/qcom/purwa-iot-som.dtsi | 677 ++ + arch/arm64/boot/dts/qcom/purwa.dtsi | 606 +- + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 171 +- + arch/arm64/boot/dts/qcom/qcs615-ride.dts | 38 +- + .../qcom/qcs6490-rb3gen2-industrial-mezzanine.dtso | 269 + + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 2 +- + .../dts/qcom/qcs6490-thundercomm-minipc-g1iot.dts | 1093 +++ + .../boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts | 8 +- + arch/arm64/boot/dts/qcom/qcs8300-ride.dts | 336 + + arch/arm64/boot/dts/qcom/qdu1000.dtsi | 10 +- + arch/arm64/boot/dts/qcom/qrb2210-arduino-imola.dts | 126 +- + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 105 +- + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 105 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 39 +- + arch/arm64/boot/dts/qcom/sc7180-ecs-liva-qc710.dts | 616 ++ + arch/arm64/boot/dts/qcom/sc7180.dtsi | 10 +- + arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 11 - + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 12 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 40 +- + .../arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts | 66 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 42 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 69 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 35 + + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 13 +- + .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 17 +- + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 1 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 62 + + arch/arm64/boot/dts/qcom/sdx75.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sm4450.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 10 +- + .../boot/dts/qcom/sm6125-xiaomi-ginkgo-common.dtsi | 313 + + arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo.dts | 285 +- + .../boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts | 73 + + arch/arm64/boot/dts/qcom/sm6125-xiaomi-willow.dts | 15 + + arch/arm64/boot/dts/qcom/sm6125.dtsi | 36 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 28 +- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 4 + + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 141 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 16 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 28 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 17 +- + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 13 +- + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 13 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 101 +- + .../boot/dts/qcom/sm8650-ayaneo-pocket-s2.dts | 1551 +++++ + arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 13 +- + arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 13 +- + arch/arm64/boot/dts/qcom/sm8650.dtsi | 78 +- + arch/arm64/boot/dts/qcom/sm8750-mtp.dts | 122 + + arch/arm64/boot/dts/qcom/sm8750.dtsi | 1345 +++- + arch/arm64/boot/dts/qcom/smb2370.dtsi | 45 + + arch/arm64/boot/dts/qcom/talos.dtsi | 139 +- + arch/arm64/boot/dts/qcom/x1-asus-vivobook-s15.dtsi | 1356 ++++ + arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi | 91 +- + arch/arm64/boot/dts/qcom/x1-crd.dtsi | 50 +- + arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 18 +- + arch/arm64/boot/dts/qcom/x1-el2.dtso | 8 + + arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi | 18 +- + arch/arm64/boot/dts/qcom/x1-microsoft-denali.dtsi | 12 +- + arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 18 +- + .../dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 18 +- + .../boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 1346 +--- + .../boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 12 +- + .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 18 +- + .../dts/qcom/x1e80100-medion-sprchrgd-14-s1.dts | 12 +- + .../boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 12 +- + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 18 +- + .../boot/dts/qcom/x1p42100-asus-vivobook-s15.dts | 43 + + .../boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts | 23 +- + arch/arm64/configs/defconfig | 27 + + drivers/clk/qcom/Kconfig | 68 +- + drivers/clk/qcom/Makefile | 6 + + drivers/clk/qcom/cambistmclkcc-kaanapali.c | 2 - + drivers/clk/qcom/camcc-kaanapali.c | 2 - + drivers/clk/qcom/camcc-sc8180x.c | 67 +- + drivers/clk/qcom/clk-rcg2.c | 2 + + drivers/clk/qcom/clk-rpmh.c | 26 + + drivers/clk/qcom/dispcc-eliza.c | 2121 ++++++ + drivers/clk/qcom/dispcc-glymur.c | 8 +- + drivers/clk/qcom/dispcc-kaanapali.c | 4 - + drivers/clk/qcom/dispcc-milos.c | 5 +- + drivers/clk/qcom/dispcc-sc7180.c | 8 + + drivers/clk/qcom/dispcc-sc8280xp.c | 4 - + drivers/clk/qcom/dispcc-sm4450.c | 1 - + drivers/clk/qcom/dispcc-sm6115.c | 7 + + drivers/clk/qcom/dispcc-sm6125.c | 7 + + drivers/clk/qcom/dispcc-sm8250.c | 6 +- + drivers/clk/qcom/dispcc-sm8450.c | 2 +- + drivers/clk/qcom/dispcc0-sa8775p.c | 2 - + drivers/clk/qcom/dispcc1-sa8775p.c | 2 - + drivers/clk/qcom/gcc-eliza.c | 3104 +++++++++ + drivers/clk/qcom/gcc-glymur.c | 4 +- + drivers/clk/qcom/gcc-ipq5210.c | 2661 ++++++++ + drivers/clk/qcom/gcc-ipq6018.c | 2 +- + drivers/clk/qcom/gcc-kaanapali.c | 1 - + drivers/clk/qcom/gcc-sc8180x.c | 126 +- + drivers/clk/qcom/gpucc-glymur.c | 618 ++ + drivers/clk/qcom/gpucc-kaanapali.c | 1 - + drivers/clk/qcom/gxclkctl-kaanapali.c | 2 +- + drivers/clk/qcom/tcsrcc-eliza.c | 179 + + drivers/clk/qcom/tcsrcc-glymur.c | 3 +- + drivers/clk/qcom/tcsrcc-kaanapali.c | 1 - + drivers/clk/qcom/tcsrcc-sm8750.c | 2 +- + drivers/clk/qcom/videocc-glymur.c | 532 ++ + drivers/clk/qcom/videocc-sm8750.c | 1 - + drivers/firmware/qcom/qcom_qseecom_uefisecapp.c | 9 +- + drivers/firmware/qcom/qcom_scm.c | 16 +- + drivers/soc/qcom/llcc-qcom.c | 186 +- + drivers/soc/qcom/ocmem.c | 17 +- + drivers/soc/qcom/pdr_interface.c | 4 +- + drivers/soc/qcom/pdr_internal.h | 5 +- + drivers/soc/qcom/pmic_glink.c | 66 +- + drivers/soc/qcom/pmic_glink_altmode.c | 39 +- + drivers/soc/qcom/qcom_pd_mapper.c | 32 +- + drivers/soc/qcom/qcom_pdr_msg.c | 2 +- + drivers/soc/qcom/smp2p.c | 103 +- + drivers/soc/qcom/socinfo.c | 10 + + drivers/soc/qcom/ubwc_config.c | 31 +- + include/dt-bindings/arm/qcom,ids.h | 9 + + include/dt-bindings/clock/qcom,dispcc-sc7180.h | 7 +- + include/dt-bindings/clock/qcom,dispcc-sm6125.h | 6 +- + include/dt-bindings/clock/qcom,eliza-dispcc.h | 118 + + include/dt-bindings/clock/qcom,eliza-gcc.h | 210 + + include/dt-bindings/clock/qcom,eliza-tcsr.h | 17 + + include/dt-bindings/clock/qcom,gcc-sc8180x.h | 5 + + include/dt-bindings/clock/qcom,glymur-gcc.h | 1 + + include/dt-bindings/clock/qcom,glymur-gpucc.h | 51 + + include/dt-bindings/clock/qcom,glymur-videocc.h | 45 + + include/dt-bindings/clock/qcom,ipq5210-gcc.h | 126 + + include/dt-bindings/clock/qcom,sm6115-dispcc.h | 7 +- + include/dt-bindings/interconnect/qcom,eliza-rpmh.h | 136 + + include/dt-bindings/reset/qcom,ipq5210-gcc.h | 127 + + include/linux/soc/qcom/llcc-qcom.h | 8 +- + include/linux/soc/qcom/pdr.h | 1 + + include/linux/soc/qcom/qmi.h | 12 + + samples/qmi/qmi_sample_client.c | 2 +- + 246 files changed, 45571 insertions(+), 6260 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,eliza-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,ipq5210-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,eliza-rpmh.yaml + delete mode 100644 arch/arm/boot/dts/qcom/qcom-apq8084-ifc6540.dts + delete mode 100644 arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts + delete mode 100644 arch/arm/boot/dts/qcom/qcom-apq8084.dtsi + delete mode 100644 arch/arm/boot/dts/qcom/qcom-ipq8062-smb208.dtsi + delete mode 100644 arch/arm/boot/dts/qcom/qcom-ipq8062.dtsi + delete mode 100644 arch/arm/boot/dts/qcom/qcom-ipq8064-smb208.dtsi + delete mode 100644 arch/arm/boot/dts/qcom/qcom-ipq8064-v2.0-smb208.dtsi + delete mode 100644 arch/arm/boot/dts/qcom/qcom-ipq8065-smb208.dtsi + delete mode 100644 arch/arm/boot/dts/qcom/qcom-ipq8065.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/apq8096sg-db820c.dts + create mode 100644 arch/arm64/boot/dts/qcom/eliza-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/eliza.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/glymur-crd.dts + create mode 100644 arch/arm64/boot/dts/qcom/glymur-crd.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/glymur.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/ipq5210-rdp504.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq5210.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp418-emmc.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp433-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp433-emmc.dts + create mode 100644 arch/arm64/boot/dts/qcom/lemans-evk-ifp-mezzanine.dtso + create mode 100644 arch/arm64/boot/dts/qcom/mahua-crd.dts + create mode 100644 arch/arm64/boot/dts/qcom/mahua.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/monaco-arduino-monza.dts + create mode 100644 arch/arm64/boot/dts/qcom/monaco-el2.dtso + create mode 100644 arch/arm64/boot/dts/qcom/monaco-evk-camera-imx577.dtso + create mode 100644 arch/arm64/boot/dts/qcom/monaco-evk-ifp-mezzanine.dtso + create mode 100644 arch/arm64/boot/dts/qcom/monaco-monza-som.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-wiko-chuppito.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8917-xiaomi-rolex.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8917-xiaomi-tiare.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8917-xiaomi-wingtech.dtsi + delete mode 100644 arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8010-kaanapali.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmcx0102.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmd8028-kaanapali.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmh0101.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmh0104-glymur.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmh0104-kaanapali.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmh0110-glymur.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmh0110-kaanapali.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmih0108-kaanapali.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmk8850.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmr735d-kaanapali.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/purwa-iot-evk.dts + create mode 100644 arch/arm64/boot/dts/qcom/purwa-iot-som.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcs6490-thundercomm-minipc-g1iot.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-ecs-liva-qc710.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm6125-xiaomi-ginkgo-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm6125-xiaomi-willow.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8650-ayaneo-pocket-s2.dts + create mode 100644 arch/arm64/boot/dts/qcom/smb2370.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/x1-asus-vivobook-s15.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/x1p42100-asus-vivobook-s15.dts + create mode 100644 drivers/clk/qcom/dispcc-eliza.c + create mode 100644 drivers/clk/qcom/gcc-eliza.c + create mode 100644 drivers/clk/qcom/gcc-ipq5210.c + create mode 100644 drivers/clk/qcom/gpucc-glymur.c + create mode 100644 drivers/clk/qcom/tcsrcc-eliza.c + create mode 100644 drivers/clk/qcom/videocc-glymur.c + create mode 100644 include/dt-bindings/clock/qcom,eliza-dispcc.h + create mode 100644 include/dt-bindings/clock/qcom,eliza-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,eliza-tcsr.h + create mode 100644 include/dt-bindings/clock/qcom,glymur-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,glymur-videocc.h + create mode 100644 include/dt-bindings/clock/qcom,ipq5210-gcc.h + create mode 100644 include/dt-bindings/interconnect/qcom,eliza-rpmh.h + create mode 100644 include/dt-bindings/reset/qcom,ipq5210-gcc.h +Merging renesas/next (1ba26dfafb4de Merge branch 'renesas-dts-for-v7.1' into renesas-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. + .../bindings/clock/renesas,rzg2l-cpg.yaml | 40 ++- + arch/arm/boot/dts/renesas/r7s9210-rza2mevb.dts | 3 +- + .../boot/dts/renesas/r8a7742-iwg21d-q7-dbcm-ca.dts | 3 +- + arch/arm/boot/dts/renesas/r8a7743-sk-rzg1m.dts | 3 +- + arch/arm/boot/dts/renesas/r8a7745-sk-rzg1e.dts | 3 +- + arch/arm/boot/dts/renesas/r8a7790-lager.dts | 3 +- + arch/arm/boot/dts/renesas/r8a7790-stout.dts | 3 +- + arch/arm/boot/dts/renesas/r8a7791-koelsch.dts | 3 +- + arch/arm/boot/dts/renesas/r8a7791-porter.dts | 3 +- + arch/arm/boot/dts/renesas/r8a7793-gose.dts | 3 +- + arch/arm/boot/dts/renesas/r8a7794-alt.dts | 3 +- + arch/arm/boot/dts/renesas/r8a7794-silk.dts | 3 +- + arch/arm/boot/dts/renesas/r9a06g032.dtsi | 1 + + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 16 +- + arch/arm64/boot/dts/renesas/Makefile | 11 + + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 74 ----- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 3 +- + arch/arm64/boot/dts/renesas/cat875.dtsi | 3 +- + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 3 +- + .../r8a779g3-sparrow-hawk-olimex-dsi-hdmi.dtso | 92 ++++++ + .../r8a779g3-sparrow-hawk-ws-display-13in.dtso | 88 ++++++ + arch/arm64/boot/dts/renesas/r9a08g046.dtsi | 212 +++++++++++++ + arch/arm64/boot/dts/renesas/r9a08g046l48-smarc.dts | 37 +++ + arch/arm64/boot/dts/renesas/r9a08g046l48.dtsi | 13 + + arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts | 3 +- + arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 153 +++++++++ + arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 38 +++ + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 30 -- + .../boot/dts/renesas/r9a09g056n48-rzv2n-evk.dts | 8 +- + .../boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts | 33 +- + .../dts/renesas/r9a09g057h48-kakip-pixpaper.dtso | 39 +++ + arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 18 ++ + .../boot/dts/renesas/r9a09g077m44-rzt2h-evk.dts | 71 +++-- + arch/arm64/boot/dts/renesas/r9a09g087.dtsi | 18 ++ + .../boot/dts/renesas/r9a09g087m44-rzn2h-evk.dts | 75 +++-- + arch/arm64/boot/dts/renesas/renesas-smarc2.dtsi | 12 +- + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 6 +- + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 3 +- + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 6 +- + arch/arm64/boot/dts/renesas/rzg3e-smarc-som.dtsi | 21 +- + arch/arm64/boot/dts/renesas/rzg3l-smarc-som.dtsi | 20 ++ + drivers/soc/renesas/r9a09g047-sys.c | 2 +- + drivers/soc/renesas/r9a09g056-sys.c | 2 +- + drivers/soc/renesas/r9a09g057-sys.c | 2 +- + include/dt-bindings/clock/renesas,r9a08g046-cpg.h | 342 +++++++++++++++++++++ + 45 files changed, 1276 insertions(+), 252 deletions(-) + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk-olimex-dsi-hdmi.dtso + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk-ws-display-13in.dtso + create mode 100644 arch/arm64/boot/dts/renesas/r9a08g046.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a08g046l48-smarc.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a08g046l48.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a09g057h48-kakip-pixpaper.dtso + create mode 100644 arch/arm64/boot/dts/renesas/rzg3l-smarc-som.dtsi + create mode 100644 include/dt-bindings/clock/renesas,r9a08g046-cpg.h +Merging reset/reset/next (ccef9ef0aa2b9 reset: core: Drop unnecessary double quote) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Auto-merging drivers/reset/core.c +CONFLICT (content): Merge conflict in drivers/reset/core.c +Resolved 'drivers/reset/core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fbb92611ec6cd] Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux +$ git diff -M --stat --summary HEAD^.. + .../bindings/soc/cix/cix,sky1-system-control.yaml | 42 ++ + Documentation/driver-api/reset.rst | 1 - + drivers/reset/Kconfig | 7 + + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 517 ++++++++++++++------- + drivers/reset/reset-ath79.c | 12 +- + drivers/reset/reset-gpio.c | 27 +- + drivers/reset/reset-intel-gw.c | 11 +- + drivers/reset/reset-lpc18xx.c | 12 +- + drivers/reset/reset-ma35d1.c | 11 +- + drivers/reset/reset-npcm.c | 12 +- + drivers/reset/reset-rzv2h-usb2phy.c | 64 +-- + drivers/reset/reset-sky1.c | 367 +++++++++++++++ + drivers/reset/reset-sunplus.c | 12 +- + drivers/reset/sti/reset-syscfg.c | 9 +- + .../dt-bindings/reset/cix,sky1-s5-system-control.h | 163 +++++++ + .../dt-bindings/reset/cix,sky1-system-control.h | 41 ++ + include/linux/reset-controller.h | 21 +- + include/linux/reset.h | 43 +- + 19 files changed, 1053 insertions(+), 320 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/cix/cix,sky1-system-control.yaml + create mode 100644 drivers/reset/reset-sky1.c + create mode 100644 include/dt-bindings/reset/cix,sky1-s5-system-control.h + create mode 100644 include/dt-bindings/reset/cix,sky1-system-control.h +Merging rockchip/for-next (2e930174c99bf Merge branch 'v7.1-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 11 + + .../bindings/clock/rockchip,rv1126b-cru.yaml | 1 + + .../devicetree/bindings/soc/rockchip/grf.yaml | 3 + + arch/arm/boot/dts/rockchip/Makefile | 1 + + arch/arm/boot/dts/rockchip/rk3036-evb.dts | 4 +- + arch/arm/boot/dts/rockchip/rk3036-kylin.dts | 4 +- + arch/arm/boot/dts/rockchip/rk3188-bqedison2qc.dts | 2 +- + .../boot/dts/rockchip/rk3288-firefly-reload.dts | 3 +- + arch/arm/boot/dts/rockchip/rk3288-phycore-rdk.dts | 16 +- + arch/arm/boot/dts/rockchip/rk3288-phycore-som.dtsi | 2 +- + arch/arm/boot/dts/rockchip/rk3288-veyron-brain.dts | 2 - + .../arm/boot/dts/rockchip/rk3288-veyron-fievel.dts | 5 +- + arch/arm/boot/dts/rockchip/rk3288-veyron-jaq.dts | 2 +- + arch/arm/boot/dts/rockchip/rk3288-veyron-jerry.dts | 2 +- + .../arm/boot/dts/rockchip/rk3288-veyron-mickey.dts | 2 - + arch/arm/boot/dts/rockchip/rk3288-veyron-pinky.dts | 1 + + arch/arm/boot/dts/rockchip/rk3288.dtsi | 1 - + arch/arm/boot/dts/rockchip/rv1103b-omega4-evb.dts | 63 ++ + arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi | 147 ++++ + arch/arm/boot/dts/rockchip/rv1103b-pinctrl.dtsi | 816 +++++++++++++++++++++ + arch/arm/boot/dts/rockchip/rv1103b.dtsi | 239 ++++++ + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/rk3328-a1.dts | 23 - + arch/arm64/boot/dts/rockchip/rk3528.dtsi | 47 ++ + arch/arm64/boot/dts/rockchip/rk3562-evb2-v10.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3562.dtsi | 46 ++ + arch/arm64/boot/dts/rockchip/rk3566-lckfb-tspi.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 12 +- + arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 52 +- + .../boot/dts/rockchip/rk3576-armsom-sige5.dts | 2 + + .../boot/dts/rockchip/rk3576-khadas-edge-2l.dts | 34 + + arch/arm64/boot/dts/rockchip/rk3576.dtsi | 87 ++- + arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 12 + + .../boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi | 6 +- + .../boot/dts/rockchip/rk3588s-gameforce-ace.dts | 12 +- + drivers/clk/rockchip/Kconfig | 7 + + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-rk3568.c | 6 + + drivers/clk/rockchip/clk-rv1103b.c | 658 +++++++++++++++++ + drivers/clk/rockchip/clk.h | 49 ++ + include/dt-bindings/clock/rockchip,rv1103b-cru.h | 220 ++++++ + 41 files changed, 2542 insertions(+), 66 deletions(-) + create mode 100644 arch/arm/boot/dts/rockchip/rv1103b-omega4-evb.dts + create mode 100644 arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi + create mode 100644 arch/arm/boot/dts/rockchip/rv1103b-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/rockchip/rv1103b.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-khadas-edge-2l.dts + create mode 100644 drivers/clk/rockchip/clk-rv1103b.c + create mode 100644 include/dt-bindings/clock/rockchip,rv1103b-cru.h +Merging samsung-krzk/for-next (909d9996904bf Merge branch 'next/clk' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/axis.yaml | 6 + + .../bindings/arm/samsung/samsung-boards.yaml | 3 + + .../bindings/clock/axis,artpec9-clock.yaml | 232 ++++ + .../clock/samsung,exynosautov920-clock.yaml | 21 + + .../bindings/firmware/google,gs101-acpm-ipc.yaml | 50 +- + arch/arm/boot/dts/samsung/Makefile | 1 + + arch/arm/boot/dts/samsung/exynos3250-artik5.dtsi | 2 - + arch/arm/boot/dts/samsung/exynos3250-monk.dts | 4 - + arch/arm/boot/dts/samsung/exynos3250-rinato.dts | 4 - + arch/arm/boot/dts/samsung/exynos4210-smdkv310.dts | 2 - + .../boot/dts/samsung/exynos4412-itop-scp-core.dtsi | 2 - + arch/arm/boot/dts/samsung/exynos4412-origen.dts | 2 - + arch/arm/boot/dts/samsung/exynos5250-manta.dts | 564 +++++++++ + arch/arm/mach-exynos/firmware.c | 4 +- + arch/arm64/boot/dts/exynos/Makefile | 2 + + arch/arm64/boot/dts/exynos/axis/Makefile | 3 +- + arch/arm64/boot/dts/exynos/axis/artpec9-alfred.dts | 36 + + .../boot/dts/exynos/axis/artpec9-pinctrl.dtsi | 115 ++ + arch/arm64/boot/dts/exynos/axis/artpec9.dtsi | 277 +++++ + .../arm64/boot/dts/exynos/exynos7870-a2corelte.dts | 9 - + arch/arm64/boot/dts/exynos/exynos7870-j5y17lte.dts | 523 +++++++++ + arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts | 6 - + arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts | 494 ++++++++ + arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts | 9 - + arch/arm64/boot/dts/exynos/exynos7870.dtsi | 48 + + arch/arm64/boot/dts/exynos/exynos8895-dreamlte.dts | 2 - + arch/arm64/boot/dts/exynos/exynos8895.dtsi | 128 ++ + arch/arm64/boot/dts/exynos/exynosautov920.dtsi | 13 + + arch/arm64/boot/dts/exynos/google/gs101-oriole.dts | 22 + + .../boot/dts/exynos/google/gs101-pixel-common.dtsi | 528 ++++++++- + arch/arm64/boot/dts/exynos/google/gs101-raven.dts | 18 + + drivers/clk/samsung/Makefile | 1 + + drivers/clk/samsung/clk-acpm.c | 4 +- + drivers/clk/samsung/clk-artpec9.c | 1224 ++++++++++++++++++++ + drivers/clk/samsung/clk-exynos850.c | 7 +- + drivers/clk/samsung/clk-exynosautov920.c | 52 + + drivers/clk/samsung/clk-gs101.c | 52 +- + drivers/clk/samsung/clk-pll.c | 185 ++- + drivers/clk/samsung/clk-pll.h | 17 + + drivers/clk/samsung/clk.c | 4 +- + drivers/firmware/samsung/exynos-acpm-dvfs.c | 13 +- + drivers/firmware/samsung/exynos-acpm-dvfs.h | 4 +- + drivers/firmware/samsung/exynos-acpm-pmic.c | 26 +- + drivers/firmware/samsung/exynos-acpm-pmic.h | 10 +- + drivers/firmware/samsung/exynos-acpm.c | 30 +- + drivers/firmware/samsung/exynos-acpm.h | 10 +- + drivers/mfd/sec-acpm.c | 10 +- + include/dt-bindings/clock/axis,artpec9-clk.h | 195 ++++ + include/dt-bindings/clock/exynos850.h | 1 + + include/dt-bindings/clock/samsung,exynosautov920.h | 6 + + .../linux/firmware/samsung/exynos-acpm-protocol.h | 40 +- + 51 files changed, 4861 insertions(+), 160 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/axis,artpec9-clock.yaml + create mode 100644 arch/arm/boot/dts/samsung/exynos5250-manta.dts + create mode 100644 arch/arm64/boot/dts/exynos/axis/artpec9-alfred.dts + create mode 100644 arch/arm64/boot/dts/exynos/axis/artpec9-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/axis/artpec9.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos7870-j5y17lte.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts + create mode 100644 drivers/clk/samsung/clk-artpec9.c + create mode 100644 include/dt-bindings/clock/axis,artpec9-clk.h +Merging scmi/for-linux-next (dc2403ac2da03 Merge branch 'for-next/scmi/updates', tag 'juno-updates-7.1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/firmware/arm,scmi.yaml | 10 + + drivers/clk/clk-scmi.c | 48 +--- + drivers/firmware/arm_scmi/base.c | 4 +- + drivers/firmware/arm_scmi/clock.c | 319 ++++++++++++++++----- + drivers/firmware/arm_scmi/common.h | 4 + + drivers/firmware/arm_scmi/driver.c | 84 ++++-- + drivers/firmware/arm_scmi/protocols.h | 13 +- + drivers/firmware/arm_scmi/quirks.h | 8 +- + .../firmware/arm_scmi/vendors/imx/imx-sm-misc.c | 86 ++++++ + drivers/firmware/imx/sm-misc.c | 73 +++++ + include/linux/scmi_imx_protocol.h | 14 + + include/linux/scmi_protocol.h | 29 +- + 12 files changed, 535 insertions(+), 157 deletions(-) +Merging sophgo/for-next (9aa6068586a9b Merge branch 'dt/riscv' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sophgo/cv180x.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sophgo-soc/soc-for-next (c8754c7deab4c soc: sophgo: cv1800: rtcsys: New driver (handling RTC only)) +$ git merge -m Merge branch 'soc-for-next' of https://github.com/sophgo/linux.git sophgo-soc/soc-for-next +Already up to date. +Merging spacemit/for-next (2b8bd26bbfcde riscv: dts: spacemit: enable PCIe ports on Milk-V Jupiter) +$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/serial/8250.yaml | 5 +- + arch/riscv/boot/dts/spacemit/k1-bananapi-f3.dts | 26 +- + arch/riscv/boot/dts/spacemit/k1-milkv-jupiter.dts | 204 +++++++++++++++- + arch/riscv/boot/dts/spacemit/k1.dtsi | 112 ++++----- + arch/riscv/boot/dts/spacemit/k3-pico-itx.dts | 23 ++ + arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi | 58 +++++ + arch/riscv/boot/dts/spacemit/k3.dtsi | 269 ++++++++++++++++++++- + 7 files changed, 618 insertions(+), 79 deletions(-) + create mode 100644 arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi +Merging stm32/stm32-next (515aa8b118840 arm64: defconfig: Enable STMicroelectronics STM32 display support) +$ git merge -m Merge branch 'stm32-next' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/arm,coresight-cti.yaml | 3 + + .../bindings/arm/arm,coresight-dynamic-funnel.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-etm.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-stm.yaml | 3 + + .../devicetree/bindings/arm/arm,coresight-tmc.yaml | 3 + + .../bindings/arm/arm,coresight-tpiu.yaml | 3 + + .../devicetree/bindings/arm/stm32/stm32.yaml | 8 +- + .../bindings/bus/st,stm32mp131-dbg-bus.yaml | 76 +++++ + .../devicetree/bindings/pinctrl/st,stm32-hdp.yaml | 6 + + MAINTAINERS | 1 + + arch/arm/boot/dts/st/Makefile | 129 +++++++- + arch/arm/boot/dts/st/stm32mp131.dtsi | 156 ++++++++-- + arch/arm/boot/dts/st/stm32mp135f-dk.dts | 24 ++ + ...tm32mp13xx-dhcor-dhsbc-overlay-rb-tft32-v2.dtso | 85 ++++++ + arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi | 164 ++++++++++ + arch/arm/boot/dts/st/stm32mp151.dtsi | 236 ++++++++++++-- + arch/arm/boot/dts/st/stm32mp153.dtsi | 68 +++++ + arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 59 ++++ + ...1-3.dts => stm32mp157c-phyboard-sargas-rdk.dts} | 24 +- + ...15xx-avenger96-overlay-644-100-x6-otm8009a.dtso | 61 ++++ + ...15xx-avenger96-overlay-644-100-x6-rpi7inch.dtso | 31 ++ + .../stm32mp15xx-avenger96-overlay-fdcan1-x6.dtso | 10 + + .../stm32mp15xx-avenger96-overlay-fdcan2-x6.dtso | 10 + + ...m32mp15xx-avenger96-overlay-i2c1-eeprom-x6.dtso | 17 ++ + ...m32mp15xx-avenger96-overlay-i2c2-eeprom-x6.dtso | 17 ++ + .../stm32mp15xx-avenger96-overlay-ov5640-x7.dtso | 89 ++++++ + ...m32mp15xx-avenger96-overlay-spi2-eeprom-x6.dtso | 24 ++ + .../stm32mp15xx-dhcom-drc02-overlay-wifi-rsi.dtso | 10 + + ...mp15xx-dhcom-overlay-panel-dpi-ch101olhlwh.dtsi | 75 +++++ + .../st/stm32mp15xx-dhcom-overlay-panel-dpi.dtsi | 74 +++++ + ...stm32mp15xx-dhcom-pdk2-overlay-460-200-x11.dtso | 27 ++ + ...stm32mp15xx-dhcom-pdk2-overlay-497-200-x12.dtso | 24 ++ + ...dhcom-pdk2-overlay-505-200-x12-ch101olhlwh.dtso | 26 ++ + ...stm32mp15xx-dhcom-pdk2-overlay-531-100-x21.dtso | 35 +++ + ...stm32mp15xx-dhcom-pdk2-overlay-531-100-x22.dtso | 19 ++ + ...stm32mp15xx-dhcom-pdk2-overlay-560-200-x12.dtso | 66 ++++ + ...xx-dhcom-pdk2-overlay-638-100-x12-rpi7inch.dtso | 28 ++ + ...stm32mp15xx-dhcom-pdk2-overlay-672-100-x18.dtso | 13 + + arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi | 72 ----- + ...com-picoitx-overlay-548-200-x2-mi0700s4t-6.dtso | 35 +++ + ...m-picoitx-overlay-553-100-x2-tst043015cmhx.dtso | 35 +++ + ...com-picoitx-overlay-626-100-x2-ch101olhlwh.dtso | 8 + + .../boot/dts/st/stm32mp15xx-dhcor-avenger96.dtsi | 6 - + ...m32mp15xx-dhsom-overlay-panel-dsi-rpi7inch.dtsi | 97 ++++++ + arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 40 +++ + .../boot/dts/st/stm32mp15xx-phyboard-sargas.dtsi | 285 +++++++++++++++++ + ...2mp15-som.dtsi => stm32mp15xx-phycore-som.dtsi} | 339 ++++----------------- + arch/arm64/boot/dts/st/stm32mp211.dtsi | 16 + + arch/arm64/boot/dts/st/stm32mp215f-dk.dts | 4 + + arch/arm64/boot/dts/st/stm32mp231.dtsi | 31 +- + arch/arm64/boot/dts/st/stm32mp235.dtsi | 18 ++ + arch/arm64/boot/dts/st/stm32mp235f-dk.dts | 130 ++++++++ + arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi | 63 +++- + arch/arm64/boot/dts/st/stm32mp251.dtsi | 24 +- + arch/arm64/boot/dts/st/stm32mp257f-dk.dts | 130 ++++++++ + arch/arm64/boot/dts/st/stm32mp257f-ev1.dts | 6 + + arch/arm64/configs/defconfig | 4 + + drivers/bus/Kconfig | 10 + + drivers/bus/Makefile | 1 + + drivers/bus/stm32_dbg_bus.c | 250 +++++++++++++++ + drivers/bus/stm32_etzpc.c | 3 +- + drivers/bus/stm32_firewall.c | 59 +++- + drivers/bus/stm32_rifsc.c | 61 ++-- + drivers/pinctrl/stm32/pinctrl-stm32-hdp.c | 14 + + {drivers => include/linux}/bus/stm32_firewall.h | 0 + include/linux/bus/stm32_firewall_device.h | 26 ++ + 66 files changed, 2997 insertions(+), 480 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/st,stm32mp131-dbg-bus.yaml + create mode 100644 arch/arm/boot/dts/st/stm32mp13xx-dhcor-dhsbc-overlay-rb-tft32-v2.dtso + rename arch/arm/boot/dts/st/{stm32mp157c-phycore-stm32mp1-3.dts => stm32mp157c-phyboard-sargas-rdk.dts} (58%) + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-avenger96-overlay-644-100-x6-otm8009a.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-avenger96-overlay-644-100-x6-rpi7inch.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-avenger96-overlay-fdcan1-x6.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-avenger96-overlay-fdcan2-x6.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-avenger96-overlay-i2c1-eeprom-x6.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-avenger96-overlay-i2c2-eeprom-x6.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-avenger96-overlay-ov5640-x7.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-avenger96-overlay-spi2-eeprom-x6.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-drc02-overlay-wifi-rsi.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-overlay-panel-dpi-ch101olhlwh.dtsi + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-overlay-panel-dpi.dtsi + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2-overlay-460-200-x11.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2-overlay-497-200-x12.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2-overlay-505-200-x12-ch101olhlwh.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2-overlay-531-100-x21.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2-overlay-531-100-x22.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2-overlay-560-200-x12.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2-overlay-638-100-x12-rpi7inch.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2-overlay-672-100-x18.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx-overlay-548-200-x2-mi0700s4t-6.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx-overlay-553-100-x2-tst043015cmhx.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhcom-picoitx-overlay-626-100-x2-ch101olhlwh.dtso + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-dhsom-overlay-panel-dsi-rpi7inch.dtsi + create mode 100644 arch/arm/boot/dts/st/stm32mp15xx-phyboard-sargas.dtsi + rename arch/arm/boot/dts/st/{stm32mp157c-phycore-stm32mp15-som.dtsi => stm32mp15xx-phycore-som.dtsi} (53%) + create mode 100644 drivers/bus/stm32_dbg_bus.c + rename {drivers => include/linux}/bus/stm32_firewall.h (100%) +Merging sunxi/sunxi/for-next (57f5def66c1b4 Merge branch 'sunxi/dt-for-7.1' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + .../bindings/leds/allwinner,sun50i-a100-ledc.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm64/boot/dts/allwinner/Makefile | 1 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 10 + + .../boot/dts/allwinner/sun50i-h6-taiqicat-a01.dts | 361 +++++++++++++++++++++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 8 + + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 9 + + arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi | 59 +++- + .../boot/dts/allwinner/sun55i-t527-avaota-a1.dts | 56 ++++ + drivers/clk/sunxi-ng/ccu-sun55i-a523-r.c | 17 +- + 11 files changed, 527 insertions(+), 2 deletions(-) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-taiqicat-a01.dts +Merging tee/next (68ab55bcc5f51 Merge branch 'tee_for_v7.1' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tee/next +Merge made by the 'ort' strategy. + drivers/tee/optee/device.c | 5 +-- + drivers/tee/optee/supp.c | 107 +++++++++++++++++++++++++++++++-------------- + include/linux/tee_core.h | 30 +++++++------ + 3 files changed, 91 insertions(+), 51 deletions(-) +Merging tegra/for-next (18a0a635f4862 Merge branch for-7.1/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/tegra.yaml | 56 +- + .../bindings/arm/tegra/nvidia,tegra234-cbb.yaml | 4 + + .../bindings/clock/nvidia,tegra124-dfll.txt | 155 - + .../bindings/clock/nvidia,tegra124-dfll.yaml | 290 ++ + .../display/tegra/nvidia,tegra20-hdmi.yaml | 13 +- + .../interrupt-controller/nvidia,tegra20-ictlr.yaml | 23 +- + .../memory-controllers/nvidia,tegra210-emc.yaml | 6 +- + .../memory-controllers/nvidia,tegra210-mc.yaml | 77 + + .../bindings/pci/nvidia,tegra264-pcie.yaml | 149 + + .../bindings/phy/nvidia,tegra194-xusb-padctl.yaml | 39 +- + .../bindings/phy/nvidia,tegra20-usb-phy.yaml | 1 + + MAINTAINERS | 14 +- + arch/arm/boot/dts/nvidia/tegra114-tn7.dts | 13 +- + arch/arm/boot/dts/nvidia/tegra114.dtsi | 221 + + arch/arm/boot/dts/nvidia/tegra20-paz00.dts | 8 + + arch/arm/boot/dts/nvidia/tegra30-asus-tf600t.dts | 21 +- + arch/arm/boot/dts/nvidia/tegra30-lg-p880.dts | 23 + + arch/arm/boot/dts/nvidia/tegra30-lg-p895.dts | 33 + + arch/arm/boot/dts/nvidia/tegra30-lg-x3.dtsi | 174 +- + arch/arm/configs/multi_v7_defconfig | 4 - + arch/arm/configs/tegra_defconfig | 4 - + arch/arm/mach-tegra/Makefile | 2 - + arch/arm/mach-tegra/board-paz00.c | 56 - + arch/arm/mach-tegra/board.h | 2 - + arch/arm/mach-tegra/tegra.c | 4 - + arch/arm64/boot/dts/nvidia/Makefile | 2 + + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 12 + + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 - + arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi | 1 + + arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi | 1 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 6 +- + .../dts/nvidia/tegra264-p4071-0000+p3834-0008.dts | 11 + + .../boot/dts/nvidia/tegra264-p4071-0000+p3834.dtsi | 12 + + arch/arm64/boot/dts/nvidia/tegra264.dtsi | 336 +- + arch/arm64/configs/defconfig | 7 - + drivers/firmware/tegra/bpmp.c | 34 + + drivers/soc/tegra/Kconfig | 20 + + drivers/soc/tegra/cbb/tegra234-cbb.c | 169 +- + drivers/soc/tegra/common.c | 5 +- + drivers/soc/tegra/pmc.c | 668 +-- + include/soc/tegra/bpmp-abi.h | 4577 ++++++++++++++++---- + include/soc/tegra/bpmp.h | 20 +- + 42 files changed, 5823 insertions(+), 1452 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt + create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra210-mc.yaml + create mode 100644 Documentation/devicetree/bindings/pci/nvidia,tegra264-pcie.yaml + delete mode 100644 arch/arm/mach-tegra/board-paz00.c + create mode 100644 arch/arm64/boot/dts/nvidia/tegra264-p4071-0000+p3834-0008.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra264-p4071-0000+p3834.dtsi +Merging tenstorrent-dt/tenstorrent-dt-for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'tenstorrent-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-dt/tenstorrent-dt-for-next +Already up to date. +Merging thead-dt/thead-dt-for-next (74ec3d52c0035 riscv: dts: thead: beaglev-ahead: enable HDMI output) +$ git merge -m Merge branch 'thead-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt/thead-dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts | 25 ++++++++++++++++++++++ + arch/riscv/boot/dts/thead/th1520.dtsi | 4 ++++ + 2 files changed, 29 insertions(+) +Merging ti/ti-next (f2f0f3b1eee98 Merge branch 'ti-k3-config-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/ti/k3.yaml | 5 +- + .../embedded-controller/kontron,sl28cpld.yaml | 7 +- + arch/arm64/boot/dts/ti/Makefile | 27 +- + arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 14 +- + arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi | 7 + + arch/arm64/boot/dts/ti/k3-am62-verdin-zinnia.dtsi | 493 +++++++++ + arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 42 +- + .../boot/dts/ti/k3-am625-verdin-nonwifi-zinnia.dts | 22 + + .../boot/dts/ti/k3-am625-verdin-wifi-zinnia.dts | 22 + + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 15 +- + arch/arm64/boot/dts/ti/k3-am62d2-evm.dts | 82 +- + arch/arm64/boot/dts/ti/k3-am62l-main.dtsi | 7 + + arch/arm64/boot/dts/ti/k3-am62l-wakeup.dtsi | 7 +- + arch/arm64/boot/dts/ti/k3-am62l.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-am62l3-evm.dts | 32 +- + arch/arm64/boot/dts/ti/k3-am62l3.dtsi | 47 + + .../boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 13 +- + arch/arm64/boot/dts/ti/k3-am62p-verdin-zinnia.dtsi | 469 +++++++++ + arch/arm64/boot/dts/ti/k3-am62p-verdin.dtsi | 29 +- + arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 19 +- + .../dts/ti/k3-am62p5-verdin-nonwifi-zinnia.dts | 22 + + .../boot/dts/ti/k3-am62p5-verdin-wifi-zinnia.dts | 22 + + arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 13 +- + arch/arm64/boot/dts/ti/k3-am642-evm-icssg0.dtso | 168 +++ + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 1 + + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 2 + + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 1 + + .../boot/dts/ti/k3-am67a-kontron-sa67-ads2.dtso | 146 --- + .../boot/dts/ti/k3-am67a-kontron-sa67-base.dts | 1091 -------------------- + .../boot/dts/ti/k3-am67a-kontron-sa67-gbe1.dtso | 26 - + .../boot/dts/ti/k3-am67a-kontron-sa67-gpios.dtso | 61 -- + .../dts/ti/k3-am67a-kontron-sa67-rtc-rv8263.dtso | 31 - + .../k3-am68-phyboard-izar-lvds-ph128800t006.dtso | 125 +++ + .../dts/ti/k3-am68-phyboard-izar-peb-av-15.dtso | 191 ++++ + arch/arm64/boot/dts/ti/k3-am68-phyboard-izar.dts | 17 + + arch/arm64/boot/dts/ti/k3-am68-phycore-som.dtsi | 17 + + arch/arm64/boot/dts/ti/k3-am69-aquila-clover.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am69-aquila-dev.dts | 2 +- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 1 + + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 5 +- + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 1 + + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 42 + + arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 50 +- + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 12 +- + arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 13 + + arch/arm64/boot/dts/ti/k3-j722s.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-pinctrl.h | 78 +- + arch/arm64/configs/defconfig | 5 +- + 48 files changed, 2032 insertions(+), 1480 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-am62-verdin-zinnia.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am625-verdin-nonwifi-zinnia.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am625-verdin-wifi-zinnia.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am62p-verdin-zinnia.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62p5-verdin-nonwifi-zinnia.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am62p5-verdin-wifi-zinnia.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-evm-icssg0.dtso + delete mode 100644 arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-ads2.dtso + delete mode 100644 arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-base.dts + delete mode 100644 arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-gbe1.dtso + delete mode 100644 arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-gpios.dtso + delete mode 100644 arch/arm64/boot/dts/ti/k3-am67a-kontron-sa67-rtc-rv8263.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am68-phyboard-izar-lvds-ph128800t006.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am68-phyboard-izar-peb-av-15.dtso +Merging xilinx/for-next (edacbf64eedd5 soc: xilinx: Shutdown and free rx mailbox channel) +$ git merge -m Merge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + drivers/soc/xilinx/zynqmp_power.c | 47 +++++++++++++++++---------------------- + 1 file changed, 20 insertions(+), 27 deletions(-) +Merging socfpga/for-next (9d29bcefcdbec arm64: dts: intel: agilex5: Drop CPU masks from GICv3 PPI interrupts) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git socfpga/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/altera.yaml | 7 ++ + arch/arm64/boot/dts/altera/Makefile | 1 + + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 67 +----------------- + .../boot/dts/altera/socfpga_stratix10_socdk.dtsi | 71 +++++++++++++++++++ + .../dts/altera/socfpga_stratix10_socdk_emmc.dts | 81 ++++++++++++++++++++++ + arch/arm64/boot/dts/intel/socfpga_agilex5.dtsi | 8 +-- + 6 files changed, 166 insertions(+), 69 deletions(-) + create mode 100755 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dtsi + create mode 100755 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_emmc.dts +Merging clk/clk-next (18023cf0dd64f Merge branch 'clk-mediatek' into clk-next) +$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/clock/airoha,en7523-scu.yaml | 6 +- + .../bindings/clock/baikal,bt1-ccu-div.yaml | 196 --- + .../bindings/clock/baikal,bt1-ccu-pll.yaml | 131 -- + .../bindings/clock/eswin,eic7700-clock.yaml | 46 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 2 + + MAINTAINERS | 10 + + drivers/clk/Kconfig | 8 +- + drivers/clk/Makefile | 2 +- + drivers/clk/baikal-t1/Kconfig | 52 - + drivers/clk/baikal-t1/Makefile | 4 - + drivers/clk/baikal-t1/ccu-div.c | 653 ---------- + drivers/clk/baikal-t1/ccu-div.h | 121 -- + drivers/clk/baikal-t1/ccu-pll.c | 560 -------- + drivers/clk/baikal-t1/ccu-pll.h | 72 - + drivers/clk/baikal-t1/ccu-rst.c | 217 --- + drivers/clk/baikal-t1/ccu-rst.h | 67 - + drivers/clk/baikal-t1/clk-ccu-div.c | 520 -------- + drivers/clk/baikal-t1/clk-ccu-pll.c | 277 ---- + drivers/clk/bcm/clk-raspberrypi.c | 38 +- + drivers/clk/clk-en7523.c | 223 +++- + drivers/clk/clk-qoriq.c | 17 +- + drivers/clk/clk-xgene.c | 2 + + drivers/clk/clk.c | 7 +- + drivers/clk/eswin/Kconfig | 15 + + drivers/clk/eswin/Makefile | 8 + + drivers/clk/eswin/clk-eic7700.c | 1376 ++++++++++++++++++++ + drivers/clk/eswin/clk.c | 586 +++++++++ + drivers/clk/eswin/common.h | 340 +++++ + drivers/clk/mvebu/armada-37xx-periph.c | 16 +- + drivers/clk/renesas/r9a09g056-cpg.c | 4 + + include/dt-bindings/clock/bt1-ccu.h | 48 - + include/dt-bindings/clock/econet,en751221-scu.h | 12 + + include/dt-bindings/clock/eswin,eic7700-clock.h | 285 ++++ + include/dt-bindings/reset/econet,en751221-scu.h | 49 + + include/linux/clk-provider.h | 20 + + 35 files changed, 3038 insertions(+), 2952 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/baikal,bt1-ccu-div.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/baikal,bt1-ccu-pll.yaml + create mode 100644 Documentation/devicetree/bindings/clock/eswin,eic7700-clock.yaml + delete mode 100644 drivers/clk/baikal-t1/Kconfig + delete mode 100644 drivers/clk/baikal-t1/Makefile + delete mode 100644 drivers/clk/baikal-t1/ccu-div.c + delete mode 100644 drivers/clk/baikal-t1/ccu-div.h + delete mode 100644 drivers/clk/baikal-t1/ccu-pll.c + delete mode 100644 drivers/clk/baikal-t1/ccu-pll.h + delete mode 100644 drivers/clk/baikal-t1/ccu-rst.c + delete mode 100644 drivers/clk/baikal-t1/ccu-rst.h + delete mode 100644 drivers/clk/baikal-t1/clk-ccu-div.c + delete mode 100644 drivers/clk/baikal-t1/clk-ccu-pll.c + create mode 100644 drivers/clk/eswin/Kconfig + create mode 100644 drivers/clk/eswin/Makefile + create mode 100644 drivers/clk/eswin/clk-eic7700.c + create mode 100644 drivers/clk/eswin/clk.c + create mode 100644 drivers/clk/eswin/common.h + delete mode 100644 include/dt-bindings/clock/bt1-ccu.h + create mode 100644 include/dt-bindings/clock/econet,en751221-scu.h + create mode 100644 include/dt-bindings/clock/eswin,eic7700-clock.h + create mode 100644 include/dt-bindings/reset/econet,en751221-scu.h +Merging clk-imx/for-next (d16f57caa7877 clk: imx8mq: Correct the CSI PHY sels) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/clock/imx6q-clock.yaml | 4 ++++ + Documentation/devicetree/bindings/clock/imx6ul-clock.yaml | 4 ++++ + drivers/clk/imx/clk-fracn-gppll.c | 2 ++ + drivers/clk/imx/clk-imx6q.c | 12 +++++++++++- + drivers/clk/imx/clk-imx8-acm.c | 3 ++- + drivers/clk/imx/clk-imx8mq.c | 4 ++-- + drivers/clk/imx/clk-pll14xx.c | 6 +++--- + drivers/clk/imx/clk-vf610.c | 12 ++++++++++++ + include/dt-bindings/clock/vf610-clock.h | 6 +++++- + 9 files changed, 45 insertions(+), 8 deletions(-) +Merging clk-renesas/renesas-clk (77894661c00ab clk: renesas: Add support for RZ/G3L SoC) +$ git merge -m Merge branch 'renesas-clk' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/Kconfig | 7 +- + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r9a06g032-clocks.c | 5 +- + drivers/clk/renesas/r9a07g043-cpg.c | 9 ++ + drivers/clk/renesas/r9a07g044-cpg.c | 13 +++ + drivers/clk/renesas/r9a08g045-cpg.c | 9 ++ + drivers/clk/renesas/r9a08g046-cpg.c | 153 +++++++++++++++++++++++++++++++++ + drivers/clk/renesas/r9a09g047-cpg.c | 29 +++++++ + drivers/clk/renesas/r9a09g056-cpg.c | 20 ++--- + drivers/clk/renesas/r9a09g057-cpg.c | 5 ++ + drivers/clk/renesas/renesas-cpg-mssr.c | 4 +- + drivers/clk/renesas/rzg2l-cpg.c | 91 +++++++++++++++++--- + drivers/clk/renesas/rzg2l-cpg.h | 8 ++ + 13 files changed, 321 insertions(+), 33 deletions(-) + create mode 100644 drivers/clk/renesas/r9a08g046-cpg.c +Merging thead-clk/thead-clk-for-next (baf4fc7c03bd0 clk: thead: th1520-ap: Support CPU frequency scaling) +$ git merge -m Merge branch 'thead-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk/thead-clk-for-next +Already up to date. +Merging tenstorrent-clk/tenstorrent-clk-for-next (23c8ebc952849 clk: tenstorrent: Add Atlantis clock controller driver) +$ git merge -m Merge branch 'tenstorrent-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-clk/tenstorrent-clk-for-next +Auto-merging MAINTAINERS +Auto-merging drivers/clk/Kconfig +Auto-merging drivers/clk/Makefile +Auto-merging drivers/reset/Kconfig +Auto-merging drivers/reset/Makefile +Merge made by the 'ort' strategy. + .../clock/tenstorrent,atlantis-prcm-rcpu.yaml | 54 ++ + MAINTAINERS | 4 + + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 1 + + drivers/clk/tenstorrent/Kconfig | 14 + + drivers/clk/tenstorrent/Makefile | 3 + + drivers/clk/tenstorrent/atlantis-prcm.c | 870 +++++++++++++++++++++ + drivers/reset/Kconfig | 11 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-tenstorrent-atlantis.c | 173 ++++ + .../clock/tenstorrent,atlantis-prcm-rcpu.h | 103 +++ + 11 files changed, 1235 insertions(+) + create mode 100644 Documentation/devicetree/bindings/clock/tenstorrent,atlantis-prcm-rcpu.yaml + create mode 100644 drivers/clk/tenstorrent/Kconfig + create mode 100644 drivers/clk/tenstorrent/Makefile + create mode 100644 drivers/clk/tenstorrent/atlantis-prcm.c + create mode 100644 drivers/reset/reset-tenstorrent-atlantis.c + create mode 100644 include/dt-bindings/clock/tenstorrent,atlantis-prcm-rcpu.h +Merging csky/linux-next (817d21578d51e csky: Remove compile warning for CONFIG_SMP) +$ git merge -m Merge branch 'linux-next' of https://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (6bcfb7f46d667 LoongArch: KVM: Fix base address calculation in kvm_eiointc_regs_access()) +$ git merge -m Merge branch 'loongarch-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (cb39cf99d88e8 m68k: sun3: Replace vsprintf() with bounded vsnprintf()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (7aaa8047eafd0 Linux 7.0-rc6) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'mips-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (0dfffa5479d62 openrisc: define arch-specific version of nop()) +$ git merge -m Merge branch 'for-next' of https://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (c369299895a59 Linux 7.0-rc5) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Already up to date. +Merging powerpc/next (07791ff060dd3 powerpc: Print MMU_FTRS_POSSIBLE & MMU_FTRS_ALWAYS at startup) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging arch/powerpc/mm/book3s64/pgtable.c +Merge made by the 'ort' strategy. + arch/powerpc/include/asm/book3s/64/pgtable.h | 20 +++++-- + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 1 - + arch/powerpc/kernel/setup-common.c | 4 ++ + arch/powerpc/mm/book3s64/hash_pgtable.c | 21 ++++++++ + arch/powerpc/mm/book3s64/internal.h | 2 - + arch/powerpc/mm/book3s64/pgtable.c | 40 ++++---------- + arch/powerpc/mm/book3s64/radix_tlb.c | 61 ++++++++++------------ + arch/powerpc/mm/pgtable-frag.c | 1 + + 8 files changed, 79 insertions(+), 71 deletions(-) +Merging risc-v/for-next (b335bc5892a0c riscv: make runtime const not usable by modules) + 01c86f9b8b4fa ("riscv: Simplify assignment for UTS_MACHINE") + 33f9827f7a2ee ("riscv: kgdb: fix several debug register assignment bugs") + 4b8c74782d4a1 ("selftests: riscv: Add license to cfi selftest") + 596be0be3255a ("riscv: move kaslr_offset() to page.h as a static inline function") + 70142bf78076c ("riscv: smp: Clarify comment "cache" -> "instruction cache"") + 826798077f3bc ("riscv: patch: Avoid early phys_to_page()") + 98545620b0586 ("riscv: ptrace: Fix BIT() compilation issues") + bbbaa513cbbd6 ("riscv: export kaslr offset and satp in VMCOREINFO ELF notes") + c1bcdeb9162c1 ("riscv: smp: Remove outdated comment about disabling preemption") + eaa1b6498b520 ("selftests: riscv: Add definition of BIT() macro") + f762404d5114d ("riscv: fix various typos in comments and code") +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/include/asm/page.h +Auto-merging arch/riscv/mm/init.c +Merge made by the 'ort' strategy. + arch/riscv/include/asm/runtime-const.h | 4 ++++ + arch/riscv/include/asm/smp.h | 2 +- + arch/riscv/kernel/cpu-hotplug.c | 2 -- + 3 files changed, 5 insertions(+), 3 deletions(-) +Merging riscv-dt/riscv-dt-for-next (4a1739c30fc66 riscv: dts: microchip: add tsu clock to macb on mpfs) +$ git merge -m Merge branch 'riscv-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Auto-merging arch/riscv/boot/dts/microchip/mpfs.dtsi +Merge made by the 'ort' strategy. + .../devicetree/bindings/riscv/extensions.yaml | 27 + + .../devicetree/bindings/riscv/microchip.yaml | 7 +- + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + arch/riscv/boot/dts/microchip/Makefile | 17 +- + .../boot/dts/microchip/mpfs-icicle-kit-common.dtsi | 1 - + .../boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi | 63 +++ + arch/riscv/boot/dts/microchip/mpfs-pinctrl.dtsi | 167 ++++++ + arch/riscv/boot/dts/microchip/mpfs.dtsi | 24 +- + .../boot/dts/microchip/pic64gx-curiosity-kit.dts | 165 ++++++ + arch/riscv/boot/dts/microchip/pic64gx-pinctrl.dtsi | 177 ++++++ + arch/riscv/boot/dts/microchip/pic64gx.dtsi | 630 +++++++++++++++++++++ + 11 files changed, 1264 insertions(+), 15 deletions(-) + create mode 100644 arch/riscv/boot/dts/microchip/mpfs-pinctrl.dtsi + create mode 100644 arch/riscv/boot/dts/microchip/pic64gx-curiosity-kit.dts + create mode 100644 arch/riscv/boot/dts/microchip/pic64gx-pinctrl.dtsi + create mode 100644 arch/riscv/boot/dts/microchip/pic64gx.dtsi +Merging riscv-soc/riscv-soc-for-next (9a9d7b6a45f5f Merge branch 'k230-basic' into riscv-soc-for-next) +$ git merge -m Merge branch 'riscv-soc-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Auto-merging Documentation/devicetree/bindings/timer/sifive,clint.yaml +Auto-merging drivers/soc/microchip/mpfs-sys-controller.c +Merge made by the 'ort' strategy. + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../devicetree/bindings/riscv/canaan.yaml | 8 +- + .../microchip/microchip,mpfs-mss-top-sysreg.yaml | 14 +- + .../microchip/microchip,mpfs-sys-controller.yaml | 4 +- + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + arch/riscv/boot/dts/canaan/Makefile | 2 + + arch/riscv/boot/dts/canaan/k230-canmv.dts | 332 +++++++++++++++++++++ + arch/riscv/boot/dts/canaan/k230-evb.dts | 28 ++ + arch/riscv/boot/dts/canaan/k230-pinctrl.h | 18 ++ + arch/riscv/boot/dts/canaan/k230.dtsi | 157 ++++++++++ + drivers/soc/microchip/mpfs-sys-controller.c | 74 +++-- + 11 files changed, 613 insertions(+), 26 deletions(-) + create mode 100644 arch/riscv/boot/dts/canaan/k230-canmv.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230-evb.dts + create mode 100644 arch/riscv/boot/dts/canaan/k230-pinctrl.h + create mode 100644 arch/riscv/boot/dts/canaan/k230.dtsi +Merging s390/for-next (95e95d7257b94 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/powerpc/include/asm/book3s/32/pgtable.h +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging arch/powerpc/include/asm/nohash/pgtable.h +Auto-merging arch/powerpc/include/asm/pgtable.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/x86/include/asm/pgtable.h +Merge made by the 'ort' strategy. + arch/arm64/include/asm/pgtable.h | 6 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 10 +-- + arch/powerpc/include/asm/nohash/pgtable.h | 2 +- + arch/powerpc/include/asm/pgtable.h | 4 +- + arch/riscv/include/asm/pgtable.h | 6 +- + arch/s390/Kconfig | 3 +- + arch/s390/boot/startup.c | 3 +- + arch/s390/configs/debug_defconfig | 2 + + arch/s390/include/asm/percpu.h | 18 +++++ + arch/s390/include/asm/pgtable.h | 60 +++++++++++++-- + arch/s390/include/asm/setup.h | 1 - + arch/x86/include/asm/pgtable.h | 6 +- + drivers/s390/crypto/pkey_cca.c | 48 ++++++------ + drivers/s390/crypto/zcrypt_api.c | 40 ++++------ + drivers/s390/crypto/zcrypt_ccamisc.c | 28 ++++--- + drivers/s390/crypto/zcrypt_ccamisc.h | 24 +++--- + drivers/s390/crypto/zcrypt_cex4.c | 110 +++++++++++++++++---------- + drivers/s390/crypto/zcrypt_error.h | 28 +++---- + drivers/s390/crypto/zcrypt_msgtype6.c | 76 +++++++++++++++--- + drivers/s390/crypto/zcrypt_msgtype6.h | 55 +------------- + mm/page_table_check.c | 15 ++-- + 22 files changed, 319 insertions(+), 228 deletions(-) +Merging sh/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging sparc/for-next (d844152d85cfc sparc: remove unused variable strtab) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (8aae2da6104ab um: Replace strncpy() with strnlen()+memcpy_and_pad() in strncpy_chunk_from_user()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Auto-merging arch/um/include/asm/pgtable.h +Auto-merging mm/Kconfig +Merge made by the 'ort' strategy. + arch/um/configs/x86_64_defconfig | 1 - + arch/um/include/asm/pgtable.h | 9 ++++----- + arch/um/kernel/skas/stub.c | 2 +- + arch/um/kernel/skas/uaccess.c | 4 ++-- + arch/um/kernel/tlb.c | 4 ++-- + arch/x86/Makefile.um | 2 ++ + arch/x86/um/os-Linux/mcontext.c | 6 ++++++ + arch/x86/um/vdso/Makefile | 2 -- + include/uapi/linux/um_timetravel.h | 6 +++++- + mm/Kconfig | 1 + + 10 files changed, 23 insertions(+), 14 deletions(-) +Merging xtensa/xtensa-for-next (aa5903b47d4bc xtensa: uapi: Reuse asm-generic ucontext.h) +$ git merge -m Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/include/asm/ucontext.h | 22 ---------------------- + arch/xtensa/include/uapi/asm/Kbuild | 1 + + arch/xtensa/platforms/iss/setup.c | 11 ++++------- + arch/xtensa/platforms/xt2000/setup.c | 11 ++++------- + arch/xtensa/platforms/xtfpga/setup.c | 11 ++++------- + 5 files changed, 13 insertions(+), 43 deletions(-) + delete mode 100644 arch/xtensa/include/asm/ucontext.h +Merging fs-next (e9fd8517d65f7 next-20260312/vfs-brauner) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging CREDITS +Auto-merging Documentation/filesystems/index.rst +Auto-merging MAINTAINERS +Auto-merging fs/btrfs/compression.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/raid56.c +Auto-merging fs/buffer.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/erofs/data.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/page-io.c +Auto-merging fs/ext4/readpage.c +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/f2fs/compress.c +CONFLICT (content): Merge conflict in fs/f2fs/compress.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/mpage.c +Auto-merging fs/nfs/blocklayout/blocklayout.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/nilfs2/btree.c +Auto-merging fs/nilfs2/segment.c +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/ocfs2/quota_local.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/iomap.h +Auto-merging include/linux/shmem_fs.h +Auto-merging include/linux/sunrpc/svc.h +Auto-merging include/trace/events/writeback.h +Auto-merging kernel/fork.c +Auto-merging kernel/signal.c +Auto-merging mm/shmem.c +Auto-merging security/selinux/hooks.c +Resolved 'fs/f2fs/compress.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 17155745a7765] Merge branch 'fs-next' of linux-next +$ git diff -M --stat --summary HEAD^.. + CREDITS | 9 +- + Documentation/ABI/testing/sysfs-fs-f2fs | 9 +- + .../admin-guide/nfs/pnfs-block-server.rst | 30 + + Documentation/admin-guide/nfs/pnfs-scsi-server.rst | 31 + + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/locking.rst | 2 + + Documentation/filesystems/mount_api.rst | 4 - + Documentation/filesystems/nfs/exporting.rst | 85 + + Documentation/filesystems/ntfs.rst | 159 + + Documentation/filesystems/porting.rst | 14 + + Documentation/netlink/specs/nfsd.yaml | 6 + + Documentation/sunrpc/xdr/nlm4.x | 211 + + MAINTAINERS | 9 + + block/Makefile | 2 +- + block/bio-integrity-auto.c | 80 +- + block/bio-integrity-fs.c | 81 + + block/bio-integrity.c | 64 + + block/bio.c | 17 +- + block/blk-mq.c | 6 +- + block/blk-settings.c | 13 - + block/blk.h | 6 +- + block/t10-pi.c | 12 +- + drivers/dma-buf/dma-buf.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- + drivers/mtd/ubi/ubi.h | 9 +- + drivers/nvdimm/btt.c | 6 +- + fs/9p/vfs_addr.c | 4 +- + fs/9p/vfs_inode.c | 6 +- + fs/9p/vfs_inode_dotl.c | 6 +- + fs/9p/vfs_super.c | 6 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/affs/amigaffs.c | 10 +- + fs/affs/bitmap.c | 2 +- + fs/affs/dir.c | 2 +- + fs/affs/file.c | 20 +- + fs/affs/inode.c | 12 +- + fs/affs/namei.c | 14 +- + fs/affs/symlink.c | 2 +- + fs/afs/dir.c | 10 +- + fs/afs/dir_search.c | 2 +- + fs/afs/dynroot.c | 2 +- + fs/afs/inode.c | 2 +- + fs/autofs/inode.c | 2 +- + fs/befs/linuxvfs.c | 28 +- + fs/bfs/dir.c | 4 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/btrfs/Kconfig | 1 + + fs/btrfs/Makefile | 4 + + fs/btrfs/backref.c | 10 - + fs/btrfs/block-group.c | 327 +- + fs/btrfs/block-group.h | 1 + + fs/btrfs/block-rsv.c | 25 + + fs/btrfs/compression.c | 4 +- + fs/btrfs/compression.h | 6 +- + fs/btrfs/ctree.c | 36 +- + fs/btrfs/delayed-inode.c | 3 +- + fs/btrfs/delayed-ref.c | 28 + + fs/btrfs/dev-replace.c | 4 +- + fs/btrfs/dir-item.c | 4 +- + fs/btrfs/direct-io.c | 11 +- + fs/btrfs/disk-io.c | 227 +- + fs/btrfs/disk-io.h | 7 +- + fs/btrfs/extent-io-tree.c | 184 +- + fs/btrfs/extent-tree.c | 119 +- + fs/btrfs/extent_io.c | 161 +- + fs/btrfs/extent_io.h | 31 +- + fs/btrfs/file-item.c | 6 +- + fs/btrfs/file-item.h | 6 +- + fs/btrfs/file.c | 4 +- + fs/btrfs/fs.h | 9 +- + fs/btrfs/inode.c | 298 +- + fs/btrfs/ioctl.c | 4 +- + fs/btrfs/lzo.c | 7 +- + fs/btrfs/messages.h | 8 +- + fs/btrfs/misc.h | 18 +- + fs/btrfs/ordered-data.c | 67 +- + fs/btrfs/ordered-data.h | 66 +- + fs/btrfs/print-tree.c | 4 - + fs/btrfs/qgroup.c | 42 +- + fs/btrfs/qgroup.h | 42 +- + fs/btrfs/raid-stripe-tree.c | 2 +- + fs/btrfs/raid56.c | 17 +- + fs/btrfs/reflink.c | 4 +- + fs/btrfs/relocation.c | 12 +- + fs/btrfs/scrub.c | 22 +- + fs/btrfs/send.c | 6 +- + fs/btrfs/space-info.c | 63 +- + fs/btrfs/space-info.h | 22 +- + fs/btrfs/super.h | 2 +- + fs/btrfs/tests/btrfs-tests.c | 3 + + fs/btrfs/tests/btrfs-tests.h | 10 + + fs/btrfs/tests/zoned-tests.c | 675 +++ + fs/btrfs/transaction.c | 78 +- + fs/btrfs/transaction.h | 3 + + fs/btrfs/tree-checker.c | 122 + + fs/btrfs/tree-log.c | 66 +- + fs/btrfs/tree-mod-log.c | 8 +- + fs/btrfs/uuid-tree.c | 7 +- + fs/btrfs/volumes.c | 216 +- + fs/btrfs/volumes.h | 34 + + fs/btrfs/zlib.c | 2 +- + fs/btrfs/zoned.c | 15 +- + fs/btrfs/zstd.c | 2 +- + fs/buffer.c | 18 +- + fs/cachefiles/io.c | 6 +- + fs/cachefiles/namei.c | 109 +- + fs/cachefiles/xattr.c | 2 +- + fs/ceph/addr.c | 4 + + fs/ceph/crypto.c | 4 +- + fs/coda/dir.c | 2 +- + fs/coda/inode.c | 2 +- + fs/cramfs/inode.c | 2 +- + fs/crypto/Kconfig | 2 +- + fs/crypto/bio.c | 38 +- + fs/crypto/crypto.c | 2 +- + fs/crypto/fscrypt_private.h | 3 - + fs/crypto/hooks.c | 2 +- + fs/crypto/inline_crypt.c | 86 +- + fs/crypto/keyring.c | 4 +- + fs/crypto/keysetup.c | 4 +- + fs/crypto/keysetup_v1.c | 87 +- + fs/dcache.c | 8 +- + fs/ecryptfs/crypto.c | 36 +- + fs/ecryptfs/debug.c | 5 +- + fs/ecryptfs/file.c | 2 +- + fs/ecryptfs/keystore.c | 6 +- + fs/ecryptfs/main.c | 1 + + fs/ecryptfs/messaging.c | 3 +- + fs/ecryptfs/miscdev.c | 7 +- + fs/efs/inode.c | 6 +- + fs/erofs/data.c | 14 + + fs/erofs/xattr.c | 8 + + fs/eventpoll.c | 2 +- + fs/exfat/Makefile | 2 +- + fs/exfat/balloc.c | 18 +- + fs/exfat/dir.c | 56 +- + fs/exfat/exfat_fs.h | 30 +- + fs/exfat/exfat_raw.h | 1 + + fs/exfat/fatent.c | 121 +- + fs/exfat/file.c | 291 +- + fs/exfat/inode.c | 349 +- + fs/exfat/iomap.c | 305 ++ + fs/exfat/iomap.h | 16 + + fs/exfat/misc.c | 8 +- + fs/exfat/namei.c | 12 +- + fs/exfat/super.c | 12 +- + fs/exportfs/expfs.c | 4 +- + fs/ext2/balloc.c | 4 +- + fs/ext2/dir.c | 10 +- + fs/ext2/ialloc.c | 9 +- + fs/ext2/inode.c | 5 +- + fs/ext2/namei.c | 7 +- + fs/ext2/trace.h | 8 +- + fs/ext2/xattr.c | 16 +- + fs/ext4/dir.c | 2 +- + fs/ext4/ext4.h | 4 +- + fs/ext4/extents.c | 8 +- + fs/ext4/extents_status.c | 28 +- + fs/ext4/fast_commit.c | 8 +- + fs/ext4/ialloc.c | 10 +- + fs/ext4/indirect.c | 2 +- + fs/ext4/inline.c | 14 +- + fs/ext4/inode.c | 27 +- + fs/ext4/ioctl.c | 4 +- + fs/ext4/mballoc.c | 6 +- + fs/ext4/migrate.c | 2 +- + fs/ext4/move_extent.c | 20 +- + fs/ext4/namei.c | 10 +- + fs/ext4/orphan.c | 16 +- + fs/ext4/page-io.c | 38 +- + fs/ext4/readpage.c | 10 +- + fs/ext4/super.c | 22 +- + fs/ext4/xattr.c | 10 +- + fs/f2fs/checkpoint.c | 9 - + fs/f2fs/compress.c | 21 +- + fs/f2fs/data.c | 69 +- + fs/f2fs/debug.c | 1 + + fs/f2fs/dir.c | 4 +- + fs/f2fs/extent_cache.c | 8 +- + fs/f2fs/f2fs.h | 44 +- + fs/f2fs/file.c | 20 +- + fs/f2fs/gc.c | 25 +- + fs/f2fs/inline.c | 29 +- + fs/f2fs/inode.c | 55 +- + fs/f2fs/namei.c | 9 +- + fs/f2fs/node.c | 138 +- + fs/f2fs/node.h | 23 +- + fs/f2fs/recovery.c | 12 +- + fs/f2fs/segment.c | 22 +- + fs/f2fs/segment.h | 2 +- + fs/f2fs/super.c | 61 +- + fs/f2fs/sysfs.c | 12 + + fs/f2fs/verity.c | 2 + + fs/f2fs/xattr.c | 16 +- + fs/freevxfs/vxfs_bmap.c | 4 +- + fs/fs_context.c | 1 - + fs/fs_parser.c | 19 +- + fs/fs_struct.c | 34 +- + fs/fserror.c | 2 +- + fs/fuse/control.c | 4 +- + fs/fuse/dev.c | 61 +- + fs/fuse/dev_uring.c | 36 +- + fs/fuse/dir.c | 14 +- + fs/fuse/file.c | 23 +- + fs/fuse/fuse_i.h | 1 + + fs/fuse/inode.c | 1 + + fs/fuse/readdir.c | 8 +- + fs/fuse/virtio_fs.c | 29 +- + fs/gfs2/aops.c | 15 +- + fs/gfs2/glops.c | 8 +- + fs/gfs2/inode.c | 3 +- + fs/gfs2/log.c | 80 +- + fs/gfs2/log.h | 26 +- + fs/gfs2/lops.c | 16 +- + fs/gfs2/meta_io.c | 43 +- + fs/gfs2/meta_io.h | 1 - + fs/gfs2/super.c | 85 +- + fs/gfs2/trans.c | 45 +- + fs/hfs/catalog.c | 2 +- + fs/hfs/extent.c | 4 +- + fs/hfs/inode.c | 4 +- + fs/hfsplus/attributes.c | 10 +- + fs/hfsplus/catalog.c | 2 +- + fs/hfsplus/dir.c | 6 +- + fs/hfsplus/extents.c | 6 +- + fs/hfsplus/inode.c | 8 +- + fs/hfsplus/super.c | 6 +- + fs/hfsplus/xattr.c | 10 +- + fs/hpfs/dir.c | 4 +- + fs/hpfs/dnode.c | 4 +- + fs/hpfs/ea.c | 4 +- + fs/hpfs/inode.c | 4 +- + fs/inode.c | 49 +- + fs/iomap/bio.c | 135 +- + fs/iomap/buffered-io.c | 14 +- + fs/iomap/direct-io.c | 21 +- + fs/iomap/internal.h | 14 + + fs/iomap/ioend.c | 32 +- + fs/iomap/trace.h | 8 +- + fs/isofs/compress.c | 2 +- + fs/isofs/dir.c | 2 +- + fs/isofs/inode.c | 8 +- + fs/isofs/namei.c | 2 +- + fs/jbd2/journal.c | 4 +- + fs/jbd2/transaction.c | 2 +- + fs/jffs2/dir.c | 4 +- + fs/jffs2/file.c | 4 +- + fs/jffs2/fs.c | 18 +- + fs/jfs/inode.c | 2 +- + fs/jfs/jfs_dmap.c | 114 +- + fs/jfs/jfs_dtree.c | 192 +- + fs/jfs/jfs_dtree.h | 4 + + fs/jfs/jfs_imap.c | 6 +- + fs/jfs/jfs_logmgr.c | 34 +- + fs/jfs/jfs_logmgr.h | 7 + + fs/jfs/jfs_metapage.c | 5 +- + fs/jfs/jfs_mount.c | 3 +- + fs/jfs/jfs_txnmgr.c | 3 +- + fs/jfs/jfs_umount.c | 10 + + fs/kernfs/dir.c | 15 +- + fs/kernfs/inode.c | 99 +- + fs/kernfs/kernfs-internal.h | 5 +- + fs/libfs.c | 3 +- + fs/lockd/Makefile | 30 +- + fs/lockd/clnt4xdr.c | 5 +- + fs/lockd/clntlock.c | 2 +- + fs/lockd/clntproc.c | 2 +- + fs/lockd/clntxdr.c | 3 +- + fs/lockd/host.c | 31 +- + {include/linux => fs}/lockd/lockd.h | 101 +- + fs/lockd/mon.c | 2 +- + {include/linux => fs}/lockd/nlm.h | 8 +- + fs/lockd/nlm4xdr_gen.c | 724 +++ + fs/lockd/nlm4xdr_gen.h | 32 + + {include/linux => fs}/lockd/share.h | 19 +- + fs/lockd/svc.c | 50 +- + fs/lockd/svc4proc.c | 1786 +++++-- + fs/lockd/svclock.c | 29 +- + fs/lockd/svcproc.c | 126 +- + fs/lockd/svcshare.c | 40 +- + fs/lockd/svcsubs.c | 34 +- + fs/lockd/trace.h | 3 +- + fs/lockd/xdr.c | 6 +- + {include/linux => fs}/lockd/xdr.h | 15 +- + fs/lockd/xdr4.c | 347 -- + fs/locks.c | 32 +- + fs/minix/inode.c | 10 +- + fs/mpage.c | 30 +- + fs/namei.c | 70 +- + fs/namespace.c | 125 +- + fs/nfs/blocklayout/blocklayout.c | 4 +- + fs/nfs/dir.c | 20 +- + fs/nfs/file.c | 8 +- + fs/nfs/filelayout/filelayout.c | 8 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 8 +- + fs/nfs/inode.c | 6 +- + fs/nfs/internal.h | 2 +- + fs/nfs/nfs3proc.c | 1 + + fs/nfs/nfs4proc.c | 4 +- + fs/nfs/pnfs.c | 12 +- + fs/nfs/proc.c | 1 + + fs/nfs/sysfs.c | 4 +- + fs/nfs/write.c | 3 +- + fs/nfsd/Kconfig | 12 +- + fs/nfsd/blocklayout.c | 102 +- + fs/nfsd/debugfs.c | 4 + + fs/nfsd/export.c | 7 +- + fs/nfsd/lockd.c | 50 +- + fs/nfsd/netlink.c | 5 +- + fs/nfsd/netns.h | 4 + + fs/nfsd/nfs4layouts.c | 152 +- + fs/nfsd/nfs4proc.c | 3 +- + fs/nfsd/nfs4recover.c | 6 +- + fs/nfsd/nfs4state.c | 117 +- + fs/nfsd/nfs4xdr.c | 26 +- + fs/nfsd/nfscache.c | 3 +- + fs/nfsd/nfsctl.c | 40 +- + fs/nfsd/nfsd.h | 6 + + fs/nfsd/nfsfh.c | 87 +- + fs/nfsd/nfssvc.c | 10 +- + fs/nfsd/pnfs.h | 5 +- + fs/nfsd/state.h | 23 +- + fs/nfsd/trace.h | 23 + + fs/nfsd/vfs.c | 2 +- + fs/nilfs2/alloc.c | 10 +- + fs/nilfs2/bmap.c | 2 +- + fs/nilfs2/btnode.c | 2 +- + fs/nilfs2/btree.c | 12 +- + fs/nilfs2/dir.c | 12 +- + fs/nilfs2/direct.c | 4 +- + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/inode.c | 8 +- + fs/nilfs2/mdt.c | 2 +- + fs/nilfs2/namei.c | 2 +- + fs/nilfs2/segment.c | 2 +- + fs/notify/fanotify/fanotify.h | 5 +- + fs/notify/fanotify/fanotify_user.c | 50 +- + fs/notify/fdinfo.c | 4 +- + fs/notify/inotify/inotify_user.c | 3 +- + fs/nsfs.c | 4 +- + fs/ntfs/Kconfig | 48 + + fs/ntfs/Makefile | 10 + + fs/ntfs/aops.c | 263 + + fs/ntfs/attrib.c | 5424 ++++++++++++++++++++ + fs/ntfs/attrib.h | 164 + + fs/ntfs/attrlist.c | 289 ++ + fs/ntfs/attrlist.h | 20 + + fs/ntfs/bdev-io.c | 117 + + fs/ntfs/bitmap.c | 287 ++ + fs/ntfs/bitmap.h | 100 + + fs/ntfs/collate.c | 146 + + fs/ntfs/collate.h | 36 + + fs/ntfs/compress.c | 1577 ++++++ + fs/ntfs/debug.c | 171 + + fs/ntfs/debug.h | 63 + + fs/ntfs/dir.c | 1238 +++++ + fs/ntfs/dir.h | 32 + + fs/ntfs/ea.c | 954 ++++ + fs/ntfs/ea.h | 30 + + fs/ntfs/file.c | 1161 +++++ + fs/ntfs/index.c | 2117 ++++++++ + fs/ntfs/index.h | 111 + + fs/ntfs/inode.c | 3815 ++++++++++++++ + fs/ntfs/inode.h | 358 ++ + fs/ntfs/iomap.c | 870 ++++ + fs/ntfs/iomap.h | 23 + + fs/ntfs/layout.h | 2346 +++++++++ + fs/ntfs/lcnalloc.c | 1049 ++++ + fs/ntfs/lcnalloc.h | 134 + + fs/ntfs/logfile.c | 778 +++ + fs/ntfs/logfile.h | 245 + + fs/ntfs/malloc.h | 77 + + fs/ntfs/mft.c | 2924 +++++++++++ + fs/ntfs/mft.h | 91 + + fs/ntfs/mst.c | 194 + + fs/ntfs/namei.c | 1692 ++++++ + fs/ntfs/ntfs.h | 294 ++ + fs/ntfs/object_id.c | 158 + + fs/ntfs/object_id.h | 14 + + fs/ntfs/quota.c | 95 + + fs/ntfs/quota.h | 15 + + fs/ntfs/reparse.c | 573 +++ + fs/ntfs/reparse.h | 20 + + fs/ntfs/runlist.c | 2066 ++++++++ + fs/ntfs/runlist.h | 97 + + fs/ntfs/super.c | 2771 ++++++++++ + fs/ntfs/sysctl.c | 54 + + fs/ntfs/sysctl.h | 26 + + fs/ntfs/time.h | 87 + + fs/ntfs/unistr.c | 477 ++ + fs/ntfs/upcase.c | 70 + + fs/ntfs/volume.h | 296 ++ + fs/ntfs3/Kconfig | 10 +- + fs/ntfs3/Makefile | 20 + + fs/ntfs3/attrib.c | 15 + + fs/ntfs3/dir.c | 10 - + fs/ntfs3/file.c | 11 - + fs/ntfs3/frecord.c | 47 +- + fs/ntfs3/fslog.c | 4 +- + fs/ntfs3/fsntfs.c | 4 +- + fs/ntfs3/index.c | 76 +- + fs/ntfs3/inode.c | 88 +- + fs/ntfs3/ntfs_fs.h | 14 - + fs/ntfs3/super.c | 61 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.c | 4 +- + fs/ocfs2/dir.c | 8 +- + fs/ocfs2/dlmfs/dlmfs.c | 10 +- + fs/ocfs2/extent_map.c | 12 +- + fs/ocfs2/inode.c | 2 +- + fs/ocfs2/quota_local.c | 2 +- + fs/ocfs2/refcounttree.c | 10 +- + fs/ocfs2/xattr.c | 4 +- + fs/orangefs/inode.c | 2 +- + fs/overlayfs/dir.c | 51 +- + fs/overlayfs/export.c | 81 +- + fs/overlayfs/namei.c | 4 +- + fs/overlayfs/overlayfs.h | 10 +- + fs/overlayfs/super.c | 16 +- + fs/overlayfs/util.c | 27 +- + fs/pidfs.c | 102 +- + fs/pipe.c | 2 +- + fs/proc/fd.c | 2 +- + fs/proc/self.c | 3 - + fs/proc/task_mmu.c | 4 +- + fs/proc/thread_self.c | 3 - + fs/qnx4/inode.c | 4 +- + fs/qnx6/inode.c | 2 +- + fs/quota/dquot.c | 38 +- + fs/smb/Kconfig | 1 + + fs/smb/client/Kconfig | 4 +- + fs/smb/client/cifs_debug.c | 67 +- + fs/smb/client/smb2pdu.c | 9 +- + fs/smb/client/smbdirect.c | 3116 +---------- + fs/smb/client/smbdirect.h | 19 +- + fs/smb/common/Makefile | 1 + + fs/smb/common/smbdirect/Kconfig | 9 + + fs/smb/common/smbdirect/Makefile | 18 + + fs/smb/common/smbdirect/smbdirect.h | 9 + + fs/smb/common/smbdirect/smbdirect_accept.c | 857 ++++ + fs/smb/common/smbdirect/smbdirect_connect.c | 925 ++++ + fs/smb/common/smbdirect/smbdirect_connection.c | 2175 ++++++++ + fs/smb/common/smbdirect/smbdirect_debug.c | 88 + + fs/smb/common/smbdirect/smbdirect_devices.c | 277 + + fs/smb/common/smbdirect/smbdirect_internal.h | 141 + + fs/smb/common/smbdirect/smbdirect_listen.c | 308 ++ + fs/smb/common/smbdirect/smbdirect_main.c | 121 + + fs/smb/common/smbdirect/smbdirect_mr.c | 485 ++ + fs/smb/common/smbdirect/smbdirect_pdu.h | 4 + + fs/smb/common/smbdirect/smbdirect_public.h | 148 + + fs/smb/common/smbdirect/smbdirect_rw.c | 255 + + fs/smb/common/smbdirect/smbdirect_socket.c | 724 +++ + fs/smb/common/smbdirect/smbdirect_socket.h | 303 +- + fs/smb/server/Kconfig | 5 +- + fs/smb/server/connection.c | 5 - + fs/smb/server/connection.h | 1 - + fs/smb/server/smb2pdu.c | 122 +- + fs/smb/server/smbacl.c | 43 + + fs/smb/server/smbacl.h | 2 + + fs/smb/server/transport_rdma.c | 2958 +---------- + fs/smb/server/transport_rdma.h | 4 +- + fs/ubifs/debug.c | 8 +- + fs/ubifs/dir.c | 28 +- + fs/ubifs/file.c | 28 +- + fs/ubifs/journal.c | 6 +- + fs/ubifs/super.c | 16 +- + fs/ubifs/tnc.c | 4 +- + fs/ubifs/xattr.c | 14 +- + fs/udf/directory.c | 18 +- + fs/udf/file.c | 2 +- + fs/udf/inode.c | 56 +- + fs/udf/namei.c | 8 +- + fs/udf/super.c | 6 +- + fs/ufs/balloc.c | 6 +- + fs/ufs/dir.c | 10 +- + fs/ufs/ialloc.c | 6 +- + fs/ufs/inode.c | 18 +- + fs/ufs/ufs_fs.h | 6 +- + fs/ufs/util.c | 2 +- + fs/verity/init.c | 2 +- + fs/xattr.c | 425 +- + fs/xfs/libxfs/xfs_fs.h | 5 +- + fs/xfs/xfs_aops.c | 47 +- + fs/xfs/xfs_file.c | 112 +- + fs/xfs/xfs_ioctl.c | 19 + + fs/xfs/xfs_iomap.c | 157 +- + fs/xfs/xfs_mount.c | 75 +- + fs/xfs/xfs_mount.h | 3 + + fs/xfs/xfs_zone_alloc.c | 44 +- + fs/xfs/xfs_zone_gc.c | 24 +- + fs/xfs/xfs_zone_info.c | 7 +- + fs/zonefs/super.c | 8 +- + fs/zonefs/trace.h | 18 +- + include/linux/audit.h | 2 +- + include/linux/backing-dev.h | 13 + + include/linux/bio-integrity.h | 12 +- + include/linux/bio.h | 2 +- + include/linux/blk-integrity.h | 28 +- + include/linux/blkdev.h | 34 +- + include/linux/f2fs_fs.h | 3 + + include/linux/filelock.h | 1 + + include/linux/fs.h | 88 +- + include/linux/fs_parser.h | 8 +- + include/linux/fs_struct.h | 43 +- + include/linux/fscrypt.h | 37 +- + include/linux/iomap.h | 20 +- + include/linux/kernfs.h | 2 - + include/linux/lockd/bind.h | 26 +- + include/linux/lockd/debug.h | 40 - + include/linux/lockd/xdr4.h | 43 - + include/linux/mpage.h | 11 +- + include/linux/namei.h | 6 - + include/linux/quotaops.h | 9 +- + include/linux/sched/signal.h | 1 + + include/linux/shmem_fs.h | 2 +- + include/linux/sunrpc/cache.h | 7 +- + include/linux/sunrpc/debug.h | 10 +- + include/linux/sunrpc/sched.h | 3 - + include/linux/sunrpc/svc.h | 67 +- + include/linux/sunrpc/svc_rdma.h | 23 +- + include/linux/sunrpc/xdr.h | 48 +- + include/linux/sunrpc/xdrgen/nlm4.h | 233 + + include/linux/xattr.h | 47 +- + include/net/sock.h | 4 +- + include/trace/events/btrfs.h | 24 + + include/trace/events/cachefiles.h | 18 +- + include/trace/events/ext4.h | 550 +- + include/trace/events/f2fs.h | 248 +- + include/trace/events/filelock.h | 34 +- + include/trace/events/filemap.h | 20 +- + include/trace/events/fs_dax.h | 20 +- + include/trace/events/fsverity.h | 30 +- + include/trace/events/hugetlbfs.h | 42 +- + include/trace/events/netfs.h | 8 +- + include/trace/events/nilfs2.h | 12 +- + include/trace/events/readahead.h | 18 +- + include/trace/events/sunrpc.h | 4 +- + include/trace/events/timestamp.h | 16 +- + include/trace/events/writeback.h | 162 +- + include/uapi/linux/btrfs_tree.h | 3 +- + include/uapi/linux/fs.h | 12 + + include/uapi/linux/mount.h | 1 + + include/uapi/linux/nfsd/export.h | 4 +- + include/uapi/linux/nfsd_netlink.h | 1 + + include/uapi/linux/pidfd.h | 1 + + include/uapi/linux/sched.h | 3 + + kernel/audit.h | 13 +- + kernel/audit_fsnotify.c | 4 +- + kernel/audit_watch.c | 12 +- + kernel/auditsc.c | 11 +- + kernel/events/uprobes.c | 4 +- + kernel/fork.c | 52 +- + kernel/ptrace.c | 3 +- + kernel/signal.c | 4 + + mm/shmem.c | 46 +- + net/ax25/af_ax25.c | 2 +- + net/bluetooth/af_bluetooth.c | 4 +- + net/can/bcm.c | 2 +- + net/ceph/auth.c | 2 +- + net/ceph/messenger_v2.c | 13 +- + net/ipv4/ping.c | 2 +- + net/ipv4/raw.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/udp.c | 2 +- + net/ipv6/datagram.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/key/af_key.c | 2 +- + net/netlink/af_netlink.c | 2 +- + net/netlink/diag.c | 2 +- + net/netrom/af_netrom.c | 4 +- + net/packet/af_packet.c | 2 +- + net/packet/diag.c | 2 +- + net/phonet/socket.c | 4 +- + net/rose/af_rose.c | 4 +- + net/sctp/proc.c | 4 +- + net/socket.c | 121 +- + net/sunrpc/auth_gss/gss_krb5_test.c | 93 +- + net/sunrpc/cache.c | 251 +- + net/sunrpc/svc.c | 59 +- + net/sunrpc/svc_xprt.c | 47 +- + net/sunrpc/svcsock.c | 7 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 28 +- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 151 +- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 194 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 33 +- + net/unix/af_unix.c | 2 +- + net/unix/diag.c | 6 +- + net/x25/x25_proc.c | 4 +- + net/xdp/xsk_diag.c | 2 +- + security/apparmor/apparmorfs.c | 38 +- + security/integrity/integrity_audit.c | 2 +- + security/ipe/audit.c | 2 +- + security/lsm_audit.c | 10 +- + security/selinux/hooks.c | 10 +- + security/selinux/selinuxfs.c | 17 +- + security/smack/smack_lsm.c | 12 +- + tools/include/uapi/linux/mount.h | 14 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/filesystems/devpts_pts.c | 2 - + .../selftests/filesystems/fsmount_ns/.gitignore | 1 + + .../selftests/filesystems/fsmount_ns/Makefile | 10 + + .../filesystems/fsmount_ns/fsmount_ns_test.c | 1138 ++++ + .../selftests/filesystems/move_mount/.gitignore | 2 + + .../selftests/filesystems/move_mount/Makefile | 10 + + .../filesystems/move_mount/move_mount_test.c | 492 ++ + .../selftests/filesystems/open_tree_ns/Makefile | 2 +- + .../filesystems/open_tree_ns/open_tree_ns_test.c | 43 +- + .../selftests/filesystems/statmount/statmount.h | 51 + + .../filesystems/statmount/statmount_test.c | 45 +- + .../testing/selftests/filesystems/xattr/.gitignore | 3 + + tools/testing/selftests/filesystems/xattr/Makefile | 6 + + .../filesystems/xattr/xattr_socket_test.c | 470 ++ + .../filesystems/xattr/xattr_socket_types_test.c | 177 + + .../filesystems/xattr/xattr_sockfs_test.c | 363 ++ + tools/testing/selftests/pidfd/.gitignore | 1 + + tools/testing/selftests/pidfd/Makefile | 2 +- + .../testing/selftests/pidfd/pidfd_autoreap_test.c | 900 ++++ + 618 files changed, 58836 insertions(+), 12289 deletions(-) + create mode 100644 Documentation/filesystems/ntfs.rst + create mode 100644 Documentation/sunrpc/xdr/nlm4.x + create mode 100644 block/bio-integrity-fs.c + create mode 100644 fs/btrfs/tests/zoned-tests.c + create mode 100644 fs/exfat/iomap.c + create mode 100644 fs/exfat/iomap.h + rename {include/linux => fs}/lockd/lockd.h (83%) + rename {include/linux => fs}/lockd/nlm.h (91%) + create mode 100644 fs/lockd/nlm4xdr_gen.c + create mode 100644 fs/lockd/nlm4xdr_gen.h + rename {include/linux => fs}/lockd/share.h (58%) + rename {include/linux => fs}/lockd/xdr.h (91%) + delete mode 100644 fs/lockd/xdr4.c + create mode 100644 fs/ntfs/Kconfig + create mode 100644 fs/ntfs/Makefile + create mode 100644 fs/ntfs/aops.c + create mode 100644 fs/ntfs/attrib.c + create mode 100644 fs/ntfs/attrib.h + create mode 100644 fs/ntfs/attrlist.c + create mode 100644 fs/ntfs/attrlist.h + create mode 100644 fs/ntfs/bdev-io.c + create mode 100644 fs/ntfs/bitmap.c + create mode 100644 fs/ntfs/bitmap.h + create mode 100644 fs/ntfs/collate.c + create mode 100644 fs/ntfs/collate.h + create mode 100644 fs/ntfs/compress.c + create mode 100644 fs/ntfs/debug.c + create mode 100644 fs/ntfs/debug.h + create mode 100644 fs/ntfs/dir.c + create mode 100644 fs/ntfs/dir.h + create mode 100644 fs/ntfs/ea.c + create mode 100644 fs/ntfs/ea.h + create mode 100644 fs/ntfs/file.c + create mode 100644 fs/ntfs/index.c + create mode 100644 fs/ntfs/index.h + create mode 100644 fs/ntfs/inode.c + create mode 100644 fs/ntfs/inode.h + create mode 100644 fs/ntfs/iomap.c + create mode 100644 fs/ntfs/iomap.h + create mode 100644 fs/ntfs/layout.h + create mode 100644 fs/ntfs/lcnalloc.c + create mode 100644 fs/ntfs/lcnalloc.h + create mode 100644 fs/ntfs/logfile.c + create mode 100644 fs/ntfs/logfile.h + create mode 100644 fs/ntfs/malloc.h + create mode 100644 fs/ntfs/mft.c + create mode 100644 fs/ntfs/mft.h + create mode 100644 fs/ntfs/mst.c + create mode 100644 fs/ntfs/namei.c + create mode 100644 fs/ntfs/ntfs.h + create mode 100644 fs/ntfs/object_id.c + create mode 100644 fs/ntfs/object_id.h + create mode 100644 fs/ntfs/quota.c + create mode 100644 fs/ntfs/quota.h + create mode 100644 fs/ntfs/reparse.c + create mode 100644 fs/ntfs/reparse.h + create mode 100644 fs/ntfs/runlist.c + create mode 100644 fs/ntfs/runlist.h + create mode 100644 fs/ntfs/super.c + create mode 100644 fs/ntfs/sysctl.c + create mode 100644 fs/ntfs/sysctl.h + create mode 100644 fs/ntfs/time.h + create mode 100644 fs/ntfs/unistr.c + create mode 100644 fs/ntfs/upcase.c + create mode 100644 fs/ntfs/volume.h + create mode 100644 fs/smb/common/smbdirect/Kconfig + create mode 100644 fs/smb/common/smbdirect/Makefile + create mode 100644 fs/smb/common/smbdirect/smbdirect_accept.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_connect.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_connection.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_debug.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_devices.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_internal.h + create mode 100644 fs/smb/common/smbdirect/smbdirect_listen.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_main.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_mr.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_public.h + create mode 100644 fs/smb/common/smbdirect/smbdirect_rw.c + create mode 100644 fs/smb/common/smbdirect/smbdirect_socket.c + delete mode 100644 include/linux/lockd/debug.h + delete mode 100644 include/linux/lockd/xdr4.h + create mode 100644 include/linux/sunrpc/xdrgen/nlm4.h + create mode 100644 tools/testing/selftests/filesystems/fsmount_ns/.gitignore + create mode 100644 tools/testing/selftests/filesystems/fsmount_ns/Makefile + create mode 100644 tools/testing/selftests/filesystems/fsmount_ns/fsmount_ns_test.c + create mode 100644 tools/testing/selftests/filesystems/move_mount/.gitignore + create mode 100644 tools/testing/selftests/filesystems/move_mount/Makefile + create mode 100644 tools/testing/selftests/filesystems/move_mount/move_mount_test.c + create mode 100644 tools/testing/selftests/filesystems/xattr/.gitignore + create mode 100644 tools/testing/selftests/filesystems/xattr/Makefile + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_socket_test.c + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_socket_types_test.c + create mode 100644 tools/testing/selftests/filesystems/xattr/xattr_sockfs_test.c + create mode 100644 tools/testing/selftests/pidfd/pidfd_autoreap_test.c +$ git am -3 ../patches/0001-ntfs-Fix-up-mm-merge.patch +Applying: ntfs: Fix up mm merge +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ntfs/file.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 6d964e54140ba] Merge branch 'fs-next' of linux-next + Date: Mon Mar 30 14:48:55 2026 +0100 +$ git am -3 ../patches/0001-f2fs-Fix-up-fs-next-mismerge.patch +Applying: f2fs: Fix up fs-next mismerge +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/compress.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 9f5e1dcd81f1c] Merge branch 'fs-next' of linux-next + Date: Mon Mar 30 14:48:55 2026 +0100 +$ git am -3 ../patches/0001-exfat-Fix-up-merge-with-mm.patch +Applying: exfat: Fix up merge with mm +$ git reset HEAD^ +Unstaged changes after reset: +M fs/exfat/file.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master d63f65c00f0f0] Merge branch 'fs-next' of linux-next + Date: Mon Mar 30 14:48:55 2026 +0100 +Merging printk/for-next (11828908e102a Merge branch 'rework/prb-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging kernel/printk/printk_ringbuffer.h +Merge made by the 'ort' strategy. + kernel/printk/printk_ringbuffer.c | 15 +++++++++------ + kernel/printk/printk_ringbuffer.h | 2 +- + lib/tests/printf_kunit.c | 22 ++++++++++++++++++++++ + 3 files changed, 32 insertions(+), 7 deletions(-) +Merging pci/next (50451816531d6 Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging MAINTAINERS +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/intel/igc/igc_main.c +Auto-merging drivers/pci/controller/dwc/pcie-designware-ep.c +Auto-merging drivers/pci/endpoint/functions/pci-epf-test.c +Auto-merging drivers/pci/pwrctrl/generic.c +Merge made by the 'ort' strategy. + Documentation/PCI/msi-howto.rst | 7 +- + .../bindings/pci/andestech,qilai-pcie.yaml | 89 +++ + .../devicetree/bindings/pci/baikal,bt1-pcie.yaml | 168 ------ + .../bindings/pci/cix,sky1-pcie-host.yaml | 3 + + .../devicetree/bindings/pci/eswin,pcie.yaml | 166 ++++++ + .../bindings/pci/renesas,r9a08g045-pcie.yaml | 121 +++- + MAINTAINERS | 14 + + arch/alpha/kernel/pci.c | 1 + + arch/arm/kernel/bios32.c | 9 +- + arch/m68k/kernel/pcibios.c | 8 +- + arch/mips/pci/pci-generic.c | 8 +- + arch/mips/pci/pci-legacy.c | 3 + + arch/parisc/kernel/pci.c | 17 +- + arch/powerpc/kernel/pci-common.c | 6 +- + arch/s390/pci/pci.c | 1 + + arch/sh/drivers/pci/pci.c | 6 +- + arch/x86/pci/i386.c | 5 +- + arch/xtensa/kernel/pci.c | 3 + + drivers/misc/pci_endpoint_test.c | 24 +- + drivers/net/ethernet/intel/ice/ice_main.c | 2 +- + drivers/net/ethernet/intel/idpf/idpf_main.c | 2 +- + drivers/net/ethernet/intel/igc/igc_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- + drivers/ntb/ntb_transport.c | 14 +- + drivers/pci/controller/Kconfig | 1 + + drivers/pci/controller/cadence/pci-j721e.c | 3 +- + drivers/pci/controller/cadence/pci-sky1.c | 6 +- + drivers/pci/controller/dwc/Kconfig | 28 +- + drivers/pci/controller/dwc/Makefile | 3 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 4 - + drivers/pci/controller/dwc/pci-imx6.c | 70 +-- + drivers/pci/controller/dwc/pci-keystone.c | 12 + + drivers/pci/controller/dwc/pci-layerscape-ep.c | 6 - + drivers/pci/controller/dwc/pci-layerscape.c | 16 +- + drivers/pci/controller/dwc/pcie-amd-mdb.c | 2 +- + drivers/pci/controller/dwc/pcie-andes-qilai.c | 197 +++++++ + drivers/pci/controller/dwc/pcie-artpec6.c | 4 - + drivers/pci/controller/dwc/pcie-bt1.c | 645 --------------------- + .../pci/controller/dwc/pcie-designware-debugfs.c | 52 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 55 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 27 +- + drivers/pci/controller/dwc/pcie-designware-plat.c | 10 - + drivers/pci/controller/dwc/pcie-designware.c | 2 +- + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 24 +- + drivers/pci/controller/dwc/pcie-eswin.c | 408 +++++++++++++ + drivers/pci/controller/dwc/pcie-keembay.c | 3 - + drivers/pci/controller/dwc/pcie-qcom-common.c | 2 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 16 +- + drivers/pci/controller/dwc/pcie-qcom.c | 6 +- + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 20 +- + drivers/pci/controller/dwc/pcie-stm32-ep.c | 10 - + drivers/pci/controller/dwc/pcie-tegra194.c | 21 +- + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 19 +- + drivers/pci/controller/pcie-brcmstb.c | 5 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 225 ++++--- + drivers/pci/controller/pcie-mediatek.c | 2 +- + drivers/pci/controller/pcie-rcar-ep.c | 3 - + drivers/pci/controller/pcie-rzg3s-host.c | 371 +++++++++--- + drivers/pci/endpoint/functions/pci-epf-mhi.c | 4 + + drivers/pci/endpoint/functions/pci-epf-ntb.c | 56 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 36 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 69 ++- + drivers/pci/endpoint/pci-ep-cfs.c | 30 +- + drivers/pci/endpoint/pci-ep-msi.c | 5 + + drivers/pci/endpoint/pci-epc-core.c | 5 +- + drivers/pci/endpoint/pci-epf-core.c | 2 +- + drivers/pci/hotplug/pciehp_core.c | 3 +- + drivers/pci/hotplug/pnv_php.c | 19 +- + drivers/pci/hotplug/rpaphp_slot.c | 4 +- + drivers/pci/msi/api.c | 5 + + drivers/pci/msi/msi.c | 10 + + drivers/pci/of.c | 21 +- + drivers/pci/pci-sysfs.c | 3 +- + drivers/pci/pci.c | 279 ++++----- + drivers/pci/pci.h | 8 +- + drivers/pci/pcie/aer.c | 35 +- + drivers/pci/pcie/aspm.c | 17 +- + drivers/pci/pcie/dpc.c | 3 + + drivers/pci/pcie/ptm.c | 77 +-- + drivers/pci/probe.c | 22 + + drivers/pci/pwrctrl/Kconfig | 13 +- + drivers/pci/pwrctrl/Makefile | 4 +- + drivers/pci/pwrctrl/{slot.c => generic.c} | 13 +- + drivers/pci/quirks.c | 3 + + drivers/pci/setup-bus.c | 65 ++- + drivers/pci/setup-res.c | 40 +- + drivers/pci/slot.c | 31 +- + drivers/pci/tph.c | 9 +- + drivers/pci/vgaarb.c | 20 +- + drivers/pcmcia/rsrc_nonstatic.c | 3 +- + include/linux/ioport.h | 22 +- + include/linux/ntb.h | 24 + + include/linux/pci-epc.h | 46 +- + include/linux/pci.h | 32 +- + include/linux/vgaarb.h | 15 +- + kernel/resource.c | 33 +- + .../selftests/pci_endpoint/pci_endpoint_test.c | 6 + + 97 files changed, 2413 insertions(+), 1638 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/andestech,qilai-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/baikal,bt1-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/eswin,pcie.yaml + create mode 100644 drivers/pci/controller/dwc/pcie-andes-qilai.c + delete mode 100644 drivers/pci/controller/dwc/pcie-bt1.c + create mode 100644 drivers/pci/controller/dwc/pcie-eswin.c + rename drivers/pci/pwrctrl/{slot.c => generic.c} (93%) +$ git reset --hard HEAD^ +HEAD is now at efa6f2720677a Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git +Merging next-20260326 version of pci +$ git merge -m next-20260326/pci ff6c76c8f6b57d0609a5db304bc660552ed2b0b2 +Auto-merging MAINTAINERS +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/intel/igc/igc_main.c +Auto-merging drivers/pci/controller/dwc/pcie-designware-ep.c +Auto-merging drivers/pci/endpoint/functions/pci-epf-test.c +Auto-merging drivers/pci/pwrctrl/generic.c +Merge made by the 'ort' strategy. + Documentation/PCI/msi-howto.rst | 7 +- + .../bindings/pci/andestech,qilai-pcie.yaml | 89 +++ + .../devicetree/bindings/pci/baikal,bt1-pcie.yaml | 168 ------ + .../bindings/pci/cix,sky1-pcie-host.yaml | 3 + + .../devicetree/bindings/pci/eswin,pcie.yaml | 166 ++++++ + .../bindings/pci/renesas,r9a08g045-pcie.yaml | 121 +++- + MAINTAINERS | 14 + + drivers/misc/pci_endpoint_test.c | 24 +- + drivers/net/ethernet/intel/ice/ice_main.c | 2 +- + drivers/net/ethernet/intel/idpf/idpf_main.c | 2 +- + drivers/net/ethernet/intel/igc/igc_main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- + drivers/pci/controller/Kconfig | 1 + + drivers/pci/controller/cadence/pci-sky1.c | 4 +- + drivers/pci/controller/dwc/Kconfig | 28 +- + drivers/pci/controller/dwc/Makefile | 3 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 4 - + drivers/pci/controller/dwc/pci-imx6.c | 26 +- + drivers/pci/controller/dwc/pci-keystone.c | 12 + + drivers/pci/controller/dwc/pci-layerscape-ep.c | 6 - + drivers/pci/controller/dwc/pci-layerscape.c | 16 +- + drivers/pci/controller/dwc/pcie-amd-mdb.c | 2 +- + drivers/pci/controller/dwc/pcie-andes-qilai.c | 197 +++++++ + drivers/pci/controller/dwc/pcie-artpec6.c | 4 - + drivers/pci/controller/dwc/pcie-bt1.c | 645 --------------------- + drivers/pci/controller/dwc/pcie-designware-ep.c | 55 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 25 +- + drivers/pci/controller/dwc/pcie-designware-plat.c | 10 - + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 24 +- + drivers/pci/controller/dwc/pcie-eswin.c | 408 +++++++++++++ + drivers/pci/controller/dwc/pcie-keembay.c | 3 - + drivers/pci/controller/dwc/pcie-qcom-ep.c | 12 - + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 20 +- + drivers/pci/controller/dwc/pcie-stm32-ep.c | 10 - + drivers/pci/controller/dwc/pcie-tegra194.c | 19 +- + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 19 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 223 ++++--- + drivers/pci/controller/pcie-mediatek.c | 2 +- + drivers/pci/controller/pcie-rcar-ep.c | 3 - + drivers/pci/controller/pcie-rzg3s-host.c | 371 +++++++++--- + drivers/pci/endpoint/functions/pci-epf-mhi.c | 4 + + drivers/pci/endpoint/functions/pci-epf-ntb.c | 56 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 36 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 60 +- + drivers/pci/endpoint/pci-ep-cfs.c | 14 +- + drivers/pci/endpoint/pci-ep-msi.c | 5 + + drivers/pci/endpoint/pci-epc-core.c | 5 +- + drivers/pci/endpoint/pci-epf-core.c | 2 +- + drivers/pci/hotplug/pciehp_core.c | 3 +- + drivers/pci/hotplug/pnv_php.c | 19 +- + drivers/pci/hotplug/rpaphp_slot.c | 4 +- + drivers/pci/msi/api.c | 5 + + drivers/pci/msi/msi.c | 10 + + drivers/pci/of.c | 2 +- + drivers/pci/pci-sysfs.c | 3 +- + drivers/pci/pci.c | 267 ++++----- + drivers/pci/pci.h | 3 +- + drivers/pci/pcie/aer.c | 35 +- + drivers/pci/pcie/aspm.c | 17 +- + drivers/pci/pcie/dpc.c | 3 + + drivers/pci/pcie/ptm.c | 77 +-- + drivers/pci/pwrctrl/Kconfig | 13 +- + drivers/pci/pwrctrl/Makefile | 4 +- + drivers/pci/pwrctrl/{slot.c => generic.c} | 13 +- + drivers/pci/quirks.c | 3 + + drivers/pci/slot.c | 31 +- + drivers/pci/tph.c | 9 +- + include/linux/pci-epc.h | 46 +- + include/linux/pci.h | 16 +- + .../selftests/pci_endpoint/pci_endpoint_test.c | 6 + + 70 files changed, 2010 insertions(+), 1513 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/andestech,qilai-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/baikal,bt1-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/eswin,pcie.yaml + create mode 100644 drivers/pci/controller/dwc/pcie-andes-qilai.c + delete mode 100644 drivers/pci/controller/dwc/pcie-bt1.c + create mode 100644 drivers/pci/controller/dwc/pcie-eswin.c + rename drivers/pci/pwrctrl/{slot.c => generic.c} (93%) +Merging pstore/for-next/pstore (bb5278a89dad2 pstore/ram: fix resource leak when ioremap() fails) +$ git merge -m Merge branch 'for-next/pstore' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Auto-merging fs/pstore/inode.c +Auto-merging fs/pstore/ram.c +Auto-merging fs/pstore/ram_core.c +Merge made by the 'ort' strategy. + fs/pstore/inode.c | 6 +++--- + fs/pstore/ram.c | 2 +- + fs/pstore/ram_core.c | 5 ++++- + 3 files changed, 8 insertions(+), 5 deletions(-) +Merging hid/for-next (72b8994888628 Merge branch 'for-7.0/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging MAINTAINERS +Auto-merging include/linux/device.h +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-driver-hid-lenovo-go | 724 ++++++ + .../ABI/testing/sysfs-driver-hid-lenovo-go-s | 304 +++ + MAINTAINERS | 28 +- + drivers/hid/Kconfig | 25 +- + drivers/hid/Makefile | 2 + + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 3 +- + drivers/hid/hid-apple.c | 10 +- + drivers/hid/hid-asus.c | 108 +- + drivers/hid/hid-core.c | 198 +- + drivers/hid/hid-debug.c | 6 + + drivers/hid/hid-ids.h | 42 +- + drivers/hid/hid-input-test.c | 39 +- + drivers/hid/hid-input.c | 213 +- + drivers/hid/hid-kysona.c | 2 + + drivers/hid/hid-lenovo-go-s.c | 1504 ++++++++++++ + drivers/hid/hid-lenovo-go.c | 2500 ++++++++++++++++++++ + drivers/hid/hid-magicmouse.c | 10 +- + drivers/hid/hid-mcp2221.c | 36 +- + drivers/hid/hid-pl.c | 12 +- + drivers/hid/hid-quirks.c | 1 + + drivers/hid/hid-roccat.c | 2 + + drivers/hid/hid-sony.c | 286 ++- + .../intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 7 + + .../intel-thc-hid/intel-quicki2c/quicki2c-dev.h | 4 + + .../intel-thc-hid/intel-quickspi/pci-quickspi.c | 22 +- + .../intel-thc-hid/intel-quickspi/quickspi-dev.h | 2 + + .../hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 47 + + drivers/hid/intel-thc-hid/intel-thc/intel-thc-hw.h | 4 + + drivers/hid/usbhid/hid-pidff.c | 57 +- + drivers/hid/usbhid/hid-pidff.h | 9 + + include/linux/device.h | 46 + + include/linux/hid.h | 58 +- + include/uapi/linux/input-event-codes.h | 4 + + 33 files changed, 5920 insertions(+), 395 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-lenovo-go + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-lenovo-go-s + create mode 100644 drivers/hid/hid-lenovo-go-s.c + create mode 100644 drivers/hid/hid-lenovo-go.c +Merging i2c/i2c/for-next (e1ec0c7eb3d6f Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 20 ++++++++++++++++++++ + .../devicetree/bindings/i2c/renesas,riic.yaml | 1 + + drivers/i2c/busses/Kconfig | 3 +-- + drivers/i2c/busses/i2c-cp2615.c | 5 ++--- + drivers/i2c/busses/i2c-diolan-u2c.c | 12 +++--------- + drivers/i2c/busses/i2c-robotfuzz-osif.c | 4 +--- + drivers/i2c/busses/i2c-tiny-usb.c | 13 +++---------- + 7 files changed, 31 insertions(+), 27 deletions(-) +Merging i2c-host/i2c/i2c-host (8461f5e388740 i2c: ocores: Use read_poll_timeout_atomic to avoid false poll timeouts) +$ git merge -m Merge branch 'i2c/i2c-host' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host +Auto-merging Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml +Auto-merging drivers/i2c/busses/i2c-tegra.c +Merge made by the 'ort' strategy. + .../bindings/i2c/snps,designware-i2c.yaml | 2 - + .../devicetree/bindings/i2c/spacemit,k1-i2c.yaml | 6 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 1 + + drivers/i2c/busses/i2c-npcm7xx.c | 2 +- + drivers/i2c/busses/i2c-ocores.c | 24 +- + drivers/i2c/busses/i2c-qcom-cci.c | 3 - + drivers/i2c/busses/i2c-s3c2410.c | 7 +- + drivers/i2c/busses/i2c-tegra.c | 530 +++++++++++++++------ + 8 files changed, 415 insertions(+), 160 deletions(-) +Merging i2c-rust/rust-i2c-next (bf074eb6891be rust: str: improve safety comment for CString::try_from_fmt) +$ git merge -m Merge branch 'rust-i2c-next' of https://github.com/ikrtn/rust-for-linux i2c-rust/rust-i2c-next +Already up to date. +Merging i3c/i3c/next (8ecd876fdaeda i3c: master: use kzalloc_flex) +$ git merge -m Merge branch 'i3c/next' of https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-i3c | 20 +++++++++++ + drivers/i3c/master.c | 41 ++++++++++++++++------ + drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c | 3 ++ + drivers/i3c/master/svc-i3c-master.c | 6 ++-- + 4 files changed, 57 insertions(+), 13 deletions(-) +Merging dmi/dmi-for-next (1afafbaf749d8 firmware/dmi: Include product_family info to modalias) +$ git merge -m Merge branch 'dmi-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (b773f2e6b4726 hwmon: (yogafan) Add support for Lenovo Yoga/Legion fan monitoring) +$ git merge -m Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/pmbus/tps53679.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/hwmon/baikal,bt1-pvt.yaml | 105 -- + .../devicetree/bindings/hwmon/moortec,mr75203.yaml | 4 +- + .../devicetree/bindings/hwmon/npcm750-pwm-fan.txt | 88 -- + .../bindings/hwmon/nuvoton,npcm750-pwm-fan.yaml | 139 +++ + .../bindings/hwmon/pmbus/isil,isl68137.yaml | 93 +- + .../devicetree/bindings/hwmon/ti,ina2xx.yaml | 3 + + .../devicetree/bindings/trivial-devices.yaml | 11 + + Documentation/hwmon/asus_ec_sensors.rst | 3 + + Documentation/hwmon/bt1-pvt.rst | 117 -- + Documentation/hwmon/ina2xx.rst | 25 +- + Documentation/hwmon/index.rst | 3 +- + Documentation/hwmon/isl68137.rst | 20 + + Documentation/hwmon/it87.rst | 26 +- + Documentation/hwmon/lattepanda-sigma-ec.rst | 61 + + Documentation/hwmon/ltc4282.rst | 3 +- + Documentation/hwmon/tmp102.rst | 21 + + Documentation/hwmon/yogafan.rst | 130 +++ + MAINTAINERS | 15 + + drivers/hwmon/Kconfig | 67 +- + drivers/hwmon/Makefile | 3 +- + drivers/hwmon/acpi_power_meter.c | 96 +- + drivers/hwmon/ads7828.c | 4 +- + drivers/hwmon/ads7871.c | 18 +- + drivers/hwmon/aht10.c | 10 + + drivers/hwmon/aspeed-g6-pwm-tach.c | 8 - + drivers/hwmon/asus-ec-sensors.c | 29 + + drivers/hwmon/asus_atk0110.c | 92 +- + drivers/hwmon/bt1-pvt.c | 1171 -------------------- + drivers/hwmon/bt1-pvt.h | 247 ----- + drivers/hwmon/emc1403.c | 2 +- + drivers/hwmon/gpd-fan.c | 8 + + drivers/hwmon/hwmon.c | 1 + + drivers/hwmon/ina209.c | 11 +- + drivers/hwmon/ina2xx.c | 76 +- + drivers/hwmon/it87.c | 61 +- + drivers/hwmon/lattepanda-sigma-ec.c | 359 ++++++ + drivers/hwmon/lm75.c | 20 +- + drivers/hwmon/ltc4282.c | 15 +- + drivers/hwmon/max31722.c | 3 +- + drivers/hwmon/max6650.c | 3 +- + drivers/hwmon/nct6775-platform.c | 23 + + drivers/hwmon/pmbus/Kconfig | 9 + + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/bel-pfe.c | 5 +- + drivers/hwmon/pmbus/fsp-3y.c | 13 +- + drivers/hwmon/pmbus/ibm-cffps.c | 16 +- + drivers/hwmon/pmbus/isl68137.c | 52 +- + drivers/hwmon/pmbus/ltc2978.c | 2 +- + drivers/hwmon/pmbus/max16601.c | 2 +- + drivers/hwmon/pmbus/max20730.c | 5 +- + drivers/hwmon/pmbus/max31785.c | 197 ++-- + drivers/hwmon/pmbus/max34440.c | 4 +- + drivers/hwmon/pmbus/pmbus.c | 4 +- + drivers/hwmon/pmbus/pmbus.h | 13 +- + drivers/hwmon/pmbus/pmbus_core.c | 300 +++-- + drivers/hwmon/pmbus/q54sj108a2.c | 23 +- + drivers/hwmon/pmbus/tps53679.c | 5 +- + drivers/hwmon/pmbus/xdpe1a2g7b.c | 119 ++ + drivers/hwmon/tc74.c | 2 +- + drivers/hwmon/yogafan.c | 275 +++++ + drivers/iio/adc/ina2xx-adc.c | 14 +- + include/linux/platform_data/ina2xx.h | 16 - + 62 files changed, 1861 insertions(+), 2410 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwmon/baikal,bt1-pvt.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/npcm750-pwm-fan.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/nuvoton,npcm750-pwm-fan.yaml + delete mode 100644 Documentation/hwmon/bt1-pvt.rst + create mode 100644 Documentation/hwmon/lattepanda-sigma-ec.rst + create mode 100644 Documentation/hwmon/yogafan.rst + delete mode 100644 drivers/hwmon/bt1-pvt.c + delete mode 100644 drivers/hwmon/bt1-pvt.h + create mode 100644 drivers/hwmon/lattepanda-sigma-ec.c + create mode 100644 drivers/hwmon/pmbus/xdpe1a2g7b.c + create mode 100644 drivers/hwmon/yogafan.c + delete mode 100644 include/linux/platform_data/ina2xx.h +Merging jc_docs/docs-next (0a4f3ef9880e5 docs: ja_JP: process: translate second half of 'Describe your changes') +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 +- + .../admin-guide/quickly-build-trimmed-linux.rst | 14 +- + Documentation/admin-guide/reporting-issues.rst | 182 ++- + Documentation/admin-guide/sysctl/crypto.rst | 47 + + Documentation/admin-guide/sysctl/debug.rst | 52 + + Documentation/admin-guide/sysctl/index.rst | 6 +- + Documentation/admin-guide/tainted-kernels.rst | 2 +- + .../verify-bugs-and-bisect-regressions.rst | 15 +- + Documentation/conf.py | 1 + + Documentation/core-api/housekeeping.rst | 2 +- + Documentation/core-api/memory-hotplug.rst | 2 +- + Documentation/core-api/printk-basics.rst | 36 + + Documentation/dev-tools/coccinelle.rst | 5 +- + Documentation/doc-guide/kernel-doc.rst | 6 + + Documentation/driver-api/acpi/acpi-drivers.rst | 2 +- + .../driver-api/cxl/platform/acpi/cedt.rst | 2 +- + .../driver-api/cxl/platform/bios-and-efi.rst | 2 +- + Documentation/driver-api/dmaengine/pxa_dma.rst | 2 +- + .../early-userspace/early_userspace_support.rst | 2 +- + Documentation/driver-api/interconnect.rst | 16 +- + Documentation/driver-api/libata.rst | 2 +- + Documentation/driver-api/pci/p2pdma.rst | 2 +- + .../features/perf/perf-regs/arch-support.txt | 2 +- + .../features/perf/perf-stackdump/arch-support.txt | 2 +- + Documentation/filesystems/path-lookup.rst | 2 +- + Documentation/filesystems/proc.rst | 40 +- + Documentation/mm/hwpoison.rst | 2 +- + Documentation/mm/numa.rst | 2 +- + Documentation/process/2.Process.rst | 2 +- + Documentation/process/backporting.rst | 2 +- + Documentation/process/changes.rst | 2 +- + Documentation/process/handling-regressions.rst | 695 +++++--- + Documentation/process/maintainer-handbooks.rst | 2 - + Documentation/process/maintainer-tip.rst | 2 +- + Documentation/process/submitting-patches.rst | 2 +- + Documentation/scheduler/sched-deadline.rst | 22 +- + Documentation/sphinx-static/custom.css | 26 + + Documentation/sphinx/translations.py | 1 + + Documentation/tools/kdoc_ancillary.rst | 17 + + Documentation/tools/kdoc_parser.rst | 8 + + Documentation/tools/python.rst | 2 + + Documentation/tools/rtla/rtla.rst | 6 +- + Documentation/tools/unittest.rst | 24 + + Documentation/translations/index.rst | 4 +- + .../translations/it_IT/process/4.Coding.rst | 3 +- + .../ja_JP/process/submitting-patches.rst | 130 +- + .../translations/pt_BR/disclaimer-pt_BR.rst | 11 + + Documentation/translations/pt_BR/index.rst | 77 + + .../translations/pt_BR/process/1.Intro.rst | 269 ++++ + .../translations/pt_BR/process/changes.rst | 576 +++++++ + .../translations/pt_BR/process/conclave.rst | 40 + + Documentation/translations/pt_BR/process/howto.rst | 637 ++++++++ + .../pt_BR/process/maintainer-handbooks.rst | 18 + + .../pt_BR/process/maintainer-kvm-x86.rst | 435 +++++ + .../pt_BR/process/maintainer-netdev.rst | 596 +++++++ + .../pt_BR/process/maintainer-soc-clean-dts.rst | 28 + + .../translations/pt_BR/process/maintainer-soc.rst | 222 +++ + .../translations/sp_SP/process/4.Coding.rst | 3 +- + .../sp_SP/process/submitting-patches.rst | 2 +- + .../translations/zh_CN/process/4.Coding.rst | 2 +- + .../translations/zh_TW/admin-guide/README.rst | 2 +- + .../translations/zh_TW/process/4.Coding.rst | 2 +- + MAINTAINERS | 10 +- + scripts/ver_linux | 50 +- + tools/docs/checktransupdate.py | 22 +- + tools/docs/kernel-doc | 49 +- + tools/docs/sphinx-build-wrapper | 10 +- + tools/lib/python/jobserver.py | 4 +- + tools/lib/python/kdoc/c_lex.py | 662 ++++++++ + tools/lib/python/kdoc/kdoc_files.py | 148 +- + tools/lib/python/kdoc/kdoc_item.py | 45 +- + tools/lib/python/kdoc/kdoc_output.py | 324 +++- + tools/lib/python/kdoc/kdoc_parser.py | 292 ++-- + tools/lib/python/kdoc/kdoc_re.py | 205 +-- + tools/lib/python/kdoc/kdoc_yaml_file.py | 178 ++ + tools/lib/python/kdoc/xforms_lists.py | 153 ++ + tools/lib/python/unittest_helper.py | 353 ++++ + tools/unittests/kdoc-test-schema.yaml | 156 ++ + tools/unittests/kdoc-test.yaml | 1698 ++++++++++++++++++++ + tools/unittests/run.py | 17 + + tools/unittests/test_cmatch.py | 821 ++++++++++ + tools/unittests/test_kdoc_parser.py | 560 +++++++ + tools/unittests/test_kdoc_test_schema.py | 94 ++ + tools/unittests/test_tokenizer.py | 469 ++++++ + 84 files changed, 9786 insertions(+), 856 deletions(-) + create mode 100644 Documentation/admin-guide/sysctl/crypto.rst + create mode 100644 Documentation/admin-guide/sysctl/debug.rst + create mode 100644 Documentation/tools/unittest.rst + create mode 100644 Documentation/translations/pt_BR/disclaimer-pt_BR.rst + create mode 100644 Documentation/translations/pt_BR/index.rst + create mode 100644 Documentation/translations/pt_BR/process/1.Intro.rst + create mode 100644 Documentation/translations/pt_BR/process/changes.rst + create mode 100644 Documentation/translations/pt_BR/process/conclave.rst + create mode 100644 Documentation/translations/pt_BR/process/howto.rst + create mode 100644 Documentation/translations/pt_BR/process/maintainer-handbooks.rst + create mode 100644 Documentation/translations/pt_BR/process/maintainer-kvm-x86.rst + create mode 100644 Documentation/translations/pt_BR/process/maintainer-netdev.rst + create mode 100644 Documentation/translations/pt_BR/process/maintainer-soc-clean-dts.rst + create mode 100644 Documentation/translations/pt_BR/process/maintainer-soc.rst + create mode 100644 tools/lib/python/kdoc/c_lex.py + create mode 100644 tools/lib/python/kdoc/kdoc_yaml_file.py + create mode 100644 tools/lib/python/kdoc/xforms_lists.py + create mode 100755 tools/lib/python/unittest_helper.py + create mode 100644 tools/unittests/kdoc-test-schema.yaml + create mode 100644 tools/unittests/kdoc-test.yaml + create mode 100755 tools/unittests/run.py + create mode 100755 tools/unittests/test_cmatch.py + create mode 100755 tools/unittests/test_kdoc_parser.py + create mode 100755 tools/unittests/test_kdoc_test_schema.py + create mode 100755 tools/unittests/test_tokenizer.py +Merging v4l-dvb/next (4fbeef21f5387 Revert "media: cx231xx: add USB ID 2040:8360 for Hauppauge WinTV-HVR-935") +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging drivers/media/platform/synopsys/Kconfig +Auto-merging drivers/media/platform/synopsys/dw-mipi-csi2rx.c +Merge made by the 'ort' strategy. + .mailmap | 1 + + Documentation/admin-guide/media/mgb4.rst | 8 + + Documentation/admin-guide/media/starfive_camss.rst | 72 -- + .../admin-guide/media/starfive_camss_graph.dot | 12 - + Documentation/admin-guide/media/v4l-drivers.rst | 1 - + .../media/i2c/alliedvision,alvium-csi2.yaml | 2 +- + .../bindings/media/i2c/onnn,mt9m114.yaml | 4 +- + .../bindings/media/i2c/ovti,ov08d10.yaml | 101 ++ + .../devicetree/bindings/media/i2c/ovti,ov2732.yaml | 103 ++ + .../devicetree/bindings/media/i2c/ovti,ov8856.yaml | 6 + + .../devicetree/bindings/media/i2c/sony,imx355.yaml | 111 ++ + .../bindings/media/i2c/ti,ds90ub960.yaml | 221 ++-- + .../devicetree/bindings/media/nxp,imx8-isi.yaml | 27 +- + .../bindings/media/nxp,imx8mq-mipi-csi2.yaml | 49 +- + .../bindings/media/qcom,sdm670-camss.yaml | 3 - + .../bindings/media/rockchip,rk3568-mipi-csi2.yaml | 47 +- + .../devicetree/bindings/media/rockchip,vdec.yaml | 22 +- + .../devicetree/bindings/media/st,stm32-dcmi.yaml | 14 +- + .../bindings/media/starfive,jh7110-camss.yaml | 180 ---- + Documentation/driver-api/media/index.rst | 1 + + .../driver-api/media/maintainer-entry-profile.rst | 463 +++++++-- + .../driver-api/media/media-committers.rst | 203 ++++ + Documentation/process/maintainer-pgp-guide.rst | 2 + + .../userspace-api/media/dvb/legacy_dvb_audio.rst | 2 +- + .../userspace-api/media/v4l/subdev-formats.rst | 20 +- + MAINTAINERS | 30 +- + drivers/gpio/gpio-tps68470.c | 21 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 1 + + drivers/gpu/drm/tegra/dsi.c | 1 + + drivers/gpu/host1x/Makefile | 1 + + drivers/gpu/host1x/mipi.c | 612 +++-------- + drivers/gpu/host1x/tegra114-mipi.c | 483 +++++++++ + drivers/hid/hid-picolcd_cir.c | 1 + + drivers/media/cec/core/cec-core.c | 2 +- + drivers/media/cec/usb/pulse8/pulse8-cec.c | 7 + + drivers/media/common/b2c2/flexcop.c | 14 - + drivers/media/common/saa7146/saa7146_fops.c | 13 - + drivers/media/common/siano/smsir.c | 1 + + drivers/media/common/uvc.c | 4 + + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 1 + + drivers/media/dvb-frontends/au8522_decoder.c | 1 + + drivers/media/dvb-frontends/dib8000.c | 4 +- + drivers/media/dvb-frontends/m88ds3103.c | 426 ++++++-- + drivers/media/dvb-frontends/m88ds3103_priv.h | 46 +- + drivers/media/dvb-frontends/si2168.c | 8 +- + drivers/media/i2c/Kconfig | 31 +- + drivers/media/i2c/Makefile | 2 + + drivers/media/i2c/alvium-csi2.c | 2 +- + drivers/media/i2c/ar0521.c | 3 + + drivers/media/i2c/ccs-pll.c | 5 +- + drivers/media/i2c/cx25840/cx25840-core.c | 29 +- + drivers/media/i2c/ds90ub913.c | 59 +- + drivers/media/i2c/ds90ub953.c | 61 +- + drivers/media/i2c/ds90ub960.c | 214 ++-- + drivers/media/i2c/dw9768.c | 2 +- + drivers/media/i2c/imx219.c | 3 + + drivers/media/i2c/imx258.c | 14 +- + drivers/media/i2c/imx283.c | 27 +- + drivers/media/i2c/imx355.c | 117 ++- + drivers/media/i2c/imx412.c | 8 +- + drivers/media/i2c/ir-kbd-i2c.c | 2 + + drivers/media/i2c/max9286.c | 2 +- + drivers/media/i2c/mt9m114.c | 35 +- + drivers/media/i2c/mt9p031.c | 4 + + drivers/media/i2c/og01a1b.c | 907 ++++++++--------- + drivers/media/i2c/ov02a10.c | 2 +- + drivers/media/i2c/ov08d10.c | 246 ++++- + drivers/media/i2c/ov2732.c | 790 +++++++++++++++ + drivers/media/i2c/ov5647.c | 12 +- + drivers/media/i2c/ov5675.c | 32 +- + drivers/media/i2c/ov8856.c | 23 +- + drivers/media/i2c/ov9282.c | 681 +++++-------- + drivers/media/i2c/t4ka3.c | 1064 ++++++++++++++++++++ + drivers/media/i2c/vgxy61.c | 3 + + drivers/media/pci/bt8xx/bttv-input.c | 3 +- + drivers/media/pci/cx23885/cx23885-cards.c | 3 + + drivers/media/pci/cx23885/cx23885-core.c | 15 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 6 +- + drivers/media/pci/cx23885/cx23885-input.c | 1 + + drivers/media/pci/cx23885/cx23885.h | 1 + + drivers/media/pci/cx25821/cx25821-alsa.c | 6 +- + drivers/media/pci/cx88/cx88-input.c | 3 +- + drivers/media/pci/dm1105/dm1105.c | 1 + + drivers/media/pci/intel/ipu-bridge.c | 16 + + drivers/media/pci/intel/ipu6/ipu6.c | 2 +- + drivers/media/pci/mantis/mantis_input.c | 1 + + drivers/media/pci/mgb4/mgb4_core.c | 3 +- + drivers/media/pci/mgb4/mgb4_sysfs_in.c | 18 +- + drivers/media/pci/mgb4/mgb4_sysfs_out.c | 62 ++ + drivers/media/pci/saa7134/saa7134-i2c.c | 26 +- + drivers/media/pci/saa7134/saa7134-input.c | 1 + + drivers/media/pci/saa7164/saa7164-core.c | 47 +- + drivers/media/pci/saa7164/saa7164-fw.c | 4 +- + drivers/media/pci/smipcie/smipcie-ir.c | 1 + + drivers/media/pci/ttpci/budget-ci.c | 1 + + drivers/media/pci/zoran/zoran_card.c | 2 +- + drivers/media/platform/amphion/vpu_v4l2.c | 9 +- + .../media/platform/arm/mali-c55/mali-c55-common.h | 2 + + .../media/platform/arm/mali-c55/mali-c55-core.c | 35 - + drivers/media/platform/arm/mali-c55/mali-c55-isp.c | 37 +- + .../media/platform/arm/mali-c55/mali-c55-params.c | 134 ++- + .../platform/arm/mali-c55/mali-c55-registers.h | 4 +- + drivers/media/platform/broadcom/Kconfig | 5 - + drivers/media/platform/broadcom/bcm2835-unicam.c | 45 +- + .../media/platform/chips-media/wave5/wave5-vdi.c | 1 + + .../platform/chips-media/wave5/wave5-vpu-dec.c | 14 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 1 + + .../mediatek/vcodec/encoder/mtk_vcodec_enc_drv.c | 9 + + drivers/media/platform/nxp/dw100/dw100.c | 134 ++- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h | 3 + + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 117 ++- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 22 + + drivers/media/platform/nxp/imx-mipi-csis.c | 31 +- + .../media/platform/nxp/imx8-isi/imx8-isi-core.c | 12 + + .../media/platform/nxp/imx8-isi/imx8-isi-core.h | 1 + + drivers/media/platform/nxp/imx8-isi/imx8-isi-hw.c | 6 +- + .../media/platform/nxp/imx8-isi/imx8-isi-video.c | 2 +- + drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 92 +- + drivers/media/platform/renesas/rcar-csi2.c | 116 ++- + drivers/media/platform/renesas/rcar-isp/csisp.c | 13 +- + drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 22 + + .../media/platform/renesas/rcar-vin/rcar-v4l2.c | 12 + + .../platform/renesas/rzv2h-ivc/rzv2h-ivc-dev.c | 2 +- + .../platform/renesas/rzv2h-ivc/rzv2h-ivc-video.c | 63 +- + .../media/platform/renesas/rzv2h-ivc/rzv2h-ivc.h | 13 +- + drivers/media/platform/renesas/vsp1/vsp1_brx.c | 37 +- + drivers/media/platform/renesas/vsp1/vsp1_clu.c | 47 +- + drivers/media/platform/renesas/vsp1/vsp1_drv.c | 8 +- + drivers/media/platform/renesas/vsp1/vsp1_entity.c | 112 ++- + drivers/media/platform/renesas/vsp1/vsp1_entity.h | 21 +- + drivers/media/platform/renesas/vsp1/vsp1_histo.c | 97 +- + drivers/media/platform/renesas/vsp1/vsp1_histo.h | 2 - + drivers/media/platform/renesas/vsp1/vsp1_hsit.c | 61 +- + drivers/media/platform/renesas/vsp1/vsp1_iif.c | 39 +- + drivers/media/platform/renesas/vsp1/vsp1_lif.c | 40 +- + drivers/media/platform/renesas/vsp1/vsp1_lut.c | 47 +- + drivers/media/platform/renesas/vsp1/vsp1_rpf.c | 7 +- + drivers/media/platform/renesas/vsp1/vsp1_rwpf.c | 127 ++- + drivers/media/platform/renesas/vsp1/vsp1_rwpf.h | 6 +- + drivers/media/platform/renesas/vsp1/vsp1_sru.c | 63 +- + drivers/media/platform/renesas/vsp1/vsp1_uds.c | 62 +- + drivers/media/platform/renesas/vsp1/vsp1_uif.c | 40 +- + drivers/media/platform/renesas/vsp1/vsp1_wpf.c | 13 +- + .../platform/rockchip/rkcif/rkcif-capture-mipi.c | 10 +- + .../platform/rockchip/rkcif/rkcif-interface.c | 3 +- + .../media/platform/rockchip/rkcif/rkcif-stream.c | 46 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 3 + + .../media/platform/samsung/exynos4-is/fimc-core.c | 6 +- + .../media/platform/samsung/exynos4-is/fimc-is.c | 11 +- + drivers/media/platform/st/stm32/stm32-dcmi.c | 475 ++++++--- + drivers/media/platform/synopsys/Kconfig | 1 + + drivers/media/platform/synopsys/dw-mipi-csi2rx.c | 281 +++++- + .../media/platform/synopsys/hdmirx/snps_hdmirx.c | 6 +- + drivers/media/platform/ti/omap3isp/ispvideo.c | 1 + + drivers/media/platform/ti/vpe/vip.c | 1 + + drivers/media/rc/ati_remote.c | 6 +- + drivers/media/rc/ene_ir.c | 2 +- + drivers/media/rc/fintek-cir.c | 3 +- + drivers/media/rc/gpio-ir-tx.c | 4 +- + drivers/media/rc/igorplugusb.c | 17 +- + drivers/media/rc/iguanair.c | 1 + + drivers/media/rc/img-ir/img-ir-hw.c | 3 +- + drivers/media/rc/img-ir/img-ir-raw.c | 3 +- + drivers/media/rc/imon.c | 16 +- + drivers/media/rc/ir-hix5hd2.c | 2 +- + drivers/media/rc/ir_toy.c | 1 + + drivers/media/rc/ite-cir.c | 2 +- + drivers/media/rc/mceusb.c | 5 +- + drivers/media/rc/rc-ir-raw.c | 5 - + drivers/media/rc/rc-loopback.c | 1 + + drivers/media/rc/rc-main.c | 6 +- + drivers/media/rc/redrat3.c | 4 +- + drivers/media/rc/st_rc.c | 2 +- + drivers/media/rc/streamzap.c | 19 +- + drivers/media/rc/sunxi-cir.c | 1 + + drivers/media/rc/ttusbir.c | 15 +- + drivers/media/rc/winbond-cir.c | 2 +- + drivers/media/rc/xbox_remote.c | 14 +- + drivers/media/test-drivers/vidtv/Kconfig | 1 + + drivers/media/test-drivers/vidtv/vidtv_bridge.c | 4 +- + drivers/media/test-drivers/vidtv/vidtv_channel.c | 4 + + drivers/media/test-drivers/vidtv/vidtv_mux.c | 4 +- + drivers/media/test-drivers/vidtv/vidtv_psi.c | 57 +- + drivers/media/test-drivers/vidtv/vidtv_s302m.c | 6 +- + drivers/media/test-drivers/vidtv/vidtv_ts.c | 48 +- + drivers/media/test-drivers/vidtv/vidtv_ts.h | 4 +- + drivers/media/test-drivers/vimc/vimc-common.h | 41 + + drivers/media/test-drivers/vimc/vimc-sensor.c | 114 ++- + drivers/media/test-drivers/vimc/vimc-streamer.c | 33 +- + drivers/media/tuners/mxl5005s.c | 6 + + drivers/media/tuners/si2157.c | 232 +++-- + drivers/media/tuners/si2157_priv.h | 3 +- + drivers/media/tuners/xc5000.c | 12 +- + drivers/media/usb/as102/as102_usb_drv.c | 2 + + drivers/media/usb/au0828/au0828-cards.c | 50 + + drivers/media/usb/au0828/au0828-cards.h | 2 + + drivers/media/usb/au0828/au0828-dvb.c | 1 + + drivers/media/usb/au0828/au0828-input.c | 2 + + drivers/media/usb/au0828/au0828-video.c | 25 +- + drivers/media/usb/cx231xx/cx231xx-avcore.c | 7 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 5 +- + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 1 + + drivers/media/usb/dvb-usb/dvb-usb-remote.c | 6 +- + drivers/media/usb/em28xx/em28xx-cards.c | 258 ++++- + drivers/media/usb/em28xx/em28xx-core.c | 159 ++- + drivers/media/usb/em28xx/em28xx-dvb.c | 322 +++++- + drivers/media/usb/em28xx/em28xx-i2c.c | 2 + + drivers/media/usb/em28xx/em28xx-input.c | 1 + + drivers/media/usb/em28xx/em28xx-reg.h | 1 + + drivers/media/usb/em28xx/em28xx-video.c | 207 +++- + drivers/media/usb/em28xx/em28xx.h | 23 + + drivers/media/usb/go7007/go7007-loader.c | 6 +- + drivers/media/usb/gspca/gspca.c | 13 - + drivers/media/usb/hackrf/hackrf.c | 7 +- + drivers/media/usb/usbtv/usbtv-core.c | 4 +- + drivers/media/usb/uvc/uvc_driver.c | 38 +- + drivers/media/usb/uvc/uvc_isight.c | 2 +- + drivers/media/usb/uvc/uvc_metadata.c | 9 +- + drivers/media/usb/uvc/uvc_queue.c | 23 +- + drivers/media/usb/uvc/uvc_v4l2.c | 3 + + drivers/media/usb/uvc/uvcvideo.h | 13 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 9 +- + drivers/media/v4l2-core/v4l2-subdev.c | 119 +++ + drivers/platform/x86/intel/int3472/tps68470.c | 1 + + drivers/platform/x86/intel/int3472/tps68470.h | 1 + + .../x86/intel/int3472/tps68470_board_data.c | 107 +- + drivers/staging/media/Kconfig | 2 - + drivers/staging/media/Makefile | 1 - + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 4 + + drivers/staging/media/av7110/av7110.c | 2 +- + drivers/staging/media/av7110/av7110_ir.c | 1 + + drivers/staging/media/imx/imx-media-csi.c | 86 +- + drivers/staging/media/imx/imx-media-of.c | 3 +- + drivers/staging/media/imx/imx-media-vdic.c | 2 +- + drivers/staging/media/imx/imx-media.h | 2 +- + drivers/staging/media/ipu3/ipu3.c | 2 +- + drivers/staging/media/ipu7/TODO | 12 +- + drivers/staging/media/starfive/Kconfig | 5 - + drivers/staging/media/starfive/Makefile | 2 - + drivers/staging/media/starfive/camss/Kconfig | 18 - + drivers/staging/media/starfive/camss/Makefile | 13 - + drivers/staging/media/starfive/camss/TODO.txt | 4 - + drivers/staging/media/starfive/camss/stf-camss.c | 438 -------- + drivers/staging/media/starfive/camss/stf-camss.h | 134 --- + drivers/staging/media/starfive/camss/stf-capture.c | 605 ----------- + drivers/staging/media/starfive/camss/stf-capture.h | 86 -- + .../staging/media/starfive/camss/stf-isp-hw-ops.c | 445 -------- + drivers/staging/media/starfive/camss/stf-isp.c | 379 ------- + drivers/staging/media/starfive/camss/stf-isp.h | 428 -------- + drivers/staging/media/starfive/camss/stf-video.c | 570 ----------- + drivers/staging/media/starfive/camss/stf-video.h | 100 -- + drivers/staging/media/tegra-video/Makefile | 1 + + drivers/staging/media/tegra-video/csi.c | 68 +- + drivers/staging/media/tegra-video/csi.h | 22 + + drivers/staging/media/tegra-video/tegra20.c | 840 +++++++++++++--- + drivers/staging/media/tegra-video/vi.c | 58 +- + drivers/staging/media/tegra-video/vi.h | 6 +- + drivers/staging/media/tegra-video/video.c | 8 +- + drivers/staging/media/tegra-video/vip.c | 2 +- + drivers/staging/media/tegra-video/vip.h | 2 +- + include/linux/host1x.h | 10 - + include/linux/tegra-mipi-cal.h | 57 ++ + include/linux/usb/uvc.h | 3 + + include/media/rc-core.h | 4 +- + include/media/v4l2-fwnode.h | 6 +- + include/media/v4l2-subdev.h | 56 ++ + 266 files changed, 10060 insertions(+), 7144 deletions(-) + delete mode 100644 Documentation/admin-guide/media/starfive_camss.rst + delete mode 100644 Documentation/admin-guide/media/starfive_camss_graph.dot + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov08d10.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov2732.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx355.yaml + delete mode 100644 Documentation/devicetree/bindings/media/starfive,jh7110-camss.yaml + create mode 100644 Documentation/driver-api/media/media-committers.rst + create mode 100644 drivers/gpu/host1x/tegra114-mipi.c + create mode 100644 drivers/media/i2c/ov2732.c + create mode 100644 drivers/media/i2c/t4ka3.c + delete mode 100644 drivers/staging/media/starfive/Kconfig + delete mode 100644 drivers/staging/media/starfive/Makefile + delete mode 100644 drivers/staging/media/starfive/camss/Kconfig + delete mode 100644 drivers/staging/media/starfive/camss/Makefile + delete mode 100644 drivers/staging/media/starfive/camss/TODO.txt + delete mode 100644 drivers/staging/media/starfive/camss/stf-camss.c + delete mode 100644 drivers/staging/media/starfive/camss/stf-camss.h + delete mode 100644 drivers/staging/media/starfive/camss/stf-capture.c + delete mode 100644 drivers/staging/media/starfive/camss/stf-capture.h + delete mode 100644 drivers/staging/media/starfive/camss/stf-isp-hw-ops.c + delete mode 100644 drivers/staging/media/starfive/camss/stf-isp.c + delete mode 100644 drivers/staging/media/starfive/camss/stf-isp.h + delete mode 100644 drivers/staging/media/starfive/camss/stf-video.c + delete mode 100644 drivers/staging/media/starfive/camss/stf-video.h + create mode 100644 include/linux/tegra-mipi-cal.h +Merging v4l-dvb-next/master (adc218676eef2 Linux 6.12) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (61e0eac49e85d Merge branch 'fixes' into linux-next) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging drivers/char/hpet.c +Auto-merging kernel/power/user.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 18 + + Documentation/ABI/testing/sysfs-firmware-acpi | 6 + + Documentation/admin-guide/kernel-parameters.txt | 8 + + arch/x86/kernel/rtc.c | 19 +- + arch/x86/power/hibernate_64.c | 2 - + drivers/acpi/ac.c | 31 +- + drivers/acpi/acpi_fpdt.c | 28 + + drivers/acpi/acpi_memhotplug.c | 4 - + drivers/acpi/acpi_pad.c | 28 +- + drivers/acpi/acpi_pnp.c | 22 +- + drivers/acpi/acpi_processor.c | 2 - + drivers/acpi/acpi_tad.c | 282 ++++++---- + drivers/acpi/acpi_video.c | 100 ++-- + drivers/acpi/acpica/utnonansi.c | 3 +- + drivers/acpi/battery.c | 9 +- + drivers/acpi/button.c | 11 +- + drivers/acpi/cppc_acpi.c | 296 +++++++++-- + drivers/acpi/ec.c | 6 - + drivers/acpi/event.c | 7 +- + drivers/acpi/osl.c | 19 +- + drivers/acpi/pci_link.c | 4 - + drivers/acpi/pci_root.c | 9 +- + drivers/acpi/power.c | 4 - + drivers/acpi/pptt.c | 31 +- + drivers/acpi/processor_driver.c | 22 +- + drivers/acpi/processor_idle.c | 21 +- + drivers/acpi/sbs.c | 4 - + drivers/acpi/sbshc.c | 6 - + drivers/acpi/thermal.c | 13 +- + drivers/acpi/x86/cmos_rtc.c | 88 ++-- + drivers/base/auxiliary.c | 10 + + drivers/char/hpet.c | 18 +- + drivers/char/sonypi.c | 25 +- + drivers/cpufreq/acpi-cpufreq.c | 31 +- + drivers/cpufreq/cppc_cpufreq.c | 104 +++- + drivers/cpufreq/cpufreq.c | 4 +- + drivers/cpufreq/cpufreq_governor.h | 5 +- + drivers/cpufreq/intel_pstate.c | 2 +- + drivers/cpuidle/governors/gov.h | 5 + + drivers/cpuidle/governors/menu.c | 15 +- + drivers/cpuidle/governors/teo.c | 81 ++- + drivers/gpu/drm/amd/include/amd_acpi.h | 2 - + drivers/gpu/drm/radeon/radeon_acpi.c | 2 - + drivers/idle/intel_idle.c | 42 ++ + drivers/platform/x86/hp/hp-wmi.c | 2 - + drivers/platform/x86/lenovo/wmi-capdata.c | 1 - + drivers/powercap/intel_rapl_common.c | 568 +++++++++------------ + drivers/powercap/intel_rapl_msr.c | 1 + + drivers/powercap/intel_rapl_tpmi.c | 48 ++ + drivers/rtc/rtc-cmos.c | 158 ++---- + drivers/thermal/devfreq_cooling.c | 3 +- + .../intel/int340x_thermal/processor_thermal_rapl.c | 9 + + .../intel/int340x_thermal/processor_thermal_rfim.c | 25 +- + drivers/thermal/intel/intel_hfi.c | 2 +- + drivers/thermal/thermal_core.c | 33 +- + drivers/thermal/thermal_sysfs.c | 7 +- + drivers/watchdog/ni903x_wdt.c | 27 +- + drivers/xen/xen-acpi-pad.c | 23 +- + include/acpi/acpi_bus.h | 14 +- + include/acpi/cppc_acpi.h | 23 +- + include/acpi/processor.h | 2 - + include/linux/acpi.h | 10 + + include/linux/auxiliary_bus.h | 2 + + include/linux/cpufreq.h | 2 +- + include/linux/intel_rapl.h | 18 +- + include/linux/powercap.h | 4 +- + include/linux/units.h | 3 + + kernel/power/user.c | 7 +- + 68 files changed, 1394 insertions(+), 1047 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 6e7303a2a2994 Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git +Merging next-20260327 version of pm +$ git merge -m next-20260327/pm a06009b0477c2758da727c90893765480c9b6f92 +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging drivers/char/hpet.c +Auto-merging drivers/platform/x86/hp/hp-wmi.c +Auto-merging kernel/power/user.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 18 + + Documentation/admin-guide/kernel-parameters.txt | 8 + + arch/x86/kernel/rtc.c | 19 +- + arch/x86/power/hibernate_64.c | 2 - + drivers/acpi/ac.c | 31 +- + drivers/acpi/acpi_memhotplug.c | 4 - + drivers/acpi/acpi_pad.c | 28 +- + drivers/acpi/acpi_pnp.c | 22 +- + drivers/acpi/acpi_processor.c | 2 - + drivers/acpi/acpi_tad.c | 282 +++++---- + drivers/acpi/acpi_video.c | 100 ++- + drivers/acpi/acpica/utnonansi.c | 3 +- + drivers/acpi/battery.c | 9 +- + drivers/acpi/button.c | 11 +- + drivers/acpi/cppc_acpi.c | 296 +++++++-- + drivers/acpi/ec.c | 6 - + drivers/acpi/event.c | 7 +- + drivers/acpi/osl.c | 19 +- + drivers/acpi/pci_link.c | 4 - + drivers/acpi/pci_root.c | 9 +- + drivers/acpi/power.c | 4 - + drivers/acpi/pptt.c | 31 +- + drivers/acpi/processor_driver.c | 22 +- + drivers/acpi/processor_idle.c | 21 +- + drivers/acpi/sbs.c | 4 - + drivers/acpi/sbshc.c | 6 - + drivers/acpi/thermal.c | 13 +- + drivers/acpi/x86/cmos_rtc.c | 88 +-- + drivers/base/auxiliary.c | 10 + + drivers/char/hpet.c | 18 +- + drivers/char/sonypi.c | 25 +- + drivers/cpufreq/acpi-cpufreq.c | 31 +- + drivers/cpufreq/cppc_cpufreq.c | 104 ++- + drivers/cpufreq/cpufreq.c | 4 +- + drivers/cpufreq/cpufreq_governor.h | 5 +- + drivers/cpufreq/intel_pstate.c | 2 +- + drivers/cpuidle/governors/gov.h | 5 + + drivers/cpuidle/governors/menu.c | 15 +- + drivers/cpuidle/governors/teo.c | 81 +-- + drivers/gpu/drm/amd/include/amd_acpi.h | 2 - + drivers/gpu/drm/radeon/radeon_acpi.c | 2 - + drivers/idle/intel_idle.c | 42 ++ + drivers/platform/x86/hp/hp-wmi.c | 2 - + drivers/platform/x86/lenovo/wmi-capdata.c | 1 - + drivers/powercap/intel_rapl_common.c | 695 +++------------------ + drivers/powercap/intel_rapl_msr.c | 393 +++++++++++- + drivers/powercap/intel_rapl_tpmi.c | 101 +++ + drivers/rtc/rtc-cmos.c | 158 ++--- + drivers/thermal/devfreq_cooling.c | 3 +- + .../intel/int340x_thermal/processor_thermal_rapl.c | 81 +++ + .../intel/int340x_thermal/processor_thermal_rfim.c | 25 +- + drivers/thermal/intel/intel_hfi.c | 2 +- + drivers/thermal/thermal_core.c | 2 +- + drivers/thermal/thermal_sysfs.c | 7 +- + drivers/watchdog/ni903x_wdt.c | 27 +- + drivers/xen/xen-acpi-pad.c | 23 +- + include/acpi/acpi_bus.h | 14 +- + include/acpi/cppc_acpi.h | 23 +- + include/acpi/processor.h | 2 - + include/linux/acpi.h | 10 + + include/linux/auxiliary_bus.h | 2 + + include/linux/cpufreq.h | 2 +- + include/linux/intel_rapl.h | 52 +- + include/linux/powercap.h | 4 +- + include/linux/units.h | 3 + + kernel/power/user.c | 7 +- + 66 files changed, 1709 insertions(+), 1345 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (8655a4e35cda5 cpufreq: tegra194: remove COMPILE_TEST) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../arm/tegra/nvidia,tegra-ccplex-cluster.yaml | 1 + + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 1 + + MAINTAINERS | 23 ++++++++++++++++------ + drivers/cpufreq/Kconfig.arm | 2 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/tegra194-cpufreq.c | 4 ++-- + 6 files changed, 23 insertions(+), 9 deletions(-) +Merging cpupower/cpupower (8bbd81ddbe174 cpupower-info.1: describe the --perf-bias option) +$ git merge -m Merge branch 'cpupower' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'ort' strategy. + tools/power/cpupower/man/cpupower-frequency-info.1 | 8 +++++++- + tools/power/cpupower/man/cpupower-idle-info.1 | 4 ++-- + tools/power/cpupower/man/cpupower-info.1 | 9 ++++++++- + 3 files changed, 17 insertions(+), 4 deletions(-) +Merging devfreq/devfreq-next (c297565666d74 PM / devfreq: tegra30-devfreq: add support for Tegra114) +$ git merge -m Merge branch 'devfreq-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/devfreq.c | 108 ++++++++++++++++++++++---------------- + drivers/devfreq/tegra30-devfreq.c | 17 ++++-- + 2 files changed, 74 insertions(+), 51 deletions(-) +Merging pmdomain/next (bc330699801d3 pmdomain: qcom: cpr: simplify main allocation) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Merge made by the 'ort' strategy. + .../bindings/power/allwinner,sun20i-d1-ppu.yaml | 17 +- + .../bindings/power/mediatek,mt8196-gpufreq.yaml | 13 + + .../bindings/power/mediatek,power-controller.yaml | 1 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + drivers/pmdomain/arm/scmi_pm_domain.c | 1 + + drivers/pmdomain/bcm/bcm2835-power.c | 25 +- + drivers/pmdomain/core.c | 59 ++- + drivers/pmdomain/imx/imx93-blk-ctrl.c | 77 ++-- + drivers/pmdomain/imx/scu-pd.c | 1 + + .../pmdomain/marvell/pxa1908-power-controller.c | 39 +- + drivers/pmdomain/mediatek/mt8189-pm-domains.h | 485 +++++++++++++++++++++ + drivers/pmdomain/mediatek/mtk-mfg-pmdomain.c | 59 +++ + drivers/pmdomain/mediatek/mtk-pm-domains.c | 44 +- + drivers/pmdomain/mediatek/mtk-pm-domains.h | 5 + + drivers/pmdomain/mediatek/mtk-scpsys.c | 10 + + drivers/pmdomain/qcom/cpr.c | 13 +- + drivers/pmdomain/qcom/rpmhpd.c | 20 + + drivers/pmdomain/qcom/rpmpd.c | 2 +- + drivers/pmdomain/rockchip/pm-domains.c | 7 +- + drivers/pmdomain/sunxi/sun55i-pck600.c | 35 +- + drivers/pmdomain/ti/omap_prm.c | 1 + + drivers/pmdomain/ti/ti_sci_pm_domains.c | 5 +- + .../power/allwinner,sun60i-a733-pck-600.h | 18 + + include/dt-bindings/power/marvell,pxa1908-power.h | 1 + + include/dt-bindings/power/mediatek,mt8189-power.h | 38 ++ + include/dt-bindings/power/mt7622-power.h | 1 + + include/linux/pm_domain.h | 5 +- + 27 files changed, 880 insertions(+), 103 deletions(-) + create mode 100644 drivers/pmdomain/mediatek/mt8189-pm-domains.h + create mode 100644 include/dt-bindings/power/allwinner,sun60i-a733-pck-600.h + create mode 100644 include/dt-bindings/power/mediatek,mt8189-power.h +Merging opp/opp/linux-next (3d2398f44a2d4 OPP: Move break out of scoped_guard in dev_pm_opp_xlate_required_opp()) +$ git merge -m Merge branch 'opp/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Merge made by the 'ort' strategy. + drivers/opp/core.c | 2 +- + drivers/opp/debugfs.c | 20 +++++++++++--------- + 2 files changed, 12 insertions(+), 10 deletions(-) +Merging thermal/thermal/linux-next (9124e0e8f3fa3 dt-bindings: thermal: qcom-tsens: Document the SM8750 Temperature Sensor) +$ git merge -m Merge branch 'thermal/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/thermal/qcom-lmh.yaml | 3 +++ + .../devicetree/bindings/thermal/qcom-tsens.yaml | 2 ++ + drivers/thermal/imx91_thermal.c | 4 ++++ + drivers/thermal/sprd_thermal.c | 6 +++--- + drivers/thermal/thermal_of.c | 20 ++++++++++---------- + 5 files changed, 22 insertions(+), 13 deletions(-) +Merging rdma/for-next (05eec2a60c790 RDMA: Remove outdated comments referencing hfi1_destroy_qp()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/infiniband/core/umem.c +Auto-merging drivers/infiniband/hw/irdma/verbs.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + Documentation/driver-api/infiniband.rst | 15 - + Documentation/infiniband/index.rst | 1 - + Documentation/infiniband/opa_vnic.rst | 159 --- + .../translations/zh_CN/infiniband/index.rst | 1 - + .../translations/zh_CN/infiniband/opa_vnic.rst | 156 --- + MAINTAINERS | 8 +- + drivers/infiniband/Kconfig | 2 - + drivers/infiniband/core/Makefile | 6 +- + drivers/infiniband/core/cq.c | 3 + + drivers/infiniband/core/device.c | 6 +- + drivers/infiniband/core/frmr_pools.c | 547 +++++++++ + drivers/infiniband/core/frmr_pools.h | 63 ++ + drivers/infiniband/core/ib_core_uverbs.c | 27 + + drivers/infiniband/core/iter.c | 43 + + drivers/infiniband/core/nldev.c | 298 +++++ + drivers/infiniband/core/rdma_core.c | 4 +- + drivers/infiniband/core/rdma_core.h | 3 + + drivers/infiniband/core/umem.c | 2 +- + drivers/infiniband/core/umem_dmabuf.c | 138 ++- + drivers/infiniband/core/uverbs_cmd.c | 40 +- + drivers/infiniband/core/uverbs_ioctl.c | 87 ++ + drivers/infiniband/core/uverbs_std_types_cq.c | 38 +- + drivers/infiniband/core/uverbs_std_types_device.c | 8 + + drivers/infiniband/core/verbs.c | 59 +- + drivers/infiniband/hw/bnxt_re/Makefile | 2 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 902 ++++++++------- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 25 +- + drivers/infiniband/hw/bnxt_re/main.c | 4 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 305 ++---- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 8 + + drivers/infiniband/hw/bnxt_re/qplib_res.c | 47 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 10 + + drivers/infiniband/hw/bnxt_re/uapi.c | 469 ++++++++ + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/efa/efa.h | 6 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 23 +- + drivers/infiniband/hw/efa/efa_com_cmd.c | 55 +- + drivers/infiniband/hw/efa/efa_com_cmd.h | 3 +- + drivers/infiniband/hw/efa/efa_main.c | 3 +- + drivers/infiniband/hw/efa/efa_verbs.c | 68 +- + drivers/infiniband/hw/erdma/erdma.h | 1 - + drivers/infiniband/hw/erdma/erdma_eq.c | 3 +- + drivers/infiniband/hw/erdma/erdma_main.c | 1 - + drivers/infiniband/hw/erdma/erdma_verbs.c | 2 +- + drivers/infiniband/hw/hfi1/Makefile | 4 +- + drivers/infiniband/hw/hfi1/aspm.c | 2 +- + drivers/infiniband/hw/hfi1/chip.c | 54 +- + drivers/infiniband/hw/hfi1/chip.h | 2 - + drivers/infiniband/hw/hfi1/driver.c | 13 +- + drivers/infiniband/hw/hfi1/hfi.h | 20 - + drivers/infiniband/hw/hfi1/init.c | 4 +- + drivers/infiniband/hw/hfi1/mad.c | 1 - + drivers/infiniband/hw/hfi1/msix.c | 4 +- + drivers/infiniband/hw/hfi1/netdev.h | 8 +- + drivers/infiniband/hw/hfi1/netdev_rx.c | 3 +- + drivers/infiniband/hw/hfi1/qp.c | 1 - + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 14 +- + drivers/infiniband/hw/hfi1/user_exp_rcv.h | 2 +- + drivers/infiniband/hw/hfi1/verbs.c | 2 - + drivers/infiniband/hw/hfi1/vnic.h | 126 --- + drivers/infiniband/hw/hfi1/vnic_main.c | 615 ----------- + drivers/infiniband/hw/hfi1/vnic_sdma.c | 282 ----- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 7 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 13 +- + drivers/infiniband/hw/ionic/ionic_ibdev.h | 2 +- + drivers/infiniband/hw/irdma/ctrl.c | 44 +- + drivers/infiniband/hw/irdma/defs.h | 4 + + drivers/infiniband/hw/irdma/hw.c | 29 +- + drivers/infiniband/hw/irdma/ig3rdma_hw.c | 1 - + drivers/infiniband/hw/irdma/irdma.h | 1 + + drivers/infiniband/hw/irdma/main.h | 2 +- + drivers/infiniband/hw/irdma/type.h | 2 + + drivers/infiniband/hw/irdma/user.h | 4 +- + drivers/infiniband/hw/irdma/verbs.c | 109 +- + drivers/infiniband/hw/mana/main.c | 141 +-- + drivers/infiniband/hw/mana/mana_ib.h | 2 +- + drivers/infiniband/hw/mana/mr.c | 38 +- + drivers/infiniband/hw/mana/qp.c | 25 +- + drivers/infiniband/hw/mlx4/cq.c | 268 +++-- + drivers/infiniband/hw/mlx4/main.c | 5 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 8 +- + drivers/infiniband/hw/mlx4/mr.c | 1 + + drivers/infiniband/hw/mlx5/cq.c | 169 ++- + drivers/infiniband/hw/mlx5/devx.c | 6 +- + drivers/infiniband/hw/mlx5/dm.c | 2 +- + drivers/infiniband/hw/mlx5/fs.c | 6 +- + drivers/infiniband/hw/mlx5/main.c | 170 ++- + drivers/infiniband/hw/mlx5/mem.c | 1 + + drivers/infiniband/hw/mlx5/mlx5_ib.h | 102 +- + drivers/infiniband/hw/mlx5/mr.c | 1158 ++++---------------- + drivers/infiniband/hw/mlx5/odp.c | 19 - + drivers/infiniband/hw/mlx5/qos.c | 2 +- + drivers/infiniband/hw/mlx5/qp.c | 2 +- + drivers/infiniband/hw/mlx5/umr.c | 1 + + drivers/infiniband/hw/mlx5/umr.h | 1 + + drivers/infiniband/hw/mthca/mthca_provider.c | 9 +- + drivers/infiniband/hw/ocrdma/ocrdma.h | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 42 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 2 +- + drivers/infiniband/hw/qedr/verbs.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c | 3 +- + drivers/infiniband/sw/rdmavt/cq.c | 4 +- + drivers/infiniband/sw/rdmavt/cq.h | 2 +- + drivers/infiniband/sw/rdmavt/mcast.c | 1 - + drivers/infiniband/sw/rdmavt/mmap.c | 22 +- + drivers/infiniband/sw/rdmavt/qp.c | 2 +- + drivers/infiniband/sw/rdmavt/vt.c | 10 +- + drivers/infiniband/sw/rxe/Makefile | 3 +- + drivers/infiniband/sw/rxe/rxe.c | 38 +- + drivers/infiniband/sw/rxe/rxe.h | 2 + + drivers/infiniband/sw/rxe/rxe_cq.c | 31 - + drivers/infiniband/sw/rxe/rxe_loc.h | 3 - + drivers/infiniband/sw/rxe/rxe_net.c | 144 ++- + drivers/infiniband/sw/rxe/rxe_net.h | 9 +- + drivers/infiniband/sw/rxe/rxe_ns.c | 124 +++ + drivers/infiniband/sw/rxe/rxe_ns.h | 26 + + drivers/infiniband/sw/rxe/rxe_odp.c | 2 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 56 +- + drivers/infiniband/sw/rxe/rxe_task.c | 2 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 20 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 1 + + drivers/infiniband/ulp/Makefile | 1 - + drivers/infiniband/ulp/opa_vnic/Kconfig | 9 - + drivers/infiniband/ulp/opa_vnic/Makefile | 9 - + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c | 513 --------- + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h | 524 --------- + drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c | 183 ---- + .../infiniband/ulp/opa_vnic/opa_vnic_internal.h | 329 ------ + drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 400 ------- + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 1056 ------------------ + .../infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c | 390 ------- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 68 +- + include/linux/mlx5/device.h | 9 + + include/linux/mlx5/driver.h | 11 - + include/linux/mlx5/mlx5_ifc.h | 23 +- + include/rdma/frmr_pools.h | 39 + + include/rdma/ib_cache.h | 4 +- + include/rdma/ib_umem.h | 65 +- + include/rdma/ib_verbs.h | 194 ++-- + include/rdma/iter.h | 88 ++ + include/rdma/iw_cm.h | 14 +- + include/rdma/opa_port_info.h | 8 +- + include/rdma/opa_vnic.h | 96 -- + include/rdma/rdma_netlink.h | 2 + + include/rdma/rdma_vt.h | 10 + + include/rdma/restrack.h | 4 +- + include/rdma/uverbs_ioctl.h | 101 ++ + include/uapi/rdma/bnxt_re-abi.h | 36 +- + include/uapi/rdma/efa-abi.h | 11 +- + include/uapi/rdma/ib_user_ioctl_verbs.h | 1 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 1 + + include/uapi/rdma/mlx5_user_ioctl_verbs.h | 4 + + include/uapi/rdma/rdma_netlink.h | 22 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/rdma/Makefile | 7 + + tools/testing/selftests/rdma/config | 3 + + tools/testing/selftests/rdma/rxe_ipv6.sh | 63 ++ + .../selftests/rdma/rxe_rping_between_netns.sh | 85 ++ + .../selftests/rdma/rxe_socket_with_netns.sh | 76 ++ + .../selftests/rdma/rxe_test_NETDEV_UNREGISTER.sh | 63 ++ + 166 files changed, 4498 insertions(+), 7758 deletions(-) + delete mode 100644 Documentation/infiniband/opa_vnic.rst + delete mode 100644 Documentation/translations/zh_CN/infiniband/opa_vnic.rst + create mode 100644 drivers/infiniband/core/frmr_pools.c + create mode 100644 drivers/infiniband/core/frmr_pools.h + create mode 100644 drivers/infiniband/core/iter.c + create mode 100644 drivers/infiniband/hw/bnxt_re/uapi.c + delete mode 100644 drivers/infiniband/hw/hfi1/vnic.h + delete mode 100644 drivers/infiniband/hw/hfi1/vnic_main.c + delete mode 100644 drivers/infiniband/hw/hfi1/vnic_sdma.c + create mode 100644 drivers/infiniband/sw/rxe/rxe_ns.c + create mode 100644 drivers/infiniband/sw/rxe/rxe_ns.h + delete mode 100644 drivers/infiniband/ulp/opa_vnic/Kconfig + delete mode 100644 drivers/infiniband/ulp/opa_vnic/Makefile + delete mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c + delete mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.h + delete mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_ethtool.c + delete mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_internal.h + delete mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c + delete mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c + delete mode 100644 drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c + create mode 100644 include/rdma/frmr_pools.h + create mode 100644 include/rdma/iter.h + delete mode 100644 include/rdma/opa_vnic.h + create mode 100644 tools/testing/selftests/rdma/Makefile + create mode 100644 tools/testing/selftests/rdma/config + create mode 100755 tools/testing/selftests/rdma/rxe_ipv6.sh + create mode 100755 tools/testing/selftests/rdma/rxe_rping_between_netns.sh + create mode 100755 tools/testing/selftests/rdma/rxe_socket_with_netns.sh + create mode 100755 tools/testing/selftests/rdma/rxe_test_NETDEV_UNREGISTER.sh +Merging net-next/main (cf0d9080c6f79 Merge branch 'net-hsr-subsystem-cleanups-and-modernization') +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/clk/qcom/Kconfig +Auto-merging drivers/infiniband/Kconfig +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h +Auto-merging drivers/infiniband/hw/mlx5/mr.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mr.c +Auto-merging drivers/infiniband/sw/rxe/rxe_net.c +CONFLICT (content): Merge conflict in drivers/infiniband/sw/rxe/rxe_net.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/microsoft/mana/mana_en.c +Auto-merging drivers/net/vxlan/vxlan_core.c +Auto-merging drivers/net/wireless/ath/ath12k/dp_rx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/scan.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mld/iface.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mld/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mld/mlo.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mld/scan.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mld/scan.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw.c +Auto-merging drivers/net/wireless/virtual/virt_wifi.c +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/skbuff.h +Auto-merging include/net/netmem.h +CONFLICT (content): Merge conflict in include/net/netmem.h +Auto-merging include/net/sock.h +Auto-merging net/bridge/br_arp_nd_proxy.c +Auto-merging net/ipv4/ping.c +Auto-merging net/ipv4/raw.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv6/datagram.c +Auto-merging net/ipv6/icmp.c +Auto-merging net/ipv6/ndisc.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/mpls/af_mpls.c +Auto-merging net/netlink/af_netlink.c +Auto-merging net/qrtr/af_qrtr.c +Auto-merging net/socket.c +Auto-merging net/unix/af_unix.c +Auto-merging security/smack/smack_lsm.c +Auto-merging tools/testing/selftests/tc-testing/tc-tests/infra/qdiscs.json +Resolved 'drivers/infiniband/hw/mlx5/mr.c' using previous resolution. +Resolved 'drivers/infiniband/sw/rxe/rxe_net.c' using previous resolution. +Resolved 'include/net/netmem.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 38b3953f6750a] Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/sysctl/net.rst | 28 + + .../devicetree/bindings/net/cdns,macb.yaml | 90 +- + .../bindings/net/dsa/maxlinear,mxl862xx.yaml | 1 - + .../devicetree/bindings/net/ethernet-phy.yaml | 14 + + Documentation/devicetree/bindings/net/micrel.yaml | 6 +- + .../bindings/net/nuvoton,ma35d1-dwmac.yaml | 140 + + .../devicetree/bindings/net/nxp,s32-dwmac.yaml | 47 +- + .../devicetree/bindings/net/qcom,ipa.yaml | 11 + + .../devicetree/bindings/net/snps,dwmac.yaml | 21 +- + .../devicetree/bindings/net/spacemit,k3-dwmac.yaml | 102 + + .../devicetree/bindings/sram/qcom,imem.yaml | 14 + + Documentation/netlink/genetlink.yaml | 2 +- + Documentation/netlink/netlink-raw.yaml | 11 +- + Documentation/netlink/specs/devlink.yaml | 58 + + Documentation/netlink/specs/ethtool.yaml | 25 +- + Documentation/netlink/specs/nftables.yaml | 691 ++- + Documentation/netlink/specs/ovpn.yaml | 23 +- + .../device_drivers/ethernet/marvell/octeontx2.rst | 2 +- + .../ethernet/mellanox/mlx5/kconfig.rst | 4 +- + .../networking/devlink/devlink-shared.rst | 97 + + Documentation/networking/devlink/index.rst | 1 + + Documentation/networking/ethtool-netlink.rst | 23 +- + Documentation/networking/ip-sysctl.rst | 40 +- + .../net_cachelines/netns_ipv4_sysctl.rst | 2 + + .../networking/net_cachelines/tcp_sock.rst | 1 + + Documentation/networking/scaling.rst | 13 +- + Documentation/networking/smc-sysctl.rst | 43 +- + Documentation/networking/tls-handshake.rst | 2 +- + Documentation/process/maintainer-netdev.rst | 10 +- + MAINTAINERS | 8 +- + arch/arm64/configs/defconfig | 2 +- + arch/m68k/configs/amiga_defconfig | 44 +- + arch/m68k/configs/apollo_defconfig | 44 +- + arch/m68k/configs/atari_defconfig | 44 +- + arch/m68k/configs/bvme6000_defconfig | 44 +- + arch/m68k/configs/hp300_defconfig | 44 +- + arch/m68k/configs/mac_defconfig | 44 +- + arch/m68k/configs/multi_defconfig | 44 +- + arch/m68k/configs/mvme147_defconfig | 44 +- + arch/m68k/configs/mvme16x_defconfig | 44 +- + arch/m68k/configs/q40_defconfig | 44 +- + arch/m68k/configs/sun3_defconfig | 44 +- + arch/m68k/configs/sun3x_defconfig | 44 +- + drivers/base/regmap/Kconfig | 2 +- + drivers/clk/qcom/Kconfig | 2 +- + drivers/dibs/dibs_main.c | 14 +- + drivers/dpll/zl3073x/Makefile | 4 +- + drivers/dpll/zl3073x/chan.c | 165 + + drivers/dpll/zl3073x/chan.h | 179 + + drivers/dpll/zl3073x/core.c | 152 +- + drivers/dpll/zl3073x/core.h | 71 +- + drivers/dpll/zl3073x/dpll.c | 514 +-- + drivers/dpll/zl3073x/dpll.h | 6 +- + drivers/dpll/zl3073x/i2c.c | 37 +- + drivers/dpll/zl3073x/out.c | 27 +- + drivers/dpll/zl3073x/out.h | 21 +- + drivers/dpll/zl3073x/ref.c | 58 +- + drivers/dpll/zl3073x/ref.h | 33 +- + drivers/dpll/zl3073x/regs.h | 14 + + drivers/dpll/zl3073x/spi.c | 37 +- + drivers/dpll/zl3073x/synth.h | 16 +- + drivers/gpio/TODO | 28 - + drivers/gpio/gpiolib-of.c | 31 +- + drivers/infiniband/Kconfig | 1 - + drivers/infiniband/core/addr.c | 3 +- + drivers/infiniband/hw/mlx5/ib_rep.c | 24 +- + drivers/infiniband/hw/mlx5/main.c | 21 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 1 - + drivers/infiniband/hw/mlx5/mr.c | 1 - + drivers/infiniband/hw/ocrdma/Kconfig | 2 +- + drivers/infiniband/sw/rxe/rxe_net.c | 6 +- + drivers/infiniband/ulp/ipoib/Kconfig | 2 +- + drivers/net/Kconfig | 10 +- + drivers/net/bonding/bond_main.c | 10 +- + drivers/net/bonding/bond_netlink.c | 9 + + drivers/net/bonding/bond_procfs.c | 11 +- + drivers/net/bonding/bonding_priv.h | 22 - + drivers/net/dsa/microchip/ksz9477.c | 68 +- + drivers/net/dsa/microchip/ksz_common.c | 2 +- + drivers/net/dsa/microchip/ksz_common.h | 4 +- + drivers/net/dsa/mv88e6xxx/Makefile | 2 + + drivers/net/dsa/mv88e6xxx/chip.c | 35 + + drivers/net/dsa/mv88e6xxx/chip.h | 52 + + drivers/net/dsa/mv88e6xxx/port.c | 28 +- + drivers/net/dsa/mv88e6xxx/port.h | 7 +- + drivers/net/dsa/mv88e6xxx/tcam.c | 338 ++ + drivers/net/dsa/mv88e6xxx/tcam.h | 41 + + drivers/net/dsa/mv88e6xxx/tcflower.c | 167 + + drivers/net/dsa/mv88e6xxx/tcflower.h | 14 + + drivers/net/dsa/mxl862xx/Kconfig | 1 + + drivers/net/dsa/mxl862xx/mxl862xx-host.c | 371 +- + drivers/net/dsa/mxl862xx/mxl862xx-host.h | 2 + + drivers/net/dsa/mxl862xx/mxl862xx.c | 43 +- + drivers/net/dsa/mxl862xx/mxl862xx.h | 2 + + drivers/net/dsa/qca/qca8k.h | 2 +- + drivers/net/ethernet/airoha/airoha_eth.c | 150 +- + drivers/net/ethernet/airoha/airoha_eth.h | 5 +- + drivers/net/ethernet/airoha/airoha_ppe.c | 25 +- + drivers/net/ethernet/airoha/airoha_regs.h | 12 +- + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 8 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 127 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 114 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 18 + + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 91 +- + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 22 +- + drivers/net/ethernet/amd/xgbe/xgbe-platform.c | 14 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 34 +- + .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 55 +- + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 3 + + .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 7 + + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 80 + + drivers/net/ethernet/broadcom/Kconfig | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 72 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 27 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 55 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 57 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 10 + + drivers/net/ethernet/cadence/macb.h | 28 + + drivers/net/ethernet/cadence/macb_main.c | 496 ++- + drivers/net/ethernet/chelsio/Kconfig | 2 +- + .../ethernet/chelsio/inline_crypto/chtls/chtls.h | 2 +- + .../chelsio/inline_crypto/chtls/chtls_io.c | 8 +- + drivers/net/ethernet/cisco/enic/enic.h | 39 + + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 155 +- + drivers/net/ethernet/freescale/Makefile | 3 +- + drivers/net/ethernet/freescale/dpaa2/Kconfig | 4 + + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 61 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.c | 409 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-mac.h | 27 +- + .../freescale/dpaa2/dpaa2-switch-ethtool.c | 48 +- + drivers/net/ethernet/freescale/dpaa2/dpmac-cmd.h | 11 +- + drivers/net/ethernet/freescale/dpaa2/dpmac.c | 31 +- + drivers/net/ethernet/freescale/dpaa2/dpmac.h | 94 +- + drivers/net/ethernet/freescale/enetc/ntmp.c | 2 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 4 +- + drivers/net/ethernet/freescale/ucc_geth.c | 3 +- + drivers/net/ethernet/google/gve/gve.h | 18 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 30 +- + .../net/ethernet/google/gve/gve_buffer_mgmt_dqo.c | 2 +- + drivers/net/ethernet/google/gve/gve_main.c | 56 +- + drivers/net/ethernet/google/gve/gve_rx.c | 5 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 43 +- + drivers/net/ethernet/google/gve/gve_tx.c | 5 +- + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 37 +- + drivers/net/ethernet/huawei/hinic3/Makefile | 1 + + drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c | 195 +- + drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.h | 15 + + drivers/net/ethernet/huawei/hinic3/hinic3_common.c | 6 +- + drivers/net/ethernet/huawei/hinic3/hinic3_common.h | 1 + + drivers/net/ethernet/huawei/hinic3/hinic3_csr.h | 2 + + drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c | 65 + + drivers/net/ethernet/huawei/hinic3/hinic3_eqs.h | 5 + + .../net/ethernet/huawei/hinic3/hinic3_ethtool.c | 425 ++ + drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.c | 47 +- + drivers/net/ethernet/huawei/hinic3/hinic3_hw_cfg.h | 8 + + .../net/ethernet/huawei/hinic3/hinic3_hw_comm.c | 69 + + .../net/ethernet/huawei/hinic3/hinic3_hw_comm.h | 2 + + .../net/ethernet/huawei/hinic3/hinic3_hw_intf.h | 12 + + drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.c | 9 + + drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.h | 1 + + drivers/net/ethernet/huawei/hinic3/hinic3_hwif.c | 23 +- + drivers/net/ethernet/huawei/hinic3/hinic3_lld.c | 1 + + drivers/net/ethernet/huawei/hinic3/hinic3_main.c | 3 + + drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c | 39 +- + drivers/net/ethernet/huawei/hinic3/hinic3_mbox.h | 4 + + .../ethernet/huawei/hinic3/hinic3_mgmt_interface.h | 16 +- + .../net/ethernet/huawei/hinic3/hinic3_netdev_ops.c | 16 +- + .../net/ethernet/huawei/hinic3/hinic3_nic_cfg.c | 77 + + .../net/ethernet/huawei/hinic3/hinic3_nic_cfg.h | 110 + + .../net/ethernet/huawei/hinic3/hinic3_nic_dev.h | 3 + + .../net/ethernet/huawei/hinic3/hinic3_pci_id_tbl.h | 1 + + drivers/net/ethernet/huawei/hinic3/hinic3_rss.c | 2 +- + drivers/net/ethernet/huawei/hinic3/hinic3_rx.c | 15 + + drivers/net/ethernet/huawei/hinic3/hinic3_rx.h | 3 + + drivers/net/ethernet/ibm/ibmveth.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 21 +- + drivers/net/ethernet/intel/i40e/i40e_hmc.h | 2 + + drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 27 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 56 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 2 +- + drivers/net/ethernet/litex/litex_liteeth.c | 21 +- + drivers/net/ethernet/marvell/mvneta.c | 3 + + drivers/net/ethernet/marvell/octeontx2/Kconfig | 1 + + drivers/net/ethernet/marvell/octeontx2/af/Makefile | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 2 +- + .../ethernet/marvell/octeontx2/af/cn20k/debugfs.c | 273 ++ + .../ethernet/marvell/octeontx2/af/cn20k/debugfs.h | 3 + + .../marvell/octeontx2/af/cn20k/mbox_init.c | 17 + + .../net/ethernet/marvell/octeontx2/af/cn20k/npc.c | 4522 ++++++++++++++++++++ + .../net/ethernet/marvell/octeontx2/af/cn20k/npc.h | 340 ++ + .../net/ethernet/marvell/octeontx2/af/cn20k/reg.h | 65 + + drivers/net/ethernet/marvell/octeontx2/af/common.h | 4 - + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 172 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 2 + + .../ethernet/marvell/octeontx2/af/npc_profile.h | 84 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 114 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 18 +- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 104 +- + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 95 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 5 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 600 ++- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.h | 21 + + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 708 ++- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.h | 14 +- + .../ethernet/marvell/octeontx2/af/rvu_npc_hash.c | 120 +- + .../ethernet/marvell/octeontx2/af/rvu_npc_hash.h | 2 +- + .../ethernet/marvell/octeontx2/nic/cn10k_macsec.c | 53 +- + drivers/net/ethernet/marvell/octeontx2/nic/cn20k.c | 266 ++ + drivers/net/ethernet/marvell/octeontx2/nic/cn20k.h | 14 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 35 + + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 267 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 79 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 34 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 5 +- + .../mellanox/mlx5/core/diag/fs_tracepoint.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 9 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 413 +- + .../net/ethernet/mellanox/mlx5/core/en/params.h | 45 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/neigh.c | 9 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 3 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 3 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/pool.c | 23 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 59 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.h | 6 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 1 - + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 218 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 36 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 30 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 14 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 103 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 17 +- + .../net/ethernet/mellanox/mlx5/core/lag/debugfs.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 704 ++- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h | 49 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/mp.c | 20 +- + .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 15 +- + .../net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 28 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 40 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/sd.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 17 + + .../net/ethernet/mellanox/mlx5/core/sh_devlink.c | 61 + + .../net/ethernet/mellanox/mlx5/core/sh_devlink.h | 12 + + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 - + drivers/net/ethernet/meta/fbnic/fbnic.h | 35 + + drivers/net/ethernet/meta/fbnic/fbnic_csr.c | 128 + + drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 30 + + drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 139 + + drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 100 + + drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 27 + + drivers/net/ethernet/meta/fbnic/fbnic_hw_stats.h | 1 + + drivers/net/ethernet/meta/fbnic/fbnic_irq.c | 156 + + drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 111 + + drivers/net/ethernet/meta/fbnic/fbnic_mac.h | 27 + + drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 5 + + drivers/net/ethernet/meta/fbnic/fbnic_tlv.c | 276 ++ + drivers/net/ethernet/meta/fbnic/fbnic_tlv.h | 27 + + drivers/net/ethernet/microchip/lan743x_ethtool.c | 8 + + drivers/net/ethernet/microchip/lan743x_main.c | 15 +- + drivers/net/ethernet/microchip/lan743x_main.h | 1 + + .../ethernet/microchip/sparx5/sparx5_calendar.c | 15 +- + .../net/ethernet/microchip/sparx5/sparx5_ethtool.c | 9 +- + .../ethernet/microchip/sparx5/sparx5_mactable.c | 34 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 253 +- + .../net/ethernet/microchip/sparx5/sparx5_main.h | 12 +- + drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 18 + + .../ethernet/microchip/sparx5/sparx5_vcap_impl.c | 2 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 150 +- + drivers/net/ethernet/microsoft/mana/hw_channel.c | 12 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 108 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 75 +- + drivers/net/ethernet/netronome/Kconfig | 1 - + drivers/net/ethernet/netronome/nfp/flower/action.c | 2 +- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 7 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 9 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 6 + + drivers/net/ethernet/qlogic/qed/qed_l2.c | 53 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 2 +- + drivers/net/ethernet/realtek/r8169.h | 1 + + drivers/net/ethernet/realtek/r8169_main.c | 7 + + drivers/net/ethernet/realtek/r8169_phy_config.c | 26 + + drivers/net/ethernet/renesas/ravb_main.c | 1 + + drivers/net/ethernet/rocker/rocker_ofdpa.c | 31 +- + drivers/net/ethernet/sfc/tc_counters.c | 2 +- + drivers/net/ethernet/sfc/tc_encap_actions.c | 5 +- + drivers/net/ethernet/spacemit/k1_emac.c | 3 - + drivers/net/ethernet/stmicro/stmmac/Kconfig | 24 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 2 + + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 21 +- + drivers/net/ethernet/stmicro/stmmac/descs.h | 2 + + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 22 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 19 +- + .../net/ethernet/stmicro/stmmac/dwmac-loongson.c | 20 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 8 +- + .../net/ethernet/stmicro/stmmac/dwmac-motorcomm.c | 5 - + .../net/ethernet/stmicro/stmmac/dwmac-nuvoton.c | 136 + + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 160 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c | 38 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 63 +- + .../net/ethernet/stmicro/stmmac/dwmac-spacemit.c | 227 + + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 11 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 13 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 12 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 22 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 11 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 10 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 27 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 33 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 8 - + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 54 +- + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 2 - + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 24 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 30 +- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 38 +- + drivers/net/ethernet/stmicro/stmmac/hwif.c | 13 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 25 +- + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 39 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 56 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1106 +++-- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 113 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 11 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.c | 156 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h | 14 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 107 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 21 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 4 +- + drivers/net/ethernet/ti/am65-cpts.c | 23 +- + drivers/net/ethernet/ti/am65-cpts.h | 8 +- + drivers/net/ethernet/ti/davinci_emac.c | 39 +- + drivers/net/ethernet/ti/icssg/icssg_classifier.c | 69 +- + drivers/net/ethernet/ti/icssg/icssg_prueth.c | 255 +- + drivers/net/ethernet/ti/icssg/icssg_prueth.h | 2 + + drivers/net/fjes/fjes_main.c | 120 +- + drivers/net/geneve.c | 1 - + drivers/net/gtp.c | 2 +- + drivers/net/ieee802154/atusb.c | 5 +- + drivers/net/ipa/ipa_data.h | 9 +- + drivers/net/ipa/ipa_mem.c | 24 +- + drivers/net/macvlan.c | 12 +- + drivers/net/mdio/Kconfig | 1 - + drivers/net/mdio/mdio-gpio.c | 12 +- + drivers/net/mdio/mdio-mvusb.c | 14 +- + drivers/net/mdio/mdio-xgene.c | 2 +- + drivers/net/netdevsim/Makefile | 2 +- + drivers/net/netdevsim/bus.c | 2 +- + drivers/net/netdevsim/netdev.c | 51 - + drivers/net/netdevsim/netdevsim.h | 3 + + drivers/net/netdevsim/tc.c | 79 + + drivers/net/ntb_netdev.c | 542 ++- + drivers/net/ovpn/crypto_aead.c | 162 +- + drivers/net/ovpn/io.c | 8 +- + drivers/net/ovpn/netlink-gen.c | 13 +- + drivers/net/ovpn/netlink-gen.h | 6 +- + drivers/net/ovpn/netlink.c | 98 +- + drivers/net/ovpn/netlink.h | 2 + + drivers/net/ovpn/peer.c | 9 +- + drivers/net/ovpn/peer.h | 4 +- + drivers/net/ovpn/pktid.c | 11 +- + drivers/net/ovpn/pktid.h | 2 +- + drivers/net/ovpn/skb.h | 13 +- + drivers/net/ovpn/tcp.c | 2 +- + drivers/net/ovpn/udp.c | 3 +- + drivers/net/phy/Kconfig | 6 - + drivers/net/phy/Makefile | 6 +- + drivers/net/phy/mdio-private.h | 11 - + drivers/net/phy/mdio_bus.c | 412 -- + drivers/net/phy/mdio_bus_provider.c | 319 ++ + drivers/net/phy/mdio_device.c | 171 +- + drivers/net/phy/micrel.c | 152 + + drivers/net/phy/mxl-gpy.c | 66 +- + drivers/net/phy/phy_device.c | 51 +- + drivers/net/phy/phy_package.c | 4 +- + drivers/net/phy/phylib-internal.h | 7 + + drivers/net/phy/phylink.c | 13 +- + drivers/net/phy/realtek/Kconfig | 1 + + drivers/net/phy/realtek/realtek_main.c | 99 + + drivers/net/phy/vitesse.c | 41 + + drivers/net/ppp/ppp_async.c | 2 +- + drivers/net/ppp/ppp_generic.c | 215 +- + drivers/net/ppp/ppp_synctty.c | 2 +- + drivers/net/ppp/pppoe.c | 81 +- + drivers/net/ppp/pppox.c | 3 - + drivers/net/team/team_core.c | 77 +- + drivers/net/usb/cdc_ether.c | 54 +- + drivers/net/usb/cdc_mbim.c | 17 +- + drivers/net/usb/lan78xx.c | 9 +- + drivers/net/usb/r8152.c | 50 +- + drivers/net/virtio_net.c | 560 +-- + drivers/net/vmxnet3/vmxnet3_drv.c | 4 +- + drivers/net/vrf.c | 82 +- + drivers/net/vxlan/vxlan_core.c | 11 +- + drivers/net/vxlan/vxlan_multicast.c | 6 +- + drivers/net/wan/fsl_ucc_hdlc.c | 3 +- + drivers/net/wireguard/socket.c | 3 +- + drivers/net/wireless/ath/ath10k/usb.c | 8 +- + drivers/net/wireless/ath/ath11k/ahb.c | 10 +- + drivers/net/wireless/ath/ath11k/mac.c | 36 +- + drivers/net/wireless/ath/ath12k/Makefile | 1 + + drivers/net/wireless/ath/ath12k/ahb.h | 4 +- + drivers/net/wireless/ath/ath12k/core.c | 23 +- + drivers/net/wireless/ath/ath12k/core.h | 5 +- + drivers/net/wireless/ath/ath12k/dp_htt.c | 24 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 2 - + drivers/net/wireless/ath/ath12k/dp_rx.h | 2 - + drivers/net/wireless/ath/ath12k/hal.h | 31 +- + drivers/net/wireless/ath/ath12k/mac.c | 81 +- + drivers/net/wireless/ath/ath12k/qmi.c | 2 +- + drivers/net/wireless/ath/ath12k/thermal.c | 124 + + drivers/net/wireless/ath/ath12k/thermal.h | 40 + + drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c | 76 +- + drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c | 25 +- + drivers/net/wireless/ath/ath12k/wifi7/hw.c | 6 +- + drivers/net/wireless/ath/ath12k/wmi.c | 115 +- + drivers/net/wireless/ath/ath12k/wmi.h | 14 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 25 +- + drivers/net/wireless/ath/ath6kl/main.c | 4 +- + drivers/net/wireless/ath/ath6kl/usb.c | 16 +- + drivers/net/wireless/ath/ath6kl/wmi.h | 11 - + drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 4 - + drivers/net/wireless/ath/wil6210/cfg80211.c | 33 +- + drivers/net/wireless/ath/wil6210/main.c | 3 +- + drivers/net/wireless/ath/wil6210/wmi.c | 5 +- + drivers/net/wireless/atmel/at76c50x-usb.c | 12 +- + drivers/net/wireless/broadcom/b43/dma.c | 18 +- + drivers/net/wireless/broadcom/b43/dma.h | 4 +- + drivers/net/wireless/broadcom/b43/phy_n.c | 24 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 41 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/intel/iwlegacy/3945.h | 4 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + drivers/net/wireless/intel/iwlegacy/commands.h | 9 +- + drivers/net/wireless/intel/iwlegacy/common.h | 4 +- + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 132 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 28 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 3 +- + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 167 +- + drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 6 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 18 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 37 +- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 45 + + drivers/net/wireless/intel/iwlwifi/fw/api/stats.h | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/dump.c | 69 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 15 + + drivers/net/wireless/intel/iwlwifi/fw/img.c | 32 +- + drivers/net/wireless/intel/iwlwifi/fw/img.h | 8 + + drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 151 +- + drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 14 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 10 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 238 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 141 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 1 - + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 23 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 9 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 10 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 20 +- + drivers/net/wireless/intel/iwlwifi/mld/constants.h | 1 - + drivers/net/wireless/intel/iwlwifi/mld/fw.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mld/iface.c | 22 +- + drivers/net/wireless/intel/iwlwifi/mld/iface.h | 15 +- + drivers/net/wireless/intel/iwlwifi/mld/link.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mld/link.h | 2 + + .../net/wireless/intel/iwlwifi/mld/low_latency.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 52 +- + drivers/net/wireless/intel/iwlwifi/mld/mld.h | 6 +- + drivers/net/wireless/intel/iwlwifi/mld/mlo.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mld/nan.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mld/nan.h | 5 +- + drivers/net/wireless/intel/iwlwifi/mld/phy.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mld/power.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mld/ptp.c | 4 +- + .../net/wireless/intel/iwlwifi/mld/regulatory.c | 178 +- + .../net/wireless/intel/iwlwifi/mld/regulatory.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mld/rx.c | 25 +- + drivers/net/wireless/intel/iwlwifi/mld/scan.c | 224 +- + drivers/net/wireless/intel/iwlwifi/mld/scan.h | 2 + + drivers/net/wireless/intel/iwlwifi/mld/sta.c | 50 +- + drivers/net/wireless/intel/iwlwifi/mld/sta.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mld/stats.c | 31 +- + .../net/wireless/intel/iwlwifi/mld/tests/utils.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mld/time_sync.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mld/tlc.c | 78 +- + drivers/net/wireless/intel/iwlwifi/mld/tlc.h | 3 + + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 157 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-key.c | 46 - + drivers/net/wireless/intel/iwlwifi/mvm/mld-mac.c | 18 +- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 132 - + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 291 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 5 - + drivers/net/wireless/intel/iwlwifi/mvm/ptp.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 4 - + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/time-sync.c | 6 +- + .../intel/iwlwifi/pcie/gen1_2/trans-gen2.c | 13 +- + .../net/wireless/intel/iwlwifi/pcie/gen1_2/trans.c | 2 +- + drivers/net/wireless/marvell/libertas/cfg.c | 8 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 35 +- + drivers/net/wireless/marvell/libertas/if_usb.h | 3 + + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 2 - + drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 1 + + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 36 +- + drivers/net/wireless/marvell/mwifiex/init.c | 2 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 12 +- + drivers/net/wireless/marvell/mwifiex/uap_event.c | 7 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 4 - + drivers/net/wireless/marvell/mwl8k.c | 4 +- + drivers/net/wireless/mediatek/mt76/channel.c | 39 +- + drivers/net/wireless/mediatek/mt76/dma.c | 33 +- + drivers/net/wireless/mediatek/mt76/dma.h | 4 +- + drivers/net/wireless/mediatek/mt76/eeprom.c | 154 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 230 +- + drivers/net/wireless/mediatek/mt76/mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 47 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 15 - + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 47 + + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 5 +- + drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 2 - + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 11 +- + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 34 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 46 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 15 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 13 - + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 70 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 11 + + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 4 + + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 29 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 3 + + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 16 + + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 70 +- + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 4 + + drivers/net/wireless/mediatek/mt76/mt7925/init.c | 2 + + drivers/net/wireless/mediatek/mt76/mt7925/mac.c | 22 +- + drivers/net/wireless/mediatek/mt76/mt7925/main.c | 394 +- + drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 194 +- + drivers/net/wireless/mediatek/mt76/mt7925/mcu.h | 7 + + drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h | 13 +- + drivers/net/wireless/mediatek/mt76/mt7925/regd.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt792x.h | 7 + + drivers/net/wireless/mediatek/mt76/mt792x_core.c | 14 +- + drivers/net/wireless/mediatek/mt76/mt792x_dma.c | 18 +- + drivers/net/wireless/mediatek/mt76/mt792x_mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x_regs.h | 6 + + drivers/net/wireless/mediatek/mt76/mt792x_usb.c | 51 +- + .../net/wireless/mediatek/mt76/mt7996/debugfs.c | 36 +- + drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 208 +- + drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c | 64 +- + drivers/net/wireless/mediatek/mt76/mt7996/init.c | 110 +- + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 165 +- + drivers/net/wireless/mediatek/mt76/mt7996/mac.h | 5 - + drivers/net/wireless/mediatek/mt76/mt7996/main.c | 439 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 829 +++- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 112 +- + drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 70 +- + drivers/net/wireless/mediatek/mt76/mt7996/npu.c | 469 +- + drivers/net/wireless/mediatek/mt76/mt7996/regs.h | 11 + + drivers/net/wireless/mediatek/mt76/npu.c | 37 +- + drivers/net/wireless/mediatek/mt76/scan.c | 70 +- + drivers/net/wireless/mediatek/mt76/tx.c | 34 +- + drivers/net/wireless/mediatek/mt7601u/mcu.c | 15 +- + drivers/net/wireless/mediatek/mt7601u/usb.h | 1 + + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 44 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 38 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 4 +- + drivers/net/wireless/quantenna/qtnfmac/event.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 12 +- + drivers/net/wireless/realtek/rtl8xxxu/core.c | 14 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 28 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 17 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 2 + + drivers/net/wireless/rsi/rsi_common.h | 1 + + drivers/net/wireless/silabs/wfx/data_rx.c | 8 +- + drivers/net/wireless/virtual/mac80211_hwsim.c | 240 +- + drivers/net/wireless/virtual/mac80211_hwsim.h | 2 + + drivers/net/wireless/virtual/virt_wifi.c | 12 +- + drivers/nfc/microread/i2c.c | 1 - + drivers/nfc/nfcmrvl/fw_dnld.c | 2 +- + drivers/nfc/nfcmrvl/main.c | 47 +- + drivers/nfc/nfcmrvl/nfcmrvl.h | 4 +- + drivers/nfc/nfcmrvl/uart.c | 23 +- + drivers/nfc/nfcmrvl/usb.c | 2 +- + drivers/nfc/nxp-nci/firmware.c | 2 +- + drivers/nfc/pn533/usb.c | 4 +- + drivers/nfc/pn544/i2c.c | 2 +- + drivers/nfc/port100.c | 4 +- + drivers/nfc/s3fwrn5/firmware.c | 2 +- + drivers/nfc/s3fwrn5/i2c.c | 54 +- + drivers/nfc/s3fwrn5/phy_common.c | 11 +- + drivers/nfc/s3fwrn5/phy_common.h | 5 +- + drivers/nfc/s3fwrn5/uart.c | 43 +- + drivers/phy/broadcom/Kconfig | 4 +- + drivers/phy/qualcomm/phy-qcom-sgmii-eth.c | 62 +- + drivers/ptp/ptp_ocp.c | 365 +- + drivers/ptp/ptp_vmw.c | 23 +- + drivers/scsi/bnx2fc/Kconfig | 1 - + drivers/scsi/bnx2i/Kconfig | 1 - + drivers/scsi/cxgbi/cxgb3i/Kconfig | 2 +- + drivers/scsi/cxgbi/cxgb4i/Kconfig | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 33 +- + drivers/vhost/vsock.c | 13 + + fs/dlm/Kconfig | 2 +- + fs/gfs2/Kconfig | 2 +- + include/linux/atmdev.h | 6 +- + include/linux/ethtool.h | 21 +- + include/linux/icmpv6.h | 29 +- + include/linux/ieee80211-eht.h | 4 +- + include/linux/ieee80211-ht.h | 3 + + include/linux/ieee80211-nan.h | 7 +- + include/linux/ieee80211-uhr.h | 275 +- + include/linux/ieee80211.h | 94 +- + include/linux/if_pppox.h | 6 - + include/linux/if_team.h | 3 +- + include/linux/indirect_call_wrapper.h | 2 +- + include/linux/mdio-gpio.h | 9 - + include/linux/mdio.h | 2 - + include/linux/micrel_phy.h | 1 + + include/linux/mlx5/device.h | 1 + + include/linux/mlx5/driver.h | 1 + + include/linux/mlx5/fs.h | 10 +- + include/linux/mlx5/lag.h | 21 + + include/linux/mlx5/mlx5_ifc.h | 26 +- + include/linux/mroute_base.h | 9 +- + include/linux/net.h | 2 + + include/linux/netdevice.h | 18 +- + include/linux/netfilter_ipv6.h | 102 +- + include/linux/of_gpio.h | 38 - + include/linux/phy.h | 5 - + include/linux/platform_data/mdio-gpio.h | 14 - + include/linux/ppp_channel.h | 6 +- + include/linux/ptr_ring.h | 8 +- + include/linux/rculist_bl.h | 49 +- + include/linux/skbuff.h | 13 +- + include/linux/socket.h | 2 +- + include/linux/stmmac.h | 124 +- + include/linux/tcp.h | 14 +- + include/linux/udp.h | 10 +- + include/net/af_vsock.h | 9 + + include/net/bonding.h | 10 +- + include/net/cfg80211.h | 328 +- + include/net/devlink.h | 10 + + include/net/dropreason-core.h | 51 +- + include/net/dropreason-qdisc.h | 114 + + include/net/dropreason.h | 6 + + include/net/hotdata.h | 5 +- + include/net/inet6_connection_sock.h | 4 +- + include/net/inet6_hashtables.h | 2 + + include/net/inet_common.h | 3 +- + include/net/inet_connection_sock.h | 3 +- + include/net/inet_hashtables.h | 1 - + include/net/ip.h | 10 +- + include/net/ip6_checksum.h | 2 - + include/net/ip6_fib.h | 35 +- + include/net/ip6_route.h | 41 +- + include/net/ip6_tunnel.h | 2 +- + include/net/ip_vs.h | 404 +- + include/net/ipv6.h | 20 +- + include/net/ipv6_stubs.h | 102 - + include/net/mac80211.h | 19 +- + include/net/mana/gdma.h | 20 +- + include/net/mana/mana.h | 18 +- + include/net/ndisc.h | 31 +- + include/net/netdev_rx_queue.h | 3 +- + include/net/netfilter/nf_tables.h | 32 - + include/net/netfilter/nft_fib.h | 2 - + include/net/netfilter/nft_meta.h | 3 - + include/net/netmem.h | 39 +- + include/net/netns/ipv4.h | 9 +- + include/net/netns/ipv6.h | 2 +- + include/net/netns/mib.h | 5 - + include/net/netns/vsock.h | 2 + + include/net/page_pool/types.h | 11 +- + include/net/ping.h | 5 +- + include/net/rps-types.h | 24 + + include/net/rps.h | 49 +- + include/net/sch_generic.h | 47 +- + include/net/sock.h | 17 +- + include/net/switchdev.h | 1 + + include/net/tc_wrapper.h | 47 +- + include/net/tcp.h | 96 +- + include/net/transp_v6.h | 3 - + include/net/udp.h | 89 +- + include/net/udp_tunnel.h | 3 +- + include/net/udplite.h | 88 - + include/net/xsk_buff_pool.h | 7 - + include/trace/events/devlink.h | 36 +- + include/trace/events/qdisc.h | 51 + + include/uapi/linux/devlink.h | 4 + + include/uapi/linux/ethtool.h | 2 +- + include/uapi/linux/ethtool_netlink_generated.h | 3 + + include/uapi/linux/if_link.h | 2 + + include/uapi/linux/if_pppox.h | 14 +- + include/uapi/linux/inet_diag.h | 9 + + include/uapi/linux/nfc.h | 6 +- + include/uapi/linux/nl80211.h | 272 +- + include/uapi/linux/openvswitch.h | 76 +- + include/uapi/linux/ovpn.h | 2 + + include/uapi/linux/seg6_iptunnel.h | 1 + + include/uapi/linux/udp.h | 2 + + net/atm/pppoatm.c | 2 +- + net/bridge/Kconfig | 1 - + net/bridge/br_arp_nd_proxy.c | 3 +- + net/bridge/br_netfilter_hooks.c | 12 +- + net/bridge/br_netfilter_ipv6.c | 7 +- + net/bridge/br_private.h | 10 + + net/bridge/br_switchdev.c | 15 + + net/bridge/br_vlan.c | 7 +- + net/bridge/netfilter/nft_meta_bridge.c | 20 - + net/bridge/netfilter/nft_reject_bridge.c | 1 - + net/core/dev.c | 181 +- + net/core/failover.c | 14 +- + net/core/fib_notifier.c | 1 + + net/core/filter.c | 75 +- + net/core/hotdata.c | 1 - + net/core/link_watch.c | 2 +- + net/core/lwt_bpf.c | 10 +- + net/core/neighbour.c | 1 - + net/core/net-sysfs.c | 87 +- + net/core/net-sysfs.h | 1 + + net/core/scm.c | 12 +- + net/core/skbuff.c | 16 +- + net/core/sock.c | 45 +- + net/core/sock_diag.c | 3 +- + net/core/sysctl_net_core.c | 117 +- + net/devlink/Makefile | 2 +- + net/devlink/core.c | 91 +- + net/devlink/dev.c | 8 +- + net/devlink/devl_internal.h | 34 +- + net/devlink/netlink.c | 52 +- + net/devlink/netlink_gen.c | 355 +- + net/devlink/port.c | 19 +- + net/devlink/sh_dev.c | 161 + + net/dns_resolver/dns_key.c | 16 +- + net/dns_resolver/dns_query.c | 14 +- + net/dns_resolver/internal.h | 14 +- + net/ethtool/bitset.c | 3 +- + net/ethtool/bitset.h | 3 + + net/ethtool/cabletest.c | 3 +- + net/ethtool/channels.c | 2 +- + net/ethtool/coalesce.c | 17 +- + net/ethtool/common.c | 185 +- + net/ethtool/debug.c | 4 +- + net/ethtool/eee.c | 4 +- + net/ethtool/eeprom.c | 15 +- + net/ethtool/features.c | 4 +- + net/ethtool/fec.c | 4 +- + net/ethtool/ioctl.c | 10 +- + net/ethtool/linkinfo.c | 2 +- + net/ethtool/linkmodes.c | 4 +- + net/ethtool/linkstate.c | 5 +- + net/ethtool/module.c | 4 +- + net/ethtool/mse.c | 2 +- + net/ethtool/netlink.c | 6 +- + net/ethtool/netlink.h | 1 + + net/ethtool/pause.c | 7 +- + net/ethtool/phc_vclocks.c | 2 +- + net/ethtool/phy.c | 6 +- + net/ethtool/plca.c | 2 +- + net/ethtool/privflags.c | 4 +- + net/ethtool/pse-pd.c | 7 +- + net/ethtool/rings.c | 2 +- + net/ethtool/rss.c | 30 +- + net/ethtool/stats.c | 5 +- + net/ethtool/strset.c | 4 +- + net/ethtool/tsconfig.c | 6 +- + net/ethtool/tsinfo.c | 8 +- + net/ethtool/wol.c | 4 +- + net/hsr/hsr_device.c | 6 +- + net/hsr/hsr_forward.c | 2 +- + net/hsr/hsr_framereg.c | 4 +- + net/hsr/hsr_main.c | 2 +- + net/hsr/hsr_main.h | 2 +- + net/ieee802154/socket.c | 6 +- + net/ipv4/Kconfig | 9 +- + net/ipv4/Makefile | 2 +- + net/ipv4/af_inet.c | 33 +- + net/ipv4/bpf_tcp_ca.c | 5 + + net/ipv4/devinet.c | 55 +- + net/ipv4/fib_semantics.c | 16 +- + net/ipv4/fou_core.c | 3 +- + net/ipv4/icmp.c | 7 +- + net/ipv4/inet_connection_sock.c | 4 - + net/ipv4/inet_diag.c | 13 +- + net/ipv4/inet_hashtables.c | 84 +- + net/ipv4/inetpeer.c | 7 +- + net/ipv4/ip_input.c | 39 + + net/ipv4/ip_sockglue.c | 4 +- + net/ipv4/ip_tunnel_core.c | 2 +- + net/ipv4/ipmr.c | 265 +- + net/ipv4/ipmr_base.c | 5 +- + net/ipv4/metrics.c | 1 - + net/ipv4/netfilter.c | 3 +- + net/ipv4/netfilter/nft_dup_ipv4.c | 1 - + net/ipv4/netfilter/nft_fib_ipv4.c | 2 - + net/ipv4/netfilter/nft_reject_ipv4.c | 1 - + net/ipv4/nexthop.c | 28 +- + net/ipv4/ping.c | 25 +- + net/ipv4/proc.c | 16 - + net/ipv4/raw.c | 6 +- + net/ipv4/route.c | 4 +- + net/ipv4/syncookies.c | 4 - + net/ipv4/sysctl_net_ipv4.c | 7 + + net/ipv4/tcp.c | 143 +- + net/ipv4/tcp_bbr.c | 9 +- + net/ipv4/tcp_bpf.c | 17 +- + net/ipv4/tcp_cubic.c | 31 +- + net/ipv4/tcp_dctcp.c | 12 +- + net/ipv4/tcp_dctcp.h | 1 + + net/ipv4/tcp_diag.c | 4 +- + net/ipv4/tcp_fastopen.c | 2 +- + net/ipv4/tcp_input.c | 74 +- + net/ipv4/tcp_ipv4.c | 80 +- + net/ipv4/tcp_minisocks.c | 5 +- + net/ipv4/tcp_output.c | 83 +- + net/ipv4/tcp_plb.c | 1 + + net/ipv4/tcp_timer.c | 1 - + net/ipv4/tcp_vegas.c | 10 +- + net/ipv4/tcp_vegas.h | 1 + + net/ipv4/tcp_veno.c | 8 +- + net/ipv4/tcp_yeah.c | 1 + + net/ipv4/udp.c | 479 +-- + net/ipv4/udp_bpf.c | 18 +- + net/ipv4/udp_diag.c | 128 +- + net/ipv4/udp_impl.h | 28 - + net/ipv4/udp_offload.c | 3 +- + net/ipv4/udplite.c | 135 - + net/ipv6/Kconfig | 6 +- + net/ipv6/Makefile | 2 +- + net/ipv6/addrconf_core.c | 91 - + net/ipv6/af_inet6.c | 108 +- + net/ipv6/datagram.c | 9 +- + net/ipv6/fib6_notifier.c | 1 + + net/ipv6/fib6_rules.c | 3 + + net/ipv6/fou6.c | 3 +- + net/ipv6/icmp.c | 6 - + net/ipv6/ila/ila_common.c | 1 + + net/ipv6/inet6_connection_sock.c | 19 +- + net/ipv6/inet6_hashtables.c | 51 +- + net/ipv6/ip6_checksum.c | 49 +- + net/ipv6/ip6_fib.c | 13 +- + net/ipv6/ip6_icmp.c | 46 +- + net/ipv6/ip6_input.c | 40 + + net/ipv6/ip6_offload.c | 4 +- + net/ipv6/ip6_output.c | 8 + + net/ipv6/ip6_udp_tunnel.c | 3 +- + net/ipv6/ip6mr.c | 4 +- + net/ipv6/ipv6_sockglue.c | 17 +- + net/ipv6/ndisc.c | 1 + + net/ipv6/netfilter.c | 51 +- + net/ipv6/netfilter/nft_dup_ipv6.c | 1 - + net/ipv6/netfilter/nft_fib_ipv6.c | 81 +- + net/ipv6/netfilter/nft_reject_ipv6.c | 1 - + net/ipv6/ping.c | 3 +- + net/ipv6/proc.c | 16 - + net/ipv6/raw.c | 8 +- + net/ipv6/reassembly.c | 6 + + net/ipv6/route.c | 12 +- + net/ipv6/seg6_iptunnel.c | 114 +- + net/ipv6/sit.c | 11 +- + net/ipv6/tcp_ipv6.c | 64 +- + net/ipv6/udp.c | 330 +- + net/ipv6/udp_impl.h | 32 - + net/ipv6/udp_offload.c | 3 +- + net/ipv6/udplite.c | 139 - + net/l2tp/Kconfig | 1 - + net/l2tp/l2tp_eth.c | 5 +- + net/l2tp/l2tp_ip.c | 4 +- + net/l2tp/l2tp_ip6.c | 6 +- + net/l2tp/l2tp_ppp.c | 15 +- + net/mac80211/agg-rx.c | 49 +- + net/mac80211/agg-tx.c | 39 +- + net/mac80211/cfg.c | 103 +- + net/mac80211/chan.c | 289 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/eht.c | 21 +- + net/mac80211/he.c | 37 +- + net/mac80211/ht.c | 43 +- + net/mac80211/ibss.c | 22 +- + net/mac80211/ieee80211_i.h | 20 +- + net/mac80211/iface.c | 49 +- + net/mac80211/main.c | 28 +- + net/mac80211/mesh.c | 14 +- + net/mac80211/mesh_hwmp.c | 20 +- + net/mac80211/mesh_plink.c | 24 +- + net/mac80211/mlme.c | 209 +- + net/mac80211/rx.c | 141 +- + net/mac80211/s1g.c | 36 +- + net/mac80211/spectmgmt.c | 31 +- + net/mac80211/sta_info.c | 4 +- + net/mac80211/sta_info.h | 3 +- + net/mac80211/tdls.c | 29 +- + net/mac80211/trace.h | 99 +- + net/mac80211/tx.c | 77 +- + net/mac80211/util.c | 6 +- + net/mac80211/vht.c | 41 +- + net/mac80211/wpa.c | 55 +- + net/mctp/route.c | 26 +- + net/mctp/test/route-test.c | 4 + + net/mpls/af_mpls.c | 6 +- + net/mptcp/options.c | 6 +- + net/mptcp/protocol.c | 4 +- + net/mptcp/subflow.c | 1 - + net/netfilter/Kconfig | 8 - + net/netfilter/core.c | 6 +- + net/netfilter/ipvs/ip_vs_conn.c | 1055 +++-- + net/netfilter/ipvs/ip_vs_core.c | 181 +- + net/netfilter/ipvs/ip_vs_ctl.c | 981 +++-- + net/netfilter/ipvs/ip_vs_est.c | 18 +- + net/netfilter/ipvs/ip_vs_pe_sip.c | 4 +- + net/netfilter/ipvs/ip_vs_sync.c | 23 + + net/netfilter/ipvs/ip_vs_xmit.c | 12 +- + net/netfilter/nf_conntrack_netlink.c | 4 +- + net/netfilter/nf_flow_table_offload.c | 1 + + net/netfilter/nf_log_syslog.c | 16 +- + net/netfilter/nf_nat_masquerade.c | 21 +- + net/netfilter/nf_queue.c | 1 + + net/netfilter/nf_tables_api.c | 78 - + net/netfilter/nfnetlink.c | 4 +- + net/netfilter/nfnetlink_log.c | 19 +- + net/netfilter/nfnetlink_queue.c | 46 +- + net/netfilter/nft_bitwise.c | 104 - + net/netfilter/nft_byteorder.c | 11 - + net/netfilter/nft_chain_filter.c | 1 + + net/netfilter/nft_cmp.c | 3 - + net/netfilter/nft_compat.c | 10 - + net/netfilter/nft_connlimit.c | 1 - + net/netfilter/nft_counter.c | 1 - + net/netfilter/nft_ct.c | 46 - + net/netfilter/nft_dup_netdev.c | 1 - + net/netfilter/nft_dynset.c | 1 - + net/netfilter/nft_exthdr.c | 34 - + net/netfilter/nft_fib.c | 42 - + net/netfilter/nft_fib_inet.c | 1 - + net/netfilter/nft_fib_netdev.c | 1 - + net/netfilter/nft_flow_offload.c | 1 - + net/netfilter/nft_fwd_netdev.c | 2 - + net/netfilter/nft_hash.c | 36 - + net/netfilter/nft_immediate.c | 12 - + net/netfilter/nft_last.c | 1 - + net/netfilter/nft_limit.c | 2 - + net/netfilter/nft_log.c | 1 - + net/netfilter/nft_lookup.c | 12 - + net/netfilter/nft_masq.c | 3 - + net/netfilter/nft_meta.c | 68 +- + net/netfilter/nft_nat.c | 2 - + net/netfilter/nft_numgen.c | 22 - + net/netfilter/nft_objref.c | 2 - + net/netfilter/nft_osf.c | 25 - + net/netfilter/nft_payload.c | 47 - + net/netfilter/nft_queue.c | 2 - + net/netfilter/nft_quota.c | 1 - + net/netfilter/nft_range.c | 1 - + net/netfilter/nft_redir.c | 3 - + net/netfilter/nft_reject_inet.c | 1 - + net/netfilter/nft_reject_netdev.c | 1 - + net/netfilter/nft_rt.c | 1 - + net/netfilter/nft_set_rbtree.c | 23 +- + net/netfilter/nft_socket.c | 26 - + net/netfilter/nft_synproxy.c | 1 - + net/netfilter/nft_tproxy.c | 1 - + net/netfilter/nft_tunnel.c | 26 - + net/netfilter/nft_xfrm.c | 27 - + net/netfilter/utils.c | 1 - + net/netfilter/xt_connbytes.c | 3 +- + net/netfilter/xt_connlimit.c | 3 +- + net/netfilter/xt_owner.c | 28 +- + net/netfilter/xt_time.c | 3 +- + net/netlink/af_netlink.c | 4 +- + net/netlink/genetlink.c | 20 +- + net/netlink/policy.c | 4 +- + net/openvswitch/actions.c | 3 +- + net/phonet/datagram.c | 4 +- + net/phonet/pep.c | 2 +- + net/psp/psp_main.c | 2 +- + net/psp/psp_sock.c | 1 - + net/qrtr/af_qrtr.c | 4 +- + net/rds/send.c | 2 +- + net/rxrpc/Kconfig | 2 +- + net/rxrpc/output.c | 2 - + net/sched/cls_flower.c | 12 +- + net/sched/cls_u32.c | 5 +- + net/sched/sch_api.c | 5 +- + net/sched/sch_cake.c | 26 +- + net/sched/sch_codel.c | 5 +- + net/sched/sch_dualpi2.c | 18 +- + net/sched/sch_fq.c | 10 +- + net/sched/sch_fq_codel.c | 4 +- + net/sched/sch_fq_pie.c | 4 +- + net/sched/sch_frag.c | 4 +- + net/sched/sch_generic.c | 51 +- + net/sched/sch_gred.c | 4 +- + net/sched/sch_htb.c | 4 +- + net/sched/sch_mq.c | 2 +- + net/sched/sch_mqprio.c | 2 +- + net/sched/sch_pie.c | 4 +- + net/sched/sch_red.c | 4 +- + net/sched/sch_sfb.c | 4 +- + net/sched/sch_sfq.c | 8 +- + net/sched/sch_taprio.c | 2 +- + net/sctp/Kconfig | 1 - + net/sctp/socket.c | 12 +- + net/socket.c | 51 +- + net/switchdev/switchdev.c | 2 +- + net/tipc/Kconfig | 1 - + net/tipc/udp_media.c | 9 +- + net/tls/Kconfig | 1 - + net/tls/tls.h | 2 +- + net/tls/tls_device_fallback.c | 3 - + net/tls/tls_sw.c | 3 +- + net/unix/af_unix.c | 4 +- + net/unix/unix_bpf.c | 2 +- + net/vmw_vsock/af_vsock.c | 39 +- + net/vmw_vsock/hyperv_transport.c | 2 +- + net/vmw_vsock/virtio_transport.c | 7 + + net/vmw_vsock/vsock_bpf.c | 2 +- + net/wireless/chan.c | 145 +- + net/wireless/core.c | 131 +- + net/wireless/core.h | 14 + + net/wireless/ibss.c | 4 +- + net/wireless/mlme.c | 64 +- + net/wireless/nl80211.c | 1215 +++++- + net/wireless/nl80211.h | 5 +- + net/wireless/of.c | 13 +- + net/wireless/pmsr.c | 5 +- + net/wireless/radiotap.c | 10 +- + net/wireless/rdev-ops.h | 94 +- + net/wireless/reg.c | 40 +- + net/wireless/reg.h | 13 +- + net/wireless/sme.c | 4 +- + net/wireless/sysfs.c | 36 +- + net/wireless/trace.c | 1 + + net/wireless/trace.h | 290 +- + net/wireless/util.c | 32 +- + net/wireless/wext-compat.c | 12 +- + net/wireless/wext-core.c | 3 +- + net/wireless/wext-priv.c | 3 +- + net/wireless/wext-proc.c | 3 +- + net/xdp/xsk.h | 7 - + net/xfrm/espintcp.c | 7 +- + net/xfrm/xfrm_nat_keepalive.c | 4 +- + net/xfrm/xfrm_output.c | 3 +- + security/smack/smack_lsm.c | 4 +- + tools/net/ynl/Makefile | 4 +- + tools/net/ynl/pyynl/cli.py | 14 +- + tools/net/ynl/pyynl/lib/__init__.py | 5 +- + tools/net/ynl/pyynl/lib/ynl.py | 279 +- + tools/net/ynl/samples/Makefile | 36 - + tools/net/ynl/samples/devlink.c | 61 - + tools/net/ynl/samples/ethtool.c | 65 - + tools/net/ynl/samples/netdev.c | 128 - + tools/net/ynl/samples/ovs.c | 60 - + tools/net/ynl/samples/rt-addr.c | 80 - + tools/net/ynl/samples/rt-link.c | 184 - + tools/net/ynl/samples/rt-route.c | 80 - + tools/net/ynl/samples/tc-filter-add.c | 335 -- + tools/net/ynl/samples/tc.c | 80 - + tools/net/ynl/{samples => tests}/.gitignore | 3 +- + tools/net/ynl/tests/Makefile | 94 +- + tools/net/ynl/tests/config | 8 + + tools/net/ynl/tests/devlink.c | 101 + + tools/net/ynl/tests/devlink.sh | 5 + + tools/net/ynl/tests/ethtool.c | 92 + + tools/net/ynl/tests/ethtool.sh | 5 + + tools/net/ynl/tests/netdev.c | 231 + + tools/net/ynl/tests/ovs.c | 108 + + tools/net/ynl/tests/rt-addr.c | 111 + + tools/net/ynl/tests/rt-addr.sh | 5 + + tools/net/ynl/tests/rt-link.c | 206 + + tools/net/ynl/tests/rt-route.c | 113 + + tools/net/ynl/tests/rt-route.sh | 5 + + tools/net/ynl/tests/tc.c | 409 ++ + tools/net/ynl/tests/ynl_nsim_lib.sh | 35 + + tools/testing/selftests/bpf/progs/bpf_cc_cubic.c | 8 +- + tools/testing/selftests/bpf/progs/bpf_cubic.c | 29 +- + tools/testing/selftests/bpf/progs/tcp_ca_kfunc.c | 16 +- + tools/testing/selftests/drivers/net/.gitignore | 1 - + tools/testing/selftests/drivers/net/Makefile | 1 - + tools/testing/selftests/drivers/net/README.rst | 128 +- + .../testing/selftests/drivers/net/bonding/Makefile | 1 + + .../net/bonding/bond_stacked_header_parse.sh | 72 + + tools/testing/selftests/drivers/net/bonding/config | 1 + + tools/testing/selftests/drivers/net/gro.py | 203 +- + tools/testing/selftests/drivers/net/hw/Makefile | 3 + + tools/testing/selftests/drivers/net/hw/config | 5 + + tools/testing/selftests/drivers/net/hw/gro_hw.py | 294 ++ + tools/testing/selftests/drivers/net/hw/iou-zcrx.py | 58 +- + .../selftests/drivers/net/hw/lib/py/__init__.py | 14 +- + .../selftests/drivers/net/hw/nk_forward.bpf.c | 49 + + tools/testing/selftests/drivers/net/hw/nk_netns.py | 29 + + tools/testing/selftests/drivers/net/hw/rss_ctx.py | 49 +- + tools/testing/selftests/drivers/net/hw/rss_drv.py | 233 +- + tools/testing/selftests/drivers/net/hw/tso.py | 7 +- + .../selftests/drivers/net/hw/xdp_metadata.py | 146 + + .../selftests/drivers/net/lib/py/__init__.py | 17 +- + tools/testing/selftests/drivers/net/lib/py/env.py | 211 +- + .../drivers/net/netconsole/netcons_basic.sh | 6 +- + tools/testing/selftests/drivers/net/xdp.py | 96 +- + tools/testing/selftests/net/Makefile | 4 + + tools/testing/selftests/net/af_unix/so_peek_off.c | 46 + + tools/testing/selftests/net/config | 2 + + tools/testing/selftests/net/fib_tests.sh | 19 +- + tools/testing/selftests/net/forwarding/.gitignore | 1 + + tools/testing/selftests/net/forwarding/Makefile | 4 + + .../selftests/net/forwarding/gre_multipath.sh | 2 +- + .../selftests/net/forwarding/gre_multipath_nh.sh | 2 +- + .../net/forwarding/gre_multipath_nh_res.sh | 2 +- + tools/testing/selftests/net/forwarding/ipip_lib.sh | 2 +- + tools/testing/selftests/net/forwarding/ipmr.c | 455 ++ + .../selftests/net/forwarding/local_termination.sh | 37 +- + tools/testing/selftests/net/fq_band_pktlimit.sh | 16 +- + .../testing/selftests/net/io_uring_zerocopy_tx.sh | 9 + + tools/testing/selftests/net/ip6_tunnel.sh | 44 + + tools/testing/selftests/net/lib/.gitignore | 1 + + tools/testing/selftests/net/lib/Makefile | 1 + + .../selftests/{drivers/net => net/lib}/gro.c | 252 +- + tools/testing/selftests/net/lib/py/__init__.py | 14 +- + tools/testing/selftests/net/lib/py/bpf.py | 68 + + tools/testing/selftests/net/lib/py/utils.py | 75 +- + tools/testing/selftests/net/lib/py/ynl.py | 18 +- + tools/testing/selftests/net/lib/xdp_metadata.bpf.c | 163 + + .../selftests/net/macvlan_mcast_shared_mac.sh | 93 + + tools/testing/selftests/net/nl_netdev.py | 32 +- + tools/testing/selftests/net/nl_nlctrl.py | 131 + + .../testing/selftests/net/openvswitch/ovs-dpctl.py | 2 +- + tools/testing/selftests/net/ovpn/Makefile | 31 +- + tools/testing/selftests/net/ovpn/common.sh | 101 +- + tools/testing/selftests/net/ovpn/data64.key | 6 +- + .../selftests/net/ovpn/json/peer0-float.json | 9 + + .../selftests/net/ovpn/json/peer0-symm-float.json | 1 + + .../selftests/net/ovpn/json/peer0-symm.json | 1 + + tools/testing/selftests/net/ovpn/json/peer0.json | 6 + + .../selftests/net/ovpn/json/peer1-float.json | 1 + + .../selftests/net/ovpn/json/peer1-symm-float.json | 1 + + .../selftests/net/ovpn/json/peer1-symm.json | 1 + + tools/testing/selftests/net/ovpn/json/peer1.json | 1 + + .../selftests/net/ovpn/json/peer2-float.json | 1 + + .../selftests/net/ovpn/json/peer2-symm-float.json | 1 + + .../selftests/net/ovpn/json/peer2-symm.json | 1 + + tools/testing/selftests/net/ovpn/json/peer2.json | 1 + + .../selftests/net/ovpn/json/peer3-float.json | 1 + + .../selftests/net/ovpn/json/peer3-symm-float.json | 1 + + .../selftests/net/ovpn/json/peer3-symm.json | 1 + + tools/testing/selftests/net/ovpn/json/peer3.json | 1 + + .../selftests/net/ovpn/json/peer4-float.json | 1 + + .../selftests/net/ovpn/json/peer4-symm-float.json | 1 + + .../selftests/net/ovpn/json/peer4-symm.json | 1 + + tools/testing/selftests/net/ovpn/json/peer4.json | 1 + + .../selftests/net/ovpn/json/peer5-float.json | 1 + + .../selftests/net/ovpn/json/peer5-symm-float.json | 1 + + .../selftests/net/ovpn/json/peer5-symm.json | 1 + + tools/testing/selftests/net/ovpn/json/peer5.json | 1 + + .../selftests/net/ovpn/json/peer6-float.json | 1 + + .../selftests/net/ovpn/json/peer6-symm-float.json | 1 + + .../selftests/net/ovpn/json/peer6-symm.json | 1 + + tools/testing/selftests/net/ovpn/json/peer6.json | 1 + + tools/testing/selftests/net/ovpn/ovpn-cli.c | 152 +- + tools/testing/selftests/net/ovpn/tcp_peers.txt | 11 +- + .../selftests/net/ovpn/test-close-socket.sh | 2 +- + tools/testing/selftests/net/ovpn/test-mark.sh | 96 + + .../selftests/net/ovpn/test-symmetric-id-float.sh | 11 + + .../selftests/net/ovpn/test-symmetric-id-tcp.sh | 11 + + .../selftests/net/ovpn/test-symmetric-id.sh | 10 + + tools/testing/selftests/net/ovpn/test.sh | 76 +- + tools/testing/selftests/net/ovpn/udp_peers.txt | 12 +- + .../packetdrill/tcp_disorder_fin_in_FIN_WAIT.pkt | 33 + + .../net/packetdrill/tcp_rcv_big_endseq.pkt | 2 +- + .../net/packetdrill/tcp_rcv_neg_window.pkt | 34 + + .../net/packetdrill/tcp_rcv_wnd_shrink_allowed.pkt | 40 + + .../net/packetdrill/tcp_rcv_wnd_shrink_nomem.pkt | 132 + + tools/testing/selftests/net/rds/Makefile | 1 + + tools/testing/selftests/net/rds/README.txt | 5 +- + tools/testing/selftests/net/rds/config | 5 + + tools/testing/selftests/net/rds/config.sh | 37 +- + tools/testing/selftests/net/rds/run.sh | 7 +- + tools/testing/selftests/net/rds/settings | 1 + + tools/testing/selftests/net/rds/test.py | 108 +- + tools/testing/selftests/net/reuseport_bpf.c | 11 + + tools/testing/selftests/net/reuseport_bpf_cpu.c | 10 + + tools/testing/selftests/net/reuseport_bpf_numa.c | 10 + + tools/testing/selftests/net/reuseport_dualstack.c | 11 + + .../selftests/net/srv6_hencap_red_l3vpn_test.sh | 109 +- + tools/testing/selftests/net/xfrm_state.sh | 613 +++ + .../tc-testing/tc-tests/infra/qdiscs.json | 2 +- + .../selftests/tc-testing/tc-tests/qdiscs/ets.json | 23 + + tools/testing/selftests/tc-testing/tdc.py | 3 + + tools/testing/selftests/tc-testing/tdc_config.py | 1 + + tools/testing/selftests/tc-testing/tdc_helper.py | 4 +- + tools/testing/selftests/vsock/vmtest.sh | 45 +- + 1217 files changed, 43363 insertions(+), 16748 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/nuvoton,ma35d1-dwmac.yaml + create mode 100644 Documentation/devicetree/bindings/net/spacemit,k3-dwmac.yaml + create mode 100644 Documentation/networking/devlink/devlink-shared.rst + create mode 100644 drivers/dpll/zl3073x/chan.c + create mode 100644 drivers/dpll/zl3073x/chan.h + delete mode 100644 drivers/net/bonding/bonding_priv.h + create mode 100644 drivers/net/dsa/mv88e6xxx/tcam.c + create mode 100644 drivers/net/dsa/mv88e6xxx/tcam.h + create mode 100644 drivers/net/dsa/mv88e6xxx/tcflower.c + create mode 100644 drivers/net/dsa/mv88e6xxx/tcflower.h + create mode 100644 drivers/net/ethernet/huawei/hinic3/hinic3_ethtool.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.h + create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sh_devlink.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sh_devlink.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-nuvoton.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c + create mode 100644 drivers/net/netdevsim/tc.c + delete mode 100644 drivers/net/phy/mdio-private.h + create mode 100644 drivers/net/wireless/ath/ath12k/thermal.c + create mode 100644 drivers/net/wireless/ath/ath12k/thermal.h + delete mode 100644 include/linux/mdio-gpio.h + create mode 100644 include/linux/mlx5/lag.h + delete mode 100644 include/linux/of_gpio.h + delete mode 100644 include/linux/platform_data/mdio-gpio.h + create mode 100644 include/net/dropreason-qdisc.h + delete mode 100644 include/net/ipv6_stubs.h + create mode 100644 include/net/rps-types.h + delete mode 100644 include/net/udplite.h + create mode 100644 net/devlink/sh_dev.c + delete mode 100644 net/ipv4/udp_impl.h + delete mode 100644 net/ipv4/udplite.c + delete mode 100644 net/ipv6/udp_impl.h + delete mode 100644 net/ipv6/udplite.c + delete mode 100644 tools/net/ynl/samples/Makefile + delete mode 100644 tools/net/ynl/samples/devlink.c + delete mode 100644 tools/net/ynl/samples/ethtool.c + delete mode 100644 tools/net/ynl/samples/netdev.c + delete mode 100644 tools/net/ynl/samples/ovs.c + delete mode 100644 tools/net/ynl/samples/rt-addr.c + delete mode 100644 tools/net/ynl/samples/rt-link.c + delete mode 100644 tools/net/ynl/samples/rt-route.c + delete mode 100644 tools/net/ynl/samples/tc-filter-add.c + delete mode 100644 tools/net/ynl/samples/tc.c + rename tools/net/ynl/{samples => tests}/.gitignore (87%) + create mode 100644 tools/net/ynl/tests/devlink.c + create mode 100755 tools/net/ynl/tests/devlink.sh + create mode 100644 tools/net/ynl/tests/ethtool.c + create mode 100755 tools/net/ynl/tests/ethtool.sh + create mode 100644 tools/net/ynl/tests/netdev.c + create mode 100644 tools/net/ynl/tests/ovs.c + create mode 100644 tools/net/ynl/tests/rt-addr.c + create mode 100755 tools/net/ynl/tests/rt-addr.sh + create mode 100644 tools/net/ynl/tests/rt-link.c + create mode 100644 tools/net/ynl/tests/rt-route.c + create mode 100755 tools/net/ynl/tests/rt-route.sh + create mode 100644 tools/net/ynl/tests/tc.c + create mode 100644 tools/net/ynl/tests/ynl_nsim_lib.sh + create mode 100755 tools/testing/selftests/drivers/net/bonding/bond_stacked_header_parse.sh + create mode 100755 tools/testing/selftests/drivers/net/hw/gro_hw.py + create mode 100644 tools/testing/selftests/drivers/net/hw/nk_forward.bpf.c + create mode 100755 tools/testing/selftests/drivers/net/hw/nk_netns.py + create mode 100644 tools/testing/selftests/drivers/net/hw/xdp_metadata.py + create mode 100644 tools/testing/selftests/net/forwarding/ipmr.c + create mode 100755 tools/testing/selftests/net/ip6_tunnel.sh + rename tools/testing/selftests/{drivers/net => net/lib}/gro.c (86%) + create mode 100644 tools/testing/selftests/net/lib/py/bpf.py + create mode 100644 tools/testing/selftests/net/lib/xdp_metadata.bpf.c + create mode 100755 tools/testing/selftests/net/macvlan_mcast_shared_mac.sh + create mode 100755 tools/testing/selftests/net/nl_nlctrl.py + create mode 100644 tools/testing/selftests/net/ovpn/json/peer0-float.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer0-symm-float.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer0-symm.json + create mode 100644 tools/testing/selftests/net/ovpn/json/peer0.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer1-float.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer1-symm-float.json + create mode 100644 tools/testing/selftests/net/ovpn/json/peer1-symm.json + create mode 100644 tools/testing/selftests/net/ovpn/json/peer1.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer2-float.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer2-symm-float.json + create mode 100644 tools/testing/selftests/net/ovpn/json/peer2-symm.json + create mode 100644 tools/testing/selftests/net/ovpn/json/peer2.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer3-float.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer3-symm-float.json + create mode 100644 tools/testing/selftests/net/ovpn/json/peer3-symm.json + create mode 100644 tools/testing/selftests/net/ovpn/json/peer3.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer4-float.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer4-symm-float.json + create mode 100644 tools/testing/selftests/net/ovpn/json/peer4-symm.json + create mode 100644 tools/testing/selftests/net/ovpn/json/peer4.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer5-float.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer5-symm-float.json + create mode 100644 tools/testing/selftests/net/ovpn/json/peer5-symm.json + create mode 100644 tools/testing/selftests/net/ovpn/json/peer5.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer6-float.json + create mode 120000 tools/testing/selftests/net/ovpn/json/peer6-symm-float.json + create mode 100644 tools/testing/selftests/net/ovpn/json/peer6-symm.json + create mode 100644 tools/testing/selftests/net/ovpn/json/peer6.json + create mode 100755 tools/testing/selftests/net/ovpn/test-mark.sh + create mode 100755 tools/testing/selftests/net/ovpn/test-symmetric-id-float.sh + create mode 100755 tools/testing/selftests/net/ovpn/test-symmetric-id-tcp.sh + create mode 100755 tools/testing/selftests/net/ovpn/test-symmetric-id.sh + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_disorder_fin_in_FIN_WAIT.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_rcv_neg_window.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_rcv_wnd_shrink_allowed.pkt + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_rcv_wnd_shrink_nomem.pkt + create mode 100644 tools/testing/selftests/net/rds/config + create mode 100644 tools/testing/selftests/net/rds/settings + create mode 100755 tools/testing/selftests/net/xfrm_state.sh +$ git am -3 ../patches/0001-net-mlx5e-Fix-up-merge.patch +Applying: net/mlx5e: Fix up merge +Using index info to reconstruct a base tree... +M drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging bpf-next/for-next (b6b5e0ebd429d bpf,arc_jit: Fix missing newline in pr_err messages) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging MAINTAINERS +Auto-merging net/ipv6/addrconf.c +Merge made by the 'ort' strategy. + MAINTAINERS | 7 +- + arch/arc/net/bpf_jit_arcv2.c | 8 +- + arch/arm64/net/bpf_jit.h | 4 +- + arch/s390/kernel/Makefile | 2 + + arch/s390/kernel/bpf.c | 12 + + arch/s390/net/bpf_jit_comp.c | 157 ++- + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 18 +- + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 12 +- + include/linux/bpf_verifier.h | 10 +- + include/linux/btf_ids.h | 2 +- + include/linux/filter.h | 1 - + include/uapi/linux/btf.h | 12 + + kernel/bpf/bpf_local_storage.c | 11 + + kernel/bpf/bpf_lsm.c | 4 + + kernel/bpf/btf.c | 86 +- + kernel/bpf/core.c | 5 +- + kernel/bpf/cpumap.c | 5 +- + kernel/bpf/devmap.c | 5 +- + kernel/bpf/helpers.c | 187 ++- + kernel/bpf/log.c | 10 +- + kernel/bpf/syscall.c | 2 +- + kernel/bpf/tnum.c | 46 +- + kernel/bpf/verifier.c | 1320 ++++++++++++-------- + net/bpf/test_run.c | 29 + + net/ipv6/addrconf.c | 1 + + net/xdp/xsk.c | 18 +- + net/xdp/xsk_queue.h | 16 +- + scripts/Makefile.btf | 2 + + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 11 +- + tools/bpf/bpftool/Makefile | 30 +- + tools/bpf/bpftool/bash-completion/bpftool | 6 +- + tools/bpf/bpftool/btf.c | 121 +- + tools/bpf/bpftool/jit_disasm.c | 11 +- + tools/bpf/bpftool/main.c | 7 + + tools/bpf/bpftool/main.h | 14 + + tools/bpf/resolve_btfids/main.c | 1 + + tools/include/uapi/linux/btf.h | 12 + + tools/lib/bpf/btf.c | 625 ++++++--- + tools/lib/bpf/btf.h | 20 + + tools/lib/bpf/features.c | 53 + + tools/lib/bpf/libbpf.c | 185 ++- + tools/lib/bpf/libbpf.h | 17 + + tools/lib/bpf/libbpf.map | 6 + + tools/lib/bpf/libbpf_internal.h | 8 + + tools/lib/bpf/libbpf_probes.c | 48 +- + tools/lib/bpf/libbpf_version.h | 2 +- + tools/lib/bpf/usdt.c | 47 +- + tools/testing/selftests/bpf/.gitignore | 2 + + tools/testing/selftests/bpf/Makefile | 17 +- + tools/testing/selftests/bpf/bench.c | 4 + + tools/testing/selftests/bpf/benchs/bench_trigger.c | 60 + + .../selftests/bpf/benchs/run_bench_uprobes.sh | 2 +- + tools/testing/selftests/bpf/bpf_experimental.h | 174 +-- + tools/testing/selftests/bpf/bpftool_helpers.c | 15 +- + tools/testing/selftests/bpf/cgroup_iter_memcg.h | 2 - + tools/testing/selftests/bpf/prog_tests/align.c | 712 ----------- + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 29 +- + .../selftests/bpf/prog_tests/bpf_insn_array.c | 2 +- + tools/testing/selftests/bpf/prog_tests/btf_kind.c | 226 ++++ + tools/testing/selftests/bpf/prog_tests/btf_write.c | 111 ++ + .../selftests/bpf/prog_tests/cgroup_iter_memcg.c | 28 - + .../selftests/bpf/prog_tests/clone_attach_btf_id.c | 78 ++ + .../selftests/bpf/prog_tests/connect_force_port.c | 26 +- + .../testing/selftests/bpf/prog_tests/exceptions.c | 1 + + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 26 +- + .../selftests/bpf/prog_tests/get_func_args_test.c | 25 +- + .../selftests/bpf/prog_tests/get_func_ip_test.c | 28 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 2 + + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 33 +- + .../testing/selftests/bpf/prog_tests/linked_list.c | 4 +- + .../bpf/prog_tests/livepatch_trampoline.c | 20 +- + tools/testing/selftests/bpf/prog_tests/lsm_bdev.c | 221 ++++ + tools/testing/selftests/bpf/prog_tests/lwt_misc.c | 9 + + .../selftests/bpf/prog_tests/modify_return.c | 8 +- + .../selftests/bpf/prog_tests/module_attach.c | 191 ++- + tools/testing/selftests/bpf/prog_tests/perf_link.c | 20 +- + .../testing/selftests/bpf/prog_tests/probe_user.c | 29 +- + tools/testing/selftests/bpf/prog_tests/rbtree.c | 6 + + .../testing/selftests/bpf/prog_tests/reg_bounds.c | 18 +- + .../selftests/bpf/prog_tests/sockmap_basic.c | 17 +- + tools/testing/selftests/bpf/prog_tests/spin_lock.c | 5 +- + .../selftests/bpf/prog_tests/summarization.c | 2 +- + .../selftests/bpf/prog_tests/task_local_data.h | 7 +- + .../selftests/bpf/prog_tests/task_local_storage.c | 16 +- + .../selftests/bpf/prog_tests/test_bpf_smc.c | 6 +- + .../selftests/bpf/prog_tests/test_global_funcs.c | 2 + + .../bpf/prog_tests/test_struct_ops_multi_args.c | 9 + + .../selftests/bpf/prog_tests/test_tc_tunnel.c | 2 +- + .../selftests/bpf/prog_tests/trampoline_count.c | 17 +- + tools/testing/selftests/bpf/prog_tests/usdt.c | 92 ++ + tools/testing/selftests/bpf/prog_tests/verifier.c | 4 + + tools/testing/selftests/bpf/progs/bpf_misc.h | 4 + + tools/testing/selftests/bpf/progs/bpf_smc.c | 28 +- + .../selftests/bpf/progs/cgroup_iter_memcg.c | 18 +- + .../selftests/bpf/progs/clone_attach_btf_id.c | 13 + + .../selftests/bpf/progs/connect_force_port4.c | 10 +- + .../selftests/bpf/progs/connect_force_port6.c | 10 +- + tools/testing/selftests/bpf/progs/exceptions.c | 14 + + .../selftests/bpf/progs/exceptions_assert.c | 2 +- + .../testing/selftests/bpf/progs/exceptions_fail.c | 34 +- + .../selftests/bpf/progs/freplace_int_with_void.c | 11 + + tools/testing/selftests/bpf/progs/freplace_void.c | 10 + + .../bpf/progs/get_func_args_fsession_test.c | 37 + + .../selftests/bpf/progs/get_func_args_test.c | 38 - + .../bpf/progs/get_func_ip_fsession_test.c | 21 + + .../testing/selftests/bpf/progs/get_func_ip_test.c | 23 - + tools/testing/selftests/bpf/progs/irq.c | 4 +- + tools/testing/selftests/bpf/progs/iters.c | 6 +- + .../testing/selftests/bpf/progs/kfunc_call_test.c | 98 ++ + .../selftests/bpf/progs/kprobe_multi_session.c | 10 + + .../testing/selftests/bpf/progs/kptr_xchg_inline.c | 4 +- + tools/testing/selftests/bpf/progs/lsm_bdev.c | 96 ++ + tools/testing/selftests/bpf/progs/lwt_misc.c | 22 + + .../selftests/bpf/progs/mem_rdonly_untrusted.c | 2 +- + tools/testing/selftests/bpf/progs/modify_return.c | 13 + + .../selftests/bpf/progs/percpu_alloc_fail.c | 4 +- + tools/testing/selftests/bpf/progs/preempt_lock.c | 6 +- + .../selftests/bpf/progs/rbtree_search_kptr.c | 290 +++++ + .../testing/selftests/bpf/progs/refcounted_kptr.c | 4 +- + .../selftests/bpf/progs/refcounted_kptr_fail.c | 2 +- + .../selftests/bpf/progs/struct_ops_multi_args.c | 35 + + tools/testing/selftests/bpf/progs/tailcall3.c | 5 +- + .../selftests/bpf/progs/task_local_data.bpf.h | 2 +- + .../selftests/bpf/progs/test_global_func3.c | 18 +- + .../selftests/bpf/progs/test_global_func7.c | 2 +- + .../bpf/progs/test_global_func_deep_stack.c | 95 ++ + .../selftests/bpf/progs/test_module_attach.c | 63 +- + .../testing/selftests/bpf/progs/test_probe_user.c | 13 +- + .../selftests/bpf/progs/test_trampoline_count.c | 12 +- + tools/testing/selftests/bpf/progs/test_usdt.c | 12 + + tools/testing/selftests/bpf/progs/trigger_bench.c | 10 +- + tools/testing/selftests/bpf/progs/verifier_align.c | 581 +++++++++ + .../bpf/progs/verifier_async_cb_context.c | 4 +- + .../testing/selftests/bpf/progs/verifier_bounds.c | 36 +- + tools/testing/selftests/bpf/progs/verifier_ctx.c | 76 ++ + .../selftests/bpf/progs/verifier_ctx_ptr_param.c | 68 + + .../bpf/progs/verifier_direct_packet_access.c | 4 +- + .../selftests/bpf/progs/verifier_global_subprogs.c | 19 + + tools/testing/selftests/bpf/progs/verifier_gotox.c | 4 +- + .../bpf/progs/verifier_helper_packet_access.c | 2 +- + .../bpf/progs/verifier_helper_value_access.c | 4 +- + .../testing/selftests/bpf/progs/verifier_int_ptr.c | 2 +- + .../bpf/progs/verifier_jeq_infer_not_null.c | 54 + + .../selftests/bpf/progs/verifier_meta_access.c | 2 +- + .../selftests/bpf/progs/verifier_private_stack.c | 8 +- + .../selftests/bpf/progs/verifier_spill_fill.c | 86 +- + .../selftests/bpf/progs/verifier_stack_ptr.c | 4 +- + .../testing/selftests/bpf/progs/verifier_subreg.c | 165 +++ + .../selftests/bpf/progs/verifier_value_ptr_arith.c | 10 +- + .../bpf/progs/verifier_xdp_direct_packet_access.c | 64 +- + tools/testing/selftests/bpf/test_bpftool.py | 174 --- + tools/testing/selftests/bpf/test_bpftool.sh | 11 - + .../testing/selftests/bpf/test_kmods/bpf_testmod.c | 79 +- + .../testing/selftests/bpf/test_kmods/bpf_testmod.h | 3 + + .../selftests/bpf/test_kmods/bpf_testmod_kfunc.h | 1 + + tools/testing/selftests/bpf/testing_helpers.c | 9 +- + tools/testing/selftests/bpf/testing_helpers.h | 1 + + tools/testing/selftests/bpf/uprobe_multi.c | 19 +- + tools/testing/selftests/bpf/uprobe_multi.ld | 4 +- + tools/testing/selftests/bpf/usdt.h | 2 + + tools/testing/selftests/bpf/usdt_1.c | 18 + + tools/testing/selftests/bpf/usdt_2.c | 16 + + tools/testing/selftests/bpf/verifier/calls.c | 3 +- + tools/testing/selftests/bpf/veristat.c | 102 +- + 164 files changed, 5794 insertions(+), 2466 deletions(-) + create mode 100644 arch/s390/kernel/bpf.c + delete mode 100644 tools/testing/selftests/bpf/prog_tests/align.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_kind.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/clone_attach_btf_id.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/lsm_bdev.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/lwt_misc.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_struct_ops_multi_args.c + create mode 100644 tools/testing/selftests/bpf/progs/clone_attach_btf_id.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_int_with_void.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_void.c + create mode 100644 tools/testing/selftests/bpf/progs/get_func_args_fsession_test.c + create mode 100644 tools/testing/selftests/bpf/progs/get_func_ip_fsession_test.c + create mode 100644 tools/testing/selftests/bpf/progs/lsm_bdev.c + create mode 100644 tools/testing/selftests/bpf/progs/lwt_misc.c + create mode 100644 tools/testing/selftests/bpf/progs/rbtree_search_kptr.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_multi_args.c + create mode 100644 tools/testing/selftests/bpf/progs/test_global_func_deep_stack.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_align.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_ctx_ptr_param.c + delete mode 100644 tools/testing/selftests/bpf/test_bpftool.py + delete mode 100755 tools/testing/selftests/bpf/test_bpftool.sh + create mode 100644 tools/testing/selftests/bpf/usdt_1.c + create mode 100644 tools/testing/selftests/bpf/usdt_2.c +Merging ipsec-next/master (be14d13625c9b xfrm: update outdated comment) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Auto-merging net/xfrm/xfrm_policy.c +Merge made by the 'ort' strategy. + net/xfrm/xfrm_policy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mlx5-next/mlx5-next (26469110c750c net/mlx5: Add vhca_id_type bit to alias context) +$ git merge -m Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging include/linux/mlx5/driver.h +Merge made by the 'ort' strategy. + drivers/infiniband/hw/mlx5/main.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 3 +-- + drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c | 3 +-- + include/linux/mlx5/driver.h | 1 - + include/linux/mlx5/mlx5_ifc.h | 7 +++++-- + 5 files changed, 8 insertions(+), 8 deletions(-) +Merging netfilter-next/main (e4cf6087cab38 net: qrtr: fix endian handling of confirm_rx field) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (e4cf6087cab38 net: qrtr: fix endian handling of confirm_rx field) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (42ee54fcd11e4 Bluetooth: hci_h4: Fix race during initialization) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging drivers/bluetooth/btintel.c +Auto-merging drivers/bluetooth/btqca.c +Auto-merging drivers/bluetooth/btusb.c +Auto-merging net/bluetooth/hci_conn.c +Auto-merging net/bluetooth/hci_core.c +Auto-merging net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/l2cap_core.c +CONFLICT (content): Merge conflict in net/bluetooth/l2cap_core.c +Auto-merging net/bluetooth/sco.c +Resolved 'net/bluetooth/l2cap_core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2638ff9242467] Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/btbcm.c | 11 ++-- + drivers/bluetooth/btintel.c | 109 +++++++++++++++++++++++++++++++++------ + drivers/bluetooth/btintel.h | 20 +++++-- + drivers/bluetooth/btintel_pcie.c | 24 +++++++-- + drivers/bluetooth/btmtk.c | 23 ++++++++- + drivers/bluetooth/btmtk.h | 2 + + drivers/bluetooth/btmtksdio.c | 42 ++++++++++----- + drivers/bluetooth/btqca.c | 37 ++++++------- + drivers/bluetooth/btusb.c | 19 ++++++- + drivers/bluetooth/hci_h4.c | 3 -- + drivers/bluetooth/hci_ldisc.c | 3 ++ + drivers/bluetooth/hci_qca.c | 80 ++++++++++++++++------------ + include/linux/mmc/sdio_ids.h | 1 + + net/bluetooth/hci_conn.c | 4 +- + net/bluetooth/hci_core.c | 4 +- + net/bluetooth/hci_event.c | 94 +++++++++++++-------------------- + net/bluetooth/hci_sync.c | 83 ++++++++++++++++++++--------- + net/bluetooth/l2cap_core.c | 9 +++- + net/bluetooth/sco.c | 30 ++++++++--- + 19 files changed, 401 insertions(+), 197 deletions(-) +Merging wireless-next/for-next (dbd94b9831bc5 Merge tag 'wireless-next-2026-03-26' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging ath-next/for-next (dbd94b9831bc5 Merge tag 'wireless-next-2026-03-26' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Already up to date. +Merging iwlwifi-next/next (709503c4a2102 wifi: iwlwifi: mvm: fix race condition in PTP removal) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi-next/next +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/mld/ptp.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/ptp.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging wpan-next/master (1dd9291eb9037 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Merge made by the 'ort' strategy. + net/ieee802154/core.c | 49 ++++++++++++++++++++++++++++--------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) +Merging wpan-staging/staging (1dd9291eb9037 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'staging' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (b800359a4dfac mtd: cmdlinepart: use a flexible array member) +$ git merge -m Merge branch 'mtd/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + .../bindings/mtd/partitions/partition.yaml | 20 ++ + drivers/mtd/Kconfig | 9 + + drivers/mtd/Makefile | 1 + + drivers/mtd/devices/docg3.c | 3 +- + drivers/mtd/maps/Kconfig | 11 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/physmap-bt1-rom.c | 125 -------- + drivers/mtd/maps/physmap-bt1-rom.h | 17 - + drivers/mtd/maps/physmap-core.c | 5 - + drivers/mtd/maps/physmap-gemini.c | 2 +- + drivers/mtd/mtd_virt_concat.c | 350 +++++++++++++++++++++ + drivers/mtd/mtdconcat.c | 17 +- + drivers/mtd/mtdcore.c | 21 ++ + drivers/mtd/mtdpart.c | 6 + + drivers/mtd/parsers/cmdlinepart.c | 3 +- + drivers/mtd/parsers/ofpart_core.c | 4 +- + include/linux/mtd/concat.h | 63 +++- + 17 files changed, 475 insertions(+), 183 deletions(-) + delete mode 100644 drivers/mtd/maps/physmap-bt1-rom.c + delete mode 100644 drivers/mtd/maps/physmap-bt1-rom.h + create mode 100644 drivers/mtd/mtd_virt_concat.c +Merging nand/nand/next (3b2a422e23cf1 dt-bindings: mtd: mxc-nand: add missing compatible string and ref to nand-controller-legacy.yaml) +$ git merge -m Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging drivers/mtd/nand/raw/nand_base.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/gpmi-nand.yaml | 2 +- + .../devicetree/bindings/mtd/mxc-nand.yaml | 27 +- + .../devicetree/bindings/mtd/nand-chip.yaml | 46 +-- + .../bindings/mtd/nand-controller-legacy.yaml | 65 ++++ + .../devicetree/bindings/mtd/nand-controller.yaml | 2 + + .../devicetree/bindings/mtd/nand-property.yaml | 64 ++++ + .../devicetree/bindings/mtd/raw-nand-chip.yaml | 74 +--- + .../devicetree/bindings/mtd/raw-nand-property.yaml | 98 ++++++ + drivers/mtd/nand/ecc-realtek.c | 18 +- + drivers/mtd/nand/raw/cafe_nand.c | 7 +- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 10 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 11 +- + drivers/mtd/nand/raw/mxc_nand.c | 10 +- + drivers/mtd/nand/raw/nand_base.c | 19 +- + drivers/mtd/nand/raw/sunxi_nand.c | 381 ++++++++++++++++----- + drivers/mtd/nand/spi/winbond.c | 13 +- + include/linux/mtd/spinand.h | 5 +- + 17 files changed, 614 insertions(+), 238 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/nand-controller-legacy.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/nand-property.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/raw-nand-property.yaml +Merging spi-nor/spi-nor/next (94645aa41bf9e mtd: spi-nor: swp: check SR_TB flag when getting tb_mask) +$ git merge -m Merge branch 'spi-nor/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Auto-merging drivers/mtd/spi-nor/core.c +Merge made by the 'ort' strategy. + drivers/mtd/spi-nor/core.c | 2 +- + drivers/mtd/spi-nor/core.h | 2 +- + drivers/mtd/spi-nor/micron-st.c | 10 ++++++++++ + drivers/mtd/spi-nor/swp.c | 4 +++- + 4 files changed, 15 insertions(+), 3 deletions(-) +Merging crypto/master (be0240f65705b crypto: qce - use memcpy_and_pad in qce_aead_setkey) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging MAINTAINERS +Auto-merging crypto/testmgr.c +Auto-merging drivers/crypto/caam/caamalg_qi2.c +Auto-merging drivers/crypto/caam/caamhash.c +Auto-merging drivers/crypto/ccp/sev-dev.c +Auto-merging drivers/crypto/tegra/tegra-se-aes.c +Auto-merging drivers/crypto/tegra/tegra-se-hash.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-hisi-hpre | 7 + + Documentation/ABI/testing/debugfs-hisi-sec | 7 + + Documentation/ABI/testing/debugfs-hisi-zip | 7 + + Documentation/ABI/testing/sysfs-driver-qat_svn | 114 ++ + Documentation/crypto/userspace-if.rst | 4 +- + .../bindings/crypto/inside-secure,safexcel.yaml | 5 +- + .../bindings/crypto/qcom,inline-crypto-engine.yaml | 27 + + .../devicetree/bindings/rng/atmel,at91-trng.yaml | 1 + + MAINTAINERS | 13 +- + crypto/cryptd.c | 112 +- + crypto/drbg.c | 2 +- + crypto/krb5enc.c | 5 +- + crypto/lrw.c | 2 +- + crypto/simd.c | 239 +--- + crypto/tcrypt.c | 17 +- + crypto/tea.c | 2 +- + crypto/testmgr.c | 46 +- + crypto/testmgr.h | 1509 ++++++++++++++++++++ + crypto/xts.c | 2 +- + drivers/crypto/Makefile | 1 - + drivers/crypto/atmel-aes.c | 8 +- + drivers/crypto/atmel-ecc.c | 1 + + drivers/crypto/atmel-i2c.c | 6 +- + drivers/crypto/atmel-sha.c | 17 +- + drivers/crypto/atmel-sha204a.c | 41 +- + drivers/crypto/atmel-tdes.c | 8 +- + drivers/crypto/axis/artpec6_crypto.c | 9 +- + drivers/crypto/caam/caamalg_qi2.c | 17 +- + drivers/crypto/caam/caamhash.c | 16 +- + drivers/crypto/ccp/sev-dev.c | 27 +- + drivers/crypto/hisilicon/debugfs.c | 54 + + drivers/crypto/hisilicon/hpre/hpre_main.c | 18 + + drivers/crypto/hisilicon/sec2/sec_crypto.c | 2 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 11 + + drivers/crypto/hisilicon/zip/zip_main.c | 19 + + drivers/crypto/inside-secure/eip93/Kconfig | 2 +- + drivers/crypto/inside-secure/eip93/eip93-aead.c | 2 +- + drivers/crypto/inside-secure/eip93/eip93-aead.h | 2 +- + drivers/crypto/inside-secure/eip93/eip93-aes.h | 2 +- + drivers/crypto/inside-secure/eip93/eip93-cipher.c | 4 +- + drivers/crypto/inside-secure/eip93/eip93-cipher.h | 2 +- + drivers/crypto/inside-secure/eip93/eip93-common.c | 2 +- + drivers/crypto/inside-secure/eip93/eip93-common.h | 2 +- + drivers/crypto/inside-secure/eip93/eip93-des.h | 2 +- + drivers/crypto/inside-secure/eip93/eip93-hash.c | 2 +- + drivers/crypto/inside-secure/eip93/eip93-hash.h | 2 +- + drivers/crypto/inside-secure/eip93/eip93-main.c | 18 +- + drivers/crypto/inside-secure/eip93/eip93-main.h | 2 +- + drivers/crypto/inside-secure/eip93/eip93-regs.h | 4 +- + drivers/crypto/inside-secure/safexcel.c | 8 +- + drivers/crypto/inside-secure/safexcel.h | 8 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 149 ++ + .../crypto/intel/qat/qat_6xxx/adf_6xxx_hw_data.c | 113 +- + .../crypto/intel/qat/qat_6xxx/adf_6xxx_hw_data.h | 20 + + drivers/crypto/intel/qat/qat_6xxx/adf_drv.c | 33 +- + drivers/crypto/intel/qat/qat_common/Makefile | 2 + + .../intel/qat/qat_common/adf_accel_devices.h | 2 + + .../crypto/intel/qat/qat_common/adf_accel_engine.c | 7 + + drivers/crypto/intel/qat/qat_common/adf_admin.c | 70 + + drivers/crypto/intel/qat/qat_common/adf_admin.h | 2 + + drivers/crypto/intel/qat/qat_common/adf_anti_rb.c | 66 + + drivers/crypto/intel/qat/qat_common/adf_anti_rb.h | 37 + + .../crypto/intel/qat/qat_common/adf_fw_config.h | 1 + + .../crypto/intel/qat/qat_common/adf_gen6_shared.c | 6 - + .../crypto/intel/qat/qat_common/adf_gen6_shared.h | 1 - + drivers/crypto/intel/qat/qat_common/adf_init.c | 3 + + .../intel/qat/qat_common/adf_sysfs_anti_rb.c | 133 ++ + .../intel/qat/qat_common/adf_sysfs_anti_rb.h | 11 + + drivers/crypto/intel/qat/qat_common/adf_sysfs_rl.c | 10 +- + .../intel/qat/qat_common/icp_qat_fw_init_admin.h | 15 +- + .../qat/qat_common/icp_qat_fw_loader_handle.h | 1 + + drivers/crypto/intel/qat/qat_common/icp_qat_hw.h | 3 +- + drivers/crypto/intel/qat/qat_common/qat_hal.c | 27 +- + drivers/crypto/intel/qat/qat_common/qat_uclo.c | 25 +- + drivers/crypto/marvell/cesa/hash.c | 3 +- + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 8 +- + drivers/crypto/nx/nx-842.c | 10 +- + drivers/crypto/nx/nx-842.h | 6 +- + drivers/crypto/qce/aead.c | 22 +- + drivers/crypto/qce/sha.c | 6 +- + drivers/crypto/qce/skcipher.c | 6 +- + drivers/crypto/s5p-sss.c | 27 +- + drivers/crypto/stm32/stm32-cryp.c | 16 +- + drivers/crypto/stm32/stm32-hash.c | 16 +- + drivers/crypto/tegra/tegra-se-aes.c | 9 + + drivers/crypto/tegra/tegra-se-hash.c | 3 + + drivers/crypto/ti/Kconfig | 4 + + drivers/crypto/ti/dthev2-aes.c | 899 +++++++++++- + drivers/crypto/ti/dthev2-common.c | 19 + + drivers/crypto/ti/dthev2-common.h | 27 +- + drivers/crypto/virtio/virtio_crypto_common.h | 3 +- + drivers/crypto/virtio/virtio_crypto_core.c | 11 +- + include/crypto/acompress.h | 5 +- + include/crypto/cryptd.h | 33 - + include/crypto/des.h | 8 +- + include/crypto/internal/acompress.h | 1 + + include/crypto/internal/ecc.h | 22 +- + include/crypto/internal/scompress.h | 1 + + include/crypto/internal/simd.h | 19 - + include/crypto/skcipher.h | 1 + + include/linux/cpuhotplug.h | 1 - + include/linux/hisi_acc_qm.h | 12 + + include/linux/hw_random.h | 2 +- + include/linux/padata.h | 8 +- + include/linux/printk.h | 13 + + include/linux/rhashtable.h | 13 +- + include/uapi/linux/psp-sev.h | 2 +- + kernel/padata.c | 130 +- + 108 files changed, 3751 insertions(+), 792 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-qat_svn + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_anti_rb.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_anti_rb.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_sysfs_anti_rb.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_sysfs_anti_rb.h +Merging libcrypto/libcrypto-next (7ac21b4032e5b lib: Move crypto library tests to Runtime Testing menu) +$ git merge -m Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/crypto/aes-neonbs-glue.c +Auto-merging arch/m68k/configs/amiga_defconfig +Auto-merging arch/m68k/configs/apollo_defconfig +Auto-merging arch/m68k/configs/atari_defconfig +Auto-merging arch/m68k/configs/bvme6000_defconfig +Auto-merging arch/m68k/configs/hp300_defconfig +Auto-merging arch/m68k/configs/mac_defconfig +Auto-merging arch/m68k/configs/multi_defconfig +Auto-merging arch/m68k/configs/mvme147_defconfig +Auto-merging arch/m68k/configs/mvme16x_defconfig +Auto-merging arch/m68k/configs/q40_defconfig +Auto-merging arch/m68k/configs/sun3_defconfig +Auto-merging arch/m68k/configs/sun3x_defconfig +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging crypto/Kconfig +Auto-merging crypto/Makefile +Auto-merging crypto/tcrypt.c +Auto-merging crypto/testmgr.c +Auto-merging crypto/testmgr.h +Auto-merging lib/Kconfig.debug +Auto-merging lib/crypto/Makefile +Auto-merging net/mac80211/wpa.c +Merge made by the 'ort' strategy. + MAINTAINERS | 4 +- + arch/arm/crypto/Kconfig | 13 +- + arch/arm/crypto/ghash-ce-core.S | 171 +-------- + arch/arm/crypto/ghash-ce-glue.c | 166 +------- + arch/arm64/configs/defconfig | 2 +- + arch/arm64/crypto/Kconfig | 29 +- + arch/arm64/crypto/Makefile | 10 +- + arch/arm64/crypto/aes-ce-ccm-glue.c | 4 - + arch/arm64/crypto/aes-glue.c | 261 +------------ + arch/arm64/crypto/aes-neonbs-glue.c | 15 +- + arch/arm64/crypto/ghash-ce-core.S | 221 +---------- + arch/arm64/crypto/ghash-ce-glue.c | 168 +------- + arch/arm64/crypto/sm3-ce-glue.c | 70 ---- + arch/arm64/crypto/sm3-neon-glue.c | 67 ---- + arch/loongarch/configs/loongson32_defconfig | 2 +- + arch/loongarch/configs/loongson64_defconfig | 2 +- + arch/m68k/configs/amiga_defconfig | 2 +- + arch/m68k/configs/apollo_defconfig | 2 +- + arch/m68k/configs/atari_defconfig | 2 +- + arch/m68k/configs/bvme6000_defconfig | 2 +- + arch/m68k/configs/hp300_defconfig | 2 +- + arch/m68k/configs/mac_defconfig | 2 +- + arch/m68k/configs/multi_defconfig | 2 +- + arch/m68k/configs/mvme147_defconfig | 2 +- + arch/m68k/configs/mvme16x_defconfig | 2 +- + arch/m68k/configs/q40_defconfig | 2 +- + arch/m68k/configs/sun3_defconfig | 2 +- + arch/m68k/configs/sun3x_defconfig | 2 +- + arch/powerpc/crypto/Kconfig | 5 +- + arch/powerpc/crypto/Makefile | 8 +- + arch/powerpc/crypto/aesp8-ppc.h | 1 - + arch/powerpc/crypto/ghash.c | 160 -------- + arch/powerpc/crypto/vmx.c | 10 +- + arch/riscv/crypto/Kconfig | 24 -- + arch/riscv/crypto/Makefile | 6 - + arch/riscv/crypto/ghash-riscv64-glue.c | 146 ------- + arch/riscv/crypto/sm3-riscv64-glue.c | 97 ----- + arch/s390/configs/debug_defconfig | 3 +- + arch/s390/configs/defconfig | 3 +- + arch/s390/crypto/Kconfig | 10 - + arch/s390/crypto/Makefile | 1 - + arch/s390/crypto/ghash_s390.c | 144 ------- + arch/x86/crypto/Kconfig | 23 -- + arch/x86/crypto/Makefile | 6 - + arch/x86/crypto/aesni-intel_glue.c | 1 + + arch/x86/crypto/ghash-clmulni-intel_glue.c | 163 -------- + arch/x86/crypto/sm3_avx_glue.c | 100 ----- + crypto/Kconfig | 17 +- + crypto/Makefile | 3 +- + crypto/aes.c | 183 ++++++++- + crypto/gcm.c | 427 ++++----------------- + crypto/ghash-generic.c | 162 -------- + crypto/hctr2.c | 2 +- + crypto/jitterentropy-kcapi.c | 116 ++---- + crypto/jitterentropy.c | 25 +- + crypto/jitterentropy.h | 19 +- + crypto/sm3.c | 89 +++++ + crypto/sm3_generic.c | 72 ---- + crypto/tcrypt.c | 9 - + crypto/testmgr.c | 28 +- + crypto/testmgr.h | 109 ------ + drivers/crypto/Kconfig | 2 +- + drivers/crypto/starfive/Kconfig | 2 +- + drivers/crypto/starfive/jh7110-aes.c | 4 +- + drivers/crypto/starfive/jh7110-hash.c | 8 +- + drivers/virt/coco/guest/Kconfig | 1 - + include/crypto/aes-cbc-macs.h | 154 ++++++++ + include/crypto/aes.h | 66 ++++ + include/crypto/gcm.h | 4 +- + include/crypto/{polyval.h => gf128hash.h} | 126 +++++- + include/crypto/gf128mul.h | 17 +- + include/crypto/ghash.h | 12 - + include/crypto/internal/blockhash.h | 52 --- + include/crypto/sm3.h | 89 +++-- + include/crypto/sm3_base.h | 82 ---- + lib/Kconfig.debug | 2 + + lib/crypto/.kunitconfig | 23 +- + lib/crypto/Kconfig | 66 ++-- + lib/crypto/Makefile | 77 ++-- + lib/crypto/aes.c | 231 ++++++++++- + lib/crypto/aesgcm.c | 55 +-- + lib/crypto/arm/gf128hash.h | 43 +++ + lib/crypto/arm/ghash-neon-core.S | 209 ++++++++++ + {arch/arm64/crypto => lib/crypto/arm64}/aes-ce.S | 3 +- + .../arm64/crypto => lib/crypto/arm64}/aes-modes.S | 25 +- + {arch/arm64/crypto => lib/crypto/arm64}/aes-neon.S | 2 +- + lib/crypto/arm64/aes.h | 84 +++- + lib/crypto/arm64/gf128hash.h | 137 +++++++ + lib/crypto/arm64/ghash-neon-core.S | 220 +++++++++++ + lib/crypto/arm64/polyval.h | 80 ---- + lib/crypto/arm64/sha256.h | 8 +- + lib/crypto/arm64/sha512.h | 5 +- + .../crypto => lib/crypto/arm64}/sm3-ce-core.S | 11 +- + .../crypto => lib/crypto/arm64}/sm3-neon-core.S | 9 +- + lib/crypto/arm64/sm3.h | 41 ++ + lib/crypto/fips.h | 5 + + lib/crypto/{polyval.c => gf128hash.c} | 183 +++++++-- + lib/crypto/gf128mul.c | 73 +--- + lib/crypto/powerpc/.gitignore | 1 + + lib/crypto/powerpc/gf128hash.h | 109 ++++++ + .../crypto => lib/crypto/powerpc}/ghashp8-ppc.pl | 1 + + lib/crypto/riscv/gf128hash.h | 57 +++ + .../crypto/riscv}/ghash-riscv64-zvkg.S | 13 +- + .../crypto/riscv}/sm3-riscv64-zvksh-zvkb.S | 3 +- + lib/crypto/riscv/sm3.h | 39 ++ + lib/crypto/s390/gf128hash.h | 54 +++ + lib/crypto/sm3.c | 148 +++++-- + lib/crypto/tests/Kconfig | 76 +++- + lib/crypto/tests/Makefile | 3 + + lib/crypto/tests/aes-cmac-testvecs.h | 181 +++++++++ + lib/crypto/tests/aes_cbc_macs_kunit.c | 228 +++++++++++ + lib/crypto/tests/ghash-testvecs.h | 186 +++++++++ + lib/crypto/tests/ghash_kunit.c | 194 ++++++++++ + lib/crypto/tests/polyval_kunit.c | 2 +- + lib/crypto/tests/sm3-testvecs.h | 231 +++++++++++ + lib/crypto/tests/sm3_kunit.c | 31 ++ + lib/crypto/x86/{polyval.h => gf128hash.h} | 72 +++- + .../crypto/x86/ghash-pclmul.S | 98 +++-- + lib/crypto/x86/sha256.h | 25 ++ + .../x86/crypto => lib/crypto/x86}/sm3-avx-asm_64.S | 13 +- + lib/crypto/x86/sm3.h | 39 ++ + net/mac80211/Kconfig | 2 +- + net/mac80211/aes_cmac.c | 65 +--- + net/mac80211/aes_cmac.h | 12 +- + net/mac80211/fils_aead.c | 48 +-- + net/mac80211/key.c | 11 +- + net/mac80211/key.h | 3 +- + net/mac80211/wpa.c | 13 +- + samples/Kconfig | 2 + + samples/tsm-mr/tsm_mr_sample.c | 66 ++-- + scripts/crypto/gen-fips-testvecs.py | 10 + + scripts/crypto/gen-hash-testvecs.py | 97 ++++- + security/integrity/ima/Kconfig | 2 +- + tools/testing/kunit/configs/all_tests.config | 2 + + 134 files changed, 4061 insertions(+), 3688 deletions(-) + delete mode 100644 arch/arm64/crypto/sm3-ce-glue.c + delete mode 100644 arch/arm64/crypto/sm3-neon-glue.c + delete mode 100644 arch/powerpc/crypto/ghash.c + delete mode 100644 arch/riscv/crypto/ghash-riscv64-glue.c + delete mode 100644 arch/riscv/crypto/sm3-riscv64-glue.c + delete mode 100644 arch/s390/crypto/ghash_s390.c + delete mode 100644 arch/x86/crypto/ghash-clmulni-intel_glue.c + delete mode 100644 arch/x86/crypto/sm3_avx_glue.c + delete mode 100644 crypto/ghash-generic.c + create mode 100644 crypto/sm3.c + delete mode 100644 crypto/sm3_generic.c + create mode 100644 include/crypto/aes-cbc-macs.h + rename include/crypto/{polyval.h => gf128hash.h} (60%) + delete mode 100644 include/crypto/internal/blockhash.h + delete mode 100644 include/crypto/sm3_base.h + create mode 100644 lib/crypto/arm/gf128hash.h + create mode 100644 lib/crypto/arm/ghash-neon-core.S + rename {arch/arm64/crypto => lib/crypto/arm64}/aes-ce.S (96%) + rename {arch/arm64/crypto => lib/crypto/arm64}/aes-modes.S (98%) + rename {arch/arm64/crypto => lib/crypto/arm64}/aes-neon.S (99%) + create mode 100644 lib/crypto/arm64/gf128hash.h + create mode 100644 lib/crypto/arm64/ghash-neon-core.S + delete mode 100644 lib/crypto/arm64/polyval.h + rename {arch/arm64/crypto => lib/crypto/arm64}/sm3-ce-core.S (93%) + rename {arch/arm64/crypto => lib/crypto/arm64}/sm3-neon-core.S (98%) + create mode 100644 lib/crypto/arm64/sm3.h + rename lib/crypto/{polyval.c => gf128hash.c} (61%) + create mode 100644 lib/crypto/powerpc/gf128hash.h + rename {arch/powerpc/crypto => lib/crypto/powerpc}/ghashp8-ppc.pl (98%) + create mode 100644 lib/crypto/riscv/gf128hash.h + rename {arch/riscv/crypto => lib/crypto/riscv}/ghash-riscv64-zvkg.S (91%) + rename {arch/riscv/crypto => lib/crypto/riscv}/sm3-riscv64-zvksh-zvkb.S (97%) + create mode 100644 lib/crypto/riscv/sm3.h + create mode 100644 lib/crypto/s390/gf128hash.h + create mode 100644 lib/crypto/tests/aes-cmac-testvecs.h + create mode 100644 lib/crypto/tests/aes_cbc_macs_kunit.c + create mode 100644 lib/crypto/tests/ghash-testvecs.h + create mode 100644 lib/crypto/tests/ghash_kunit.c + create mode 100644 lib/crypto/tests/sm3-testvecs.h + create mode 100644 lib/crypto/tests/sm3_kunit.c + rename lib/crypto/x86/{polyval.h => gf128hash.h} (51%) + rename arch/x86/crypto/ghash-clmulni-intel_asm.S => lib/crypto/x86/ghash-pclmul.S (54%) + rename {arch/x86/crypto => lib/crypto/x86}/sm3-avx-asm_64.S (98%) + create mode 100644 lib/crypto/x86/sm3.h +Merging drm/drm-next (a51973c5dff8a Merge tag 'drm-xe-next-2026-03-26-1' 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 +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/accel/ivpu/ivpu_drv.h +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/resource/dce60/dce60_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn32/dcn32_resource.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c +Auto-merging drivers/gpu/drm/drm_bridge.c +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power_well.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_dmc.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp_tunnel.c +Auto-merging drivers/gpu/drm/i915/display/intel_gmbus.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c +Auto-merging drivers/gpu/drm/imagination/pvr_power.c +Auto-merging drivers/gpu/drm/mediatek/mtk_dsi.c +Auto-merging drivers/gpu/drm/xe/regs/xe_gt_regs.h +Auto-merging drivers/gpu/drm/xe/xe_ggtt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_ggtt.c +Auto-merging drivers/gpu/drm/xe/xe_ggtt_types.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_ggtt_types.h +Auto-merging drivers/gpu/drm/xe/xe_gt_ccs_mode.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_ccs_mode.c +Auto-merging drivers/gpu/drm/xe/xe_guc.c +Auto-merging drivers/gpu/drm/xe/xe_guc_ct.c +Auto-merging drivers/gpu/drm/xe/xe_guc_submit.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_submit.c +Auto-merging drivers/gpu/drm/xe/xe_lrc.c +Auto-merging drivers/gpu/drm/xe/xe_oa.c +Auto-merging drivers/gpu/drm/xe/xe_pt.c +Auto-merging drivers/gpu/drm/xe/xe_vm.c +Auto-merging drivers/gpu/drm/xe/xe_vm_types.h +Auto-merging drivers/gpu/drm/xe/xe_wa.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_wa.c +Auto-merging drivers/infiniband/core/ib_core_uverbs.c +Auto-merging drivers/infiniband/core/umem_dmabuf.c +Auto-merging drivers/infiniband/hw/mlx5/mr.c +Auto-merging drivers/vfio/pci/vfio_pci_dmabuf.c +Auto-merging include/linux/mmu_notifier.h +Auto-merging mm/mmu_notifier.c +Resolved 'drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c' using previous resolution. +Resolved 'drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c' using previous resolution. +Resolved 'drivers/gpu/drm/drm_gem_shmem_helper.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_ggtt.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_ggtt_types.h' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_gt_ccs_mode.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_guc_submit.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_wa.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d9b5dc219a8e1] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-driver-intel-xe-sriov | 31 + + Documentation/devicetree/bindings/arm/qcom.yaml | 6 + + .../devicetree/bindings/display/arm,komeda.yaml | 4 +- + .../bindings/display/bridge/analogix,anx7625.yaml | 98 +- + .../bindings/display/bridge/fsl,ldb.yaml | 18 + + .../bindings/display/bridge/lontium,lt8713sx.yaml | 113 + + .../bindings/display/bridge/lontium,lt9611.yaml | 15 +- + .../display/bridge/thead,th1520-dw-hdmi.yaml | 120 + + .../bindings/display/bridge/waveshare,dsi2dpi.yaml | 3 + + .../bindings/display/mediatek/mediatek,aal.yaml | 1 + + .../bindings/display/mediatek/mediatek,ccorr.yaml | 4 +- + .../bindings/display/mediatek/mediatek,dither.yaml | 1 + + .../bindings/display/mediatek/mediatek,gamma.yaml | 1 + + .../bindings/display/mediatek/mediatek,ovl.yaml | 1 + + .../bindings/display/mediatek/mediatek,rdma.yaml | 1 + + .../bindings/display/mediatek/mediatek,wdma.yaml | 4 +- + .../bindings/display/panel/abt,y030xx067a.yaml | 5 - + .../display/panel/advantech,idk-1110wr.yaml | 4 +- + .../display/panel/advantech,idk-2121wr.yaml | 4 +- + .../display/panel/bananapi,s070wv20-ct16.yaml | 4 +- + .../bindings/display/panel/dlc,dlc0700yzg-1.yaml | 4 +- + .../display/panel/feiyang,fy07024di26a30d.yaml | 1 - + .../bindings/display/panel/himax,hx83102.yaml | 2 + + .../bindings/display/panel/himax,hx83112a.yaml | 2 - + .../bindings/display/panel/himax,hx83121a.yaml | 91 + + .../bindings/display/panel/himax,hx8394.yaml | 7 +- + .../bindings/display/panel/ilitek,ili9163.yaml | 4 - + .../bindings/display/panel/ilitek,ili9322.yaml | 3 - + .../bindings/display/panel/ilitek,ili9341.yaml | 6 +- + .../bindings/display/panel/ilitek,ili9806e.yaml | 38 +- + .../bindings/display/panel/innolux,ej030na.yaml | 5 - + .../bindings/display/panel/innolux,p097pfg.yaml | 26 +- + .../bindings/display/panel/jadard,jd9365da-h3.yaml | 4 +- + .../display/panel/kingdisplay,kd035g6-54nt.yaml | 5 - + .../display/panel/leadtek,ltk050h3146w.yaml | 1 + + .../display/panel/leadtek,ltk500hd1829.yaml | 1 + + .../bindings/display/panel/lgphilips,lb035q02.yaml | 4 - + .../bindings/display/panel/lxd,m9189a.yaml | 64 + + .../display/panel/mantix,mlaf057we51-x.yaml | 5 +- + .../display/panel/mitsubishi,aa104xd12.yaml | 4 +- + .../display/panel/mitsubishi,aa121td01.yaml | 4 +- + .../bindings/display/panel/motorola,mot-panel.yaml | 69 + + .../bindings/display/panel/nec,nl8048hl11.yaml | 4 - + .../bindings/display/panel/novatek,nt35510.yaml | 3 +- + .../bindings/display/panel/novatek,nt36523.yaml | 3 - + .../bindings/display/panel/novatek,nt36672a.yaml | 3 - + .../bindings/display/panel/orisetech,otm8009a.yaml | 4 +- + .../bindings/display/panel/panel-edp-legacy.yaml | 2 + + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 10 +- + .../bindings/display/panel/pda,91-00156-a0.yaml | 4 +- + .../bindings/display/panel/raydium,rm68200.yaml | 4 +- + .../bindings/display/panel/raydium,rm692e5.yaml | 2 - + .../bindings/display/panel/renesas,r61307.yaml | 3 +- + .../bindings/display/panel/renesas,r69328.yaml | 1 - + .../display/panel/rocktech,jh057n00900.yaml | 5 +- + .../bindings/display/panel/samsung,atna33xc20.yaml | 4 +- + .../bindings/display/panel/samsung,ld9040.yaml | 4 - + .../bindings/display/panel/samsung,lms380kf01.yaml | 6 - + .../bindings/display/panel/samsung,lms397kf04.yaml | 6 - + .../bindings/display/panel/samsung,s6d27a1.yaml | 6 - + .../bindings/display/panel/samsung,s6d7aa0.yaml | 8 + + .../bindings/display/panel/samsung,s6e3ha8.yaml | 4 - + .../bindings/display/panel/samsung,s6e63m0.yaml | 2 - + .../panel/samsung,s6e8aa5x01-ams561ra01.yaml | 5 +- + .../bindings/display/panel/sgd,gktw70sdae4se.yaml | 4 +- + .../bindings/display/panel/sitronix,st7701.yaml | 6 - + .../bindings/display/panel/sitronix,st7789v.yaml | 6 - + .../bindings/display/panel/sony,acx565akm.yaml | 4 - + .../display/panel/sony,tulip-truly-nt35521.yaml | 2 - + .../display/panel/startek,kd070fhfid015.yaml | 11 +- + .../devicetree/bindings/display/panel/tpo,td.yaml | 5 - + .../bindings/display/panel/visionox,r66451.yaml | 4 +- + .../bindings/display/panel/visionox,rm69299.yaml | 4 +- + .../bindings/display/panel/visionox,vtdr6130.yaml | 4 +- + .../bindings/display/rockchip/rockchip,dw-dp.yaml | 27 +- + .../devicetree/bindings/display/tilcdc/panel.txt | 1 + + .../bindings/display/tilcdc/ti,am33xx-tilcdc.yaml | 100 + + .../devicetree/bindings/display/tilcdc/tilcdc.txt | 82 - + .../bindings/display/verisilicon,dc.yaml | 122 + + .../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 10 + + Documentation/gpu/drm-kms-helpers.rst | 12 - + Documentation/gpu/drm-mm.rst | 10 +- + Documentation/gpu/drm-ras.rst | 103 + + Documentation/gpu/drm-uapi.rst | 14 +- + Documentation/gpu/index.rst | 1 + + Documentation/gpu/introduction.rst | 6 - + Documentation/gpu/todo.rst | 32 + + Documentation/gpu/xe/xe_firmware.rst | 3 + + Documentation/netlink/specs/drm_ras.yaml | 115 + + MAINTAINERS | 31 +- + drivers/accel/amdxdna/Makefile | 1 + + drivers/accel/amdxdna/aie2_ctx.c | 95 +- + drivers/accel/amdxdna/aie2_error.c | 5 +- + drivers/accel/amdxdna/aie2_message.c | 139 +- + drivers/accel/amdxdna/aie2_msg_priv.h | 52 + + drivers/accel/amdxdna/aie2_pci.c | 71 + + drivers/accel/amdxdna/aie2_pci.h | 38 +- + drivers/accel/amdxdna/amdxdna_ctx.c | 29 +- + drivers/accel/amdxdna/amdxdna_ctx.h | 33 +- + drivers/accel/amdxdna/amdxdna_gem.c | 515 +- + drivers/accel/amdxdna/amdxdna_gem.h | 39 +- + drivers/accel/amdxdna/amdxdna_iommu.c | 184 + + drivers/accel/amdxdna/amdxdna_mailbox.c | 2 +- + drivers/accel/amdxdna/amdxdna_pci_drv.c | 55 +- + drivers/accel/amdxdna/amdxdna_pci_drv.h | 28 + + drivers/accel/amdxdna/amdxdna_ubuf.c | 17 +- + drivers/accel/amdxdna/amdxdna_ubuf.h | 5 - + drivers/accel/amdxdna/npu4_regs.c | 3 +- + drivers/accel/ivpu/ivpu_debugfs.c | 14 +- + drivers/accel/ivpu/ivpu_drv.c | 95 +- + drivers/accel/ivpu/ivpu_drv.h | 29 +- + drivers/accel/ivpu/ivpu_gem.c | 12 +- + drivers/accel/ivpu/ivpu_job.c | 86 +- + drivers/accel/ivpu/ivpu_jsm_msg.c | 19 +- + drivers/accel/ivpu/ivpu_jsm_msg.h | 3 +- + drivers/accel/ivpu/ivpu_mmu.c | 3 +- + drivers/accel/ivpu/ivpu_pm.c | 15 +- + drivers/accel/ivpu/ivpu_pm.h | 1 + + drivers/accel/ivpu/vpu_boot_api.h | 211 +- + drivers/dma-buf/Kconfig | 12 - + drivers/dma-buf/dma-buf.c | 69 +- + drivers/dma-buf/dma-fence-array.c | 19 +- + drivers/dma-buf/dma-fence-chain.c | 16 +- + drivers/dma-buf/dma-fence.c | 168 +- + drivers/dma-buf/dma-resv.c | 5 +- + drivers/dma-buf/heaps/cma_heap.c | 7 +- + drivers/dma-buf/st-dma-fence.c | 50 +- + drivers/dma-buf/sw_sync.c | 14 +- + drivers/dma-buf/sync_debug.h | 2 +- + drivers/firmware/google/Kconfig | 5 +- + drivers/firmware/google/cbmem.c | 1 + + drivers/firmware/google/coreboot_table.c | 13 +- + drivers/firmware/google/coreboot_table.h | 59 +- + drivers/firmware/google/framebuffer-coreboot.c | 126 +- + drivers/firmware/google/memconsole-coreboot.c | 1 + + drivers/firmware/google/vpd.c | 1 + + drivers/gpu/Kconfig | 13 + + drivers/gpu/Makefile | 4 +- + drivers/gpu/buddy.c | 1525 + + drivers/gpu/drm/Kconfig | 18 +- + drivers/gpu/drm/Kconfig.debug | 2 - + drivers/gpu/drm/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 161 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 173 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 85 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 834 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 572 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c | 251 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.h | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 118 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 100 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 49 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 26 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 59 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c | 958 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h | 163 + + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 163 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 206 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 776 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 18 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 77 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 79 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 28 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 21 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 28 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 52 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 31 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 20 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 33 + + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 189 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h | 223 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.c | 193 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 86 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c | 33 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 85 +- + drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 36 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.c | 840 + + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.h | 111 + + drivers/gpu/drm/amd/amdgpu/lsdma_v7_1.c | 99 + + drivers/gpu/drm/amd/amdgpu/lsdma_v7_1.h | 31 + + drivers/gpu/drm/amd/amdgpu/mes_v12_1.c | 396 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 49 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 18 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 18 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 55 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c | 195 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 30 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 31 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 54 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 39 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 35 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 54 +- + drivers/gpu/drm/amd/amdgpu/si.c | 66 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 31 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 68 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 1 - + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 25 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 30 +- + drivers/gpu/drm/amd/amdgpu/soc24.c | 20 +- + drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 147 +- + drivers/gpu/drm/amd/amdgpu/soc_v1_0.h | 2 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 117 +- + drivers/gpu/drm/amd/amdgpu/vce_v1_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 19 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_2.c | 1219 + + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_2.h | 29 + + drivers/gpu/drm/amd/amdgpu/vi.c | 76 +- + drivers/gpu/drm/amd/amdkfd/Kconfig | 2 +- + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 6 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm | 3 - + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 7 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 35 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v12_1.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 30 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 361 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 21 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 27 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 7 - + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 1 - + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 52 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 9 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 14 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 39 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 124 +- + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 23 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 30 +- + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 64 +- + .../amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c | 166 - + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 1 + + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 14 +- + .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 1176 + + .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.h | 79 + + .../drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.c | 431 + + .../drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.h | 190 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 741 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 60 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 12 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 11 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 9 + + drivers/gpu/drm/amd/display/dc/dc.h | 106 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 7 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 27 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 9 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 6 +- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_helper.c | 2 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 79 +- + drivers/gpu/drm/amd/display/dc/dc_plane.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc_trace.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 40 +- + drivers/gpu/drm/amd/display/dc/dccg/Makefile | 11 +- + .../gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.h | 16 +- + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 20 + + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c | 333 + + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.h | 273 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 60 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 131 - + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 9 - + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 966 - + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 64 +- + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 16 + + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.h | 31 + + drivers/gpu/drm/amd/display/dc/dio/Makefile | 11 +- + .../display/dc/dio/dcn10/dcn10_stream_encoder.h | 10 +- + .../display/dc/dio/dcn42/dcn42_dio_link_encoder.c | 205 + + .../display/dc/dio/dcn42/dcn42_dio_link_encoder.h | 140 + + .../dc/dio/dcn42/dcn42_dio_stream_encoder.c | 522 + + .../dc/dio/dcn42/dcn42_dio_stream_encoder.h | 206 + + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 6 +- + drivers/gpu/drm/amd/display/dc/dml2_0/Makefile | 3 + + .../drm/amd/display/dc/dml2_0/display_mode_core.c | 4 +- + .../dc/dml2_0/dml21/dml21_translation_helper.c | 64 +- + .../dc/dml2_0/dml21/dml21_translation_helper.h | 1 + + .../drm/amd/display/dc/dml2_0/dml21/dml21_utils.c | 228 +- + .../drm/amd/display/dc/dml2_0/dml21/dml21_utils.h | 1 + + .../amd/display/dc/dml2_0/dml21/dml21_wrapper.c | 15 +- + .../dml2_0/dml21/inc/bounding_boxes/dcn42_soc_bb.h | 263 + + .../dml2_0/dml21/inc/dml_top_display_cfg_types.h | 13 + + .../dml2_0/dml21/inc/dml_top_soc_parameter_types.h | 3 + + .../display/dc/dml2_0/dml21/inc/dml_top_types.h | 3 + + .../dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn4.c | 112 + + .../dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn4.h | 1 + + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 54 +- + .../dml2_0/dml21/src/dml2_core/dml2_core_factory.c | 9 + + .../dml2_0/dml21/src/dml2_core/dml2_core_utils.c | 63 +- + .../dml2_0/dml21/src/dml2_core/dml2_core_utils.h | 2 + + .../dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 33 + + .../dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h | 1 + + .../dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 6 + + .../dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_dcn4.h | 2 +- + .../dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_dcn42.c | 76 + + .../dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_dcn42.h | 12 + + .../dml2_0/dml21/src/dml2_mcg/dml2_mcg_factory.c | 6 + + .../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 6 + + .../dml2_0/dml21/src/dml2_pmo/dml2_pmo_factory.c | 4 +- + .../dml2_0/dml21/src/dml2_pmo/dml2_pmo_factory.h | 2 +- + .../dml21/src/dml2_top/dml2_top_interfaces.c | 2 + + .../dc/dml2_0/dml21/src/dml2_top/dml2_top_legacy.c | 1 - + .../dml21/src/inc/dml2_internal_shared_types.h | 3 + + .../amd/display/dc/dml2_0/dml2_dc_resource_mgmt.c | 8 +- + .../drm/amd/display/dc/dml2_0/dml2_mall_phantom.c | 41 +- + .../display/dc/dml2_0/dml2_translation_helper.c | 6 +- + .../gpu/drm/amd/display/dc/dml2_0/dml2_wrapper.c | 3 +- + .../gpu/drm/amd/display/dc/dml2_0/dml2_wrapper.h | 1 + + drivers/gpu/drm/amd/display/dc/dpp/Makefile | 10 +- + .../gpu/drm/amd/display/dc/dpp/dcn10/dcn10_dpp.c | 8 +- + .../drm/amd/display/dc/dpp/dcn10/dcn10_dpp_dscl.c | 4 +- + .../gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c | 8 +- + .../drm/amd/display/dc/dpp/dcn30/dcn30_dpp_cm.c | 2 + + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h | 5 +- + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 27 +- + .../gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.c | 333 + + .../gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.h | 469 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 13 +- + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 2 +- + .../gpu/drm/amd/display/dc/dsc/dcn35/dcn35_dsc.c | 2 +- + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 13 +- + .../amd/display/dc/gpio/dcn42/hw_factory_dcn42.c | 254 + + .../amd/display/dc/gpio/dcn42/hw_factory_dcn42.h | 31 + + .../amd/display/dc/gpio/dcn42/hw_translate_dcn42.c | 205 + + .../amd/display/dc/gpio/dcn42/hw_translate_dcn42.h | 36 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 4 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 4 + + drivers/gpu/drm/amd/display/dc/hpo/Makefile | 11 +- + .../dc/hpo/dcn31/dcn31_hpo_dp_stream_encoder.c | 5 + + .../dc/hpo/dcn31/dcn31_hpo_dp_stream_encoder.h | 10 +- + .../dc/hpo/dcn42/dcn42_hpo_dp_link_encoder.c | 93 + + .../dc/hpo/dcn42/dcn42_hpo_dp_link_encoder.h | 17 + + drivers/gpu/drm/amd/display/dc/hubbub/Makefile | 10 +- + .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h | 6 +- + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 4 - + .../drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.c | 574 + + .../drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.h | 268 + + drivers/gpu/drm/amd/display/dc/hubp/Makefile | 10 +- + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h | 8 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 208 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h | 23 +- + .../gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.c | 741 + + .../gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.h | 79 + + drivers/gpu/drm/amd/display/dc/hwss/Makefile | 12 +- + .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h | 13 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 128 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 32 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 1 - + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 17 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 12 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 566 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 3 +- + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 1102 + + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.h | 47 + + .../gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.c | 173 + + .../gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.h | 11 + + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 25 +- + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 24 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 102 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 10 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 36 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 20 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 100 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 1 + + drivers/gpu/drm/amd/display/dc/irq/Makefile | 9 + + .../amd/display/dc/irq/dcn42/irq_service_dcn42.c | 412 + + .../amd/display/dc/irq/dcn42/irq_service_dcn42.h | 15 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 80 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 637 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 29 +- + .../display/dc/link/protocols/link_dp_capability.c | 2 + + .../amd/display/dc/link/protocols/link_dp_dpia.c | 2 +- + .../dc/link/protocols/link_dp_irq_handler.c | 36 +- + .../dc/link/protocols/link_dp_panel_replay.c | 25 +- + .../dc/link/protocols/link_edp_panel_control.c | 11 +- + drivers/gpu/drm/amd/display/dc/mmhubbub/Makefile | 10 +- + .../amd/display/dc/mmhubbub/dcn42/dcn42_mmhubbub.c | 25 + + .../amd/display/dc/mmhubbub/dcn42/dcn42_mmhubbub.h | 13 + + drivers/gpu/drm/amd/display/dc/mpc/Makefile | 10 +- + .../gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c | 4 +- + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 190 +- + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h | 35 +- + .../gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c | 797 + + .../gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.h | 962 + + drivers/gpu/drm/amd/display/dc/optc/Makefile | 10 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 26 +- + .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c | 2 +- + .../gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.c | 291 + + .../gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.h | 220 + + drivers/gpu/drm/amd/display/dc/pg/Makefile | 10 +- + .../drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.c | 649 + + .../drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.h | 175 + + drivers/gpu/drm/amd/display/dc/resource/Makefile | 18 + + .../amd/display/dc/resource/dce60/dce60_resource.c | 2 +- + .../amd/display/dc/resource/dcn10/dcn10_resource.c | 9 +- + .../amd/display/dc/resource/dcn10/dcn10_resource.h | 2 + + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 5 +- + .../display/dc/resource/dcn201/dcn201_resource.c | 3 +- + .../amd/display/dc/resource/dcn21/dcn21_resource.c | 3 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 3 +- + .../display/dc/resource/dcn301/dcn301_resource.c | 3 +- + .../display/dc/resource/dcn302/dcn302_resource.c | 3 +- + .../display/dc/resource/dcn303/dcn303_resource.c | 3 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 3 + + .../display/dc/resource/dcn314/dcn314_resource.c | 3 +- + .../display/dc/resource/dcn315/dcn315_resource.c | 5 +- + .../display/dc/resource/dcn316/dcn316_resource.c | 3 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 1 + + .../display/dc/resource/dcn321/dcn321_resource.c | 1 + + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 3 +- + .../display/dc/resource/dcn351/dcn351_resource.c | 3 +- + .../amd/display/dc/resource/dcn36/dcn36_resource.c | 3 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 11 +- + .../display/dc/resource/dcn401/dcn401_resource.h | 3 + + .../amd/display/dc/resource/dcn42/dcn42_resource.c | 2340 + + .../amd/display/dc/resource/dcn42/dcn42_resource.h | 591 + + .../display/dc/resource/dcn42/dcn42_resource_fpu.c | 47 + + .../dcn42/dcn42_resource_fpu.h} | 17 +- + .../amd/display/dc/soc_and_ip_translator/Makefile | 3 + + .../dcn401/dcn401_soc_and_ip_translator.c | 3 + + .../dcn42/dcn42_soc_and_ip_translator.c | 171 +- + .../dcn42/dcn42_soc_and_ip_translator.h | 1 + + .../soc_and_ip_translator/soc_and_ip_translator.c | 4 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 5 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 126 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 3 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.c | 753 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.h | 171 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 64 +- + .../drm/amd/display/include/bios_parser_types.h | 2 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 1 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 3 + + .../drm/amd/display/modules/color/color_gamma.c | 2 + + .../drm/amd/display/modules/freesync/freesync.c | 6 + + drivers/gpu/drm/amd/display/modules/hdcp/hdcp.h | 1 + + .../amd/include/asic_reg/clk/clk_15_0_0_offset.h | 44 + + .../amd/include/asic_reg/clk/clk_15_0_0_sh_mask.h | 52 + + .../amd/include/asic_reg/dcn/dcn_4_2_0_offset.h | 17880 +++++ + .../amd/include/asic_reg/dcn/dcn_4_2_0_sh_mask.h | 67286 +++++++++++++++++++ + .../amd/include/asic_reg/dpcs/dpcs_4_0_0_offset.h | 142 + + .../amd/include/asic_reg/dpcs/dpcs_4_0_0_sh_mask.h | 688 + + .../include/asic_reg/lsdma/lsdma_7_1_0_offset.h | 44 + + .../include/asic_reg/lsdma/lsdma_7_1_0_sh_mask.h | 105 + + drivers/gpu/drm/amd/include/atomfirmware.h | 6 +- + drivers/gpu/drm/amd/include/discovery.h | 13 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 72 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 54 +- + drivers/gpu/drm/amd/pm/legacy-dpm/si_smc.c | 16 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 20 + + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 3 + + .../pm/swsmu/inc/pmfw_if/smu15_driver_if_v15_0_8.h | 295 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v15_0_8_pmfw.h | 427 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v15_0_8_ppsmc.h | 100 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 19 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 - + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v15_0.h | 57 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 44 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 42 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 99 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 13 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 1 - + drivers/gpu/drm/amd/pm/swsmu/smu15/Makefile | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c | 212 +- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.c | 3 +- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c | 2270 + + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.h | 313 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 39 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 2 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c | 34 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.h | 1 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1_v13_0.c | 46 + + .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_process.c | 10 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_sys.c | 3 +- + .../gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c | 169 +- + .../gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.h | 14 +- + drivers/gpu/drm/amd/ras/rascore/Makefile | 3 +- + drivers/gpu/drm/amd/ras/rascore/ras.h | 30 + + drivers/gpu/drm/amd/ras/rascore/ras_aca.c | 29 +- + drivers/gpu/drm/amd/ras/rascore/ras_cmd.c | 9 +- + drivers/gpu/drm/amd/ras/rascore/ras_cmd.h | 29 + + drivers/gpu/drm/amd/ras/rascore/ras_core.c | 74 +- + drivers/gpu/drm/amd/ras/rascore/ras_eeprom.c | 4 +- + drivers/gpu/drm/amd/ras/rascore/ras_eeprom.h | 7 - + drivers/gpu/drm/amd/ras/rascore/ras_eeprom_fw.c | 520 + + drivers/gpu/drm/amd/ras/rascore/ras_eeprom_fw.h | 87 + + drivers/gpu/drm/amd/ras/rascore/ras_umc.c | 39 +- + drivers/gpu/drm/amd/ras/rascore/ras_umc.h | 2 + + drivers/gpu/drm/amd/ras/rascore/ras_umc_v12_0.c | 19 +- + .../gpu/drm/arm/display/include/malidp_product.h | 1 + + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 14 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 1 + + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 1 + + .../drm/arm/display/komeda/komeda_framebuffer.c | 6 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 7 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 2 +- + .../drm/arm/display/komeda/komeda_private_obj.c | 208 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 81 + + drivers/gpu/drm/bridge/Kconfig | 21 + + drivers/gpu/drm/bridge/Makefile | 2 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 +- + drivers/gpu/drm/bridge/analogix/Kconfig | 2 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 292 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 4 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 216 +- + drivers/gpu/drm/bridge/analogix/anx7625.h | 34 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 281 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 4 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-hdcp.c | 18 +- + drivers/gpu/drm/bridge/fsl-ldb.c | 7 + + drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 50 +- + drivers/gpu/drm/bridge/inno-hdmi.c | 6 +- + drivers/gpu/drm/bridge/ite-it6263.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt8713sx.c | 598 + + drivers/gpu/drm/bridge/lontium-lt9611.c | 46 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 7 +- + drivers/gpu/drm/bridge/synopsys/dw-dp.c | 83 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 224 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.h | 3 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 16 +- + drivers/gpu/drm/bridge/tda998x_drv.c | 263 +- + drivers/gpu/drm/bridge/th1520-dw-hdmi.c | 173 + + drivers/gpu/drm/bridge/waveshare-dsi.c | 16 +- + drivers/gpu/drm/display/drm_bridge_connector.c | 22 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 36 +- + drivers/gpu/drm/display/drm_dp_tunnel.c | 25 +- + drivers/gpu/drm/display/drm_hdmi_helper.c | 7 +- + drivers/gpu/drm/display/drm_hdmi_state_helper.c | 60 +- + drivers/gpu/drm/drm_atomic.c | 30 +- + drivers/gpu/drm/drm_atomic_helper.c | 6 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 24 + + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_blend.c | 39 +- + drivers/gpu/drm/drm_bridge.c | 66 +- + drivers/gpu/drm/drm_buddy.c | 1272 +- + drivers/gpu/drm/drm_client.c | 3 +- + drivers/gpu/drm/drm_colorop.c | 77 +- + drivers/gpu/drm/drm_connector.c | 49 +- + drivers/gpu/drm/drm_crtc.c | 10 +- + drivers/gpu/drm/drm_drv.c | 8 +- + drivers/gpu/drm/drm_edid.c | 18 +- + drivers/gpu/drm/drm_fb_helper.c | 45 +- + drivers/gpu/drm/drm_gem.c | 56 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 22 - + drivers/gpu/drm/drm_gem_dma_helper.c | 23 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 89 +- + drivers/gpu/drm/drm_gpusvm.c | 14 +- + drivers/gpu/drm/drm_mipi_dbi.c | 394 +- + drivers/gpu/drm/drm_mode_config.c | 12 + + drivers/gpu/drm/drm_modeset_helper.c | 3 - + drivers/gpu/drm/drm_pagemap.c | 157 +- + drivers/gpu/drm/drm_prime.c | 2 +- + drivers/gpu/drm/drm_probe_helper.c | 2 +- + drivers/gpu/drm/drm_ras.c | 354 + + drivers/gpu/drm/drm_ras_genl_family.c | 42 + + drivers/gpu/drm/drm_ras_nl.c | 56 + + drivers/gpu/drm/drm_ras_nl.h | 24 + + drivers/gpu/drm/drm_self_refresh_helper.c | 2 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 83 - + drivers/gpu/drm/drm_suballoc.c | 106 +- + drivers/gpu/drm/drm_writeback.c | 2 +- + drivers/gpu/drm/gma500/fbdev.c | 101 +- + drivers/gpu/drm/gma500/framebuffer.c | 104 +- + drivers/gpu/drm/gma500/psb_drv.h | 6 - + drivers/gpu/drm/gud/gud_pipe.c | 2 +- + drivers/gpu/drm/i915/Makefile | 7 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 1 - + drivers/gpu/drm/i915/display/g4x_hdmi.c | 1 - + drivers/gpu/drm/i915/display/hsw_ips.c | 10 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 1 - + drivers/gpu/drm/i915/display/i9xx_wm.c | 10 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 7 - + drivers/gpu/drm/i915/display/intel_alpm.c | 144 +- + drivers/gpu/drm/i915/display/intel_alpm.h | 9 +- + drivers/gpu/drm/i915/display/intel_audio.c | 24 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 1 - + drivers/gpu/drm/i915/display/intel_bios.c | 31 +- + drivers/gpu/drm/i915/display/intel_bo.c | 100 +- + drivers/gpu/drm/i915/display/intel_bo.h | 14 +- + drivers/gpu/drm/i915/display/intel_bw.c | 24 +- + drivers/gpu/drm/i915/display/intel_casf.c | 7 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 63 +- + .../gpu/drm/i915/display/intel_color_pipeline.c | 175 +- + drivers/gpu/drm/i915/display/intel_colorop.c | 6 + + drivers/gpu/drm/i915/display/intel_colorop.h | 1 + + drivers/gpu/drm/i915/display/intel_crt.c | 18 +- + drivers/gpu/drm/i915/display/intel_crt_regs.h | 2 - + drivers/gpu/drm/i915/display/intel_crtc.c | 4 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 3 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 737 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 5 +- + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 4 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 13 +- + drivers/gpu/drm/i915/display/intel_de.h | 17 +- + drivers/gpu/drm/i915/display/intel_display.c | 150 +- + drivers/gpu/drm/i915/display/intel_display.h | 27 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 2 +- + .../gpu/drm/i915/display/intel_display_device.c | 11 +- + .../gpu/drm/i915/display/intel_display_device.h | 1 + + .../gpu/drm/i915/display/intel_display_driver.c | 22 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 11 +- + .../gpu/drm/i915/display/intel_display_limits.h | 26 + + drivers/gpu/drm/i915/display/intel_display_power.c | 29 +- + .../gpu/drm/i915/display/intel_display_power_map.c | 13 - + .../drm/i915/display/intel_display_power_well.c | 72 +- + .../drm/i915/display/intel_display_power_well.h | 2 - + drivers/gpu/drm/i915/display/intel_display_regs.h | 268 +- + drivers/gpu/drm/i915/display/intel_display_rps.c | 2 +- + .../gpu/drm/i915/display/intel_display_snapshot.c | 4 - + drivers/gpu/drm/i915/display/intel_display_types.h | 12 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 83 +- + drivers/gpu/drm/i915/display/intel_display_wa.h | 28 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 1 - + drivers/gpu/drm/i915/display/intel_dp.c | 864 +- + drivers/gpu/drm/i915/display/intel_dp.h | 20 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 53 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 213 +- + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 96 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 8 +- + drivers/gpu/drm/i915/display/intel_dpll.h | 1 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 11 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 3 - + drivers/gpu/drm/i915/display/intel_dpt.c | 328 +- + drivers/gpu/drm/i915/display/intel_dpt.h | 22 +- + drivers/gpu/drm/i915/display/intel_dpt_common.c | 35 - + drivers/gpu/drm/i915/display/intel_dpt_common.h | 13 - + drivers/gpu/drm/i915/display/intel_dram.c | 9 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 107 +- + drivers/gpu/drm/i915/display/intel_dsb_buffer.h | 22 - + drivers/gpu/drm/i915/display/intel_fb.c | 41 +- + drivers/gpu/drm/i915/display/intel_fb_bo.c | 101 - + drivers/gpu/drm/i915/display/intel_fb_bo.h | 25 - + drivers/gpu/drm/i915/display/intel_fb_pin.c | 15 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 17 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 5 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 38 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.h | 1 + + drivers/gpu/drm/i915/display/intel_fdi.c | 1 - + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 1 - + drivers/gpu/drm/i915/display/intel_flipq.c | 13 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 37 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.h | 21 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 7 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 18 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 19 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 1 - + drivers/gpu/drm/i915/display/intel_lt_phy.c | 245 +- + drivers/gpu/drm/i915/display/intel_lt_phy.h | 5 +- + drivers/gpu/drm/i915/display/intel_lt_phy_regs.h | 8 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 4 +- + drivers/gpu/drm/i915/display/intel_oprom_regs.h | 15 + + drivers/gpu/drm/i915/display/intel_overlay.c | 584 +- + drivers/gpu/drm/i915/display/intel_overlay.h | 48 - + drivers/gpu/drm/i915/display/intel_parent.c | 156 + + drivers/gpu/drm/i915/display/intel_parent.h | 51 + + drivers/gpu/drm/i915/display/intel_pch_display.c | 1 - + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 1 - + drivers/gpu/drm/i915/display/intel_pmdemand.c | 8 +- + drivers/gpu/drm/i915/display/intel_pps.c | 1 - + drivers/gpu/drm/i915/display/intel_psr.c | 57 +- + drivers/gpu/drm/i915/display/intel_psr.h | 1 + + drivers/gpu/drm/i915/display/intel_rom.c | 3 +- + drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c | 2 - + drivers/gpu/drm/i915/display/intel_tc.c | 5 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 1 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 73 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 9 + + drivers/gpu/drm/i915/display/intel_vga.c | 333 +- + drivers/gpu/drm/i915/display/intel_vga.h | 5 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 41 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 1 + + drivers/gpu/drm/i915/display/intel_vrr_regs.h | 1 + + drivers/gpu/drm/i915/display/skl_scaler.c | 2 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 7 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 26 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 1 - + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 30 +- + .../gpu/drm/i915/gem/i915_gem_object_frontbuffer.c | 69 + + .../gpu/drm/i915/gem/i915_gem_object_frontbuffer.h | 24 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 2 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 27 +- + drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_breadcrumbs.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 10 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 2 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 6 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 7 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 2 + + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 11 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 2 + + drivers/gpu/drm/i915/gt/intel_llc.c | 2 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 21 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 24 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 21 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 1 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 26 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 10 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 4 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 2 +- + .../gpu/drm/i915/gt/uc/selftest_guc_multi_lrc.c | 2 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + + drivers/gpu/drm/i915/gvt/display.c | 1 - + drivers/gpu/drm/i915/gvt/handlers.c | 48 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 1 + + drivers/gpu/drm/i915/gvt/mmio_context.c | 3 +- + drivers/gpu/drm/i915/gvt/reg.h | 4 +- + drivers/gpu/drm/i915/i915_active.c | 21 +- + drivers/gpu/drm/i915/i915_bo.c | 156 + + drivers/gpu/drm/i915/i915_bo.h | 9 + + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_dpt.c | 277 + + drivers/gpu/drm/i915/i915_dpt.h | 20 + + drivers/gpu/drm/i915/i915_driver.c | 32 +- + drivers/gpu/drm/i915/i915_drv.h | 5 +- + .../intel_dsb_buffer.c => i915_dsb_buffer.c} | 28 +- + drivers/gpu/drm/i915/i915_dsb_buffer.h | 9 + + drivers/gpu/drm/i915/i915_gem.c | 6 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 6 - + drivers/gpu/drm/i915/i915_gpu_error.h | 1 - + drivers/gpu/drm/i915/i915_hwmon.c | 2 + + drivers/gpu/drm/i915/i915_initial_plane.c | 3 +- + drivers/gpu/drm/i915/i915_irq.c | 1 + + drivers/gpu/drm/i915/i915_overlay.c | 517 + + drivers/gpu/drm/i915/i915_overlay.h | 11 + + drivers/gpu/drm/i915/i915_perf.c | 34 +- + drivers/gpu/drm/i915/i915_reg.h | 465 +- + drivers/gpu/drm/i915/i915_reg_defs.h | 179 +- + drivers/gpu/drm/i915/i915_scatterlist.c | 10 +- + drivers/gpu/drm/i915/i915_sw_fence_work.c | 2 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 55 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.h | 4 +- + drivers/gpu/drm/i915/i915_vma.c | 10 + + drivers/gpu/drm/i915/i915_vma.h | 7 +- + drivers/gpu/drm/i915/i915_vma_resource.c | 2 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 42 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 10 +- + drivers/gpu/drm/i915/intel_pcode.c | 17 +- + drivers/gpu/drm/i915/intel_pcode.h | 9 +- + drivers/gpu/drm/i915/intel_uncore.c | 4 +- + drivers/gpu/drm/i915/pxp/intel_pxp.c | 6 +- + drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 2 +- + drivers/gpu/drm/i915/selftests/igt_mmap.c | 43 +- + drivers/gpu/drm/i915/selftests/igt_mmap.h | 8 + + .../gpu/drm/i915/selftests/intel_memory_region.c | 20 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- + drivers/gpu/drm/i915/vlv_suspend.c | 1 + + drivers/gpu/drm/imagination/Makefile | 1 + + drivers/gpu/drm/imagination/pvr_ccb.c | 25 +- + drivers/gpu/drm/imagination/pvr_device.h | 10 +- + drivers/gpu/drm/imagination/pvr_dump.c | 113 + + drivers/gpu/drm/imagination/pvr_dump.h | 17 + + drivers/gpu/drm/imagination/pvr_fw_startstop.c | 100 +- + drivers/gpu/drm/imagination/pvr_gem.c | 6 +- + drivers/gpu/drm/imagination/pvr_power.c | 122 +- + drivers/gpu/drm/imagination/pvr_rogue_fwif.h | 8 +- + .../gpu/drm/imagination/pvr_rogue_fwif_shared.h | 18 +- + drivers/gpu/drm/imx/ipuv3/Kconfig | 1 + + drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c | 23 +- + drivers/gpu/drm/imx/ipuv3/parallel-display.c | 15 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 28 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 28 +- + drivers/gpu/drm/loongson/lsdc_drv.c | 3 +- + drivers/gpu/drm/loongson/lsdc_gem.c | 15 - + drivers/gpu/drm/loongson/lsdc_gem.h | 4 - + drivers/gpu/drm/mcde/mcde_dsi.c | 17 +- + drivers/gpu/drm/mediatek/Makefile | 1 - + drivers/gpu/drm/mediatek/mtk_crtc.c | 1 - + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 12 + + drivers/gpu/drm/mediatek/mtk_dp.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 26 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 - + drivers/gpu/drm/mediatek/mtk_dsi.c | 35 +- + drivers/gpu/drm/mediatek/mtk_gem.c | 231 - + drivers/gpu/drm/mediatek/mtk_gem.h | 17 - + drivers/gpu/drm/mediatek/mtk_hdmi_v2.c | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 41 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 40 +- + drivers/gpu/drm/mxsfb/lcdif_drv.c | 8 +- + drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | 19 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 29 + + drivers/gpu/drm/nouveau/nouveau_abi16.h | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 38 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c | 4 - + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gr.c | 9 +- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/gsp.c | 7 +- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r570/gr.c | 34 +- + .../drm/nouveau/nvkm/subdev/gsp/rm/r570/nvrm/gr.h | 19 + + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/rm.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/tu102.c | 18 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 22 +- + drivers/gpu/drm/panel/Kconfig | 79 +- + drivers/gpu/drm/panel/Makefile | 9 +- + .../gpu/drm/panel/panel-boe-th101mb31ig002-28a.c | 7 +- + drivers/gpu/drm/panel/panel-edp.c | 40 +- + drivers/gpu/drm/panel/panel-himax-hx83102.c | 151 + + drivers/gpu/drm/panel/panel-himax-hx83121a.c | 749 + + drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.c | 134 + + drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.h | 15 + + ...itek-ili9806e.c => panel-ilitek-ili9806e-dsi.c} | 153 +- + drivers/gpu/drm/panel/panel-ilitek-ili9806e-spi.c | 323 + + drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 14 +- + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 244 + + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 105 +- + drivers/gpu/drm/panel/panel-lxd-m9189a.c | 243 + + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 15 +- + drivers/gpu/drm/panel/panel-motorola-mot.c | 244 + + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 94 +- + drivers/gpu/drm/panel/panel-novatek-nt37700f.c | 299 + + drivers/gpu/drm/panel/panel-renesas-r61307.c | 40 +- + drivers/gpu/drm/panel/panel-renesas-r69328.c | 38 +- + .../gpu/drm/panel/panel-samsung-s6e8fc0-m1906f9.c | 301 + + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 1 + + drivers/gpu/drm/panel/panel-simple.c | 154 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 +- + drivers/gpu/drm/panthor/Makefile | 2 + + drivers/gpu/drm/panthor/panthor_device.h | 107 +- + drivers/gpu/drm/panthor/panthor_drv.c | 134 +- + drivers/gpu/drm/panthor/panthor_fw.c | 20 +- + drivers/gpu/drm/panthor/panthor_gem.c | 2 +- + drivers/gpu/drm/panthor/panthor_gpu.c | 30 +- + drivers/gpu/drm/panthor/panthor_gpu.h | 2 + + drivers/gpu/drm/panthor/panthor_hw.c | 62 + + drivers/gpu/drm/panthor/panthor_hw.h | 8 + + drivers/gpu/drm/panthor/panthor_mmu.c | 47 +- + drivers/gpu/drm/panthor/panthor_pwr.c | 2 +- + drivers/gpu/drm/panthor/panthor_sched.c | 2 +- + drivers/gpu/drm/panthor/panthor_trace.h | 86 + + drivers/gpu/drm/qxl/qxl_release.c | 5 +- + drivers/gpu/drm/radeon/radeon_device.c | 7 +- + drivers/gpu/drm/radeon/radeon_fbdev.c | 17 - + drivers/gpu/drm/radeon/radeon_mode.h | 5 - + drivers/gpu/drm/renesas/rcar-du/rcar_cmm.c | 26 +- + drivers/gpu/drm/renesas/rcar-du/rcar_cmm.h | 18 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c | 16 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.h | 3 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.h | 8 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 52 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c | 16 + + drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.h | 2 + + drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 35 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 3 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 4 +- + drivers/gpu/drm/rockchip/dw_dp-rockchip.c | 27 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 24 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 4 + + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 8 +- + drivers/gpu/drm/scheduler/sched_fence.c | 10 +- + drivers/gpu/drm/scheduler/sched_main.c | 38 +- + drivers/gpu/drm/scheduler/tests/tests_basic.c | 4 +- + drivers/gpu/drm/sitronix/st7586.c | 185 +- + drivers/gpu/drm/sitronix/st7735r.c | 142 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 33 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 29 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 16 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 27 +- + drivers/gpu/drm/sun4i/sunxi_engine.h | 7 +- + drivers/gpu/drm/sysfb/Kconfig | 16 + + drivers/gpu/drm/sysfb/Makefile | 1 + + drivers/gpu/drm/sysfb/corebootdrm.c | 434 + + drivers/gpu/drm/sysfb/drm_sysfb.c | 24 + + drivers/gpu/drm/sysfb/drm_sysfb_helper.h | 8 +- + drivers/gpu/drm/sysfb/drm_sysfb_screen_info.c | 30 - + drivers/gpu/drm/sysfb/efidrm.c | 8 +- + drivers/gpu/drm/sysfb/vesadrm.c | 8 +- + drivers/gpu/drm/tegra/hub.c | 22 +- + drivers/gpu/drm/tests/Makefile | 1 - + drivers/gpu/drm/tests/drm_buddy_test.c | 928 - + drivers/gpu/drm/tests/drm_connector_test.c | 80 +- + drivers/gpu/drm/tests/drm_exec_test.c | 2 - + drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 182 +- + drivers/gpu/drm/tests/drm_mm_test.c | 2 - + drivers/gpu/drm/tilcdc/Kconfig | 18 + + drivers/gpu/drm/tilcdc/Makefile | 5 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 192 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 496 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 99 +- + drivers/gpu/drm/tilcdc/tilcdc_encoder.c | 69 + + .../tilcdc/{tilcdc_external.h => tilcdc_encoder.h} | 5 +- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 179 - + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 408 - + drivers/gpu/drm/tilcdc/tilcdc_panel.h | 15 - + drivers/gpu/drm/tilcdc/tilcdc_panel_legacy.c | 185 + + drivers/gpu/drm/tilcdc/tilcdc_panel_legacy.dtso | 29 + + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 35 +- + drivers/gpu/drm/tilcdc/tilcdc_regs.h | 8 +- + drivers/gpu/drm/tiny/hx8357d.c | 138 +- + drivers/gpu/drm/tiny/ili9163.c | 138 +- + drivers/gpu/drm/tiny/ili9225.c | 192 +- + drivers/gpu/drm/tiny/ili9341.c | 138 +- + drivers/gpu/drm/tiny/ili9486.c | 139 +- + drivers/gpu/drm/tiny/mi0283qt.c | 138 +- + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 141 +- + drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c | 45 +- + drivers/gpu/drm/ttm/tests/ttm_mock_manager.c | 18 +- + drivers/gpu/drm/ttm/tests/ttm_mock_manager.h | 4 +- + drivers/gpu/drm/ttm/ttm_backup.c | 6 +- + drivers/gpu/drm/ttm/ttm_bo.c | 12 +- + drivers/gpu/drm/ttm/ttm_pool.c | 7 +- + drivers/gpu/drm/ttm/ttm_resource.c | 28 +- + drivers/gpu/drm/v3d/v3d_drv.c | 55 +- + drivers/gpu/drm/v3d/v3d_drv.h | 51 +- + drivers/gpu/drm/v3d/v3d_fence.c | 2 +- + drivers/gpu/drm/v3d/v3d_gem.c | 43 +- + drivers/gpu/drm/v3d/v3d_irq.c | 2 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 57 +- + drivers/gpu/drm/v3d/v3d_sched.c | 133 +- + drivers/gpu/drm/v3d/v3d_submit.c | 6 + + drivers/gpu/drm/v3d/v3d_sysfs.c | 2 +- + drivers/gpu/drm/vc4/vc4_bo.c | 2 +- + drivers/gpu/drm/vc4/vc4_drv.h | 5 +- + drivers/gpu/drm/vc4/vc4_gem.c | 2 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 36 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 2 +- + drivers/gpu/drm/vc4/vc4_kms.c | 67 +- + drivers/gpu/drm/vc4/vc4_perfmon.c | 51 +- + drivers/gpu/drm/verisilicon/Kconfig | 16 + + drivers/gpu/drm/verisilicon/Makefile | 5 + + drivers/gpu/drm/verisilicon/vs_bridge.c | 371 + + drivers/gpu/drm/verisilicon/vs_bridge.h | 39 + + drivers/gpu/drm/verisilicon/vs_bridge_regs.h | 54 + + drivers/gpu/drm/verisilicon/vs_crtc.c | 191 + + drivers/gpu/drm/verisilicon/vs_crtc.h | 31 + + drivers/gpu/drm/verisilicon/vs_crtc_regs.h | 60 + + drivers/gpu/drm/verisilicon/vs_dc.c | 207 + + drivers/gpu/drm/verisilicon/vs_dc.h | 38 + + drivers/gpu/drm/verisilicon/vs_dc_top_regs.h | 27 + + drivers/gpu/drm/verisilicon/vs_drm.c | 182 + + drivers/gpu/drm/verisilicon/vs_drm.h | 28 + + drivers/gpu/drm/verisilicon/vs_hwdb.c | 150 + + drivers/gpu/drm/verisilicon/vs_hwdb.h | 29 + + drivers/gpu/drm/verisilicon/vs_plane.c | 124 + + drivers/gpu/drm/verisilicon/vs_plane.h | 72 + + drivers/gpu/drm/verisilicon/vs_primary_plane.c | 173 + + .../gpu/drm/verisilicon/vs_primary_plane_regs.h | 53 + + drivers/gpu/drm/virtio/virtgpu_prime.c | 4 +- + drivers/gpu/drm/vkms/vkms_colorop.c | 16 +- + drivers/gpu/drm/vkms/vkms_composer.c | 8 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 3 + + drivers/gpu/drm/vkms/vkms_drv.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 3 +- + drivers/gpu/drm/xe/Makefile | 11 +- + drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h | 6 - + drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h | 36 - + .../gpu/drm/xe/compat-i915-headers/intel_pcode.h | 11 - + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 9 + + drivers/gpu/drm/xe/display/intel_bo.c | 109 - + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 39 +- + drivers/gpu/drm/xe/display/xe_display.c | 16 + + .../xe/display/{intel_fb_bo.c => xe_display_bo.c} | 69 +- + drivers/gpu/drm/xe/display/xe_display_bo.h | 9 + + drivers/gpu/drm/xe/display/xe_display_pcode.c | 38 + + drivers/gpu/drm/xe/display/xe_display_pcode.h | 9 + + drivers/gpu/drm/xe/display/xe_display_vma.h | 18 + + drivers/gpu/drm/xe/display/xe_dsb_buffer.c | 32 +- + drivers/gpu/drm/xe/display/xe_dsb_buffer.h | 9 + + drivers/gpu/drm/xe/display/xe_fb_pin.c | 149 +- + drivers/gpu/drm/xe/display/xe_frontbuffer.c | 71 + + drivers/gpu/drm/xe/display/xe_frontbuffer.h | 9 + + drivers/gpu/drm/xe/display/xe_initial_plane.c | 29 +- + .../gpu/drm/xe/instructions/xe_gfxpipe_commands.h | 10 + + drivers/gpu/drm/xe/instructions/xe_mi_commands.h | 19 + + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 8 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 31 +- + drivers/gpu/drm/xe/regs/xe_guc_regs.h | 8 + + drivers/gpu/drm/xe/regs/xe_hw_error_regs.h | 86 +- + drivers/gpu/drm/xe/regs/xe_reg_defs.h | 5 +- + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 7 +- + .../gpu/drm/xe/tests/xe_gt_sriov_pf_config_kunit.c | 98 +- + drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c | 6 +- + drivers/gpu/drm/xe/tests/xe_guc_g2g_test.c | 61 +- + drivers/gpu/drm/xe/tests/xe_pci_test.c | 8 + + drivers/gpu/drm/xe/tests/xe_rtp_test.c | 3 +- + drivers/gpu/drm/xe/xe_bb.c | 59 +- + drivers/gpu/drm/xe/xe_bb.h | 6 +- + drivers/gpu/drm/xe/xe_bo.c | 279 +- + drivers/gpu/drm/xe/xe_bo.h | 62 +- + drivers/gpu/drm/xe/xe_bo_types.h | 6 + + drivers/gpu/drm/xe/xe_configfs.c | 64 +- + drivers/gpu/drm/xe/xe_configfs.h | 16 +- + drivers/gpu/drm/xe/xe_defaults.h | 26 + + drivers/gpu/drm/xe/xe_devcoredump.c | 2 +- + drivers/gpu/drm/xe/xe_device.c | 105 +- + drivers/gpu/drm/xe/xe_device.h | 21 +- + drivers/gpu/drm/xe/xe_device_types.h | 206 +- + drivers/gpu/drm/xe/xe_device_wa_oob.rules | 1 + + drivers/gpu/drm/xe/xe_dma_buf.c | 38 +- + drivers/gpu/drm/xe/xe_drm_ras.c | 186 + + drivers/gpu/drm/xe/xe_drm_ras.h | 15 + + drivers/gpu/drm/xe/xe_drm_ras_types.h | 48 + + drivers/gpu/drm/xe/xe_eu_stall.c | 20 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 244 +- + drivers/gpu/drm/xe/xe_exec_queue.h | 1 + + drivers/gpu/drm/xe/xe_exec_queue_types.h | 21 +- + drivers/gpu/drm/xe/xe_execlist.c | 15 +- + drivers/gpu/drm/xe/xe_force_wake.c | 46 +- + drivers/gpu/drm/xe/xe_force_wake.h | 11 + + drivers/gpu/drm/xe/xe_ggtt.c | 389 +- + drivers/gpu/drm/xe/xe_ggtt.h | 14 +- + drivers/gpu/drm/xe/xe_ggtt_types.h | 62 +- + drivers/gpu/drm/xe/xe_gt.c | 63 +- + drivers/gpu/drm/xe/xe_gt_ccs_mode.c | 44 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 26 + + drivers/gpu/drm/xe/xe_gt_idle.c | 25 + + drivers/gpu/drm/xe/xe_gt_idle_types.h | 6 +- + drivers/gpu/drm/xe/xe_gt_mcr.c | 30 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 242 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 4 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c | 80 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.h | 1 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control_types.h | 2 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 2 + + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 89 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 3 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 4 +- + drivers/gpu/drm/xe/xe_gt_stats.c | 70 +- + drivers/gpu/drm/xe/xe_gt_stats.h | 6 + + drivers/gpu/drm/xe/xe_gt_stats_types.h | 26 + + drivers/gpu/drm/xe/xe_gt_topology.c | 39 +- + drivers/gpu/drm/xe/xe_gt_types.h | 22 +- + drivers/gpu/drm/xe/xe_guc.c | 85 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 11 + + drivers/gpu/drm/xe/xe_guc_ct.c | 142 +- + drivers/gpu/drm/xe/xe_guc_ct_types.h | 6 +- + drivers/gpu/drm/xe/xe_guc_exec_queue_types.h | 4 +- + drivers/gpu/drm/xe/xe_guc_fwif.h | 6 +- + drivers/gpu/drm/xe/xe_guc_log.h | 6 +- + drivers/gpu/drm/xe/xe_guc_pagefault.c | 18 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 126 +- + drivers/gpu/drm/xe/xe_guc_pc.h | 6 +- + drivers/gpu/drm/xe/xe_guc_rc.c | 131 + + drivers/gpu/drm/xe/xe_guc_rc.h | 16 + + drivers/gpu/drm/xe/xe_guc_submit.c | 183 +- + drivers/gpu/drm/xe/xe_guc_tlb_inval.c | 242 +- + drivers/gpu/drm/xe/xe_heci_gsc.h | 6 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 14 +- + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.h | 4 +- + drivers/gpu/drm/xe/xe_hw_engine_group.c | 3 +- + drivers/gpu/drm/xe/xe_hw_error.c | 451 +- + drivers/gpu/drm/xe/xe_hw_fence.c | 3 +- + drivers/gpu/drm/xe/xe_i2c.c | 17 +- + drivers/gpu/drm/xe/xe_late_bind_fw_types.h | 4 +- + drivers/gpu/drm/xe/xe_lmtt.c | 17 + + drivers/gpu/drm/xe/xe_lmtt.h | 1 + + drivers/gpu/drm/xe/xe_lrc.c | 398 +- + drivers/gpu/drm/xe/xe_lrc.h | 5 + + drivers/gpu/drm/xe/xe_lrc_types.h | 6 + + drivers/gpu/drm/xe/xe_migrate.c | 262 +- + drivers/gpu/drm/xe/xe_migrate.h | 4 + + drivers/gpu/drm/xe/xe_mmio.c | 9 + + drivers/gpu/drm/xe/xe_mmio.h | 8 +- + drivers/gpu/drm/xe/xe_mmio_types.h | 64 + + drivers/gpu/drm/xe/xe_mocs.c | 1 + + drivers/gpu/drm/xe/xe_module.c | 44 +- + drivers/gpu/drm/xe/xe_nvm.c | 12 +- + drivers/gpu/drm/xe/xe_oa.c | 66 +- + drivers/gpu/drm/xe/xe_oa_types.h | 3 - + drivers/gpu/drm/xe/xe_page_reclaim.c | 26 + + drivers/gpu/drm/xe/xe_page_reclaim.h | 3 + + drivers/gpu/drm/xe/xe_pagefault.c | 78 +- + drivers/gpu/drm/xe/xe_pagefault_types.h | 20 +- + drivers/gpu/drm/xe/xe_pat.c | 176 +- + drivers/gpu/drm/xe/xe_pat.h | 5 +- + drivers/gpu/drm/xe/xe_pci.c | 71 +- + drivers/gpu/drm/xe/xe_pci_types.h | 5 + + drivers/gpu/drm/xe/xe_pcode.c | 30 - + drivers/gpu/drm/xe/xe_pcode.h | 8 - + drivers/gpu/drm/xe/xe_platform_types.h | 5 +- + drivers/gpu/drm/xe/xe_pt.c | 40 +- + drivers/gpu/drm/xe/xe_pxp.c | 4 +- + drivers/gpu/drm/xe/xe_query.c | 7 +- + drivers/gpu/drm/xe/xe_reg_sr.c | 72 +- + drivers/gpu/drm/xe/xe_reg_sr.h | 7 + + drivers/gpu/drm/xe/xe_reg_whitelist.c | 12 +- + drivers/gpu/drm/xe/xe_res_cursor.h | 34 +- + drivers/gpu/drm/xe/xe_ring_ops.c | 143 +- + drivers/gpu/drm/xe/xe_ring_ops_types.h | 8 +- + drivers/gpu/drm/xe/xe_rtp.c | 15 +- + drivers/gpu/drm/xe/xe_rtp.h | 23 +- + drivers/gpu/drm/xe/xe_rtp_types.h | 1 + + drivers/gpu/drm/xe/xe_sa.c | 36 + + drivers/gpu/drm/xe/xe_sa.h | 2 + + drivers/gpu/drm/xe/xe_sched_job.c | 4 +- + drivers/gpu/drm/xe/xe_sched_job_types.h | 2 + + drivers/gpu/drm/xe/xe_sleep.h | 57 + + drivers/gpu/drm/xe/xe_soc_remapper.c | 1 + + drivers/gpu/drm/xe/xe_sriov.c | 2 +- + drivers/gpu/drm/xe/xe_sriov.h | 7 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 10 +- + drivers/gpu/drm/xe/xe_sriov_pf_control.c | 24 + + drivers/gpu/drm/xe/xe_sriov_pf_control.h | 1 + + drivers/gpu/drm/xe/xe_sriov_pf_helpers.h | 3 +- + drivers/gpu/drm/xe/xe_sriov_pf_provision.c | 119 +- + drivers/gpu/drm/xe/xe_sriov_pf_provision.h | 4 + + drivers/gpu/drm/xe/xe_sriov_pf_sysfs.c | 31 +- + drivers/gpu/drm/xe/xe_sriov_pf_types.h | 3 + + drivers/gpu/drm/xe/xe_sriov_vfio.c | 1 + + drivers/gpu/drm/xe/xe_step.c | 74 +- + drivers/gpu/drm/xe/xe_step.h | 10 +- + drivers/gpu/drm/xe/xe_step_types.h | 1 + + drivers/gpu/drm/xe/xe_svm.c | 48 +- + drivers/gpu/drm/xe/xe_tile.h | 4 +- + drivers/gpu/drm/xe/xe_tile_printk.h | 4 +- + drivers/gpu/drm/xe/xe_tile_sriov_vf.c | 198 +- + drivers/gpu/drm/xe/xe_tile_sriov_vf.h | 3 - + drivers/gpu/drm/xe/xe_tile_sysfs.c | 2 +- + drivers/gpu/drm/xe/xe_tile_types.h | 141 + + drivers/gpu/drm/xe/xe_tlb_inval.c | 117 + + drivers/gpu/drm/xe/xe_tlb_inval.h | 8 + + drivers/gpu/drm/xe/xe_tlb_inval_types.h | 14 + + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 85 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h | 4 +- + drivers/gpu/drm/xe/xe_tuning.c | 36 +- + drivers/gpu/drm/xe/xe_uc.c | 30 +- + drivers/gpu/drm/xe/xe_uc.h | 1 - + drivers/gpu/drm/xe/xe_uc_fw.c | 4 +- + drivers/gpu/drm/xe/xe_userptr.c | 155 +- + drivers/gpu/drm/xe/xe_userptr.h | 31 +- + drivers/gpu/drm/xe/xe_vm.c | 519 +- + drivers/gpu/drm/xe/xe_vm.h | 27 +- + drivers/gpu/drm/xe/xe_vm_madvise.c | 338 +- + drivers/gpu/drm/xe/xe_vm_madvise.h | 3 + + drivers/gpu/drm/xe/xe_vm_types.h | 60 + + drivers/gpu/drm/xe/xe_vram_freq.c | 2 +- + drivers/gpu/drm/xe/xe_wa.c | 391 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 39 +- + drivers/gpu/drm/xe/xe_wopcm.c | 15 +- + drivers/gpu/tests/Makefile | 4 + + drivers/gpu/tests/gpu_buddy_test.c | 1421 + + .../{drm/lib/drm_random.c => tests/gpu_random.c} | 18 +- + .../{drm/lib/drm_random.h => tests/gpu_random.h} | 18 +- + drivers/infiniband/core/ib_core_uverbs.c | 2 +- + drivers/infiniband/core/umem_dmabuf.c | 10 - + drivers/infiniband/core/uverbs_std_types_dmabuf.c | 2 +- + drivers/infiniband/hw/mlx5/mr.c | 2 +- + drivers/iommu/iommufd/pages.c | 11 +- + drivers/iommu/iommufd/selftest.c | 2 +- + drivers/vfio/pci/vfio_pci_dmabuf.c | 80 +- + drivers/vfio/pci/xe/main.c | 14 + + drivers/video/Kconfig | 1 + + include/drm/bridge/dw_dp.h | 7 + + include/drm/bridge/dw_hdmi_qp.h | 2 +- + include/drm/display/drm_hdmi_helper.h | 3 +- + include/drm/drm_atomic.h | 20 +- + include/drm/drm_atomic_state_helper.h | 3 + + include/drm/drm_blend.h | 4 +- + include/drm/drm_bridge.h | 6 +- + include/drm/drm_buddy.h | 163 +- + include/drm/drm_client.h | 3 + + include/drm/drm_colorop.h | 32 +- + include/drm/drm_connector.h | 49 +- + include/drm/drm_crtc.h | 12 + + include/drm/drm_fb_helper.h | 107 +- + include/drm/drm_mipi_dbi.h | 145 +- + include/drm/drm_mode_config.h | 9 + + include/drm/drm_pagemap.h | 21 + + include/drm/drm_ras.h | 75 + + include/drm/drm_ras_genl_family.h | 17 + + include/drm/drm_simple_kms_helper.h | 216 +- + include/drm/drm_suballoc.h | 6 + + include/drm/intel/display_parent_interface.h | 108 + + include/drm/intel/i915_drm.h | 82 +- + include/drm/intel/intel_gmd_interrupt_regs.h | 92 + + include/drm/intel/intel_gmd_misc_regs.h | 21 + + include/drm/intel/intel_pcode_regs.h | 108 + + include/drm/intel/pciids.h | 12 + + include/drm/intel/pick.h | 51 + + include/drm/intel/reg_bits.h | 139 + + include/drm/intel/xe_sriov_vfio.h | 11 + + include/drm/ttm/ttm_backup.h | 2 +- + include/drm/ttm/ttm_bo.h | 28 +- + include/linux/coreboot.h | 90 + + include/linux/dma-buf.h | 17 +- + include/linux/dma-fence-array.h | 1 - + include/linux/dma-fence-chain.h | 1 - + include/linux/dma-fence.h | 97 +- + include/linux/gpu_buddy.h | 241 + + include/linux/iopoll.h | 8 +- + include/linux/math.h | 18 +- + include/linux/mmu_notifier.h | 42 + + include/trace/events/dma_fence.h | 35 +- + include/uapi/drm/amdgpu_drm.h | 7 +- + include/uapi/drm/amdxdna_accel.h | 47 +- + include/uapi/drm/drm_fourcc.h | 16 + + include/uapi/drm/drm_mode.h | 84 + + include/uapi/drm/drm_ras.h | 49 + + include/uapi/drm/nouveau_drm.h | 66 + + include/uapi/drm/panthor_drm.h | 63 +- + include/uapi/drm/xe_drm.h | 268 +- + include/uapi/linux/const.h | 18 + + include/video/vga.h | 1 + + mm/mmu_notifier.c | 65 +- + 1296 files changed, 150252 insertions(+), 22409 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/lontium,lt8713sx.yaml + create mode 100644 Documentation/devicetree/bindings/display/bridge/thead,th1520-dw-hdmi.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/himax,hx83121a.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/lxd,m9189a.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/motorola,mot-panel.yaml + create mode 100644 Documentation/devicetree/bindings/display/tilcdc/ti,am33xx-tilcdc.yaml + delete mode 100644 Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt + create mode 100644 Documentation/devicetree/bindings/display/verisilicon,dc.yaml + create mode 100644 Documentation/gpu/drm-ras.rst + create mode 100644 Documentation/netlink/specs/drm_ras.yaml + create mode 100644 drivers/accel/amdxdna/amdxdna_iommu.c + create mode 100644 drivers/gpu/Kconfig + create mode 100644 drivers/gpu/buddy.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_reg_access.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/lsdma_v7_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/lsdma_v7_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v5_0_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v5_0_2.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dce60/dce60_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn42/dcn42_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn42/dcn42_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/bounding_boxes/dcn42_soc_bb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_dcn42.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_dcn42.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn42/dcn42_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn42/hw_factory_dcn42.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn42/hw_factory_dcn42.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn42/hw_translate_dcn42.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn42/hw_translate_dcn42.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hpo/dcn42/dcn42_hpo_dp_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hpo/dcn42/dcn42_hpo_dp_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn42/irq_service_dcn42.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn42/irq_service_dcn42.h + create mode 100644 drivers/gpu/drm/amd/display/dc/mmhubbub/dcn42/dcn42_mmhubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/mmhubbub/dcn42/dcn42_mmhubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn42/dcn42_resource_fpu.c + rename drivers/gpu/drm/amd/display/dc/{clk_mgr/dce60/dce60_clk_mgr.h => resource/dcn42/dcn42_resource_fpu.h} (78%) + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_15_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/clk/clk_15_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_4_2_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_4_2_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dpcs/dpcs_4_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_7_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_7_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu15_driver_if_v15_0_8.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v15_0_8_pmfw.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v15_0_8_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.h + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_eeprom_fw.c + create mode 100644 drivers/gpu/drm/amd/ras/rascore/ras_eeprom_fw.h + create mode 100644 drivers/gpu/drm/bridge/lontium-lt8713sx.c + create mode 100644 drivers/gpu/drm/bridge/th1520-dw-hdmi.c + create mode 100644 drivers/gpu/drm/drm_ras.c + create mode 100644 drivers/gpu/drm/drm_ras_genl_family.c + create mode 100644 drivers/gpu/drm/drm_ras_nl.c + create mode 100644 drivers/gpu/drm/drm_ras_nl.h + delete mode 100644 drivers/gpu/drm/i915/display/intel_dpt_common.c + delete mode 100644 drivers/gpu/drm/i915/display/intel_dpt_common.h + delete mode 100644 drivers/gpu/drm/i915/display/intel_dsb_buffer.h + delete mode 100644 drivers/gpu/drm/i915/display/intel_fb_bo.c + delete mode 100644 drivers/gpu/drm/i915/display/intel_fb_bo.h + create mode 100644 drivers/gpu/drm/i915/display/intel_oprom_regs.h + create mode 100644 drivers/gpu/drm/i915/i915_bo.c + create mode 100644 drivers/gpu/drm/i915/i915_bo.h + create mode 100644 drivers/gpu/drm/i915/i915_dpt.c + create mode 100644 drivers/gpu/drm/i915/i915_dpt.h + rename drivers/gpu/drm/i915/{display/intel_dsb_buffer.c => i915_dsb_buffer.c} (63%) + create mode 100644 drivers/gpu/drm/i915/i915_dsb_buffer.h + create mode 100644 drivers/gpu/drm/i915/i915_overlay.c + create mode 100644 drivers/gpu/drm/i915/i915_overlay.h + create mode 100644 drivers/gpu/drm/imagination/pvr_dump.c + create mode 100644 drivers/gpu/drm/imagination/pvr_dump.h + delete mode 100644 drivers/gpu/drm/mediatek/mtk_gem.c + delete mode 100644 drivers/gpu/drm/mediatek/mtk_gem.h + create mode 100644 drivers/gpu/drm/panel/panel-himax-hx83121a.c + create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.c + create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.h + rename drivers/gpu/drm/panel/{panel-ilitek-ili9806e.c => panel-ilitek-ili9806e-dsi.c} (82%) + create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9806e-spi.c + create mode 100644 drivers/gpu/drm/panel/panel-lxd-m9189a.c + create mode 100644 drivers/gpu/drm/panel/panel-motorola-mot.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt37700f.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e8fc0-m1906f9.c + create mode 100644 drivers/gpu/drm/panthor/panthor_trace.h + create mode 100644 drivers/gpu/drm/sysfb/corebootdrm.c + delete mode 100644 drivers/gpu/drm/tests/drm_buddy_test.c + create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_encoder.c + rename drivers/gpu/drm/tilcdc/{tilcdc_external.h => tilcdc_encoder.h} (51%) + delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_external.c + delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_panel.c + delete mode 100644 drivers/gpu/drm/tilcdc/tilcdc_panel.h + create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_panel_legacy.c + create mode 100644 drivers/gpu/drm/tilcdc/tilcdc_panel_legacy.dtso + create mode 100644 drivers/gpu/drm/verisilicon/Kconfig + create mode 100644 drivers/gpu/drm/verisilicon/Makefile + create mode 100644 drivers/gpu/drm/verisilicon/vs_bridge.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_bridge.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_bridge_regs.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_crtc.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_crtc.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_crtc_regs.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_dc.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_dc.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_dc_top_regs.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_drm.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_drm.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_hwdb.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_hwdb.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_plane.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_plane.h + create mode 100644 drivers/gpu/drm/verisilicon/vs_primary_plane.c + create mode 100644 drivers/gpu/drm/verisilicon/vs_primary_plane_regs.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_reg.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_pcode.h + delete mode 100644 drivers/gpu/drm/xe/display/intel_bo.c + rename drivers/gpu/drm/xe/display/{intel_fb_bo.c => xe_display_bo.c} (52%) + create mode 100644 drivers/gpu/drm/xe/display/xe_display_bo.h + create mode 100644 drivers/gpu/drm/xe/display/xe_display_pcode.c + create mode 100644 drivers/gpu/drm/xe/display/xe_display_pcode.h + create mode 100644 drivers/gpu/drm/xe/display/xe_display_vma.h + create mode 100644 drivers/gpu/drm/xe/display/xe_dsb_buffer.h + create mode 100644 drivers/gpu/drm/xe/display/xe_frontbuffer.c + create mode 100644 drivers/gpu/drm/xe/display/xe_frontbuffer.h + create mode 100644 drivers/gpu/drm/xe/xe_defaults.h + create mode 100644 drivers/gpu/drm/xe/xe_drm_ras.c + create mode 100644 drivers/gpu/drm/xe/xe_drm_ras.h + create mode 100644 drivers/gpu/drm/xe/xe_drm_ras_types.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_rc.c + create mode 100644 drivers/gpu/drm/xe/xe_guc_rc.h + create mode 100644 drivers/gpu/drm/xe/xe_mmio_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sleep.h + create mode 100644 drivers/gpu/drm/xe/xe_tile_types.h + create mode 100644 drivers/gpu/tests/Makefile + create mode 100644 drivers/gpu/tests/gpu_buddy_test.c + rename drivers/gpu/{drm/lib/drm_random.c => tests/gpu_random.c} (59%) + rename drivers/gpu/{drm/lib/drm_random.h => tests/gpu_random.h} (53%) + create mode 100644 include/drm/drm_ras.h + create mode 100644 include/drm/drm_ras_genl_family.h + create mode 100644 include/drm/intel/intel_gmd_interrupt_regs.h + create mode 100644 include/drm/intel/intel_gmd_misc_regs.h + create mode 100644 include/drm/intel/intel_pcode_regs.h + create mode 100644 include/drm/intel/pick.h + create mode 100644 include/drm/intel/reg_bits.h + create mode 100644 include/linux/coreboot.h + create mode 100644 include/linux/gpu_buddy.h + create mode 100644 include/uapi/drm/drm_ras.h +$ git am -3 ../patches/0001-drm-rdma-Fix-up-merge.patch +Applying: drm/rdma: Fix up merge +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/infiniband/core/umem_dmabuf.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master ee27551d272e1] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git + Date: Mon Mar 30 17:41:27 2026 +0100 +Merging drm-exynos/for-linux-next (3a8660878839f Linux 6.18-rc1) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (6fdfd24017756 Merge drm/drm-fixes into drm-misc-next-fixes) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/xe/xe_ggtt.c +Auto-merging drivers/gpu/drm/xe/xe_ggtt_types.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_ggtt_types.h +Resolved 'drivers/gpu/drm/drm_gem_shmem_helper.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_ggtt_types.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c1c503c42df63] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/drm_gem_shmem_helper.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging amdgpu/drm-next (68178644c35fc drm/amd/display: add a no_hpd link_encoder_funcs variant) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git amdgpu/drm-next +Already up to date. +$ git am -3 ../patches/0001-drm-fbdev-emulation-restore-drm_fb_helper_gem_is_fb-.patch +Applying: drm/fbdev-emulation: restore drm_fb_helper_gem_is_fb() dummy +$ git reset HEAD^ +Unstaged changes after reset: +M include/drm/drm_fb_helper.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master e624c4ee3bcec] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git + Date: Mon Mar 30 18:28:39 2026 +0100 +Merging drm-intel/for-linux-next (4ab789c1b3c81 Merge drm/drm-next into drm-intel-next) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Auto-merging .mailmap +Auto-merging drivers/gpu/drm/i915/display/icl_dsi.c +Auto-merging drivers/gpu/drm/i915/display/intel_display.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_types.h +Auto-merging drivers/gpu/drm/i915/display/intel_gmbus.c +Auto-merging drivers/gpu/drm/i915/display/intel_plane.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_plane.c +Auto-merging drivers/gpu/drm/i915/display/intel_psr.c +Resolved 'drivers/gpu/drm/i915/display/intel_plane.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4c037367caacb] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/icl_dsi.c | 17 +- + drivers/gpu/drm/i915/display/icl_dsi_regs.h | 3 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 10 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 1 + + drivers/gpu/drm/i915/display/intel_ddi.c | 26 +-- + drivers/gpu/drm/i915/display/intel_de.c | 178 +++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_de.h | 121 +++---------- + drivers/gpu/drm/i915/display/intel_display.c | 35 +--- + .../gpu/drm/i915/display/intel_display_device.c | 28 ++- + .../gpu/drm/i915/display/intel_display_device.h | 1 + + drivers/gpu/drm/i915/display/intel_display_types.h | 3 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 27 +-- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 32 +++- + drivers/gpu/drm/i915/display/intel_dpll.c | 26 +-- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 186 +++++++++++++++++++- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 1 + + drivers/gpu/drm/i915/display/intel_dsi.h | 7 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 12 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- + drivers/gpu/drm/i915/display/intel_lt_phy.c | 193 ++++++++++++--------- + drivers/gpu/drm/i915/display/intel_lt_phy.h | 23 ++- + .../gpu/drm/i915/display/intel_modeset_verify.c | 1 - + drivers/gpu/drm/i915/display/intel_pch.c | 93 ++++++++++ + drivers/gpu/drm/i915/display/intel_pch.h | 1 + + drivers/gpu/drm/i915/display/intel_plane.c | 60 +++---- + drivers/gpu/drm/i915/display/intel_psr.c | 8 + + drivers/gpu/drm/i915/display/intel_quirks.c | 25 ++- + drivers/gpu/drm/i915/display/intel_quirks.h | 1 + + drivers/gpu/drm/i915/display/skl_watermark.c | 162 +++++++++++------ + drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- + drivers/gpu/drm/i915/gvt/edid.c | 18 +- + drivers/gpu/drm/i915/i915_initial_plane.c | 3 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 86 +-------- + drivers/gpu/drm/i915/intel_step.h | 57 +----- + drivers/gpu/drm/i915/intel_uncore.c | 72 +++++--- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 62 ------- + drivers/gpu/drm/xe/Makefile | 1 + + .../gpu/drm/xe/compat-i915-headers/intel_step.h | 3 +- + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 31 ---- + include/drm/intel/step.h | 62 +++++++ + 42 files changed, 1013 insertions(+), 669 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_de.c + create mode 100644 include/drm/intel/step.h +Merging drm-msm/msm-next (6efced27f5df9 drm/ci: add rk3588-rock-5b) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/ci/arm64.config +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/gpu/drm/ci/arm64.config | 6 ++ + drivers/gpu/drm/ci/build.sh | 13 +-- + drivers/gpu/drm/ci/build.yml | 40 +++---- + drivers/gpu/drm/ci/container.yml | 32 ++++-- + drivers/gpu/drm/ci/gitlab-ci.yml | 96 +++++++++++++---- + drivers/gpu/drm/ci/igt_runner.sh | 6 +- + drivers/gpu/drm/ci/image-tags.yml | 22 ++-- + drivers/gpu/drm/ci/lava-submit.sh | 101 ++++++++--------- + drivers/gpu/drm/ci/static-checks.yml | 1 + + drivers/gpu/drm/ci/test.yml | 119 +++++++++++---------- + drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 13 ++- + drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt | 7 ++ + drivers/gpu/drm/ci/xfails/i915-amly-fails.txt | 27 +---- + drivers/gpu/drm/ci/xfails/i915-apl-fails.txt | 24 +---- + drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 37 ++----- + drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 7 ++ + drivers/gpu/drm/ci/xfails/i915-glk-fails.txt | 22 ++-- + drivers/gpu/drm/ci/xfails/i915-jsl-fails.txt | 27 +---- + drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt | 5 +- + drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 5 +- + drivers/gpu/drm/ci/xfails/i915-tgl-flakes.txt | 6 ++ + drivers/gpu/drm/ci/xfails/i915-whl-fails.txt | 13 +-- + .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt | 12 +-- + .../gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt | 35 ++++++ + drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 4 + + drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt | 2 + + .../xfails/msm-sc7180-trogdor-kingoftown-fails.txt | 5 +- + .../msm-sc7180-trogdor-lazor-limozeen-fails.txt | 5 +- + drivers/gpu/drm/ci/xfails/msm-sm8350-hdk-fails.txt | 1 + + .../gpu/drm/ci/xfails/panfrost-mt8183-fails.txt | 1 + + .../gpu/drm/ci/xfails/panfrost-rk3288-fails.txt | 1 + + .../gpu/drm/ci/xfails/panfrost-rk3399-fails.txt | 1 + + drivers/gpu/drm/ci/xfails/panthor-rk3588-fails.txt | 5 + + drivers/gpu/drm/ci/xfails/panthor-rk3588-skips.txt | 20 ++++ + .../gpu/drm/ci/xfails/rockchip-rk3288-fails.txt | 15 ++- + .../gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt | 21 ++++ + .../gpu/drm/ci/xfails/rockchip-rk3399-fails.txt | 12 ++- + .../gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt | 35 ++++++ + .../gpu/drm/ci/xfails/rockchip-rk3588-fails.txt | 9 ++ + .../gpu/drm/ci/xfails/rockchip-rk3588-skips.txt | 14 +++ + .../gpu/drm/ci/xfails/virtio_gpu-none-fails.txt | 66 ++---------- + drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 2 + + 43 files changed, 513 insertions(+), 383 deletions(-) + create mode 100644 drivers/gpu/drm/ci/xfails/i915-tgl-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panthor-rk3588-fails.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panthor-rk3588-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3588-fails.txt + create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3588-skips.txt +Merging drm-msm-lumag/msm-next-lumag (cebf747abeebb drm/msm/dsi: Add support for RGB101010 pixel format) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c +Auto-merging drivers/gpu/drm/msm/dp/dp_display.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_bridge.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_i2c.c +Merge made by the 'ort' strategy. + .../bindings/display/msm/dp-controller.yaml | 1 + + .../bindings/display/msm/dsi-controller-main.yaml | 5 + + .../bindings/display/msm/dsi-phy-7nm.yaml | 5 + + .../bindings/display/msm/qcom,eliza-mdss.yaml | 494 +++++++++++++++++++++ + .../bindings/display/msm/qcom,sc8280xp-mdss.yaml | 30 ++ + .../bindings/display/msm/qcom,sm8650-dpu.yaml | 1 + + drivers/gpu/drm/meson/meson_dw_mipi_dsi.c | 6 +- + .../drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 4 +- + .../drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h | 4 +- + .../drm/msm/disp/dpu1/catalog/dpu_12_2_glymur.h | 4 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_12_4_eliza.h | 363 +++++++++++++++ + .../drm/msm/disp/dpu1/catalog/dpu_13_0_kaanapali.h | 4 +- + .../drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h | 3 +- + .../drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h | 3 +- + .../drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h | 3 +- + .../drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h | 3 +- + .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 3 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 3 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 3 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 3 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h | 3 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 4 +- + .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 4 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 4 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 4 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 4 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 4 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 4 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 3 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 4 +- + .../drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 3 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 3 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 4 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 4 +- + .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 3 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 4 +- + .../drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 4 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 4 +- + .../drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h | 4 +- + .../drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 57 ++- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 + + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 6 + + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 2 + + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 36 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 9 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 26 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 21 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 6 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.c | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_vbif.h | 1 - + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 75 ++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 303 ++++++++----- + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 19 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 157 +++---- + drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.h | 4 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 94 +--- + drivers/gpu/drm/msm/dp/dp_display.c | 1 + + drivers/gpu/drm/msm/dsi/dsi.c | 1 + + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 4 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 50 ++- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 16 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 35 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 6 +- + drivers/gpu/drm/msm/hdmi/hdmi_audio.c | 5 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 8 +- + drivers/gpu/drm/msm/hdmi/hdmi_hpd.c | 4 +- + drivers/gpu/drm/msm/hdmi/hdmi_i2c.c | 12 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 3 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x60.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8x74.c | 2 +- + drivers/gpu/drm/msm/msm_mdss.c | 9 + + drivers/gpu/drm/msm/registers/display/dsi.xml | 5 +- + include/drm/drm_mipi_dsi.h | 4 + + 81 files changed, 1427 insertions(+), 600 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,eliza-mdss.yaml + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_4_eliza.h +Merging drm-xe/drm-xe-next (df03d7c2bbc91 drm/xe: Document GT statistics) +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe/drm-xe-next +Auto-merging drivers/gpu/drm/xe/xe_device.c +Merge made by the 'ort' strategy. + Documentation/gpu/xe/index.rst | 1 + + Documentation/gpu/xe/xe_gt_stats.rst | 11 +++ + drivers/gpu/drm/xe/xe_device.c | 27 ++++---- + drivers/gpu/drm/xe/xe_gt_stats.c | 41 ++++++++++++ + drivers/gpu/drm/xe/xe_gt_stats_types.h | 118 +++++++++++++++++++++++++++++++++ + drivers/gpu/drm/xe/xe_guc_submit.c | 33 +++------ + drivers/gpu/drm/xe/xe_pxp.c | 23 +++++-- + drivers/gpu/drm/xe/xe_svm.c | 2 +- + 8 files changed, 210 insertions(+), 46 deletions(-) + create mode 100644 Documentation/gpu/xe/xe_gt_stats.rst +$ git am -3 ../patches/0001-drm-xe-Fix-up-merge-issue.patch +Applying: drm: xe: Fix up merge issue +Using index info to reconstruct a base tree... +M drivers/gpu/drm/xe/xe_ttm_vram_mgr.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging etnaviv/etnaviv/next (6bde14ba5f7ef drm/etnaviv: add optional reset support) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging drm-rust/drm-rust-next (7c50d748b4a63 gpu: nova-core: firmware: factor out an elf_str() function) +$ git merge -m Merge branch 'drm-rust-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/drm-rust-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging rust/helpers/helpers.c +Auto-merging rust/kernel/error.rs +Auto-merging rust/kernel/lib.rs +Auto-merging rust/kernel/num/bounded.rs +Auto-merging scripts/Makefile.build +CONFLICT (content): Merge conflict in scripts/Makefile.build +Resolved 'scripts/Makefile.build' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 41c6c3124d9fa] Merge branch 'drm-rust-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/nova/core/todo.rst | 76 -- + MAINTAINERS | 18 +- + drivers/gpu/drm/Kconfig | 7 + + drivers/gpu/drm/nova/gem.rs | 5 +- + drivers/gpu/drm/tyr/driver.rs | 98 +- + drivers/gpu/drm/tyr/file.rs | 34 +- + drivers/gpu/drm/tyr/gem.rs | 18 +- + drivers/gpu/drm/tyr/gpu.rs | 56 +- + drivers/gpu/drm/tyr/regs.rs | 16 +- + drivers/gpu/drm/tyr/tyr.rs | 4 +- + drivers/gpu/nova-core/Kconfig | 2 +- + drivers/gpu/nova-core/dma.rs | 54 - + drivers/gpu/nova-core/driver.rs | 17 +- + drivers/gpu/nova-core/falcon.rs | 789 ++++++------ + drivers/gpu/nova-core/falcon/gsp.rs | 27 +- + drivers/gpu/nova-core/falcon/hal.rs | 6 +- + drivers/gpu/nova-core/falcon/hal/ga102.rs | 70 +- + drivers/gpu/nova-core/falcon/hal/tu102.rs | 12 +- + drivers/gpu/nova-core/falcon/sec2.rs | 17 +- + drivers/gpu/nova-core/fb.rs | 101 +- + drivers/gpu/nova-core/fb/hal/ga100.rs | 37 +- + drivers/gpu/nova-core/fb/hal/ga102.rs | 7 +- + drivers/gpu/nova-core/fb/hal/tu102.rs | 17 +- + drivers/gpu/nova-core/firmware.rs | 194 ++- + drivers/gpu/nova-core/firmware/booter.rs | 87 +- + drivers/gpu/nova-core/firmware/fwsec.rs | 181 ++- + drivers/gpu/nova-core/firmware/fwsec/bootloader.rs | 350 ++++++ + drivers/gpu/nova-core/firmware/gsp.rs | 118 +- + drivers/gpu/nova-core/firmware/riscv.rs | 10 +- + drivers/gpu/nova-core/gfw.rs | 11 +- + drivers/gpu/nova-core/gpu.rs | 66 +- + drivers/gpu/nova-core/gsp.rs | 118 +- + drivers/gpu/nova-core/gsp/boot.rs | 82 +- + drivers/gpu/nova-core/gsp/cmdq.rs | 393 ++++-- + drivers/gpu/nova-core/gsp/cmdq/continuation.rs | 307 +++++ + drivers/gpu/nova-core/gsp/commands.rs | 23 +- + drivers/gpu/nova-core/gsp/fw.rs | 309 ++--- + drivers/gpu/nova-core/gsp/fw/commands.rs | 17 +- + drivers/gpu/nova-core/gsp/fw/r570_144/bindings.rs | 1 + + drivers/gpu/nova-core/gsp/sequencer.rs | 22 +- + drivers/gpu/nova-core/nova_core.rs | 54 +- + drivers/gpu/nova-core/num.rs | 80 ++ + drivers/gpu/nova-core/regs.rs | 571 +++++---- + drivers/gpu/nova-core/regs/macros.rs | 739 ------------ + rust/bindings/bindings_helper.h | 14 + + rust/helpers/device.c | 5 + + rust/helpers/dma-resv.c | 14 + + rust/helpers/drm.c | 56 +- + rust/helpers/gpu.c | 17 + + rust/helpers/helpers.c | 3 + + rust/helpers/list.c | 17 + + rust/kernel/device.rs | 15 +- + rust/kernel/dma.rs | 899 ++++++++++---- + rust/kernel/drm/device.rs | 87 +- + rust/kernel/drm/driver.rs | 10 +- + rust/kernel/drm/file.rs | 8 +- + rust/kernel/drm/gem/mod.rs | 104 +- + rust/kernel/drm/gem/shmem.rs | 228 ++++ + rust/kernel/error.rs | 1 + + rust/kernel/gpu.rs | 6 + + rust/kernel/gpu/buddy.rs | 614 ++++++++++ + rust/kernel/interop.rs | 9 + + rust/kernel/interop/list.rs | 339 ++++++ + rust/kernel/io.rs | 782 +++++++----- + rust/kernel/io/mem.rs | 10 +- + rust/kernel/io/register.rs | 1260 ++++++++++++++++++++ + rust/kernel/lib.rs | 8 + + rust/kernel/num/bounded.rs | 70 +- + rust/kernel/pci/io.rs | 99 +- + rust/kernel/uaccess.rs | 91 +- + rust/kernel/workqueue.rs | 104 +- + samples/rust/rust_dma.rs | 13 +- + samples/rust/rust_driver_pci.rs | 90 +- + scripts/Makefile.build | 3 +- + 74 files changed, 7132 insertions(+), 3065 deletions(-) + delete mode 100644 drivers/gpu/nova-core/dma.rs + create mode 100644 drivers/gpu/nova-core/firmware/fwsec/bootloader.rs + create mode 100644 drivers/gpu/nova-core/gsp/cmdq/continuation.rs + delete mode 100644 drivers/gpu/nova-core/regs/macros.rs + create mode 100644 rust/helpers/dma-resv.c + create mode 100644 rust/helpers/gpu.c + create mode 100644 rust/helpers/list.c + create mode 100644 rust/kernel/drm/gem/shmem.rs + create mode 100644 rust/kernel/gpu.rs + create mode 100644 rust/kernel/gpu/buddy.rs + create mode 100644 rust/kernel/interop.rs + create mode 100644 rust/kernel/interop/list.rs + create mode 100644 rust/kernel/io/register.rs +$ git am -3 ../patches/0001-drm-nova-Fix-up-merge-issue.patch +Applying: drm: nova: Fix up merge issue +Using index info to reconstruct a base tree... +M drivers/gpu/nova-core/gsp/cmdq.rs +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/nova-core/gsp/cmdq.rs +No changes -- Patch already applied. +Merging drm-nova/nova-next (93296e9d9528f gpu: nova-core: vbios: store reference to Device where relevant) +$ git merge -m Merge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git drm-nova/nova-next +Already up to date. +Merging fbdev/for-next (caf6144053b4e fbdev: matroxfb: Mark variable with __maybe_unused to avoid W=1 build break) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging include/linux/console_struct.h +Merge made by the 'ort' strategy. + drivers/video/console/newport_con.c | 61 +++----- + drivers/video/fbdev/Kconfig | 10 +- + drivers/video/fbdev/core/bitblit.c | 11 +- + drivers/video/fbdev/core/fb_defio.c | 266 ++++++++++++++++++++++++---------- + drivers/video/fbdev/core/fbcon.c | 194 +++++++------------------ + drivers/video/fbdev/core/fbcon.h | 8 +- + drivers/video/fbdev/core/fbmem.c | 6 +- + drivers/video/fbdev/goldfishfb.c | 14 +- + drivers/video/fbdev/macfb.c | 38 ++--- + drivers/video/fbdev/matrox/g450_pll.c | 2 +- + drivers/video/fbdev/omap/hwa742.c | 4 + + drivers/video/fbdev/tdfxfb.c | 103 ++++++------- + drivers/video/fbdev/via/lcd.c | 3 + + drivers/video/fbdev/wmt_ge_rops.c | 18 +-- + include/linux/console_struct.h | 59 +++++++- + include/linux/fb.h | 19 +-- + include/linux/font.h | 115 +++++++++------ + lib/fonts/font.h | 38 +++++ + lib/fonts/font_10x18.c | 2 +- + lib/fonts/font_6x10.c | 3 +- + lib/fonts/font_6x11.c | 2 +- + lib/fonts/font_6x8.c | 3 +- + lib/fonts/font_7x14.c | 2 +- + lib/fonts/font_8x16.c | 3 +- + lib/fonts/font_8x8.c | 2 +- + lib/fonts/font_acorn_8x8.c | 4 +- + lib/fonts/font_mini_4x6.c | 10 +- + lib/fonts/font_pearl_8x8.c | 2 +- + lib/fonts/font_sun12x22.c | 3 +- + lib/fonts/font_sun8x16.c | 3 +- + lib/fonts/font_ter10x18.c | 4 +- + lib/fonts/font_ter16x32.c | 4 +- + lib/fonts/fonts.c | 232 ++++++++++++++++++++++++++++- + 33 files changed, 801 insertions(+), 447 deletions(-) + create mode 100644 lib/fonts/font.h +$ git am -3 ../patches/0001-fix-up-for-drm-hyperv-Remove-reference-to-hyperv_fb-.patch +Applying: fix up for "drm/hyperv: Remove reference to hyperv_fb driver" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/hyperv/Kconfig +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 5f16b0a7ac8c7] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git + Date: Mon Mar 30 19:04:40 2026 +0100 +Merging regmap/for-next (10ec8c4403296 Merge remote-tracking branch 'regmap/for-7.1' into regmap-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/internal.h | 2 +- + drivers/base/regmap/regcache.c | 102 ++++++++++++++++++++++------------------- + drivers/base/regmap/regmap.c | 23 ++++------ + include/linux/regmap.h | 15 +++--- + 4 files changed, 74 insertions(+), 68 deletions(-) +Merging sound/for-next (66a6333ba5087 ALSA: hda/realtek: Add support for ASUS 2026 Commercial laptops using CS35L41 HDA) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging sound/core/pcm_native.c +Auto-merging sound/hda/codecs/realtek/alc269.c +Auto-merging sound/hda/controllers/intel.c +Auto-merging sound/usb/quirks.c +Merge made by the 'ort' strategy. + Documentation/sound/alsa-configuration.rst | 7 ++ + include/sound/core.h | 3 + + include/sound/hda_verbs.h | 12 ++- + include/sound/pcm.h | 4 + + include/sound/timer.h | 1 + + sound/aoa/aoa.h | 2 +- + sound/aoa/fabrics/layout.c | 28 +++--- + sound/aoa/soundbus/i2sbus/core.c | 12 ++- + sound/aoa/soundbus/i2sbus/pcm.c | 16 ++-- + sound/core/Makefile | 1 + + sound/core/compress_offload.c | 7 -- + sound/core/control.c | 76 +++++++++++++++- + sound/core/control_trace.h | 55 ++++++++++++ + sound/core/init.c | 8 ++ + sound/core/oss/pcm_oss.c | 44 +++++---- + sound/core/pcm_compat.c | 10 ++- + sound/core/pcm_native.c | 29 +++++- + sound/core/seq/oss/seq_oss_rw.c | 6 +- + sound/core/seq/seq_ump_convert.c | 35 +++++--- + sound/core/sound.c | 7 ++ + sound/core/timer.c | 29 ++++-- + sound/hda/codecs/cirrus/cs8409.c | 2 +- + sound/hda/codecs/realtek/alc269.c | 8 ++ + sound/hda/codecs/senarytech.c | 73 +++++++++++++-- + .../hda/codecs/side-codecs/cs35l41_hda_property.c | 6 ++ + sound/hda/common/proc.c | 100 ++++++++++++++------- + sound/hda/controllers/intel.c | 13 --- + sound/pci/asihpi/asihpi.c | 36 +++++--- + sound/usb/card.c | 44 ++++----- + sound/usb/format.c | 4 + + sound/usb/midi.c | 12 ++- + sound/usb/midi2.c | 6 +- + sound/usb/mixer.c | 100 ++++++++++++++++----- + sound/usb/mixer.h | 4 +- + sound/usb/mixer_quirks.c | 59 ++++++++++++ + sound/usb/mixer_s1810c.c | 2 + + sound/usb/quirks-table.h | 65 ++++++++++++++ + sound/usb/quirks.c | 75 ++++++++++++++++ + sound/usb/stream.c | 8 ++ + sound/usb/usbaudio.h | 12 +++ + tools/testing/selftests/alsa/utimer-test.c | 10 ++- + 41 files changed, 819 insertions(+), 212 deletions(-) + create mode 100644 sound/core/control_trace.h +Merging ieee1394/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging sound-asoc/for-next (877bf4ed5b372 Merge remote-tracking branch 'asoc/for-7.1' into asoc-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/adi,ssm2305.txt | 14 - + .../devicetree/bindings/sound/adi,ssm2305.yaml | 46 + + .../devicetree/bindings/sound/awinic,aw88395.yaml | 4 + + .../devicetree/bindings/sound/cirrus,cs42l43.yaml | 3 + + .../devicetree/bindings/sound/imx-audio-card.yaml | 9 +- + .../bindings/sound/mediatek,mt2701-wm8960.yaml | 4 +- + .../bindings/sound/mediatek,mt7986-wm8960.yaml | 4 +- + .../sound/mediatek,mt8173-rt5650-rt5514.yaml | 41 + + .../bindings/sound/mediatek,mt8188-mt6359.yaml | 4 +- + .../bindings/sound/mt8173-rt5650-rt5514.txt | 15 - + .../bindings/sound/nvidia,tegra-audio-cpcap.yaml | 90 ++ + .../sound/nvidia,tegra-audio-max9808x.yaml | 5 + + .../bindings/sound/nvidia,tegra-audio-wm8962.yaml | 88 ++ + .../sound/rockchip,rockchip-audio-max98090.yaml | 59 + + .../bindings/sound/rockchip-max98090.txt | 42 - + .../devicetree/bindings/sound/simple-card.yaml | 14 +- + .../devicetree/bindings/sound/tdm-slot.txt | 29 - + .../devicetree/bindings/sound/tdm-slot.yaml | 52 + + .../devicetree/bindings/sound/ti,tas2770.yaml | 4 +- + arch/arm/mach-s3c/mach-crag6410-module.c | 6 +- + drivers/firmware/cirrus/cs_dsp.c | 117 +- + drivers/firmware/cirrus/cs_dsp.h | 4 +- + drivers/firmware/cirrus/test/cs_dsp_test_bin.c | 25 +- + .../firmware/cirrus/test/cs_dsp_test_bin_error.c | 22 +- + .../cirrus/test/cs_dsp_test_control_cache.c | 5 + + .../cirrus/test/cs_dsp_test_control_parse.c | 5 + + .../firmware/cirrus/test/cs_dsp_test_control_rw.c | 5 + + drivers/firmware/cirrus/test/cs_dsp_test_wmfw.c | 32 +- + .../firmware/cirrus/test/cs_dsp_test_wmfw_error.c | 30 +- + drivers/mfd/cs42l43-i2c.c | 7 +- + drivers/mfd/cs42l43-sdw.c | 4 +- + drivers/mfd/cs42l43.c | 93 +- + drivers/mfd/cs42l43.h | 2 +- + include/linux/firmware/cirrus/cs_dsp.h | 3 + + include/linux/mfd/arizona/pdata.h | 10 - + include/linux/mfd/cs42l43-regs.h | 76 ++ + include/linux/mfd/cs42l43.h | 1 + + include/sound/cs35l56.h | 7 +- + include/sound/simple_card_utils.h | 6 + + include/sound/soc-component.h | 11 +- + include/sound/soc-dai.h | 22 + + include/sound/soc-dapm.h | 1 + + include/sound/soc.h | 22 +- + include/sound/soc_sdw_utils.h | 5 + + sound/hda/codecs/side-codecs/Kconfig | 1 + + sound/soc/amd/Kconfig | 10 - + sound/soc/amd/Makefile | 1 - + sound/soc/amd/acp-da7219-max98357a.c | 1 - + sound/soc/amd/acp-es8336.c | 1 - + sound/soc/amd/acp-pcm-dma.c | 2 +- + sound/soc/amd/acp-rt5645.c | 22 +- + sound/soc/amd/acp/acp-platform.c | 2 +- + sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c | 1 - + sound/soc/amd/acp3x-rt5682-max9836.c | 1 - + sound/soc/amd/include/acp_2_2_d.h | 18 +- + sound/soc/amd/include/acp_2_2_enum.h | 18 +- + sound/soc/amd/include/acp_2_2_sh_mask.h | 18 +- + sound/soc/amd/ps/ps-pdm-dma.c | 2 +- + sound/soc/amd/ps/ps-sdw-dma.c | 2 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 2 +- + sound/soc/amd/renoir/acp3x-pdm-dma.c | 2 +- + sound/soc/amd/rpl/Makefile | 5 - + sound/soc/amd/rpl/rpl-pci-acp6x.c | 227 ---- + sound/soc/amd/rpl/rpl_acp6x.h | 36 - + sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h | 30 - + sound/soc/amd/vangogh/acp5x-pcm-dma.c | 2 +- + sound/soc/amd/yc/acp6x-mach.c | 21 + + sound/soc/amd/yc/acp6x-pdm-dma.c | 2 +- + sound/soc/amd/yc/pci-acp6x.c | 12 + + sound/soc/apple/Kconfig | 1 + + sound/soc/apple/Makefile | 1 + + sound/soc/apple/mca.c | 4 +- + sound/soc/atmel/atmel-pcm-pdc.c | 2 +- + sound/soc/au1x/dbdma2.c | 2 +- + sound/soc/au1x/dma.c | 2 +- + sound/soc/bcm/bcm63xx-pcm-whistler.c | 2 +- + sound/soc/bcm/cygnus-pcm.c | 2 +- + sound/soc/codecs/Kconfig | 58 +- + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/arizona-jack.c | 95 +- + sound/soc/codecs/arizona.h | 1 + + sound/soc/codecs/aw87390.c | 3 +- + sound/soc/codecs/aw88081.c | 3 +- + sound/soc/codecs/aw88166.c | 12 +- + sound/soc/codecs/aw88261.c | 16 +- + sound/soc/codecs/cros_ec_codec.c | 2 +- + sound/soc/codecs/cs-amp-lib-test.c | 1 - + sound/soc/codecs/cs-amp-lib.c | 2 + + sound/soc/codecs/cs35l41.c | 5 + + sound/soc/codecs/cs35l45.c | 3 + + sound/soc/codecs/cs35l56-sdw.c | 34 +- + sound/soc/codecs/cs35l56-shared-test.c | 240 ++++ + sound/soc/codecs/cs35l56-shared.c | 9 + + sound/soc/codecs/cs35l56-test.c | 101 +- + sound/soc/codecs/cs35l56.c | 99 +- + sound/soc/codecs/cs35l56.h | 4 + + sound/soc/codecs/cs4270.c | 6 +- + sound/soc/codecs/cs42l43.c | 756 +++++++++--- + sound/soc/codecs/cs42l43.h | 4 +- + sound/soc/codecs/cs42l84.c | 20 +- + sound/soc/codecs/cs42xx8-i2c.c | 5 +- + sound/soc/codecs/cs42xx8.c | 27 +- + sound/soc/codecs/cs42xx8.h | 5 +- + sound/soc/codecs/da7219-aad.c | 3 +- + sound/soc/codecs/da7219-aad.h | 5 + + sound/soc/codecs/max98390.c | 6 +- + sound/soc/codecs/max98520.c | 4 +- + sound/soc/codecs/nau8315.c | 1 - + sound/soc/codecs/peb2466.c | 19 +- + sound/soc/codecs/rt1318.c | 1 - + sound/soc/codecs/rt5514-spi.c | 2 +- + sound/soc/codecs/rt5575.c | 1 - + sound/soc/codecs/rt5677-spi.c | 9 +- + sound/soc/codecs/rt5677.c | 40 +- + sound/soc/codecs/rt5677.h | 2 +- + sound/soc/codecs/sta529.c | 5 +- + sound/soc/codecs/tas2552.c | 10 +- + sound/soc/codecs/tas2764.c | 95 ++ + sound/soc/codecs/tas2764.h | 11 + + sound/soc/codecs/tas2770.c | 75 ++ + sound/soc/codecs/tas2770.h | 12 + + sound/soc/codecs/ts3a227e.c | 1 - + sound/soc/codecs/uda1380.c | 47 +- + sound/soc/codecs/wcd-clsh-v2.c | 3 - + sound/soc/codecs/wcd9335.c | 2 +- + sound/soc/codecs/wm_adsp.c | 242 ++-- + sound/soc/codecs/wm_adsp.h | 20 + + sound/soc/codecs/wm_adsp_fw_find_test.c | 1223 ++++++++++++++++++++ + sound/soc/dwc/dwc-i2s.c | 5 +- + sound/soc/dwc/dwc-pcm.c | 7 +- + sound/soc/dwc/local.h | 5 +- + sound/soc/fsl/efika-audio-fabric.c | 5 +- + sound/soc/fsl/fsl_asrc_dma.c | 2 +- + sound/soc/fsl/fsl_dma.c | 12 +- + sound/soc/fsl/fsl_easrc.c | 2 +- + sound/soc/fsl/fsl_qmc_audio.c | 6 +- + sound/soc/fsl/fsl_sai.c | 66 ++ + sound/soc/fsl/fsl_sai.h | 4 + + sound/soc/fsl/fsl_utils.c | 131 +++ + sound/soc/fsl/fsl_utils.h | 48 + + sound/soc/fsl/fsl_xcvr.c | 64 + + sound/soc/fsl/fsl_xcvr.h | 18 + + sound/soc/fsl/imx-pcm-fiq.c | 4 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 2 +- + sound/soc/fsl/mpc5200_dma.c | 13 +- + sound/soc/generic/audio-graph-card.c | 2 +- + sound/soc/generic/simple-card-utils.c | 43 +- + sound/soc/generic/simple-card.c | 6 +- + sound/soc/generic/test-component.c | 12 +- + sound/soc/google/chv3-i2s.c | 6 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- + sound/soc/intel/avs/pcm.c | 8 +- + sound/soc/intel/boards/ehl_rt5660.c | 2 - + sound/soc/intel/catpt/Makefile | 1 + + sound/soc/intel/catpt/core.h | 2 +- + sound/soc/intel/catpt/device.c | 2 +- + sound/soc/intel/catpt/ipc.c | 3 + + sound/soc/intel/catpt/loader.c | 2 + + sound/soc/intel/catpt/messages.h | 3 + + sound/soc/intel/catpt/pcm.c | 414 +++---- + sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 100 -- + sound/soc/intel/keembay/Makefile | 1 + + sound/soc/intel/keembay/kmb_platform.c | 2 +- + sound/soc/kirkwood/kirkwood-dma.c | 2 +- + sound/soc/loongson/loongson_dma.c | 2 +- + .../soc/mediatek/common/mtk-afe-platform-driver.c | 2 +- + sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 2 +- + sound/soc/mediatek/mt8189/mt8189-afe-pcm.c | 4 +- + sound/soc/pxa/pxa-ssp.c | 2 +- + sound/soc/pxa/pxa2xx-ac97.c | 2 +- + sound/soc/pxa/pxa2xx-i2s.c | 2 +- + sound/soc/pxa/pxa2xx-pcm.c | 2 +- + sound/soc/qcom/lpass-platform.c | 2 +- + sound/soc/qcom/qdsp6/q6apm-dai.c | 2 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 2 +- + sound/soc/renesas/dma-sh7760.c | 5 +- + sound/soc/renesas/fsi.c | 2 +- + sound/soc/renesas/rcar/msiof.c | 2 +- + sound/soc/renesas/rz-ssi.c | 2 +- + sound/soc/renesas/siu_pcm.c | 5 +- + sound/soc/rockchip/rockchip_sai.c | 4 + + sound/soc/samsung/idma.c | 4 +- + sound/soc/sdca/sdca_asoc.c | 116 +- + sound/soc/sdca/sdca_class.c | 2 + + sound/soc/sdca/sdca_fdl.c | 5 - + sound/soc/sdca/sdca_functions.c | 6 +- + sound/soc/sdw_utils/Makefile | 1 + + sound/soc/sdw_utils/soc_sdw_cs47l47.c | 80 ++ + sound/soc/sdw_utils/soc_sdw_rt_dmic.c | 46 +- + sound/soc/sdw_utils/soc_sdw_utils.c | 234 +++- + sound/soc/soc-component.c | 25 +- + sound/soc/soc-compress.c | 4 +- + sound/soc/soc-core.c | 84 +- + sound/soc/soc-dai.c | 40 + + sound/soc/soc-dapm.c | 11 + + sound/soc/soc-generic-dmaengine-pcm.c | 4 +- + sound/soc/soc-ops.c | 83 +- + sound/soc/soc-pcm.c | 4 +- + sound/soc/soc-topology.c | 73 +- + sound/soc/sof/compress.c | 4 +- + sound/soc/sof/intel/hda.c | 17 +- + sound/soc/sof/ipc4-topology.c | 13 +- + sound/soc/sof/pcm.c | 10 +- + sound/soc/sof/sof-audio.h | 11 +- + sound/soc/sof/topology.c | 22 +- + sound/soc/spear/spdif_in.c | 5 +- + sound/soc/spear/spdif_out.c | 5 +- + sound/soc/spear/spear_pcm.c | 5 +- + sound/soc/sprd/sprd-pcm-dma.c | 2 +- + sound/soc/starfive/Makefile | 1 + + sound/soc/sti/uniperif_player.c | 9 +- + sound/soc/stm/stm32_adfsdm.c | 2 +- + sound/soc/sunxi/sun4i-spdif.c | 13 +- + sound/soc/tegra/Kconfig | 19 + + sound/soc/tegra/Makefile | 2 + + sound/soc/tegra/tegra186_asrc.c | 7 +- + sound/soc/tegra/tegra186_dspk.c | 15 +- + sound/soc/tegra/tegra210_admaif.c | 6 +- + sound/soc/tegra/tegra210_adx.c | 13 +- + sound/soc/tegra/tegra210_ahub.c | 26 +- + sound/soc/tegra/tegra210_amx.c | 9 +- + sound/soc/tegra/tegra210_dmic.c | 14 +- + sound/soc/tegra/tegra210_i2s.c | 18 +- + sound/soc/tegra/tegra210_mbdrc.c | 18 +- + sound/soc/tegra/tegra210_mixer.c | 7 +- + sound/soc/tegra/tegra210_mvc.c | 7 +- + sound/soc/tegra/tegra210_peq.c | 6 +- + sound/soc/tegra/tegra210_sfc.c | 7 +- + sound/soc/tegra/tegra_asoc_machine.c | 122 +- + sound/soc/tegra/tegra_audio_graph_card.c | 21 +- + sound/soc/tegra/tegra_pcm.c | 6 +- + sound/soc/tegra/tegra_pcm.h | 4 +- + sound/soc/tegra/tegra_wm8962.c | 165 +++ + sound/soc/ti/davinci-mcasp.c | 47 +- + sound/soc/uniphier/aio-dma.c | 2 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 2 +- + sound/soc/xtensa/xtfpga-i2s.c | 2 +- + sound/usb/qcom/Makefile | 1 + + sound/x86/intel_hdmi_audio.h | 22 +- + 239 files changed, 5478 insertions(+), 1937 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/adi,ssm2305.txt + create mode 100644 Documentation/devicetree/bindings/sound/adi,ssm2305.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt8173-rt5650-rt5514.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-cpcap.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8962.yaml + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rockchip-audio-max98090.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/rockchip-max98090.txt + delete mode 100644 Documentation/devicetree/bindings/sound/tdm-slot.txt + create mode 100644 Documentation/devicetree/bindings/sound/tdm-slot.yaml + delete mode 100644 sound/soc/amd/rpl/Makefile + delete mode 100644 sound/soc/amd/rpl/rpl-pci-acp6x.c + delete mode 100644 sound/soc/amd/rpl/rpl_acp6x.h + delete mode 100644 sound/soc/amd/rpl/rpl_acp6x_chip_offset_byte.h + create mode 100644 sound/soc/codecs/wm_adsp_fw_find_test.c + create mode 100644 sound/soc/sdw_utils/soc_sdw_cs47l47.c + create mode 100644 sound/soc/tegra/tegra_wm8962.c +Merging modules/modules-next (55722b3f80377 selftests/bpf: verify_pkcs7_sig: Use 'struct module_signature' from the UAPI headers) +$ git merge -m Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Auto-merging include/linux/module.h +Auto-merging kernel/module/main.c +Auto-merging scripts/Makefile +Auto-merging tools/testing/selftests/bpf/Makefile +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-module | 9 ++ + Documentation/core-api/symbol-namespaces.rst | 5 ++ + arch/s390/kernel/machine_kexec_file.c | 6 +- + certs/extract-cert.c | 2 - + include/asm-generic/codetag.lds.h | 2 +- + include/linux/module.h | 1 + + include/linux/module_signature.h | 30 +------ + include/linux/moduleparam.h | 100 ++++++++++----------- + include/uapi/linux/module_signature.h | 41 +++++++++ + kernel/module/main.c | 73 ++++++++++++++- + kernel/module/signing.c | 4 +- + kernel/module_signature.c | 2 +- + kernel/params.c | 29 +++--- + scripts/Makefile | 1 + + scripts/module.lds.S | 12 +-- + scripts/sign-file.c | 19 +--- + security/integrity/ima/ima_modsig.c | 6 +- + tools/include/uapi/linux/module_signature.h | 41 +++++++++ + tools/testing/selftests/bpf/Makefile | 1 + + .../selftests/bpf/prog_tests/verify_pkcs7_sig.c | 28 +----- + 20 files changed, 259 insertions(+), 153 deletions(-) + create mode 100644 include/uapi/linux/module_signature.h + create mode 100644 tools/include/uapi/linux/module_signature.h +Merging input/next (79df764dbecd5 Input: zinitix - use guard notation when acquiring mutex) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/matrix-keymap.yaml | 4 +- + .../devicetree/bindings/input/parade,tc3408.yaml | 68 ++ + .../bindings/input/touchscreen/edt-ft5x06.yaml | 30 +- + .../input/touchscreen/sitronix,st1232.yaml | 4 + + .../input/touchscreen/technologic,ts4800-ts.yaml | 42 + + .../bindings/input/touchscreen/trivial-touch.yaml | 6 +- + .../bindings/input/touchscreen/ts4800-ts.txt | 11 - + drivers/hid/i2c-hid/i2c-hid-of-elan.c | 8 + + drivers/input/input.c | 23 +- + drivers/input/keyboard/atkbd.c | 133 ++- + drivers/input/keyboard/cros_ec_keyb.c | 259 +++-- + drivers/input/keyboard/mpr121_touchkey.c | 8 - + drivers/input/misc/adxl34x-i2c.c | 5 +- + drivers/input/misc/atlas_btns.c | 22 +- + drivers/input/misc/drv260x.c | 50 +- + drivers/input/mouse/Kconfig | 10 - + drivers/input/mouse/Makefile | 1 - + drivers/input/mouse/alps.c | 11 +- + drivers/input/mouse/alps.h | 4 +- + drivers/input/mouse/hgpk.c | 1063 -------------------- + drivers/input/mouse/hgpk.h | 61 -- + drivers/input/mouse/psmouse-base.c | 51 +- + drivers/input/mouse/psmouse.h | 6 +- + drivers/input/serio/libps2.c | 12 +- + drivers/input/touchscreen/ad7877.c | 32 +- + drivers/input/touchscreen/ad7879.c | 46 +- + drivers/input/touchscreen/ads7846.c | 44 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 290 +++--- + drivers/input/touchscreen/auo-pixcir-ts.c | 43 +- + drivers/input/touchscreen/bu21029_ts.c | 8 +- + drivers/input/touchscreen/chipone_icn8318.c | 8 +- + drivers/input/touchscreen/cyttsp_core.c | 20 +- + drivers/input/touchscreen/edt-ft5x06.c | 87 +- + drivers/input/touchscreen/eeti_ts.c | 27 +- + drivers/input/touchscreen/ektf2127.c | 8 +- + drivers/input/touchscreen/elants_i2c.c | 93 +- + drivers/input/touchscreen/elo.c | 32 +- + drivers/input/touchscreen/exc3000.c | 31 +- + drivers/input/touchscreen/goodix_fwupload.c | 29 +- + drivers/input/touchscreen/hideep.c | 54 +- + drivers/input/touchscreen/hycon-hy46xx.c | 31 +- + drivers/input/touchscreen/imagis.c | 30 +- + drivers/input/touchscreen/imx6ul_tsc.c | 19 +- + drivers/input/touchscreen/ipaq-micro-ts.c | 8 +- + drivers/input/touchscreen/iqs5xx.c | 190 ++-- + drivers/input/touchscreen/iqs7211.c | 24 +- + drivers/input/touchscreen/lpc32xx_ts.c | 8 +- + drivers/input/touchscreen/melfas_mip4.c | 121 +-- + drivers/input/touchscreen/mk712.c | 16 +- + drivers/input/touchscreen/mms114.c | 20 +- + drivers/input/touchscreen/msg2638.c | 19 +- + drivers/input/touchscreen/mxs-lradc-ts.c | 7 +- + drivers/input/touchscreen/novatek-nvt-ts.c | 8 +- + drivers/input/touchscreen/pixcir_i2c_ts.c | 38 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 56 +- + drivers/input/touchscreen/st1232.c | 67 +- + drivers/input/touchscreen/stmfts.c | 63 +- + drivers/input/touchscreen/sur40.c | 23 +- + drivers/input/touchscreen/sx8654.c | 20 +- + drivers/input/touchscreen/tsc2007_core.c | 7 +- + drivers/input/touchscreen/tsc2007_iio.c | 9 +- + drivers/input/touchscreen/wdt87xx_i2c.c | 44 +- + drivers/input/touchscreen/wm97xx-core.c | 57 +- + drivers/input/touchscreen/zinitix.c | 19 +- + include/linux/input.h | 4 + + 65 files changed, 1290 insertions(+), 2362 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/parade,tc3408.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/technologic,ts4800-ts.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/ts4800-ts.txt + delete mode 100644 drivers/input/mouse/hgpk.c + delete mode 100644 drivers/input/mouse/hgpk.h +Merging block/for-next (cdd71b7feb367 Merge branch 'io_uring-7.0' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git block/for-next +Auto-merging crypto/Kconfig +Auto-merging crypto/Makefile +Auto-merging drivers/target/target_core_file.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/ext4/mballoc-test.c +Auto-merging fs/ext4/mballoc.c +Auto-merging mm/swapfile.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-block | 15 + + Documentation/ABI/testing/sysfs-nvme | 13 + + Documentation/admin-guide/blockdev/zoned_loop.rst | 5 + + block/bio.c | 224 +++--- + block/blk-cgroup.c | 15 + + block/blk-crypto-sysfs.c | 40 +- + block/blk-ia-ranges.c | 6 +- + block/blk-mq-debugfs.c | 1 + + block/blk-mq-sysfs.c | 10 +- + block/blk-mq.c | 19 + + block/blk-settings.c | 12 +- + block/blk-sysfs.c | 89 ++- + block/blk-zoned.c | 410 +++++++---- + block/blk.h | 5 - + block/bsg-lib.c | 2 +- + block/bsg.c | 33 +- + block/opal_proto.h | 4 + + block/partitions/acorn.c | 32 +- + block/partitions/aix.c | 21 +- + block/partitions/amiga.c | 35 +- + block/partitions/atari.c | 12 +- + block/partitions/check.h | 8 +- + block/partitions/cmdline.c | 6 +- + block/partitions/core.c | 20 +- + block/partitions/efi.c | 2 +- + block/partitions/ibm.c | 27 +- + block/partitions/karma.c | 2 +- + block/partitions/ldm.c | 4 +- + block/partitions/mac.c | 4 +- + block/partitions/msdos.c | 67 +- + block/partitions/of.c | 6 +- + block/partitions/osf.c | 2 +- + block/partitions/sgi.c | 2 +- + block/partitions/sun.c | 2 +- + block/partitions/sysv68.c | 9 +- + block/partitions/ultrix.c | 2 +- + block/sed-opal.c | 399 +++++++++- + block/t10-pi.c | 854 ++++++++++++---------- + crypto/Kconfig | 6 - + crypto/Makefile | 1 - + crypto/hkdf.c | 573 --------------- + drivers/block/drbd/drbd_nl.c | 581 ++++++++------- + drivers/block/ublk_drv.c | 72 +- + drivers/block/zloop.c | 337 ++++++--- + drivers/md/bcache/super.c | 7 + + drivers/md/md-llbitmap.c | 11 +- + drivers/md/md.c | 32 +- + drivers/md/raid1.c | 6 +- + drivers/md/raid10.c | 6 +- + drivers/md/raid5.c | 31 +- + drivers/md/raid5.h | 1 - + drivers/nvme/common/.kunitconfig | 6 + + drivers/nvme/common/Kconfig | 14 +- + drivers/nvme/common/Makefile | 2 + + drivers/nvme/common/auth.c | 591 ++++++--------- + drivers/nvme/common/tests/auth_kunit.c | 175 +++++ + drivers/nvme/host/auth.c | 187 ++--- + drivers/nvme/host/core.c | 89 ++- + drivers/nvme/host/ioctl.c | 4 - + drivers/nvme/host/multipath.c | 15 +- + drivers/nvme/host/nvme.h | 6 + + drivers/nvme/host/pci.c | 2 + + drivers/nvme/host/sysfs.c | 50 +- + drivers/nvme/target/admin-cmd.c | 4 +- + drivers/nvme/target/auth.c | 202 ++--- + drivers/nvme/target/configfs.c | 3 - + drivers/nvme/target/core.c | 7 +- + drivers/nvme/target/fabrics-cmd-auth.c | 18 +- + drivers/nvme/target/fc.c | 6 +- + drivers/nvme/target/io-cmd-bdev.c | 19 +- + drivers/nvme/target/loop.c | 2 - + drivers/nvme/target/nvmet.h | 8 +- + drivers/nvme/target/tcp.c | 2 +- + drivers/scsi/scsi_bsg.c | 176 ++++- + drivers/target/target_core_file.c | 2 +- + drivers/target/target_core_iblock.c | 2 +- + fs/btrfs/volumes.c | 4 +- + fs/ext4/mballoc-test.c | 2 +- + fs/ext4/mballoc.c | 2 +- + include/crypto/hkdf.h | 20 - + include/linux/bio.h | 3 +- + include/linux/blk-integrity.h | 1 + + include/linux/blkdev.h | 17 +- + include/linux/bsg.h | 6 +- + include/linux/genl_magic_func.h | 4 + + include/linux/io_uring/cmd.h | 53 +- + include/linux/io_uring_types.h | 57 +- + include/linux/nvme-auth.h | 41 +- + include/linux/nvme.h | 24 +- + include/linux/sed-opal.h | 4 + + include/uapi/linux/bsg.h | 75 ++ + include/uapi/linux/io_uring.h | 117 +-- + include/uapi/linux/io_uring/zcrx.h | 115 +++ + include/uapi/linux/sed-opal.h | 29 + + io_uring/Kconfig | 5 + + io_uring/Makefile | 3 +- + io_uring/bpf-ops.c | 270 +++++++ + io_uring/bpf-ops.h | 28 + + io_uring/cmd_net.c | 34 +- + io_uring/eventfd.c | 4 +- + io_uring/io_uring.c | 126 ++-- + io_uring/io_uring.h | 10 +- + io_uring/kbuf.c | 254 ++++++- + io_uring/kbuf.h | 11 +- + io_uring/loop.c | 91 +++ + io_uring/loop.h | 27 + + io_uring/memmap.c | 111 +++ + io_uring/memmap.h | 4 + + io_uring/msg_ring.c | 2 +- + io_uring/net.c | 166 ++--- + io_uring/net.h | 1 - + io_uring/opdef.c | 12 +- + io_uring/opdef.h | 2 - + io_uring/poll.c | 8 +- + io_uring/query.c | 4 +- + io_uring/register.c | 10 +- + io_uring/rsrc.c | 12 +- + io_uring/rw.c | 13 +- + io_uring/tctx.c | 2 +- + io_uring/timeout.c | 74 +- + io_uring/timeout.h | 2 +- + io_uring/tw.c | 2 +- + io_uring/uring_cmd.c | 15 +- + io_uring/wait.h | 1 + + io_uring/zcrx.c | 378 ++++++---- + io_uring/zcrx.h | 34 +- + mm/swapfile.c | 2 +- + 127 files changed, 4713 insertions(+), 3254 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-nvme + delete mode 100644 crypto/hkdf.c + create mode 100644 drivers/nvme/common/.kunitconfig + create mode 100644 drivers/nvme/common/tests/auth_kunit.c + delete mode 100644 include/crypto/hkdf.h + create mode 100644 include/uapi/linux/io_uring/zcrx.h + create mode 100644 io_uring/bpf-ops.c + create mode 100644 io_uring/bpf-ops.h + create mode 100644 io_uring/loop.c + create mode 100644 io_uring/loop.h +$ git am -3 ../patches/0001-Merge-fixup-for-Rust-error.patch +Applying: Merge fixup for Rust error +Using index info to reconstruct a base tree... +M drivers/block/rnull/configfs.rs +Falling back to patching base and 3-way merge... +Auto-merging drivers/block/rnull/configfs.rs +No changes -- Patch already applied. +$ git am -3 ../patches/0001-Revert-block-remove-bio_last_bvec_all.patch +Applying: Revert "block: remove bio_last_bvec_all" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/block/biovecs.rst +M include/linux/bio.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master de8f4e3b3d9ae] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Mon Mar 30 19:42:59 2026 +0100 +Merging device-mapper/for-next (43fd83c0b1dc1 dm-crypt: Make crypt_iv_operations::post return void) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/device-mapper/verity.rst | 122 +++++-- + drivers/md/Kconfig | 2 + + drivers/md/dm-bufio.c | 4 +- + drivers/md/dm-cache-metadata.c | 33 +- + drivers/md/dm-cache-metadata.h | 10 +- + drivers/md/dm-cache-policy-smq.c | 4 + + drivers/md/dm-cache-target.c | 90 +++-- + drivers/md/dm-crypt.c | 140 +++----- + drivers/md/dm-ima.c | 54 +-- + drivers/md/dm-ima.h | 1 - + drivers/md/dm-init.c | 4 +- + drivers/md/dm-integrity.c | 10 +- + drivers/md/dm-ioctl.c | 35 +- + drivers/md/dm-log.c | 6 +- + drivers/md/dm-mpath.c | 9 +- + drivers/md/dm-raid1.c | 6 +- + drivers/md/dm-vdo/action-manager.c | 2 +- + drivers/md/dm-vdo/block-map.c | 32 +- + drivers/md/dm-vdo/block-map.h | 2 +- + drivers/md/dm-vdo/constants.h | 13 +- + drivers/md/dm-vdo/data-vio.c | 3 +- + drivers/md/dm-vdo/dedupe.c | 8 +- + drivers/md/dm-vdo/dm-vdo-target.c | 151 +++++++- + drivers/md/dm-vdo/encodings.c | 221 +++++++++++- + drivers/md/dm-vdo/encodings.h | 17 + + drivers/md/dm-vdo/flush.c | 4 +- + drivers/md/dm-vdo/funnel-queue.c | 2 +- + drivers/md/dm-vdo/funnel-workqueue.c | 8 +- + drivers/md/dm-vdo/indexer/chapter-index.c | 2 +- + drivers/md/dm-vdo/indexer/config.c | 2 +- + drivers/md/dm-vdo/indexer/delta-index.c | 13 +- + drivers/md/dm-vdo/indexer/funnel-requestqueue.c | 2 +- + drivers/md/dm-vdo/indexer/geometry.c | 2 +- + drivers/md/dm-vdo/indexer/index-layout.c | 54 ++- + drivers/md/dm-vdo/indexer/index-page-map.c | 8 +- + drivers/md/dm-vdo/indexer/index-session.c | 2 +- + drivers/md/dm-vdo/indexer/index.c | 14 +- + drivers/md/dm-vdo/indexer/index.h | 2 +- + drivers/md/dm-vdo/indexer/indexer.h | 4 + + drivers/md/dm-vdo/indexer/io-factory.c | 6 +- + drivers/md/dm-vdo/indexer/open-chapter.c | 4 +- + drivers/md/dm-vdo/indexer/open-chapter.h | 2 +- + drivers/md/dm-vdo/indexer/radix-sort.c | 3 +- + drivers/md/dm-vdo/indexer/sparse-cache.c | 10 +- + drivers/md/dm-vdo/indexer/volume-index.c | 10 +- + drivers/md/dm-vdo/indexer/volume.c | 22 +- + drivers/md/dm-vdo/int-map.c | 5 +- + drivers/md/dm-vdo/io-submitter.c | 30 +- + drivers/md/dm-vdo/io-submitter.h | 4 + + drivers/md/dm-vdo/logical-zone.c | 3 +- + drivers/md/dm-vdo/logical-zone.h | 2 +- + drivers/md/dm-vdo/memory-alloc.c | 8 +- + drivers/md/dm-vdo/memory-alloc.h | 74 +--- + drivers/md/dm-vdo/message-stats.c | 2 +- + drivers/md/dm-vdo/packer.c | 9 +- + drivers/md/dm-vdo/physical-zone.c | 8 +- + drivers/md/dm-vdo/priority-table.c | 3 +- + drivers/md/dm-vdo/recovery-journal.c | 23 +- + drivers/md/dm-vdo/repair.c | 17 +- + drivers/md/dm-vdo/slab-depot.c | 41 +-- + drivers/md/dm-vdo/slab-depot.h | 2 +- + drivers/md/dm-vdo/status-codes.c | 2 + + drivers/md/dm-vdo/thread-utils.c | 2 +- + drivers/md/dm-vdo/types.h | 3 + + drivers/md/dm-vdo/vdo.c | 335 ++++++++++++------ + drivers/md/dm-vdo/vdo.h | 19 + + drivers/md/dm-vdo/vio.c | 12 +- + drivers/md/dm-verity-fec.c | 384 ++++++++++----------- + drivers/md/dm-verity-fec.h | 28 +- + drivers/md/dm-verity-target.c | 16 +- + drivers/md/dm-verity.h | 4 +- + drivers/md/dm-writecache.c | 10 +- + include/linux/device-mapper.h | 7 + + 73 files changed, 1345 insertions(+), 863 deletions(-) +Merging libata/for-next (78ec06991d2cd ata: libata-transport: remove redundant dynamic sysfs attributes) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/ata/baikal,bt1-ahci.yaml | 115 ----------- + drivers/ata/Kconfig | 1 - + drivers/ata/ahci_dwc.c | 55 ----- + drivers/ata/libata-core.c | 9 +- + drivers/ata/libata-eh.c | 28 ++- + drivers/ata/libata-sata.c | 14 +- + drivers/ata/libata-scsi.c | 223 +++++++++++---------- + drivers/ata/libata-transport.c | 113 ++++------- + include/linux/libata.h | 4 +- + 9 files changed, 191 insertions(+), 371 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/ata/baikal,bt1-ahci.yaml +Merging pcmcia/pcmcia-next (b3c26ea81ccc5 pcmcia: remove obsolete host controller drivers) +$ git merge -m Merge branch 'pcmcia-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Auto-merging drivers/pci/quirks.c +Merge made by the 'ort' strategy. + arch/mips/configs/mtx1_defconfig | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 2 - + arch/x86/kernel/resource.c | 2 +- + drivers/pci/quirks.c | 4 +- + drivers/pcmcia/Kconfig | 30 - + drivers/pcmcia/Makefile | 3 - + drivers/pcmcia/i82092.c | 679 ----------------- + drivers/pcmcia/i82092aa.h | 24 - + drivers/pcmcia/i82365.c | 1347 --------------------------------- + drivers/pcmcia/rsrc_nonstatic.c | 12 +- + drivers/pcmcia/tcic.c | 805 -------------------- + drivers/pcmcia/tcic.h | 266 ------- + drivers/pcmcia/yenta_socket.c | 3 +- + 13 files changed, 9 insertions(+), 3169 deletions(-) + delete mode 100644 drivers/pcmcia/i82092.c + delete mode 100644 drivers/pcmcia/i82092aa.h + delete mode 100644 drivers/pcmcia/i82365.c + delete mode 100644 drivers/pcmcia/tcic.c + delete mode 100644 drivers/pcmcia/tcic.h +Merging mmc/next (0aa7a5723c96d mmc: core: Switch to use pm_ptr() for mmc_host_class_dev_pm_ops) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Auto-merging include/linux/mmc/sdio_ids.h +Merge made by the 'ort' strategy. + .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 4 + + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 5 + + .../devicetree/bindings/mmc/arm,pl18x.yaml | 2 +- + .../devicetree/bindings/mmc/aspeed,sdhci.yaml | 41 +- + .../devicetree/bindings/mmc/brcm,iproc-sdhci.yaml | 5 + + .../devicetree/bindings/mmc/bst,c1200-sdhci.yaml | 70 ++ + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 2 - + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 1 + + .../bindings/mmc/hisilicon,hi3660-dw-mshc.yaml | 117 +++ + .../devicetree/bindings/mmc/k3-dw-mshc.txt | 73 -- + .../bindings/mmc/loongson,ls2k0500-mmc.yaml | 1 + + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 3 + + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 6 + + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 4 + + .../devicetree/bindings/mmc/sdhci-msm.yaml | 2 + + .../bindings/mmc/snps,dwcmshc-sdhci.yaml | 63 ++ + .../devicetree/bindings/mmc/spacemit,sdhci.yaml | 14 +- + MAINTAINERS | 2 + + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 4 +- + arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts | 4 +- + drivers/i2c/busses/i2c-omap.c | 24 +- + drivers/mmc/core/block.c | 12 +- + drivers/mmc/core/card.h | 11 + + drivers/mmc/core/host.c | 29 +- + drivers/mmc/core/host.h | 6 +- + drivers/mmc/core/mmc.c | 12 + + drivers/mmc/core/mmc_test.c | 28 +- + drivers/mmc/core/queue.c | 9 +- + drivers/mmc/core/queue.h | 3 + + drivers/mmc/core/quirks.h | 12 + + drivers/mmc/core/sdio_io.c | 6 +- + drivers/mmc/host/Kconfig | 16 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/atmel-mci.c | 12 +- + drivers/mmc/host/cavium-octeon.c | 5 +- + drivers/mmc/host/cavium.c | 4 +- + drivers/mmc/host/dw_mmc-bluefield.c | 2 +- + drivers/mmc/host/dw_mmc-exynos.c | 9 +- + drivers/mmc/host/dw_mmc-hi3798cv200.c | 6 +- + drivers/mmc/host/dw_mmc-hi3798mv200.c | 28 +- + drivers/mmc/host/dw_mmc-k3.c | 51 +- + drivers/mmc/host/dw_mmc-pci.c | 37 +- + drivers/mmc/host/dw_mmc-pltfm.c | 34 +- + drivers/mmc/host/dw_mmc-pltfm.h | 2 +- + drivers/mmc/host/dw_mmc-rockchip.c | 36 +- + drivers/mmc/host/dw_mmc-starfive.c | 5 +- + drivers/mmc/host/dw_mmc.c | 781 ++++++++------------- + drivers/mmc/host/dw_mmc.h | 148 +--- + drivers/mmc/host/jz4740_mmc.c | 2 +- + drivers/mmc/host/loongson2-mmc.c | 60 +- + drivers/mmc/host/mtk-sd.c | 32 +- + drivers/mmc/host/renesas_sdhi_core.c | 6 + + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 12 +- + drivers/mmc/host/rtsx_pci_sdmmc.c | 88 +-- + drivers/mmc/host/sdhci-esdhc-imx.c | 33 +- + drivers/mmc/host/sdhci-msm.c | 119 +++- + drivers/mmc/host/sdhci-of-arasan.c | 88 +-- + drivers/mmc/host/sdhci-of-aspeed.c | 11 +- + drivers/mmc/host/sdhci-of-bst.c | 523 ++++++++++++++ + drivers/mmc/host/sdhci-of-dwcmshc.c | 406 +++++++++++ + drivers/mmc/host/sdhci-of-k1.c | 39 +- + drivers/mmc/host/sdhci-pci-core.c | 1 - + drivers/mmc/host/sdhci-pic32.c | 5 +- + drivers/mmc/host/sdhci-pltfm.c | 20 - + drivers/mmc/host/sdhci-uhs2.c | 13 +- + drivers/mmc/host/sdhci.c | 23 +- + drivers/mmc/host/tifm_sd.c | 4 +- + drivers/mux/Kconfig | 17 +- + drivers/mux/core.c | 198 +++++- + drivers/phy/phy-can-transceiver.c | 10 - + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 30 +- + include/linux/mmc/card.h | 2 + + include/linux/mmc/sdio_ids.h | 3 + + include/linux/mux/consumer.h | 108 ++- + 74 files changed, 2411 insertions(+), 1194 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/bst,c1200-sdhci.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/hisilicon,hi3660-dw-mshc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt + create mode 100644 drivers/mmc/host/sdhci-of-bst.c +Merging mfd/for-mfd-next (d6e0ef4468824 mfd: intel-lpss: Add Intel Nova Lake-H PCI IDs) +$ git merge -m Merge branch 'for-mfd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/gpio/trivial-gpio.yaml | 2 - + .../devicetree/bindings/mfd/fsl,imx25-tsadc.yaml | 97 +++++ + .../devicetree/bindings/mfd/fsl-imx25-tsadc.txt | 47 --- + Documentation/devicetree/bindings/mfd/max77620.txt | 162 -------- + .../devicetree/bindings/mfd/maxim,max77620.yaml | 444 +++++++++++++++++++++ + .../devicetree/bindings/mfd/rohm,bd72720-pmic.yaml | 29 +- + .../devicetree/bindings/mfd/spacemit,p1.yaml | 49 ++- + .../bindings/thermal/max77620_thermal.txt | 70 ---- + Documentation/driver-api/driver-model/devres.rst | 4 + + drivers/mfd/atmel-hlcdc.c | 13 +- + drivers/mfd/bcm2835-pm.c | 9 +- + drivers/mfd/dln2.c | 21 +- + drivers/mfd/ezx-pcap.c | 27 +- + drivers/mfd/intel-lpss-pci.c | 13 + + drivers/mfd/lpc_ich.c | 7 + + drivers/mfd/macsmc.c | 1 + + drivers/mfd/max77705.c | 2 +- + drivers/mfd/mc13xxx-core.c | 2 +- + drivers/mfd/mt6397-core.c | 4 +- + drivers/mfd/rohm-bd71828.c | 1 + + drivers/mfd/stpmic1.c | 20 +- + drivers/mfd/viperboard.c | 7 +- + include/linux/mfd/atmel-hlcdc.h | 1 + + include/linux/mfd/bcm2835-pm.h | 7 + + include/linux/mfd/cgbc.h | 4 +- + include/linux/mfd/kempld.h | 6 +- + include/linux/mfd/lpc_ich.h | 2 + + include/linux/mfd/mt6397/core.h | 6 +- + include/linux/mfd/rsmu.h | 1 - + include/linux/mfd/si476x-core.h | 17 +- + include/linux/workqueue.h | 22 + + kernel/workqueue.c | 28 ++ + 32 files changed, 769 insertions(+), 356 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/fsl,imx25-tsadc.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/fsl-imx25-tsadc.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/max77620.txt + create mode 100644 Documentation/devicetree/bindings/mfd/maxim,max77620.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/max77620_thermal.txt +Merging backlight/for-backlight-next (797cc011ae02b backlight: sky81452-backlight: Check return value of devm_gpiod_get_optional() in sky81452_bl_parse_dt()) +$ git merge -m Merge branch 'for-backlight-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Merge made by the 'ort' strategy. + drivers/video/backlight/sky81452-backlight.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging battery/for-next (aa2132799817f power: supply: add support for S2MU005 battery fuel gauge device) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../testing/sysfs-class-reboot-mode-reboot_modes | 36 + + .../bindings/power/supply/cpcap-battery.yaml | 1 + + .../bindings/power/supply/maxim,max17042.yaml | 21 +- + .../power/supply/samsung,s2mu005-fuel-gauge.yaml | 49 ++ + MAINTAINERS | 1 + + drivers/power/reset/keystone-reset.c | 11 +- + drivers/power/reset/reboot-mode.c | 151 +++- + drivers/power/supply/Kconfig | 22 + + drivers/power/supply/Makefile | 2 + + drivers/power/supply/axp288_charger.c | 71 +- + drivers/power/supply/bq24190_charger.c | 9 +- + drivers/power/supply/cpcap-battery.c | 31 +- + drivers/power/supply/cw2015_battery.c | 3 +- + drivers/power/supply/ipaq_micro_battery.c | 50 +- + drivers/power/supply/macsmc-power.c | 855 +++++++++++++++++++++ + drivers/power/supply/max17042_battery.c | 130 +++- + drivers/power/supply/max77705_charger.c | 36 +- + drivers/power/supply/mt6370-charger.c | 13 +- + drivers/power/supply/qcom_battmgr.c | 2 + + drivers/power/supply/s2mu005-battery.c | 307 ++++++++ + drivers/power/supply/sbs-manager.c | 2 +- + drivers/power/supply/twl4030_madc_battery.c | 2 - + include/linux/power/max17042_battery.h | 25 +- + 23 files changed, 1670 insertions(+), 160 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-reboot-mode-reboot_modes + create mode 100644 Documentation/devicetree/bindings/power/supply/samsung,s2mu005-fuel-gauge.yaml + create mode 100644 drivers/power/supply/macsmc-power.c + create mode 100644 drivers/power/supply/s2mu005-battery.c +Merging regulator/for-next (efcc20ca0ec19 Merge remote-tracking branch 'regulator/for-7.1' into regulator-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/cpcap-regulator.txt | 35 ------- + .../devicetree/bindings/regulator/dlg,da9121.yaml | 49 ++++++++++ + .../bindings/regulator/fitipower,fp9931.yaml | 1 + + .../regulator/google,cros-ec-regulator.yaml | 4 + + .../regulator/motorola,cpcap-regulator.yaml | 47 +++++++++ + .../devicetree/bindings/regulator/mp8859.txt | 22 ----- + .../devicetree/bindings/regulator/mps,mp8859.yaml | 54 +++++++++++ + drivers/regulator/core.c | 2 +- + drivers/regulator/cpcap-regulator.c | 105 +++++++++++++++++++++ + drivers/regulator/cros-ec-regulator.c | 1 + + drivers/regulator/da9063-regulator.c | 9 +- + drivers/regulator/da9121-regulator.c | 43 +++++++-- + drivers/regulator/fixed.c | 4 - + drivers/regulator/fp9931.c | 2 +- + drivers/regulator/max20411-regulator.c | 2 +- + drivers/regulator/pf0900-regulator.c | 2 +- + drivers/regulator/pf1550-regulator.c | 1 - + drivers/regulator/pf9453-regulator.c | 5 +- + drivers/regulator/spacemit-p1.c | 25 ++--- + 19 files changed, 321 insertions(+), 92 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/cpcap-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/motorola,cpcap-regulator.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/mp8859.txt + create mode 100644 Documentation/devicetree/bindings/regulator/mps,mp8859.yaml +Merging security/next (20091d97d711a Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Merge made by the 'ort' strategy. + include/linux/cred.h | 10 +++++++--- + security/inode.c | 10 +++++----- + 2 files changed, 12 insertions(+), 8 deletions(-) +Merging apparmor/apparmor-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'apparmor-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (7a60fe48af206 ima: remove buggy support for asynchronous hashes) +$ git merge -m Merge branch 'next-integrity' of https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/kernel/Makefile +Auto-merging arch/x86/include/asm/efi.h +Auto-merging arch/x86/platform/efi/efi.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 17 -- + MAINTAINERS | 1 + + arch/Kconfig | 3 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/kernel/ima_arch.c | 8 +- + arch/powerpc/kernel/secure_boot.c | 6 + + arch/s390/Kconfig | 2 +- + arch/s390/kernel/Makefile | 1 - + arch/s390/kernel/ima_arch.c | 14 - + arch/s390/kernel/ipl.c | 6 + + arch/x86/include/asm/efi.h | 4 +- + arch/x86/platform/efi/efi.c | 2 +- + include/linux/evm.h | 8 + + include/linux/ima.h | 7 +- + include/linux/secure_boot.h | 23 ++ + security/integrity/Makefile | 1 + + security/integrity/efi_secureboot.c | 56 ++++ + security/integrity/evm/evm_main.c | 56 +++- + security/integrity/ima/ima.h | 28 +- + security/integrity/ima/ima_api.c | 13 +- + security/integrity/ima/ima_appraise.c | 7 +- + security/integrity/ima/ima_crypto.c | 390 +----------------------- + security/integrity/ima/ima_efi.c | 53 +--- + security/integrity/ima/ima_fs.c | 34 ++- + security/integrity/ima/ima_main.c | 37 ++- + security/integrity/integrity.h | 1 + + security/integrity/platform_certs/load_uefi.c | 2 +- + 27 files changed, 267 insertions(+), 514 deletions(-) + delete mode 100644 arch/s390/kernel/ima_arch.c + create mode 100644 include/linux/secure_boot.h + create mode 100644 security/integrity/efi_secureboot.c +Merging selinux/next (8dc51459ef702 selinux: annotate intentional data race in inode_doinit_with_dentry()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + security/selinux/hooks.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging smack/next (b2faddc131124 Smack: Fix error in capability bypass) +$ git merge -m Merge branch 'next' of https://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + security/smack/smack_lsm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging tomoyo/master (c369299895a59 Linux 7.0-rc5) +$ 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 (d79526b89571a Merge tag 'spi-fix-v7.0-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (450517fa5aae9 dt-bindings: watchdog: qcom-wdt: Document Glymur watchdog) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (23f3682fd3605 Merge branches 'fixes', 'arm/smmu/updates', 'arm/smmu/bindings', 'riscv', 'amd/amd-vi' and 'core' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Auto-merging Documentation/arch/arm64/silicon-errata.rst +Merge made by the 'ort' strategy. + Documentation/arch/arm64/silicon-errata.rst | 8 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 1 + + drivers/iommu/amd/debugfs.c | 63 +- + drivers/iommu/amd/init.c | 9 +- + drivers/iommu/amd/iommu.c | 6 + + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 35 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c | 135 +++ + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 956 +++++++++++++++++---- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 142 ++- + drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 7 +- + drivers/iommu/generic_pt/.kunitconfig | 1 + + drivers/iommu/generic_pt/Kconfig | 11 + + drivers/iommu/generic_pt/fmt/Makefile | 2 + + drivers/iommu/generic_pt/fmt/amdv1.h | 2 +- + drivers/iommu/generic_pt/fmt/defs_riscv.h | 29 + + drivers/iommu/generic_pt/fmt/iommu_riscv64.c | 11 + + drivers/iommu/generic_pt/fmt/riscv.h | 313 +++++++ + drivers/iommu/generic_pt/iommu_pt.h | 191 ++-- + drivers/iommu/generic_pt/kunit_generic_pt.h | 12 + + drivers/iommu/generic_pt/pt_iter.h | 22 + + drivers/iommu/intel/iommu.c | 2 + + drivers/iommu/iommu.c | 66 +- + drivers/iommu/iommufd/device.c | 4 + + drivers/iommu/iova.c | 3 +- + drivers/iommu/riscv/Kconfig | 8 +- + drivers/iommu/riscv/iommu-bits.h | 4 +- + drivers/iommu/riscv/iommu-platform.c | 17 +- + drivers/iommu/riscv/iommu.c | 375 +++----- + include/linux/generic_pt/common.h | 16 + + include/linux/generic_pt/iommu.h | 80 +- + include/linux/iommu.h | 6 +- + include/uapi/linux/iommufd.h | 9 + + 32 files changed, 1937 insertions(+), 609 deletions(-) + create mode 100644 drivers/iommu/generic_pt/fmt/defs_riscv.h + create mode 100644 drivers/iommu/generic_pt/fmt/iommu_riscv64.c + create mode 100644 drivers/iommu/generic_pt/fmt/riscv.h +Merging audit/next (360160f75592b audit: handle unknown status requests in audit_receive_msg()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Auto-merging include/linux/audit.h +CONFLICT (content): Merge conflict in include/linux/audit.h +Resolved 'include/linux/audit.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7c2f8570e3481] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git +$ git diff -M --stat --summary HEAD^.. + include/linux/audit.h | 9 +++++++++ + include/uapi/linux/audit.h | 8 ++++---- + kernel/audit.c | 8 +++++--- + kernel/auditfilter.c | 3 +-- + lib/audit.c | 2 +- + 5 files changed, 20 insertions(+), 10 deletions(-) +Merging devicetree/for-next (908c80894f4ac Merge branch 'dt-reserved-mem-cleanups' into dt/next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/cpus.yaml +Auto-merging drivers/bus/Kconfig +Auto-merging drivers/bus/Makefile +Auto-merging drivers/soc/qcom/qcom_pd_mapper.c +CONFLICT (content): Merge conflict in drivers/soc/qcom/qcom_pd_mapper.c +Auto-merging scripts/checkpatch.pl +Resolved 'Documentation/devicetree/bindings/arm/cpus.yaml' using previous resolution. +Resolved 'drivers/soc/qcom/qcom_pd_mapper.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5ca81f903740c] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/cpus.yaml | 304 ++++++++-------- + .../bindings/arm/freescale/fsl,imx51-m4if.yaml | 1 + + .../devicetree/bindings/bus/baikal,bt1-apb.yaml | 90 ----- + .../devicetree/bindings/bus/baikal,bt1-axi.yaml | 107 ------ + .../bindings/input/touchscreen/fsl,imx25-tcq.yaml | 69 ++++ + .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 34 -- + .../bindings/interrupt-controller/arm,gic-v3.yaml | 2 +- + .../bindings/interrupt-controller/qcom,pdc.yaml | 1 + + .../devicetree/bindings/mux/mux-controller.yaml | 6 - + .../bindings/spmi/qcom,x1e80100-spmi-pmic-arb.yaml | 4 +- + Documentation/devicetree/of_unittest.rst | 20 +- + .../translations/zh_CN/devicetree/of_unittest.rst | 21 +- + drivers/bus/Kconfig | 30 -- + drivers/bus/Makefile | 2 - + drivers/bus/bt1-apb.c | 396 --------------------- + drivers/bus/bt1-axi.c | 292 --------------- + drivers/cpufreq/airoha-cpufreq.c | 7 +- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 16 +- + drivers/cpufreq/ti-cpufreq.c | 12 +- + drivers/of/base.c | 20 +- + drivers/of/platform.c | 12 +- + drivers/of/property.c | 2 +- + drivers/soc/qcom/qcom_pd_mapper.c | 2 +- + include/linux/of.h | 11 +- + scripts/checkpatch.pl | 2 +- + 25 files changed, 281 insertions(+), 1182 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/bus/baikal,bt1-apb.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/baikal,bt1-axi.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl,imx25-tcq.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/fsl-mx25-tcq.txt + delete mode 100644 drivers/bus/bt1-apb.c + delete mode 100644 drivers/bus/bt1-axi.c +Merging dt-krzk/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Already up to date. +Merging mailbox/for-next (220045247712d dt-bindings: mailbox: qcom-ipcc: Document the Eliza Inter-Processor Communication Controller) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 1 + + drivers/mailbox/cix-mailbox.c | 4 +-- + drivers/mailbox/exynos-mailbox.c | 4 --- + drivers/mailbox/hi3660-mailbox.c | 2 -- + drivers/mailbox/hi6220-mailbox.c | 14 +++----- + drivers/mailbox/imx-mailbox.c | 2 -- + drivers/mailbox/mailbox-sti.c | 2 -- + drivers/mailbox/mailbox-test.c | 37 ++++++++++--------- + drivers/mailbox/mailbox.c | 42 ++++++++++++++++------ + drivers/mailbox/mailbox.h | 12 ------- + drivers/mailbox/mtk-cmdq-mailbox.c | 8 ++--- + drivers/mailbox/mtk-vcp-mailbox.c | 2 +- + drivers/mailbox/omap-mailbox.c | 2 -- + drivers/mailbox/pcc.c | 2 -- + drivers/mailbox/rockchip-mailbox.c | 9 ++--- + drivers/mailbox/tegra-hsp.c | 4 +-- + include/linux/mailbox_client.h | 1 + + include/linux/mailbox_controller.h | 8 +++++ + 18 files changed, 77 insertions(+), 79 deletions(-) + delete mode 100644 drivers/mailbox/mailbox.h +Merging spi/for-next (03f4aab0953e4 Merge remote-tracking branch 'spi/for-7.1' into spi-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. + .../bindings/spi/microchip,mpfs-spi.yaml | 4 +- + .../bindings/spi/renesas,rzv2h-rspi.yaml | 23 ++++- + drivers/spi/spi-amlogic-spisg.c | 6 +- + drivers/spi/spi-atcspi200.c | 29 ++---- + drivers/spi/spi-axiado.c | 1 - + drivers/spi/spi-bcm63xx-hsspi.c | 46 +++------ + drivers/spi/spi-bcmbca-hsspi.c | 49 +++------ + drivers/spi/spi-cs42l43.c | 4 +- + drivers/spi/spi-fsl-qspi.c | 3 +- + drivers/spi/spi-hisi-kunpeng.c | 17 +++- + drivers/spi/spi-imx.c | 41 +++----- + drivers/spi/spi-nxp-fspi.c | 3 +- + drivers/spi/spi-nxp-xspi.c | 3 +- + drivers/spi/spi-omap2-mcspi.c | 17 +++- + drivers/spi/spi-pl022.c | 10 +- + drivers/spi/spi-pxa2xx-dma.c | 6 +- + drivers/spi/spi-pxa2xx.c | 11 +- + drivers/spi/spi-rockchip.c | 40 +++----- + drivers/spi/spi-sifive.c | 21 ++-- + drivers/spi/spi-stm32-ospi.c | 5 - + drivers/spi/spi-stm32.c | 72 ++++--------- + drivers/spi/spi-sunplus-sp7021.c | 15 +-- + drivers/spi/spi-tegra20-slink.c | 26 ++--- + drivers/spi/spi-tegra210-quad.c | 16 ++- + drivers/spi/spi.c | 113 +++++++++++++++------ + include/linux/spi/spi-mem.h | 8 +- + include/linux/spi/spi.h | 1 + + 27 files changed, 280 insertions(+), 310 deletions(-) +Merging tip/master (6e45429392a5c Merge branch into tip/master: 'x86/tdx') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/s390/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging drivers/acpi/osl.c +Auto-merging drivers/crypto/ccp/sev-dev.c +Auto-merging drivers/irqchip/Kconfig +Auto-merging include/linux/sched/signal.h +Auto-merging include/trace/stages/stage3_trace_output.h +Auto-merging include/uapi/linux/sched.h +Auto-merging init/Kconfig +Auto-merging kernel/events/core.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/vdso/datastore.c +CONFLICT (content): Merge conflict in lib/vdso/datastore.c +Auto-merging rust/kernel/list/arc.rs +Resolved 'lib/vdso/datastore.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e0aa1be6ed33e] Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 15 +- + .../bindings/interrupt-controller/apple,aic2.yaml | 30 +- + .../interrupt-controller/loongson,pch-lpc.yaml | 52 + + .../interrupt-controller/renesas,rzg2l-irqc.yaml | 157 +-- + MAINTAINERS | 18 + + arch/arm/include/asm/vdso/gettimeofday.h | 2 + + arch/arm64/include/asm/vdso/compat_gettimeofday.h | 3 + + arch/arm64/include/asm/vdso/gettimeofday.h | 2 + + arch/loongarch/include/asm/irq.h | 1 - + arch/loongarch/kernel/irq.c | 6 + + arch/loongarch/kernel/process.c | 1 + + arch/loongarch/kernel/vdso.c | 1 + + arch/mips/Kconfig | 1 - + arch/mips/include/asm/vdso/vdso.h | 5 + + arch/mips/kernel/vdso.c | 1 + + arch/mips/loongson64/init.c | 6 + + arch/mips/pic32/Kconfig | 1 - + arch/parisc/kernel/time.c | 5 +- + arch/powerpc/include/asm/vdso/gettimeofday.h | 1 + + arch/powerpc/include/asm/vdso/processor.h | 3 + + arch/powerpc/kernel/compat_audit.c | 3 +- + arch/s390/Makefile | 3 +- + arch/sparc/Kconfig | 3 +- + arch/sparc/include/asm/clocksource.h | 9 - + arch/sparc/include/asm/processor.h | 3 + + arch/sparc/include/asm/processor_32.h | 2 - + arch/sparc/include/asm/processor_64.h | 25 - + arch/sparc/include/asm/vdso.h | 2 - + arch/sparc/include/asm/vdso/clocksource.h | 10 + + arch/sparc/include/asm/vdso/gettimeofday.h | 184 ++++ + arch/sparc/include/asm/vdso/processor.h | 41 + + arch/sparc/include/asm/vdso/vsyscall.h | 10 + + arch/sparc/include/asm/vvar.h | 75 -- + arch/sparc/kernel/Makefile | 1 - + arch/sparc/kernel/time_64.c | 6 +- + arch/sparc/kernel/vdso.c | 69 -- + arch/sparc/vdso/Makefile | 11 +- + arch/sparc/vdso/vclock_gettime.c | 418 +------ + arch/sparc/vdso/vdso-layout.lds.S | 26 +- + arch/sparc/vdso/vdso.lds.S | 2 - + arch/sparc/vdso/vdso2c.c | 24 - + arch/sparc/vdso/vdso2c.h | 45 +- + arch/sparc/vdso/vdso32/vdso32.lds.S | 4 +- + arch/sparc/vdso/vma.c | 274 +---- + arch/x86/Kconfig | 14 +- + arch/x86/Kconfig.cpu | 44 +- + arch/x86/Makefile_32.cpu | 2 - + arch/x86/boot/compressed/sev.c | 6 +- + arch/x86/coco/tdx/debug.c | 26 +- + arch/x86/coco/tdx/tdx.c | 8 +- + arch/x86/configs/x86_64_defconfig | 1 + + arch/x86/entry/vdso/vdso32/Makefile | 4 + + arch/x86/entry/vsyscall/vsyscall_64.c | 91 +- + arch/x86/events/amd/ibs.c | 264 ++++- + arch/x86/events/intel/core.c | 22 +- + arch/x86/events/intel/p4.c | 6 +- + arch/x86/events/perf_event_flags.h | 1 + + arch/x86/include/asm/amd/ibs.h | 6 +- + arch/x86/include/asm/clock_inlined.h | 22 + + arch/x86/include/asm/floppy.h | 27 +- + arch/x86/include/asm/fsgsbase.h | 4 +- + arch/x86/include/asm/io.h | 21 +- + arch/x86/include/asm/irqflags.h | 6 +- + arch/x86/include/asm/local.h | 2 +- + arch/x86/include/asm/mce.h | 62 +- + arch/x86/include/asm/microcode.h | 2 + + arch/x86/include/asm/mmu_context.h | 3 - + arch/x86/include/asm/msr-index.h | 2 + + arch/x86/include/asm/orc_types.h | 9 +- + arch/x86/include/asm/paravirt-base.h | 6 + + arch/x86/include/asm/paravirt.h | 11 - + arch/x86/include/asm/paravirt_types.h | 2 - + arch/x86/include/asm/perf_event.h | 55 +- + arch/x86/include/asm/processor.h | 5 + + arch/x86/include/asm/segment.h | 59 +- + arch/x86/include/asm/sev.h | 4 + + arch/x86/include/asm/shared/tdx.h | 50 +- + arch/x86/include/asm/tdx_global_metadata.h | 7 + + arch/x86/include/asm/time.h | 1 - + arch/x86/include/asm/tlbflush.h | 26 + + arch/x86/include/asm/vermagic.h | 6 - + arch/x86/include/asm/vsyscall.h | 13 +- + arch/x86/kernel/Makefile | 14 + + arch/x86/kernel/apic/apic.c | 41 +- + arch/x86/kernel/cpu/bus_lock.c | 49 +- + arch/x86/kernel/cpu/common.c | 37 +- + arch/x86/kernel/cpu/intel.c | 1 + + arch/x86/kernel/cpu/match.c | 3 + + arch/x86/kernel/cpu/mce/amd.c | 138 +-- + arch/x86/kernel/cpu/microcode/intel-ucode-defs.h | 398 ++++--- + arch/x86/kernel/cpu/microcode/intel.c | 54 +- + arch/x86/kernel/cpu/mtrr/cleanup.c | 7 +- + arch/x86/kernel/cpu/topology_common.c | 8 +- + arch/x86/kernel/cpu/vmware.c | 2 +- + arch/x86/kernel/fred.c | 3 - + arch/x86/kernel/hpet.c | 4 +- + arch/x86/kernel/kvm.c | 8 +- + arch/x86/kernel/paravirt.c | 3 +- + arch/x86/kernel/reboot.c | 5 +- + arch/x86/kernel/traps.c | 12 +- + arch/x86/kernel/tsc.c | 61 +- + arch/x86/kernel/umip.c | 3 + + arch/x86/kernel/unwind_orc.c | 32 +- + arch/x86/kvm/vmx/tdx.c | 4 +- + arch/x86/kvm/vmx/tdx_arch.h | 6 - + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/pat/set_memory.c | 37 +- + arch/x86/mm/tlb.c | 21 - + arch/x86/platform/efi/efi_64.c | 35 + + arch/x86/virt/svm/sev.c | 181 ++-- + arch/x86/virt/vmx/tdx/tdx_global_metadata.c | 22 + + arch/x86/xen/enlighten_pv.c | 6 +- + drivers/acpi/osl.c | 2 +- + drivers/block/floppy.c | 2 - + drivers/char/random.c | 16 +- + drivers/clocksource/Kconfig | 1 - + drivers/clocksource/acpi_pm.c | 4 +- + drivers/crypto/ccp/sev-dev.c | 62 +- + drivers/edac/mce_amd.c | 48 +- + drivers/irqchip/Kconfig | 12 +- + drivers/irqchip/irq-apple-aic.c | 24 +- + drivers/irqchip/irq-gic-v3.c | 10 +- + drivers/irqchip/irq-imx-irqsteer.c | 55 +- + drivers/irqchip/irq-loongson-pch-lpc.c | 92 +- + drivers/irqchip/irq-msi-lib.c | 3 + + drivers/irqchip/irq-mvebu-odmi.c | 2 +- + drivers/irqchip/irq-pic32-evic.c | 8 +- + drivers/irqchip/irq-renesas-rzg2l.c | 488 +++++++-- + drivers/irqchip/irq-renesas-rzv2h.c | 483 +++++++-- + drivers/virt/coco/tdx-guest/tdx-guest.c | 5 + + include/asm-generic/bitsperlong.h | 9 + + include/asm-generic/futex.h | 4 +- + include/asm-generic/thread_info_tif.h | 5 +- + include/linux/cleanup.h | 19 +- + include/linux/clockchips.h | 8 +- + include/linux/clocksource.h | 33 +- + include/linux/compiler-context-analysis.h | 32 + + include/linux/compiler.h | 5 +- + include/linux/energy_model.h | 4 +- + include/linux/entry-common.h | 3 + + include/linux/hrtimer.h | 64 +- + include/linux/hrtimer_defs.h | 83 +- + include/linux/hrtimer_rearm.h | 83 ++ + include/linux/hrtimer_types.h | 19 +- + include/linux/irq-entry-common.h | 25 +- + include/linux/irq.h | 4 + + include/linux/jiffies.h | 6 +- + include/linux/jump_label.h | 22 +- + include/linux/mod_devicetable.h | 2 + + include/linux/mutex.h | 13 +- + include/linux/mutex_types.h | 2 +- + include/linux/psp-sev.h | 5 +- + include/linux/rbtree.h | 81 +- + include/linux/rbtree_types.h | 16 + + include/linux/rseq_entry.h | 16 +- + include/linux/rtmutex.h | 8 +- + include/linux/rwlock.h | 18 +- + include/linux/rwlock_api_smp.h | 6 +- + include/linux/rwsem.h | 8 +- + include/linux/sched/signal.h | 2 +- + include/linux/sched/topology.h | 26 +- + include/linux/semaphore.h | 4 +- + include/linux/smp.h | 42 +- + include/linux/spinlock.h | 3 +- + include/linux/spinlock_up.h | 20 +- + include/linux/time_namespace.h | 36 +- + include/linux/timekeeper_internal.h | 8 + + include/linux/timerqueue.h | 56 +- + include/linux/timerqueue_types.h | 15 +- + include/linux/trace_events.h | 13 +- + include/linux/vdso_datastore.h | 6 + + include/linux/wait_bit.h | 4 +- + include/linux/ww_mutex.h | 4 +- + include/trace/events/timer.h | 42 +- + include/trace/stages/stage3_trace_output.h | 40 +- + include/uapi/linux/sched.h | 3 + + include/vdso/datapage.h | 27 +- + include/vdso/helpers.h | 31 +- + init/Kconfig | 4 +- + init/main.c | 2 + + kernel/entry/common.c | 4 +- + kernel/events/core.c | 37 +- + kernel/futex/Makefile | 2 + + kernel/futex/core.c | 9 +- + kernel/futex/futex.h | 17 +- + kernel/futex/pi.c | 9 + + kernel/futex/waitwake.c | 4 + + kernel/irq/matrix.c | 2 +- + kernel/jump_label.c | 9 - + kernel/locking/Makefile | 5 + + kernel/locking/mutex-debug.c | 5 +- + kernel/locking/mutex.c | 82 +- + kernel/locking/mutex.h | 1 + + kernel/locking/rtmutex.c | 18 +- + kernel/locking/rtmutex_api.c | 2 + + kernel/locking/rtmutex_common.h | 27 +- + kernel/locking/rwbase_rt.c | 1 + + kernel/locking/rwsem.c | 113 +- + kernel/locking/semaphore.c | 39 +- + kernel/locking/spinlock.c | 12 +- + kernel/locking/ww_mutex.h | 49 +- + kernel/locking/ww_rt_mutex.c | 1 + + kernel/sched/core.c | 110 +- + kernel/sched/deadline.c | 25 +- + kernel/sched/debug.c | 14 +- + kernel/sched/ext.c | 4 +- + kernel/sched/fair.c | 458 +++++--- + kernel/sched/features.h | 8 + + kernel/sched/rt.c | 7 +- + kernel/sched/sched.h | 59 +- + kernel/sched/syscalls.c | 16 +- + kernel/sched/topology.c | 266 +++-- + kernel/smp.c | 60 +- + kernel/softirq.c | 15 +- + kernel/time/.kunitconfig | 2 + + kernel/time/Kconfig | 32 +- + kernel/time/Makefile | 1 + + kernel/time/clockevents.c | 48 +- + kernel/time/clocksource-wdtest.c | 296 +++-- + kernel/time/clocksource.c | 877 ++++++++------- + kernel/time/hrtimer.c | 1139 +++++++++++--------- + kernel/time/jiffies.c | 1 - + kernel/time/namespace.c | 132 +-- + kernel/time/namespace_internal.h | 28 + + kernel/time/namespace_vdso.c | 160 +++ + kernel/time/posix-timers.c | 2 +- + kernel/time/tick-broadcast-hrtimer.c | 1 - + kernel/time/tick-sched.c | 27 +- + kernel/time/timekeeping.c | 207 +++- + kernel/time/timekeeping.h | 2 + + kernel/time/timer.c | 5 +- + kernel/time/timer_list.c | 16 +- + kernel/trace/trace_events_synth.c | 4 +- + kernel/trace/trace_output.c | 20 +- + kernel/trace/trace_syscalls.c | 3 +- + lib/Kconfig.debug | 8 + + lib/debugobjects.c | 2 +- + lib/rbtree.c | 17 + + lib/test_context-analysis.c | 11 + + lib/timerqueue.c | 14 + + lib/vdso/datastore.c | 122 ++- + lib/vdso/getrandom.c | 3 + + lib/vdso/gettimeofday.c | 99 +- + rust/helpers/atomic_ext.c | 152 +-- + rust/kernel/list/arc.rs | 8 +- + rust/kernel/sync/atomic.rs | 310 +++++- + rust/kernel/sync/atomic/internal.rs | 44 +- + rust/kernel/sync/atomic/predefine.rs | 109 ++ + scripts/context-analysis-suppression.txt | 1 + + scripts/gdb/linux/timerlist.py | 2 +- + scripts/livepatch/Makefile | 20 + + scripts/livepatch/klp-build | 131 ++- + sound/soc/intel/Kconfig | 2 +- + sound/soc/intel/avs/tgl.c | 38 +- + tools/arch/x86/include/asm/amd/ibs.h | 2 +- + tools/arch/x86/include/asm/orc_types.h | 9 +- + tools/arch/x86/kcpuid/cpuid.csv | 661 ++++++------ + tools/objtool/arch/x86/decode.c | 18 +- + tools/objtool/arch/x86/orc.c | 31 +- + tools/objtool/check.c | 4 +- + tools/objtool/disas.c | 6 +- + tools/objtool/elf.c | 101 +- + tools/objtool/include/objtool/elf.h | 3 + + tools/objtool/klp-diff.c | 99 +- + tools/testing/selftests/futex/functional/Makefile | 7 +- + .../selftests/futex/functional/futex_numa_mpol.c | 4 +- + .../selftests/futex/functional/futex_requeue.c | 49 +- + tools/testing/selftests/vDSO/Makefile | 6 +- + tools/testing/selftests/vDSO/parse_vdso.c | 3 +- + .../testing/selftests/vDSO/vdso_test_correctness.c | 112 +- + .../selftests/vDSO/vdso_test_gettimeofday.c | 2 - + 272 files changed, 7705 insertions(+), 4966 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/loongson,pch-lpc.yaml + create mode 100644 arch/sparc/include/asm/vdso/clocksource.h + create mode 100644 arch/sparc/include/asm/vdso/gettimeofday.h + create mode 100644 arch/sparc/include/asm/vdso/processor.h + create mode 100644 arch/sparc/include/asm/vdso/vsyscall.h + delete mode 100644 arch/sparc/include/asm/vvar.h + delete mode 100644 arch/sparc/kernel/vdso.c + create mode 100644 arch/x86/include/asm/clock_inlined.h + create mode 100644 include/linux/hrtimer_rearm.h + create mode 100644 kernel/time/.kunitconfig + create mode 100644 kernel/time/namespace_internal.h + create mode 100644 kernel/time/namespace_vdso.c + create mode 100644 scripts/livepatch/Makefile +Merging clockevents/timers/drivers/next (a83f9c04be4e8 clocksource/drivers/mips-gic-timer: Move GIC timer to request_percpu_irq()) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (10d9f973f8d36 Merge ras/edac-misc into for-next) +$ git merge -m Merge branch 'edac-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. + drivers/edac/altera_edac.h | 1 - + drivers/edac/amd64_edac.c | 3 + + drivers/edac/edac_device.h | 2 +- + drivers/edac/edac_device_sysfs.c | 24 ++--- + drivers/edac/edac_pci_sysfs.c | 10 +- + drivers/edac/i10nm_base.c | 16 +++- + drivers/edac/i7core_edac.c | 15 +-- + drivers/edac/ie31200_edac.c | 2 +- + drivers/edac/mpc85xx_edac.c | 2 +- + drivers/edac/sb_edac.c | 14 +-- + drivers/edac/versalnet_edac.c | 192 ++++++++++++++++++++++----------------- + 11 files changed, 150 insertions(+), 131 deletions(-) +Merging ftrace/for-next (b93640faeaf2f Merge trace/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging drivers/cpufreq/intel_pstate.c +Auto-merging fs/btrfs/raid56.c +Auto-merging kernel/sched/ext.c +Auto-merging kernel/smp.c +Auto-merging kernel/trace/Makefile +Auto-merging kernel/trace/trace_output.c +Auto-merging mm/damon/core.c +Merge made by the 'ort' strategy. + drivers/cpufreq/amd-pstate.c | 10 +- + drivers/cpufreq/cpufreq.c | 2 +- + drivers/cpufreq/intel_pstate.c | 2 +- + drivers/i2c/i2c-core-slave.c | 2 +- + drivers/spi/spi-axi-spi-engine.c | 4 +- + fs/btrfs/extent_map.c | 4 +- + fs/btrfs/raid56.c | 4 +- + include/linux/bootconfig.h | 6 +- + include/linux/ftrace.h | 2 +- + include/linux/trace_printk.h | 1 - + include/linux/tracepoint.h | 11 + + include/uapi/linux/trace_mmap.h | 1 + + kernel/irq_work.c | 2 +- + kernel/sched/ext.c | 2 +- + kernel/smp.c | 2 +- + kernel/trace/Makefile | 1 + + kernel/trace/fprobe.c | 2 - + kernel/trace/trace.c | 1201 +------------------------------------- + kernel/trace/trace.h | 123 +++- + kernel/trace/trace_events.c | 18 +- + kernel/trace/trace_events_hist.c | 4 - + kernel/trace/trace_output.c | 12 +- + kernel/trace/trace_printk.c | 1 + + kernel/trace/trace_snapshot.c | 1067 +++++++++++++++++++++++++++++++++ + lib/bootconfig.c | 62 +- + mm/damon/core.c | 2 +- + 26 files changed, 1288 insertions(+), 1260 deletions(-) + create mode 100644 kernel/trace/trace_snapshot.c +$ git am -3 ../patches/0001-ftrace-Fix-semantic-conflict-with-mm-tree.patch +Applying: ftrace: Fix semantic conflict with mm tree +Using index info to reconstruct a base tree... +M kernel/trace/trace_printk.c +Falling back to patching base and 3-way merge... +Auto-merging kernel/trace/trace_printk.c +No changes -- Patch already applied. +Merging rcu/next (ed062c41dfda2 Merge branch 'rcu-nocb.20260123a') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux rcu/next +Already up to date. +Merging paulmck/non-rcu/next (48f7a50c027dd stop_machine: Fix the documentation for a NULL cpus argument) +$ git merge -m Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Merge made by the 'ort' strategy. + include/linux/stop_machine.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging kvm/next (24f9515de8778 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (5ad2ff071b598 Merge branch kvm-arm64/pkvm-protected-guest into kvmarm-master/next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/arm64/kvm/hyp/pgtable.c +Auto-merging arch/arm64/mm/fault.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/virt/kvm/arm/index.rst | 1 + + Documentation/virt/kvm/arm/pkvm.rst | 106 +++++ + arch/arm64/include/asm/kvm_asm.h | 31 +- + arch/arm64/include/asm/kvm_host.h | 9 +- + arch/arm64/include/asm/kvm_pgtable.h | 45 +- + arch/arm64/include/asm/kvm_pkvm.h | 4 +- + arch/arm64/include/asm/virt.h | 9 + + arch/arm64/kvm/arm.c | 12 +- + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 10 +- + arch/arm64/kvm/hyp/include/nvhe/memory.h | 12 +- + arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 7 +- + arch/arm64/kvm/hyp/include/nvhe/trap_handler.h | 2 + + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 184 +++++--- + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 587 +++++++++++++++++++++--- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 232 +++++++++- + arch/arm64/kvm/hyp/nvhe/switch.c | 1 + + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 8 + + arch/arm64/kvm/hyp/pgtable.c | 33 +- + arch/arm64/kvm/mmu.c | 113 ++++- + arch/arm64/kvm/pkvm.c | 157 +++++-- + arch/arm64/mm/fault.c | 33 +- + drivers/virt/coco/pkvm-guest/Kconfig | 2 +- + include/uapi/linux/kvm.h | 5 + + 24 files changed, 1380 insertions(+), 227 deletions(-) + create mode 100644 Documentation/virt/kvm/arm/pkvm.rst +Merging kvms390/next (e3372ffb5f9e2 KVM: s390: Increase permitted SE header size to 1 MiB) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-ppc/topic/ppc-kvm (f338e77383789 Linux 7.0-rc4) +$ git merge -m Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (c61ec3e8cc5d4 RISC-V: KVM: Check host Ssaia extension when creating AIA irqchip) +$ 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 (3d6cdcc8883b5 Merge branch 'vmxon') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/reboot.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/vmx/tdx.c +Auto-merging arch/x86/virt/vmx/tdx/tdx_global_metadata.c +CONFLICT (content): Merge conflict in arch/x86/virt/vmx/tdx/tdx_global_metadata.c +Auto-merging include/linux/kvm_host.h +Auto-merging include/uapi/linux/kvm.h +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Auto-merging tools/testing/selftests/kvm/guest_memfd_test.c +Auto-merging virt/kvm/guest_memfd.c +CONFLICT (content): Merge conflict in virt/kvm/guest_memfd.c +Auto-merging virt/kvm/kvm_main.c +Resolved 'arch/x86/virt/vmx/tdx/tdx_global_metadata.c' using previous resolution. +Resolved 'virt/kvm/guest_memfd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 73032564733cd] Merge branch 'next' of https://github.com/kvm-x86/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/arch/x86/tdx.rst | 36 +- + arch/x86/events/intel/pt.c | 1 - + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/kvm-x86-ops.h | 10 +- + arch/x86/include/asm/kvm-x86-pmu-ops.h | 8 +- + arch/x86/include/asm/kvm_host.h | 37 +- + arch/x86/include/asm/reboot.h | 11 - + arch/x86/include/asm/svm.h | 20 +- + arch/x86/include/asm/tdx.h | 4 - + arch/x86/include/asm/virt.h | 26 + + arch/x86/include/asm/vmx.h | 11 + + arch/x86/include/uapi/asm/kvm.h | 12 +- + arch/x86/kernel/cpu/common.c | 2 + + arch/x86/kernel/crash.c | 3 +- + arch/x86/kernel/reboot.c | 63 +-- + arch/x86/kernel/smp.c | 5 +- + arch/x86/kvm/cpuid.c | 6 +- + arch/x86/kvm/emulate.c | 23 +- + arch/x86/kvm/hyperv.h | 8 - + arch/x86/kvm/lapic.c | 13 +- + arch/x86/kvm/mmu/mmu.c | 14 + + arch/x86/kvm/mmu/tdp_mmu.c | 2 +- + arch/x86/kvm/pmu.c | 2 +- + arch/x86/kvm/svm/avic.c | 17 +- + arch/x86/kvm/svm/hyperv.h | 9 +- + arch/x86/kvm/svm/nested.c | 604 ++++++++++++--------- + arch/x86/kvm/svm/sev.c | 36 +- + arch/x86/kvm/svm/svm.c | 449 +++++++++------ + arch/x86/kvm/svm/svm.h | 78 ++- + arch/x86/kvm/svm/vmenter.S | 10 +- + arch/x86/kvm/vmx/capabilities.h | 2 +- + arch/x86/kvm/vmx/main.c | 21 +- + arch/x86/kvm/vmx/tdx.c | 224 +------- + arch/x86/kvm/vmx/tdx.h | 8 +- + arch/x86/kvm/vmx/vmcs.h | 11 - + arch/x86/kvm/vmx/vmcs_shadow_fields.h | 5 +- + arch/x86/kvm/vmx/vmenter.S | 2 +- + arch/x86/kvm/vmx/vmx.c | 142 +---- + arch/x86/kvm/vmx/vmx_ops.h | 5 +- + arch/x86/kvm/x86.c | 460 +++++++++------- + arch/x86/kvm/x86.h | 32 +- + arch/x86/virt/Makefile | 2 + + arch/x86/virt/hw.c | 359 ++++++++++++ + arch/x86/virt/vmx/tdx/tdx.c | 326 ++++++----- + arch/x86/virt/vmx/tdx/tdx.h | 8 - + arch/x86/virt/vmx/tdx/tdx_global_metadata.c | 10 +- + include/linux/kvm_host.h | 19 +- + include/uapi/linux/kvm.h | 11 +- + tools/testing/selftests/kvm/Makefile.kvm | 3 + + tools/testing/selftests/kvm/guest_memfd_test.c | 70 ++- + tools/testing/selftests/kvm/include/kvm_syscalls.h | 1 + + .../testing/selftests/kvm/include/x86/processor.h | 12 + + tools/testing/selftests/kvm/include/x86/svm.h | 14 +- + tools/testing/selftests/kvm/lib/x86/processor.c | 15 +- + tools/testing/selftests/kvm/lib/x86/svm.c | 2 +- + .../testing/selftests/kvm/x86/fix_hypercall_test.c | 2 +- + tools/testing/selftests/kvm/x86/msrs_test.c | 4 +- + .../selftests/kvm/x86/nested_vmsave_vmload_test.c | 16 +- + .../selftests/kvm/x86/pmu_event_filter_test.c | 3 +- + tools/testing/selftests/kvm/x86/state_test.c | 35 ++ + .../selftests/kvm/x86/svm_lbr_nested_state.c | 145 +++++ + .../selftests/kvm/x86/svm_nested_clear_efer_svme.c | 55 ++ + .../kvm/x86/svm_nested_invalid_vmcb12_gpa.c | 98 ++++ + tools/testing/selftests/kvm/x86/xapic_state_test.c | 2 +- + virt/kvm/guest_memfd.c | 5 +- + virt/kvm/kvm_main.c | 43 +- + 66 files changed, 2294 insertions(+), 1399 deletions(-) + create mode 100644 arch/x86/include/asm/virt.h + create mode 100644 arch/x86/virt/hw.c + create mode 100644 tools/testing/selftests/kvm/x86/svm_lbr_nested_state.c + create mode 100644 tools/testing/selftests/kvm/x86/svm_nested_clear_efer_svme.c + create mode 100644 tools/testing/selftests/kvm/x86/svm_nested_invalid_vmcb12_gpa.c +$ git am -3 ../patches/0001-KVM-selftests-Fix-up-semantic-changes.patch +Applying: KVM: selftests: Fix up semantic changes +Using index info to reconstruct a base tree... +M tools/testing/selftests/kvm/lib/kvm_util.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +$ git am -3 ../patches/kvm-x86-init +Applying: Fix up merge +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/virt/vmx/tdx/tdx_global_metadata.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 2f42f610af1a9] Merge branch 'next' of https://github.com/kvm-x86/linux.git + Date: Mon Mar 30 20:50:10 2026 +0100 +$ git am -3 ../patches/0001-kvm-fix-up-merge-issue.patch +Applying: kvm: fix up merge issue +$ git reset HEAD^ +Unstaged changes after reset: +M virt/kvm/guest_memfd.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 4476dfd35bb04] Merge branch 'next' of https://github.com/kvm-x86/linux.git + Date: Mon Mar 30 20:50:10 2026 +0100 +Merging xen-tip/linux-next (cd7e1fef5a1ca xen/privcmd: unregister xenstore notifier on module exit) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (0842bc976fd5e Merge branch 'for-7.1' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. + drivers/firmware/efi/efi.c | 2 +- + include/linux/workqueue.h | 22 ++++++++----- + kernel/workqueue.c | 79 +++++++++++++++++++++++++++++++++------------- + tools/workqueue/wq_dump.py | 17 ++++------ + 4 files changed, 78 insertions(+), 42 deletions(-) +Merging sched-ext/for-next (92c41a7c6e17f Merge branch 'for-7.1' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Auto-merging init/Kconfig +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/ext.c +Auto-merging kernel/sched/sched.h +Merge made by the 'ort' strategy. + Documentation/scheduler/sched-ext.rst | 160 +- + include/linux/cgroup-defs.h | 4 + + include/linux/cgroup.h | 65 +- + include/linux/sched/ext.h | 81 +- + init/Kconfig | 4 + + kernel/cgroup/cgroup-internal.h | 6 - + kernel/cgroup/cgroup.c | 55 - + kernel/fork.c | 6 +- + kernel/sched/core.c | 2 +- + kernel/sched/ext.c | 3648 ++++++++++++++++---- + kernel/sched/ext.h | 4 +- + kernel/sched/ext_idle.c | 136 +- + kernel/sched/ext_internal.h | 342 +- + kernel/sched/sched.h | 11 +- + tools/sched_ext/include/scx/bpf_arena_common.bpf.h | 8 +- + tools/sched_ext/include/scx/common.bpf.h | 277 ++ + tools/sched_ext/include/scx/common.h | 4 - + tools/sched_ext/include/scx/compat.bpf.h | 57 +- + tools/sched_ext/include/scx/compat.h | 52 +- + tools/sched_ext/include/scx/enum_defs.autogen.h | 61 +- + tools/sched_ext/include/scx/enums.autogen.bpf.h | 11 + + tools/sched_ext/include/scx/enums.autogen.h | 4 + + tools/sched_ext/scx_central.bpf.c | 66 +- + tools/sched_ext/scx_central.c | 26 +- + tools/sched_ext/scx_cpu0.bpf.c | 2 +- + tools/sched_ext/scx_flatcg.bpf.c | 24 +- + tools/sched_ext/scx_pair.c | 16 +- + tools/sched_ext/scx_qmap.bpf.c | 174 +- + tools/sched_ext/scx_qmap.c | 29 +- + tools/sched_ext/scx_sdt.bpf.c | 2 +- + tools/sched_ext/scx_sdt.c | 2 +- + tools/sched_ext/scx_simple.bpf.c | 8 +- + tools/sched_ext/scx_userland.c | 2 +- + tools/testing/selftests/sched_ext/Makefile | 1 + + tools/testing/selftests/sched_ext/dequeue.bpf.c | 389 +++ + tools/testing/selftests/sched_ext/dequeue.c | 274 ++ + tools/testing/selftests/sched_ext/exit.bpf.c | 2 +- + tools/testing/selftests/sched_ext/exit.c | 2 +- + tools/testing/selftests/sched_ext/exit_test.h | 2 +- + tools/testing/selftests/sched_ext/maximal.bpf.c | 17 +- + tools/testing/selftests/sched_ext/maximal.c | 3 + + tools/testing/selftests/sched_ext/numa.bpf.c | 2 +- + tools/testing/selftests/sched_ext/peek_dsq.bpf.c | 8 +- + tools/testing/selftests/sched_ext/reload_loop.c | 3 + + tools/testing/selftests/sched_ext/rt_stall.c | 5 + + tools/testing/selftests/sched_ext/runner.c | 20 +- + .../selftests/sched_ext/select_cpu_vtime.bpf.c | 8 +- + tools/testing/selftests/sched_ext/util.h | 2 +- + 48 files changed, 4999 insertions(+), 1088 deletions(-) + create mode 100644 tools/testing/selftests/sched_ext/dequeue.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/dequeue.c +Merging drivers-x86/for-next (fab7c51693e95 platform/x86: asus-wmi: fix screenpad brightness range) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging drivers/platform/x86/lenovo/thinkpad_acpi.c +Merge made by the 'ort' strategy. + .../admin-guide/laptops/thinkpad-acpi.rst | 21 + + Documentation/wmi/devices/bitland-mifs-wmi.rst | 207 +++++ + drivers/gpu/drm/xe/xe_debugfs.c | 2 +- + drivers/gpu/drm/xe/xe_hwmon.c | 2 +- + drivers/gpu/drm/xe/xe_vsec.c | 7 +- + drivers/gpu/drm/xe/xe_vsec.h | 4 +- + drivers/input/mouse/trackpoint.c | 46 ++ + drivers/input/mouse/trackpoint.h | 5 + + drivers/platform/mellanox/nvsw-sn2201.c | 1 - + drivers/platform/surface/surface_hotplug.c | 2 +- + drivers/platform/surface/surfacepro3_button.c | 71 +- + drivers/platform/x86/Kconfig | 18 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acer-wireless.c | 48 +- + drivers/platform/x86/asus-wmi.c | 77 +- + drivers/platform/x86/barco-p50-gpio.c | 23 +- + drivers/platform/x86/bitland-mifs-wmi.c | 845 +++++++++++++++++++++ + drivers/platform/x86/dell/dell-rbtn.c | 142 ++-- + drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 44 +- + drivers/platform/x86/eeepc-laptop.c | 45 +- + drivers/platform/x86/fujitsu-laptop.c | 519 +++++++------ + drivers/platform/x86/fujitsu-tablet.c | 30 +- + drivers/platform/x86/intel/pmc/core.c | 4 +- + drivers/platform/x86/intel/pmc/ssram_telemetry.c | 2 +- + drivers/platform/x86/intel/pmt/class.c | 8 +- + drivers/platform/x86/intel/pmt/class.h | 5 +- + drivers/platform/x86/intel/pmt/discovery.c | 4 +- + drivers/platform/x86/intel/pmt/telemetry.c | 13 +- + drivers/platform/x86/intel/pmt/telemetry.h | 12 +- + drivers/platform/x86/intel/rst.c | 23 +- + drivers/platform/x86/intel/sdsi.c | 5 +- + drivers/platform/x86/intel/smartconnect.c | 23 +- + drivers/platform/x86/intel/vsec.c | 121 +-- + drivers/platform/x86/intel/vsec_tpmi.c | 8 +- + drivers/platform/x86/lenovo/thinkpad_acpi.c | 128 ++-- + drivers/platform/x86/lg-laptop.c | 51 +- + drivers/platform/x86/mxm-wmi.c | 12 - + drivers/platform/x86/panasonic-laptop.c | 79 +- + drivers/platform/x86/pcengines-apuv2.c | 3 +- + drivers/platform/x86/sony-laptop.c | 122 +-- + drivers/platform/x86/system76_acpi.c | 63 +- + drivers/platform/x86/topstar-laptop.c | 43 +- + drivers/platform/x86/wireless-hotkey.c | 49 +- + include/linux/intel_vsec.h | 39 +- + 44 files changed, 2096 insertions(+), 881 deletions(-) + create mode 100644 Documentation/wmi/devices/bitland-mifs-wmi.rst + create mode 100644 drivers/platform/x86/bitland-mifs-wmi.c +$ git am -3 ../patches/0001-hid-Fix-up-mismerge.patch +Applying: hid: Fix up mismerge +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hid/hid-asus.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 7b3de9ac54f51] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git + Date: Mon Mar 30 20:50:24 2026 +0100 +Merging chrome-platform/for-next (168e4b208ca8c platform/chrome: cros_usbpd_logger: Simplify with devm) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + drivers/platform/chrome/chromeos_privacy_screen.c | 41 ++++++------- + drivers/platform/chrome/chromeos_tbmc.c | 55 +++++++++++------ + drivers/platform/chrome/cros_ec_lightbar.c | 3 + + drivers/platform/chrome/cros_usbpd_logger.c | 18 +++--- + drivers/platform/chrome/wilco_ec/event.c | 73 +++++++++++++---------- + 5 files changed, 107 insertions(+), 83 deletions(-) +Merging chrome-platform-firmware/for-firmware-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-firmware-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (59b026da00383 HSI: cmt_speech: fix wrong printf format) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/clients/cmt_speech.c | 2 +- + drivers/hsi/controllers/omap_ssi_port.c | 2 +- + drivers/hsi/hsi_core.c | 37 +++++++++++++-------------------- + include/linux/hsi/hsi.h | 2 +- + 4 files changed, 18 insertions(+), 25 deletions(-) +Merging leds-lj/for-leds-next (b727ba2560a8a leds: Kconfig: Drop unneeded dependency on OF_GPIO) +$ git merge -m Merge branch 'for-leds-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/leds/leds-lp5860.yaml | 7 ++ + .../devicetree/bindings/leds/sprd,sc2731-bltc.yaml | 7 +- + drivers/leds/Kconfig | 1 - + drivers/leds/blink/leds-lgm-sso.c | 4 +- + drivers/leds/flash/leds-ktd2692.c | 2 +- + drivers/leds/led-class-multicolor.c | 4 +- + drivers/leds/led-core.c | 20 ++-- + drivers/leds/leds-lm3642.c | 20 ++-- + drivers/leds/leds-lp5569.c | 4 +- + drivers/leds/leds-lp8860.c | 119 +++++++++------------ + drivers/leds/rgb/leds-qcom-lpg.c | 7 +- + drivers/leds/trigger/ledtrig-tty.c | 2 +- + 12 files changed, 99 insertions(+), 98 deletions(-) +Merging ipmi/for-next (122d16da1313f ipmi: Replace use of system_wq with system_percpu_wq) +$ git merge -m Merge branch 'for-next' of https://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging driver-core/driver-core-next (a1fa010b3c9f0 driver core: auxiliary bus: Drop auxiliary_dev_pm_ops) +$ git merge -m Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core/driver-core-next +Auto-merging drivers/base/auxiliary.c +Auto-merging drivers/net/phy/mdio_bus_provider.c +Auto-merging drivers/of/base.c +CONFLICT (content): Merge conflict in drivers/of/base.c +Auto-merging drivers/of/platform.c +Auto-merging drivers/spi/spi.c +Auto-merging fs/kernfs/dir.c +Auto-merging fs/kernfs/inode.c +Auto-merging include/linux/device.h +Auto-merging include/linux/of.h +Auto-merging tools/testing/selftests/cgroup/test_memcontrol.c +Resolved 'drivers/of/base.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 480bc984e38a8] Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git +$ git diff -M --stat --summary HEAD^.. + drivers/base/auxiliary.c | 6 - + drivers/base/base.h | 97 +++++--- + drivers/base/core.c | 29 +-- + drivers/base/devres.c | 281 +++++++++++++++-------- + drivers/base/platform.c | 58 ++--- + drivers/base/soc.c | 29 ++- + drivers/bus/imx-weim.c | 2 +- + drivers/i2c/i2c-core-of.c | 2 +- + drivers/net/phy/mdio_bus_provider.c | 4 +- + drivers/of/base.c | 30 ++- + drivers/of/dynamic.c | 2 +- + drivers/of/platform.c | 2 +- + drivers/soc/fsl/guts.c | 12 +- + drivers/soc/imx/soc-imx8m.c | 11 +- + drivers/soc/imx/soc-imx9.c | 4 +- + drivers/soc/sunxi/sunxi_mbus.c | 2 +- + drivers/spi/spi.c | 2 +- + fs/kernfs/dir.c | 58 ++++- + fs/kernfs/inode.c | 2 +- + fs/sysfs/group.c | 10 +- + include/linux/device.h | 5 +- + include/linux/device/class.h | 4 +- + include/linux/fwnode.h | 44 +++- + include/linux/of.h | 14 ++ + include/linux/platform_device.h | 58 ++++- + include/linux/sys_soc.h | 10 + + include/linux/sysfs.h | 16 +- + rust/kernel/devres.rs | 185 +++++++++++---- + rust/kernel/irq/request.rs | 28 +-- + tools/testing/selftests/cgroup/test_memcontrol.c | 112 +++++++++ + 30 files changed, 785 insertions(+), 334 deletions(-) +Merging usb/usb-next (84db3719d2733 usb: dwc3: imx: avoid calling imx suspend/resume callbacks twice) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging drivers/usb/typec/ucsi/ucsi.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-power | 3 +- + .../bindings/connector/usb-connector.yaml | 39 +- + .../devicetree/bindings/usb/cdns,usb3.yaml | 1 + + .../devicetree/bindings/usb/corechips,sl6341.yaml | 79 ++ + .../devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml | 2 + + .../devicetree/bindings/usb/maxim,max33359.yaml | 4 + + .../devicetree/bindings/usb/maxim,max3421.txt | 23 - + .../devicetree/bindings/usb/maxim,max3421.yaml | 67 ++ + .../bindings/usb/microchip,mpfs-musb.yaml | 3 + + .../devicetree/bindings/usb/nxp,imx-dwc3.yaml | 123 +++ + Documentation/devicetree/bindings/usb/ohci-st.txt | 36 - + Documentation/devicetree/bindings/usb/omap-usb.txt | 80 -- + .../devicetree/bindings/usb/qcom,snps-dwc3.yaml | 2 +- + .../devicetree/bindings/usb/richtek,rt1711h.yaml | 3 +- + .../devicetree/bindings/usb/st,st-ohci-300x.yaml | 85 ++ + Documentation/devicetree/bindings/usb/ti,dwc3.yaml | 100 +++ + .../devicetree/bindings/usb/ti,omap4-musb.yaml | 120 +++ + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + drivers/power/supply/power_supply_sysfs.c | 2 + + drivers/usb/core/endpoint.c | 8 - + drivers/usb/core/message.c | 20 +- + drivers/usb/core/port.c | 21 +- + drivers/usb/dwc3/Kconfig | 12 + + drivers/usb/dwc3/Makefile | 1 + + drivers/usb/dwc3/core.c | 29 +- + drivers/usb/dwc3/core.h | 9 +- + drivers/usb/dwc3/dwc3-imx.c | 448 +++++++++++ + drivers/usb/dwc3/dwc3-qcom.c | 4 +- + drivers/usb/dwc3/gadget.c | 2 +- + drivers/usb/dwc3/glue.h | 3 + + drivers/usb/dwc3/ulpi.c | 25 + + drivers/usb/gadget/function/f_midi2.c | 6 +- + drivers/usb/gadget/function/u_serial.c | 2 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 68 +- + drivers/usb/gadget/udc/snps_udc_core.c | 2 +- + drivers/usb/host/ehci-orion.c | 9 - + drivers/usb/host/fhci-hcd.c | 15 +- + drivers/usb/host/fhci.h | 3 +- + drivers/usb/host/xhci-tegra.c | 4 - + drivers/usb/image/microtek.c | 79 +- + drivers/usb/misc/apple-mfi-fastcharge.c | 3 +- + drivers/usb/misc/cypress_cy7c63.c | 4 +- + drivers/usb/misc/cytherm.c | 4 +- + drivers/usb/misc/iowarrior.c | 34 +- + drivers/usb/misc/onboard_usb_dev.c | 3 + + drivers/usb/misc/onboard_usb_dev.h | 39 +- + drivers/usb/misc/trancevibrator.c | 3 +- + drivers/usb/misc/usb-ljca.c | 15 +- + drivers/usb/misc/usbsevseg.c | 3 +- + drivers/usb/misc/uss720.c | 27 +- + drivers/usb/musb/musb_core.c | 2 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 16 +- + drivers/usb/serial/ti_usb_3410_5052.c | 16 +- + drivers/usb/storage/uas.c | 4 +- + drivers/usb/typec/mux.c | 25 +- + drivers/usb/typec/mux/ps883x.c | 1 + + drivers/usb/typec/tcpm/Kconfig | 2 + + drivers/usb/typec/tcpm/fusb302.c | 13 + + drivers/usb/typec/tcpm/tcpci.c | 2 +- + drivers/usb/typec/tcpm/tcpci_rt1711h.c | 16 +- + drivers/usb/typec/tcpm/tcpm.c | 889 ++++++++++++++++++--- + drivers/usb/typec/tipd/core.c | 6 +- + drivers/usb/typec/ucsi/ucsi.c | 8 +- + drivers/usb/typec/ucsi/ucsi.h | 3 + + drivers/usb/typec/ucsi/ucsi_glink.c | 4 + + drivers/usb/typec/ucsi/ucsi_huawei_gaokun.c | 2 +- + drivers/usb/usbip/stub_dev.c | 5 +- + drivers/usb/usbip/vhci_sysfs.c | 2 +- + include/dt-bindings/usb/pd.h | 36 + + include/linux/power_supply.h | 3 + + include/linux/usb/cdc_ncm.h | 4 +- + include/linux/usb/pd.h | 108 ++- + include/linux/usb/tcpm.h | 2 +- + include/linux/usb/typec_altmode.h | 3 + + 74 files changed, 2338 insertions(+), 515 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/corechips,sl6341.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/maxim,max3421.txt + create mode 100644 Documentation/devicetree/bindings/usb/maxim,max3421.yaml + create mode 100644 Documentation/devicetree/bindings/usb/nxp,imx-dwc3.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/ohci-st.txt + delete mode 100644 Documentation/devicetree/bindings/usb/omap-usb.txt + create mode 100644 Documentation/devicetree/bindings/usb/st,st-ohci-300x.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,dwc3.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,omap4-musb.yaml + create mode 100644 drivers/usb/dwc3/dwc3-imx.c +Merging thunderbolt/next (c3e7cc8bc5ca0 thunderbolt: Use kzalloc_flex() for struct tb_path allocation) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/thunderbolt/dma_port.c | 15 +++------------ + drivers/thunderbolt/path.c | 28 +++++++--------------------- + drivers/thunderbolt/quirks.c | 7 +++++++ + drivers/thunderbolt/switch.c | 30 ++++++++++++++++++++++++++---- + drivers/thunderbolt/tb.h | 5 +++-- + 6 files changed, 47 insertions(+), 40 deletions(-) +Merging usb-serial/usb-next (5a6a33b564021 USB: serial: ti_usb_3410_5052: use strscpy() instead of strcpy()) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Merge made by the 'ort' strategy. +Merging tty/tty-next (6872c84dc6f5d Merge 7.0-rc5 into tty-next) +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Merge made by the 'ort' strategy. + .../bindings/serial/amlogic,meson-uart.yaml | 1 + + .../bindings/serial/atmel,at91-usart.yaml | 1 + + .../bindings/serial/snps-dw-apb-uart.yaml | 1 + + drivers/tty/hvc/hvc_iucv.c | 2 +- + drivers/tty/pty.c | 12 +- + drivers/tty/serial/8250/8250_core.c | 2 +- + drivers/tty/serial/8250/8250_pci.c | 51 ++ + drivers/tty/serial/8250/8250_port.c | 4 +- + drivers/tty/serial/Kconfig | 33 +- + drivers/tty/serial/Makefile | 2 - + drivers/tty/serial/amba-pl011.c | 153 +++- + drivers/tty/serial/apbuart.c | 2 +- + drivers/tty/serial/dz.c | 2 +- + drivers/tty/serial/esp32_acm.c | 459 ------------ + drivers/tty/serial/esp32_uart.c | 779 --------------------- + drivers/tty/serial/imx.c | 7 +- + drivers/tty/serial/ip22zilog.c | 2 +- + drivers/tty/serial/mxs-auart.c | 3 +- + drivers/tty/serial/qcom_geni_serial.c | 19 +- + drivers/tty/serial/samsung_tty.c | 10 +- + drivers/tty/serial/zs.c | 2 +- + drivers/tty/tty_buffer.c | 15 +- + drivers/tty/tty_io.c | 25 +- + drivers/tty/tty_ldisc.c | 16 +- + drivers/tty/tty_port.c | 22 + + drivers/tty/vt/keyboard.c | 80 ++- + drivers/tty/vt/vt.c | 48 +- + include/linux/serdev.h | 9 +- + include/linux/tty_buffer.h | 1 + + include/linux/tty_driver.h | 7 + + include/linux/tty_ldisc.h | 6 +- + include/linux/tty_port.h | 13 + + include/uapi/linux/keyboard.h | 29 + + 33 files changed, 464 insertions(+), 1354 deletions(-) + delete mode 100644 drivers/tty/serial/esp32_acm.c + delete mode 100644 drivers/tty/serial/esp32_uart.c +Merging char-misc/char-misc-next (a8a37957f2bc4 Merge tag 'iio-for-7.1a' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging MAINTAINERS +Auto-merging drivers/iio/accel/adxl313_core.c +Auto-merging drivers/iio/accel/adxl380.c +Auto-merging drivers/iio/adc/ad4062.c +Auto-merging drivers/iio/adc/ade9000.c +Auto-merging drivers/iio/adc/aspeed_adc.c +Auto-merging drivers/iio/adc/ina2xx-adc.c +Auto-merging drivers/iio/adc/nxp-sar-adc.c +Auto-merging drivers/iio/adc/ti-ads1119.c +Auto-merging drivers/iio/adc/ti-ads7950.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 2 +- + .../devicetree/bindings/iio/accel/adi,adxl372.yaml | 9 +- + .../bindings/iio/accel/bosch,bma255.yaml | 38 +- + .../devicetree/bindings/iio/adc/adi,ad4030.yaml | 64 ++ + .../devicetree/bindings/iio/adc/adi,ad4080.yaml | 3 + + .../devicetree/bindings/iio/adc/adi,ad7380.yaml | 23 + + .../bindings/iio/adc/amlogic,meson-saradc.yaml | 4 + + .../devicetree/bindings/iio/adc/lltc,ltc2497.yaml | 7 + + .../bindings/iio/adc/motorola,cpcap-adc.yaml | 1 + + .../bindings/iio/adc/qcom,spmi-adc5-gen3.yaml | 151 ++++ + .../bindings/iio/adc/qcom,spmi-vadc-common.yaml | 84 ++ + .../bindings/iio/adc/qcom,spmi-vadc.yaml | 78 +- + .../bindings/iio/amplifiers/adi,ad8366.yaml | 101 +++ + .../devicetree/bindings/iio/dac/lltc,ltc2632.yaml | 57 +- + .../devicetree/bindings/iio/dac/maxim,ds4424.yaml | 42 +- + .../devicetree/bindings/iio/dac/ti,dac7612.yaml | 2 +- + .../bindings/iio/gyroscope/bosch,bmg160.yaml | 12 +- + .../bindings/iio/light/vishay,vcnl4000.yaml | 31 +- + .../iio/magnetometer/bosch,bmc150_magn.yaml | 14 +- + .../bindings/iio/proximity/st,vl53l0x.yaml | 22 +- + .../bindings/iio/proximity/tyhx,hx9023s.yaml | 4 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 1 + + Documentation/iio/ad4030.rst | 39 + + Documentation/iio/ad7191.rst | 6 +- + Documentation/iio/adxl345.rst | 89 ++- + MAINTAINERS | 29 +- + drivers/android/binder.c | 2 +- + drivers/android/binder/context.rs | 11 + + drivers/android/binder/process.rs | 3 + + drivers/android/binder/thread.rs | 6 + + drivers/android/binder/transaction.rs | 4 +- + drivers/gpib/agilent_82357a/agilent_82357a.c | 5 +- + drivers/gpib/common/gpib_os.c | 17 +- + drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 206 +++-- + drivers/gpib/nec7210/nec7210.c | 12 - + drivers/gpib/ni_usb/ni_usb_gpib.c | 4 - + drivers/gpib/tms9914/tms9914.c | 13 - + drivers/iio/accel/Kconfig | 12 +- + drivers/iio/accel/adis16201.c | 2 +- + drivers/iio/accel/adis16209.c | 2 +- + drivers/iio/accel/adxl313_core.c | 11 +- + drivers/iio/accel/adxl345_core.c | 32 +- + drivers/iio/accel/adxl372.c | 314 +++++--- + drivers/iio/accel/adxl372.h | 20 +- + drivers/iio/accel/adxl372_i2c.c | 17 +- + drivers/iio/accel/adxl372_spi.c | 17 +- + drivers/iio/accel/adxl380.c | 4 +- + drivers/iio/accel/bmc150-accel-core.c | 4 +- + drivers/iio/accel/sca3000.c | 215 +++--- + drivers/iio/adc/Kconfig | 33 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad4030.c | 618 ++++++++++++++- + drivers/iio/adc/ad4062.c | 12 +- + drivers/iio/adc/ad4080.c | 46 +- + drivers/iio/adc/ad4170-4.c | 6 +- + drivers/iio/adc/ad7173.c | 3 +- + drivers/iio/adc/ad7192.c | 3 - + drivers/iio/adc/ad7266.c | 6 +- + drivers/iio/adc/ad7380.c | 53 +- + drivers/iio/adc/ad7768-1.c | 221 +++++- + drivers/iio/adc/ad7793.c | 3 +- + drivers/iio/adc/ad7887.c | 2 +- + drivers/iio/adc/ad7923.c | 4 +- + drivers/iio/adc/ad9467.c | 95 ++- + drivers/iio/adc/ad_sigma_delta.c | 6 +- + drivers/iio/adc/ade9000.c | 13 +- + drivers/iio/adc/adi-axi-adc.c | 5 + + drivers/iio/adc/aspeed_adc.c | 72 +- + drivers/iio/adc/at91-sama5d2_adc.c | 5 +- + drivers/iio/adc/at91_adc.c | 12 +- + drivers/iio/adc/cpcap-adc.c | 15 + + drivers/iio/adc/fsl-imx25-gcq.c | 2 +- + drivers/iio/adc/ina2xx-adc.c | 65 +- + drivers/iio/adc/ltc2309.c | 81 +- + drivers/iio/adc/max11410.c | 4 +- + drivers/iio/adc/max1363.c | 87 +-- + drivers/iio/adc/mcp3564.c | 2 +- + drivers/iio/adc/men_z188_adc.c | 2 +- + drivers/iio/adc/meson_saradc.c | 21 +- + drivers/iio/adc/mt6359-auxadc.c | 2 +- + drivers/iio/adc/nau7802.c | 3 +- + drivers/iio/adc/npcm_adc.c | 2 +- + drivers/iio/adc/nxp-sar-adc.c | 3 +- + drivers/iio/adc/pac1921.c | 2 +- + drivers/iio/adc/pac1934.c | 2 +- + drivers/iio/adc/palmas_gpadc.c | 8 +- + drivers/iio/adc/qcom-spmi-adc5-gen3.c | 860 +++++++++++++++++++++ + drivers/iio/adc/rohm-bd79124.c | 4 +- + drivers/iio/adc/sd_adc_modulator.c | 1 + + drivers/iio/adc/spear_adc.c | 2 +- + drivers/iio/adc/stm32-adc-core.c | 2 +- + drivers/iio/adc/stm32-adc.c | 2 +- + drivers/iio/adc/sun20i-gpadc-iio.c | 2 +- + drivers/iio/adc/ti-ads1015.c | 1 - + drivers/iio/adc/ti-ads1119.c | 3 +- + drivers/iio/adc/ti-ads7950.c | 183 +++-- + drivers/iio/adc/ti_am335x_adc.c | 6 +- + drivers/iio/adc/twl4030-madc.c | 2 +- + drivers/iio/adc/twl6030-gpadc.c | 2 +- + drivers/iio/addac/ad74413r.c | 9 +- + drivers/iio/amplifiers/Kconfig | 8 + + drivers/iio/amplifiers/ad8366.c | 409 +++++----- + drivers/iio/amplifiers/ada4250.c | 2 +- + drivers/iio/buffer/industrialio-hw-consumer.c | 11 +- + drivers/iio/buffer/kfifo_buf.c | 41 +- + drivers/iio/cdc/ad7150.c | 2 +- + drivers/iio/cdc/ad7746.c | 2 +- + drivers/iio/chemical/bme680_core.c | 2 +- + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 2 +- + .../iio/common/hid-sensors/hid-sensor-attributes.c | 2 +- + .../iio/common/inv_sensors/inv_sensors_timestamp.c | 4 +- + drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 2 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 11 +- + drivers/iio/dac/Kconfig | 1 + + drivers/iio/dac/ad5360.c | 29 +- + drivers/iio/dac/ad7293.c | 31 +- + drivers/iio/dac/adi-axi-dac.c | 3 +- + drivers/iio/dac/ds4424.c | 377 +++++---- + drivers/iio/dac/ltc2632.c | 353 ++++----- + drivers/iio/dac/max5522.c | 22 +- + drivers/iio/dac/ti-dac5571.c | 1 - + drivers/iio/filter/admv8818.c | 60 +- + drivers/iio/frequency/ad9523.c | 92 +-- + drivers/iio/frequency/adf4350.c | 10 +- + drivers/iio/frequency/adf4377.c | 56 +- + drivers/iio/frequency/admv1013.c | 104 +-- + drivers/iio/frequency/admv1014.c | 89 +-- + drivers/iio/frequency/admv4420.c | 37 +- + drivers/iio/frequency/adrf6780.c | 58 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 6 +- + drivers/iio/humidity/hdc2010.c | 1 - + drivers/iio/imu/bmi323/bmi323_core.c | 1 - + drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_magn.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 1 + + drivers/iio/industrialio-backend.c | 22 +- + drivers/iio/industrialio-event.c | 1 + + drivers/iio/industrialio-trigger.c | 33 +- + drivers/iio/light/Kconfig | 2 +- + drivers/iio/light/acpi-als.c | 42 +- + drivers/iio/light/apds9160.c | 2 +- + drivers/iio/light/apds9306.c | 4 +- + drivers/iio/light/as73211.c | 3 - + drivers/iio/light/gp2ap020a00f.c | 310 +++----- + drivers/iio/light/ltr390.c | 2 +- + drivers/iio/light/ltr501.c | 6 +- + drivers/iio/light/opt3001.c | 2 +- + drivers/iio/light/tsl2772.c | 2 +- + drivers/iio/light/vcnl4000.c | 131 +++- + drivers/iio/light/zopt2201.c | 47 +- + drivers/iio/magnetometer/ak8974.c | 2 +- + drivers/iio/magnetometer/ak8975.c | 6 +- + drivers/iio/magnetometer/bmc150_magn.c | 145 ++-- + drivers/iio/magnetometer/si7210.c | 21 +- + drivers/iio/magnetometer/yamaha-yas530.c | 2 +- + drivers/iio/pressure/bmp280-spi.c | 2 +- + drivers/iio/pressure/hsc030pa.c | 2 +- + drivers/iio/pressure/hsc030pa_i2c.c | 7 +- + drivers/iio/pressure/rohm-bm1390.c | 2 +- + drivers/iio/pressure/zpa2326.c | 2 +- + drivers/iio/proximity/Kconfig | 15 + + drivers/iio/proximity/Makefile | 1 + + drivers/iio/proximity/hx9023s.c | 5 +- + drivers/iio/proximity/sx9324.c | 2 +- + drivers/iio/proximity/vl53l1x-i2c.c | 756 ++++++++++++++++++ + drivers/iio/resolver/ad2s1210.c | 6 +- + drivers/iio/temperature/ltc2983.c | 4 +- + drivers/iio/test/iio-test-gts.c | 2 +- + drivers/mux/mmio.c | 8 +- + drivers/staging/iio/adc/ad7816.c | 16 +- + drivers/staging/iio/frequency/ad9834.c | 20 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 28 +- + include/linux/iio/adc/qcom-adc5-gen3-common.h | 211 +++++ + include/linux/iio/backend.h | 24 + + include/linux/iio/common/st_sensors.h | 11 +- + include/linux/iio/types.h | 1 + + include/linux/platform_data/tsl2772.h | 4 +- + rust/kernel/alloc/kvec.rs | 216 +++++- + 178 files changed, 6093 insertions(+), 2316 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-adc5-gen3.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc-common.yaml + create mode 100644 Documentation/devicetree/bindings/iio/amplifiers/adi,ad8366.yaml + create mode 100644 drivers/iio/adc/qcom-spmi-adc5-gen3.c + create mode 100644 drivers/iio/proximity/vl53l1x-i2c.c + create mode 100644 include/linux/iio/adc/qcom-adc5-gen3-common.h +$ git am -3 ../patches/0001-bus-mhi-Fix-up-interaction-with-net-next-tree.patch +Applying: bus: mhi: Fix up interaction with net-next tree +Using index info to reconstruct a base tree... +M drivers/net/wireless/ath/ath12k/wifi7/mhi.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging coresight/next (ada4280812a7a coresight: platform: check the availability of the endpoint before parse) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Auto-merging .mailmap +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 1 + + MAINTAINERS | 5 +- + drivers/hwtracing/coresight/coresight-catu.c | 4 +- + drivers/hwtracing/coresight/coresight-core.c | 216 ++++++++------ + drivers/hwtracing/coresight/coresight-ctcu-core.c | 5 +- + drivers/hwtracing/coresight/coresight-cti-core.c | 321 ++++----------------- + drivers/hwtracing/coresight/coresight-cti-sysfs.c | 174 +++++------ + drivers/hwtracing/coresight/coresight-cti.h | 15 +- + drivers/hwtracing/coresight/coresight-dummy.c | 7 +- + drivers/hwtracing/coresight/coresight-etb10.c | 4 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 5 +- + drivers/hwtracing/coresight/coresight-funnel.c | 4 +- + drivers/hwtracing/coresight/coresight-platform.c | 4 +- + drivers/hwtracing/coresight/coresight-priv.h | 3 +- + drivers/hwtracing/coresight/coresight-replicator.c | 4 +- + drivers/hwtracing/coresight/coresight-stm.c | 4 +- + drivers/hwtracing/coresight/coresight-tmc-core.c | 15 +- + drivers/hwtracing/coresight/coresight-tnoc.c | 4 +- + drivers/hwtracing/coresight/coresight-tpda.c | 4 +- + drivers/hwtracing/coresight/coresight-tpdm.c | 4 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 4 +- + drivers/hwtracing/coresight/ultrasoc-smb.c | 4 +- + include/linux/coresight.h | 14 +- + 23 files changed, 318 insertions(+), 507 deletions(-) +Merging fastrpc/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (f63ddbcc32990 fpga: m10bmc-sec: switch show_canceled_csk() to using sysfs_emit()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + drivers/fpga/fpga-bridge.c | 2 +- + drivers/fpga/intel-m10-bmc-sec-update.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging icc/icc-next (7a73b226c990d Merge branch 'icc-fixes' into icc-next) +$ git merge -m Merge branch 'icc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + .../bindings/interconnect/qcom,glymur-rpmh.yaml | 136 +- + .../bindings/interconnect/qcom,msm8974.yaml | 28 +- + .../bindings/interconnect/qcom,osm-l3.yaml | 1 + + .../bindings/interconnect/qcom,qcs615-rpmh.yaml | 23 + + .../bindings/interconnect/qcom,qcs8300-rpmh.yaml | 63 + + drivers/interconnect/qcom/Kconfig | 13 +- + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/eliza.c | 1585 +++++++++++++++++++ + drivers/interconnect/qcom/glymur.c | 40 +- + drivers/interconnect/qcom/icc-rpm-clocks.c | 6 + + drivers/interconnect/qcom/icc-rpm.c | 18 +- + drivers/interconnect/qcom/icc-rpm.h | 7 +- + drivers/interconnect/qcom/msm8974.c | 1613 +++++++++++++++----- + drivers/interconnect/qcom/qcs615.c | 247 +++ + drivers/interconnect/qcom/qcs8300.c | 375 +++++ + 15 files changed, 3711 insertions(+), 446 deletions(-) + create mode 100644 drivers/interconnect/qcom/eliza.c +Merging iio/togreg (d2a4ec19d2a2e Docs: iio: ad7191 Correct clock configuration) +$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (caf08514bbee0 dt-bindings: phy: qcom,sc8280xp-qmp-ufs-phy: document the Eliza QMP UFS PHY) + 7df891f2c3944 ("dt-bindings: phy: mediatek,dsi-phy: Add support for mt8167") +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging drivers/phy/Kconfig +Merge made by the 'ort' strategy. + .../bindings/phy/canaan,k230-usb-phy.yaml | 35 +++ + .../bindings/phy/eswin,eic7700-sata-phy.yaml | 92 +++++++ + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 8 +- + drivers/phy/Kconfig | 102 ++++---- + drivers/phy/Makefile | 12 +- + drivers/phy/apple/atc.c | 10 +- + drivers/phy/canaan/Kconfig | 14 + + drivers/phy/canaan/Makefile | 2 + + drivers/phy/canaan/phy-k230-usb.c | 284 +++++++++++++++++++++ + drivers/phy/eswin/Kconfig | 14 + + drivers/phy/eswin/Makefile | 2 + + drivers/phy/eswin/phy-eic7700-sata.c | 273 ++++++++++++++++++++ + drivers/phy/marvell/phy-mmp3-hsic.c | 24 +- + drivers/phy/mediatek/phy-mtk-tphy.c | 4 +- + drivers/phy/qualcomm/phy-qcom-m31-eusb2.c | 2 +- + drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 6 +- + drivers/phy/spacemit/Kconfig | 12 + + drivers/phy/spacemit/Makefile | 1 + + .../phy-k1-pcie.c} | 0 + 19 files changed, 816 insertions(+), 81 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/canaan,k230-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/eswin,eic7700-sata-phy.yaml + create mode 100644 drivers/phy/canaan/Kconfig + create mode 100644 drivers/phy/canaan/Makefile + create mode 100644 drivers/phy/canaan/phy-k230-usb.c + create mode 100644 drivers/phy/eswin/Kconfig + create mode 100644 drivers/phy/eswin/Makefile + create mode 100644 drivers/phy/eswin/phy-eic7700-sata.c + rename drivers/phy/{phy-spacemit-k1-pcie.c => spacemit/phy-k1-pcie.c} (100%) +Merging soundwire/next (b8f2d65fec19f soundwire: intel_auxdevice: Add cs42l49 to wake_capable_list) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + drivers/soundwire/amd_manager.c | 100 ++++++++++++++++++++++++++++++++---- + drivers/soundwire/amd_manager.h | 4 -- + drivers/soundwire/bus.c | 8 +-- + drivers/soundwire/cadence_master.c | 8 +++ + drivers/soundwire/intel_ace2x.c | 5 ++ + drivers/soundwire/intel_auxdevice.c | 2 + + drivers/soundwire/slave.c | 3 ++ + drivers/soundwire/stream.c | 22 +++++--- + include/linux/soundwire/sdw.h | 18 +++---- + include/linux/soundwire/sdw_amd.h | 4 ++ + 10 files changed, 138 insertions(+), 36 deletions(-) +Merging extcon/extcon-next (1bf0ba46d9d2c extcon: usbc-tusb320: Make typec-power-opmode optional) +$ git merge -m Merge branch 'extcon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/extcon/extcon-ptn5150.yaml | 3 ++ + drivers/extcon/Kconfig | 1 + + drivers/extcon/extcon-intel-int3496.c | 4 +- + drivers/extcon/extcon-ptn5150.c | 56 ++++++++++++++++++++++ + drivers/extcon/extcon-usbc-tusb320.c | 24 +++++----- + drivers/extcon/extcon.c | 4 +- + 6 files changed, 75 insertions(+), 17 deletions(-) +Merging gnss/gnss-next (f338e77383789 Linux 7.0-rc4) +$ git merge -m Merge branch 'gnss-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (2241228a5492b vfio/qat: add support for Intel QAT 420xx VFs) +$ git merge -m Merge branch 'next' of https://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'ort' strategy. + drivers/vfio/group.c | 23 ++-- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 17 +-- + drivers/vfio/pci/mlx5/cmd.c | 25 ++++- + drivers/vfio/pci/mlx5/cmd.h | 6 +- + drivers/vfio/pci/mlx5/main.c | 124 ++++++++++++--------- + drivers/vfio/pci/qat/Kconfig | 2 +- + drivers/vfio/pci/qat/main.c | 19 ++-- + drivers/vfio/pci/virtio/migrate.c | 17 +-- + drivers/vfio/vfio_main.c | 21 ++++ + include/linux/mlx5/mlx5_ifc.h | 16 ++- + include/linux/vfio.h | 40 +++++++ + include/uapi/linux/vfio.h | 26 ++++- + samples/vfio-mdev/mtty.c | 33 +++--- + tools/testing/selftests/vfio/Makefile | 2 +- + tools/testing/selftests/vfio/lib/drivers/dsa/dsa.c | 15 ++- + tools/testing/selftests/vfio/lib/vfio_pci_device.c | 4 +- + .../selftests/vfio/vfio_dma_mapping_mmio_test.c | 1 - + 17 files changed, 263 insertions(+), 128 deletions(-) +Merging w1/for-next (f2c1ae05fe820 w1: ds2490: drop redundant device reference) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Merge made by the 'ort' strategy. + drivers/w1/masters/ds2490.c | 11 +++-------- + 1 file changed, 3 insertions(+), 8 deletions(-) +Merging spmi/spmi-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'spmi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (82e1c68ac206e staging: rtl8723bs: add missing blank lines after declarations) +$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +Merge made by the 'ort' strategy. + drivers/staging/axis-fifo/axis-fifo.c | 59 +- + drivers/staging/fbtft/Kconfig | 6 +- + drivers/staging/fbtft/README | 29 +- + drivers/staging/fbtft/fb_agm1264k-fl.c | 2 +- + drivers/staging/fbtft/fb_hx8340bn.c | 8 - + drivers/staging/fbtft/fb_hx8353d.c | 13 - + drivers/staging/fbtft/fb_hx8357d.c | 14 - + drivers/staging/fbtft/fb_ili9163.c | 2 +- + drivers/staging/fbtft/fb_ili9340.c | 12 - + drivers/staging/fbtft/fb_ili9341.c | 12 - + drivers/staging/fbtft/fb_ili9481.c | 12 - + drivers/staging/fbtft/fb_ili9486.c | 12 - + drivers/staging/fbtft/fb_s6d02a1.c | 12 - + drivers/staging/fbtft/fb_st7735r.c | 12 - + drivers/staging/fbtft/fb_tinylcd.c | 14 +- + drivers/staging/fbtft/fbtft-core.c | 13 +- + .../greybus/Documentation/firmware/authenticate.c | 2 +- + drivers/staging/greybus/Kconfig | 2 +- + drivers/staging/greybus/arche-apb-ctrl.c | 10 +- + drivers/staging/greybus/arche-platform.c | 10 +- + drivers/staging/greybus/audio_manager.c | 12 - + drivers/staging/greybus/audio_manager.h | 7 - + drivers/staging/greybus/audio_manager_module.c | 13 +- + drivers/staging/greybus/loopback.c | 18 +- + drivers/staging/greybus/pwm.c | 2 +- + drivers/staging/greybus/sdio.c | 4 +- + .../staging/most/Documentation/driver_usage.txt | 10 +- + drivers/staging/most/dim2/dim2.c | 76 +- + drivers/staging/most/dim2/hal.c | 7 +- + drivers/staging/most/net/net.c | 1 - + drivers/staging/nvec/nvec.c | 21 +- + drivers/staging/octeon/ethernet-rx.c | 2 +- + drivers/staging/octeon/ethernet-tx.c | 2 - + drivers/staging/octeon/octeon-stubs.h | 1614 ++++++++++---------- + drivers/staging/rtl8723bs/core/rtw_ap.c | 39 +- + drivers/staging/rtl8723bs/core/rtw_btcoex.c | 1 - + drivers/staging/rtl8723bs/core/rtw_cmd.c | 111 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 24 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 131 +- + drivers/staging/rtl8723bs/core/rtw_io.c | 9 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 13 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 48 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 63 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 104 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 93 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 16 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 36 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 16 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 10 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 60 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 36 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 7 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 14 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 24 +- + drivers/staging/rtl8723bs/hal/odm.h | 9 +- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 28 +- + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c | 6 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 2 + + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 9 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 1 + + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 1 + + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 6 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 11 +- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 12 +- + drivers/staging/rtl8723bs/include/hal_com.h | 2 - + drivers/staging/rtl8723bs/include/ieee80211.h | 15 +- + drivers/staging/rtl8723bs/include/ioctl_cfg80211.h | 60 - + drivers/staging/rtl8723bs/include/rtl8192c_recv.h | 4 - + drivers/staging/rtl8723bs/include/rtw_cmd.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_efuse.h | 19 - + drivers/staging/rtl8723bs/include/rtw_mlme.h | 36 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 4 +- + drivers/staging/rtl8723bs/include/wlan_bssdef.h | 5 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 43 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 10 +- + drivers/staging/sm750fb/ddk750_mode.c | 2 +- + drivers/staging/sm750fb/ddk750_swi2c.c | 2 +- + drivers/staging/sm750fb/sm750.c | 88 +- + drivers/staging/sm750fb/sm750_hw.c | 26 +- + drivers/staging/vme_user/vme_user.h | 10 - + 80 files changed, 1430 insertions(+), 1883 deletions(-) +Merging counter-next/counter-next (cbf8db23fc58d counter: sysfs: remove double return in counter_sysfs_attr_add()) +$ git merge -m Merge branch 'counter-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Merge made by the 'ort' strategy. + drivers/counter/counter-sysfs.c | 2 -- + 1 file changed, 2 deletions(-) +Merging mux/for-next (59b723cd2adba Linux 6.12-rc6) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (b7560798466a0 dmaengine: dw-edma: Add non-LL mode) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Auto-merging drivers/dma/xilinx/xilinx_dma.c +Merge made by the 'ort' strategy. + .../bindings/dma/loongson,ls2k0300-dma.yaml | 81 ++ + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 102 +- + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 3 + + .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 111 -- + .../bindings/dma/xilinx/xlnx,axi-dma.yaml | 299 ++++ + MAINTAINERS | 14 +- + drivers/dma/Kconfig | 36 +- + drivers/dma/Makefile | 4 +- + drivers/dma/dma-axi-dmac.c | 170 ++- + drivers/dma/dmaengine.c | 50 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 42 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 1 + + drivers/dma/dw-edma/dw-edma-core.c | 174 ++- + drivers/dma/dw-edma/dw-edma-core.h | 18 + + drivers/dma/dw-edma/dw-edma-pcie.c | 220 ++- + drivers/dma/dw-edma/dw-edma-v0-core.c | 21 + + drivers/dma/dw-edma/dw-hdma-v0-core.c | 71 +- + drivers/dma/dw-edma/dw-hdma-v0-regs.h | 1 + + drivers/dma/fsl-edma-common.c | 3 +- + drivers/dma/fsl-edma-main.c | 55 +- + drivers/dma/fsl-qdma.c | 47 +- + drivers/dma/imx-sdma.c | 56 +- + drivers/dma/ioat/dma.h | 13 +- + drivers/dma/ioat/sysfs.c | 32 +- + drivers/dma/loongson/Kconfig | 41 + + drivers/dma/loongson/Makefile | 4 + + drivers/dma/{ => loongson}/loongson1-apb-dma.c | 4 +- + drivers/dma/loongson/loongson2-apb-cmc-dma.c | 730 ++++++++++ + drivers/dma/{ => loongson}/loongson2-apb-dma.c | 93 +- + drivers/dma/mxs-dma.c | 37 +- + drivers/dma/sh/rz-dmac.c | 304 ++++- + drivers/dma/switchtec_dma.c | 1437 ++++++++++++++++++++ + drivers/dma/xilinx/xdma.c | 2 + + drivers/dma/xilinx/xilinx_dma.c | 8 +- + include/linux/dma/edma.h | 7 + + include/linux/dma/qcom-gpi-dma.h | 5 +- + include/linux/dma/ti-cppi5.h | 53 +- + include/linux/dmaengine.h | 3 +- + include/linux/of_dma.h | 29 + + include/linux/platform_data/dma-mcf-edma.h | 5 +- + 40 files changed, 3852 insertions(+), 534 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/loongson,ls2k0300-dma.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/xilinx/xlnx,axi-dma.yaml + create mode 100644 drivers/dma/loongson/Kconfig + create mode 100644 drivers/dma/loongson/Makefile + rename drivers/dma/{ => loongson}/loongson1-apb-dma.c (99%) + create mode 100644 drivers/dma/loongson/loongson2-apb-cmc-dma.c + rename drivers/dma/{ => loongson}/loongson2-apb-dma.c (91%) + create mode 100644 drivers/dma/switchtec_dma.c +Merging cgroup/for-next (6ffdb01db6d5d Merge branch 'for-7.0-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging include/linux/cgroup-defs.h +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'ort' strategy. + include/linux/cgroup-defs.h | 4 + + kernel/cgroup/cgroup.c | 143 ++++++++++++++++----- + kernel/cgroup/dmem.c | 5 +- + tools/testing/selftests/cgroup/lib/cgroup_util.c | 15 +++ + .../selftests/cgroup/lib/include/cgroup_util.h | 2 + + tools/testing/selftests/cgroup/test_core.c | 3 +- + tools/testing/selftests/cgroup/test_kill.c | 7 +- + 7 files changed, 143 insertions(+), 36 deletions(-) +Merging scsi/for-next (604f9c5150f63 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/usb/gadget/function/f_tcm.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 23 +++++ + .../devicetree/bindings/ufs/qcom,sc7180-ufshc.yaml | 38 ++++--- + .../devicetree/bindings/ufs/qcom,sm8650-ufshc.yaml | 14 +++ + .../bindings/ufs/rockchip,rk3576-ufshc.yaml | 7 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 1 + + drivers/scsi/BusLogic.c | 4 +- + drivers/scsi/elx/efct/efct_lio.c | 2 + + drivers/scsi/fnic/fdls_disc.c | 4 +- + drivers/scsi/fnic/fip.c | 2 +- + drivers/scsi/fnic/fnic.h | 7 +- + drivers/scsi/fnic/fnic_fcs.c | 112 +++++++++++++++++---- + drivers/scsi/fnic/fnic_fdls.h | 2 +- + drivers/scsi/fnic/fnic_main.c | 28 +++++- + drivers/scsi/fnic/fnic_scsi.c | 70 ++----------- + drivers/scsi/hisi_sas/hisi_sas_main.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 12 +-- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 1 + + drivers/scsi/lpfc/lpfc.h | 11 +- + drivers/scsi/lpfc/lpfc_crtn.h | 3 +- + drivers/scsi/lpfc/lpfc_ct.c | 13 +-- + drivers/scsi/lpfc/lpfc_disc.h | 5 +- + drivers/scsi/lpfc/lpfc_els.c | 30 ++++-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 29 +++--- + drivers/scsi/lpfc/lpfc_init.c | 6 +- + drivers/scsi/lpfc/lpfc_nvme.c | 50 ++++++++- + drivers/scsi/lpfc/lpfc_scsi.c | 10 +- + drivers/scsi/lpfc/lpfc_sli.c | 85 +++++++--------- + drivers/scsi/lpfc/lpfc_sli4.h | 5 +- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 15 +-- + drivers/scsi/qla2xxx/qla_attr.c | 62 +++++++++++- + drivers/scsi/qla2xxx/qla_init.c | 2 +- + drivers/scsi/qla2xxx/qla_mbx.c | 9 ++ + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 + + drivers/scsi/scsi_lib.c | 47 +++++++++ + drivers/scsi/scsi_scan.c | 10 +- + drivers/scsi/scsi_sysfs.c | 16 +++ + drivers/scsi/sd.c | 80 ++++++++++++--- + drivers/scsi/sg.c | 88 +++++++--------- + drivers/target/iscsi/iscsi_target_configfs.c | 1 + + drivers/target/loopback/tcm_loop.c | 1 + + drivers/target/sbp/sbp_target.c | 1 + + drivers/target/target_core_configfs.c | 22 ++++ + drivers/target/target_core_device.c | 1 + + drivers/target/target_core_fabric_configfs.c | 24 +++++ + drivers/target/target_core_sbc.c | 3 +- + drivers/target/target_core_transport.c | 60 +++++++++-- + drivers/target/tcm_fc/tfc_conf.c | 1 + + drivers/ufs/core/ufs-mcq.c | 9 +- + drivers/ufs/core/ufs-sysfs.c | 30 ++++++ + drivers/ufs/core/ufshcd.c | 49 +++++++-- + drivers/ufs/host/ufs-mediatek.c | 11 ++ + drivers/ufs/host/ufs-mediatek.h | 4 + + drivers/ufs/host/ufshcd-pci.c | 1 + + drivers/usb/gadget/function/f_tcm.c | 1 + + drivers/vhost/scsi.c | 2 + + drivers/xen/xen-scsiback.c | 1 + + include/scsi/scsi_device.h | 1 + + include/scsi/scsi_host.h | 7 +- + include/target/target_core_base.h | 10 ++ + include/target/target_core_fabric.h | 12 ++- + include/ufs/ufshcd.h | 15 +++ + include/ufs/ufshci.h | 1 + + 63 files changed, 861 insertions(+), 320 deletions(-) +Merging scsi-mkp/for-next (2dfb80cc3580d Merge patch series "scsi: ufs: Add TX Equalization support for UFS 5.0") +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr_fw.c +CONFLICT (content): Merge conflict in drivers/scsi/mpi3mr/mpi3mr_fw.c +Auto-merging drivers/ufs/core/ufshcd.c +Recorded preimage for 'drivers/scsi/mpi3mr/mpi3mr_fw.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/scsi/mpi3mr/mpi3mr_fw.c'. +[master b26c2edb56f9e] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git +$ git diff -M --stat --summary HEAD^.. + drivers/scsi/Kconfig | 1 + + drivers/scsi/esas2r/esas2r_log.c | 14 +- + drivers/scsi/iscsi_tcp.c | 2 +- + drivers/scsi/lpfc/lpfc.h | 2 - + drivers/scsi/lpfc/lpfc_crtn.h | 2 +- + drivers/scsi/lpfc/lpfc_els.c | 6 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 11 +- + drivers/scsi/lpfc/lpfc_init.c | 58 +- + drivers/scsi/mpi3mr/mpi3mr.h | 16 + + drivers/scsi/mpi3mr/mpi3mr_fw.c | 55 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 11 +- + drivers/scsi/virtio_scsi.c | 14 +- + drivers/target/target_core_transport.c | 8 +- + drivers/ufs/core/Makefile | 2 +- + drivers/ufs/core/ufs-debugfs.c | 290 +++++++ + drivers/ufs/core/ufs-mcq.c | 13 +- + drivers/ufs/core/ufs-txeq.c | 1293 ++++++++++++++++++++++++++++++++ + drivers/ufs/core/ufshcd-priv.h | 61 +- + drivers/ufs/core/ufshcd.c | 208 ++++- + drivers/ufs/host/ufs-amd-versal2.c | 3 - + drivers/ufs/host/ufs-exynos.c | 34 +- + drivers/ufs/host/ufs-hisi.c | 23 +- + drivers/ufs/host/ufs-mediatek.c | 40 +- + drivers/ufs/host/ufs-qcom.c | 591 ++++++++++++++- + drivers/ufs/host/ufs-qcom.h | 42 ++ + drivers/ufs/host/ufs-rockchip.c | 1 - + drivers/ufs/host/ufs-sprd.c | 3 - + drivers/ufs/host/ufshcd-pci.c | 7 +- + include/uapi/scsi/fc/fc_els.h | 2 +- + include/ufs/ufshcd.h | 174 ++++- + include/ufs/ufshci.h | 2 + + include/ufs/unipro.h | 141 +++- + 32 files changed, 2914 insertions(+), 216 deletions(-) + create mode 100644 drivers/ufs/core/ufs-txeq.c +Merging vhost/linux-next (ebcff9dacaf2c vduse: avoid adding implicit padding) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (9e71a1ffc54e2 Merge branches 'rproc-next', 'rproc-fixes' and 'rpmsg-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 13 +- + .../bindings/remoteproc/qcom,sm8550-pas.yaml | 14 +- + .../bindings/remoteproc/ti,k3-r5f-rproc.yaml | 55 ++++- + drivers/remoteproc/da8xx_remoteproc.c | 97 ++++----- + drivers/remoteproc/imx_rproc.c | 8 +- + drivers/remoteproc/keystone_remoteproc.c | 43 ++-- + drivers/remoteproc/pru_rproc.c | 17 +- + drivers/remoteproc/qcom_q6v5_mss.c | 237 ++++++++++++++++++++- + drivers/remoteproc/qcom_sysmon.c | 2 +- + drivers/remoteproc/remoteproc_internal.h | 2 +- + drivers/remoteproc/ti_k3_common.c | 2 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 28 ++- + drivers/rpmsg/rpmsg_core.c | 4 +- + 13 files changed, 386 insertions(+), 136 deletions(-) +Merging gpio-brgl/gpio/for-next (802c51a83e9a0 gpiolib: fix hogs with multiple lines) +$ git merge -m Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/regulator/Kconfig +Auto-merging include/linux/mfd/kempld.h +Recorded preimage for 'Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml'. +[master 5db55edf976b9] Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/gpio-delay.yaml | 2 +- + .../bindings/gpio/microchip,mpfs-gpio.yaml | 27 +- + .../devicetree/bindings/gpio/pin-control-gpio.yaml | 59 +++++ + .../bindings/gpio/realtek,otto-gpio.yaml | 1 + + Documentation/driver-api/gpio/board.rst | 16 -- + Documentation/driver-api/gpio/driver.rst | 27 ++ + arch/arc/plat-axs10x/Kconfig | 1 - + arch/arm/mach-omap1/board-ams-delta.c | 32 ++- + arch/powerpc/platforms/85xx/Kconfig | 1 - + drivers/firmware/arm_scmi/pinctrl.c | 2 + + drivers/gpio/Kconfig | 76 +++--- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-bcm-kona.c | 37 ++- + drivers/gpio/gpio-bd9571mwv.c | 2 +- + drivers/gpio/gpio-brcmstb.c | 125 ++++++--- + drivers/gpio/gpio-by-pinctrl.c | 101 +++++++ + drivers/gpio/gpio-cgbc.c | 4 +- + drivers/gpio/gpio-cs5535.c | 48 ++-- + drivers/gpio/gpio-da9055.c | 2 +- + drivers/gpio/gpio-dwapb.c | 19 +- + drivers/gpio/gpio-htc-egpio.c | 13 +- + drivers/gpio/gpio-kempld.c | 289 +++++++++++++++++++- + drivers/gpio/gpio-lp873x.c | 2 +- + drivers/gpio/gpio-max732x.c | 24 +- + drivers/gpio/gpio-mmio.c | 4 +- + drivers/gpio/gpio-mpsse.c | 13 +- + drivers/gpio/gpio-realtek-otto.c | 4 + + drivers/gpio/gpio-sim.c | 200 +++++++------- + drivers/gpio/gpio-stp-xway.c | 2 +- + drivers/gpio/gpio-tegra186.c | 45 ++-- + drivers/gpio/gpio-tps65086.c | 2 +- + drivers/gpio/gpio-ts4800.c | 10 - + drivers/gpio/gpio-viperboard.c | 2 +- + drivers/gpio/gpiolib-acpi-core.c | 70 ----- + drivers/gpio/gpiolib-cdev.c | 159 ++++------- + drivers/gpio/gpiolib-cdev.h | 2 +- + drivers/gpio/gpiolib-of.c | 152 ++--------- + drivers/gpio/gpiolib-of.h | 10 + + drivers/gpio/gpiolib-sysfs.c | 30 +-- + drivers/gpio/gpiolib-sysfs.h | 8 +- + drivers/gpio/gpiolib.c | 214 +++++++++------ + drivers/gpio/gpiolib.h | 6 +- + drivers/pinctrl/core.c | 31 +++ + drivers/pinctrl/pinconf.h | 6 + + drivers/pinctrl/pinctrl-scmi.c | 46 +++- + drivers/regulator/Kconfig | 2 - + include/linux/gpio/consumer.h | 2 + + include/linux/gpio/defs.h | 9 + + include/linux/gpio/driver.h | 15 +- + include/linux/gpio/generic.h | 8 +- + include/linux/gpio/machine.h | 33 --- + include/linux/mfd/kempld.h | 1 + + include/linux/pinctrl/consumer.h | 9 + + tools/testing/selftests/gpio/Makefile | 5 +- + tools/testing/selftests/gpio/gpio-cdev-uaf.c | 292 +++++++++++++++++++++ + tools/testing/selftests/gpio/gpio-cdev-uaf.sh | 63 +++++ + 56 files changed, 1531 insertions(+), 835 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/pin-control-gpio.yaml + create mode 100644 drivers/gpio/gpio-by-pinctrl.c + create mode 100644 include/linux/gpio/defs.h + create mode 100644 tools/testing/selftests/gpio/gpio-cdev-uaf.c + create mode 100755 tools/testing/selftests/gpio/gpio-cdev-uaf.sh +Merging gpio-intel/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (58a64a4b05e1e Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Merge made by the 'ort' strategy. + .../bindings/pinctrl/fsl,imx27-iomuxc.yaml | 126 + + .../bindings/pinctrl/fsl,imx27-pinctrl.txt | 121 - + .../bindings/pinctrl/fsl,imx35-pinctrl.yaml | 1 + + .../pinctrl/marvell,armada3710-xb-pinctrl.yaml | 11 +- + .../devicetree/bindings/pinctrl/pincfg-node.yaml | 107 +- + .../bindings/pinctrl/qcom,eliza-tlmm.yaml | 138 + + .../pinctrl/qcom,milos-lpass-lpi-pinctrl.yaml | 109 + + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 8 +- + .../pinctrl/qcom,sm8650-lpass-lpi-pinctrl.yaml | 4 +- + .../bindings/pinctrl/realtek,rtd1315e-pinctrl.yaml | 7 +- + .../bindings/pinctrl/realtek,rtd1319d-pinctrl.yaml | 7 +- + .../bindings/pinctrl/realtek,rtd1619b-pinctrl.yaml | 7 +- + .../bindings/pinctrl/realtek,rtd1625-pinctrl.yaml | 260 ++ + .../pinctrl/renesas,r9a09g077-pinctrl.yaml | 17 + + .../bindings/pinctrl/rockchip,pinctrl.yaml | 1 + + drivers/gpio/gpio-rockchip.c | 2 +- + drivers/gpio/gpio-spacemit-k1.c | 1 + + drivers/pinctrl/Kconfig | 15 +- + drivers/pinctrl/bcm/Kconfig | 4 +- + drivers/pinctrl/core.c | 7 +- + drivers/pinctrl/devicetree.c | 2 +- + drivers/pinctrl/freescale/Kconfig | 2 +- + drivers/pinctrl/meson/Kconfig | 1 - + drivers/pinctrl/microchip/pinctrl-mpfs-mssio.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 +- + drivers/pinctrl/nxp/pinctrl-s32.h | 2 +- + drivers/pinctrl/pinconf-generic.c | 94 +- + drivers/pinctrl/pinctrl-amd.c | 1 + + drivers/pinctrl/pinctrl-cy8c95x0.c | 93 +- + drivers/pinctrl/pinctrl-eyeq5.c | 437 ++- + drivers/pinctrl/pinctrl-pic32.c | 64 +- + drivers/pinctrl/pinctrl-rockchip.c | 313 +- + drivers/pinctrl/pinctrl-rockchip.h | 1 + + drivers/pinctrl/pinctrl-single.c | 1 + + drivers/pinctrl/qcom/Kconfig | 10 + + drivers/pinctrl/qcom/Kconfig.msm | 10 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-eliza.c | 1548 ++++++++++ + drivers/pinctrl/qcom/pinctrl-glymur.c | 2 +- + drivers/pinctrl/qcom/pinctrl-milos-lpass-lpi.c | 217 ++ + drivers/pinctrl/realtek/Kconfig | 14 + + drivers/pinctrl/realtek/Makefile | 1 + + drivers/pinctrl/realtek/pinctrl-rtd.c | 224 +- + drivers/pinctrl/realtek/pinctrl-rtd.h | 50 + + drivers/pinctrl/realtek/pinctrl-rtd1625.c | 3138 ++++++++++++++++++++ + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 8 +- + drivers/pinctrl/renesas/pinctrl-rzt2h.c | 258 ++ + drivers/pinctrl/spacemit/pinctrl-k1.c | 21 +- + drivers/pinctrl/starfive/Kconfig | 2 - + drivers/pinctrl/sunplus/Kconfig | 1 - + drivers/pinctrl/tegra/pinctrl-tegra.c | 10 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 4 +- + include/linux/pinctrl/pinconf-generic.h | 5 +- + 53 files changed, 7023 insertions(+), 470 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx27-iomuxc.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,eliza-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,milos-lpass-lpi-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/realtek,rtd1625-pinctrl.yaml + create mode 100644 drivers/pinctrl/qcom/pinctrl-eliza.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-milos-lpass-lpi.c + create mode 100644 drivers/pinctrl/realtek/pinctrl-rtd1625.c +Merging pinctrl-intel/for-next (1ca468e78ea97 pinctrl: intel: Enable 3-bit PAD_OWN feature) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-intel.c | 36 +++++++++++++++++++++++++---------- + drivers/pinctrl/intel/pinctrl-intel.h | 1 + + 2 files changed, 27 insertions(+), 10 deletions(-) +Merging pinctrl-renesas/renesas-pinctrl (3f92867ce3ee2 pinctrl: renesas: rzg2l: Drop superfluous blank line) +$ git merge -m Merge branch 'renesas-pinctrl' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/pwm/for-next (aa8f35172ab66 pwm: th1520: fix `CLIPPY=1` warning) +$ git merge -m Merge branch 'pwm/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml | 3 +++ + MAINTAINERS | 1 + + drivers/pwm/pwm-imx-tpm.c | 9 ++++++++- + drivers/pwm/pwm-jz4740.c | 1 - + drivers/pwm/pwm_th1520.rs | 5 +---- + 5 files changed, 13 insertions(+), 6 deletions(-) +Merging ktest/for-next (229517449879b ktest: Add a --dry-run mode) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Merge made by the 'ort' strategy. + tools/testing/ktest/ktest.pl | 158 +++++++++++++++++++++++++++++----------- + tools/testing/ktest/sample.conf | 6 ++ + 2 files changed, 122 insertions(+), 42 deletions(-) +Merging kselftest/next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'test' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (fa2c3ed5f079d kunit: tool: Terminate kernel under test on SIGINT) +$ git merge -m Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Auto-merging tools/testing/kunit/kunit_kernel.py +Auto-merging tools/testing/kunit/kunit_tool_test.py +CONFLICT (content): Merge conflict in tools/testing/kunit/kunit_tool_test.py +Resolved 'tools/testing/kunit/kunit_tool_test.py' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ee937ace176a2] Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git +$ git diff -M --stat --summary HEAD^.. + tools/testing/kunit/kunit.py | 16 ++++++++-- + tools/testing/kunit/kunit_kernel.py | 38 +++++++++++++++------- + tools/testing/kunit/kunit_parser.py | 3 +- + tools/testing/kunit/kunit_tool_test.py | 58 ++++++++++++++++++++++++++++++++-- + 4 files changed, 98 insertions(+), 17 deletions(-) +Merging livepatching/for-next (712c0756828be Merge branch 'for-7.1/module-function-test' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git livepatching/for-next +Merge made by the 'ort' strategy. + tools/testing/selftests/livepatch/test-ftrace.sh | 36 ++++++++ + .../testing/selftests/livepatch/test-livepatch.sh | 100 +++++++++++++++++++++ + .../selftests/livepatch/test_modules/Makefile | 2 + + .../livepatch/test_modules/test_klp_mod_patch.c | 53 +++++++++++ + .../livepatch/test_modules/test_klp_mod_target.c | 39 ++++++++ + 5 files changed, 230 insertions(+) + create mode 100644 tools/testing/selftests/livepatch/test_modules/test_klp_mod_patch.c + create mode 100644 tools/testing/selftests/livepatch/test_modules/test_klp_mod_target.c +Merging rtc/rtc-next (5ff89ef425d17 dt-bindings: rtc: isl12026: convert to YAML schema) +$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/rtc/isil,isl12026.txt | 28 ---------- + .../devicetree/bindings/rtc/isil,isl12026.yaml | 59 ++++++++++++++++++++++ + .../bindings/rtc/microchip,mpfs-rtc.yaml | 3 ++ + .../bindings/rtc/microcrystal,rv3028.yaml | 2 + + drivers/rtc/rtc-abx80x.c | 3 +- + drivers/rtc/rtc-m41t80.c | 8 +-- + drivers/rtc/rtc-max77686.c | 14 ++++- + drivers/rtc/rtc-pcf2127.c | 23 +++------ + drivers/rtc/rtc-rs5c372.c | 7 +-- + drivers/rtc/rtc-rv8803.c | 8 +-- + drivers/rtc/rtc-rx8025.c | 4 +- + 11 files changed, 88 insertions(+), 71 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/rtc/isil,isl12026.txt + create mode 100644 Documentation/devicetree/bindings/rtc/isil,isl12026.yaml +Merging nvdimm/libnvdimm-for-next (a9ba6733c7f10 nvdimm: virtio_pmem: serialize flush requests) +$ git merge -m Merge branch 'libnvdimm-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'at24/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (7b3302c687cae ntb_hw_amd: Fix incorrect debug message in link disable path) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging seccomp/for-next/seccomp (7d0a66e4bb908 Linux 6.18) +$ git merge -m Merge branch 'for-next/seccomp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging slimbus/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (8d48419d141cb Merge branches 'nvmem-fixes' and 'nvmem-for-7.1' into nvmem-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'ort' strategy. + .../bindings/nvmem/layouts/kontron,sl28-vpd.yaml | 7 +- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 1 + + .../devicetree/bindings/nvmem/rockchip,otp.yaml | 83 +++++++++-- + drivers/nvmem/imx-ocotp-ele.c | 1 + + drivers/nvmem/imx-ocotp.c | 1 + + drivers/nvmem/qnap-mcu-eeprom.c | 8 +- + drivers/nvmem/rockchip-otp.c | 159 +++++++++++++++++---- + drivers/nvmem/zynqmp_nvmem.c | 8 +- + 8 files changed, 213 insertions(+), 55 deletions(-) +Merging hyperv/hyperv-next (e733a9e281805 mshv: Introduce tracing support) +$ git merge -m Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging drivers/hv/hyperv_vmbus.h +Auto-merging drivers/hv/mshv_root.h +Auto-merging drivers/hv/mshv_root_main.c +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'ort' strategy. + drivers/hv/Makefile | 1 + + drivers/hv/channel_mgmt.c | 16 +- + drivers/hv/hyperv_vmbus.h | 3 +- + drivers/hv/mshv_eventfd.c | 14 ++ + drivers/hv/mshv_irq.c | 4 + + drivers/hv/mshv_root.h | 1 + + drivers/hv/mshv_root_hv_call.c | 22 +- + drivers/hv/mshv_root_main.c | 78 ++++++- + drivers/hv/mshv_trace.c | 9 + + drivers/hv/mshv_trace.h | 515 +++++++++++++++++++++++++++++++++++++++++ + drivers/hv/vmbus_drv.c | 7 +- + 11 files changed, 644 insertions(+), 26 deletions(-) + create mode 100644 drivers/hv/mshv_trace.c + create mode 100644 drivers/hv/mshv_trace.h +Merging auxdisplay/for-next (7f138de156b20 auxdisplay: line-display: fix NULL dereference in linedisp_release) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Already up to date. +Merging kgdb/kgdb/for-next (fdbdd0ccb30af kdb: remove redundant check for scancode 0xe0) +$ git merge -m Merge branch 'kgdb/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'hmm' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'cfi/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (f2d1643ddc0f3 bus: mhi: ep: Test for non-zero return value where applicable) +$ git merge -m Merge branch 'mhi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/ep/main.c | 10 +++++----- + drivers/bus/mhi/ep/ring.c | 6 +++--- + drivers/bus/mhi/host/boot.c | 22 +++------------------- + drivers/bus/mhi/host/pci_generic.c | 27 ++++++++++++++++++++++++++- + include/linux/mhi.h | 34 +++++++++++++++++----------------- + 5 files changed, 54 insertions(+), 45 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-net-qrtr-Drop-the-MHI-auto_queue-feature-.patch +Applying: fix up for "net: qrtr: Drop the MHI auto_queue feature for IPCR DL channels" +Using index info to reconstruct a base tree... +M drivers/net/wireless/ath/ath12k/wifi7/mhi.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging memblock/for-next (c7fc9cde41be0 memblock: warn when freeing reserved memory before memory map is initialized) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/x86/platform/efi/quirks.c +Auto-merging drivers/of/kexec.c +Auto-merging include/linux/mm.h +Auto-merging kernel/dma/swiotlb.c +Auto-merging lib/bootconfig.c +Auto-merging mm/internal.h +Auto-merging mm/kfence/core.c +Auto-merging mm/memblock.c +Auto-merging mm/mm_init.c +Auto-merging mm/page_alloc.c +Merge made by the 'ort' strategy. + arch/arm64/mm/init.c | 3 - + arch/powerpc/kernel/fadump.c | 16 +- + arch/powerpc/platforms/powernv/opal-core.c | 11 +- + arch/sparc/kernel/mdesc.c | 4 +- + arch/x86/kernel/setup.c | 2 +- + arch/x86/platform/efi/memmap.c | 5 +- + arch/x86/platform/efi/quirks.c | 2 +- + drivers/firmware/efi/apple-properties.c | 2 +- + drivers/of/kexec.c | 2 +- + include/linux/bootmem_info.h | 4 - + include/linux/memblock.h | 2 - + include/linux/mm.h | 3 - + init/initramfs.c | 7 - + kernel/dma/swiotlb.c | 6 +- + lib/bootconfig.c | 2 +- + mm/internal.h | 10 ++ + mm/kfence/core.c | 4 +- + mm/memblock.c | 231 ++++++++++++++++++++------ + mm/mm_init.c | 25 --- + mm/page_alloc.c | 46 ----- + tools/include/linux/mm.h | 3 +- + tools/testing/memblock/internal.h | 43 ++++- + tools/testing/memblock/linux/string_helpers.h | 10 ++ + tools/testing/memblock/mmzone.c | 4 - + 24 files changed, 254 insertions(+), 193 deletions(-) + create mode 100644 tools/testing/memblock/linux/string_helpers.h +Merging cxl/next (a792fe15f1cb9 Merge branch 'for-7.1/cxl-misc' into cxl-for-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging drivers/cxl/core/mbox.c +Auto-merging drivers/cxl/core/region.c +Merge made by the 'ort' strategy. + drivers/acpi/numa/srat.c | 7 +- + drivers/cxl/core/core.h | 2 + + drivers/cxl/core/mbox.c | 17 ++-- + drivers/cxl/core/memdev.c | 24 +++++ + drivers/cxl/core/pci.c | 57 +++++++++++ + drivers/cxl/core/region.c | 95 +++++++++++------- + drivers/cxl/core/regs.c | 1 - + drivers/cxl/cxl.h | 100 +------------------ + drivers/cxl/cxlmem.h | 88 +---------------- + drivers/cxl/cxlpci.h | 13 +++ + drivers/cxl/pci.c | 103 +++++--------------- + include/cxl/cxl.h | 226 +++++++++++++++++++++++++++++++++++++++++++ + tools/testing/cxl/test/mem.c | 3 +- + 13 files changed, 428 insertions(+), 308 deletions(-) + create mode 100644 include/cxl/cxl.h +Merging zstd/zstd-next (65d1f5507ed2c zstd: Import upstream v1.5.7) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (56e2ef8f5f916 efi: libstub: fix type of fdt 32 and 64bit variables) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging drivers/firmware/efi/efi.c +Merge made by the 'ort' strategy. + drivers/firmware/efi/efi-bgrt.c | 7 +++++-- + drivers/firmware/efi/efi.c | 27 +++++++++------------------ + drivers/firmware/efi/libstub/fdt.c | 12 ++++++------ + include/linux/efi.h | 21 --------------------- + 4 files changed, 20 insertions(+), 47 deletions(-) +Merging unicode/for-next (bcfee135d5847 utf8: Remove unused utf8_normalize) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Auto-merging fs/unicode/utf8-core.c +Merge made by the 'ort' strategy. + fs/unicode/utf8-core.c | 22 ---------------------- + include/linux/unicode.h | 3 --- + 2 files changed, 25 deletions(-) +Merging slab/slab/for-next (dbc785fb4d9cf Merge branch 'slab/for-7.1/misc' into slab/for-next) +$ git merge -m Merge branch 'slab/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging mm/Kconfig +Auto-merging mm/slab.h +Merge made by the 'ort' strategy. + mm/Kconfig | 1 + + mm/slab.h | 7 +- + mm/slub.c | 339 ++++++++++++++++++++++++++++++++++++++----------------------- + 3 files changed, 221 insertions(+), 126 deletions(-) +Merging random/master (bb9ff576fdff4 virt: vmgenid: remap memory as decrypted) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Merge made by the 'ort' strategy. + drivers/virt/vmgenid.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging landlock/next (a8a64ed1dd538 landlock: Document FS access right for pathname UNIX sockets) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging net/unix/af_unix.c +Merge made by the 'ort' strategy. + Documentation/security/landlock.rst | 42 +- + Documentation/userspace-api/landlock.rst | 14 +- + include/linux/lsm_hook_defs.h | 5 + + include/linux/security.h | 11 + + include/uapi/linux/landlock.h | 21 + + net/unix/af_unix.c | 10 +- + samples/landlock/sandboxer.c | 12 +- + security/landlock/access.h | 4 +- + security/landlock/audit.c | 1 + + security/landlock/cred.h | 2 +- + security/landlock/domain.c | 6 +- + security/landlock/fs.c | 163 ++- + security/landlock/id.c | 2 +- + security/landlock/limits.h | 2 +- + security/landlock/ruleset.c | 14 +- + security/landlock/ruleset.h | 2 +- + security/landlock/syscalls.c | 19 +- + security/landlock/task.c | 22 +- + security/landlock/tsync.c | 124 +- + security/security.c | 20 + + tools/testing/selftests/landlock/audit.h | 29 +- + tools/testing/selftests/landlock/audit_test.c | 2 - + tools/testing/selftests/landlock/base_test.c | 2 +- + tools/testing/selftests/landlock/fs_test.c | 1345 +++++++++++--------- + tools/testing/selftests/landlock/ptrace_test.c | 1 - + .../selftests/landlock/scoped_abstract_unix_test.c | 1 - + 26 files changed, 1137 insertions(+), 739 deletions(-) +Merging sysctl/sysctl-next (f63a9df7e3f9f sysctl: fix uninitialized variable in proc_do_large_bitmap) +$ git merge -m Merge branch 'sysctl-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (4ced4cf5c9d17 binfmt_elf_fdpic: fix AUXV size calculation for ELF_HWCAP3 and ELF_HWCAP4) +$ git merge -m Merge branch 'for-next/execve' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (95d324fb1b484 bitmap: add test_zero_nbits()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging arch/loongarch/kvm/intc/eiointc.c +Merge made by the 'ort' strategy. + arch/loongarch/kvm/intc/eiointc.c | 4 +- + arch/x86/kernel/cpu/topology.c | 8 +- + include/asm-generic/bitops/instrumented-atomic.h | 2 +- + include/linux/bitmap.h | 33 ++++++ + include/linux/bitops.h | 2 +- + include/linux/count_zeros.h | 13 +-- + include/linux/find.h | 2 - + lib/bitmap.c | 2 + + lib/crypto/mpi/longlong.h | 8 +- + lib/find_bit.c | 7 -- + lib/find_bit_benchmark.c | 15 ++- + lib/test_bitmap.c | 135 ++++++++++++++++++++--- + 12 files changed, 177 insertions(+), 54 deletions(-) +Merging hte/for-next (92dfd92f74769 hte: tegra194: remove Kconfig dependency on Tegra194 SoC) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Merge made by the 'ort' strategy. + drivers/hte/Kconfig | 6 +++--- + drivers/hte/hte.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging kspp/for-next/kspp (0cc96f105d77e Merge branch 'for-next/hardening' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging arch/Kconfig +Auto-merging arch/s390/kernel/syscall.c +Auto-merging init/main.c +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + arch/Kconfig | 5 ++-- + arch/arm64/kernel/syscall.c | 11 -------- + arch/loongarch/kernel/syscall.c | 11 -------- + arch/powerpc/kernel/syscall.c | 16 ++--------- + arch/riscv/kernel/traps.c | 12 -------- + arch/s390/include/asm/entry-common.h | 8 ------ + arch/s390/kernel/syscall.c | 2 +- + arch/x86/entry/syscall_32.c | 4 +-- + arch/x86/entry/syscall_64.c | 2 +- + arch/x86/include/asm/entry-common.h | 12 -------- + include/linux/randomize_kstack.h | 54 +++++++++++++----------------------- + init/main.c | 9 +++++- + kernel/fork.c | 1 + + 13 files changed, 37 insertions(+), 110 deletions(-) +Merging nolibc/for-next (6285f0881ec68 tools/nolibc: rename sys_foo() functions to _sys_foo()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Merge made by the 'ort' strategy. + tools/include/nolibc/Makefile | 1 + + tools/include/nolibc/arch-arm.h | 14 +- + tools/include/nolibc/arch-arm64.h | 14 +- + tools/include/nolibc/arch-loongarch.h | 14 +- + tools/include/nolibc/arch-m68k.h | 14 +- + tools/include/nolibc/arch-mips.h | 33 +- + tools/include/nolibc/arch-powerpc.h | 14 +- + tools/include/nolibc/arch-riscv.h | 14 +- + tools/include/nolibc/arch-s390.h | 34 +- + tools/include/nolibc/arch-sh.h | 14 +- + tools/include/nolibc/arch-sparc.h | 26 +- + tools/include/nolibc/arch-x86.h | 68 +-- + tools/include/nolibc/compiler.h | 11 +- + tools/include/nolibc/crt.h | 26 + + tools/include/nolibc/dirent.h | 4 +- + tools/include/nolibc/err.h | 87 ++++ + tools/include/nolibc/errno.h | 4 + + tools/include/nolibc/fcntl.h | 12 +- + tools/include/nolibc/nolibc.h | 11 +- + tools/include/nolibc/poll.h | 8 +- + tools/include/nolibc/sched.h | 12 +- + tools/include/nolibc/signal.h | 2 +- + tools/include/nolibc/stackprotector.h | 8 +- + tools/include/nolibc/stdio.h | 535 +++++++++++++++------ + tools/include/nolibc/stdlib.h | 175 ++++--- + tools/include/nolibc/sys.h | 288 +++++------ + tools/include/nolibc/sys/ioctl.h | 6 +- + tools/include/nolibc/sys/mman.h | 24 +- + tools/include/nolibc/sys/mount.h | 8 +- + tools/include/nolibc/sys/prctl.h | 8 +- + tools/include/nolibc/sys/ptrace.h | 6 +- + tools/include/nolibc/sys/random.h | 6 +- + tools/include/nolibc/sys/reboot.h | 6 +- + tools/include/nolibc/sys/resource.h | 10 +- + tools/include/nolibc/sys/select.h | 10 +- + tools/include/nolibc/sys/stat.h | 8 +- + tools/include/nolibc/sys/syscall.h | 2 +- + tools/include/nolibc/sys/time.h | 8 +- + tools/include/nolibc/sys/timerfd.h | 24 +- + tools/include/nolibc/sys/uio.h | 12 +- + tools/include/nolibc/sys/utsname.h | 6 +- + tools/include/nolibc/sys/wait.h | 6 +- + tools/include/nolibc/time.h | 68 +-- + tools/include/nolibc/unistd.h | 12 +- + tools/testing/selftests/nolibc/Makefile | 4 +- + tools/testing/selftests/nolibc/Makefile.include | 5 +- + tools/testing/selftests/nolibc/Makefile.nolibc | 8 +- + .../selftests/nolibc/nolibc-test-ignore-errno.c | 6 + + tools/testing/selftests/nolibc/nolibc-test.c | 217 ++++++--- + 49 files changed, 1196 insertions(+), 717 deletions(-) + create mode 100644 tools/include/nolibc/err.h + create mode 100644 tools/testing/selftests/nolibc/nolibc-test-ignore-errno.c +Merging iommufd/for-next (67cb50aee0828 iommufd: update outdated comment for renamed iommufd_hw_pagetable_alloc()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Auto-merging drivers/iommu/iommufd/device.c +Auto-merging drivers/iommu/iommufd/pages.c +Auto-merging drivers/iommu/iommufd/selftest.c +Merge made by the 'ort' strategy. + drivers/iommu/iommufd/device.c | 2 +- + drivers/iommu/iommufd/pages.c | 2 +- + drivers/iommu/iommufd/selftest.c | 4 ++-- + drivers/iommu/iommufd/vfio_compat.c | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) +Merging turbostat/next (a23c1298f1593 tools/power turbostat: Cleanup print helper functions) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Merge made by the 'ort' strategy. + tools/power/x86/turbostat/turbostat.c | 91 ++++++++++++++++++++--------------- + 1 file changed, 53 insertions(+), 38 deletions(-) +Merging pwrseq/pwrseq/for-next (6de23f81a5e08 Linux 7.0-rc1) +$ git merge -m Merge branch 'pwrseq/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next +Already up to date. +Merging capabilities-next/caps-next (0715881360074 ipc: don't audit capability check in ipc_permissions()) +$ git merge -m Merge branch 'caps-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Already up to date. +$ git am -3 ../patches/0001-sign-file-Fix-up-merge-issue.patch +Applying: sign-file: Fix up merge issue +Using index info to reconstruct a base tree... +M scripts/sign-file.c +Falling back to patching base and 3-way merge... +Auto-merging scripts/sign-file.c +No changes -- Patch already applied. +Merging ipe/next (f37070985ed91 docs: security: ipe: fix typos and grammar) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next +Merge made by the 'ort' strategy. + Documentation/security/ipe.rst | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) +Merging kcsan/next (dcb6fa37fd7bc Linux 6.18-rc3) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next +Already up to date. +Merging crc/crc-next (63432fd625372 lib/crc: arm64: add NEON accelerated CRC64-NVMe implementation) +$ git merge -m Merge branch 'crc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next +Auto-merging tools/testing/kunit/configs/all_tests.config +Merge made by the 'ort' strategy. + crypto/crc32c.c | 19 +------ + lib/crc/.kunitconfig | 3 ++ + lib/crc/Kconfig | 24 ++++++--- + lib/crc/Makefile | 8 ++- + lib/crc/arm64/crc64-neon-inner.c | 78 ++++++++++++++++++++++++++++ + lib/crc/arm64/crc64.h | 30 +++++++++++ + lib/crc/tests/crc_kunit.c | 28 +++++++--- + tools/testing/kunit/configs/all_tests.config | 2 + + 8 files changed, 160 insertions(+), 32 deletions(-) + create mode 100644 lib/crc/.kunitconfig + create mode 100644 lib/crc/arm64/crc64-neon-inner.c + create mode 100644 lib/crc/arm64/crc64.h +Merging keys-next/keys-next (965e9a2cf23b0 pkcs7: Change a pr_warn() to pr_warn_once()) +$ git merge -m Merge branch 'keys-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys-next/keys-next +Already up to date. +Merging fwctl/for-next (f2cfe848d5618 fwctl/bnxt_fwctl: Add documentation entries) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/infiniband/hw/bnxt_re/main.c +Auto-merging drivers/infiniband/hw/bnxt_re/qplib_fp.c +Auto-merging drivers/infiniband/hw/bnxt_re/qplib_res.h +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.h +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +Merge made by the 'ort' strategy. + Documentation/userspace-api/fwctl/bnxt_fwctl.rst | 74 +++++ + Documentation/userspace-api/fwctl/fwctl.rst | 1 + + Documentation/userspace-api/fwctl/index.rst | 1 + + MAINTAINERS | 6 + + drivers/fwctl/Kconfig | 11 + + drivers/fwctl/Makefile | 1 + + drivers/fwctl/bnxt/Makefile | 4 + + drivers/fwctl/bnxt/main.c | 281 +++++++++++++++++ + drivers/infiniband/hw/bnxt_re/debugfs.c | 2 +- + drivers/infiniband/hw/bnxt_re/main.c | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 49 +-- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 19 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 10 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 345 +++++++++++++-------- + .../bnxt/bnxt_ulp.h => include/linux/bnxt/ulp.h | 26 +- + include/uapi/fwctl/bnxt.h | 26 ++ + include/uapi/fwctl/fwctl.h | 1 + + 21 files changed, 695 insertions(+), 174 deletions(-) + create mode 100644 Documentation/userspace-api/fwctl/bnxt_fwctl.rst + create mode 100644 drivers/fwctl/bnxt/Makefile + create mode 100644 drivers/fwctl/bnxt/main.c + rename drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h => include/linux/bnxt/ulp.h (86%) + create mode 100644 include/uapi/fwctl/bnxt.h +Merging devsec-tsm/next (43185067c6fd5 configfs-tsm-report: tdx_guest: Increase Quote buffer size to 128KB) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next +Already up to date. +Merging hisilicon/for-next (b419e155e31d9 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/hisilicon/linux-hisi.git hisilicon/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 4 ++-- + arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 4 ++-- + arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts | 2 +- + arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 1 + + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 6 +++--- + drivers/soc/hisilicon/kunpeng_hccs.c | 7 +++---- + 6 files changed, 12 insertions(+), 12 deletions(-) +Merging kthread/for-next (fa39ec4f89f26 doc: Add housekeeping documentation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..b87e1566cb15 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20260330 |