diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-08-15 21:42:46 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-08-15 21:42:46 +1000 |
| commit | 98297fc6ecafc0c7eabc5d869279fb27609fcdc1 (patch) | |
| tree | 31c74b7bb0473da7d039cc633466e5508f9004bb | |
| parent | 4e9e4ce00feaacfc58f9df94848c5dd3fd08ba60 (diff) | |
Add linux-next specific files for 20230815next-20230815
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 368 | ||||
| -rw-r--r-- | Next/Trees | 370 | ||||
| -rw-r--r-- | Next/merge.log | 14975 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 15714 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ab4e5fd31185 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,368 @@ +Name SHA1 +---- ---- +origin 2ccdd1b13c591d306f0401d98dedc4bdcd02b421 +fixes d528014517f2b0531862c02865b9d4c908019dc4 +mm-hotfixes 7a8abf373f29d97c84a1ee860cee9f33233b47fa +kbuild-current 6ccbd7fd474674654019a20177c943359469103a +arc-current 4d3696801bad2a037832c15a8d21dfe0c529d9cd +arm-current 6995e2de6891c724bfeb2db33d7b87775f913ad1 +arm64-fixes 69af56ae56a48a2522aad906c4461c6c7c092737 +arm-soc-fixes 6e6d847a8ce18ab2fbec4f579f682486a82d2c6b +davinci-current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory-fixes faafd6ca7e6e7100d21d3f43ec17674f36c9f843 +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current 922a9bd138101e3e5718f0f4d40dba68ef89bb43 +powerpc-fixes 86582e6189dd8f9f52c25d46c70fe5d111da6345 +s390-fixes 388acb471662c273d94163a8502f09668f380686 +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net 855067defa36b1f9effad8c219d9a85b655cf500 +bpf 9ebbb29db9cae23e29881b9a268767d4baa53cdb +ipsec f3ec2b5d879ef5bbcb24678914641343cb6399a2 +netfilter cc941e548bffc01b5816b4edc5cb432a137a58b3 +ipvs 829c6524d6729d05a82575dbcc16f99be5ee843d +wireless 06f2ab86a5b6ed55f013258de4be9319841853ea +wpan 9a43827e876c9a071826cc81783aa2222b020f1d +rdma-fixes 2ccdd1b13c591d306f0401d98dedc4bdcd02b421 +sound-current 7c761166399bedfc89c928bef8015546d85a9099 +sound-asoc-fixes 8a60e83d19a730fe11ce80184eb6430e20eb5c13 +regmap-fixes 52a93d39b17dc7eb98b6aa3edb93943248e03b2f +regulator-fixes b81f77a4fa887c7af0386d73113d40f2d2a6d953 +spi-fixes e5baf3f03be895f27f697ffee5e59757ff0256a5 +pci-current cc22522fd55e257c86d340ae9aedc122e705a435 +driver-core.current 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +tty.current 04c7f60ca477ffbf7b7910320482335050f0d23a +usb.current 2ccdd1b13c591d306f0401d98dedc4bdcd02b421 +usb-serial-fixes d245aedc00775c4d7265a9f4522cc4e1fd34d102 +phy 52a93d39b17dc7eb98b6aa3edb93943248e03b2f +staging.current 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +iio-fixes 34477b2d710ad203eb67103806970b2c21e718ec +counter-current aead78125a987f48944bff2001f61df72b95afc4 +char-misc.current 2ccdd1b13c591d306f0401d98dedc4bdcd02b421 +soundwire-fixes 52a93d39b17dc7eb98b6aa3edb93943248e03b2f +thunderbolt-fixes 2ccdd1b13c591d306f0401d98dedc4bdcd02b421 +input-current eb09074bdb05ffd6bfe77f8b4a41b76ef78c997b +crypto-current 0b7ec177b589842c0abf9e91459c83ba28d32452 +vfio-fixes 4752354af71043e6fd72ef5490ed6da39e6cab4a +kselftest-fixes 569f8b501b177f21121d483a96491716ab8905f4 +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes 422dbc66b7702ae797326d5480c3c9b6467053da +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes c6abce60338aa2080973cd95be0aedad528bb41f +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 2908042a37b56d6a9a595eca946e187e9d2df39a +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 6eaae198076080886b9e7d57f4ae06fa782f90ef +at91-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes d5ad9aae13dcced333c1a7816ff0a4fbbb052466 +kvms390-fixes c2fceb59bbda16468bda82b002383bff59de89ab +hwmon-fixes 56b930dcd88c2adc261410501c402c790980bdb5 +nvdimm-fixes e98d14fa7315867fded127a98db355f49807dfdb +cxl-fixes ad64f5952ce3ea565c7f76ec37ab41df0dde773a +btrfs-fixes 02aff77b978ef05e09c3be052a5fbf093e8b4b0c +vfs-fixes 609d54441493c99f21c1823dfd66fa7f4c512ff4 +dma-mapping-fixes bbb73a103fbbed6f63cb738d3783261c4241b4b2 +drivers-x86-fixes 2b6aa6610dc9690f79d305ca938abfb799a4f766 +samsung-krzk-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pinctrl-samsung-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +devicetree-fixes ffc59c6414f9ffd52591786efe3e62e145563deb +dt-krzk-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +scsi-fixes ef222f551e7c4e2008fc442ffc9edcd1a7fd8f63 +drm-fixes 2ccdd1b13c591d306f0401d98dedc4bdcd02b421 +drm-intel-fixes 423ffe62c06ae241ad460f4629dddb9dcf55e060 +mmc-fixes cf3f15b8c6601c1dc70f85949788ee993dd9a439 +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes fdf0eaf11452d72945af31804e2a1048ee1b574c +hyperv-fixes 6ad0f2f91ad14ba0a3c2990c054fd6fbe8100429 +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes 7e3811521dc3934e2ecae8458676fc4a1f62bf9f +riscv-dt-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +riscv-soc-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +fpga-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +spdx fdf0eaf11452d72945af31804e2a1048ee1b574c +gpio-brgl-fixes 2fc8d02058dbec258039c3253ebd1f124766a796 +gpio-intel-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pinctrl-intel-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +erofs-fixes 4da3c7183e186afe8196160f16d5a0248a24e45d +kunit-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 9e46e4dcd9d6cd88342b028dbfa5f4fb7483d39c +nfsd-fixes c96e2a695e00bca5487824d84b85aab6aa2c1891 +irqchip-fixes 6fe5c68ee6a1aae0ef291a56001e7888de547fa2 +renesas-fixes 4c188fa183ebb45238ef16504c4c7606955cf9d4 +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 374a7f47bf401441edff0a64465e61326bf70a82 +efi-fixes 36e4fc57fc1619f462e669e939209c45763bc8f5 +zstd-fixes 6906598f1ce93761716d780b6e3f171e13f0f4ce +battery-fixes 205f4cf3136fc0bdac5e963a219ae6f115496a14 +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes b7c822fa6b7701b17e139f1c562fc24135880ed4 +rust-fixes 3fa7187eceee11998f756481e45ce8c4f9d9dc48 +v9fs-fixes e6ab0b914c12acefbb0880dded48cb930ccab5cf +w1-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +genpd-fixes 12acb348fa4528a4203edf1cce7a3be2c9af2279 +i2c-host-fixes 9a5adaf694f5ae8ba8f8e6178d01b5950fc7222a +drm-misc-fixes e8470c0a7bcaa82f78ad34282d662dd7bd9630c2 +mm-stable 5fb2ea3111f4ecc6dc4891ce5b00f0217aae9a04 +mm-nonmm-stable 290931e2b83cd254823f47ceeb796a37109b7a65 +mm f8a7ed854c1a66b1984a64baf0ece09e44552fab +kbuild 45a7371d5be21c174be201b8cde0e91b0357c606 +clang-format 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +perf 55b290501928bb2648978257e7a00fc3a64b15fa +compiler-attributes 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +dma-mapping d069ed288ac74c24e2b1c294aa9445c80ed6c518 +asm-generic cdea694d7616727c2028ddac4d05ce4454d2e1db +arc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +arm a6f307c20d649e5f1da280bee7ed160de74de2ff +arm64 78a2dc32d20ac84b014bc2f07417280b66b4caf7 +arm-perf ac18ea1a8935920a6b3284f24e58f903b95dac20 +arm-soc eac502461628e2e54be844a2f3e2d583dd273e17 +amlogic f590814603bf2dd8620584b7d59ae94d7c186c69 +asahi-soc eaf935fa48ec826f7c564c269a607cb4fba082b3 +aspeed 8eb02f6fdd011c60ffe97ebb4f157289e759a2e5 +at91 b04dba7c1c30a172e93a0b1c9f450076945ef546 +broadcom a70e8c9ff89a809cfd0402e8c506c240eca65468 +davinci 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory 35bd78cf252245f11dd1c9d5f1b414c25e727b5a +imx-mxs 246e2cc22265e395e9e8880d957e99b66f5a2ac3 +mediatek f6925844c82ae23165097eb14e272f76b855fb5d +mvebu a8e364c2c4285e78128eac157ddb27915026689f +omap ca55cf3d7b527f479400da7ec6900c1005067058 +qcom b9a263d90a2c71ff397c769fb0fe07386cb4512f +renesas 13512fa6af4abcdd8645daabd4ad22576694c7a5 +reset 417a3a5ae44a14b4eeb3df514b2c006b19771f82 +rockchip bcd6a683ddaab9ca382cdafd3b9ff0899be418d9 +samsung-krzk 4124fbc4b4b1d7f5e4b5c3a2aa1a15db75dc9744 +scmi 45e5b76801e198fe00b4116658391f6334d612f2 +stm32 06113b7ac2dfe2eff8f1f8d901924d6710528d79 +sunxi aa333f5e8461bae5e1a7888b0ca8672dccba3721 +tee 6a8b7e80105416cc7324fda295608ea2d3f98862 +tegra 77a4cfe28fb8977e302fb76b43af6f69a277d175 +ti d0857dc9b22de3754375278c6420a970496d42aa +xilinx 7cd073eddcd423daae1b8845a3e7fcf45bc6aa2c +clk bd0f09c12e99c5f1b53b4480706c52875f697df3 +clk-imx 72d00e560d10665e6139c9431956a87ded6e9880 +clk-renesas dec57795efc4585d5bbca913af6683c5cce2a647 +csky c8171a86b27401aa1f492dd1f080f3102264f1ab +loongarch 5020c5f9d5f72b4ce537df61345b1db94b4c9d65 +m68k 922a9bd138101e3e5718f0f4d40dba68ef89bb43 +m68knommu 7c53e18ee74e6817c732bdc0c8a1791a2741784c +microblaze 0e9a2a228a1ac80053d9817a8af68abcd754675e +mips f11a9967413281b49690d864795e7c5f8f8e4fda +openrisc 232ba1630c666b37a5045781e6513cba607fb0d5 +parisc-hd 7a894c87374771f3cfb1b8e5453fbe03f1fb8135 +powerpc cd50430ceb3598957803934068531a274349bcf9 +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v 174e8ac0272d54a9c1cc23185665f715c36620ad +riscv-dt f331eb1f5454123f3cec51c18a3d86c2a53bddb9 +riscv-soc 30fb4784483b41ba7169432e594e6a96d7cbe4e0 +s390 63b9eab21ad8d029b33e7c6364eeacef050c554e +sh 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +uml 6032aca0deb9c138df122192f8ef02de1fdccf25 +xtensa a160e9414d8a1747225206558b24d7df513b3c8d +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 324718ddddc40905f0216062dfbb977809184c06 +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs 6099857b7d15f86281f8ededa28eb6652ece5d83 +ceph e6e2843230799230fc5deb8279728a7218b0d63c +cifs 7b38f6ddc97bf572c3422d3175e8678dd95502fa +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs c23df8256b55297179aa7c0d874e8a82e1e443fd +exfat ff84772fd45d486e4fc78c82e2f70ce5333543e6 +ext3 70a58515e2ff123ef1bedf549d4288e7b9efa1a4 +ext4 9d3de7ee192a6a253f475197fe4d2e2af10a731f +f2fs 0cc81b1ad51287847e494e055e5d3426f95e7921 +fsverity adcb53e3ee055d0f9f241fe84c72d339a6d72dad +fuse 91ec6c85599b60c00caf4e9a9d6c4d6e5dd5e93c +gfs2 9f9a7f057f079977fe587811c21cdc35689995b8 +jfs 6e2bda2c192d0244b5a78b787ef20aa10cb319b7 +ksmbd cdd143e4c508adec91c4076176dbc06715e4abfd +nfs 5b4a82a0724af1dfd1320826e0266117b6a57fbd +nfs-anna 43439d858bbae244a510de47f9a55f667ca4ed52 +nfsd f5797323270df25ad9a2f3c40107d84bed1f164f +ntfs3 44b4494d5c5971dc8f531c8783d90a637e862880 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs adcd459ff805ce5e11956cfa1e9aa85471b6ae8d +ubifs b5fda08ef213352ac2df7447611eb4d383cce929 +v9fs 4ec5183ec48656cec489c49f989c508b68b518e3 +v9fs-ericvh 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +xfs f6250e205691a58c81be041b1809a2e706852641 +zonefs 8812387d056957355ef1d026cd38bed3830649db +iomap 377698d4abe2cd118dd866d5ef19e2f1aa6b9758 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks 72bb0abc34923c207eab2e3f15114b3aed89a795 +iversion 63355b9884b3d1677de6bd1517cd2b8a9bf53978 +vfs-brauner 24a62491bb899b1b2343e2ddf7e2a580241ea759 +vfs cff4b23c731a1cbdf39d5ce180196b8dffb6c411 +printk b7661f87eda0a428a1a3472fbaf21eb24a5a6cf1 +pci b2c47cd736296cbb8d5a15a5ffb089a615e3d033 +pstore fe8c3623ab06603eb760444a032d426542212021 +hid c4cc8dab2d330c064859253d045ff6c3fa8c6d64 +i2c 8ab7725b6bfb44d4c60675786ce247cdbca2275d +i2c-host 7a34bab2daeaae6d2f32bdfa20b876a8f210cd7a +i3c 300098637900f7ff99cafed2be7221407b82df83 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging fc8df28be7155ddcf8731b4c85fd3372811ba5ac +jc_docs 90cd0c18573ad0583dec098a586f86d281947eb9 +v4l-dvb 29006e196a5661d9afc8152fa2bf8a5347ac17b4 +v4l-dvb-next b7ec3212a73abc987e8f33aa42988e6c39c38c92 +pm e8cde28ba5123d05b6d2639ba8e0a3e0b96b37e0 +cpufreq-arm d3dec5bb61ce113cc84146bf4a72f752256d3767 +cpupower 99481d2195bfd13a663904e6014887abf46b57c7 +devfreq 5693d077595de721f9ddbf9d37f40e5409707dfe +genpd fe38a2d570df3ed868c255fdad16652886997a08 +opp c2add32ce452e216f5b80269fe73d11be1e2c9a5 +thermal 57c9eaa4de537e6f08819d9214de502cac5a989c +dlm a3d85fcf268ea40c024e864b219b72516236d15b +rdma d952f54d01ec2ea5ee9d5e21f2ea3a5807b4bcbc +net-next 479b322ee6feaff612285a0e7f22c022e8cd84eb +bpf-next 83a89c4b6ae93481d3f618aba6a29d89208d26ed +ipsec-next a94fd40a18ae76ba76dbaa8eca0e3c46aa1142c1 +mlx5-next 2d297d20ace8c544bcc74a2ed5f3536add3a7a69 +netfilter-next b98a5aa7e4c20d6e4d9062ee0f0156ff3ad300fa +ipvs-next b98a5aa7e4c20d6e4d9062ee0f0156ff3ad300fa +bluetooth b5793de3cfaefef34a1fc9305c9fe3dbcd0ac792 +wireless-next 81083076a007d3af3f2216ad9be1374de0687d49 +wpan-next 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +wpan-staging 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +mtd 264725e35fbc3b67e053a405e022393a6017e6da +nand 3549fecd10d24bcf9840ba2f7d6a0b5f57feed6f +spi-nor aa517a29d6457e8afcbe8e7e9eb8813594c39d1f +crypto 91cb1e1432b3d873a0c8831d0dd8022db98ac8b8 +drm 2b9d7b6515220c30a596aba5633d675117f96500 +drm-misc f5d8f9c0d8b4bc8ad7e7b23a9f4d116e99202dd3 +amdgpu 6be2ad4f0073c541146caa66c5ae936c955a8224 +drm-intel 95c23e2085f28e2c763ca202fdc37a1392982c16 +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm d93cf453f51da168f4410ba73656f1e862096973 +drm-msm-lumag d93cf453f51da168f4410ba73656f1e862096973 +etnaviv 88c31d2dd191ab78e9ba9ff967845018aa7ee214 +fbdev 87ac8777d424677bb72a4544be4a8926a33c3070 +regmap 26fc7cfa30d6e1d0e5a0e6fd0022de8720a58e30 +sound ff7a0b4016cb349f9148d0bf9c664e604167128c +ieee1394 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +sound-asoc 52a3cd64f03bd65ba56e8126e64cad7ec4327b50 +modules a6846234f45801441f0e31a8b37f901ef0abd2df +input 54116d442e001e1b6bd482122043b1870998a1f3 +block bc1b17592bbd2486152fa32059392d047d6c1216 +device-mapper 1e4ab7b4c881cf26c1c72b3f56519e03475486fb +libata caea958926c33c72fd1c91b892feca82314e27e5 +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 13433b9e2723947d636fb09fda68948b77833077 +mfd 3d2b5d02738ee802f44f3f9c6ae8932e548188d6 +backlight fe1328b5b2a087221e31da77e617f4c2b70f3b7f +battery 7e6311f04b41174ccc738d37dcb4b93cd4de98b0 +regulator 4483b65be2c2b32fbe5b09bddb4069ac27fab0bd +security 6672efbb685f7c9c9df005beb839e1942fd6b34e +apparmor efea5b0dcc433df6e7d74605d37813d69f99bef0 +integrity 55e2b69649be38f1788b38755070875b96111d2f +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux e49be9bc7c1bd1125933f42a157ca9a2812e3797 +smack 3ad49d37cf5759c3b8b68d02e3563f633d9c1aee +tomoyo 254a8ed6aab39c869d99da97f25035ed15756337 +tpmdd 2ccdd1b13c591d306f0401d98dedc4bdcd02b421 +watchdog 8a504bd61ec7b3ddd72680e15775f2c7c0f9e894 +iommu b2b57855813d111c3fe052fe62f68919dac5d206 +audit b59bc6e37237e37eadf50cd5de369e913f524463 +devicetree 2b9583244aad15020af376bce7113a8978e0bd5c +dt-krzk f418e00ab4338216ad6dd9caff7e6e759151b77c +mailbox 1b712f18c461bd75f018033a15cf381e712806b5 +spi a9ca0d5d50063419467cbe954ff38240b849cdfb +tip 855484a68d16ed8daf563e3b154787e8330b5bbd +clockevents 8b5bf64c89c7100c921bd807ba39b2eb003061ab +edac ce53ad81ed36c24aff075f94474adecfabfcf239 +irqchip a82f3119d543406ed5b242deabf83cdecb9fe523 +ftrace 7c1130ea5cae215588e6d51242b877fd405e6c32 +rcu 13e3e81ac928d25bafd2787203f50597dc6a1e02 +kvm d5ad9aae13dcced333c1a7816ff0a4fbbb052466 +kvm-arm 3b4e3afb2032fdc86b585b0de34d226b9e87e445 +kvms390 b275d8313217b4648855de673a946662bd4c197e +kvm-riscv 477069398ed6e0498ee243e799cb6c68baf6ccb8 +kvm-x86 240f736891887939571854bd6d734b6c9291f22e +xen-tip c04e9894846c663f3278a414f34416e6e45bbe68 +percpu abf773b6fafc51af7588532120dcb7c0d3f760fd +workqueues c076af902bdf17e1f0fa095dac47e81a28288ed5 +drivers-x86 65c6ea33e7f63799090158866cdcfdfe8d63ce16 +chrome-platform 0820debb7d489e9eb1f68b7bb69e6ae210699b3f +chrome-platform-firmware 0979e7e3cfd7b479c34dc0f7217beb0c30f8028a +hsi 7ebf243a201856adcac240e490596bb908ee5fcc +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 841165267827955bb3295b066cb6a906ba9265c0 +ipmi b02bb79eee074f07acdfde540f2d4fe2a04471d8 +driver-core 0ce7c12e88cfa3e4cb0800e8172e5befea5c199a +usb bbb9e06d2c6435af9c62074ad7048910eeb2e7bc +thunderbolt a3f6445842e581233fbd19baad661dbba6d1fd58 +usb-serial 974e2f6a0554685493cc44406bc7d8ba0a3b0e33 +tty e67d7f60d2382677c25de10b2e4d8d3717ace91f +char-misc e75850b4573a092078d5ff1493d3d9ee16b98821 +accel ef8b0cb1ba370231f155c1579a602b698a9f6650 +coresight 484281bd5b989a31c1045786e326084652ea49a0 +fastrpc 64227235abd9a3ebfb5927dff2202771ffc92b8b +fpga 1a22ec09a2c1d367a43cb7f837c7a8719e7fe975 +icc 768c42cd9acb87691dd7ec12d6a9afc20903918a +iio 14b7447cec15ee8dfdfe0da66ba1e280ded7e00a +phy-next 7451eecf1ef8be9911749e927ce5690262cc9197 +soundwire e66f91a2d10b9a25eedcaddee9d6f08c8132760a +extcon d20a3a8a32e3fa564ff25da860c5fc1a97642dfe +gnss fdf0eaf11452d72945af31804e2a1048ee1b574c +vfio 73e2f19da50857a3488f44a7c9d874fed6fae533 +w1 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +staging 656ae4f48a6f7110f58fc1bbcc7eab04ba19f802 +counter-next 71ab2f343f1f968092c74dde93648f55ec3af117 +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 0f264ab788ed9a39aabb36c0b35e5821b94bcdc8 +cgroup 82b90b6c5b38e457c7081d50dff11ecbafc1e61a +scsi 7da4622a53eaaf9321b3cecfb60fc9b1ae8cc24e +scsi-mkp a18e81d17a7e634420e589fa504e79e4893cde5e +vhost 1a08d66726dc4c1cc1ef826c106929e55f1d4083 +rpmsg af2010496de7bcb8980f5169d41725be99bfe7da +gpio ac9a78681b921877518763ba0e89202254349d1b +gpio-brgl a40fe1ffb69b709835a0623959f95d6c81ff38c1 +gpio-intel 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pinctrl dfe014e7b5bc2930c0afad1d4681f98135d363d9 +pinctrl-intel 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pinctrl-renesas 95eb19869401850f069723b296170b8b3bd5be9e +pinctrl-samsung 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +pwm 3ccb179aa40d931eb00ef8910d7b812a95659563 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest 2b2fe6052dd01fdb4e9a31031c2c9d8f03cf7753 +kunit 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +kunit-next 582eb3aeed2d06b122fba95518b84506d3d4ceb9 +livepatching ac4890f972116f84253934570b2c2a74e50227f3 +rtc 4f3688dca15053555ade31a785a9c75837a64fb8 +nvdimm feb72e9b20823419aaed57801018eeffc7be7e82 +at24 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +ntb 994def29acc5d8cc5b513fc67a75aa79b059dbe8 +seccomp fbc5d382407eb5d6a2eeef245cc2ca278d590645 +fsi f432b1cf7820020ada05cf3bef080893ef2bd69a +slimbus 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +nvmem c8efcf7a86ebf2ff48584d270b3070a7075bc345 +xarray cbc02854331edc6dc22d8b77b6e22e38ebc7dd51 +hyperv 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +auxdisplay def85dce1451ec276b8047da2010b6e6a159c2b6 +kgdb b6464883f45ae6412de33e53587974fd86ba811e +hmm 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi 0724869ede9c169429bb622e2d28f97995a95656 +memblock 0f5e4adb608c79bedd8ced30f9ffdcfa01c37459 +cxl fe77cc2e5a6a7c85f5c6ef8a39d7694ffc7f41c9 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi f6e6e95ce16205025b7b8680a66c30a0c4ec2270 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 66489e5487b7157c457d84ed23cd6306e811df07 +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock 35ca4239929737bdc021ee923f97ebe7aff8fcc4 +rust 08ab786556ff177086ce93b26daf2a58edd10968 +sysctl d6ea45102f2226759a422b31e73ba48db8ec171d +execve fdf0eaf11452d72945af31804e2a1048ee1b574c +bitmap 5b914afcd1666817456f0961a33b49dd20cc508c +hte ac9a78681b921877518763ba0e89202254349d1b +kspp 429e2140a119c3e2ebc3dcd668d5e85124e53e90 +kspp-gustavo 4d8cbf6dbcdaebe949461b0a933ae4c71cb53edc +nolibc 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +iommufd 23a1b46f15d57583927742738579363f179942b1 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..4717f04daa3f --- /dev/null +++ b/Next/Trees @@ -0,0 +1,370 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +wpan git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git https://git.linuxtv.org/media_stage.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools#perf-tools +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +asahi-soc-fixes git https://github.com/AsahiLinux/linux.git#asahi-soc/fixes +iommufd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes git https://github.com/Rust-for-Linux/linux.git#rust-fixes +v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +w1-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +genpd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +i2c-host-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/andi-for-current +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc git https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +broadcom git https://github.com/Broadcom/stblinux.git#next +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +uml git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +v9fs-ericvh git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs-brauner git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i2c-host git https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/andi-for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +genpd git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +wpan-next git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 git https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-riscv git https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 git https://github.com/kvm-x86/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +chrome-platform-firmware git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +leds-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc git git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +w1 git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +nolibc git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#nolibc +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..5eb9d1e515ef --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,14975 @@ +$ date -R +Tue, 15 Aug 2023 09:40:16 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 57% (5352/9239)
Updating files: 58% (5359/9239)
Updating files: 59% (5452/9239)
Updating files: 60% (5544/9239)
Updating files: 61% (5636/9239)
Updating files: 62% (5729/9239)
Updating files: 63% (5821/9239)
Updating files: 64% (5913/9239)
Updating files: 65% (6006/9239)
Updating files: 66% (6098/9239)
Updating files: 67% (6191/9239)
Updating files: 68% (6283/9239)
Updating files: 69% (6375/9239)
Updating files: 70% (6468/9239)
Updating files: 71% (6560/9239)
Updating files: 72% (6653/9239)
Updating files: 73% (6745/9239)
Updating files: 74% (6837/9239)
Updating files: 75% (6930/9239)
Updating files: 76% (7022/9239)
Updating files: 77% (7115/9239)
Updating files: 78% (7207/9239)
Updating files: 79% (7299/9239)
Updating files: 80% (7392/9239)
Updating files: 81% (7484/9239)
Updating files: 82% (7576/9239)
Updating files: 83% (7669/9239)
Updating files: 84% (7761/9239)
Updating files: 85% (7854/9239)
Updating files: 86% (7946/9239)
Updating files: 87% (8038/9239)
Updating files: 88% (8131/9239)
Updating files: 89% (8223/9239)
Updating files: 90% (8316/9239)
Updating files: 91% (8408/9239)
Updating files: 92% (8500/9239)
Updating files: 93% (8593/9239)
Updating files: 94% (8685/9239)
Updating files: 95% (8778/9239)
Updating files: 96% (8870/9239)
Updating files: 97% (8962/9239)
Updating files: 98% (9055/9239)
Updating files: 99% (9147/9239)
Updating files: 100% (9239/9239)
Updating files: 100% (9239/9239), done. +HEAD is now at 02aee814d37c Merge tag 'gfs2-v6.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 +Merging origin/master (2ccdd1b13c59 Linux 6.5-rc6) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 02aee814d37c..2ccdd1b13c59 +Fast-forward (no commit created; -m option ignored) + Documentation/ABI/testing/sysfs-platform-hidma | 2 +- + .../ABI/testing/sysfs-platform-hidma-mgmt | 20 +- + Documentation/admin-guide/hw-vuln/index.rst | 14 +- + Documentation/admin-guide/hw-vuln/srso.rst | 71 +++-- + .../devicetree/bindings/iio/addac/adi,ad74115.yaml | 3 - + MAINTAINERS | 30 +- + Makefile | 2 +- + arch/alpha/include/asm/processor.h | 13 - + arch/alpha/kernel/setup.c | 3 +- + arch/arm64/include/asm/processor.h | 8 - + arch/ia64/include/asm/processor.h | 3 - + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 2 - + arch/parisc/Kconfig.debug | 2 +- + arch/parisc/boot/compressed/misc.c | 10 +- + arch/parisc/include/asm/dma.h | 2 + + arch/parisc/include/asm/ftrace.h | 4 + + arch/parisc/include/asm/spinlock.h | 2 - + arch/parisc/include/asm/spinlock_types.h | 6 + + arch/parisc/kernel/firmware.c | 8 +- + arch/parisc/kernel/ftrace.c | 2 +- + arch/parisc/kernel/parisc_ksyms.c | 7 +- + arch/parisc/kernel/pci-dma.c | 4 +- + arch/parisc/kernel/pdt.c | 4 +- + arch/parisc/kernel/perf.c | 2 +- + arch/parisc/kernel/processor.c | 1 + + arch/parisc/kernel/setup.c | 48 ---- + arch/parisc/kernel/signal.c | 2 +- + arch/parisc/kernel/sys_parisc.c | 15 +- + arch/parisc/kernel/syscall.S | 23 +- + arch/parisc/kernel/unaligned.c | 1 + + arch/parisc/lib/ucmpdi2.c | 3 +- + arch/parisc/mm/fault.c | 50 ++-- + arch/parisc/mm/init.c | 4 - + arch/parisc/mm/ioremap.c | 9 +- + arch/powerpc/include/asm/processor.h | 3 - + arch/riscv/include/asm/cacheflush.h | 4 + + arch/riscv/include/asm/mmio.h | 16 +- + arch/riscv/include/asm/pgtable.h | 2 + + arch/riscv/include/asm/vmalloc.h | 4 +- + arch/riscv/kernel/cpu.c | 5 + + arch/riscv/kernel/elf_kexec.c | 3 +- + arch/riscv/kernel/smp.c | 5 - + arch/riscv/mm/init.c | 16 +- + arch/riscv/mm/kasan_init.c | 1 - + arch/sparc/include/asm/processor_64.h | 3 - + arch/x86/boot/compressed/idt_64.c | 9 +- + arch/x86/boot/compressed/sev.c | 39 ++- + arch/x86/entry/vdso/vma.c | 4 +- + arch/x86/include/asm/acpi.h | 2 + + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/linkage.h | 2 +- + arch/x86/include/asm/processor.h | 10 +- + arch/x86/include/asm/segment.h | 2 +- + arch/x86/kernel/acpi/boot.c | 4 + + arch/x86/kernel/cpu/amd.c | 20 ++ + arch/x86/kernel/traps.c | 2 + + arch/x86/kernel/vmlinux.lds.S | 12 +- + arch/x86/kvm/x86.c | 2 - + block/blk-core.c | 6 - + block/blk-iocost.c | 5 +- + block/fops.c | 7 +- + drivers/accel/ivpu/ivpu_gem.c | 8 + + drivers/acpi/resource.c | 64 +++++ + drivers/acpi/scan.c | 1 + + drivers/android/binder.c | 1 + + drivers/android/binder_alloc.c | 6 + + drivers/android/binder_alloc.h | 1 + + drivers/base/cpu.c | 91 ++---- + drivers/block/zram/zram_drv.c | 32 ++- + drivers/char/tpm/tpm-chip.c | 19 +- + drivers/char/tpm/tpm_tis.c | 4 +- + drivers/counter/Kconfig | 14 +- + drivers/cpufreq/amd-pstate.c | 10 +- + drivers/cpuidle/cpuidle-psci-domain.c | 39 +-- + drivers/cpuidle/dt_idle_genpd.c | 24 ++ + drivers/cpuidle/dt_idle_genpd.h | 7 + + drivers/dma/Kconfig | 2 + + drivers/dma/idxd/device.c | 4 +- + drivers/dma/mcf-edma.c | 13 +- + drivers/dma/owl-dma.c | 2 +- + drivers/dma/pl330.c | 18 +- + drivers/dma/xilinx/xdma.c | 6 +- + drivers/gpio/gpio-sim.c | 1 + + drivers/gpio/gpio-ws16c48.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 ++ + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 15 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 4 - + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 13 - + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 8 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 2 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 7 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 20 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 5 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 12 +- + drivers/gpu/drm/bridge/ite-it6505.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 4 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 6 + + drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 48 +++- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110.c | 10 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110b.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk208.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/tu102.c | 13 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 17 +- + drivers/hwmon/aquacomputer_d5next.c | 37 ++- + drivers/hwmon/pmbus/bel-pfe.c | 16 +- + drivers/iio/adc/ad7192.c | 16 +- + drivers/iio/adc/ina2xx-adc.c | 9 +- + drivers/iio/adc/meson_saradc.c | 23 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 2 +- + drivers/iio/frequency/admv1013.c | 5 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 +- + drivers/iio/industrialio-core.c | 5 +- + drivers/iio/light/rohm-bu27008.c | 22 +- + drivers/iio/light/rohm-bu27034.c | 22 +- + drivers/infiniband/core/umem.c | 3 +- + drivers/infiniband/hw/bnxt_re/main.c | 4 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 1 + + drivers/infiniband/hw/hfi1/chip.c | 1 + + drivers/interconnect/qcom/bcm-voter.c | 5 + + drivers/interconnect/qcom/icc-rpmh.h | 2 + + drivers/interconnect/qcom/sa8775p.c | 1 + + drivers/interconnect/qcom/sm8450.c | 9 + + drivers/interconnect/qcom/sm8550.c | 17 ++ + drivers/isdn/mISDN/dsp.h | 2 +- + drivers/isdn/mISDN/dsp_cmx.c | 2 +- + drivers/isdn/mISDN/dsp_core.c | 2 +- + drivers/media/platform/qcom/venus/hfi_cmds.c | 4 +- + drivers/misc/cardreader/rts5227.c | 2 +- + drivers/misc/cardreader/rts5228.c | 18 -- + drivers/misc/cardreader/rts5249.c | 3 +- + drivers/misc/cardreader/rts5260.c | 18 -- + drivers/misc/cardreader/rts5261.c | 18 -- + drivers/misc/cardreader/rtsx_pcr.c | 5 +- + drivers/misc/tps6594-esm.c | 19 +- + drivers/net/bonding/bond_main.c | 4 +- + drivers/net/dsa/ocelot/felix.c | 2 + + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 125 +++++---- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 14 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 4 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 29 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 1 + + drivers/net/ethernet/ibm/ibmvnic.c | 112 +++++++- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 5 +- + drivers/net/ethernet/intel/iavf/iavf_fdir.c | 11 +- + drivers/net/ethernet/intel/igc/igc.h | 4 + + drivers/net/ethernet/intel/igc/igc_main.c | 34 ++- + .../ethernet/marvell/prestera/prestera_router.c | 14 +- + .../mellanox/mlx5/core/diag/reporter_vnic.c | 98 ++++--- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 11 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 21 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 5 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 3 +- + .../ethernet/mellanox/mlx5/core/steering/dr_ptrn.c | 2 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 37 ++- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 23 +- + drivers/net/macsec.c | 28 +- + drivers/net/phy/at803x.c | 47 ++-- + drivers/net/tun.c | 2 +- + drivers/net/vxlan/vxlan_vnifilter.c | 11 +- + drivers/net/wireguard/allowedips.c | 8 +- + drivers/net/wireguard/selftest/allowedips.c | 16 +- + drivers/net/wireless/ath/ath12k/wmi.c | 3 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 5 + + drivers/net/wireless/realtek/rtw89/mac.c | 2 +- + drivers/nvme/host/core.c | 10 +- + drivers/nvme/host/ioctl.c | 2 - + drivers/nvme/host/pci.c | 3 +- + drivers/nvme/host/rdma.c | 3 +- + drivers/nvme/host/tcp.c | 3 +- + drivers/parisc/sba_iommu.c | 6 + + drivers/pci/bus.c | 4 +- + drivers/pci/controller/Kconfig | 1 - + drivers/pci/controller/dwc/pcie-designware-host.c | 13 +- + drivers/pci/controller/dwc/pcie-designware.c | 20 +- + drivers/pci/controller/dwc/pcie-designware.h | 1 - + drivers/pci/hotplug/acpiphp_glue.c | 8 +- + drivers/pci/of.c | 5 - + drivers/platform/x86/amd/pmf/sps.c | 3 +- + .../x86/intel/speed_select_if/isst_if_common.c | 4 +- + drivers/platform/x86/lenovo-ymc.c | 25 ++ + drivers/platform/x86/mlx-platform.c | 23 +- + drivers/platform/x86/msi-ec.c | 16 +- + drivers/platform/x86/serial-multi-instantiate.c | 14 + + drivers/scsi/53c700.c | 2 +- + drivers/scsi/fnic/fnic.h | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 6 +- + drivers/scsi/lpfc/lpfc_scsi.c | 20 +- + drivers/scsi/qedf/qedf_main.c | 18 ++ + drivers/scsi/qedi/qedi_main.c | 23 +- + drivers/scsi/raid_class.c | 1 + + drivers/scsi/scsi_proc.c | 30 +- + drivers/scsi/snic/snic_disc.c | 1 + + drivers/scsi/storvsc_drv.c | 4 - + drivers/thunderbolt/tb.c | 2 + + drivers/thunderbolt/tmu.c | 4 +- + drivers/ufs/host/ufs-renesas.c | 2 +- + drivers/usb/common/usb-conn-gpio.c | 6 +- + drivers/usb/dwc3/gadget.c | 9 +- + drivers/usb/gadget/udc/core.c | 9 + + drivers/usb/storage/alauda.c | 12 +- + drivers/usb/typec/altmodes/displayport.c | 18 +- + drivers/usb/typec/mux/Kconfig | 1 + + drivers/usb/typec/mux/nb7vpq904m.c | 25 +- + drivers/usb/typec/tcpm/tcpm.c | 7 + + fs/btrfs/block-group.c | 17 +- + fs/btrfs/block-group.h | 2 + + fs/btrfs/disk-io.c | 13 +- + fs/btrfs/extent-tree.c | 5 +- + fs/btrfs/extent_io.c | 13 +- + fs/btrfs/inode.c | 10 +- + fs/btrfs/relocation.c | 45 ++- + fs/btrfs/tree-checker.c | 14 + + fs/inode.c | 3 - + fs/nilfs2/inode.c | 8 + + fs/nilfs2/segment.c | 2 + + fs/nilfs2/the_nilfs.h | 2 + + fs/proc/kcore.c | 30 +- + fs/smb/server/smb2misc.c | 10 +- + fs/smb/server/smb2pdu.c | 9 +- + fs/vboxsf/shfl_hostintf.h | 6 +- + fs/zonefs/file.c | 111 +------- + fs/zonefs/super.c | 9 +- + fs/zonefs/zonefs.h | 2 - + include/linux/bio.h | 2 +- + include/linux/blkdev.h | 1 - + include/linux/cpu.h | 2 + + include/linux/prefetch.h | 7 +- + include/linux/skmsg.h | 1 + + include/net/cfg80211.h | 3 + + include/net/netfilter/nf_tables.h | 120 +++----- + include/trace/events/tcp.h | 5 +- + io_uring/io_uring.c | 3 + + io_uring/openclose.c | 6 +- + kernel/power/hibernate.c | 2 +- + lib/scatterlist.c | 2 +- + mm/compaction.c | 8 +- + mm/damon/core.c | 1 + + mm/hugetlb.c | 75 +++-- + mm/ksm.c | 2 + + mm/memory-failure.c | 29 +- + mm/memory.c | 3 + + mm/swapfile.c | 8 +- + mm/zsmalloc.c | 14 +- + net/8021q/vlan.c | 3 +- + net/core/filter.c | 6 - + net/core/skmsg.c | 10 +- + net/core/sock.c | 2 +- + net/core/sock_map.c | 10 +- + net/dccp/output.c | 2 +- + net/dccp/proto.c | 10 +- + net/ipv4/ip_tunnel_core.c | 2 +- + net/ipv4/nexthop.c | 28 +- + net/ipv6/ndisc.c | 3 +- + net/mptcp/protocol.c | 4 +- + net/mptcp/protocol.h | 1 - + net/mptcp/subflow.c | 60 ++-- + net/netfilter/nf_tables_api.c | 307 ++++++++++++++++----- + net/netfilter/nft_set_hash.c | 85 +++--- + net/netfilter/nft_set_pipapo.c | 68 +++-- + net/netfilter/nft_set_rbtree.c | 146 ++++++---- + net/packet/af_packet.c | 16 +- + net/smc/af_smc.c | 79 ++++-- + net/smc/smc.h | 2 +- + net/smc/smc_clc.c | 4 +- + net/smc/smc_core.c | 25 +- + net/smc/smc_sysctl.c | 10 +- + net/tls/tls_device.c | 64 ++--- + net/tls/tls_main.c | 3 - + net/wireless/nl80211.c | 5 +- + net/xdp/xsk.c | 1 + + scripts/kallsyms.c | 1 + + tools/arch/x86/include/asm/msr-index.h | 1 + + tools/counter/Makefile | 3 +- + tools/perf/util/machine.c | 5 - + tools/perf/util/stat-display.c | 5 + + tools/testing/radix-tree/regression1.c | 2 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 74 ++++- + .../selftests/bpf/progs/test_sockmap_listen.c | 14 + + tools/testing/selftests/cgroup/test_kmem.c | 4 + + tools/testing/selftests/mm/ksm_tests.c | 1 + + tools/testing/selftests/net/fib_nexthops.sh | 10 + + .../testing/selftests/net/forwarding/bridge_mdb.sh | 59 ++-- + .../selftests/net/forwarding/bridge_mdb_max.sh | 19 +- + tools/testing/selftests/net/forwarding/ethtool.sh | 2 + + .../net/forwarding/ethtool_extended_state.sh | 2 + + .../testing/selftests/net/forwarding/ethtool_mm.sh | 18 +- + .../selftests/net/forwarding/hw_stats_l3_gre.sh | 2 + + .../net/forwarding/ip6_forward_instats_vrf.sh | 2 + + tools/testing/selftests/net/forwarding/lib.sh | 17 ++ + tools/testing/selftests/net/forwarding/settings | 1 + + .../testing/selftests/net/forwarding/tc_actions.sh | 6 +- + .../testing/selftests/net/forwarding/tc_flower.sh | 8 +- + .../selftests/net/forwarding/tc_flower_l2_miss.sh | 13 +- + .../selftests/net/forwarding/tc_tunnel_key.sh | 9 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 +- + tools/testing/selftests/net/pmtu.sh | 35 +++ + 313 files changed, 2813 insertions(+), 1614 deletions(-) + create mode 100644 tools/testing/selftests/net/forwarding/settings +Merging fixes/fixes (d528014517f2 Revert ".gitignore: ignore *.cover and *.mbx") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (7a8abf373f29 mm: multi-gen LRU: don't spin during memcg release) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging mm/memory.c +Merge made by the 'ort' strategy. + arch/powerpc/mm/book3s64/subpage_prot.c | 1 + + arch/riscv/mm/pageattr.c | 1 + + arch/s390/mm/gmap.c | 5 +++++ + fs/nilfs2/segment.c | 5 +++++ + fs/proc/task_mmu.c | 8 +++++-- + include/linux/huge_mm.h | 3 --- + include/linux/mm.h | 21 ++++++++++++----- + include/linux/mm_types.h | 9 ++++++++ + include/linux/pagewalk.h | 11 +++++++++ + lib/radix-tree.c | 1 - + mm/damon/vaddr.c | 2 ++ + mm/gup.c | 30 ++++++++++++++++++++----- + mm/hmm.c | 1 + + mm/huge_memory.c | 5 ++--- + mm/internal.h | 17 ++++++++++++++ + mm/ksm.c | 25 +++++++++++++-------- + mm/madvise.c | 9 +++++--- + mm/memcontrol.c | 2 ++ + mm/memory-failure.c | 12 ++++++---- + mm/memory.c | 3 +++ + mm/mempolicy.c | 22 +++++++++++------- + mm/migrate_device.c | 1 + + mm/mincore.c | 1 + + mm/mlock.c | 1 + + mm/mprotect.c | 1 + + mm/pagewalk.c | 36 +++++++++++++++++++++++++++--- + mm/shmem.c | 19 +++++++++++++++- + mm/vmalloc.c | 4 ++++ + mm/vmscan.c | 14 +++++++----- + tools/testing/selftests/cgroup/test_kmem.c | 4 ++-- + tools/testing/selftests/mm/hmm-tests.c | 9 ++++++-- + 31 files changed, 225 insertions(+), 58 deletions(-) +Merging kbuild-current/fixes (6ccbd7fd4746 alpha: remove __init annotation from exported page_is_ram()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (4d3696801bad ARC: -Wmissing-prototype warning fixes) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Merge made by the 'ort' strategy. + arch/arc/include/asm/entry.h | 21 +++++++++++++++++++++ + arch/arc/include/asm/irq.h | 1 + + arch/arc/include/asm/mmu.h | 2 ++ + arch/arc/include/asm/ptrace.h | 3 +++ + arch/arc/include/asm/setup.h | 2 ++ + arch/arc/include/asm/smp.h | 2 ++ + arch/arc/kernel/ctx_sw.c | 2 +- + arch/arc/kernel/devtree.c | 1 + + arch/arc/kernel/intc-arcv2.c | 2 +- + arch/arc/kernel/signal.c | 1 + + arch/arc/kernel/smp.c | 7 ++++--- + arch/arc/kernel/stacktrace.c | 1 + + arch/arc/kernel/traps.c | 1 + + arch/arc/mm/cache.c | 8 ++++---- + arch/arc/mm/fault.c | 1 + + arch/arc/mm/init.c | 1 + + arch/arc/mm/tlb.c | 2 +- + 17 files changed, 48 insertions(+), 10 deletions(-) +Merging arm-current/fixes (6995e2de6891 Linux 6.4) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (69af56ae56a4 arm64/fpsimd: Sync and zero pad FPSIMD state for streaming SVE) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (6e6d847a8ce1 soc: aspeed: socinfo: Add kfree for kstrdup) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/arm/integratorap.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-phytec-mira.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6sx.dtsi | 14 ++++++++------ + arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 6 ++++++ + arch/arm/mach-zynq/pm.c | 2 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 7 +++---- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 6 ++---- + arch/arm64/boot/dts/freescale/imx93.dtsi | 2 +- + drivers/soc/aspeed/aspeed-socinfo.c | 1 + + drivers/soc/aspeed/aspeed-uart-routing.c | 2 +- + 10 files changed, 25 insertions(+), 19 deletions(-) +Merging davinci-current/davinci/for-current (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (faafd6ca7e6e memory: tegra: make icc_set_bw return zero if BWMGR not supported) +$ 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 tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (922a9bd13810 m68k: Fix invalid .section syntax) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (86582e6189dd powerpc/powermac: Use early_* IO variants in via_calibrate_decr()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (388acb471662 s390/ptrace: add missing linux/const.h include) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Auto-merging arch/sparc/mm/srmmu.c +Merge made by the 'ort' strategy. +Merging fscrypt-current/for-current (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref()) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging net/main (855067defa36 selftests: mirror_gre_changes: Tighten up the TTL test match) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + drivers/net/pcs/pcs-rzn1-miic.c | 10 ++++++++-- + drivers/net/phy/phy_device.c | 13 ++----------- + drivers/net/virtio_net.c | 4 ++-- + net/8021q/vlan.c | 3 ++- + .../testing/selftests/net/forwarding/mirror_gre_changes.sh | 3 ++- + 5 files changed, 16 insertions(+), 17 deletions(-) +Merging bpf/master (9ebbb29db9ca Merge branch 'x86/bugs' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (f3ec2b5d879e xfrm: don't skip free of empty state in acquire policy) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + include/net/xfrm.h | 1 + + net/ipv4/ip_vti.c | 4 ++-- + net/ipv6/ip6_vti.c | 4 ++-- + net/key/af_key.c | 4 ++-- + net/xfrm/xfrm_compat.c | 2 +- + net/xfrm/xfrm_input.c | 22 +++++++++------------- + net/xfrm/xfrm_interface_core.c | 4 ++-- + net/xfrm/xfrm_state.c | 8 ++------ + net/xfrm/xfrm_user.c | 15 +++++++++++++-- + 9 files changed, 34 insertions(+), 30 deletions(-) +Merging netfilter/main (cc941e548bff net: phy: fix IRQ-based wake-on-lan over hibernate / power off) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (829c6524d672 net: pcs: Add missing put_device call in miic_create) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (06f2ab86a5b6 wifi: ath12k: Fix buffer overflow when scanning with extraie) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging wpan/master (9a43827e876c net: dpaa2-mac: add 25gbase-r support) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (2ccdd1b13c59 Linux 6.5-rc6) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (7c761166399b ALSA: hda/cs8409: Support new Dell Dolphin Variants) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + sound/pci/hda/patch_cs8409-tables.c | 4 ++++ + sound/pci/hda/patch_realtek.c | 17 +++++++++++------ + sound/soc/fsl/fsl_micfil.c | 4 ++-- + sound/soc/fsl/fsl_micfil.h | 2 +- + sound/usb/quirks-table.h | 29 +++++++++++++++++++++++++++++ + 5 files changed, 47 insertions(+), 9 deletions(-) +Merging sound-asoc-fixes/for-linus (8a60e83d19a7 Merge remote-tracking branch 'asoc/for-6.4' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/codecs/cs43130.h | 138 +++++++++++++++---------------- + sound/soc/codecs/max98363.c | 9 +- + sound/soc/codecs/rt1308-sdw.c | 13 ++- + sound/soc/codecs/rt5665.c | 2 + + sound/soc/intel/boards/sof_sdw.c | 2 +- + sound/soc/intel/boards/sof_sdw_cs42l42.c | 6 +- + sound/soc/meson/axg-tdm-formatter.c | 42 ++++++---- + sound/soc/soc-compress.c | 1 + + sound/soc/soc-pcm.c | 8 +- + sound/soc/sof/intel/hda-dai-ops.c | 11 ++- + sound/soc/sof/intel/hda-dai.c | 5 +- + sound/soc/sof/intel/hda.h | 2 + + sound/soc/sof/ipc3.c | 2 +- + sound/soc/sof/ipc4-topology.c | 6 +- + sound/soc/tegra/tegra210_sfc.c | 31 ++++++- + sound/soc/tegra/tegra210_sfc.h | 4 +- + 16 files changed, 175 insertions(+), 107 deletions(-) +Merging regmap-fixes/for-linus (52a93d39b17d Linux 6.5-rc5) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (b81f77a4fa88 Merge remote-tracking branch 'regulator/for-6.4' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/da9063-regulator.c | 12 ++++++------ + drivers/regulator/qcom-rpmh-regulator.c | 2 +- + 2 files changed, 7 insertions(+), 7 deletions(-) +Merging spi-fixes/for-linus (e5baf3f03be8 Merge remote-tracking branch 'spi/for-6.4' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-zynqmp-gqspi.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging pci-current/for-linus (cc22522fd55e PCI: acpiphp: Use pci_assign_unassigned_bridge_resources() only for non-root bus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (5d0c230f1de8 Linux 6.5-rc4) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (04c7f60ca477 serial: core: Fix serial core port id, including multiport devices) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 15 ++------ + drivers/tty/Kconfig | 3 ++ + drivers/tty/n_gsm.c | 3 +- + drivers/tty/serial/8250/8250_core.c | 3 ++ + drivers/tty/serial/8250/8250_port.c | 4 +-- + drivers/tty/serial/fsl_lpuart.c | 4 +-- + drivers/tty/serial/serial_base.h | 1 + + drivers/tty/serial/serial_base_bus.c | 70 ++++++++++++++++++++++++++++-------- + include/linux/serial_core.h | 3 +- + 9 files changed, 72 insertions(+), 34 deletions(-) +Merging usb.current/usb-linus (2ccdd1b13c59 Linux 6.5-rc6) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (d245aedc0077 USB: serial: simple: sort driver entries) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (52a93d39b17d Linux 6.5-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (5d0c230f1de8 Linux 6.5-rc4) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (34477b2d710a iio: dac: ad3552r: Correct device IDs) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/dac/ad3552r.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging counter-current/counter-current (aead78125a98 tools/counter: Makefile: Replace rmdir by rm to avoid make,clean failure) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (2ccdd1b13c59 Linux 6.5-rc6) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (52a93d39b17d Linux 6.5-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (2ccdd1b13c59 Linux 6.5-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (eb09074bdb05 Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/misc/cpcap-pwrbutton.c | 12 ++---------- + drivers/input/serio/i8042-acpipnpio.h | 7 +++++++ + drivers/input/touchscreen/exc3000.c | 10 ++++++++++ + 3 files changed, 19 insertions(+), 10 deletions(-) +Merging crypto-current/master (0b7ec177b589 crypto: algif_hash - Fix race between MORE and non-MORE sends) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (4752354af710 vfio/type1: check pfn valid before converting to struct page) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (569f8b501b17 selftests/arm64: fix build failure during the "emit_tests" step) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (422dbc66b770 dmaengine: xilinx: xdma: Fix typo) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (c6abce60338a mtd: rawnand: fsl_upm: Fix an off-by one test in fun_exec_op()) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (2908042a37b5 media: imx: imx7-media-csi: Fix applying format constraints) +$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c | 4 ++-- + drivers/media/platform/nxp/imx7-media-csi.c | 7 +++++-- + drivers/media/usb/uvc/uvc_v4l2.c | 2 +- + 3 files changed, 8 insertions(+), 5 deletions(-) +Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (6eaae1980760 Linux 6.5-rc3) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (d5ad9aae13dc selftests/rseq: Fix build with undefined __weak) +$ 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 (c2fceb59bbda KVM: s390: pv: fix index value of replaced ASCE) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (56b930dcd88c hwmon: (aquacomputer_d5next) Add selective 200ms delay after sending ctrl report) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (e98d14fa7315 tools/testing/nvdimm: Drop empty platform remove function) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (ad64f5952ce3 cxl/memdev: Only show sanitize sysfs files when supported) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (02aff77b978e Merge branch 'misc-6.5' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (609d54441493 fs: prevent out-of-bounds array speculation when closing a file descriptor) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (bbb73a103fbb swiotlb: fix a braino in the alignment check fix) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (2b6aa6610dc9 platform/x86: lenovo-ymc: Only bind on machines with a convertible DMI chassis-type) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (ffc59c6414f9 dt-bindings: serial: Remove obsolete nxp,lpc1850-uart.txt) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (ef222f551e7c scsi: qedf: Fix firmware halt over suspend and resume) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (2ccdd1b13c59 Linux 6.5-rc6) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (423ffe62c06a drm/i915: fix display probe for IVB Q and IVB D GT2 server) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + .../gpu/drm/i915/display/intel_display_device.c | 24 +++++++++++++++++++--- + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 22 ++++++++++++-------- + 3 files changed, 36 insertions(+), 12 deletions(-) +Merging mmc-fixes/fixes (cf3f15b8c660 mmc: sunplus: Fix error handling in spmmc_drv_probe()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/core/block.c | 7 ++++--- + drivers/mmc/host/sunplus-mmc.c | 26 +++++++++++++------------- + drivers/mmc/host/wbsd.c | 2 -- + 3 files changed, 17 insertions(+), 18 deletions(-) +Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (fdf0eaf11452 Linux 6.5-rc2) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (6ad0f2f91ad1 Drivers: hv: vmbus: Remove unused extern declaration vmbus_ontimer()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (7e3811521dc3 riscv: Implement flush_cache_vmap()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging riscv-dt-fixes/riscv-dt-fixes (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (fdf0eaf11452 Linux 6.5-rc2) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (2fc8d02058db MAINTAINERS: add content regex for gpio-regmap) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +Merging gpio-intel-fixes/fixes (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (4da3c7183e18 erofs: drop unnecessary WARN_ON() in erofs_kill_sb()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (9e46e4dcd9d6 mm,memblock: reset memblock.reserved to system init state to prevent UAF) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (c96e2a695e00 sunrpc: set the bv_offset of first bvec in svc_tcp_sendmsg) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Merge made by the 'ort' strategy. + net/sunrpc/svcsock.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging irqchip-fixes/irq/irqchip-fixes (6fe5c68ee6a1 irqchip/gic-v3: Workaround for GIC-700 erratum 2941627) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (4c188fa183eb arm64: dts: renesas: rzg2l: Update overfow/underflow IRQ names for MTU3 channels) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf-tools (374a7f47bf40 Merge tag '6.5-rc5-ksmbd-server' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (36e4fc57fc16 efi: Bump stub image version for macOS HVF compatibility) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (6906598f1ce9 zstd: Fix definition of assert()) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Already up to date. +Merging battery-fixes/fixes (205f4cf3136f power: supply: ab8500: Set typing and props) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Merge made by the 'ort' strategy. + drivers/power/supply/ab8500_btemp.c | 9 +-------- + drivers/power/supply/ab8500_chargalg.c | 2 +- + 2 files changed, 2 insertions(+), 9 deletions(-) +Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes +Already up to date. +Merging iommufd-fixes/for-rc (b7c822fa6b77 iommufd: Set end correctly when doing batch carry) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (3fa7187eceee rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`)) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Merge made by the 'ort' strategy. + rust/macros/vtable.rs | 1 + + 1 file changed, 1 insertion(+) +Merging v9fs-fixes/fixes/next (e6ab0b914c12 fs/9p: Remove unused extern declaration) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging w1-fixes/fixes (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging genpd-fixes/fixes (12acb348fa45 cpuidle: psci: Move enabling OSI mode after power domains creation) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git genpd-fixes/fixes +Already up to date. +Merging i2c-host-fixes/i2c/andi-for-current (9a5adaf694f5 i2c: hisi: Only handle the interrupt of the driver's transfer) +$ git merge -m Merge branch 'i2c/andi-for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/andi-for-current +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-designware-master.c | 16 ++++++++++++++-- + drivers/i2c/busses/i2c-hisi.c | 8 ++++++++ + drivers/i2c/busses/i2c-imx-lpi2c.c | 3 +++ + drivers/i2c/busses/i2c-tegra.c | 2 +- + drivers/i2c/busses/i2c-tiny-usb.c | 4 ++++ + 5 files changed, 30 insertions(+), 3 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (e8470c0a7bca drm/panel: simple: Fix AUO G121EAN01 panel timings according to the docs) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 36 ++++++++++---------------- + drivers/gpu/drm/panel/panel-simple.c | 24 ++++++++--------- + 2 files changed, 26 insertions(+), 34 deletions(-) +Merging mm-stable/mm-stable (5fb2ea3111f4 powerpc/book3s64/radix: add debug message to give more details of vmemmap allocation) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging MAINTAINERS +Auto-merging arch/parisc/mm/ioremap.c +CONFLICT (content): Merge conflict in arch/parisc/mm/ioremap.c +Auto-merging arch/powerpc/mm/init_64.c +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +Auto-merging fs/ocfs2/file.c +Auto-merging fs/proc/base.c +Auto-merging include/linux/bio.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm_types.h +Auto-merging mm/compaction.c +Auto-merging mm/gup.c +Auto-merging mm/huge_memory.c +Auto-merging mm/hugetlb.c +Auto-merging mm/internal.h +Auto-merging mm/ksm.c +Auto-merging mm/madvise.c +Auto-merging mm/memcontrol.c +Auto-merging mm/memory-failure.c +Auto-merging mm/memory.c +Auto-merging mm/migrate_device.c +Auto-merging mm/mprotect.c +Auto-merging mm/shmem.c +Auto-merging mm/swapfile.c +Auto-merging mm/vmscan.c +Auto-merging mm/zsmalloc.c +Recorded preimage for 'arch/parisc/mm/ioremap.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/parisc/mm/ioremap.c'. +[master 5df0b13b9896] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-memory-page-offline | 4 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 2 - + Documentation/admin-guide/mm/ksm.rst | 25 +- + Documentation/admin-guide/mm/memory-hotplug.rst | 2 +- + Documentation/admin-guide/mm/userfaultfd.rst | 15 + + Documentation/block/biovecs.rst | 1 + + Documentation/features/vm/TLB/arch-support.txt | 2 +- + Documentation/mm/vmemmap_dedup.rst | 1 + + Documentation/powerpc/index.rst | 1 + + Documentation/powerpc/vmemmap_dedup.rst | 101 ++++ + MAINTAINERS | 1 - + arch/arc/Kconfig | 1 + + arch/arc/include/asm/io.h | 7 +- + arch/arc/mm/ioremap.c | 49 +- + arch/arm/mm/fault-armv.c | 3 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/io.h | 3 +- + arch/arm64/include/asm/mte.h | 4 +- + arch/arm64/include/asm/pgtable.h | 26 +- + arch/arm64/include/asm/tlbbatch.h | 12 + + arch/arm64/include/asm/tlbflush.h | 55 +- + arch/arm64/kernel/mte.c | 37 +- + arch/arm64/mm/fault.c | 2 - + arch/arm64/mm/ioremap.c | 10 +- + arch/hexagon/Kconfig | 1 + + arch/hexagon/include/asm/io.h | 11 +- + arch/hexagon/kernel/hexagon_ksyms.c | 2 - + arch/hexagon/mm/Makefile | 2 +- + arch/hexagon/mm/ioremap.c | 44 -- + arch/ia64/Kconfig | 1 + + arch/ia64/include/asm/io.h | 13 +- + arch/ia64/mm/ioremap.c | 41 +- + arch/loongarch/Kconfig | 2 +- + arch/loongarch/include/asm/io.h | 2 - + arch/m68k/include/asm/io_mm.h | 2 - + arch/m68k/include/asm/kmap.h | 2 - + arch/mips/include/asm/io.h | 5 +- + arch/openrisc/Kconfig | 1 + + arch/openrisc/include/asm/io.h | 11 +- + arch/openrisc/mm/ioremap.c | 82 --- + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/io.h | 15 +- + arch/parisc/mm/ioremap.c | 61 +-- + arch/powerpc/Kconfig | 2 + + arch/powerpc/include/asm/book3s/64/hash.h | 9 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 155 +++++- + arch/powerpc/include/asm/book3s/64/radix.h | 49 ++ + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 2 + + arch/powerpc/include/asm/book3s/64/tlbflush.h | 9 + + arch/powerpc/include/asm/io.h | 17 +- + arch/powerpc/include/asm/pgalloc.h | 4 + + arch/powerpc/include/asm/pgtable.h | 10 +- + arch/powerpc/mm/book3s64/hash_pgtable.c | 2 +- + arch/powerpc/mm/book3s64/pgtable.c | 78 +++ + arch/powerpc/mm/book3s64/radix_hugetlbpage.c | 1 + + arch/powerpc/mm/book3s64/radix_pgtable.c | 574 +++++++++++++++++++-- + arch/powerpc/mm/book3s64/radix_tlb.c | 11 + + arch/powerpc/mm/fault.c | 4 - + arch/powerpc/mm/init_64.c | 37 +- + arch/powerpc/mm/ioremap.c | 26 +- + arch/powerpc/mm/ioremap_32.c | 19 +- + arch/powerpc/mm/ioremap_64.c | 12 +- + arch/powerpc/mm/pgtable-frag.c | 29 +- + arch/powerpc/mm/pgtable.c | 8 +- + arch/powerpc/platforms/Kconfig.cputype | 1 + + arch/powerpc/xmon/xmon.c | 2 +- + arch/riscv/Kconfig | 2 +- + arch/riscv/include/asm/pgtable.h | 12 +- + arch/riscv/mm/fault.c | 4 - + arch/s390/Kconfig | 3 +- + arch/s390/include/asm/io.h | 21 +- + arch/s390/include/asm/pgalloc.h | 4 + + arch/s390/mm/fault.c | 2 - + arch/s390/mm/pgalloc.c | 80 ++- + arch/s390/pci/pci.c | 57 +- + arch/sh/Kconfig | 1 + + arch/sh/include/asm/io.h | 89 ++-- + arch/sh/include/asm/io_noioport.h | 7 - + arch/sh/mm/ioremap.c | 65 +-- + arch/sparc/include/asm/pgalloc_64.h | 4 + + arch/sparc/kernel/setup_32.c | 2 +- + arch/sparc/mm/init_64.c | 16 + + arch/x86/Kconfig | 3 +- + arch/x86/include/asm/io.h | 5 - + arch/x86/include/asm/pgtable.h | 16 +- + arch/x86/include/asm/tlbflush.h | 24 +- + arch/x86/mm/fault.c | 4 - + arch/x86/mm/tlb.c | 2 + + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/io.h | 32 +- + arch/xtensa/mm/ioremap.c | 58 +-- + drivers/dax/kmem.c | 4 +- + drivers/iommu/amd/iommu_v2.c | 10 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 29 +- + drivers/iommu/intel/svm.c | 8 +- + drivers/misc/ocxl/link.c | 8 +- + drivers/net/ethernet/sfc/io.h | 2 +- + drivers/net/ethernet/sfc/siena/io.h | 2 +- + drivers/nvdimm/pfn_devs.c | 2 +- + drivers/tty/sysrq.c | 2 +- + drivers/tty/vt/keyboard.c | 2 +- + fs/9p/cache.c | 2 + + fs/Kconfig | 7 +- + fs/affs/file.c | 77 ++- + fs/affs/symlink.c | 12 +- + fs/afs/internal.h | 2 + + fs/buffer.c | 36 +- + fs/cachefiles/namei.c | 2 + + fs/ceph/cache.c | 2 + + fs/drop_caches.c | 2 + + fs/exec.c | 1 + + fs/ext4/inode.c | 4 +- + fs/ext4/move_extent.c | 19 +- + fs/hugetlbfs/inode.c | 57 +- + fs/jbd2/journal.c | 35 +- + fs/nfs/fscache.c | 3 + + fs/ntfs3/inode.c | 10 +- + fs/ocfs2/file.c | 7 +- + fs/proc/base.c | 1 + + fs/smb/client/fscache.c | 2 + + fs/splice.c | 3 +- + fs/udf/file.c | 6 +- + fs/userfaultfd.c | 94 +++- + include/asm-generic/io.h | 31 +- + include/asm-generic/iomap.h | 6 +- + include/asm-generic/tlb.h | 1 - + include/linux/bio.h | 5 + + include/linux/buffer_head.h | 4 +- + include/linux/fs.h | 2 +- + include/linux/highmem.h | 44 ++ + include/linux/hugetlb.h | 35 +- + include/linux/ioremap.h | 30 ++ + include/linux/kfence.h | 11 +- + include/linux/ksm.h | 20 + + include/linux/maple_tree.h | 44 +- + include/linux/memblock.h | 4 +- + include/linux/memcontrol.h | 2 - + include/linux/memory-tiers.h | 4 +- + include/linux/mm.h | 87 ++-- + include/linux/mm_inline.h | 21 + + include/linux/mm_types.h | 13 +- + include/linux/mm_types_task.h | 4 +- + include/linux/mmap_lock.h | 18 +- + include/linux/mmu_notifier.h | 104 +--- + include/linux/mmzone.h | 1 - + include/linux/net_mm.h | 17 - + include/linux/page_idle.h | 5 - + include/linux/page_table_check.h | 66 +-- + include/linux/pagemap.h | 16 + + include/linux/pgtable.h | 28 +- + include/linux/swapops.h | 15 +- + include/linux/userfaultfd_k.h | 4 + + include/net/tcp.h | 1 - + include/trace/events/thp.h | 33 +- + include/uapi/linux/userfaultfd.h | 25 +- + init/initramfs.c | 2 +- + kernel/events/uprobes.c | 2 +- + kernel/futex/core.c | 3 +- + kernel/iomem.c | 1 + + kernel/panic.c | 2 +- + lib/maple_tree.c | 483 ++++++++--------- + lib/test_maple_tree.c | 141 +++++ + lib/test_meminit.c | 2 +- + mm/Kconfig | 8 +- + mm/cma.c | 4 +- + mm/compaction.c | 44 +- + mm/debug_vm_pgtable.c | 18 +- + mm/filemap.c | 19 +- + mm/gup.c | 83 +-- + mm/huge_memory.c | 36 +- + mm/hugetlb.c | 336 +++--------- + mm/hugetlb_vmemmap.c | 34 +- + mm/internal.h | 53 +- + mm/ioremap.c | 43 +- + mm/kfence/core.c | 123 +++-- + mm/kfence/kfence.h | 5 +- + mm/khugepaged.c | 484 ++++++----------- + mm/ksm.c | 28 +- + mm/madvise.c | 6 +- + mm/memcontrol.c | 18 +- + mm/memfd.c | 57 +- + mm/memory-failure.c | 121 +++-- + mm/memory-tiers.c | 19 +- + mm/memory.c | 220 +++++--- + mm/memory_hotplug.c | 5 + + mm/migrate.c | 5 +- + mm/migrate_device.c | 30 +- + mm/mm_init.c | 25 +- + mm/mmap.c | 216 ++++---- + mm/mmu_notifier.c | 50 +- + mm/mprotect.c | 6 +- + mm/mremap.c | 2 +- + mm/nommu.c | 51 +- + mm/page_alloc.c | 32 +- + mm/page_ext.c | 103 ++-- + mm/page_io.c | 61 ++- + mm/page_isolation.c | 8 +- + mm/page_table_check.c | 50 +- + mm/page_vma_mapped.c | 12 +- + mm/pgtable-generic.c | 97 +++- + mm/rmap.c | 83 +-- + mm/shmem.c | 6 +- + mm/show_mem.c | 4 +- + mm/sparse-vmemmap.c | 3 + + mm/sparse.c | 3 +- + mm/swapfile.c | 18 +- + mm/truncate.c | 8 +- + mm/userfaultfd.c | 87 +++- + mm/util.c | 6 - + mm/vmscan.c | 8 +- + mm/zsmalloc.c | 79 +-- + net/ipv4/tcp.c | 11 +- + tools/include/nolibc/stdio.h | 24 + + tools/testing/radix-tree/maple.c | 140 +++-- + tools/testing/selftests/cgroup/.gitignore | 1 + + tools/testing/selftests/cgroup/Makefile | 2 + + tools/testing/selftests/cgroup/test_zswap.c | 286 ++++++++++ + tools/testing/selftests/kselftest.h | 9 + + tools/testing/selftests/kselftest/runner.sh | 7 +- + tools/testing/selftests/memfd/memfd_test.c | 5 + + tools/testing/selftests/mm/.gitignore | 1 + + tools/testing/selftests/mm/Makefile | 81 +-- + tools/testing/selftests/mm/hugetlb-read-hwpoison.c | 322 ++++++++++++ + tools/testing/selftests/mm/ksm_functional_tests.c | 98 +++- + tools/testing/selftests/mm/madv_populate.c | 26 +- + tools/testing/selftests/mm/migration.c | 12 +- + tools/testing/selftests/mm/mrelease_test.c | 1 + + tools/testing/selftests/mm/run_vmtests.sh | 76 ++- + tools/testing/selftests/mm/settings | 2 +- + tools/testing/selftests/mm/thuge-gen.c | 4 +- + tools/testing/selftests/mm/transhuge-stress.c | 12 +- + tools/testing/selftests/mm/uffd-common.c | 5 +- + tools/testing/selftests/mm/uffd-common.h | 3 + + tools/testing/selftests/mm/uffd-stress.c | 8 +- + tools/testing/selftests/mm/uffd-unit-tests.c | 117 +++++ + tools/testing/selftests/mm/va_high_addr_switch.c | 2 +- + 236 files changed, 5059 insertions(+), 3042 deletions(-) + create mode 100644 Documentation/powerpc/vmemmap_dedup.rst + create mode 100644 arch/arm64/include/asm/tlbbatch.h + delete mode 100644 arch/hexagon/mm/ioremap.c + create mode 100644 include/linux/ioremap.h + delete mode 100644 include/linux/net_mm.h + create mode 100644 tools/testing/selftests/cgroup/test_zswap.c + create mode 100644 tools/testing/selftests/mm/hugetlb-read-hwpoison.c +Merging mm-nonmm-stable/mm-nonmm-stable (290931e2b83c x86/kernel: increase kcov coverage under arch/x86/kernel folder) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Auto-merging arch/arm64/Kconfig +Auto-merging arch/ia64/Kconfig +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/kernel/elf_kexec.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/sh/Kconfig +Auto-merging arch/x86/Kconfig +Merge made by the 'ort' strategy. + arch/Kconfig | 17 +--- + arch/arm/Kconfig | 29 +------ + arch/arm/include/asm/irq.h | 2 +- + arch/arm/kernel/smp.c | 4 +- + arch/arm64/Kconfig | 62 ++++---------- + arch/ia64/Kconfig | 30 ++----- + arch/ia64/include/asm/cmpxchg.h | 17 ++++ + arch/ia64/include/uapi/asm/cmpxchg.h | 17 ---- + arch/loongarch/Kconfig | 26 ++---- + arch/loongarch/include/asm/irq.h | 2 +- + arch/loongarch/kernel/process.c | 4 +- + arch/m68k/Kconfig | 19 +---- + arch/mips/Kconfig | 30 +------ + arch/mips/cavium-octeon/setup.c | 2 +- + arch/mips/include/asm/irq.h | 2 +- + arch/mips/kernel/process.c | 4 +- + arch/parisc/Kconfig | 34 +++----- + arch/powerpc/Kconfig | 55 ++++-------- + arch/powerpc/include/asm/irq.h | 2 +- + arch/powerpc/kernel/stacktrace.c | 4 +- + arch/powerpc/kernel/watchdog.c | 4 +- + arch/riscv/Kbuild | 2 +- + arch/riscv/Kconfig | 46 ++++------- + arch/riscv/kernel/elf_kexec.c | 4 +- + arch/s390/Kbuild | 2 +- + arch/s390/Kconfig | 66 +++++---------- + arch/sh/Kconfig | 42 ++-------- + arch/sparc/include/asm/irq_64.h | 2 +- + arch/sparc/kernel/process_64.c | 6 +- + arch/x86/Kconfig | 90 ++++---------------- + arch/x86/include/asm/irq.h | 2 +- + arch/x86/include/asm/rmwcc.h | 11 +-- + arch/x86/kernel/Makefile | 9 +- + arch/x86/kernel/apic/hw_nmi.c | 4 +- + arch/x86/pci/amd_bus.c | 8 ++ + arch/x86/pci/bus_numa.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 1 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 7 -- + drivers/gpu/ipu-v3/ipu-image-convert.c | 15 ++-- + drivers/irqchip/Kconfig | 1 + + drivers/net/ethernet/altera/Kconfig | 1 + + drivers/tty/serial/omap-serial.c | 7 +- + drivers/video/fbdev/core/svgalib.c | 7 +- + fs/efs/efs.h | 5 +- + fs/hfsplus/extents.c | 6 +- + fs/ocfs2/cluster/netdebug.c | 40 ++++----- + fs/ocfs2/cluster/quorum.c | 26 +++--- + fs/ocfs2/journal.c | 11 +-- + fs/ocfs2/journal.h | 2 +- + fs/ocfs2/namei.c | 4 + + fs/ocfs2/super.c | 3 +- + include/kunit/test.h | 1 + + include/linux/args.h | 28 +++++++ + include/linux/arm-smccc.h | 69 +++++++--------- + include/linux/genl_magic_func.h | 27 +++--- + include/linux/genl_magic_struct.h | 8 +- + include/linux/kernel.h | 7 -- + include/linux/kthread.h | 1 - + include/linux/limits.h | 2 + + include/linux/math.h | 19 +++++ + include/linux/nmi.h | 14 ++-- + include/linux/pci.h | 2 +- + include/linux/range.h | 8 -- + include/trace/bpf_probe.h | 2 + + init/Kconfig | 2 + + ipc/sem.c | 6 +- + kernel/Kconfig.kexec | 115 ++++++++++++++++++++++++++ + kernel/acct.c | 2 +- + kernel/cred.c | 27 +++--- + kernel/gcov/Makefile | 2 + + kernel/kexec_file.c | 6 +- + kernel/kthread.c | 3 +- + kernel/relay.c | 2 +- + kernel/signal.c | 13 ++- + kernel/watchdog.c | 11 +-- + lib/Kconfig | 1 + + lib/bch.c | 38 +-------- + lib/error-inject.c | 2 - + lib/nmi_backtrace.c | 6 +- + lib/notifier-error-inject.c | 3 - + lib/test_hmm.c | 10 +-- + scripts/gdb/linux/constants.py.in | 3 + + scripts/gdb/linux/modules.py | 12 ++- + scripts/gdb/linux/symbols.py | 17 ++-- + scripts/headers_install.sh | 1 - + tools/testing/selftests/proc/proc-empty-vm.c | 23 ++++++ + 86 files changed, 564 insertions(+), 727 deletions(-) + create mode 100644 include/linux/args.h + create mode 100644 kernel/Kconfig.kexec +Merging mm/mm-everything (f8a7ed854c1a Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging Documentation/ABI/testing/sysfs-devices-system-cpu +Auto-merging Documentation/filesystems/locking.rst +Auto-merging MAINTAINERS +Auto-merging arch/arc/mm/cache.c +Auto-merging arch/arc/mm/tlb.c +Auto-merging arch/riscv/include/asm/cacheflush.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/x86/Kconfig +Auto-merging drivers/base/cpu.c +Auto-merging mm/memory.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-devices-memory | 8 + + Documentation/ABI/testing/sysfs-devices-system-cpu | 8 + + Documentation/ABI/testing/sysfs-kernel-mm-damon | 40 +- + Documentation/admin-guide/mm/damon/usage.rst | 76 ++- + Documentation/admin-guide/mm/ksm.rst | 2 + + Documentation/admin-guide/mm/memory-hotplug.rst | 20 + + Documentation/admin-guide/mm/zswap.rst | 14 +- + Documentation/core-api/cachetlb.rst | 55 +- + Documentation/core-api/cpu_hotplug.rst | 18 + + Documentation/filesystems/locking.rst | 2 +- + Documentation/filesystems/proc.rst | 3 + + Documentation/mm/damon/design.rst | 24 +- + Documentation/mm/frontswap.rst | 264 --------- + Documentation/mm/index.rst | 1 - + Documentation/mm/split_page_table_lock.rst | 12 +- + Documentation/translations/zh_CN/mm/frontswap.rst | 196 ------- + Documentation/translations/zh_CN/mm/index.rst | 1 - + .../zh_CN/mm/split_page_table_lock.rst | 14 +- + MAINTAINERS | 7 - + arch/alpha/include/asm/cacheflush.h | 13 +- + arch/alpha/include/asm/pgtable.h | 10 +- + arch/arc/include/asm/cacheflush.h | 14 +- + arch/arc/include/asm/pgtable-bits-arcv2.h | 12 +- + arch/arc/include/asm/pgtable-levels.h | 1 + + arch/arc/mm/cache.c | 61 +- + arch/arc/mm/tlb.c | 18 +- + arch/arm/include/asm/cacheflush.h | 29 +- + arch/arm/include/asm/hugetlb.h | 1 + + arch/arm/include/asm/pgtable.h | 5 +- + arch/arm/include/asm/tlb.h | 12 +- + arch/arm/include/asm/tlbflush.h | 14 +- + arch/arm/mm/copypage-v4mc.c | 5 +- + arch/arm/mm/copypage-v6.c | 5 +- + arch/arm/mm/copypage-xscale.c | 5 +- + arch/arm/mm/dma-mapping.c | 24 +- + arch/arm/mm/fault-armv.c | 16 +- + arch/arm/mm/flush.c | 99 ++-- + arch/arm/mm/mm.h | 2 +- + arch/arm/mm/mmu.c | 21 +- + arch/arm/mm/nommu.c | 6 + + arch/arm/mm/pageattr.c | 6 +- + arch/arm64/Kconfig | 4 +- + arch/arm64/include/asm/cacheflush.h | 4 +- + arch/arm64/include/asm/hugetlb.h | 16 + + arch/arm64/include/asm/pgtable.h | 24 +- + arch/arm64/include/asm/tlb.h | 14 +- + arch/arm64/include/asm/tlbflush.h | 15 + + arch/arm64/mm/fault.c | 3 +- + arch/arm64/mm/flush.c | 36 +- + arch/arm64/mm/hugetlbpage.c | 2 +- + arch/arm64/mm/mmu.c | 7 +- + arch/csky/abiv1/cacheflush.c | 32 +- + arch/csky/abiv1/inc/abi/cacheflush.h | 3 +- + arch/csky/abiv2/cacheflush.c | 34 +- + arch/csky/abiv2/inc/abi/cacheflush.h | 11 +- + arch/csky/include/asm/pgalloc.h | 4 +- + arch/csky/include/asm/pgtable.h | 8 +- + arch/hexagon/include/asm/cacheflush.h | 10 +- + arch/hexagon/include/asm/pgalloc.h | 8 +- + arch/hexagon/include/asm/pgtable.h | 9 +- + arch/ia64/hp/common/sba_iommu.c | 28 +- + arch/ia64/include/asm/cacheflush.h | 14 +- + arch/ia64/include/asm/pgtable.h | 4 +- + arch/ia64/mm/init.c | 32 +- + arch/loongarch/include/asm/cacheflush.h | 1 - + arch/loongarch/include/asm/pgalloc.h | 27 +- + arch/loongarch/include/asm/pgtable-bits.h | 4 +- + arch/loongarch/include/asm/pgtable.h | 33 +- + arch/loongarch/mm/pgtable.c | 9 +- + arch/loongarch/mm/tlb.c | 2 +- + arch/m68k/include/asm/cacheflush_mm.h | 26 +- + arch/m68k/include/asm/mcf_pgalloc.h | 47 +- + arch/m68k/include/asm/mcf_pgtable.h | 1 + + arch/m68k/include/asm/motorola_pgtable.h | 1 + + arch/m68k/include/asm/pgtable_mm.h | 10 +- + arch/m68k/include/asm/sun3_pgalloc.h | 8 +- + arch/m68k/include/asm/sun3_pgtable.h | 1 + + arch/m68k/mm/motorola.c | 6 +- + arch/microblaze/include/asm/cacheflush.h | 8 + + arch/microblaze/include/asm/pgtable.h | 15 +- + arch/microblaze/include/asm/tlbflush.h | 4 +- + arch/mips/bcm47xx/prom.c | 2 +- + arch/mips/include/asm/cacheflush.h | 32 +- + arch/mips/include/asm/pgalloc.h | 32 +- + arch/mips/include/asm/pgtable-32.h | 10 +- + arch/mips/include/asm/pgtable-64.h | 6 +- + arch/mips/include/asm/pgtable-bits.h | 6 +- + arch/mips/include/asm/pgtable.h | 61 +- + arch/mips/mm/c-r4k.c | 5 +- + arch/mips/mm/cache.c | 54 +- + arch/mips/mm/init.c | 21 +- + arch/mips/mm/pgtable-32.c | 2 +- + arch/mips/mm/pgtable-64.c | 2 +- + arch/mips/mm/pgtable.c | 8 +- + arch/mips/mm/tlbex.c | 2 +- + arch/nios2/include/asm/cacheflush.h | 6 +- + arch/nios2/include/asm/pgalloc.h | 8 +- + arch/nios2/include/asm/pgtable.h | 26 +- + arch/nios2/mm/cacheflush.c | 79 +-- + arch/openrisc/include/asm/cacheflush.h | 8 +- + arch/openrisc/include/asm/pgalloc.h | 8 +- + arch/openrisc/include/asm/pgtable.h | 15 +- + arch/openrisc/mm/cache.c | 12 +- + arch/parisc/include/asm/cacheflush.h | 14 +- + arch/parisc/include/asm/pgtable.h | 37 +- + arch/parisc/kernel/cache.c | 107 ++-- + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/book3s/32/pgtable.h | 5 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 6 +- + arch/powerpc/include/asm/book3s/pgtable.h | 11 +- + arch/powerpc/include/asm/cacheflush.h | 14 +- + arch/powerpc/include/asm/kvm_ppc.h | 10 +- + arch/powerpc/include/asm/nohash/pgtable.h | 16 +- + arch/powerpc/include/asm/pgtable.h | 33 ++ + arch/powerpc/kvm/book3s_hv_uvmem.c | 1 + + arch/powerpc/mm/book3s64/hash_utils.c | 11 +- + arch/powerpc/mm/book3s64/mmu_context.c | 10 +- + arch/powerpc/mm/book3s64/pgtable.c | 32 +- + arch/powerpc/mm/cacheflush.c | 41 +- + arch/powerpc/mm/fault.c | 3 +- + arch/powerpc/mm/nohash/e500_hugetlbpage.c | 3 +- + arch/powerpc/mm/pgtable-frag.c | 58 +- + arch/powerpc/mm/pgtable.c | 53 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +- + arch/riscv/include/asm/cacheflush.h | 19 +- + arch/riscv/include/asm/hugetlb.h | 1 + + arch/riscv/include/asm/pgalloc.h | 8 +- + arch/riscv/include/asm/pgtable.h | 37 +- + arch/riscv/mm/cacheflush.c | 13 +- + arch/riscv/mm/fault.c | 3 +- + arch/riscv/mm/init.c | 16 +- + arch/s390/include/asm/pgalloc.h | 4 +- + arch/s390/include/asm/pgtable.h | 33 +- + arch/s390/include/asm/tlb.h | 4 +- + arch/s390/mm/fault.c | 3 +- + arch/s390/mm/pgalloc.c | 128 ++--- + arch/sh/include/asm/cacheflush.h | 21 +- + arch/sh/include/asm/pgalloc.h | 9 +- + arch/sh/include/asm/pgtable.h | 7 +- + arch/sh/include/asm/pgtable_32.h | 5 +- + arch/sh/mm/cache-j2.c | 4 +- + arch/sh/mm/cache-sh4.c | 26 +- + arch/sh/mm/cache-sh7705.c | 26 +- + arch/sh/mm/cache.c | 52 +- + arch/sh/mm/kmap.c | 3 +- + arch/sparc/include/asm/cacheflush_32.h | 10 +- + arch/sparc/include/asm/cacheflush_64.h | 19 +- + arch/sparc/include/asm/pgtable_32.h | 8 +- + arch/sparc/include/asm/pgtable_64.h | 29 +- + arch/sparc/kernel/smp_64.c | 56 +- + arch/sparc/mm/init_32.c | 13 +- + arch/sparc/mm/init_64.c | 95 ++-- + arch/sparc/mm/srmmu.c | 5 +- + arch/sparc/mm/tlb.c | 5 +- + arch/um/include/asm/pgalloc.h | 18 +- + arch/um/include/asm/pgtable.h | 7 +- + arch/x86/Kconfig | 7 +- + arch/x86/include/asm/kexec.h | 18 + + arch/x86/include/asm/pgtable.h | 14 +- + arch/x86/kernel/crash.c | 142 ++++- + arch/x86/mm/fault.c | 3 +- + arch/x86/mm/pgtable.c | 47 +- + arch/x86/xen/mmu_pv.c | 2 +- + arch/xtensa/include/asm/cacheflush.h | 11 +- + arch/xtensa/include/asm/pgtable.h | 18 +- + arch/xtensa/mm/cache.c | 85 +-- + drivers/acpi/acpi_memhotplug.c | 3 +- + drivers/acpi/acpi_pad.c | 2 +- + drivers/acpi/numa/hmat.c | 218 ++++++-- + drivers/base/cpu.c | 13 + + drivers/base/memory.c | 40 +- + drivers/base/node.c | 4 +- + drivers/dax/kmem.c | 54 +- + drivers/dma-buf/heaps/system_heap.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 5 +- + drivers/gpu/drm/arm/display/include/malidp_utils.h | 2 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 24 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 6 - + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 18 +- + drivers/virt/acrn/ioreq.c | 4 +- + fs/adfs/dir_f.h | 5 - + fs/btrfs/misc.h | 2 - + fs/exec.c | 4 +- + fs/ext2/balloc.c | 2 - + fs/ext4/ext4.h | 2 - + fs/proc/meminfo.c | 13 +- + fs/proc/task_mmu.c | 31 +- + fs/proc/task_nommu.c | 15 +- + fs/ufs/util.h | 6 - + fs/userfaultfd.c | 40 +- + include/asm-generic/cacheflush.h | 7 - + include/asm-generic/pgalloc.h | 88 +-- + include/asm-generic/tlb.h | 11 + + include/linux/backing-dev.h | 1 - + include/linux/cacheflush.h | 13 +- + include/linux/crash_core.h | 27 + + include/linux/damon.h | 28 +- + include/linux/frontswap.h | 91 --- + include/linux/kernel.h | 30 +- + include/linux/kexec.h | 48 +- + include/linux/memblock.h | 10 +- + include/linux/memcontrol.h | 16 +- + include/linux/memory-tiers.h | 25 +- + include/linux/memory.h | 8 +- + include/linux/memory_hotplug.h | 3 +- + include/linux/minmax.h | 27 + + include/linux/mm.h | 231 ++++++-- + include/linux/mm_types.h | 100 +++- + include/linux/page-flags.h | 30 +- + include/linux/page_ext.h | 9 +- + include/linux/page_table_check.h | 13 +- + include/linux/pagemap.h | 43 +- + include/linux/pgtable.h | 91 ++- + include/linux/pid_namespace.h | 39 +- + include/linux/rmap.h | 2 + + include/linux/seqlock.h | 2 +- + include/linux/sprintf.h | 27 + + include/linux/swap.h | 9 - + include/linux/swapfile.h | 5 - + include/linux/zswap.h | 37 ++ + include/uapi/linux/kexec.h | 1 + + kernel/Kconfig.kexec | 35 ++ + kernel/crash_core.c | 391 +++++++++++++ + kernel/events/core.c | 33 +- + kernel/fork.c | 22 +- + kernel/iomem.c | 12 +- + kernel/kexec.c | 5 + + kernel/kexec_core.c | 43 +- + kernel/kexec_file.c | 187 +------ + kernel/ksysfs.c | 15 + + kernel/pid.c | 3 + + kernel/pid_namespace.c | 6 +- + kernel/pid_sysctl.h | 28 +- + lib/logic_pio.c | 3 - + lib/maple_tree.c | 611 ++++++++------------- + lib/test_printf.c | 3 +- + lib/vsprintf.c | 1 + + mm/Kconfig | 7 +- + mm/Makefile | 1 - + mm/backing-dev.c | 6 +- + mm/compaction.c | 61 +- + mm/damon/core-test.h | 74 +++ + mm/damon/core.c | 62 +++ + mm/damon/ops-common.c | 2 +- + mm/damon/paddr.c | 2 +- + mm/damon/sysfs-common.h | 2 +- + mm/damon/sysfs-schemes.c | 107 +++- + mm/damon/sysfs.c | 26 +- + mm/damon/vaddr.c | 23 +- + mm/filemap.c | 158 +++--- + mm/frontswap.c | 283 ---------- + mm/gup.c | 7 - + mm/hugetlb.c | 8 +- + mm/init-mm.c | 2 + + mm/internal.h | 3 +- + mm/kfence/report.c | 3 +- + mm/kmsan/hooks.c | 4 +- + mm/kmsan/shadow.c | 8 +- + mm/ksm.c | 16 +- + mm/madvise.c | 9 +- + mm/memblock.c | 5 + + mm/memcontrol.c | 82 +-- + mm/memfd.c | 33 +- + mm/memory-failure.c | 37 +- + mm/memory-tiers.c | 73 ++- + mm/memory.c | 118 ++-- + mm/memory_hotplug.c | 187 +++++-- + mm/memtest.c | 22 +- + mm/mlock.c | 3 +- + mm/mm_init.c | 12 +- + mm/mmap.c | 39 +- + mm/mprotect.c | 1 + + mm/nommu.c | 4 +- + mm/oom_kill.c | 15 +- + mm/page_alloc.c | 121 ++-- + mm/page_io.c | 19 +- + mm/page_owner.c | 2 +- + mm/page_poison.c | 1 - + mm/page_table_check.c | 18 +- + mm/rmap.c | 60 +- + mm/secretmem.c | 14 +- + mm/shmem.c | 3 +- + mm/show_mem.c | 6 +- + mm/swap.h | 1 - + mm/swap_state.c | 17 +- + mm/swapfile.c | 45 +- + mm/util.c | 2 +- + mm/vmscan.c | 34 +- + mm/vmstat.c | 1 - + mm/workingset.c | 1 + + mm/z3fold.c | 27 +- + mm/zswap.c | 405 ++++++-------- + net/netfilter/nf_nat_core.c | 6 +- + net/tipc/core.h | 2 +- + net/tipc/link.c | 10 +- + scripts/checkpatch.pl | 22 +- + scripts/gdb/linux/constants.py.in | 52 ++ + scripts/gdb/linux/mm.py | 564 ++++++++++++------- + scripts/gdb/linux/modules.py | 32 +- + scripts/gdb/linux/page_owner.py | 190 +++++++ + scripts/gdb/linux/pgtable.py | 222 ++++++++ + scripts/gdb/linux/slab.py | 326 +++++++++++ + scripts/gdb/linux/stackdepot.py | 55 ++ + scripts/gdb/linux/symbols.py | 23 +- + scripts/gdb/linux/utils.py | 20 + + scripts/gdb/linux/vmalloc.py | 56 ++ + scripts/gdb/vmlinux-gdb.py | 7 +- + security/selinux/hooks.c | 7 +- + .../selftests/bpf/progs/get_branch_snapshot.c | 4 +- + tools/testing/selftests/damon/sysfs.sh | 6 + + tools/testing/selftests/memfd/memfd_test.c | 352 +++++++++--- + tools/testing/selftests/mm/ksm_functional_tests.c | 106 +++- + tools/testing/selftests/mm/run_vmtests.sh | 4 + + tools/testing/selftests/mm/uffd-stress.c | 24 +- + tools/testing/selftests/proc/proc-empty-vm.c | 4 +- + virt/kvm/kvm_main.c | 13 +- + 316 files changed, 6730 insertions(+), 4223 deletions(-) + delete mode 100644 Documentation/mm/frontswap.rst + delete mode 100644 Documentation/translations/zh_CN/mm/frontswap.rst + delete mode 100644 include/linux/frontswap.h + create mode 100644 include/linux/sprintf.h + create mode 100644 include/linux/zswap.h + delete mode 100644 mm/frontswap.c + create mode 100644 scripts/gdb/linux/page_owner.py + create mode 100644 scripts/gdb/linux/pgtable.py + create mode 100644 scripts/gdb/linux/slab.py + create mode 100644 scripts/gdb/linux/stackdepot.py + create mode 100644 scripts/gdb/linux/vmalloc.py +Merging kbuild/for-next (45a7371d5be2 docs: kbuild: Document search jump feature) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Makefile +Merge made by the 'ort' strategy. + .gitignore | 2 +- + Documentation/kbuild/kconfig.rst | 8 ++ + Makefile | 9 +- + include/linux/export.h | 4 +- + scripts/Makefile.modpost | 1 + + scripts/Makefile.package | 57 ++++++------ + scripts/depmod.sh | 27 +----- + scripts/kconfig/expr.h | 1 - + scripts/kconfig/lkc.h | 1 + + scripts/kconfig/lxdialog/dialog.h | 10 +- + scripts/kconfig/lxdialog/textbox.c | 68 +++++--------- + scripts/kconfig/mconf.c | 89 ++++++++++-------- + scripts/kconfig/menu.c | 30 +++--- + scripts/kconfig/nconf.c | 113 +++++++++++++++++++++-- + scripts/kconfig/nconf.gui.c | 37 +++++++- + scripts/kconfig/nconf.h | 5 + + scripts/mod/modpost.c | 172 +++++++++++++++++------------------ + scripts/mod/modpost.h | 22 ----- + scripts/package/builddeb | 29 +----- + scripts/package/debian/rules | 28 ++++++ + scripts/package/install-extmod-build | 39 ++++++++ + scripts/package/kernel.spec | 117 ++++++++++++++++++++++++ + scripts/package/mkdebian | 33 +------ + scripts/package/mkspec | 148 ++---------------------------- + scripts/remove-stale-files | 2 + + scripts/setlocalversion | 38 +++++--- + 26 files changed, 600 insertions(+), 490 deletions(-) + create mode 100755 scripts/package/debian/rules + create mode 100755 scripts/package/install-extmod-build + create mode 100644 scripts/package/kernel.spec +Merging clang-format/clang-format (5d0c230f1de8 Linux 6.5-rc4) +$ 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 (55b290501928 Merge remote-tracking branch 'torvalds/master' into perf-tools-next) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/admin-guide/perf/alibaba_pmu.rst | 5 + + MAINTAINERS | 2 + + tools/build/Makefile.build | 10 + + tools/build/feature/Makefile | 10 +- + tools/perf/Documentation/perf-bench.txt | 3 + + tools/perf/Documentation/perf.data-file-format.txt | 2 +- + tools/perf/Makefile.config | 16 +- + tools/perf/Makefile.perf | 6 +- + tools/perf/arch/x86/entry/syscalls/syscalltbl.sh | 2 +- + tools/perf/arch/x86/util/evlist.c | 7 +- + tools/perf/arch/x86/util/evsel.c | 7 +- + tools/perf/bench/Build | 1 + + tools/perf/bench/bench.h | 3 + + tools/perf/bench/uprobe.c | 198 ++++++++++ + tools/perf/builtin-bench.c | 8 + + tools/perf/builtin-diff.c | 4 +- + tools/perf/builtin-script.c | 22 +- + tools/perf/builtin-trace.c | 38 +- + tools/perf/check-headers.sh | 6 +- + tools/perf/pmu-events/Build | 6 + + .../arm64/freescale/yitian710/sys/ali_drw.json | 373 ++++++++++++++++++ + .../arm64/freescale/yitian710/sys/metrics.json | 20 + + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 11 +- + .../arch/x86/alderlaken/adln-metrics.json | 2 + + .../pmu-events/arch/x86/icelake/icl-metrics.json | 10 +- + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 10 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 4 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 165 ++++++++ + .../arch/x86/meteorlake/floating-point.json | 8 + + .../pmu-events/arch/x86/meteorlake/frontend.json | 56 +++ + .../pmu-events/arch/x86/meteorlake/memory.json | 80 ++++ + .../perf/pmu-events/arch/x86/meteorlake/other.json | 16 + + .../pmu-events/arch/x86/meteorlake/pipeline.json | 159 ++++++++ + .../arch/x86/rocketlake/rkl-metrics.json | 10 +- + .../pmu-events/arch/x86/sapphirerapids/other.json | 18 + + .../arch/x86/sapphirerapids/spr-metrics.json | 9 +- + .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 10 +- + tools/perf/pmu-events/jevents.py | 3 +- + tools/perf/scripts/python/Perf-Trace-Util/Build | 3 +- + tools/perf/scripts/python/bin/gecko-record | 2 + + tools/perf/scripts/python/bin/gecko-report | 3 + + tools/perf/scripts/python/gecko.py | 339 +++++++++++++++++ + tools/perf/tests/bpf.c | 5 +- + tools/perf/tests/builtin-test.c | 11 +- + tools/perf/tests/config-fragments/README | 7 + + tools/perf/tests/config-fragments/arm64 | 1 + + tools/perf/tests/config-fragments/config | 11 + + tools/perf/tests/shell/coresight/asm_pure_loop.sh | 2 +- + .../tests/shell/coresight/memcpy_thread_16k_10.sh | 2 +- + .../shell/coresight/thread_loop_check_tid_10.sh | 2 +- + .../shell/coresight/thread_loop_check_tid_2.sh | 2 +- + .../tests/shell/coresight/unroll_loop_thread_10.sh | 2 +- + tools/perf/tests/shell/lib/probe.sh | 1 + + tools/perf/tests/shell/lib/probe_vfs_getname.sh | 5 +- + tools/perf/tests/shell/lib/stat_output.sh | 1 + + tools/perf/tests/shell/lib/waiting.sh | 1 + + tools/perf/tests/shell/lock_contention.sh | 12 +- + tools/perf/tests/shell/probe_vfs_getname.sh | 4 +- + tools/perf/tests/shell/record+zstd_comp_decomp.sh | 14 +- + tools/perf/tests/shell/record_offcpu.sh | 6 +- + tools/perf/tests/shell/stat+csv_output.sh | 2 +- + tools/perf/tests/shell/stat+csv_summary.sh | 4 +- + tools/perf/tests/shell/stat+shadow_stat.sh | 4 +- + tools/perf/tests/shell/stat+std_output.sh | 3 +- + tools/perf/tests/shell/stat_bpf_counters.sh | 4 +- + tools/perf/tests/shell/stat_bpf_counters_cgrp.sh | 28 +- + tools/perf/tests/shell/test_arm_spe_fork.sh | 2 +- + .../tests/shell/test_perf_data_converter_json.sh | 2 +- + tools/perf/tests/shell/test_task_analyzer.sh | 2 +- + tools/perf/tests/shell/trace+probe_vfs_getname.sh | 6 +- + tools/perf/tests/stat.c | 2 +- + tools/perf/trace/beauty/arch_errno_names.sh | 15 +- + tools/perf/trace/beauty/x86_arch_prctl.sh | 6 +- + tools/perf/ui/browsers/hists.c | 60 ++- + tools/perf/util/Build | 46 ++- + tools/perf/util/annotate.c | 10 +- + tools/perf/util/bpf-filter.c | 4 +- + tools/perf/util/bpf-filter.y | 2 + + tools/perf/util/bpf-loader.c | 104 ------ + tools/perf/util/bpf_skel/bench_uprobe.bpf.c | 23 ++ + tools/perf/util/c++/Build | 3 + + tools/perf/util/event.c | 30 +- + tools/perf/util/event.h | 2 + + tools/perf/util/evsel.c | 1 + + tools/perf/util/expr.c | 4 +- + tools/perf/util/expr.y | 4 +- + tools/perf/util/machine.c | 4 +- + tools/perf/util/parse-events.c | 121 +++--- + tools/perf/util/parse-events.h | 30 +- + tools/perf/util/parse-events.l | 11 - + tools/perf/util/parse-events.y | 416 ++++++++------------- + tools/perf/util/pmu.c | 4 +- + tools/perf/util/pmu.y | 3 + + tools/perf/util/probe-event.c | 30 +- + tools/perf/util/probe-event.h | 1 - + tools/perf/util/scripting-engines/Build | 3 +- + tools/perf/util/setup.py | 3 + + tools/perf/util/stat.c | 2 +- + tools/perf/util/thread.c | 13 + + tools/perf/util/thread.h | 2 + + tools/scripts/utilities.mak | 20 + + 101 files changed, 2121 insertions(+), 671 deletions(-) + create mode 100644 tools/perf/bench/uprobe.c + create mode 100644 tools/perf/pmu-events/arch/arm64/freescale/yitian710/sys/ali_drw.json + create mode 100644 tools/perf/pmu-events/arch/arm64/freescale/yitian710/sys/metrics.json + create mode 100644 tools/perf/scripts/python/bin/gecko-record + create mode 100644 tools/perf/scripts/python/bin/gecko-report + create mode 100644 tools/perf/scripts/python/gecko.py + create mode 100644 tools/perf/tests/config-fragments/README + create mode 100644 tools/perf/tests/config-fragments/arm64 + create mode 100644 tools/perf/tests/config-fragments/config + create mode 100644 tools/perf/util/bpf_skel/bench_uprobe.bpf.c +Merging compiler-attributes/compiler-attributes (5d0c230f1de8 Linux 6.5-rc4) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (d069ed288ac7 swiotlb: optimize get_max_slots()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging mm/cma.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 13 +- + arch/arm/xen/mm.c | 10 +- + arch/arm64/mm/init.c | 2 - + arch/mips/pci/pci-octeon.c | 2 +- + arch/powerpc/kernel/dma-mask.c | 1 + + arch/x86/include/asm/xen/swiotlb-xen.h | 6 - + arch/x86/kernel/pci-dma.c | 29 +- + arch/x86/xen/setup.c | 6 + + drivers/base/core.c | 4 +- + drivers/pci/xen-pcifront.c | 6 - + drivers/xen/swiotlb-xen.c | 2 +- + include/linux/device.h | 10 +- + include/linux/dma-map-ops.h | 12 +- + include/linux/dma-mapping.h | 2 + + include/linux/swiotlb.h | 131 ++++- + include/xen/xen.h | 6 + + kernel/dma/Kconfig | 26 +- + kernel/dma/contiguous.c | 106 +++- + kernel/dma/direct.c | 2 +- + kernel/dma/mapping.c | 6 - + kernel/dma/swiotlb.c | 698 +++++++++++++++++++++--- + mm/cma.c | 10 +- + mm/slab_common.c | 5 +- + 23 files changed, 909 insertions(+), 186 deletions(-) +Merging asm-generic/master (cdea694d7616 asm-generic: partially revert "Unify uapi bitsperlong.h for arm64, riscv and loongarch") +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Merge made by the 'ort' strategy. + arch/arm64/include/uapi/asm/bitsperlong.h | 24 ++++++++++++++++++++++++ + arch/riscv/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ + tools/arch/arm64/include/uapi/asm/bitsperlong.h | 24 ++++++++++++++++++++++++ + tools/arch/riscv/include/uapi/asm/bitsperlong.h | 14 ++++++++++++++ + 4 files changed, 76 insertions(+) + create mode 100644 arch/arm64/include/uapi/asm/bitsperlong.h + create mode 100644 arch/riscv/include/uapi/asm/bitsperlong.h + create mode 100644 tools/arch/arm64/include/uapi/asm/bitsperlong.h + create mode 100644 tools/arch/riscv/include/uapi/asm/bitsperlong.h +Merging arc/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (a6f307c20d64 Revert part of ae1f8d793a19 ("ARM: 9304/1: add prototype for function called only from asm")) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Merge made by the 'ort' strategy. + arch/arm/common/locomo.c | 28 ++-- + arch/arm/include/asm/thread_info.h | 17 ++- + arch/arm/include/asm/vfp.h | 1 - + arch/arm/kernel/asm-offsets.c | 1 - + arch/arm/kernel/entry-armv.S | 254 ++----------------------------------- + arch/arm/kernel/hw_breakpoint.c | 8 +- + arch/arm/kernel/iwmmxt.S | 18 ++- + arch/arm/kernel/machine_kexec.c | 14 +- + arch/arm/kernel/pj4-cp0.c | 1 + + arch/arm/kernel/process.c | 1 - + arch/arm/kernel/ptrace.c | 2 - + arch/arm/kernel/xscale-cp0.c | 1 + + arch/arm/mm/proc-feroceon.S | 4 + + arch/arm/nwfpe/entry.S | 77 +++++++++++ + arch/arm/vfp/Makefile | 2 +- + arch/arm/vfp/entry.S | 31 ----- + arch/arm/vfp/vfp.h | 1 + + arch/arm/vfp/vfphw.S | 208 ++---------------------------- + arch/arm/vfp/vfpmodule.c | 208 +++++++++++++++++++++--------- + arch/arm64/kernel/hw_breakpoint.c | 4 +- + include/linux/perf_event.h | 22 +++- + 21 files changed, 339 insertions(+), 564 deletions(-) + delete mode 100644 arch/arm/vfp/entry.S +Merging arm64/for-next/core (78a2dc32d20a Merge branches 'for-next/cpufeature', 'for-next/docs', 'for-next/entry', 'for-next/errata', 'for-next/misc', 'for-next/mm', 'for-next/perf' and 'for-next/selftests' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging Documentation/arch/arm64/silicon-errata.rst +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/kernel/fpsimd.c +Auto-merging arch/arm64/kernel/ptrace.c +Auto-merging arch/arm64/mm/init.c +Merge made by the 'ort' strategy. + Documentation/arch/arm64/silicon-errata.rst | 16 +- + Documentation/arch/arm64/sme.rst | 2 +- + Documentation/devicetree/bindings/arm/pmu.yaml | 5 + + arch/arm64/Kconfig | 6 +- + arch/arm64/include/asm/hwcap.h | 1 + + arch/arm64/include/asm/kernel-pgtable.h | 27 --- + arch/arm64/include/asm/mmu.h | 1 - + arch/arm64/include/asm/pgtable.h | 8 +- + arch/arm64/include/asm/sdei.h | 6 + + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/kernel/cpufeature.c | 9 +- + arch/arm64/kernel/cpuidle.c | 2 - + arch/arm64/kernel/cpuinfo.c | 1 + + arch/arm64/kernel/entry-common.c | 32 +++ + arch/arm64/kernel/entry.S | 27 ++- + arch/arm64/kernel/fpsimd.c | 22 +- + arch/arm64/kernel/head.S | 4 +- + arch/arm64/kernel/pci.c | 2 - + arch/arm64/kernel/ptrace.c | 3 +- + arch/arm64/kernel/sdei.c | 3 + + arch/arm64/kernel/smp.c | 8 +- + arch/arm64/kernel/syscall.c | 33 --- + arch/arm64/kernel/vdso/vdso.lds.S | 2 - + arch/arm64/mm/init.c | 27 +++ + arch/arm64/mm/proc.S | 2 +- + drivers/firmware/arm_sdei.c | 19 ++ + drivers/perf/Kconfig | 2 +- + drivers/perf/alibaba_uncore_drw_pmu.c | 27 +++ + drivers/perf/amlogic/meson_ddr_pmu_core.c | 2 - + drivers/perf/arm-cci.c | 5 +- + drivers/perf/arm-cmn.c | 163 +++++++++++--- + drivers/perf/arm_dsu_pmu.c | 2 +- + drivers/perf/arm_pmu_platform.c | 1 - + drivers/perf/arm_pmuv3.c | 33 +-- + drivers/perf/arm_spe_pmu.c | 3 +- + drivers/perf/fsl_imx8_ddr_perf.c | 3 +- + drivers/perf/fsl_imx9_ddr_perf.c | 4 +- + drivers/perf/marvell_cn10k_ddr_pmu.c | 3 +- + drivers/perf/marvell_cn10k_tad_pmu.c | 3 +- + drivers/perf/xgene_pmu.c | 4 +- + include/linux/arm_sdei.h | 2 + + tools/include/linux/compiler.h | 18 ++ + tools/testing/selftests/arm64/Makefile | 2 + + tools/testing/selftests/arm64/abi/hwcap.c | 242 ++++++++++++++++----- + tools/testing/selftests/arm64/abi/syscall-abi.c | 38 ++-- + tools/testing/selftests/arm64/bti/compiler.h | 21 -- + tools/testing/selftests/arm64/bti/system.c | 4 +- + tools/testing/selftests/arm64/bti/system.h | 4 +- + tools/testing/selftests/arm64/bti/test.c | 1 - + tools/testing/selftests/arm64/fp/vec-syscfg.c | 127 ++++++++++- + .../selftests/arm64/signal/test_signals_utils.h | 27 ++- + 51 files changed, 725 insertions(+), 285 deletions(-) + delete mode 100644 tools/testing/selftests/arm64/bti/compiler.h +Merging arm-perf/for-next/perf (ac18ea1a8935 perf/arm-cmn: Add CMN-700 r3 support) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (eac502461628 soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../testing/sysfs-devices-platform-kunpeng_hccs | 81 + + Documentation/devicetree/bindings/arm/amlogic.yaml | 8 + + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 2 + + Documentation/devicetree/bindings/arm/fsl.yaml | 49 +- + .../devicetree/bindings/arm/omap/omap.txt | 99 - + Documentation/devicetree/bindings/arm/sunxi.yaml | 5 + + .../devicetree/bindings/arm/tegra/nvidia,nvec.txt | 21 - + .../bindings/arm/tegra/nvidia,tegra20-ahb.txt | 17 - + .../bindings/arm/tegra/nvidia,tegra20-flowctrl.txt | 18 - + Documentation/devicetree/bindings/arm/ti/k3.yaml | 13 + + Documentation/devicetree/bindings/arm/ti/omap.yaml | 176 ++ + .../bindings/clock/nvidia,tegra124-car.yaml | 4 +- + .../bindings/clock/starfive,jh7110-ispcrg.yaml | 87 + + .../bindings/clock/starfive,jh7110-pll.yaml | 46 + + .../bindings/clock/starfive,jh7110-stgcrg.yaml | 82 + + .../bindings/clock/starfive,jh7110-syscrg.yaml | 18 +- + .../bindings/clock/starfive,jh7110-voutcrg.yaml | 90 + + .../cpu/nvidia,tegra186-ccplex-cluster.yaml | 37 + + .../devicetree/bindings/crypto/ti,sa2ul.yaml | 14 +- + .../bindings/firmware/nvidia,tegra186-bpmp.yaml | 39 +- + .../arm,versatile-fpga-irq.txt | 4 +- + .../bindings/memory-controllers/ingenic,nemc.yaml | 1 + + .../memory-controllers/mc-peripheral-props.yaml | 2 + + .../devicetree/bindings/net/davicom,dm9000.yaml | 59 + + .../devicetree/bindings/net/davicom-dm9000.txt | 27 - + .../bindings/power/amlogic,meson-sec-pwrc.yaml | 3 +- + .../devicetree/bindings/pwm/pwm-samsung.yaml | 17 +- + .../nvidia,tegra264-bpmp-shmem.yaml | 47 + + .../bindings/reset/xlnx,zynqmp-reset.yaml | 1 + + .../bindings/serial/nvidia,tegra20-hsuart.txt | 73 - + .../bindings/serial/nvidia,tegra20-hsuart.yaml | 125 + + .../soc/starfive/starfive,jh7110-syscon.yaml | 93 + + .../devicetree/bindings/soc/tegra/nvidia,nvec.yaml | 84 + + .../bindings/soc/tegra/nvidia,tegra20-ahb.yaml | 40 + + .../soc/tegra/nvidia,tegra20-flowctrl.yaml | 41 + + .../devicetree/bindings/soc/ti/k3-ringacc.yaml | 9 +- + .../bindings/thermal/nvidia,tegra124-soctherm.txt | 238 -- + .../bindings/thermal/nvidia,tegra124-soctherm.yaml | 380 +++ + Documentation/process/maintainer-handbooks.rst | 1 + + Documentation/process/maintainer-soc-clean-dts.rst | 25 + + Documentation/process/maintainer-soc.rst | 4 +- + MAINTAINERS | 70 +- + arch/arm/arm-soc-for-next-changes.txt | 186 ++ + arch/arm/boot/dts/allwinner/Makefile | 19 + + arch/arm/boot/dts/aspeed/Makefile | 2 + + .../dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts | 129 +- + .../boot/dts/aspeed/aspeed-bmc-bytedance-g220a.dts | 18 +- + .../dts/aspeed/aspeed-bmc-facebook-cloudripper.dts | 10 +- + .../boot/dts/aspeed/aspeed-bmc-facebook-cmm.dts | 46 +- + .../boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts | 4 +- + .../boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts | 30 +- + .../dts/aspeed/aspeed-bmc-facebook-minipack.dts | 32 +- + .../dts/aspeed/aspeed-bmc-facebook-tiogapass.dts | 8 +- + .../dts/aspeed/aspeed-bmc-facebook-wedge100.dts | 2 +- + .../dts/aspeed/aspeed-bmc-facebook-wedge400.dts | 10 +- + .../boot/dts/aspeed/aspeed-bmc-facebook-yamp.dts | 2 +- + .../dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 624 +++++ + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 364 +-- + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 2883 +++++++++++--------- + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts | 691 +---- + .../boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts | 4 +- + .../boot/dts/aspeed/aspeed-bmc-inspur-nf5280m6.dts | 12 +- + .../dts/aspeed/aspeed-bmc-inventec-starscream.dts | 389 +++ + .../aspeed/aspeed-bmc-inventec-transformers.dts | 6 +- + .../boot/dts/aspeed/aspeed-bmc-lenovo-hr630.dts | 4 +- + .../boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts | 4 +- + arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts | 4 +- + .../arm/boot/dts/aspeed/aspeed-bmc-quanta-q71l.dts | 6 +- + arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts | 10 +- + .../arm/boot/dts/aspeed/aspeed-bmc-vegman-n110.dts | 14 +- + .../arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts | 10 +- + .../arm/boot/dts/aspeed/aspeed-bmc-vegman-sx20.dts | 14 +- + arch/arm/boot/dts/aspeed/aspeed-g6-pinctrl.dtsi | 10 + + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 20 + + .../dts/aspeed/ast2500-facebook-netbmc-common.dtsi | 4 + + arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi | 380 +++ + arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi | 1305 +++++++++ + arch/arm/boot/dts/hisilicon/hi3519.dtsi | 22 +- + .../boot/dts/marvell/armada-370-dlink-dns327l.dts | 83 +- + .../dts/marvell/armada-370-seagate-nas-4bay.dts | 43 +- + .../dts/marvell/armada-370-seagate-nas-xbay.dtsi | 46 +- + .../armada-370-seagate-personal-cloud-2bay.dts | 21 +- + .../marvell/armada-370-seagate-personal-cloud.dtsi | 43 +- + .../dts/marvell/armada-370-synology-ds213j.dts | 54 +- + .../dts/marvell/armada-382-rd-ac3x-48g4x2xl.dts | 6 +- + .../boot/dts/marvell/armada-xp-synology-ds414.dts | 105 +- + arch/arm/boot/dts/marvell/dove-cm-a510.dtsi | 18 +- + arch/arm/boot/dts/marvell/dove-cubox.dts | 29 +- + arch/arm/boot/dts/marvell/dove-d3plug.dts | 29 +- + arch/arm/boot/dts/marvell/dove-sbc-a510.dts | 28 +- + arch/arm/boot/dts/marvell/kirkwood-l-50.dts | 4 +- + arch/arm/boot/dts/marvell/pxa168.dtsi | 2 +- + arch/arm/boot/dts/marvell/pxa910.dtsi | 2 +- + arch/arm/boot/dts/microchip/Makefile | 15 +- + .../dts/microchip/at91-sama5d3_ksz9477_evb.dts | 13 + + arch/arm/boot/dts/microchip/at91-vinco.dts | 4 +- + arch/arm/boot/dts/microchip/at91rm9200.dtsi | 12 +- + arch/arm/boot/dts/microchip/at91sam9260.dtsi | 14 +- + arch/arm/boot/dts/microchip/at91sam9261.dtsi | 2 +- + arch/arm/boot/dts/microchip/at91sam9g20ek_2mmc.dts | 2 +- + arch/arm/boot/dts/microchip/at91sam9g45.dtsi | 2 +- + arch/arm/boot/dts/microchip/at91sam9m10g45ek.dts | 2 +- + arch/arm/boot/dts/microchip/at91sam9rl.dtsi | 2 +- + arch/arm/boot/dts/microchip/at91sam9x5.dtsi | 2 +- + arch/arm/boot/dts/microchip/lan966x-pcb8290.dts | 2 +- + arch/arm/boot/dts/microchip/sama5d2.dtsi | 6 +- + arch/arm/boot/dts/microchip/sama5d3.dtsi | 2 +- + arch/arm/boot/dts/microchip/sama5d4.dtsi | 2 +- + arch/arm/boot/dts/microchip/sama7g5.dtsi | 40 +- + arch/arm/boot/dts/nspire/nspire-classic.dtsi | 2 - + arch/arm/boot/dts/nspire/nspire-clp.dts | 93 +- + arch/arm/boot/dts/nspire/nspire-cx.dts | 95 +- + arch/arm/boot/dts/nspire/nspire-tp.dts | 93 +- + arch/arm/boot/dts/nspire/nspire.dtsi | 26 +- + arch/arm/boot/dts/nuvoton/nuvoton-npcm730-gbs.dts | 16 +- + arch/arm/boot/dts/nuvoton/nuvoton-npcm730-gsj.dts | 2 +- + arch/arm/boot/dts/nuvoton/nuvoton-npcm730-kudo.dts | 8 +- + .../dts/nuvoton/nuvoton-npcm750-runbmc-olympus.dts | 4 +- + arch/arm/boot/dts/nvidia/tegra114-asus-tf701t.dts | 2 + + arch/arm/boot/dts/nvidia/tegra114-dalmore.dts | 2 + + arch/arm/boot/dts/nvidia/tegra114-roth.dts | 2 + + arch/arm/boot/dts/nvidia/tegra114-tn7.dts | 2 + + arch/arm/boot/dts/nvidia/tegra114.dtsi | 4 - + arch/arm/boot/dts/nvidia/tegra124-apalis-eval.dts | 2 + + .../boot/dts/nvidia/tegra124-apalis-v1.2-eval.dts | 2 + + arch/arm/boot/dts/nvidia/tegra124-apalis-v1.2.dtsi | 3 + + arch/arm/boot/dts/nvidia/tegra124-apalis.dtsi | 3 + + arch/arm/boot/dts/nvidia/tegra124-jetson-tk1.dts | 4 + + arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi | 2 + + arch/arm/boot/dts/nvidia/tegra124-venice2.dts | 2 + + arch/arm/boot/dts/nvidia/tegra124.dtsi | 4 - + .../boot/dts/nvidia/tegra20-acer-a500-picasso.dts | 2 + + arch/arm/boot/dts/nvidia/tegra20-asus-tf101.dts | 4 + + .../boot/dts/nvidia/tegra20-colibri-eval-v3.dts | 2 + + arch/arm/boot/dts/nvidia/tegra20-colibri-iris.dts | 2 + + arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi | 2 + + arch/arm/boot/dts/nvidia/tegra20-harmony.dts | 2 + + arch/arm/boot/dts/nvidia/tegra20-paz00.dts | 23 +- + arch/arm/boot/dts/nvidia/tegra20-seaboard.dts | 2 + + arch/arm/boot/dts/nvidia/tegra20-tamonten.dtsi | 2 + + arch/arm/boot/dts/nvidia/tegra20-trimslice.dts | 2 + + arch/arm/boot/dts/nvidia/tegra20-ventana.dts | 2 + + arch/arm/boot/dts/nvidia/tegra20.dtsi | 5 - + arch/arm/boot/dts/nvidia/tegra30-apalis-eval.dts | 2 + + .../boot/dts/nvidia/tegra30-apalis-v1.1-eval.dts | 2 + + arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1.dtsi | 3 + + arch/arm/boot/dts/nvidia/tegra30-apalis.dtsi | 3 + + .../nvidia/tegra30-asus-nexus7-grouper-common.dtsi | 14 +- + .../nvidia/tegra30-asus-transformer-common.dtsi | 2 + + arch/arm/boot/dts/nvidia/tegra30-beaver.dts | 2 + + arch/arm/boot/dts/nvidia/tegra30-cardhu.dtsi | 3 + + .../boot/dts/nvidia/tegra30-colibri-eval-v3.dts | 2 + + arch/arm/boot/dts/nvidia/tegra30-colibri.dtsi | 2 + + arch/arm/boot/dts/nvidia/tegra30-ouya.dts | 3 + + .../boot/dts/nvidia/tegra30-pegatron-chagall.dts | 4 +- + arch/arm/boot/dts/nvidia/tegra30.dtsi | 5 - + arch/arm/boot/dts/nxp/imx/imx1-apf9328.dts | 6 +- + .../imx25-eukrea-mbimxsd25-baseboard-cmo-qvga.dts | 25 +- + arch/arm/boot/dts/nxp/imx/imx25-karo-tx25.dts | 71 +- + arch/arm/boot/dts/nxp/imx/imx25-pdk.dts | 62 +- + arch/arm/boot/dts/nxp/imx/imx27-apf27dev.dts | 19 +- + .../nxp/imx/imx27-eukrea-mbimxsd27-baseboard.dts | 25 +- + .../dts/nxp/imx/imx27-phytec-phycard-s-rdk.dts | 19 +- + .../boot/dts/nxp/imx/imx27-phytec-phycore-rdk.dts | 21 +- + .../boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi | 30 +- + arch/arm/boot/dts/nxp/imx/imx27.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx31.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx50-evk.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx50-kobo-aura.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx50.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx51-babbage.dts | 25 +- + .../nxp/imx/imx51-eukrea-mbimxsd51-baseboard.dts | 23 +- + arch/arm/boot/dts/nxp/imx/imx51.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx53-ard.dts | 19 +- + arch/arm/boot/dts/nxp/imx/imx53-m53.dtsi | 34 +- + arch/arm/boot/dts/nxp/imx/imx53-m53evk.dts | 34 +- + arch/arm/boot/dts/nxp/imx/imx53-mba53.dts | 33 +- + arch/arm/boot/dts/nxp/imx/imx53-qsb-common.dtsi | 65 +- + arch/arm/boot/dts/nxp/imx/imx53-smd.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx53-tqma53.dtsi | 19 +- + .../arm/boot/dts/nxp/imx/imx53-voipac-dmm-668.dtsi | 36 +- + arch/arm/boot/dts/nxp/imx/imx53.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6dl-b1x5pv2.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6dl-riotboard.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6q-arm2.dts | 36 +- + arch/arm/boot/dts/nxp/imx/imx6q-bosch-acc.dts | 2 - + arch/arm/boot/dts/nxp/imx/imx6q-bx50v3.dtsi | 1 + + arch/arm/boot/dts/nxp/imx/imx6q-cm-fx6.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dts | 55 +- + arch/arm/boot/dts/nxp/imx/imx6q-dms-ba16.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6q-gk802.dts | 19 +- + arch/arm/boot/dts/nxp/imx/imx6q-gw5400-a.dts | 67 +- + arch/arm/boot/dts/nxp/imx/imx6q-h100.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6q-pistachio.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6q-prti6q.dts | 5 +- + arch/arm/boot/dts/nxp/imx/imx6q-tbs2910.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6qdl-apf6dev.dtsi | 1 + + .../boot/dts/nxp/imx/imx6qdl-aristainetos2.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi | 2 +- + .../boot/dts/nxp/imx/imx6qdl-dfi-fs700-m60.dtsi | 30 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw52xx.dtsi | 1 + + arch/arm/boot/dts/nxp/imx/imx6qdl-gw53xx.dtsi | 1 + + arch/arm/boot/dts/nxp/imx/imx6qdl-gw54xx.dtsi | 85 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-mba6.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-mba6a.dtsi | 2 + + arch/arm/boot/dts/nxp/imx/imx6qdl-mba6b.dtsi | 2 + + arch/arm/boot/dts/nxp/imx/imx6qdl-nit6xlite.dtsi | 75 +- + .../boot/dts/nxp/imx/imx6qdl-nitrogen6_max.dtsi | 130 +- + .../boot/dts/nxp/imx/imx6qdl-nitrogen6_som2.dtsi | 1 + + arch/arm/boot/dts/nxp/imx/imx6qdl-nitrogen6x.dtsi | 115 +- + .../boot/dts/nxp/imx/imx6qdl-phytec-pbab01.dtsi | 26 +- + .../boot/dts/nxp/imx/imx6qdl-phytec-pfla02.dtsi | 50 +- + .../dts/nxp/imx/imx6qdl-phytec-phycore-som.dtsi | 8 + + arch/arm/boot/dts/nxp/imx/imx6qdl-rex.dtsi | 58 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-sabrelite.dtsi | 137 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi | 1 + + arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi | 1 + + arch/arm/boot/dts/nxp/imx/imx6qdl-ts7970.dtsi | 1 + + arch/arm/boot/dts/nxp/imx/imx6qdl-udoo.dtsi | 36 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-wandboard.dtsi | 1 + + arch/arm/boot/dts/nxp/imx/imx6sx-nitrogen6sx.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6sx.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi | 4 +- + .../boot/dts/nxp/imx/imx6ul-ccimx6ulsbcexpress.dts | 2 +- + .../arm/boot/dts/nxp/imx/imx6ul-ccimx6ulsbcpro.dts | 6 +- + arch/arm/boot/dts/nxp/imx/imx6ul-ccimx6ulsom.dtsi | 1 - + arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts | 1 - + .../boot/dts/nxp/imx/imx6ul-kontron-bl-common.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6ul-pico-dwarf.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6ul-pico-hobbit.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx6ul-pico-pi.dts | 1 + + .../boot/dts/nxp/imx/imx6ul-tx6ul-mainboard.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6ul.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi | 1 - + arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx7d-pico-dwarf.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx7d-pico-nymph.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx7d-pico.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts | 5 + + arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi | 3 +- + arch/arm/boot/dts/nxp/ls/Makefile | 1 + + arch/arm/boot/dts/nxp/ls/ls1021a-iot.dts | 10 +- + .../dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts | 405 +++ + arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi | 107 + + arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts | 23 +- + arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts | 19 +- + arch/arm/boot/dts/nxp/mxs/imx23.dtsi | 21 +- + arch/arm/boot/dts/nxp/mxs/imx28-apf28dev.dts | 34 +- + arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts | 23 +- + arch/arm/boot/dts/nxp/mxs/imx28-cfa10049.dts | 23 +- + arch/arm/boot/dts/nxp/mxs/imx28-cfa10057.dts | 23 +- + arch/arm/boot/dts/nxp/mxs/imx28-cfa10058.dts | 23 +- + .../boot/dts/nxp/mxs/imx28-eukrea-mbmx283lc.dts | 2 +- + .../boot/dts/nxp/mxs/imx28-eukrea-mbmx28lc.dtsi | 82 +- + arch/arm/boot/dts/nxp/mxs/imx28-m28.dtsi | 19 +- + arch/arm/boot/dts/nxp/mxs/imx28-m28cu3.dts | 66 +- + arch/arm/boot/dts/nxp/mxs/imx28-m28evk.dts | 45 +- + arch/arm/boot/dts/nxp/mxs/imx28-sps1.dts | 19 +- + arch/arm/boot/dts/nxp/mxs/imx28.dtsi | 24 +- + arch/arm/boot/dts/nxp/vf/vf610-twr.dts | 31 +- + arch/arm/boot/dts/nxp/vf/vfxxx.dtsi | 4 +- + .../boot/dts/renesas/r8a7740-armadillo800eva.dts | 2 +- + .../arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts | 2 +- + arch/arm/boot/dts/samsung/Makefile | 3 + + arch/arm/boot/dts/samsung/exynos4210-i9100.dts | 4 +- + arch/arm/boot/dts/samsung/exynos4210-trats.dts | 8 +- + .../boot/dts/samsung/exynos4210-universal_c210.dts | 4 +- + arch/arm/boot/dts/samsung/exynos4212-tab3-3g8.dts | 29 + + arch/arm/boot/dts/samsung/exynos4212-tab3-lte8.dts | 44 + + .../arm/boot/dts/samsung/exynos4212-tab3-wifi8.dts | 26 + + arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 1310 +++++++++ + arch/arm/boot/dts/samsung/exynos4412-midas.dtsi | 52 +- + .../boot/dts/samsung/exynos5250-snow-common.dtsi | 8 +- + arch/arm/boot/dts/samsung/s3c6410-mini6410.dts | 2 +- + arch/arm/boot/dts/samsung/s5pv210-pinctrl.dtsi | 12 +- + arch/arm/boot/dts/samsung/s5pv210-smdkv210.dts | 2 +- + arch/arm/boot/dts/st/spear1340.dtsi | 8 +- + arch/arm/boot/dts/st/spear13xx.dtsi | 24 +- + arch/arm/boot/dts/ti/davinci/da850-evm.dts | 4 +- + arch/arm/boot/dts/ti/davinci/da850-lcdk.dts | 4 +- + arch/arm/boot/dts/ti/davinci/da850-lego-ev3.dts | 4 +- + arch/arm/boot/dts/ti/davinci/da850.dtsi | 67 +- + arch/arm/boot/dts/ti/keystone/keystone-k2l.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/am335x-boneblack.dts | 3 +- + .../boot/dts/ti/omap/am335x-osd335x-common.dtsi | 3 +- + arch/arm/boot/dts/ti/omap/am33xx-l4.dtsi | 10 +- + arch/arm/boot/dts/ti/omap/am33xx.dtsi | 30 +- + arch/arm/boot/dts/ti/omap/am3517.dtsi | 6 +- + arch/arm/boot/dts/ti/omap/am4372.dtsi | 15 +- + arch/arm/boot/dts/ti/omap/am437x-idk-evm.dts | 14 +- + arch/arm/boot/dts/ti/omap/am437x-l4.dtsi | 12 +- + arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts | 6 - + arch/arm/boot/dts/ti/omap/dra7.dtsi | 9 +- + arch/arm/boot/dts/ti/omap/dra76x.dtsi | 3 +- + arch/arm/boot/dts/ti/omap/omap34xx.dtsi | 12 +- + arch/arm/boot/dts/ti/omap/omap36xx.dtsi | 14 +- + arch/arm/boot/dts/ti/omap/omap5-board-common.dtsi | 6 +- + arch/arm/configs/multi_v7_defconfig | 12 + + arch/arm/include/asm/hardware/cache-l2x0.h | 2 + + arch/arm/mach-alpine/alpine_machine.c | 2 - + arch/arm/mach-at91/pm.c | 1 + + arch/arm/mach-at91/samv7.c | 7 - + arch/arm/mach-berlin/berlin.c | 5 - + arch/arm/mach-dove/common.c | 2 - + arch/arm/mach-hisi/hotplug.c | 1 - + arch/arm/mach-hpe/gxp.c | 1 - + arch/arm/mach-imx/mach-imx1.c | 4 - + arch/arm/mach-imx/mach-imx25.c | 5 - + arch/arm/mach-imx/mach-imx27.c | 6 - + arch/arm/mach-imx/mach-imx35.c | 8 - + arch/arm/mach-imx/mach-imx50.c | 1 - + arch/arm/mach-imx/mach-imx51.c | 5 +- + arch/arm/mach-imx/mach-imx53.c | 8 - + arch/arm/mach-imx/mach-imx6sx.c | 2 - + arch/arm/mach-imx/mach-imx6ul.c | 4 - + arch/arm/mach-imx/mach-imx7d.c | 2 +- + arch/arm/mach-imx/pm-imx5.c | 1 + + arch/arm/mach-imx/pm-imx6.c | 1 + + arch/arm/mach-keystone/Makefile | 3 - + arch/arm/mach-keystone/keystone.c | 50 +- + arch/arm/mach-keystone/keystone.h | 16 - + arch/arm/mach-keystone/memory.h | 18 - + arch/arm/mach-keystone/pm_domain.c | 50 - + arch/arm/mach-meson/meson.c | 1 - + arch/arm/mach-mmp/mmp-dt.c | 3 - + arch/arm/mach-mmp/mmp2-dt.c | 4 - + arch/arm/mach-mmp/mmp3.c | 4 - + arch/arm/mach-mvebu/kirkwood.c | 1 + + arch/arm/mach-mvebu/pmsu.c | 2 +- + arch/arm/mach-nomadik/cpu-8815.c | 13 - + arch/arm/mach-npcm/platsmp.c | 3 - + arch/arm/mach-nspire/Kconfig | 2 + + arch/arm/mach-nspire/mmio.h | 16 - + arch/arm/mach-nspire/nspire.c | 24 - + arch/arm/mach-omap2/board-generic.c | 3 +- + arch/arm/mach-omap2/omap4-common.c | 3 +- + arch/arm/mach-omap2/omap_hwmod.c | 45 +- + arch/arm/mach-omap2/powerdomain.c | 2 +- + arch/arm/mach-pxa/pxa-dt.c | 6 - + arch/arm/mach-rockchip/rockchip.c | 6 +- + arch/arm/mach-s5pv210/s5pv210.c | 2 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 1 - + arch/arm/mach-spear/spear1340.c | 2 +- + arch/arm/mach-sti/board-dt.c | 2 - + arch/arm/mach-ux500/Makefile | 1 - + arch/arm/mach-ux500/cpu-db8500.c | 5 - + arch/arm/mach-ux500/pm_domains.h | 17 - + arch/arm/mach-versatile/realview.c | 2 - + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../dts/allwinner/sun50i-h616-orangepi-zero.dtsi | 134 + + .../dts/allwinner/sun50i-h616-orangepi-zero2.dts | 119 +- + .../dts/allwinner/sun50i-h618-orangepi-zero3.dts | 94 + + arch/arm64/boot/dts/amlogic/Makefile | 2 + + arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 35 + + .../boot/dts/amlogic/amlogic-t7-a311d2-an400.dts | 39 + + .../dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts | 54 + + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 155 ++ + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +- + .../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 1 - + .../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 2 +- + .../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 2 +- + .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 2 - + .../arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts | 1 - + .../boot/dts/amlogic/meson-g12b-gtking-pro.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 1 - + .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 3 +- + .../boot/dts/amlogic/meson-g12b-odroid-n2l.dts | 1 - + .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 1 - + .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 1 - + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 - + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 1 - + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 1 - + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 1 - + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 1 - + .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 1 - + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 1 - + .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 1 - + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 1 - + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 1 - + .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 1 - + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 1 - + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 1 - + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 1 - + .../boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 1 - + .../boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 1 - + .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 2 - + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 1 - + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 1 - + .../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 1 - + arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 1 - + arch/arm64/boot/dts/arm/corstone1000.dtsi | 20 +- + arch/arm64/boot/dts/arm/foundation-v8-gicv3.dtsi | 10 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 1 - + arch/arm64/boot/dts/exynos/exynos7.dtsi | 8 +- + arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts | 6 + + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 13 +- + arch/arm64/boot/dts/freescale/Makefile | 14 +- + .../fsl-ls1028a-kontron-kbox-a-230-ls.dts | 12 + + .../freescale/fsl-ls1028a-kontron-sl28-var1.dts | 2 + + .../freescale/fsl-ls1028a-kontron-sl28-var2.dts | 8 + + .../freescale/fsl-ls1028a-kontron-sl28-var4.dts | 2 + + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 17 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 15 + + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 2 +- + .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 10 +- + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 1 - + arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi | 8 +- + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 5 +- + .../arm64/boot/dts/freescale/imx8mm-beacon-kit.dts | 131 + + .../boot/dts/freescale/imx8mm-beacon-som.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mm-emcon.dtsi | 24 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 48 + + .../dts/freescale/imx8mm-phyboard-polis-rdk.dts | 51 +- + .../boot/dts/freescale/imx8mm-phycore-som.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 2 +- + .../freescale/imx8mm-venice-gw72xx-0x-rpidsi.dtso | 90 + + .../freescale/imx8mm-venice-gw73xx-0x-rpidsi.dtso | 90 + + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 53 +- + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 35 +- + .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 2 +- + .../boot/dts/freescale/imx8mm-venice-gw7904.dts | 20 +- + .../boot/dts/freescale/imx8mm-venice-gw7905-0x.dts | 28 + + .../boot/dts/freescale/imx8mm-venice-gw7905.dtsi | 303 ++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 4 +- + .../arm64/boot/dts/freescale/imx8mn-beacon-kit.dts | 133 + + .../boot/dts/freescale/imx8mn-beacon-som.dtsi | 2 +- + .../dts/freescale/imx8mn-bsh-smm-s2-common.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mn-ddr4-evk.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dts | 6 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 118 +- + .../arm64/boot/dts/freescale/imx8mn-tqma8mqnl.dtsi | 2 + + .../boot/dts/freescale/imx8mn-var-som-symphony.dts | 32 +- + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 35 +- + .../boot/dts/freescale/imx8mp-debix-model-a.dts | 27 +- + .../dts/freescale/imx8mp-debix-som-a-bmb-08.dts | 472 ++++ + .../boot/dts/freescale/imx8mp-debix-som-a.dtsi | 285 ++ + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 66 + + .../boot/dts/freescale/imx8mp-msc-sm2s-ep1.dts | 1 - + arch/arm64/boot/dts/freescale/imx8mp-msc-sm2s.dtsi | 2 +- + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 8 +- + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 155 +- + .../boot/dts/freescale/imx8mp-venice-gw71xx-2x.dts | 19 + + .../boot/dts/freescale/imx8mp-venice-gw71xx.dtsi | 236 ++ + .../boot/dts/freescale/imx8mp-venice-gw72xx-2x.dts | 19 + + .../boot/dts/freescale/imx8mp-venice-gw72xx.dtsi | 371 +++ + .../boot/dts/freescale/imx8mp-venice-gw73xx-2x.dts | 19 + + .../boot/dts/freescale/imx8mp-venice-gw73xx.dtsi | 414 +++ + .../dts/freescale/imx8mp-venice-gw74xx-rpidsi.dtso | 87 + + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 267 +- + .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 56 +- + .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 55 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 20 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 32 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r2.dts | 6 +- + .../boot/dts/freescale/imx8mq-librem5-r3.dtsi | 12 +- + .../arm64/boot/dts/freescale/imx8mq-librem5-r4.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 7 +- + arch/arm64/boot/dts/freescale/imx8mq-sr-som.dtsi | 2 +- + .../boot/dts/freescale/imx8mq-tqma8mq-mba8mx.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 200 +- + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 4 + + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 212 +- + arch/arm64/boot/dts/freescale/imx8qxp-ai_ml.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 145 +- + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 73 +- + .../boot/dts/freescale/imx8x-colibri-aster.dtsi | 2 +- + .../boot/dts/freescale/imx8x-colibri-iris.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 56 + + .../dts/freescale/imx93-tqma9352-mba93xxla.dts | 641 +++++ + arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi | 213 ++ + arch/arm64/boot/dts/freescale/imx93.dtsi | 81 +- + arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 4 +- + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 24 +- + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 8 +- + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 8 +- + arch/arm64/boot/dts/lg/lg1312.dtsi | 2 + + arch/arm64/boot/dts/lg/lg1313.dtsi | 2 + + arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 20 +- + .../boot/dts/marvell/armada-7040-mochabin.dts | 2 +- + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 4 +- + arch/arm64/boot/dts/microchip/sparx5.dtsi | 12 +- + arch/arm64/boot/dts/nuvoton/nuvoton-npcm845.dtsi | 2 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 2 + + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 3 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 3 +- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 2 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 6 +- + arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 2 + + arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 2 + + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 2 + + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 5 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 5 +- + .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi | 1 + + .../arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi | 1 + + arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi | 1991 ++++++++++++++ + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 2155 +-------------- + .../arm64/boot/dts/nvidia/tegra234-p3737-0000.dtsi | 41 + + .../dts/nvidia/tegra234-p3740-0002+p3701-0008.dts | 184 +- + .../arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi | 78 + + arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi | 8 +- + .../dts/nvidia/tegra234-p3768-0000+p3767-0000.dts | 66 +- + .../dts/nvidia/tegra234-p3768-0000+p3767-0005.dts | 7 +- + .../arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi | 27 +- + arch/arm64/boot/dts/nvidia/tegra234-sim-vdk.dts | 2 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 393 ++- + arch/arm64/boot/dts/renesas/gmsl-cameras.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 4 +- + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 20 + + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 15 + + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 70 + + arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts | 11 + + arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts | 12 + + arch/arm64/boot/dts/renesas/r9a07g044l2-smarc.dts | 21 + + arch/arm64/boot/dts/renesas/r9a07g054l2-smarc.dts | 20 + + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 28 + + arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi | 4 +- + .../boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi | 20 + + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 22 +- + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 23 +- + .../boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi | 9 + + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 26 +- + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 14 +- + .../boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi | 6 + + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 4 +- + arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi | 13 + + arch/arm64/boot/dts/tesla/fsd.dtsi | 4 +- + arch/arm64/boot/dts/ti/Makefile | 19 + + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 52 +- + arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 24 + + arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi | 58 + + arch/arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi | 50 + + arch/arm64/boot/dts/ti/k3-am62-verdin-yavia.dtsi | 5 + + arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 45 +- + arch/arm64/boot/dts/ti/k3-am62.dtsi | 8 + + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 154 +- + arch/arm64/boot/dts/ti/k3-am625-sk.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 10 +- + arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi | 24 + + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 35 +- + arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 136 + + arch/arm64/boot/dts/ti/k3-am62p-mcu.dtsi | 15 + + arch/arm64/boot/dts/ti/k3-am62p-wakeup.dtsi | 32 + + arch/arm64/boot/dts/ti/k3-am62p.dtsi | 122 + + arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 116 + + arch/arm64/boot/dts/ti/k3-am62p5.dtsi | 107 + + arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 93 +- + arch/arm64/boot/dts/ti/k3-am62x-sk-hdmi-audio.dtso | 40 + + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 48 +- + arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi | 1 + + .../dts/ti/k3-am64-tqma64xxl-mbax4xxl-sdcard.dtso | 22 + + .../dts/ti/k3-am64-tqma64xxl-mbax4xxl-wlan.dtso | 22 + + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 4 +- + .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 3 +- + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 8 +- + .../boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts | 872 ++++++ + arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi | 253 ++ + .../boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 35 +- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 24 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 5 +- + .../boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts | 4 +- + arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 165 +- + arch/arm64/boot/dts/ti/k3-am69-sk.dts | 12 + + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 22 +- + .../dts/ti/k3-j7200-evm-quad-port-eth-exp.dtso | 2 +- + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 23 +- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 21 +- + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 63 +- + .../boot/dts/ti/k3-j721e-common-proc-board.dts | 42 +- + .../boot/dts/ti/k3-j721e-evm-gesi-exp-board.dtso | 196 ++ + .../dts/ti/k3-j721e-evm-quad-port-eth-exp.dtso | 2 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 48 +- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 25 +- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 60 +- + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 17 +- + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 88 +- + .../boot/dts/ti/k3-j721s2-evm-gesi-exp-board.dtso | 85 + + arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 192 +- + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 9 +- + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 15 +- + arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 91 +- + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 41 +- + arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 18 +- + arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-pinctrl.h | 12 + + arch/arm64/boot/dts/ti/k3-serdes.h | 204 ++ + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 + + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 5 +- + .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 5 +- + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 15 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 4 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 4 +- + .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 8 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 8 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revC.dts | 4 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 8 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 8 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 201 +- + arch/arm64/configs/defconfig | 30 + + arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 44 + + arch/riscv/boot/dts/renesas/rzfive-smarc-som.dtsi | 2 + + arch/riscv/boot/dts/starfive/Makefile | 6 + + arch/riscv/boot/dts/starfive/jh7100.dtsi | 37 + + .../jh7110-starfive-visionfive-2-v1.2a.dts | 13 + + .../jh7110-starfive-visionfive-2-v1.3b.dts | 31 + + .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 284 ++ + arch/riscv/boot/dts/starfive/jh7110.dtsi | 503 +++- + drivers/Makefile | 1 + + drivers/bus/fsl-mc/fsl-mc-bus.c | 1 + + drivers/bus/fsl-mc/fsl-mc-msi.c | 2 - + drivers/bus/hisi_lpc.c | 2 +- + drivers/bus/imx-weim.c | 2 +- + drivers/bus/omap_l3_smx.c | 1 - + drivers/bus/simple-pm-bus.c | 2 + + drivers/bus/sunxi-rsb.c | 6 +- + drivers/bus/tegra-gmi.c | 4 +- + drivers/bus/ti-pwmss.c | 2 +- + drivers/bus/vexpress-config.c | 4 +- + drivers/firmware/arm_scmi/driver.c | 4 +- + drivers/firmware/arm_scmi/perf.c | 430 ++- + drivers/firmware/imx/imx-dsp.c | 1 - + drivers/firmware/imx/imx-scu-irq.c | 119 +- + drivers/firmware/imx/imx-scu-soc.c | 20 +- + drivers/firmware/imx/imx-scu.c | 10 +- + drivers/firmware/meson/meson_sm.c | 2 + + drivers/firmware/mtk-adsp-ipc.c | 1 - + drivers/firmware/raspberrypi.c | 1 + + drivers/firmware/scpi_pm_domain.c | 3 +- + drivers/firmware/stratix10-rsu.c | 1 - + drivers/firmware/tegra/bpmp.c | 3 +- + drivers/firmware/ti_sci.c | 49 +- + drivers/firmware/xilinx/zynqmp.c | 1 + + drivers/genpd/Makefile | 16 + + drivers/genpd/actions/Makefile | 3 + + drivers/{soc => genpd}/actions/owl-sps-helper.c | 0 + drivers/{soc => genpd}/actions/owl-sps.c | 0 + drivers/genpd/amlogic/Makefile | 4 + + drivers/{soc => genpd}/amlogic/meson-ee-pwrc.c | 3 +- + drivers/{soc => genpd}/amlogic/meson-gx-pwrc-vpu.c | 3 +- + drivers/{soc => genpd}/amlogic/meson-secure-pwrc.c | 30 +- + drivers/genpd/apple/Makefile | 2 + + .../apple/pmgr-pwrstate.c} | 0 + drivers/genpd/bcm/Makefile | 5 + + drivers/{soc/bcm/bcm63xx => genpd/bcm}/bcm-pmb.c | 0 + drivers/{soc => genpd}/bcm/bcm2835-power.c | 0 + .../{soc/bcm/bcm63xx => genpd/bcm}/bcm63xx-power.c | 0 + drivers/{soc => genpd}/bcm/raspberrypi-power.c | 0 + drivers/genpd/imx/Makefile | 7 + + drivers/{soc => genpd}/imx/gpc.c | 0 + drivers/{soc => genpd}/imx/gpcv2.c | 2 +- + drivers/{soc => genpd}/imx/imx8m-blk-ctrl.c | 3 +- + drivers/{soc => genpd}/imx/imx8mp-blk-ctrl.c | 2 +- + drivers/{soc => genpd}/imx/imx93-blk-ctrl.c | 17 +- + drivers/{soc => genpd}/imx/imx93-pd.c | 2 +- + drivers/genpd/mediatek/Makefile | 3 + + .../{soc => genpd}/mediatek/mt6795-pm-domains.h | 0 + .../{soc => genpd}/mediatek/mt8167-pm-domains.h | 0 + .../{soc => genpd}/mediatek/mt8173-pm-domains.h | 0 + .../{soc => genpd}/mediatek/mt8183-pm-domains.h | 0 + .../{soc => genpd}/mediatek/mt8186-pm-domains.h | 0 + .../{soc => genpd}/mediatek/mt8188-pm-domains.h | 0 + .../{soc => genpd}/mediatek/mt8192-pm-domains.h | 0 + .../{soc => genpd}/mediatek/mt8195-pm-domains.h | 0 + drivers/{soc => genpd}/mediatek/mtk-pm-domains.c | 0 + drivers/{soc => genpd}/mediatek/mtk-pm-domains.h | 0 + drivers/{soc => genpd}/mediatek/mtk-scpsys.c | 0 + drivers/genpd/qcom/Makefile | 4 + + drivers/{soc => genpd}/qcom/cpr.c | 0 + drivers/{soc => genpd}/qcom/rpmhpd.c | 0 + drivers/{soc => genpd}/qcom/rpmpd.c | 0 + drivers/genpd/renesas/Makefile | 30 + + drivers/{soc => genpd}/renesas/r8a7742-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a7743-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a7745-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a77470-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a774a1-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a774b1-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a774c0-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a774e1-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a7779-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a7790-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a7791-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a7792-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a7794-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a7795-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a7796-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a77965-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a77970-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a77980-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a77990-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a77995-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a779a0-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a779f0-sysc.c | 0 + drivers/{soc => genpd}/renesas/r8a779g0-sysc.c | 0 + drivers/{soc => genpd}/renesas/rcar-gen4-sysc.c | 0 + drivers/{soc => genpd}/renesas/rcar-gen4-sysc.h | 0 + drivers/{soc => genpd}/renesas/rcar-sysc.c | 0 + drivers/{soc => genpd}/renesas/rcar-sysc.h | 0 + drivers/{soc => genpd}/renesas/rmobile-sysc.c | 0 + drivers/genpd/rockchip/Makefile | 2 + + .../pm_domains.c => genpd/rockchip/pm-domains.c} | 0 + drivers/genpd/samsung/Makefile | 2 + + .../samsung/exynos-pm-domains.c} | 3 +- + drivers/genpd/st/Makefile | 2 + + .../genpd/st/ste-ux500-pm-domain.c | 25 +- + drivers/genpd/starfive/Makefile | 2 + + .../jh71xx_pmu.c => genpd/starfive/jh71xx-pmu.c} | 0 + drivers/genpd/sunxi/Makefile | 2 + + drivers/{soc => genpd}/sunxi/sun20i-ppu.c | 0 + drivers/genpd/tegra/Makefile | 2 + + drivers/{soc => genpd}/tegra/powergate-bpmp.c | 0 + drivers/genpd/ti/Makefile | 3 + + drivers/{soc => genpd}/ti/omap_prm.c | 13 +- + drivers/{soc => genpd}/ti/ti_sci_pm_domains.c | 0 + drivers/genpd/xilinx/Makefile | 2 + + .../xilinx/zynqmp-pm-domains.c} | 0 + drivers/irqchip/irq-versatile-fpga.c | 1 - + drivers/memory/brcmstb_dpfe.c | 3 +- + drivers/memory/da8xx-ddrctl.c | 1 - + drivers/memory/fsl_ifc.c | 2 +- + drivers/memory/jz4780-nemc.c | 1 - + drivers/memory/pl353-smc.c | 1 + + drivers/memory/renesas-rpc-if.c | 1 - + drivers/memory/samsung/exynos5422-dmc.c | 2 +- + drivers/memory/stm32-fmc2-ebi.c | 2 + + drivers/memory/tegra/mc.c | 2 +- + drivers/memory/tegra/tegra124.c | 2 +- + drivers/memory/tegra/tegra186-emc.c | 136 +- + drivers/memory/tegra/tegra186.c | 3 +- + drivers/memory/tegra/tegra20.c | 3 +- + drivers/memory/tegra/tegra210-emc-core.c | 4 +- + drivers/memory/tegra/tegra234.c | 620 +++-- + drivers/memory/tegra/tegra30-emc.c | 2 +- + drivers/memory/tegra/tegra30.c | 2 +- + drivers/reset/hisilicon/hi6220_reset.c | 1 - + drivers/reset/hisilicon/reset-hi3660.c | 6 +- + drivers/reset/reset-ath79.c | 2 - + drivers/reset/reset-bcm6345.c | 2 - + drivers/reset/reset-imx7.c | 2 +- + drivers/reset/reset-intel-gw.c | 2 +- + drivers/reset/reset-k210.c | 1 - + drivers/reset/reset-lantiq.c | 1 - + drivers/reset/reset-lpc18xx.c | 2 - + drivers/reset/reset-meson-audio-arb.c | 3 +- + drivers/reset/reset-meson.c | 3 - + drivers/reset/reset-microchip-sparx5.c | 3 +- + drivers/reset/reset-mpfs.c | 1 + + drivers/reset/reset-npcm.c | 2 - + drivers/reset/reset-qcom-aoss.c | 2 +- + drivers/reset/reset-qcom-pdc.c | 2 +- + drivers/reset/reset-simple.c | 1 - + drivers/reset/reset-ti-syscon.c | 2 - + drivers/reset/reset-uniphier-glue.c | 4 +- + drivers/reset/reset-uniphier.c | 1 - + drivers/reset/reset-zynq.c | 1 - + drivers/reset/reset-zynqmp.c | 10 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 3 +- + drivers/soc/actions/Makefile | 4 - + drivers/soc/amlogic/Makefile | 3 - + drivers/soc/amlogic/meson-canvas.c | 1 + + drivers/soc/apple/Makefile | 2 - + drivers/soc/aspeed/aspeed-lpc-snoop.c | 1 - + drivers/soc/aspeed/aspeed-p2a-ctrl.c | 2 +- + drivers/soc/aspeed/aspeed-uart-routing.c | 3 +- + drivers/soc/atmel/sfr.c | 1 - + drivers/soc/bcm/Kconfig | 22 +- + drivers/soc/bcm/Makefile | 3 - + drivers/soc/bcm/bcm63xx/Kconfig | 21 - + drivers/soc/bcm/bcm63xx/Makefile | 3 - + drivers/soc/fsl/dpaa2-console.c | 3 +- + drivers/soc/fsl/qe/qe.c | 3 +- + drivers/soc/fsl/qe/qe_common.c | 1 - + drivers/soc/fsl/qe/qe_tdm.c | 4 +- + drivers/soc/hisilicon/Kconfig | 21 + + drivers/soc/hisilicon/Makefile | 2 + + drivers/soc/hisilicon/kunpeng_hccs.c | 1275 +++++++++ + drivers/soc/hisilicon/kunpeng_hccs.h | 191 ++ + drivers/soc/imx/Makefile | 7 +- + drivers/soc/mediatek/Makefile | 2 - + drivers/soc/mediatek/mtk-cmdq-helper.c | 1 + + drivers/soc/mediatek/mtk-devapc.c | 2 +- + drivers/soc/mediatek/mtk-mmsys.c | 2 +- + drivers/soc/mediatek/mtk-mutex.c | 3 +- + drivers/soc/mediatek/mtk-pmic-wrap.c | 3 +- + drivers/soc/microchip/mpfs-sys-controller.c | 2 +- + drivers/soc/qcom/Makefile | 3 - + drivers/soc/renesas/Makefile | 27 - + drivers/soc/rockchip/Makefile | 1 - + drivers/soc/rockchip/grf.c | 2 +- + drivers/soc/samsung/Makefile | 1 - + drivers/soc/samsung/exynos-chipid.c | 1 - + drivers/soc/samsung/exynos-pmu.c | 2 +- + drivers/soc/starfive/Makefile | 3 - + drivers/soc/sunxi/Makefile | 1 - + drivers/soc/sunxi/sunxi_sram.c | 2 +- + drivers/soc/tegra/Makefile | 1 - + drivers/soc/tegra/cbb/tegra-cbb.c | 12 +- + drivers/soc/tegra/cbb/tegra194-cbb.c | 4 +- + drivers/soc/tegra/cbb/tegra234-cbb.c | 3 - + drivers/soc/tegra/fuse/fuse-tegra.c | 9 +- + drivers/soc/tegra/fuse/fuse-tegra20.c | 2 +- + drivers/soc/tegra/fuse/fuse-tegra30.c | 2 - + drivers/soc/tegra/fuse/tegra-apbmisc.c | 4 +- + drivers/soc/ti/Makefile | 2 - + drivers/soc/ti/k3-ringacc.c | 31 +- + drivers/soc/ti/k3-socinfo.c | 1 + + drivers/soc/ti/pruss.c | 4 +- + drivers/soc/ti/ti_sci_inta_msi.c | 3 +- + drivers/soc/xilinx/Makefile | 1 - + drivers/soc/xilinx/xlnx_event_manager.c | 6 +- + drivers/soc/xilinx/zynqmp_power.c | 5 +- + include/dt-bindings/clock/starfive,jh7110-crg.h | 80 + + include/dt-bindings/mux/ti-serdes.h | 8 + + include/dt-bindings/power/amlogic,c3-pwrc.h | 25 + + include/dt-bindings/reset/starfive,jh7110-crg.h | 60 + + include/linux/firmware/imx/sci.h | 16 +- + include/soc/at91/atmel_tcb.h | 3 - + 833 files changed, 26694 insertions(+), 9228 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs + delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,nvec.txt + delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-ahb.txt + delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-flowctrl.txt + create mode 100644 Documentation/devicetree/bindings/arm/ti/omap.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-ispcrg.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-pll.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-stgcrg.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jh7110-voutcrg.yaml + create mode 100644 Documentation/devicetree/bindings/cpu/nvidia,tegra186-ccplex-cluster.yaml + create mode 100644 Documentation/devicetree/bindings/net/davicom,dm9000.yaml + delete mode 100644 Documentation/devicetree/bindings/net/davicom-dm9000.txt + create mode 100644 Documentation/devicetree/bindings/reserved-memory/nvidia,tegra264-bpmp-shmem.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.txt + create mode 100644 Documentation/devicetree/bindings/serial/nvidia,tegra20-hsuart.yaml + create mode 100644 Documentation/devicetree/bindings/soc/starfive/starfive,jh7110-syscon.yaml + create mode 100644 Documentation/devicetree/bindings/soc/tegra/nvidia,nvec.yaml + create mode 100644 Documentation/devicetree/bindings/soc/tegra/nvidia,tegra20-ahb.yaml + create mode 100644 Documentation/devicetree/bindings/soc/tegra/nvidia,tegra20-flowctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/nvidia,tegra124-soctherm.txt + create mode 100644 Documentation/devicetree/bindings/thermal/nvidia,tegra124-soctherm.yaml + create mode 100644 Documentation/process/maintainer-soc-clean-dts.rst + create mode 100644 arch/arm/arm-soc-for-next-changes.txt + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-inventec-starscream.dts + create mode 100644 arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi + create mode 100644 arch/arm/boot/dts/aspeed/ibm-power10-quad.dtsi + create mode 100644 arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a-mbls1021a.dts + create mode 100644 arch/arm/boot/dts/nxp/ls/ls1021a-tqmls1021a.dtsi + create mode 100644 arch/arm/boot/dts/samsung/exynos4212-tab3-3g8.dts + create mode 100644 arch/arm/boot/dts/samsung/exynos4212-tab3-lte8.dts + create mode 100644 arch/arm/boot/dts/samsung/exynos4212-tab3-wifi8.dts + create mode 100644 arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi + delete mode 100644 arch/arm/mach-keystone/keystone.h + delete mode 100644 arch/arm/mach-keystone/memory.h + delete mode 100644 arch/arm/mach-keystone/pm_domain.c + delete mode 100644 arch/arm/mach-nspire/mmio.h + delete mode 100644 arch/arm/mach-ux500/pm_domains.h + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-orangepi-zero.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero3.dts + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-t7-a311d2-an400.dts + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw72xx-0x-rpidsi.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw73xx-0x-rpidsi.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw7905-0x.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-venice-gw7905.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-debix-som-a-bmb-08.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-debix-som-a.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx-2x.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw71xx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx-2x.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw72xx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx-2x.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw73xx.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx-rpidsi.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx93-tqma9352-mba93xxla.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62p-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62p-mcu.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62p-wakeup.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62p.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62p5-sk.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am62p5.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62x-sk-hdmi-audio.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am64-tqma64xxl-mbax4xxl-sdcard.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am64-tqma64xxl-mbax4xxl-wlan.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-evm-gesi-exp-board.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-j721s2-evm-gesi-exp-board.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-serdes.h + create mode 100644 drivers/genpd/Makefile + create mode 100644 drivers/genpd/actions/Makefile + rename drivers/{soc => genpd}/actions/owl-sps-helper.c (100%) + rename drivers/{soc => genpd}/actions/owl-sps.c (100%) + create mode 100644 drivers/genpd/amlogic/Makefile + rename drivers/{soc => genpd}/amlogic/meson-ee-pwrc.c (99%) + rename drivers/{soc => genpd}/amlogic/meson-gx-pwrc-vpu.c (99%) + rename drivers/{soc => genpd}/amlogic/meson-secure-pwrc.c (86%) + create mode 100644 drivers/genpd/apple/Makefile + rename drivers/{soc/apple/apple-pmgr-pwrstate.c => genpd/apple/pmgr-pwrstate.c} (100%) + create mode 100644 drivers/genpd/bcm/Makefile + rename drivers/{soc/bcm/bcm63xx => genpd/bcm}/bcm-pmb.c (100%) + rename drivers/{soc => genpd}/bcm/bcm2835-power.c (100%) + rename drivers/{soc/bcm/bcm63xx => genpd/bcm}/bcm63xx-power.c (100%) + rename drivers/{soc => genpd}/bcm/raspberrypi-power.c (100%) + create mode 100644 drivers/genpd/imx/Makefile + rename drivers/{soc => genpd}/imx/gpc.c (100%) + rename drivers/{soc => genpd}/imx/gpcv2.c (99%) + rename drivers/{soc => genpd}/imx/imx8m-blk-ctrl.c (99%) + rename drivers/{soc => genpd}/imx/imx8mp-blk-ctrl.c (99%) + rename drivers/{soc => genpd}/imx/imx93-blk-ctrl.c (94%) + rename drivers/{soc => genpd}/imx/imx93-pd.c (99%) + create mode 100644 drivers/genpd/mediatek/Makefile + rename drivers/{soc => genpd}/mediatek/mt6795-pm-domains.h (100%) + rename drivers/{soc => genpd}/mediatek/mt8167-pm-domains.h (100%) + rename drivers/{soc => genpd}/mediatek/mt8173-pm-domains.h (100%) + rename drivers/{soc => genpd}/mediatek/mt8183-pm-domains.h (100%) + rename drivers/{soc => genpd}/mediatek/mt8186-pm-domains.h (100%) + rename drivers/{soc => genpd}/mediatek/mt8188-pm-domains.h (100%) + rename drivers/{soc => genpd}/mediatek/mt8192-pm-domains.h (100%) + rename drivers/{soc => genpd}/mediatek/mt8195-pm-domains.h (100%) + rename drivers/{soc => genpd}/mediatek/mtk-pm-domains.c (100%) + rename drivers/{soc => genpd}/mediatek/mtk-pm-domains.h (100%) + rename drivers/{soc => genpd}/mediatek/mtk-scpsys.c (100%) + create mode 100644 drivers/genpd/qcom/Makefile + rename drivers/{soc => genpd}/qcom/cpr.c (100%) + rename drivers/{soc => genpd}/qcom/rpmhpd.c (100%) + rename drivers/{soc => genpd}/qcom/rpmpd.c (100%) + create mode 100644 drivers/genpd/renesas/Makefile + rename drivers/{soc => genpd}/renesas/r8a7742-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a7743-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a7745-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a77470-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a774a1-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a774b1-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a774c0-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a774e1-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a7779-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a7790-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a7791-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a7792-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a7794-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a7795-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a7796-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a77965-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a77970-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a77980-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a77990-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a77995-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a779a0-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a779f0-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/r8a779g0-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/rcar-gen4-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/rcar-gen4-sysc.h (100%) + rename drivers/{soc => genpd}/renesas/rcar-sysc.c (100%) + rename drivers/{soc => genpd}/renesas/rcar-sysc.h (100%) + rename drivers/{soc => genpd}/renesas/rmobile-sysc.c (100%) + create mode 100644 drivers/genpd/rockchip/Makefile + rename drivers/{soc/rockchip/pm_domains.c => genpd/rockchip/pm-domains.c} (100%) + create mode 100644 drivers/genpd/samsung/Makefile + rename drivers/{soc/samsung/pm_domains.c => genpd/samsung/exynos-pm-domains.c} (98%) + create mode 100644 drivers/genpd/st/Makefile + rename arch/arm/mach-ux500/pm_domains.c => drivers/genpd/st/ste-ux500-pm-domain.c (75%) + create mode 100644 drivers/genpd/starfive/Makefile + rename drivers/{soc/starfive/jh71xx_pmu.c => genpd/starfive/jh71xx-pmu.c} (100%) + create mode 100644 drivers/genpd/sunxi/Makefile + rename drivers/{soc => genpd}/sunxi/sun20i-ppu.c (100%) + create mode 100644 drivers/genpd/tegra/Makefile + rename drivers/{soc => genpd}/tegra/powergate-bpmp.c (100%) + create mode 100644 drivers/genpd/ti/Makefile + rename drivers/{soc => genpd}/ti/omap_prm.c (99%) + rename drivers/{soc => genpd}/ti/ti_sci_pm_domains.c (100%) + create mode 100644 drivers/genpd/xilinx/Makefile + rename drivers/{soc/xilinx/zynqmp_pm_domains.c => genpd/xilinx/zynqmp-pm-domains.c} (100%) + delete mode 100644 drivers/soc/actions/Makefile + delete mode 100644 drivers/soc/bcm/bcm63xx/Kconfig + delete mode 100644 drivers/soc/bcm/bcm63xx/Makefile + create mode 100644 drivers/soc/hisilicon/Kconfig + create mode 100644 drivers/soc/hisilicon/Makefile + create mode 100644 drivers/soc/hisilicon/kunpeng_hccs.c + create mode 100644 drivers/soc/hisilicon/kunpeng_hccs.h + delete mode 100644 drivers/soc/starfive/Makefile + create mode 100644 include/dt-bindings/power/amlogic,c3-pwrc.h +Merging amlogic/for-next (f590814603bf Merge branch 'v6.6/arm-mach' into for-next) + b18226ffd080 ("firmware: meson_sm: fix to avoid potential NULL pointer dereference") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. +Merging asahi-soc/asahi-soc/for-next (eaf935fa48ec soc: apple: mailbox: Rename config symbol to APPLE_MAILBOX) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/soc/apple/Makefile +CONFLICT (content): Merge conflict in drivers/soc/apple/Makefile +Resolved 'drivers/soc/apple/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6738385c7a6e] Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 - + drivers/mailbox/Kconfig | 12 - + drivers/mailbox/Makefile | 2 - + drivers/mailbox/apple-mailbox.c | 441 ------------------------------------- + drivers/soc/apple/Kconfig | 15 +- + drivers/soc/apple/Makefile | 3 + + drivers/soc/apple/mailbox.c | 436 ++++++++++++++++++++++++++++++++++++ + drivers/soc/apple/mailbox.h | 48 ++++ + drivers/soc/apple/rtkit-internal.h | 8 +- + drivers/soc/apple/rtkit.c | 133 +++-------- + include/linux/apple-mailbox.h | 19 -- + include/linux/soc/apple/rtkit.h | 18 -- + 12 files changed, 531 insertions(+), 606 deletions(-) + delete mode 100644 drivers/mailbox/apple-mailbox.c + create mode 100644 drivers/soc/apple/mailbox.c + create mode 100644 drivers/soc/apple/mailbox.h + delete mode 100644 include/linux/apple-mailbox.h +Merging aspeed/for-next (8eb02f6fdd01 ARM: dts: aspeed: bonnell: Add reserved memory for TPM event log) + 0955e3867b54 ("soc: aspeed: socinfo: Add kfree for kstrdup") + c5835b6e7aff ("soc: aspeed: uart-routing: Use __sysfs_match_string") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging drivers/soc/aspeed/aspeed-uart-routing.c +Merge made by the 'ort' strategy. + arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 8 +++++++- + arch/arm/configs/aspeed_g5_defconfig | 2 ++ + 2 files changed, 9 insertions(+), 1 deletion(-) +Merging at91/at91-next (b04dba7c1c30 Merge branch 'at91-dt' into at91-next) + 163edfdfd9d1 ("ARM: dts: at91: remove duplicated entries") +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging broadcom/next (a70e8c9ff89a Merge branch 'soc/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml | 1 + + .../devicetree/bindings/arm/bcm/brcm,bcm53573.yaml | 39 +++++ + arch/arm/boot/dts/broadcom/Makefile | 1 + + arch/arm/boot/dts/broadcom/bcm-hr2.dtsi | 4 +- + arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 18 +++ + arch/arm/boot/dts/broadcom/bcm-nsp.dtsi | 4 +- + arch/arm/boot/dts/broadcom/bcm11351.dtsi | 13 +- + arch/arm/boot/dts/broadcom/bcm21664.dtsi | 9 +- + arch/arm/boot/dts/broadcom/bcm23550.dtsi | 9 +- + arch/arm/boot/dts/broadcom/bcm2711.dtsi | 4 +- + arch/arm/boot/dts/broadcom/bcm28155-ap.dts | 100 ++++++------- + arch/arm/boot/dts/broadcom/bcm2835-common.dtsi | 2 +- + arch/arm/boot/dts/broadcom/bcm2835-rpi-a-plus.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-a.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-b-plus.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-b-rev2.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-b.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-cm1-io1.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-zero-w.dts | 2 + + arch/arm/boot/dts/broadcom/bcm2835-rpi-zero.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi | 2 - + arch/arm/boot/dts/broadcom/bcm2836-rpi-2-b.dts | 1 + + arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts | 1 + + .../arm/boot/dts/broadcom/bcm2837-rpi-zero-2-w.dts | 2 + + arch/arm/boot/dts/broadcom/bcm283x.dtsi | 2 +- + .../dts/broadcom/bcm4708-linksys-ea6500-v2.dts | 3 +- + .../boot/dts/broadcom/bcm47094-asus-rt-ac3100.dts | 23 +++ + .../boot/dts/broadcom/bcm47094-asus-rt-ac3100.dtsi | 163 +++++++++++++++++++++ + .../boot/dts/broadcom/bcm47094-asus-rt-ac88u.dts | 155 +------------------- + .../boot/dts/broadcom/bcm47094-dlink-dir-885l.dts | 1 + + .../boot/dts/broadcom/bcm47094-dlink-dir-890l.dts | 1 + + .../dts/broadcom/bcm47094-linksys-panamera.dts | 2 +- + .../boot/dts/broadcom/bcm47094-luxul-xap-1610.dts | 37 +++++ + .../dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts | 36 +++++ + arch/arm/boot/dts/broadcom/bcm47094-phicomm-k3.dts | 2 +- + .../boot/dts/broadcom/bcm47189-luxul-xap-1440.dts | 20 ++- + .../boot/dts/broadcom/bcm47189-luxul-xap-810.dts | 21 ++- + arch/arm/boot/dts/broadcom/bcm47189-tenda-ac9.dts | 9 +- + arch/arm/boot/dts/broadcom/bcm53573.dtsi | 53 ++++++- + arch/arm/boot/dts/broadcom/bcm947189acdbmr.dts | 6 +- + arch/arm/mach-bcm/bcm_5301x.c | 2 - + arch/arm/mach-bcm/board_bcm23550.c | 2 - + arch/arm/mach-bcm/brcmstb.c | 1 - + arch/arm/mach-bcm/platsmp-brcmstb.c | 2 +- + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 2 +- + .../arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts | 2 +- + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 +- + drivers/genpd/bcm/bcm-pmb.c | 1 - + drivers/genpd/bcm/bcm63xx-power.c | 1 - + drivers/genpd/bcm/raspberrypi-power.c | 2 +- + 50 files changed, 509 insertions(+), 261 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm53573.yaml + create mode 100644 arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac3100.dts + create mode 100644 arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac3100.dtsi +Merging davinci/davinci/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (35bd78cf2522 memory: tegra: add MC client for Tegra234 GPU) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merging imx-mxs/for-next (246e2cc22265 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (f6925844c82a Merge branch 'v6.4-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Auto-merging arch/arm64/boot/dts/mediatek/mt8192.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8195.dtsi +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 2 ++ + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 2 ++ + 2 files changed, 4 insertions(+) +Merging mvebu/for-next (a8e364c2c428 Merge branch 'mvebu/drivers' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. + drivers/firmware/turris-mox-rwtm.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +Merging omap/for-next (ca55cf3d7b52 Merge branch 'omap-for-v6.5/fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Auto-merging drivers/bus/omap_l3_smx.c +Merge made by the 'ort' strategy. + arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi | 9 +++++++++ + drivers/bus/Kconfig | 3 ++- + drivers/bus/omap_l3_smx.c | 21 ++++++++++----------- + drivers/bus/ti-sysc.c | 7 ++++++- + 4 files changed, 27 insertions(+), 13 deletions(-) +Merging qcom/for-next (b9a263d90a2c Merge branches 'arm64-defconfig-for-6.6', 'arm64-fixes-for-6.5', 'arm64-for-6.6', 'clk-for-6.6', 'drivers-for-6.6' and 'dts-for-6.6' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/qcom-soc.yaml | 2 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 14 + + .../bindings/clock/qcom,dispcc-sm8x50.yaml | 4 +- + .../bindings/clock/qcom,gcc-apq8064.yaml | 2 +- + .../bindings/clock/qcom,gcc-ipq4019.yaml | 2 +- + .../bindings/clock/qcom,gcc-ipq8074.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8976.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8996.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8998.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-other.yaml | 5 +- + .../devicetree/bindings/clock/qcom,gcc-qcs404.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sc7280.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gpucc.yaml | 2 +- + .../bindings/clock/qcom,ipq5018-gcc.yaml | 63 + + .../devicetree/bindings/clock/qcom,lcc.yaml | 34 + + .../devicetree/bindings/clock/qcom,mmcc.yaml | 4 +- + .../bindings/clock/qcom,msm8996-cbf.yaml | 4 +- + .../bindings/clock/qcom,msm8998-gpucc.yaml | 2 +- + .../bindings/clock/qcom,qdu1000-gcc.yaml | 3 +- + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 +- + .../bindings/clock/qcom,sc7180-camcc.yaml | 2 +- + .../bindings/clock/qcom,sc7180-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sc7180-lpasscorecc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,sc7180-mss.yaml | 2 +- + .../bindings/clock/qcom,sc7280-camcc.yaml | 2 +- + .../bindings/clock/qcom,sc7280-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sc7280-lpasscc.yaml | 2 +- + .../bindings/clock/qcom,sc7280-lpasscorecc.yaml | 2 +- + .../bindings/clock/qcom,sdm845-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sm8350-videocc.yaml | 8 +- + .../bindings/clock/qcom,sm8450-camcc.yaml | 4 +- + .../bindings/clock/qcom,sm8450-dispcc.yaml | 4 +- + .../bindings/clock/qcom,sm8450-videocc.yaml | 4 +- + .../bindings/clock/qcom,sm8550-dispcc.yaml | 4 +- + .../devicetree/bindings/clock/qcom,videocc.yaml | 6 +- + .../bindings/display/msm/qcom,sm8250-dpu.yaml | 4 +- + .../bindings/display/msm/qcom,sm8250-mdss.yaml | 8 +- + .../bindings/display/msm/qcom,sm8350-dpu.yaml | 4 +- + .../bindings/display/msm/qcom,sm8350-mdss.yaml | 6 +- + .../bindings/display/msm/qcom,sm8450-dpu.yaml | 4 +- + .../bindings/display/msm/qcom,sm8450-mdss.yaml | 8 +- + .../bindings/display/msm/qcom,sm8550-dpu.yaml | 4 +- + .../bindings/display/msm/qcom,sm8550-mdss.yaml | 8 +- + .../devicetree/bindings/firmware/qcom,scm.yaml | 1 + + .../bindings/media/qcom,sm8250-venus.yaml | 4 +- + .../devicetree/bindings/mmc/sdhci-msm.yaml | 4 +- + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../bindings/remoteproc/qcom,glink-edge.yaml | 3 - + .../bindings/remoteproc/qcom,glink-rpm-edge.yaml | 2 +- + .../bindings/remoteproc/qcom,rpm-proc.yaml | 171 + + .../bindings/remoteproc/qcom,sm8350-pas.yaml | 6 +- + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 23 +- + .../devicetree/bindings/soc/qcom/qcom,smd.yaml | 7 + + .../devicetree/bindings/sram/qcom,ocmem.yaml | 26 +- + arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 40 - + .../arm/boot/dts/qcom/qcom-apq8074-dragonboard.dts | 5 + + arch/arm/boot/dts/qcom/qcom-apq8084.dtsi | 6 +- + arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi | 7 +- + arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 43 +- + arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts | 1 - + arch/arm/boot/dts/qcom/qcom-ipq8064-v1.0.dtsi | 1 - + arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 19 +- + arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 182 +- + arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 1 - + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 44 +- + .../dts/qcom/qcom-msm8974pro-fairphone-fp2.dts | 2 +- + .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 8 +- + arch/arm/boot/dts/qcom/qcom-pm8226.dtsi | 12 +- + arch/arm/boot/dts/qcom/qcom-pm8941.dtsi | 36 +- + arch/arm/boot/dts/qcom/qcom-pma8084.dtsi | 12 +- + arch/arm/boot/dts/qcom/qcom-pmx55.dtsi | 8 +- + arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts | 2 +- + arch/arm64/boot/dts/qcom/Makefile | 4 + + .../dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts | 81 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 85 +- + arch/arm64/boot/dts/qcom/apq8039-t2.dts | 2 - + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 27 +- + arch/arm64/boot/dts/qcom/ipq5018-rdp432-c2.dts | 72 + + arch/arm64/boot/dts/qcom/ipq5018.dtsi | 250 ++ + arch/arm64/boot/dts/qcom/ipq5332-rdp-common.dtsi | 78 + + arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts | 26 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts | 26 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts | 24 +- + arch/arm64/boot/dts/qcom/ipq5332-rdp474.dts | 47 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 48 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 8 +- + arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts | 48 + + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 182 +- + arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 2 +- + .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 2 +- + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 2 +- + .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 1 + + .../dts/qcom/msm8916-samsung-e2015-common.dtsi | 21 +- + arch/arm64/boot/dts/qcom/msm8916-samsung-e5.dts | 20 + + .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 1 - + .../boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 29 + + arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts | 8 + + arch/arm64/boot/dts/qcom/msm8916-samsung-j5x.dts | 26 + + .../boot/dts/qcom/msm8916-samsung-serranove.dts | 70 +- + .../boot/dts/qcom/msm8916-wingtech-wt88047.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 14 +- + arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts | 495 +++ + .../dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts | 3 +- + arch/arm64/boot/dts/qcom/msm8939.dtsi | 132 +- + arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts | 4 +- + arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts | 3 +- + arch/arm64/boot/dts/qcom/msm8953.dtsi | 136 +- + arch/arm64/boot/dts/qcom/msm8976.dtsi | 154 +- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 101 +- + arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 1 + + .../dts/qcom/msm8996-sony-xperia-tone-dora.dts | 2 +- + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 2 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 8 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 193 +- + .../boot/dts/qcom/msm8996pro-xiaomi-natrium.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8998-mtp.dts | 1 + + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 4 +- + arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts | 1 - + arch/arm64/boot/dts/qcom/msm8998.dtsi | 417 ++- + arch/arm64/boot/dts/qcom/pm6125.dtsi | 18 +- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 13 +- + arch/arm64/boot/dts/qcom/pm660.dtsi | 33 +- + arch/arm64/boot/dts/qcom/pm660l.dtsi | 5 +- + arch/arm64/boot/dts/qcom/pm7250b.dtsi | 34 +- + arch/arm64/boot/dts/qcom/pm7550ba.dtsi | 70 + + arch/arm64/boot/dts/qcom/pm8150.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 8 +- + arch/arm64/boot/dts/qcom/pm8150l.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pm8350.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8350b.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8916.dtsi | 14 +- + arch/arm64/boot/dts/qcom/pm8950.dtsi | 39 +- + arch/arm64/boot/dts/qcom/pm8953.dtsi | 45 +- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 12 +- + arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmi8950.dtsi | 17 +- + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 5 +- + arch/arm64/boot/dts/qcom/pmk8350.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pmp8074.dtsi | 27 +- + arch/arm64/boot/dts/qcom/pmr735b.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pms405.dtsi | 21 +- + arch/arm64/boot/dts/qcom/pmx75.dtsi | 64 + + arch/arm64/boot/dts/qcom/qcm2290.dtsi | 158 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 160 +- + arch/arm64/boot/dts/qcom/qdu1000-idp.dts | 26 + + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 266 ++ + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 8 + + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 17 +- + arch/arm64/boot/dts/qcom/qru1000-idp.dts | 16 + + arch/arm64/boot/dts/qcom/sa8540p-pmics.dtsi | 11 +- + arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 15 + + arch/arm64/boot/dts/qcom/sa8540p.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sa8775p-ride.dts | 283 +- + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 288 +- + arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 6 +- + arch/arm64/boot/dts/qcom/sc7180-firmware-tfa.dtsi | 107 + + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 1 + + .../boot/dts/qcom/sc7180-trogdor-coachz-r1.dts | 4 +- + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 3 +- + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 3 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 2 +- + .../boot/dts/qcom/sc7180-trogdor-pompom-r1.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-pompom-r2.dts | 2 +- + .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 3 +- + .../boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi | 3 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 216 +- + .../qcom/sc7280-herobrine-audio-rt5682-3mic.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dts | 2 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +- + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 209 +- + arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi | 36 +- + arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 209 +- + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 68 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 16 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 46 +- + arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 1 + + .../arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts | 2 +- + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 160 +- + .../arm64/boot/dts/qcom/sdm660-xiaomi-lavender.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm670.dtsi | 175 + + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 10 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 7 + + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 13 +- + .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 6 +- + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 2 +- + .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 9 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 7 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 57 +- + arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 2 +- + arch/arm64/boot/dts/qcom/sdx75-idp.dts | 230 ++ + arch/arm64/boot/dts/qcom/sdx75.dtsi | 79 +- + arch/arm64/boot/dts/qcom/sm4450-qrd.dts | 18 + + arch/arm64/boot/dts/qcom/sm4450.dtsi | 431 +++ + arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 233 +- + arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 65 +- + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 19 +- + .../boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts | 4 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 140 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 493 ++- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 227 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 1 + + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 1 + + .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 24 +- + arch/arm64/boot/dts/qcom/sm8250-hdk.dts | 1 + + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 22 +- + .../dts/qcom/sm8250-sony-xperia-edo-pdx203.dts | 366 ++ + .../dts/qcom/sm8250-sony-xperia-edo-pdx206.dts | 243 ++ + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 63 +- + .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 432 ++- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 35 +- + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 1 + + arch/arm64/boot/dts/qcom/sm8350.dtsi | 403 ++- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 303 +- + arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 1 + + arch/arm64/boot/dts/qcom/sm8450.dtsi | 274 +- + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 61 +- + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 92 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 251 +- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 2 +- + arch/arm64/configs/defconfig | 6 + + drivers/clk/qcom/Kconfig | 27 +- + drivers/clk/qcom/Makefile | 2 +- + drivers/clk/qcom/camcc-sc7180.c | 2 +- + drivers/clk/qcom/clk-cbf-8996.c | 10 +- + drivers/clk/qcom/clk-smd-rpm.c | 314 +- + drivers/clk/qcom/dispcc-sc8280xp.c | 8 +- + drivers/clk/qcom/dispcc-sm8450.c | 13 +- + drivers/clk/qcom/dispcc-sm8550.c | 13 +- + drivers/clk/qcom/gcc-ipq5018.c | 3724 ++++++++++++++++++++ + drivers/clk/qcom/gcc-ipq5332.c | 208 +- + drivers/clk/qcom/gcc-ipq9574.c | 37 + + drivers/clk/qcom/gcc-mdm9615.c | 261 +- + drivers/clk/qcom/gcc-msm8917.c | 3 +- + drivers/clk/qcom/gcc-msm8998.c | 64 +- + drivers/clk/qcom/gcc-qdu1000.c | 159 +- + drivers/clk/qcom/gcc-sc7180.c | 1 + + drivers/clk/qcom/gcc-sc8280xp.c | 145 +- + drivers/clk/qcom/gcc-sm6350.c | 1 + + drivers/clk/qcom/gcc-sm7150.c | 1 + + drivers/clk/qcom/gcc-sm8250.c | 1 + + drivers/clk/qcom/gcc-sm8450.c | 4 +- + drivers/clk/qcom/gpucc-msm8998.c | 2 +- + drivers/clk/qcom/gpucc-sm6350.c | 18 +- + drivers/clk/qcom/lcc-mdm9615.c | 572 --- + drivers/clk/qcom/lcc-msm8960.c | 19 +- + drivers/clk/qcom/lpasscc-sc7280.c | 16 +- + drivers/clk/qcom/mmcc-msm8974.c | 11 + + drivers/clk/qcom/mmcc-msm8998.c | 35 +- + drivers/clk/qcom/mss-sc7180.c | 15 +- + drivers/clk/qcom/q6sstop-qcs404.c | 15 +- + drivers/clk/qcom/reset.c | 3 +- + drivers/clk/qcom/turingcc-qcs404.c | 15 +- + drivers/clk/qcom/videocc-sm8350.c | 42 +- + drivers/firmware/qcom_scm.c | 158 +- + drivers/genpd/Makefile | 1 + + drivers/genpd/qcom/cpr.c | 1 - + drivers/genpd/qcom/rpmhpd.c | 118 +- + drivers/genpd/qcom/rpmpd.c | 35 +- + drivers/interconnect/qcom/Makefile | 2 +- + drivers/interconnect/qcom/icc-rpm-clocks.c | 77 + + drivers/interconnect/qcom/icc-rpm.c | 216 +- + drivers/interconnect/qcom/icc-rpm.h | 56 +- + drivers/interconnect/qcom/msm8916.c | 5 +- + drivers/interconnect/qcom/msm8939.c | 6 +- + drivers/interconnect/qcom/msm8974.c | 2 +- + drivers/interconnect/qcom/msm8996.c | 10 +- + drivers/interconnect/qcom/qcm2290.c | 8 +- + drivers/interconnect/qcom/qcs404.c | 5 +- + drivers/interconnect/qcom/sdm660.c | 8 +- + drivers/interconnect/qcom/smd-rpm.c | 23 +- + drivers/interconnect/qcom/smd-rpm.h | 15 - + drivers/net/ipa/ipa_power.c | 5 +- + drivers/remoteproc/qcom_q6v5.c | 8 +- + drivers/rpmsg/qcom_smd.c | 10 +- + drivers/soc/qcom/Kconfig | 1 + + drivers/soc/qcom/Makefile | 2 +- + drivers/soc/qcom/cmd-db.c | 2 +- + drivers/soc/qcom/icc-bwmon.c | 30 +- + drivers/soc/qcom/ice.c | 2 + + drivers/soc/qcom/llcc-qcom.c | 1 - + drivers/soc/qcom/ocmem.c | 68 +- + drivers/soc/qcom/pmic_glink.c | 8 +- + drivers/soc/qcom/pmic_glink_altmode.c | 62 +- + drivers/soc/qcom/qcom_aoss.c | 49 +- + drivers/soc/qcom/qcom_gsbi.c | 11 +- + drivers/soc/qcom/qmi_encdec.c | 4 +- + drivers/soc/qcom/rpm-proc.c | 77 + + drivers/soc/qcom/rpmh-rsc.c | 2 +- + drivers/soc/qcom/smd-rpm.c | 52 +- + drivers/soc/qcom/smem.c | 18 +- + drivers/soc/qcom/socinfo.c | 3 +- + drivers/soc/qcom/spm.c | 6 +- + drivers/soc/qcom/trace-rpmh.h | 16 +- + drivers/soc/qcom/wcnss_ctrl.c | 1 + + include/dt-bindings/arm/qcom,ids.h | 3 +- + include/dt-bindings/clock/qcom,gcc-ipq5018.h | 183 + + include/dt-bindings/clock/qcom,gcc-msm8917.h | 1 + + include/dt-bindings/clock/qcom,gcc-msm8998.h | 3 + + include/dt-bindings/clock/qcom,gcc-sc8280xp.h | 10 + + include/dt-bindings/clock/qcom,ipq9574-gcc.h | 2 + + include/dt-bindings/clock/qcom,lcc-mdm9615.h | 44 - + include/dt-bindings/clock/qcom,qdu1000-gcc.h | 4 +- + include/dt-bindings/firmware/qcom,scm.h | 21 + + include/dt-bindings/interconnect/qcom,rpm-icc.h | 13 + + include/dt-bindings/power/qcom,rpmhpd.h | 30 + + include/dt-bindings/reset/qcom,gcc-ipq5018.h | 122 + + include/linux/firmware/qcom/qcom_scm.h | 2 +- + include/linux/soc/qcom/qcom_aoss.h | 4 +- + include/linux/soc/qcom/smd-rpm.h | 20 +- + include/linux/soc/qcom/smem.h | 1 + + 334 files changed, 14933 insertions(+), 3943 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,ipq5018-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,rpm-proc.yaml + create mode 100644 arch/arm64/boot/dts/qcom/apq8016-sbc-d3-camera-mezzanine.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq5018-rdp432-c2.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq5018.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/ipq5332-rdp-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts + create mode 100644 arch/arm64/boot/dts/qcom/pm7550ba.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmx75.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-firmware-tfa.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm4450-qrd.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm4450.dtsi + create mode 100644 drivers/clk/qcom/gcc-ipq5018.c + delete mode 100644 drivers/clk/qcom/lcc-mdm9615.c + create mode 100644 drivers/interconnect/qcom/icc-rpm-clocks.c + delete mode 100644 drivers/interconnect/qcom/smd-rpm.h + create mode 100644 drivers/soc/qcom/rpm-proc.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-ipq5018.h + delete mode 100644 include/dt-bindings/clock/qcom,lcc-mdm9615.h + create mode 100644 include/dt-bindings/interconnect/qcom,rpm-icc.h + create mode 100644 include/dt-bindings/power/qcom,rpmhpd.h + create mode 100644 include/dt-bindings/reset/qcom,gcc-ipq5018.h +Merging renesas/next (13512fa6af4a Merge branch 'renesas-dts-for-v6.6' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. +Merging reset/reset/next (417a3a5ae44a reset: ti: syscon: remove unneeded call to platform_set_drvdata()) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (bcd6a683ddaa Merge branch 'v6.6-armsoc/dts64' into for-next) + 8cbdf5d28809 ("ARM: rockchip: Drop unused includes") + fc7696e2ae81 ("soc: rockchip: grf: Explicitly include correct DT includes") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/soc/rockchip/grf.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 15 + + Documentation/devicetree/bindings/eeprom/at24.yaml | 3 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../boot/dts/rockchip/rv1126-edgeble-neu2-io.dts | 29 + + .../arm/boot/dts/rockchip/rv1126-edgeble-neu2.dtsi | 27 +- + arch/arm/boot/dts/rockchip/rv1126-pinctrl.dtsi | 26 + + arch/arm/boot/dts/rockchip/rv1126.dtsi | 93 +++ + arch/arm64/boot/dts/rockchip/Makefile | 3 + + .../boot/dts/rockchip/px30-engicam-ctouch2.dtsi | 2 +- + .../rockchip/px30-engicam-px30-core-edimm2.2.dts | 2 +- + arch/arm64/boot/dts/rockchip/px30.dtsi | 16 +- + arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 - + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts | 65 ++ + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 7 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 11 + + .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 11 + + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 11 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 27 + + .../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 3 - + arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts | 3 - + arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi | 2 - + arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 2 - + arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 2 - + .../boot/dts/rockchip/rk3566-radxa-cm3-io.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 2 - + arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi | 3 - + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 3 - + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 3 - + .../boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi | 4 - + arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts | 3 - + .../arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi | 3 - + arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts | 3 - + .../arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 3 - + arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 24 +- + arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts | 643 +++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 3 - + .../boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi | 1 - + .../boot/dts/rockchip/rk3588-edgeble-neu6b-io.dts | 66 ++ + .../boot/dts/rockchip/rk3588-edgeble-neu6b.dtsi | 359 ++++++++- + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 83 +- + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 888 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 79 +- + arch/arm64/boot/dts/rockchip/rk3588.dtsi | 215 +++++ + .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 10 +- + .../boot/dts/rockchip/rk3588s-khadas-edge2.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 665 ++++++++++++++- + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 286 +++++++ + arch/arm64/configs/defconfig | 13 + + drivers/clk/rockchip/clk-rk3568.c | 3 +- + drivers/clk/rockchip/clk-rv1126.c | 59 ++ + drivers/genpd/rockchip/pm-domains.c | 1 + + drivers/soc/rockchip/grf.c | 14 + + 59 files changed, 3712 insertions(+), 110 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts +Merging samsung-krzk/for-next (4124fbc4b4b1 Merge branch 'next/dt64' into for-next) + 3027df7e739c ("ARM: s5pv210: Explicitly include correct DT includes") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. +Merging scmi/for-linux-next (45e5b76801e1 Merge branch 'for-next/scmi/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Auto-merging drivers/firmware/arm_scmi/perf.c +CONFLICT (content): Merge conflict in drivers/firmware/arm_scmi/perf.c +Recorded preimage for 'drivers/firmware/arm_scmi/perf.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/firmware/arm_scmi/perf.c'. +[master d69c93da238c] Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/firmware/arm_scmi/perf.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging stm32/stm32-next (06113b7ac2df ARM: dts: st: Add gpio-ranges for stm32f769-pinctrl) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/stm32/stm32.yaml | 4 +- + .../devicetree/bindings/net/can/bosch,m_can.yaml | 2 +- + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 3 + + arch/arm/boot/dts/st/Makefile | 2 + + arch/arm/boot/dts/st/stm32f7-pinctrl.dtsi | 10 + + arch/arm/boot/dts/st/stm32f746-disco.dts | 19 +- + arch/arm/boot/dts/st/stm32f746-pinctrl.dtsi | 44 ++ + arch/arm/boot/dts/st/stm32f746.dtsi | 47 ++ + arch/arm/boot/dts/st/stm32f769-pinctrl.dtsi | 44 ++ + arch/arm/boot/dts/st/stm32mp131.dtsi | 16 +- + arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi | 129 +++++ + arch/arm/boot/dts/st/stm32mp15-scmi.dtsi | 23 +- + arch/arm/boot/dts/st/stm32mp151a-prtt1c.dts | 32 ++ + arch/arm/boot/dts/st/stm32mp157.dtsi | 18 + + .../st/stm32mp157a-icore-stm32mp1-ctouch2-of10.dts | 24 +- + .../dts/st/stm32mp157a-icore-stm32mp1-edimm2.2.dts | 28 +- + arch/arm/boot/dts/st/stm32mp157c-dk2.dts | 28 +- + .../arm/boot/dts/st/stm32mp157c-emstamp-argon.dtsi | 7 +- + arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 28 +- + arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen1.dts | 93 ++++ + arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen2.dts | 172 ++++++ + arch/arm/boot/dts/st/stm32mp157c-odyssey-som.dtsi | 4 +- + arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 610 +++++++++++++++++++++ + arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi | 4 +- + arch/arm/boot/dts/st/stm32mp15xx-dhcor-som.dtsi | 4 +- + 25 files changed, 1270 insertions(+), 125 deletions(-) + create mode 100644 arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen1.dts + create mode 100644 arch/arm/boot/dts/st/stm32mp157c-lxa-tac-gen2.dts + create mode 100644 arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi +Merging sunxi/sunxi/for-next (aa333f5e8461 Merge branch 'sunxi/dt-for-6.6' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 41 ++++++++++++-------------- + drivers/clk/sunxi-ng/ccu_common.c | 12 ++++++++ + drivers/clk/sunxi-ng/ccu_common.h | 6 ++++ + drivers/clk/sunxi-ng/ccu_div.h | 30 +++++++++++++++++++ + drivers/clk/sunxi-ng/ccu_mmc_timing.c | 2 +- + drivers/clk/sunxi-ng/ccu_mux.c | 15 ++++++++-- + drivers/clk/sunxi-ng/ccu_mux.h | 38 +++++++++++++++++------- + drivers/clk/sunxi-ng/ccu_nkm.c | 55 ++++++++++++++++++++++++++++++----- + drivers/clk/sunxi-ng/ccu_nm.c | 13 ++++----- + drivers/clk/sunxi-ng/ccu_nm.h | 48 ++++++++++++++++++++++++++++-- + drivers/clk/sunxi/clk-sun9i-mmc.c | 10 +++---- + 11 files changed, 209 insertions(+), 61 deletions(-) +Merging tee/next (6a8b7e801054 tee: optee: Use kmemdup() to replace kmalloc + memcpy) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Already up to date. +Merging tegra/for-next (77a4cfe28fb8 Merge branch for-6.6/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. +Merging ti/ti-next (d0857dc9b22d Merge branch 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (7cd073eddcd4 Merge branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. +Merging clk/clk-next (bd0f09c12e99 Merge branch 'clk-allwinner' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Auto-merging MAINTAINERS +Auto-merging drivers/base/core.c +Auto-merging drivers/clk/qcom/camcc-sc7180.c +Auto-merging drivers/clk/qcom/clk-smd-rpm.c +Auto-merging drivers/clk/qcom/dispcc-sm8450.c +Auto-merging drivers/clk/qcom/dispcc-sm8550.c +Auto-merging drivers/clk/qcom/gcc-ipq5332.c +Auto-merging drivers/clk/qcom/gcc-mdm9615.c +Auto-merging drivers/clk/qcom/gcc-msm8917.c +Auto-merging drivers/clk/qcom/gcc-msm8998.c +Auto-merging drivers/clk/qcom/gcc-qdu1000.c +Auto-merging drivers/clk/qcom/gcc-sc7180.c +Auto-merging drivers/clk/qcom/gcc-sc8280xp.c +Auto-merging drivers/clk/qcom/gcc-sm7150.c +Auto-merging drivers/clk/qcom/gcc-sm8250.c +Auto-merging drivers/clk/qcom/gcc-sm8450.c +Auto-merging drivers/clk/qcom/gpucc-msm8998.c +CONFLICT (modify/delete): drivers/clk/qcom/lcc-mdm9615.c deleted in HEAD and modified in clk/clk-next. Version clk/clk-next of drivers/clk/qcom/lcc-mdm9615.c left in tree. +Auto-merging drivers/clk/qcom/lcc-msm8960.c +Auto-merging drivers/clk/qcom/mmcc-msm8974.c +Auto-merging drivers/clk/qcom/mmcc-msm8998.c +Auto-merging drivers/clk/rockchip/clk-rk3568.c +Auto-merging drivers/clk/rockchip/clk-rv1126.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/clk/qcom/lcc-mdm9615.c +rm 'drivers/clk/qcom/lcc-mdm9615.c' +$ git commit --no-edit -v -a +[master 1d5ced7f7b78] Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/hisilicon/controller/cpuctrl.yaml | 20 + + .../bindings/clock/amlogic,gxbb-aoclkc.txt | 64 - + .../bindings/clock/amlogic,gxbb-aoclkc.yaml | 85 ++ + .../bindings/clock/amlogic,gxbb-clkc.txt | 53 - + .../bindings/clock/amlogic,gxbb-clkc.yaml | 37 + + .../devicetree/bindings/clock/hix5hd2-clock.txt | 30 - + .../devicetree/bindings/clock/oxnas,stdclk.txt | 28 - + .../devicetree/bindings/clock/renesas,5p35023.yaml | 86 ++ + .../devicetree/bindings/clock/xlnx,versal-clk.yaml | 87 +- + .../devicetree/bindings/clock/xlnx,zynqmp-clk.txt | 63 - + .../soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml | 160 +++ + MAINTAINERS | 6 + + drivers/base/core.c | 5 +- + drivers/clk/Kconfig | 16 +- + drivers/clk/Makefile | 2 +- + drivers/clk/actions/owl-common.c | 2 - + drivers/clk/actions/owl-common.h | 2 +- + drivers/clk/axs10x/pll_clock.c | 5 +- + drivers/clk/baikal-t1/clk-ccu-div.c | 1 - + drivers/clk/bcm/clk-bcm2835.c | 2 +- + drivers/clk/bcm/clk-bcm63xx-gate.c | 1 - + drivers/clk/bcm/clk-sr.c | 2 +- + drivers/clk/clk-aspeed.c | 2 +- + drivers/clk/clk-ast2600.c | 2 +- + drivers/clk/clk-bm1880.c | 4 +- + drivers/clk/clk-cs2000-cp.c | 2 +- + drivers/clk/clk-en7523.c | 3 +- + drivers/clk/clk-gpio.c | 2 +- + drivers/clk/clk-hsdk-pll.c | 1 - + drivers/clk/clk-k210.c | 1 - + drivers/clk/clk-oxnas.c | 251 ---- + drivers/clk/clk-palmas.c | 1 - + drivers/clk/clk-plldig.c | 2 - + drivers/clk/clk-qoriq.c | 2 +- + drivers/clk/clk-scpi.c | 1 - + drivers/clk/clk-si5351.c | 2 +- + drivers/clk/clk-versaclock3.c | 1143 +++++++++++++++ + drivers/clk/clk-versaclock5.c | 1 - + drivers/clk/clk-versaclock7.c | 1 - + drivers/clk/hisilicon/clk-hi3559a.c | 2 +- + drivers/clk/hisilicon/clk-hi3620.c | 1 - + drivers/clk/hisilicon/clk-hi3660.c | 2 +- + drivers/clk/hisilicon/clk-hi3670.c | 2 +- + drivers/clk/hisilicon/clk-hi6220-stub.c | 2 +- + drivers/clk/hisilicon/clk-hi6220.c | 3 - + drivers/clk/hisilicon/clk-hip04.c | 3 - + drivers/clk/hisilicon/clk.c | 2 +- + drivers/clk/hisilicon/crg-hi3516cv300.c | 2 +- + drivers/clk/hisilicon/crg-hi3798cv200.c | 2 +- + drivers/clk/imx/clk-imx8qxp-lpcg.c | 2 - + drivers/clk/imx/clk-imx8qxp.c | 1 - + drivers/clk/imx/clk-imx8ulp.c | 2 +- + drivers/clk/imx/clk-scu.c | 2 +- + drivers/clk/keystone/pll.c | 2 +- + drivers/clk/keystone/sci-clk.c | 3 +- + drivers/clk/keystone/syscon-clk.c | 6 +- + drivers/clk/mediatek/clk-mt2701-aud.c | 2 +- + drivers/clk/mediatek/clk-mt2701-g3d.c | 4 +- + drivers/clk/mediatek/clk-mt2701.c | 4 +- + drivers/clk/mediatek/clk-mt2712.c | 4 +- + drivers/clk/mediatek/clk-mt6765.c | 2 +- + drivers/clk/mediatek/clk-mt6779-aud.c | 4 +- + drivers/clk/mediatek/clk-mt6779.c | 2 - + drivers/clk/mediatek/clk-mt6797.c | 2 - + drivers/clk/mediatek/clk-mt7622-aud.c | 2 +- + drivers/clk/mediatek/clk-mt7622-eth.c | 4 +- + drivers/clk/mediatek/clk-mt7622-hif.c | 4 +- + drivers/clk/mediatek/clk-mt7622.c | 4 +- + drivers/clk/mediatek/clk-mt7629-eth.c | 2 - + drivers/clk/mediatek/clk-mt7629-hif.c | 4 +- + drivers/clk/mediatek/clk-mt7629.c | 2 - + drivers/clk/mediatek/clk-mt7981-apmixed.c | 4 +- + drivers/clk/mediatek/clk-mt7981-eth.c | 4 +- + drivers/clk/mediatek/clk-mt7981-infracfg.c | 4 +- + drivers/clk/mediatek/clk-mt7981-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt7986-apmixed.c | 4 +- + drivers/clk/mediatek/clk-mt7986-eth.c | 4 +- + drivers/clk/mediatek/clk-mt7986-infracfg.c | 4 +- + drivers/clk/mediatek/clk-mt7986-topckgen.c | 4 +- + drivers/clk/mediatek/clk-mt8167-aud.c | 4 +- + drivers/clk/mediatek/clk-mt8167-img.c | 4 +- + drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 4 +- + drivers/clk/mediatek/clk-mt8167-mm.c | 4 +- + drivers/clk/mediatek/clk-mt8167-vdec.c | 4 +- + drivers/clk/mediatek/clk-mt8173-mm.c | 2 +- + drivers/clk/mediatek/clk-mt8183.c | 4 +- + drivers/clk/mediatek/clk-mt8188-apmixedsys.c | 2 +- + drivers/clk/mediatek/clk-mt8188-topckgen.c | 2 +- + drivers/clk/mediatek/clk-mt8192-cam.c | 2 +- + drivers/clk/mediatek/clk-mt8192-img.c | 2 +- + drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c | 2 +- + drivers/clk/mediatek/clk-mt8192-ipe.c | 2 +- + drivers/clk/mediatek/clk-mt8192-mdp.c | 2 +- + drivers/clk/mediatek/clk-mt8192-mfg.c | 2 +- + drivers/clk/mediatek/clk-mt8192-msdc.c | 2 +- + drivers/clk/mediatek/clk-mt8192-scp_adsp.c | 2 +- + drivers/clk/mediatek/clk-mt8192-vdec.c | 2 +- + drivers/clk/mediatek/clk-mt8192-venc.c | 2 +- + drivers/clk/mediatek/clk-mt8192.c | 4 +- + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 2 +- + drivers/clk/mediatek/clk-mt8195-topckgen.c | 2 +- + drivers/clk/mediatek/clk-mt8365.c | 4 +- + drivers/clk/mediatek/clk-mt8516-aud.c | 4 +- + drivers/clk/meson/Kconfig | 9 + + drivers/clk/meson/Makefile | 1 + + drivers/clk/meson/a1-peripherals.c | 327 ++--- + drivers/clk/meson/a1-peripherals.h | 67 - + drivers/clk/meson/a1-pll.c | 40 +- + drivers/clk/meson/a1-pll.h | 19 - + drivers/clk/meson/axg-aoclk.c | 48 +- + drivers/clk/meson/axg-aoclk.h | 18 - + drivers/clk/meson/axg-audio.c | 853 ++++++----- + drivers/clk/meson/axg-audio.h | 75 - + drivers/clk/meson/axg.c | 287 ++-- + drivers/clk/meson/axg.h | 63 - + drivers/clk/meson/g12a-aoclk.c | 72 +- + drivers/clk/meson/g12a-aoclk.h | 32 - + drivers/clk/meson/g12a.c | 1483 ++++++++++---------- + drivers/clk/meson/g12a.h | 145 -- + drivers/clk/meson/gxbb-aoclk.c | 14 +- + drivers/clk/meson/gxbb-aoclk.h | 15 - + drivers/clk/meson/gxbb.c | 846 +++++------ + drivers/clk/meson/gxbb.h | 81 -- + drivers/clk/meson/meson-aoclk.c | 11 +- + drivers/clk/meson/meson-aoclk.h | 3 +- + drivers/clk/meson/meson-clkc-utils.c | 25 + + drivers/clk/meson/meson-clkc-utils.h | 19 + + drivers/clk/meson/meson-eeclk.c | 11 +- + drivers/clk/meson/meson-eeclk.h | 3 +- + drivers/clk/meson/meson8b.c | 1310 ++++++++--------- + drivers/clk/meson/meson8b.h | 117 -- + drivers/clk/microchip/clk-pic32mzda.c | 2 +- + drivers/clk/mvebu/ap-cpu-clk.c | 1 - + drivers/clk/mvebu/armada-37xx-periph.c | 1 - + drivers/clk/qcom/apss-ipq-pll.c | 2 +- + drivers/clk/qcom/camcc-sc7180.c | 2 +- + drivers/clk/qcom/camcc-sc7280.c | 2 +- + drivers/clk/qcom/clk-rpm.c | 1 - + drivers/clk/qcom/clk-rpmh.c | 1 - + drivers/clk/qcom/clk-smd-rpm.c | 1 - + drivers/clk/qcom/dispcc-qcm2290.c | 2 +- + drivers/clk/qcom/dispcc-sm6115.c | 2 +- + drivers/clk/qcom/dispcc-sm8450.c | 2 +- + drivers/clk/qcom/dispcc-sm8550.c | 2 +- + drivers/clk/qcom/gcc-apq8084.c | 1 - + drivers/clk/qcom/gcc-ipq4019.c | 1 - + drivers/clk/qcom/gcc-ipq5332.c | 3 +- + drivers/clk/qcom/gcc-ipq6018.c | 1 - + drivers/clk/qcom/gcc-ipq806x.c | 2 +- + drivers/clk/qcom/gcc-ipq8074.c | 1 - + drivers/clk/qcom/gcc-mdm9607.c | 1 - + drivers/clk/qcom/gcc-mdm9615.c | 1 - + drivers/clk/qcom/gcc-msm8660.c | 1 - + drivers/clk/qcom/gcc-msm8909.c | 1 - + drivers/clk/qcom/gcc-msm8916.c | 1 - + drivers/clk/qcom/gcc-msm8917.c | 1 - + drivers/clk/qcom/gcc-msm8939.c | 1 - + drivers/clk/qcom/gcc-msm8953.c | 1 - + drivers/clk/qcom/gcc-msm8976.c | 2 +- + drivers/clk/qcom/gcc-msm8994.c | 1 - + drivers/clk/qcom/gcc-msm8996.c | 1 - + drivers/clk/qcom/gcc-msm8998.c | 1 - + drivers/clk/qcom/gcc-qdu1000.c | 3 +- + drivers/clk/qcom/gcc-sa8775p.c | 2 +- + drivers/clk/qcom/gcc-sc7180.c | 2 +- + drivers/clk/qcom/gcc-sc7280.c | 2 +- + drivers/clk/qcom/gcc-sc8180x.c | 1 - + drivers/clk/qcom/gcc-sc8280xp.c | 2 +- + drivers/clk/qcom/gcc-sdm660.c | 1 - + drivers/clk/qcom/gcc-sdm845.c | 1 - + drivers/clk/qcom/gcc-sdx65.c | 2 +- + drivers/clk/qcom/gcc-sdx75.c | 3 +- + drivers/clk/qcom/gcc-sm6115.c | 3 +- + drivers/clk/qcom/gcc-sm6125.c | 1 - + drivers/clk/qcom/gcc-sm6375.c | 3 +- + drivers/clk/qcom/gcc-sm7150.c | 4 +- + drivers/clk/qcom/gcc-sm8150.c | 1 - + drivers/clk/qcom/gcc-sm8250.c | 2 +- + drivers/clk/qcom/gcc-sm8450.c | 3 +- + drivers/clk/qcom/gcc-sm8550.c | 3 +- + drivers/clk/qcom/gpucc-msm8998.c | 1 - + drivers/clk/qcom/gpucc-sa8775p.c | 4 +- + drivers/clk/qcom/gpucc-sdm660.c | 1 - + drivers/clk/qcom/gpucc-sm6115.c | 3 +- + drivers/clk/qcom/gpucc-sm6125.c | 3 +- + drivers/clk/qcom/gpucc-sm6375.c | 3 +- + drivers/clk/qcom/gpucc-sm8350.c | 2 +- + drivers/clk/qcom/gpucc-sm8450.c | 3 +- + drivers/clk/qcom/gpucc-sm8550.c | 3 +- + drivers/clk/qcom/lcc-ipq806x.c | 1 - + drivers/clk/qcom/lcc-msm8960.c | 1 - + drivers/clk/qcom/lpass-gfm-sm8250.c | 2 +- + drivers/clk/qcom/lpassaudiocc-sc7280.c | 3 +- + drivers/clk/qcom/lpasscc-sc8280xp.c | 4 +- + drivers/clk/qcom/lpasscorecc-sc7180.c | 2 +- + drivers/clk/qcom/lpasscorecc-sc7280.c | 3 +- + drivers/clk/qcom/mmcc-msm8974.c | 1 - + drivers/clk/qcom/mmcc-msm8994.c | 1 - + drivers/clk/qcom/mmcc-msm8996.c | 1 - + drivers/clk/qcom/mmcc-msm8998.c | 1 - + drivers/clk/qcom/tcsrcc-sm8550.c | 3 +- + drivers/clk/qcom/videocc-sm8450.c | 3 +- + drivers/clk/qcom/videocc-sm8550.c | 3 +- + drivers/clk/renesas/clk-emev2.c | 3 - + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a774b1-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a774e1-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7795-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a7796-cpg-mssr.c | 2 + + drivers/clk/renesas/r8a77965-cpg-mssr.c | 2 + + drivers/clk/renesas/r9a07g043-cpg.c | 3 + + drivers/clk/renesas/r9a09g011-cpg.c | 15 + + drivers/clk/renesas/rcar-gen3-cpg.c | 35 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 1 + + drivers/clk/renesas/rcar-usb2-clock-sel.c | 1 - + drivers/clk/renesas/renesas-cpg-mssr.c | 1 - + drivers/clk/renesas/rzg2l-cpg.c | 11 +- + drivers/clk/rockchip/clk-rk3568.c | 2 +- + drivers/clk/rockchip/clk-rv1126.c | 2 +- + drivers/clk/samsung/clk-exynos-arm64.c | 3 +- + drivers/clk/samsung/clk-exynos-audss.c | 3 +- + drivers/clk/samsung/clk-exynos5-subcmu.c | 2 +- + drivers/clk/samsung/clk-exynos7885.c | 1 - + drivers/clk/samsung/clk-exynos850.c | 1 - + drivers/clk/samsung/clk-exynosautov9.c | 2 - + drivers/clk/samsung/clk-fsd.c | 2 - + drivers/clk/sifive/sifive-prci.c | 2 +- + drivers/clk/socfpga/clk-agilex.c | 3 +- + drivers/clk/socfpga/clk-s10.c | 3 +- + drivers/clk/spear/spear1310_clock.c | 1 - + drivers/clk/spear/spear1340_clock.c | 1 - + drivers/clk/spear/spear3xx_clock.c | 2 +- + drivers/clk/sprd/common.c | 2 +- + drivers/clk/sprd/sc9860-clk.c | 2 +- + drivers/clk/sprd/ums512-clk.c | 2 +- + drivers/clk/starfive/Kconfig | 33 + + drivers/clk/starfive/Makefile | 4 + + drivers/clk/starfive/clk-starfive-jh7100-audio.c | 1 - + drivers/clk/starfive/clk-starfive-jh7110-isp.c | 232 +++ + drivers/clk/starfive/clk-starfive-jh7110-pll.c | 507 +++++++ + drivers/clk/starfive/clk-starfive-jh7110-stg.c | 173 +++ + drivers/clk/starfive/clk-starfive-jh7110-sys.c | 62 +- + drivers/clk/starfive/clk-starfive-jh7110-vout.c | 239 ++++ + drivers/clk/starfive/clk-starfive-jh7110.h | 6 + + drivers/clk/starfive/clk-starfive-jh71x0.c | 10 +- + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun6i-rtc.c | 2 + + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 2 +- + drivers/clk/sunxi/clk-sun6i-apb0-gates.c | 1 - + drivers/clk/sunxi/clk-sun9i-mmc.c | 1 - + drivers/clk/tegra/clk-device.c | 2 +- + drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 2 +- + drivers/clk/tegra/clk-tegra20.c | 1 - + drivers/clk/tegra/clk-tegra30.c | 1 - + drivers/clk/tegra/clk.c | 8 +- + drivers/clk/ti/clk.c | 4 +- + drivers/clk/ti/clkctrl.c | 9 +- + drivers/clk/uniphier/clk-uniphier-core.c | 1 - + drivers/clk/xilinx/xlnx_vcu.c | 2 +- + drivers/clk/zynqmp/clkc.c | 3 +- + drivers/reset/starfive/reset-starfive-jh7110.c | 30 + + .../clock/amlogic,a1-peripherals-clkc.h | 53 + + include/dt-bindings/clock/amlogic,a1-pll-clkc.h | 5 + + include/dt-bindings/clock/ast2600-clock.h | 12 + + include/dt-bindings/clock/axg-audio-clkc.h | 65 + + include/dt-bindings/clock/axg-clkc.h | 48 + + include/dt-bindings/clock/g12a-aoclkc.h | 7 + + include/dt-bindings/clock/g12a-clkc.h | 130 ++ + include/dt-bindings/clock/gxbb-clkc.h | 65 + + include/dt-bindings/clock/meson8b-clkc.h | 97 ++ + include/linux/clk.h | 80 +- + include/linux/string_helpers.h | 2 + + lib/string_helpers.c | 15 + + 277 files changed, 6381 insertions(+), 4151 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/hix5hd2-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/oxnas,stdclk.txt + create mode 100644 Documentation/devicetree/bindings/clock/renesas,5p35023.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/xlnx,zynqmp-clk.txt + create mode 100644 Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-hhi-sysctrl.yaml + delete mode 100644 drivers/clk/clk-oxnas.c + create mode 100644 drivers/clk/clk-versaclock3.c + delete mode 100644 drivers/clk/meson/axg-aoclk.h + delete mode 100644 drivers/clk/meson/g12a-aoclk.h + delete mode 100644 drivers/clk/meson/gxbb-aoclk.h + create mode 100644 drivers/clk/meson/meson-clkc-utils.c + create mode 100644 drivers/clk/meson/meson-clkc-utils.h + create mode 100644 drivers/clk/starfive/clk-starfive-jh7110-isp.c + create mode 100644 drivers/clk/starfive/clk-starfive-jh7110-pll.c + create mode 100644 drivers/clk/starfive/clk-starfive-jh7110-stg.c + create mode 100644 drivers/clk/starfive/clk-starfive-jh7110-vout.c +Merging clk-imx/for-next (72d00e560d10 clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Auto-merging drivers/clk/imx/clk-imx8qxp-lpcg.c +Auto-merging drivers/clk/imx/clk-imx8ulp.c +Auto-merging drivers/clk/imx/clk-imx93.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/fsl,imx8-acm.yaml | 282 ++++++++++++ + drivers/clk/imx/Makefile | 3 +- + drivers/clk/imx/clk-composite-8m.c | 12 +- + drivers/clk/imx/clk-fracn-gppll.c | 1 + + drivers/clk/imx/clk-gpr-mux.c | 8 +- + drivers/clk/imx/clk-imx25.c | 5 +- + drivers/clk/imx/clk-imx8-acm.c | 476 +++++++++++++++++++++ + drivers/clk/imx/clk-imx8mp.c | 5 - + drivers/clk/imx/clk-imx8qxp-lpcg.c | 4 +- + drivers/clk/imx/clk-imx8ulp.c | 2 +- + drivers/clk/imx/clk-imx93.c | 4 +- + drivers/clk/imx/clk-pll14xx.c | 13 +- + drivers/clk/imx/clk-pllv4.c | 44 +- + drivers/clk/imx/clk.h | 1 + + include/dt-bindings/clock/imx8-clock.h | 28 ++ + include/dt-bindings/clock/imx8mp-clock.h | 2 +- + include/dt-bindings/clock/imx93-clock.h | 3 +- + include/soc/imx/revision.h | 1 + + 18 files changed, 850 insertions(+), 44 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/fsl,imx8-acm.yaml + create mode 100644 drivers/clk/imx/clk-imx8-acm.c +Merging clk-renesas/renesas-clk (dec57795efc4 clk: renesas: r8a77965: Add 3DGE and ZG support) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging csky/linux-next (c8171a86b274 csky: Fixup -Wmissing-prototypes warning) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Auto-merging arch/csky/abiv2/cacheflush.c +CONFLICT (content): Merge conflict in arch/csky/abiv2/cacheflush.c +Recorded preimage for 'arch/csky/abiv2/cacheflush.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/csky/abiv2/cacheflush.c'. +[master de1710d2e277] Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git +$ git diff -M --stat --summary HEAD^.. + arch/arc/include/asm/page.h | 2 +- + arch/csky/abiv2/cacheflush.c | 3 +-- + arch/csky/include/asm/page.h | 13 ++++++++++--- + arch/csky/include/asm/ptrace.h | 2 ++ + arch/csky/include/asm/sections.h | 2 ++ + arch/csky/include/asm/traps.h | 15 +++++++++++++++ + arch/csky/kernel/module.c | 2 +- + arch/csky/kernel/vdso/vgettimeofday.c | 11 +++++++++++ + 8 files changed, 43 insertions(+), 7 deletions(-) +Merging loongarch/loongarch-next (5020c5f9d5f7 LoongArch: Add kernel address sanitizer support) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/include/asm/pgtable.h +Auto-merging arch/loongarch/kernel/process.c +Auto-merging arch/loongarch/mm/pgtable.c +Auto-merging mm/kfence/core.c +Merge made by the 'ort' strategy. + Documentation/dev-tools/kasan.rst | 4 +- + .../features/debug/KASAN/arch-support.txt | 2 +- + Documentation/features/debug/kcov/arch-support.txt | 2 +- + .../translations/zh_CN/dev-tools/kasan.rst | 2 +- + arch/loongarch/Kconfig | 27 +- + arch/loongarch/Makefile | 5 +- + arch/loongarch/include/asm/Kbuild | 1 - + arch/loongarch/include/asm/asm-prototypes.h | 1 + + arch/loongarch/include/asm/asmmacro.h | 51 +- + arch/loongarch/include/asm/kasan.h | 126 +++++ + arch/loongarch/include/asm/kfence.h | 61 +++ + arch/loongarch/include/asm/lbt.h | 107 +++++ + arch/loongarch/include/asm/loongarch.h | 4 + + arch/loongarch/include/asm/page.h | 7 +- + arch/loongarch/include/asm/pgtable.h | 21 +- + arch/loongarch/include/asm/processor.h | 26 +- + arch/loongarch/include/asm/ptrace.h | 2 +- + arch/loongarch/include/asm/setup.h | 8 +- + arch/loongarch/include/asm/string.h | 20 + + arch/loongarch/include/asm/switch_to.h | 2 + + arch/loongarch/include/asm/thread_info.h | 4 + + arch/loongarch/include/asm/xor.h | 68 +++ + arch/loongarch/include/asm/xor_simd.h | 34 ++ + arch/loongarch/include/uapi/asm/ptrace.h | 6 + + arch/loongarch/include/uapi/asm/sigcontext.h | 10 + + arch/loongarch/kernel/Makefile | 8 + + arch/loongarch/kernel/asm-offsets.c | 18 +- + arch/loongarch/kernel/cpu-probe.c | 14 + + arch/loongarch/kernel/fpu.S | 11 +- + arch/loongarch/kernel/head.S | 13 +- + arch/loongarch/kernel/kfpu.c | 55 ++- + arch/loongarch/kernel/lbt.S | 144 ++++++ + arch/loongarch/kernel/mcount.S | 2 +- + arch/loongarch/kernel/mcount_dyn.S | 1 - + arch/loongarch/kernel/process.c | 15 +- + arch/loongarch/kernel/ptrace.c | 54 +++ + arch/loongarch/kernel/relocate.c | 8 +- + arch/loongarch/kernel/setup.c | 4 + + arch/loongarch/kernel/signal.c | 188 ++++++++ + arch/loongarch/kernel/stacktrace.c | 18 +- + arch/loongarch/kernel/traps.c | 52 ++- + arch/loongarch/lib/Makefile | 2 + + arch/loongarch/lib/clear_user.S | 2 +- + arch/loongarch/lib/copy_user.S | 2 +- + arch/loongarch/lib/memcpy.S | 10 +- + arch/loongarch/lib/memmove.S | 22 +- + arch/loongarch/lib/memset.S | 10 +- + arch/loongarch/lib/unaligned.S | 1 - + arch/loongarch/lib/xor_simd.c | 93 ++++ + arch/loongarch/lib/xor_simd.h | 38 ++ + arch/loongarch/lib/xor_simd_glue.c | 72 +++ + arch/loongarch/lib/xor_template.c | 110 +++++ + arch/loongarch/mm/Makefile | 3 + + arch/loongarch/mm/fault.c | 22 +- + arch/loongarch/mm/kasan_init.c | 239 ++++++++++ + arch/loongarch/mm/page.S | 2 +- + arch/loongarch/mm/pgtable.c | 12 + + arch/loongarch/mm/tlbex.S | 1 - + arch/loongarch/vdso/Makefile | 3 + + include/linux/kasan.h | 2 + + include/linux/raid/pq.h | 4 + + lib/raid6/Makefile | 1 + + lib/raid6/algos.c | 16 + + lib/raid6/loongarch.h | 38 ++ + lib/raid6/loongarch_simd.c | 422 +++++++++++++++++ + lib/raid6/recov_loongarch_simd.c | 513 +++++++++++++++++++++ + lib/raid6/test/Makefile | 31 +- + mm/kasan/init.c | 18 +- + mm/kasan/kasan.h | 6 + + mm/kfence/core.c | 5 +- + 70 files changed, 2791 insertions(+), 115 deletions(-) + create mode 100644 arch/loongarch/include/asm/kasan.h + create mode 100644 arch/loongarch/include/asm/kfence.h + create mode 100644 arch/loongarch/include/asm/lbt.h + create mode 100644 arch/loongarch/include/asm/xor.h + create mode 100644 arch/loongarch/include/asm/xor_simd.h + create mode 100644 arch/loongarch/kernel/lbt.S + create mode 100644 arch/loongarch/lib/xor_simd.c + create mode 100644 arch/loongarch/lib/xor_simd.h + create mode 100644 arch/loongarch/lib/xor_simd_glue.c + create mode 100644 arch/loongarch/lib/xor_template.c + create mode 100644 arch/loongarch/mm/kasan_init.c + create mode 100644 lib/raid6/loongarch.h + create mode 100644 lib/raid6/loongarch_simd.c + create mode 100644 lib/raid6/recov_loongarch_simd.c +Merging m68k/for-next (922a9bd13810 m68k: Fix invalid .section syntax) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (7c53e18ee74e m68k: coldfire: dma_timer: ERROR: "foo __init bar" should be "foo __init bar") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/coldfire/dma_timer.c | 2 +- + arch/m68k/kernel/pcibios.c | 6 ------ + 2 files changed, 1 insertion(+), 7 deletions(-) +Merging microblaze/next (0e9a2a228a1a microblaze: Explicitly include correct DT includes) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'ort' strategy. + arch/microblaze/kernel/reset.c | 1 - + 1 file changed, 1 deletion(-) +Merging mips/mips-next (f11a99674132 MIPS: Loongson64: Fix more __iomem attributes) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Merge made by the 'ort' strategy. + arch/mips/Makefile | 16 ++- + arch/mips/bmips/setup.c | 1 - + arch/mips/cavium-octeon/flash_setup.c | 3 +- + arch/mips/cavium-octeon/octeon-platform.c | 2 + + arch/mips/cavium-octeon/octeon-usb.c | 2 + + arch/mips/include/asm/mach-loongson32/loongson1.h | 2 - + arch/mips/include/asm/mach-loongson32/regs-clk.h | 81 ----------- + arch/mips/include/asm/mach-loongson32/regs-rtc.h | 19 --- + arch/mips/lantiq/irq.c | 2 +- + arch/mips/lantiq/xway/dcdc.c | 3 +- + arch/mips/lantiq/xway/gptu.c | 3 +- + arch/mips/lantiq/xway/sysctrl.c | 1 - + arch/mips/lantiq/xway/vmmc.c | 3 +- + arch/mips/loongson32/common/platform.c | 8 -- + arch/mips/loongson64/smp.c | 160 +++++++++++----------- + arch/mips/pci/pci-lantiq.c | 4 +- + arch/mips/pci/pci-rt2880.c | 5 +- + arch/mips/pic32/pic32mzda/config.c | 2 +- + arch/mips/ralink/ill_acc.c | 2 + + arch/mips/ralink/irq.c | 2 +- + arch/mips/ralink/of.c | 2 +- + arch/mips/ralink/prom.c | 2 - + 22 files changed, 112 insertions(+), 213 deletions(-) + delete mode 100644 arch/mips/include/asm/mach-loongson32/regs-clk.h + delete mode 100644 arch/mips/include/asm/mach-loongson32/regs-rtc.h +Merging openrisc/for-next (232ba1630c66 openrisc: Make pfn accessors statics inlines) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Merge made by the 'ort' strategy. + arch/openrisc/include/asm/page.h | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) +Merging parisc-hd/for-next (7a894c873747 parisc: Fix CONFIG_TLB_PTLOCK to work with lightweight spinlock checks) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/kernel/entry.S | 47 +++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 24 deletions(-) +Merging powerpc/next (cd50430ceb35 macintosh/ams: mark ams_init() static) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging Documentation/ABI/testing/sysfs-devices-system-cpu +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/powerpc/configs/pmac32_defconfig +Auto-merging arch/powerpc/configs/ppc64_defconfig +Auto-merging arch/powerpc/mm/book3s64/pgtable.c +Auto-merging arch/powerpc/mm/book3s64/radix_tlb.c +Auto-merging arch/powerpc/xmon/xmon.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging include/linux/cpu.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 1 + + Documentation/admin-guide/kernel-parameters.txt | 4 +- + arch/Kconfig | 3 + + arch/powerpc/Kconfig | 2 + + arch/powerpc/configs/pmac32_defconfig | 3 +- + arch/powerpc/configs/ppc64_defconfig | 3 + + arch/powerpc/crypto/Kconfig | 2 +- + arch/powerpc/include/asm/book3s/32/kup.h | 127 +++++----- + arch/powerpc/include/asm/book3s/64/hash-pkey.h | 2 +- + arch/powerpc/include/asm/book3s/64/kup.h | 54 ++-- + arch/powerpc/include/asm/book3s/64/mmu.h | 2 +- + arch/powerpc/include/asm/bug.h | 1 + + arch/powerpc/include/asm/feature-fixups.h | 1 + + arch/powerpc/include/asm/ibmebus.h | 2 + + arch/powerpc/include/asm/kup.h | 91 +++---- + arch/powerpc/include/asm/macio.h | 3 +- + arch/powerpc/include/asm/mmu.h | 4 +- + arch/powerpc/include/asm/mmu_context.h | 1 + + arch/powerpc/include/asm/nohash/32/kup-8xx.h | 64 +++-- + arch/powerpc/include/asm/nohash/kup-booke.h | 68 +++--- + arch/powerpc/include/asm/pci.h | 3 +- + arch/powerpc/include/asm/topology.h | 15 ++ + arch/powerpc/include/asm/uaccess.h | 6 +- + arch/powerpc/kernel/audit.c | 3 +- + arch/powerpc/kernel/audit_32.h | 7 + + arch/powerpc/kernel/compat_audit.c | 2 + + arch/powerpc/kernel/cputable.c | 4 + + arch/powerpc/kernel/legacy_serial.c | 2 +- + arch/powerpc/kernel/of_platform.c | 4 +- + arch/powerpc/kernel/setup-common.c | 10 +- + arch/powerpc/kernel/smp.c | 20 +- + arch/powerpc/kernel/syscall.c | 2 +- + arch/powerpc/kernel/traps.c | 2 +- + arch/powerpc/kexec/crash.c | 2 +- + arch/powerpc/kexec/file_load_64.c | 8 +- + arch/powerpc/kexec/ranges.c | 2 +- + arch/powerpc/lib/feature-fixups.c | 31 ++- + arch/powerpc/mm/book3s32/kuap.c | 20 +- + arch/powerpc/mm/book3s32/mmu_context.c | 2 +- + arch/powerpc/mm/book3s64/pgtable.c | 1 + + arch/powerpc/mm/book3s64/pkeys.c | 2 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 272 ++++++++++++--------- + arch/powerpc/mm/init_32.c | 2 + + arch/powerpc/mm/mmu_context.c | 8 +- + arch/powerpc/mm/nohash/kup.c | 8 +- + arch/powerpc/platforms/4xx/cpm.c | 2 +- + arch/powerpc/platforms/4xx/hsta_msi.c | 2 +- + arch/powerpc/platforms/4xx/soc.c | 2 +- + arch/powerpc/platforms/512x/mpc5121_ads.c | 2 +- + arch/powerpc/platforms/512x/mpc512x_generic.c | 2 +- + arch/powerpc/platforms/512x/mpc512x_lpbfifo.c | 2 +- + arch/powerpc/platforms/512x/pdm360ng.c | 3 +- + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 3 +- + arch/powerpc/platforms/82xx/ep8248e.c | 9 +- + arch/powerpc/platforms/83xx/km83xx.c | 4 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 4 +- + arch/powerpc/platforms/83xx/suspend.c | 2 +- + arch/powerpc/platforms/85xx/bsc913x_qds.c | 2 +- + arch/powerpc/platforms/85xx/bsc913x_rdb.c | 2 +- + arch/powerpc/platforms/85xx/c293pcie.c | 3 +- + arch/powerpc/platforms/85xx/common.c | 1 + + arch/powerpc/platforms/85xx/ge_imp3a.c | 2 +- + arch/powerpc/platforms/85xx/ksi8560.c | 3 +- + arch/powerpc/platforms/85xx/mpc8536_ds.c | 2 +- + arch/powerpc/platforms/85xx/mpc85xx_ds.c | 2 +- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 4 +- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 3 +- + arch/powerpc/platforms/85xx/p1010rdb.c | 2 +- + arch/powerpc/platforms/85xx/p1022_ds.c | 2 +- + arch/powerpc/platforms/85xx/p1022_rdk.c | 2 +- + arch/powerpc/platforms/85xx/p1023_rdb.c | 3 +- + arch/powerpc/platforms/85xx/socrates.c | 2 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 1 - + arch/powerpc/platforms/85xx/stx_gp3.c | 2 +- + arch/powerpc/platforms/85xx/tqm85xx.c | 2 +- + arch/powerpc/platforms/85xx/twr_p102x.c | 3 +- + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 2 +- + arch/powerpc/platforms/86xx/common.c | 3 + + arch/powerpc/platforms/86xx/gef_ppc9a.c | 2 +- + arch/powerpc/platforms/86xx/gef_sbc310.c | 2 +- + arch/powerpc/platforms/86xx/gef_sbc610.c | 2 +- + arch/powerpc/platforms/86xx/mvme7100.c | 1 - + arch/powerpc/platforms/86xx/pic.c | 4 +- + arch/powerpc/platforms/cell/axon_msi.c | 3 +- + arch/powerpc/platforms/cell/cbe_regs.c | 3 +- + arch/powerpc/platforms/cell/iommu.c | 2 +- + arch/powerpc/platforms/cell/ras.c | 2 +- + arch/powerpc/platforms/cell/setup.c | 1 + + arch/powerpc/platforms/cell/spider-pci.c | 1 - + arch/powerpc/platforms/cell/spu_manage.c | 1 + + arch/powerpc/platforms/embedded6xx/holly.c | 2 +- + arch/powerpc/platforms/maple/setup.c | 3 +- + arch/powerpc/platforms/pasemi/gpio_mdio.c | 2 +- + arch/powerpc/platforms/pasemi/pasemi.h | 1 + + arch/powerpc/platforms/pasemi/setup.c | 2 + + arch/powerpc/platforms/pasemi/time.c | 2 + + arch/powerpc/platforms/powermac/feature.c | 2 + + arch/powerpc/platforms/powermac/setup.c | 2 +- + arch/powerpc/platforms/powernv/opal-imc.c | 1 - + arch/powerpc/platforms/powernv/opal-rtc.c | 3 +- + arch/powerpc/platforms/powernv/opal-secvar.c | 2 +- + arch/powerpc/platforms/powernv/opal-sensor.c | 2 + + arch/powerpc/platforms/pseries/hotplug-cpu.c | 30 ++- + arch/powerpc/platforms/pseries/ibmebus.c | 1 + + arch/powerpc/platforms/pseries/plpks.c | 2 +- + arch/powerpc/platforms/pseries/pseries.h | 2 + + arch/powerpc/platforms/pseries/setup.c | 2 + + arch/powerpc/sysdev/cpm_common.c | 2 - + arch/powerpc/sysdev/cpm_gpio.c | 3 +- + arch/powerpc/sysdev/fsl_pmc.c | 4 +- + arch/powerpc/sysdev/fsl_rio.c | 4 +- + arch/powerpc/sysdev/fsl_rmu.c | 1 - + arch/powerpc/sysdev/fsl_soc.c | 1 - + arch/powerpc/sysdev/mpic_msgr.c | 3 +- + arch/powerpc/sysdev/mpic_timer.c | 1 - + arch/powerpc/sysdev/of_rtc.c | 4 +- + arch/powerpc/sysdev/pmi.c | 4 +- + arch/powerpc/xmon/xmon.c | 10 +- + arch/x86/include/asm/topology.h | 4 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/smpboot.c | 8 - + drivers/macintosh/ams/ams-core.c | 2 +- + include/linux/cpu.h | 25 +- + include/linux/cpu_smt.h | 33 +++ + kernel/cpu.c | 142 ++++++++--- + tools/testing/selftests/powerpc/ptrace/child.h | 4 +- + tools/testing/selftests/powerpc/ptrace/core-pkey.c | 2 +- + .../selftests/powerpc/ptrace/perf-hwbreak.c | 2 +- + .../selftests/powerpc/ptrace/ptrace-hwbreak.c | 26 +- + .../selftests/powerpc/ptrace/ptrace-perf-hwbreak.c | 6 +- + .../testing/selftests/powerpc/ptrace/ptrace-pkey.c | 2 +- + .../testing/selftests/powerpc/ptrace/ptrace-tar.c | 2 +- + .../selftests/powerpc/ptrace/ptrace-tm-gpr.c | 4 +- + .../selftests/powerpc/ptrace/ptrace-tm-spd-gpr.c | 4 +- + .../selftests/powerpc/ptrace/ptrace-tm-spd-tar.c | 4 +- + .../selftests/powerpc/ptrace/ptrace-tm-spd-vsx.c | 4 +- + .../selftests/powerpc/ptrace/ptrace-tm-spr.c | 4 +- + .../selftests/powerpc/ptrace/ptrace-tm-tar.c | 4 +- + .../selftests/powerpc/ptrace/ptrace-tm-vsx.c | 4 +- + .../testing/selftests/powerpc/ptrace/ptrace-vsx.c | 2 +- + 140 files changed, 759 insertions(+), 614 deletions(-) + create mode 100644 arch/powerpc/kernel/audit_32.h + create mode 100644 include/linux/cpu_smt.h +Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (174e8ac0272d riscv: alternatives: fix a typo in comment) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/kernel/cpu.c +Auto-merging arch/riscv/kernel/cpufeature.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 7 + + arch/riscv/Kconfig | 18 + + arch/riscv/include/asm/alternative-macros.h | 2 +- + arch/riscv/include/asm/hwcap.h | 17 +- + arch/riscv/include/uapi/asm/sigcontext.h | 2 +- + arch/riscv/kernel/cpu.c | 191 ++++----- + arch/riscv/kernel/cpufeature.c | 521 ++++++++++++++++-------- + 7 files changed, 447 insertions(+), 311 deletions(-) +Merging riscv-dt/riscv-dt-for-next (f331eb1f5454 riscv: dts: starfive: jh7110: Fix GMAC configuration) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Already up to date. +Merging riscv-soc/riscv-soc-for-next (30fb4784483b soc: starfive: Add JH7110 AON PMU support) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/riscv/Kconfig.socs | 1 + + drivers/genpd/starfive/jh71xx-pmu.c | 139 +++++++++++++++++++----- + drivers/soc/starfive/Kconfig | 4 +- + include/dt-bindings/power/starfive,jh7110-pmu.h | 5 +- + 5 files changed, 118 insertions(+), 32 deletions(-) +Merging s390/for-next (63b9eab21ad8 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/s390/Kbuild +Auto-merging arch/s390/Kconfig +CONFLICT (content): Merge conflict in arch/s390/Kconfig +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/configs/defconfig +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/s390/mm/fault.c +Auto-merging drivers/Makefile +Resolved 'arch/s390/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3a42fa0f0974] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/arch/index.rst | 2 +- + Documentation/{ => arch}/s390/3270.ChangeLog | 0 + Documentation/{ => arch}/s390/3270.rst | 4 +- + Documentation/{ => arch}/s390/cds.rst | 2 +- + Documentation/{ => arch}/s390/common_io.rst | 2 +- + Documentation/{ => arch}/s390/config3270.sh | 0 + Documentation/{ => arch}/s390/driver-model.rst | 0 + Documentation/{ => arch}/s390/features.rst | 0 + Documentation/{ => arch}/s390/index.rst | 0 + Documentation/{ => arch}/s390/monreader.rst | 0 + Documentation/{ => arch}/s390/pci.rst | 2 +- + Documentation/{ => arch}/s390/qeth.rst | 0 + Documentation/{ => arch}/s390/s390dbf.rst | 0 + Documentation/{ => arch}/s390/text_files.rst | 0 + Documentation/{ => arch}/s390/vfio-ap-locking.rst | 0 + Documentation/{ => arch}/s390/vfio-ap.rst | 0 + Documentation/{ => arch}/s390/vfio-ccw.rst | 2 +- + Documentation/{ => arch}/s390/zfcpdump.rst | 0 + Documentation/driver-api/s390-drivers.rst | 4 +- + MAINTAINERS | 8 +- + arch/s390/Kbuild | 2 +- + arch/s390/Kconfig | 31 +- + arch/s390/Makefile | 1 - + arch/s390/boot/startup.c | 4 +- + arch/s390/configs/debug_defconfig | 1 + + arch/s390/configs/defconfig | 1 + + arch/s390/hypfs/Makefile | 11 +- + arch/s390/hypfs/hypfs.h | 10 +- + arch/s390/hypfs/hypfs_dbfs.c | 31 +- + arch/s390/hypfs/hypfs_diag.c | 453 +----------- + arch/s390/hypfs/hypfs_diag.h | 35 + + arch/s390/hypfs/hypfs_diag_fs.c | 393 +++++++++++ + arch/s390/hypfs/hypfs_vm.c | 175 +---- + arch/s390/hypfs/hypfs_vm.h | 50 ++ + arch/s390/hypfs/hypfs_vm_fs.c | 139 ++++ + arch/s390/hypfs/inode.c | 35 +- + arch/s390/include/asm/Kbuild | 1 - + arch/s390/include/asm/debug.h | 4 +- + arch/s390/include/asm/diag.h | 3 + + arch/s390/include/asm/ftrace.h | 17 + + arch/s390/include/asm/pfault.h | 26 + + arch/s390/include/asm/pgtable.h | 2 - + arch/s390/include/asm/sclp.h | 1 + + arch/s390/include/asm/setup.h | 9 +- + arch/s390/kernel/Makefile | 7 +- + arch/s390/kernel/asm-offsets.c | 9 + + arch/s390/kernel/cert_store.c | 811 ++++++++++++++++++++++ + arch/s390/kernel/diag.c | 25 +- + arch/s390/kernel/ebcdic.c | 2 +- + arch/s390/kernel/entry.S | 2 +- + arch/s390/kernel/machine_kexec.c | 1 + + arch/s390/kernel/mcount.S | 65 +- + arch/s390/kernel/setup.c | 1 + + arch/s390/kernel/smp.c | 16 +- + arch/s390/kernel/sthyi.c | 4 +- + arch/s390/lib/mem.S | 2 +- + arch/s390/lib/tishift.S | 2 +- + arch/s390/mm/Makefile | 1 + + arch/s390/mm/extmem.c | 9 +- + arch/s390/mm/fault.c | 228 ------ + arch/s390/mm/pfault.c | 248 +++++++ + arch/s390/mm/vmem.c | 2 +- + drivers/Makefile | 2 + + drivers/crypto/Kconfig | 7 +- + drivers/s390/block/dcssblk.c | 22 +- + drivers/s390/char/sclp_cmd.c | 4 - + drivers/s390/char/sclp_early.c | 1 + + drivers/s390/char/zcore.c | 2 +- + drivers/s390/crypto/Makefile | 2 +- + drivers/s390/crypto/ap_bus.c | 25 +- + drivers/s390/crypto/ap_bus.h | 19 +- + drivers/s390/crypto/ap_queue.c | 47 +- + drivers/s390/crypto/zcrypt_cex2a.c | 227 ------ + drivers/s390/crypto/zcrypt_cex2a.h | 134 ---- + drivers/s390/crypto/zcrypt_cex2c.c | 421 ----------- + drivers/s390/crypto/zcrypt_cex2c.h | 18 - + drivers/s390/crypto/zcrypt_msgtype50.c | 64 +- + drivers/s390/crypto/zcrypt_msgtype50.h | 3 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 14 +- + 80 files changed, 2024 insertions(+), 1888 deletions(-) + rename Documentation/{ => arch}/s390/3270.ChangeLog (100%) + rename Documentation/{ => arch}/s390/3270.rst (99%) + rename Documentation/{ => arch}/s390/cds.rst (99%) + rename Documentation/{ => arch}/s390/common_io.rst (98%) + rename Documentation/{ => arch}/s390/config3270.sh (100%) + rename Documentation/{ => arch}/s390/driver-model.rst (100%) + rename Documentation/{ => arch}/s390/features.rst (100%) + rename Documentation/{ => arch}/s390/index.rst (100%) + rename Documentation/{ => arch}/s390/monreader.rst (100%) + rename Documentation/{ => arch}/s390/pci.rst (99%) + rename Documentation/{ => arch}/s390/qeth.rst (100%) + rename Documentation/{ => arch}/s390/s390dbf.rst (100%) + rename Documentation/{ => arch}/s390/text_files.rst (100%) + rename Documentation/{ => arch}/s390/vfio-ap-locking.rst (100%) + rename Documentation/{ => arch}/s390/vfio-ap.rst (100%) + rename Documentation/{ => arch}/s390/vfio-ccw.rst (99%) + rename Documentation/{ => arch}/s390/zfcpdump.rst (100%) + create mode 100644 arch/s390/hypfs/hypfs_diag.h + create mode 100644 arch/s390/hypfs/hypfs_diag_fs.c + create mode 100644 arch/s390/hypfs/hypfs_vm.h + create mode 100644 arch/s390/hypfs/hypfs_vm_fs.c + create mode 100644 arch/s390/include/asm/pfault.h + create mode 100644 arch/s390/kernel/cert_store.c + create mode 100644 arch/s390/mm/pfault.c +Merging sh/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging uml/next (6032aca0deb9 um: make stub data pages size tweakable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (a160e9414d8a xtensa: fix unaligned and load/store configuration interaction) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging fscrypt/for-next (324718ddddc4 fscrypt: improve the "Encryption modes and usage" section) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Merge made by the 'ort' strategy. + Documentation/filesystems/fscrypt.rst | 152 +++++++++++++++++++++++++--------- + 1 file changed, 113 insertions(+), 39 deletions(-) +Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Merge made by the 'ort' strategy. + include/trace/events/afs.h | 475 ++++++++++++++------------------------------- + 1 file changed, 148 insertions(+), 327 deletions(-) +Merging btrfs/for-next (6099857b7d15 Merge branch 'for-next-next-v6.5-20230814' into for-next-20230814) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. + fs/btrfs/Kconfig | 4 +- + fs/btrfs/accessors.h | 23 +- + fs/btrfs/backref.c | 29 +- + fs/btrfs/block-group.c | 73 ++- + fs/btrfs/block-group.h | 4 +- + fs/btrfs/btrfs_inode.h | 6 +- + fs/btrfs/ctree.h | 1 + + fs/btrfs/delayed-inode.c | 8 +- + fs/btrfs/delayed-inode.h | 1 + + fs/btrfs/dev-replace.c | 6 +- + fs/btrfs/disk-io.c | 177 ++++--- + fs/btrfs/disk-io.h | 1 - + fs/btrfs/extent-io-tree.c | 14 +- + fs/btrfs/extent-io-tree.h | 6 +- + fs/btrfs/extent-tree.c | 290 +++++++----- + fs/btrfs/extent-tree.h | 16 +- + fs/btrfs/extent_io.c | 829 +++++++++++++++------------------ + fs/btrfs/extent_io.h | 35 +- + fs/btrfs/file-item.c | 33 +- + fs/btrfs/file-item.h | 6 +- + fs/btrfs/file.c | 3 +- + fs/btrfs/free-space-cache.c | 18 +- + fs/btrfs/free-space-tree.c | 13 +- + fs/btrfs/fs.h | 15 +- + fs/btrfs/inode.c | 968 ++++++++++++++++----------------------- + fs/btrfs/messages.c | 16 +- + fs/btrfs/messages.h | 2 - + fs/btrfs/ordered-data.c | 32 +- + fs/btrfs/print-tree.c | 10 +- + fs/btrfs/qgroup.c | 19 +- + fs/btrfs/raid56.c | 29 +- + fs/btrfs/raid56.h | 1 - + fs/btrfs/relocation.c | 33 +- + fs/btrfs/scrub.c | 244 ++++++---- + fs/btrfs/send.c | 6 +- + fs/btrfs/space-info.c | 85 ++-- + fs/btrfs/super.c | 6 + + fs/btrfs/sysfs.c | 7 + + fs/btrfs/tests/extent-io-tests.c | 306 ++++++++++--- + fs/btrfs/transaction.c | 39 +- + fs/btrfs/tree-log.c | 8 +- + fs/btrfs/volumes.c | 94 ++-- + fs/btrfs/volumes.h | 3 +- + fs/btrfs/zoned.c | 273 ++++++++--- + fs/btrfs/zoned.h | 28 +- + include/linux/writeback.h | 5 - + include/trace/events/btrfs.h | 30 +- + include/uapi/linux/btrfs_tree.h | 6 +- + mm/page-writeback.c | 49 +- + 49 files changed, 2060 insertions(+), 1850 deletions(-) +Merging ceph/master (e6e284323079 libceph: fix potential hang in ceph_osdc_notify()) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (7b38f6ddc97b smb3: display network namespace in debug information) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/smb/client/cifs_debug.c | 10 ++++++++++ + fs/smb/client/file.c | 25 +++++++++++++++++-------- + 2 files changed, 27 insertions(+), 8 deletions(-) +Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (a3d78fe3e1ae fs: ecryptfs: comment typo fix) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Auto-merging fs/ecryptfs/crypto.c +Merge made by the 'ort' strategy. + fs/ecryptfs/crypto.c | 10 +++++----- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/read_write.c | 8 ++++---- + 3 files changed, 10 insertions(+), 10 deletions(-) +Merging erofs/dev (c23df8256b55 erofs: refine warning messages for zdata I/Os) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'ort' strategy. + fs/erofs/Kconfig | 16 +++ + fs/erofs/Makefile | 1 + + fs/erofs/compress.h | 2 + + fs/erofs/decompressor.c | 6 + + fs/erofs/decompressor_deflate.c | 247 ++++++++++++++++++++++++++++++++++++++++ + fs/erofs/erofs_fs.h | 17 ++- + fs/erofs/internal.h | 23 ++++ + fs/erofs/super.c | 11 ++ + fs/erofs/xattr.c | 14 +++ + fs/erofs/zdata.c | 23 ++-- + fs/erofs/zmap.c | 5 +- + 11 files changed, 347 insertions(+), 18 deletions(-) + create mode 100644 fs/erofs/decompressor_deflate.c +Merging exfat/dev (ff84772fd45d exfat: release s_lock before calling dir_emit()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging ext3/for_next (70a58515e2ff Merge UDF aops cleanup.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + fs/ext2/ialloc.c | 3 - + fs/quota/dquot.c | 249 ++++++++++++++++++++------------------- + fs/udf/directory.c | 2 +- + fs/udf/inode.c | 2 - + include/linux/fsnotify_backend.h | 3 - + 6 files changed, 129 insertions(+), 132 deletions(-) +Merging ext4/dev (9d3de7ee192a ext4: fix rbtree traversal bug in ext4_mb_use_preallocated) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (0cc81b1ad512 f2fs: should update REQ_TIME for direct write) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 8 ++-- + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/compress.c | 14 +------ + fs/f2fs/data.c | 11 ++--- + fs/f2fs/debug.c | 33 +++++++++++---- + fs/f2fs/f2fs.h | 72 +++++++++++++++++++++------------ + fs/f2fs/file.c | 60 +++++++++++++++++++-------- + fs/f2fs/gc.c | 18 ++++++--- + fs/f2fs/inode.c | 12 +++--- + fs/f2fs/recovery.c | 1 + + fs/f2fs/segment.c | 68 ++++++++++++++++++++----------- + fs/f2fs/super.c | 39 +++++++++--------- + fs/f2fs/sysfs.c | 18 +++++++-- + fs/f2fs/xattr.c | 6 +-- + 14 files changed, 226 insertions(+), 136 deletions(-) +Merging fsverity/for-next (adcb53e3ee05 fsverity: skip PKCS#7 parser when keyring is empty) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Merge made by the 'ort' strategy. + fs/verity/fsverity_private.h | 12 +++---- + fs/verity/hash_algs.c | 8 +++++ + fs/verity/init.c | 56 ++++++++++++++++++++------------ + fs/verity/open.c | 18 +++-------- + fs/verity/signature.c | 76 ++++++++++++++------------------------------ + fs/verity/verify.c | 11 ++----- + 6 files changed, 78 insertions(+), 103 deletions(-) +Merging fuse/for-next (91ec6c85599b Revert "fuse: in fuse_flush only wait if someone wants the return code") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'ort' strategy. + fs/fuse/file.c | 89 +++++++++++++++++----------------------------------------- + 1 file changed, 26 insertions(+), 63 deletions(-) +Merging gfs2/for-next (9f9a7f057f07 gfs2: journal flush threshold fixes and cleanup) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + Documentation/filesystems/gfs2-glocks.rst | 3 +- + fs/gfs2/aops.c | 7 ++-- + fs/gfs2/bmap.c | 2 +- + fs/gfs2/glock.c | 37 +++++++---------- + fs/gfs2/glock.h | 9 ----- + fs/gfs2/incore.h | 39 +++++++++--------- + fs/gfs2/inode.c | 14 +++++-- + fs/gfs2/lock_dlm.c | 5 --- + fs/gfs2/log.c | 66 +++++++++++++++---------------- + fs/gfs2/lops.c | 7 ++-- + fs/gfs2/quota.c | 2 +- + 11 files changed, 85 insertions(+), 106 deletions(-) +Merging jfs/jfs-next (6e2bda2c192d jfs: fix invalid free of JFS_IP(ipimap)->i_imap in diUnmount) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Merge made by the 'ort' strategy. + fs/jfs/jfs_dmap.c | 1 + + fs/jfs/jfs_extent.c | 2 +- + fs/jfs/jfs_imap.c | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) +Merging ksmbd/ksmbd-for-next (cdd143e4c508 ksmbd: switch to use kmemdup_nul() helper) +$ 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/server/asn1.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging nfs/linux-next (5b4a82a0724a Revert "NFSv4: Retry LOCK on OLD_STATEID during delegation return") +$ 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 (43439d858bba NFSv4.2: Fix a potential double free with READ_PLUS) +$ 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 (f5797323270d SUNRPC: Clean up svc_set_num_threads) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging net/sunrpc/svcsock.c +CONFLICT (content): Merge conflict in net/sunrpc/svcsock.c +Recorded preimage for 'net/sunrpc/svcsock.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'net/sunrpc/svcsock.c'. +[master 9e2ffcc05c7e] Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux +$ git diff -M --stat --summary HEAD^.. + fs/exportfs/expfs.c | 1 + + fs/lockd/mon.c | 3 + + fs/lockd/svc.c | 52 ++---- + fs/lockd/svclock.c | 18 +- + fs/locks.c | 7 - + fs/nfs/callback.c | 23 +-- + fs/nfsd/cache.h | 8 +- + fs/nfsd/nfs3proc.c | 4 +- + fs/nfsd/nfs4acl.c | 34 +++- + fs/nfsd/nfs4proc.c | 51 +++++- + fs/nfsd/nfs4state.c | 162 +++++++++++++++--- + fs/nfsd/nfs4xdr.c | 14 +- + fs/nfsd/nfscache.c | 206 +++++++++++++++-------- + fs/nfsd/nfsctl.c | 1 + + fs/nfsd/nfsd.h | 7 +- + fs/nfsd/nfsfh.c | 26 +-- + fs/nfsd/nfsfh.h | 6 +- + fs/nfsd/nfssvc.c | 111 +++--------- + fs/nfsd/state.h | 3 + + fs/nfsd/stats.c | 2 + + fs/nfsd/stats.h | 7 + + fs/nfsd/trace.h | 27 ++- + fs/nfsd/vfs.c | 52 ++++-- + fs/nfsd/xdr4.h | 11 -- + include/linux/lockd/lockd.h | 4 +- + include/linux/sunrpc/cache.h | 12 +- + include/linux/sunrpc/svc.h | 52 +++--- + include/linux/sunrpc/svc_xprt.h | 38 +++-- + include/linux/sunrpc/svcauth.h | 53 +++--- + include/linux/sunrpc/svcsock.h | 6 +- + include/linux/sunrpc/xdr.h | 2 + + include/trace/events/sunrpc.h | 80 +++++---- + net/sunrpc/.kunitconfig | 1 - + net/sunrpc/Kconfig | 35 ---- + net/sunrpc/auth_gss/Makefile | 2 +- + net/sunrpc/auth_gss/gss_krb5_internal.h | 23 --- + net/sunrpc/auth_gss/gss_krb5_keys.c | 84 ---------- + net/sunrpc/auth_gss/gss_krb5_mech.c | 257 +--------------------------- + net/sunrpc/auth_gss/gss_krb5_seal.c | 69 -------- + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 106 ------------ + net/sunrpc/auth_gss/gss_krb5_test.c | 196 ---------------------- + net/sunrpc/auth_gss/gss_krb5_unseal.c | 77 --------- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 287 -------------------------------- + net/sunrpc/auth_gss/svcauth_gss.c | 7 +- + net/sunrpc/svc.c | 101 +++++++---- + net/sunrpc/svc_xprt.c | 124 +++++--------- + net/sunrpc/svcauth.c | 35 +++- + net/sunrpc/svcauth_unix.c | 9 +- + net/sunrpc/svcsock.c | 131 +++++++-------- + net/sunrpc/xdr.c | 50 ++++++ + 50 files changed, 910 insertions(+), 1767 deletions(-) + delete mode 100644 net/sunrpc/auth_gss/gss_krb5_seqnum.c +Merging ntfs3/master (44b4494d5c59 fs/ntfs3: Correct mode for label entry inside /proc/fs/ntfs3/) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Already up to date. +Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (adcd459ff805 ovl: validate superblock in OVL_FS()) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Merge made by the 'ort' strategy. + Documentation/filesystems/fsverity.rst | 2 + + Documentation/filesystems/overlayfs.rst | 72 ++++++++++ + fs/overlayfs/Kconfig | 9 ++ + fs/overlayfs/copy_up.c | 54 +++++++- + fs/overlayfs/export.c | 36 +++-- + fs/overlayfs/file.c | 8 +- + fs/overlayfs/inode.c | 8 +- + fs/overlayfs/namei.c | 89 ++++++++++-- + fs/overlayfs/overlayfs.h | 66 ++++++++- + fs/overlayfs/ovl_entry.h | 9 +- + fs/overlayfs/params.c | 96 +++++++++++-- + fs/overlayfs/super.c | 40 ++++-- + fs/overlayfs/util.c | 233 ++++++++++++++++++++++++++++++-- + 13 files changed, 654 insertions(+), 68 deletions(-) +Merging ubifs/next (b5fda08ef213 ubifs: Fix memleak when insert_old_idx() failed) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (4ec5183ec486 Linux 6.2-rc7) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (f6250e205691 xfs: convert flex-array declarations in xfs attr shortform objects) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (377698d4abe2 Merge tag 'xfs-async-dio.6-2023-08-01' of git://git.kernel.dk/linux into iomap-6.6-mergeA) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Auto-merging Documentation/filesystems/locking.rst +Auto-merging fs/btrfs/file.c +Auto-merging fs/f2fs/compress.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/bmap.c +Auto-merging fs/zonefs/file.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/pagemap.h +Auto-merging mm/filemap.c +Merge made by the 'ort' strategy. + Documentation/filesystems/locking.rst | 15 +- + fs/btrfs/file.c | 6 +- + fs/f2fs/compress.c | 2 +- + fs/f2fs/f2fs.h | 2 +- + fs/gfs2/aops.c | 2 +- + fs/gfs2/bmap.c | 2 +- + fs/iomap/buffered-io.c | 469 +++++++++++++++++++++++----------- + fs/iomap/direct-io.c | 161 +++++++++--- + fs/xfs/xfs_aops.c | 2 +- + fs/zonefs/file.c | 2 +- + include/linux/fs.h | 35 ++- + include/linux/iomap.h | 3 +- + include/linux/pagemap.h | 82 +++++- + include/linux/uio.h | 9 +- + io_uring/rw.c | 27 +- + lib/iov_iter.c | 43 ++-- + mm/filemap.c | 65 ++--- + mm/folio-compat.c | 2 +- + mm/readahead.c | 13 - + 19 files changed, 660 insertions(+), 282 deletions(-) +Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Auto-merging fs/f2fs/gc.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + Documentation/filesystems/vfs.rst | 6 +- + block/bdev.c | 8 +- + fs/f2fs/gc.c | 8 +- + fs/gfs2/super.c | 12 ++- + fs/gfs2/sys.c | 4 +- + fs/ioctl.c | 8 +- + fs/super.c | 113 ++++++++++++++++++++--- + fs/xfs/scrub/fscounters.c | 188 ++++++++++++++++++++++++++++++-------- + fs/xfs/scrub/scrub.c | 6 +- + fs/xfs/scrub/scrub.h | 1 + + fs/xfs/scrub/trace.h | 26 ++++++ + include/linux/fs.h | 15 ++- + 12 files changed, 321 insertions(+), 74 deletions(-) +Merging file-locks/locks-next (72bb0abc3492 locks: fix KASAN: use-after-free in trace_event_raw_event_filelock_lock) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging fs/locks.c +Merge made by the 'ort' strategy. + fs/locks.c | 27 ++++-- + tools/testing/selftests/filelock/Makefile | 5 ++ + tools/testing/selftests/filelock/ofdlocks.c | 132 ++++++++++++++++++++++++++++ + 3 files changed, 159 insertions(+), 5 deletions(-) + create mode 100644 tools/testing/selftests/filelock/Makefile + create mode 100644 tools/testing/selftests/filelock/ofdlocks.c +Merging iversion/iversion-next (63355b9884b3 cpumask: be more careful with 'cpumask_setall()') +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Already up to date. +Merging vfs-brauner/vfs.all (24a62491bb89 Merge branch 'vfs.autofs' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging Documentation/filesystems/locking.rst +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging arch/s390/hypfs/inode.c +Auto-merging block/bdev.c +Auto-merging fs/Kconfig +Auto-merging fs/btrfs/delayed-inode.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +CONFLICT (content): Merge conflict in fs/btrfs/inode.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/transaction.c +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/buffer.c +Auto-merging fs/coda/dir.c +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/ecryptfs/read_write.c +Auto-merging fs/ext2/ialloc.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/inode.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/inode.c +Auto-merging fs/f2fs/recovery.c +Auto-merging fs/f2fs/super.c +CONFLICT (content): Merge conflict in fs/f2fs/super.c +Auto-merging fs/f2fs/xattr.c +CONFLICT (content): Merge conflict in fs/f2fs/xattr.c +Auto-merging fs/file.c +Auto-merging fs/gfs2/bmap.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/gfs2/quota.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/inode.c +Auto-merging fs/jfs/jfs_imap.c +Auto-merging fs/jfs/namei.c +Auto-merging fs/locks.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/nilfs2/inode.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/journal.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/open.c +Auto-merging fs/overlayfs/file.c +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/util.c +Auto-merging fs/proc/base.c +Auto-merging fs/quota/dquot.c +Auto-merging fs/smb/client/file.c +Auto-merging fs/smb/server/smb2pdu.c +Auto-merging fs/splice.c +Auto-merging fs/super.c +Auto-merging fs/udf/inode.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/fs.h +Auto-merging mm/Makefile +Auto-merging mm/huge_memory.c +Auto-merging mm/khugepaged.c +Auto-merging mm/shmem.c +Auto-merging mm/truncate.c +Auto-merging security/selinux/hooks.c +Recorded preimage for 'fs/btrfs/inode.c' +Recorded preimage for 'fs/f2fs/super.c' +Recorded preimage for 'fs/f2fs/xattr.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/btrfs/inode.c'. +Recorded resolution for 'fs/f2fs/super.c'. +Recorded resolution for 'fs/f2fs/xattr.c'. +[master 028bd01dbea8] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/idmappings.rst | 7 + + Documentation/filesystems/locking.rst | 8 +- + Documentation/filesystems/tmpfs.rst | 38 +- + Documentation/filesystems/vfs.rst | 6 +- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/platforms/cell/spufs/inode.c | 2 +- + arch/s390/hypfs/inode.c | 4 +- + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + block/bdev.c | 61 +- + block/disk-events.c | 23 +- + block/genhd.c | 45 +- + block/ioctl.c | 9 +- + block/partitions/core.c | 5 +- + drivers/android/binderfs.c | 8 +- + drivers/block/amiflop.c | 1 - + drivers/block/floppy.c | 2 +- + drivers/block/loop.c | 6 +- + drivers/block/nbd.c | 8 +- + drivers/infiniband/hw/qib/qib_fs.c | 3 +- + drivers/misc/ibmasm/ibmasmfs.c | 2 +- + drivers/misc/ibmvmc.c | 2 +- + drivers/s390/block/dasd.c | 7 +- + drivers/usb/core/devio.c | 16 +- + drivers/usb/gadget/function/f_fs.c | 3 +- + drivers/usb/gadget/legacy/inode.c | 3 +- + fs/9p/vfs_inode.c | 8 +- + fs/9p/vfs_inode_dotl.c | 12 +- + fs/Kconfig | 16 +- + fs/adfs/inode.c | 4 +- + fs/affs/amigaffs.c | 6 +- + fs/affs/inode.c | 16 +- + fs/afs/dynroot.c | 2 +- + fs/afs/inode.c | 8 +- + fs/attr.c | 22 +- + fs/autofs/inode.c | 2 +- + fs/autofs/root.c | 6 +- + fs/autofs/waitq.c | 5 +- + fs/bad_inode.c | 6 +- + fs/befs/linuxvfs.c | 2 +- + fs/bfs/dir.c | 16 +- + fs/bfs/inode.c | 5 +- + fs/binfmt_misc.c | 3 +- + fs/btrfs/delayed-inode.c | 8 +- + fs/btrfs/disk-io.c | 4 +- + fs/btrfs/file.c | 37 +- + fs/btrfs/inode.c | 66 +- + fs/btrfs/ioctl.c | 2 +- + fs/btrfs/reflink.c | 3 +- + fs/btrfs/super.c | 66 +- + fs/btrfs/transaction.c | 3 +- + fs/btrfs/tree-log.c | 4 +- + fs/btrfs/volumes.c | 62 +- + fs/btrfs/volumes.h | 8 +- + fs/btrfs/xattr.c | 4 +- + fs/buffer.c | 18 +- + fs/ceph/acl.c | 2 +- + fs/ceph/caps.c | 2 +- + fs/ceph/inode.c | 18 +- + fs/ceph/snap.c | 2 +- + fs/ceph/xattr.c | 2 +- + fs/coda/coda_linux.c | 3 +- + fs/coda/dir.c | 2 +- + fs/coda/file.c | 2 +- + fs/coda/inode.c | 5 +- + fs/configfs/inode.c | 7 +- + fs/cramfs/inode.c | 11 +- + fs/dcache.c | 2 - + fs/debugfs/inode.c | 3 +- + fs/devpts/inode.c | 6 +- + fs/ecryptfs/inode.c | 7 +- + fs/ecryptfs/mmap.c | 5 +- + fs/ecryptfs/read_write.c | 4 +- + fs/efivarfs/file.c | 2 +- + fs/efivarfs/inode.c | 2 +- + fs/efs/inode.c | 4 +- + fs/erofs/inode.c | 14 +- + fs/eventfd.c | 2 +- + fs/eventpoll.c | 12 +- + fs/exfat/exfat_fs.h | 2 - + fs/exfat/file.c | 6 +- + fs/exfat/inode.c | 6 +- + fs/exfat/namei.c | 26 +- + fs/exfat/super.c | 42 +- + fs/ext2/acl.c | 2 +- + fs/ext2/dir.c | 6 +- + fs/ext2/ialloc.c | 2 +- + fs/ext2/inode.c | 12 +- + fs/ext2/ioctl.c | 4 +- + fs/ext2/namei.c | 8 +- + fs/ext2/super.c | 2 +- + fs/ext2/xattr.c | 2 +- + fs/ext4/acl.c | 2 +- + fs/ext4/ext4.h | 92 +-- + fs/ext4/ext4_jbd2.c | 3 +- + fs/ext4/extents.c | 12 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inline.c | 4 +- + fs/ext4/inode-test.c | 6 +- + fs/ext4/inode.c | 18 +- + fs/ext4/ioctl.c | 9 +- + fs/ext4/namei.c | 26 +- + fs/ext4/super.c | 73 +- + fs/ext4/xattr.c | 6 +- + fs/f2fs/dir.c | 8 +- + fs/f2fs/f2fs.h | 4 +- + fs/f2fs/file.c | 22 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/inode.c | 10 +- + fs/f2fs/namei.c | 12 +- + fs/f2fs/recovery.c | 4 +- + fs/f2fs/super.c | 6 +- + fs/f2fs/xattr.c | 2 +- + fs/fat/fat.h | 3 +- + fs/fat/file.c | 2 +- + fs/fat/inode.c | 5 +- + fs/fat/misc.c | 10 +- + fs/fcntl.c | 29 +- + fs/file.c | 27 +- + fs/file_table.c | 5 +- + fs/freevxfs/vxfs_inode.c | 3 +- + fs/fs_context.c | 24 +- + fs/fsopen.c | 106 ++- + fs/fuse/control.c | 2 +- + fs/fuse/dir.c | 10 +- + fs/fuse/inode.c | 16 +- + fs/gfs2/acl.c | 2 +- + fs/gfs2/bmap.c | 11 +- + fs/gfs2/dir.c | 15 +- + fs/gfs2/file.c | 2 +- + fs/gfs2/glops.c | 4 +- + fs/gfs2/inode.c | 16 +- + fs/gfs2/quota.c | 2 +- + fs/gfs2/super.c | 4 +- + fs/gfs2/xattr.c | 8 +- + fs/hfs/catalog.c | 8 +- + fs/hfs/dir.c | 2 +- + fs/hfs/inode.c | 13 +- + fs/hfs/sysdep.c | 4 +- + fs/hfsplus/catalog.c | 8 +- + fs/hfsplus/dir.c | 6 +- + fs/hfsplus/inode.c | 18 +- + fs/hostfs/hostfs_kern.c | 3 +- + fs/hpfs/dir.c | 8 +- + fs/hpfs/inode.c | 6 +- + fs/hpfs/namei.c | 29 +- + fs/hpfs/super.c | 5 +- + fs/hugetlbfs/inode.c | 12 +- + fs/inode.c | 232 ++++-- + fs/internal.h | 2 +- + fs/isofs/inode.c | 9 +- + fs/isofs/rock.c | 16 +- + fs/jffs2/dir.c | 24 +- + fs/jffs2/file.c | 3 +- + fs/jffs2/fs.c | 10 +- + fs/jffs2/os-linux.h | 2 +- + fs/jfs/acl.c | 2 +- + fs/jfs/inode.c | 2 +- + fs/jfs/ioctl.c | 2 +- + fs/jfs/jfs_imap.c | 8 +- + fs/jfs/jfs_inode.c | 4 +- + fs/jfs/namei.c | 24 +- + fs/jfs/super.c | 2 +- + fs/jfs/xattr.c | 2 +- + fs/kernfs/dir.c | 2 +- + fs/kernfs/inode.c | 53 +- + fs/libfs.c | 309 +++++++- + fs/locks.c | 20 +- + fs/minix/bitmap.c | 2 +- + fs/minix/dir.c | 6 +- + fs/minix/inode.c | 12 +- + fs/minix/itree_common.c | 4 +- + fs/minix/namei.c | 6 +- + fs/namei.c | 2 +- + fs/nfs/callback_proc.c | 2 +- + fs/nfs/fscache.h | 4 +- + fs/nfs/inode.c | 22 +- + fs/nfs/namespace.c | 3 +- + fs/nfs/nfs4_fs.h | 2 +- + fs/nfs/nfs4file.c | 2 +- + fs/nfs/nfs4proc.c | 4 +- + fs/nfsd/nfsctl.c | 2 +- + fs/nfsd/vfs.c | 2 +- + fs/nilfs2/dir.c | 6 +- + fs/nilfs2/inode.c | 12 +- + fs/nilfs2/ioctl.c | 2 +- + fs/nilfs2/namei.c | 8 +- + fs/nilfs2/super.c | 81 +- + fs/notify/dnotify/dnotify.c | 4 +- + fs/nsfs.c | 2 +- + fs/ntfs/inode.c | 15 +- + fs/ntfs/mft.c | 3 +- + fs/ntfs3/file.c | 8 +- + fs/ntfs3/frecord.c | 3 +- + fs/ntfs3/inode.c | 14 +- + fs/ntfs3/namei.c | 11 +- + fs/ntfs3/super.c | 33 +- + fs/ntfs3/xattr.c | 4 +- + fs/ocfs2/acl.c | 6 +- + fs/ocfs2/alloc.c | 6 +- + fs/ocfs2/aops.c | 2 +- + fs/ocfs2/dir.c | 8 +- + fs/ocfs2/dlmfs/dlmfs.c | 4 +- + fs/ocfs2/dlmglue.c | 7 +- + fs/ocfs2/file.c | 18 +- + fs/ocfs2/inode.c | 12 +- + fs/ocfs2/journal.c | 6 +- + fs/ocfs2/move_extents.c | 6 +- + fs/ocfs2/namei.c | 21 +- + fs/ocfs2/refcounttree.c | 14 +- + fs/ocfs2/xattr.c | 6 +- + fs/omfs/dir.c | 4 +- + fs/omfs/inode.c | 9 +- + fs/open.c | 50 +- + fs/openpromfs/inode.c | 5 +- + fs/orangefs/inode.c | 7 +- + fs/orangefs/namei.c | 2 +- + fs/orangefs/orangefs-kernel.h | 2 +- + fs/orangefs/orangefs-utils.c | 6 +- + fs/overlayfs/file.c | 7 +- + fs/overlayfs/inode.c | 2 +- + fs/overlayfs/overlayfs.h | 2 +- + fs/overlayfs/util.c | 2 +- + fs/pipe.c | 8 +- + fs/posix_acl.c | 2 +- + fs/proc/base.c | 9 +- + fs/proc/fd.c | 2 +- + fs/proc/generic.c | 2 +- + fs/proc/inode.c | 2 +- + fs/proc/proc_net.c | 3 +- + fs/proc/proc_sysctl.c | 4 +- + fs/proc/root.c | 3 +- + fs/proc/self.c | 2 +- + fs/proc/thread_self.c | 2 +- + fs/pstore/inode.c | 4 +- + fs/qnx4/inode.c | 3 +- + fs/qnx6/inode.c | 3 +- + fs/quota/dquot.c | 2 +- + fs/ramfs/inode.c | 6 +- + fs/read_write.c | 2 +- + fs/reiserfs/inode.c | 12 +- + fs/reiserfs/ioctl.c | 4 +- + fs/reiserfs/journal.c | 4 +- + fs/reiserfs/namei.c | 18 +- + fs/reiserfs/stree.c | 4 +- + fs/reiserfs/super.c | 2 +- + fs/reiserfs/xattr.c | 5 +- + fs/reiserfs/xattr_acl.c | 2 +- + fs/romfs/super.c | 13 +- + fs/smb/client/cifsfs.c | 2 +- + fs/smb/client/file.c | 4 +- + fs/smb/client/fscache.h | 5 +- + fs/smb/client/inode.c | 16 +- + fs/smb/client/smb2ops.c | 3 +- + fs/smb/server/smb2pdu.c | 30 +- + fs/smb/server/vfs.c | 3 +- + fs/splice.c | 46 +- + fs/squashfs/inode.c | 2 +- + fs/stack.c | 2 +- + fs/stat.c | 65 +- + fs/super.c | 357 ++++----- + fs/sysv/dir.c | 6 +- + fs/sysv/ialloc.c | 2 +- + fs/sysv/inode.c | 5 +- + fs/sysv/itree.c | 7 +- + fs/sysv/namei.c | 6 +- + fs/tracefs/inode.c | 2 +- + fs/ubifs/debug.c | 4 +- + fs/ubifs/dir.c | 41 +- + fs/ubifs/file.c | 31 +- + fs/ubifs/ioctl.c | 2 +- + fs/ubifs/journal.c | 4 +- + fs/ubifs/super.c | 4 +- + fs/ubifs/ubifs.h | 2 +- + fs/ubifs/xattr.c | 6 +- + fs/udf/ialloc.c | 2 +- + fs/udf/inode.c | 17 +- + fs/udf/namei.c | 24 +- + fs/udf/symlink.c | 2 +- + fs/ufs/dir.c | 6 +- + fs/ufs/ialloc.c | 2 +- + fs/ufs/inode.c | 23 +- + fs/ufs/namei.c | 8 +- + fs/vboxsf/utils.c | 6 +- + fs/xattr.c | 79 +- + fs/xfs/libxfs/xfs_inode_buf.c | 5 +- + fs/xfs/libxfs/xfs_trans_inode.c | 6 +- + fs/xfs/xfs_acl.c | 2 +- + fs/xfs/xfs_bmap_util.c | 6 +- + fs/xfs/xfs_buf.c | 7 +- + fs/xfs/xfs_inode.c | 3 +- + fs/xfs/xfs_inode_item.c | 2 +- + fs/xfs/xfs_iops.c | 25 +- + fs/xfs/xfs_itable.c | 4 +- + fs/xfs/xfs_super.c | 138 ++-- + fs/zonefs/super.c | 8 +- + include/linux/blk_types.h | 1 - + include/linux/blkdev.h | 15 +- + include/linux/dnotify.h | 4 +- + include/linux/filelock.h | 12 +- + include/linux/fs.h | 125 ++- + include/linux/fs_context.h | 6 +- + include/linux/fs_stack.h | 2 +- + include/linux/lsm_hook_defs.h | 1 + + include/linux/pipe_fs_i.h | 4 +- + include/linux/security.h | 6 + + include/linux/shmem_fs.h | 31 +- + include/linux/syscalls.h | 4 +- + include/linux/xattr.h | 10 +- + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/mount.h | 3 +- + include/uapi/linux/quota.h | 1 + + ipc/mqueue.c | 23 +- + kernel/bpf/inode.c | 6 +- + mm/Makefile | 2 +- + mm/huge_memory.c | 6 +- + mm/khugepaged.c | 13 +- + mm/shmem.c | 847 +++++++++++++++------ + mm/shmem_quota.c | 350 +++++++++ + mm/truncate.c | 4 +- + net/sunrpc/rpc_pipe.c | 2 +- + security/apparmor/apparmorfs.c | 11 +- + security/apparmor/policy_unpack.c | 11 +- + security/inode.c | 2 +- + security/security.c | 14 + + security/selinux/hooks.c | 22 + + security/selinux/selinuxfs.c | 2 +- + security/smack/smack_lsm.c | 51 ++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/fchmodat2/.gitignore | 2 + + tools/testing/selftests/fchmodat2/Makefile | 6 + + tools/testing/selftests/fchmodat2/fchmodat2_test.c | 142 ++++ + tools/testing/selftests/nolibc/nolibc-test.c | 1 - + 348 files changed, 3765 insertions(+), 2064 deletions(-) + create mode 100644 mm/shmem_quota.c + create mode 100644 tools/testing/selftests/fchmodat2/.gitignore + create mode 100644 tools/testing/selftests/fchmodat2/Makefile + create mode 100644 tools/testing/selftests/fchmodat2/fchmodat2_test.c +Merging vfs/for-next (cff4b23c731a Merge branch 'work.lock_rename_child' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Merge made by the 'ort' strategy. +Merging printk/for-next (b7661f87eda0 Merge branch 'for-6.6' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging Documentation/core-api/printk-formats.rst +Auto-merging MAINTAINERS +Auto-merging kernel/debug/kdb/kdb_io.c +Auto-merging kernel/printk/printk.c +Merge made by the 'ort' strategy. + Documentation/core-api/printk-formats.rst | 9 +- + MAINTAINERS | 4 +- + include/linux/console.h | 3 + + kernel/debug/kdb/kdb_io.c | 2 + + kernel/printk/internal.h | 2 + + kernel/printk/printk.c | 213 +++++++++++++++++++++--------- + kernel/printk/printk_ringbuffer.c | 2 +- + kernel/printk/printk_safe.c | 9 +- + 8 files changed, 164 insertions(+), 80 deletions(-) +Merging pci/next (b2c47cd73629 Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging drivers/pci/controller/Kconfig +Auto-merging drivers/pci/controller/dwc/pcie-designware.c +Auto-merging include/linux/pci.h +Merge made by the 'ort' strategy. + Documentation/PCI/pciebus-howto.rst | 14 +- + arch/alpha/include/asm/pci.h | 3 - + arch/x86/pci/irq.c | 4 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 36 +- + drivers/gpu/drm/amd/amdgpu/si.c | 36 +- + drivers/gpu/drm/radeon/cik.c | 36 +- + drivers/gpu/drm/radeon/si.c | 37 +- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 9 +- + drivers/net/wireless/ath/ath10k/pci.c | 9 +- + drivers/net/wireless/ath/ath11k/pci.c | 10 +- + drivers/net/wireless/ath/ath12k/pci.c | 10 +- + drivers/pci/access.c | 20 +- + drivers/pci/controller/Kconfig | 2 +- + drivers/pci/controller/cadence/pci-j721e.c | 2 +- + drivers/pci/controller/cadence/pcie-cadence-plat.c | 3 +- + drivers/pci/controller/cadence/pcie-cadence.c | 1 + + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/pci/controller/dwc/pci-exynos.c | 2 +- + drivers/pci/controller/dwc/pci-imx6.c | 6 +- + drivers/pci/controller/dwc/pci-keystone.c | 1 - + drivers/pci/controller/dwc/pci-meson.c | 13 +- + drivers/pci/controller/dwc/pcie-artpec6.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-plat.c | 2 +- + drivers/pci/controller/dwc/pcie-designware.c | 2 +- + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 2 +- + drivers/pci/controller/dwc/pcie-intel-gw.c | 2 + + drivers/pci/controller/dwc/pcie-keembay.c | 11 +- + drivers/pci/controller/dwc/pcie-kirin.c | 3 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 2 +- + drivers/pci/controller/dwc/pcie-qcom.c | 2 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 11 - + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2 +- + .../pci/controller/mobiveil/pcie-mobiveil-host.c | 3 - + drivers/pci/controller/pci-ftpci100.c | 3 +- + drivers/pci/controller/pci-host-common.c | 2 +- + drivers/pci/controller/pci-ixp4xx.c | 3 +- + drivers/pci/controller/pci-loongson.c | 2 +- + drivers/pci/controller/pci-rcar-gen2.c | 3 +- + drivers/pci/controller/pci-v3-semi.c | 6 +- + drivers/pci/controller/pci-xgene-msi.c | 3 +- + drivers/pci/controller/pcie-altera.c | 5 +- + drivers/pci/controller/pcie-apple.c | 10 +- + drivers/pci/controller/pcie-iproc-msi.c | 5 +- + drivers/pci/controller/pcie-microchip-host.c | 407 ++++++++++++--------- + drivers/pci/controller/pcie-rockchip-host.c | 4 +- + drivers/pci/controller/pcie-rockchip.c | 1 + + drivers/pci/controller/pcie-rockchip.h | 6 +- + drivers/pci/doe.c | 2 +- + drivers/pci/endpoint/pci-epc-core.c | 1 - + drivers/pci/hotplug/acpiphp.h | 1 - + drivers/pci/hotplug/cpci_hotplug.h | 2 - + drivers/pci/hotplug/ibmphp.h | 2 - + drivers/pci/hotplug/ibmphp_pci.c | 10 +- + drivers/pci/hotplug/pciehp_hpc.c | 12 +- + drivers/pci/iov.c | 3 +- + drivers/pci/p2pdma.c | 3 +- + drivers/pci/pci-sysfs.c | 4 + + drivers/pci/pci.c | 31 +- + drivers/pci/pcie/aer.c | 19 +- + drivers/pci/pcie/aspm.c | 30 +- + drivers/pci/probe.c | 2 +- + drivers/pci/quirks.c | 40 +- + drivers/pci/switch/switchtec.c | 158 +++++--- + drivers/pci/vpd.c | 34 +- + include/linux/aer.h | 11 - + include/linux/pci.h | 46 ++- + include/linux/switchtec.h | 1 + + 67 files changed, 648 insertions(+), 524 deletions(-) +Merging pstore/for-next/pstore (fe8c3623ab06 pstore/ram: Check start of empty przs during init) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Merge made by the 'ort' strategy. + fs/pstore/Kconfig | 100 ++-------------- + fs/pstore/platform.c | 330 ++++++++++++++++----------------------------------- + fs/pstore/ram_core.c | 2 +- + 3 files changed, 111 insertions(+), 321 deletions(-) +Merging hid/for-next (c4cc8dab2d33 Merge branch 'for-6.6/steelseries' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging .mailmap +CONFLICT (content): Merge conflict in .mailmap +Auto-merging MAINTAINERS +Recorded preimage for '.mailmap' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for '.mailmap'. +[master 6bb653eb7516] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 3 + + Documentation/hid/hidintro.rst | 524 ++++++++++++++++++++++++++++++++ + Documentation/hid/hidreport-parsing.rst | 49 +++ + Documentation/hid/index.rst | 1 + + MAINTAINERS | 4 +- + drivers/hid/Kconfig | 13 +- + drivers/hid/Makefile | 1 + + drivers/hid/hid-google-stadiaff.c | 158 ++++++++++ + drivers/hid/hid-ids.h | 2 + + drivers/hid/hid-input.c | 21 +- + drivers/hid/hid-logitech-dj.c | 11 +- + drivers/hid/hid-logitech-hidpp.c | 6 +- + drivers/hid/hid-nvidia-shield.c | 426 ++++++++++++++++++++++++-- + drivers/hid/hid-roccat-arvo.c | 20 +- + drivers/hid/hid-roccat-isku.c | 21 +- + drivers/hid/hid-roccat-kone.c | 24 +- + drivers/hid/hid-roccat-koneplus.c | 22 +- + drivers/hid/hid-roccat-konepure.c | 22 +- + drivers/hid/hid-roccat-kovaplus.c | 22 +- + drivers/hid/hid-roccat-pyra.c | 22 +- + drivers/hid/hid-roccat-ryos.c | 20 +- + drivers/hid/hid-roccat-savu.c | 20 +- + drivers/hid/hid-roccat.c | 2 +- + drivers/hid/hid-sensor-hub.c | 2 +- + drivers/hid/hid-steelseries.c | 309 ++++++++++++++++++- + drivers/hid/hid-wiimote-debug.c | 10 - + drivers/hid/hidraw.c | 18 +- + drivers/hid/wacom.h | 1 + + drivers/hid/wacom_sys.c | 44 ++- + drivers/hid/wacom_wac.c | 7 +- + drivers/hid/wacom_wac.h | 4 +- + include/linux/hid-roccat.h | 2 +- + include/linux/hid.h | 26 +- + 33 files changed, 1664 insertions(+), 173 deletions(-) + create mode 100644 Documentation/hid/hidintro.rst + create mode 100644 Documentation/hid/hidreport-parsing.rst + create mode 100644 drivers/hid/hid-google-stadiaff.c +Merging i2c/i2c/for-next (8ab7725b6bfb Merge branch 'i2c/for-mergewindow' into i2c/for-next) + 27ec43c77b5d ("i2c: tegra: Fix i2c-tegra DMA config option processing") + 3253f6923a78 ("i2c: tiny-usb: check usb base class before assuming the interface on device is for this driver") + 49d4db3953cb ("i2c: designware: Correct length byte validation logic") + 69f035c480d7 ("i2c: designware: Handle invalid SMBus block data response length value") + b610c4bbd153 ("i2c: imx-lpi2c: return -EINVAL when i2c peripheral clk doesn't work") +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging drivers/i2c/busses/i2c-hisi.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-hisi.c +Auto-merging drivers/i2c/busses/i2c-imx-lpi2c.c +Auto-merging drivers/i2c/busses/i2c-tegra.c +Recorded preimage for 'drivers/i2c/busses/i2c-hisi.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/i2c/busses/i2c-hisi.c'. +[master b08fbe1a88cc] Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/i2c/cdns,i2c-r1p10.yaml | 3 + + .../bindings/i2c/i2c-arb-gpio-challenge.txt | 82 ------------- + .../bindings/i2c/i2c-arb-gpio-challenge.yaml | 135 +++++++++++++++++++++ + Documentation/devicetree/bindings/i2c/i2c-arb.txt | 35 ------ + .../devicetree/bindings/i2c/nxp,pca9541.txt | 29 ----- + .../devicetree/bindings/i2c/nxp,pca9541.yaml | 56 +++++++++ + Documentation/i2c/writing-clients.rst | 2 +- + drivers/i2c/busses/i2c-at91-core.c | 11 +- + drivers/i2c/busses/i2c-at91-master.c | 1 - + drivers/i2c/busses/i2c-au1550.c | 15 +-- + drivers/i2c/busses/i2c-bcm-iproc.c | 31 ++--- + drivers/i2c/busses/i2c-bcm2835.c | 16 ++- + drivers/i2c/busses/i2c-brcmstb.c | 27 ++--- + drivers/i2c/busses/i2c-cpm.c | 4 +- + drivers/i2c/busses/i2c-davinci.c | 16 +-- + drivers/i2c/busses/i2c-designware-platdrv.c | 22 +--- + drivers/i2c/busses/i2c-dln2.c | 6 +- + drivers/i2c/busses/i2c-emev2.c | 2 +- + drivers/i2c/busses/i2c-exynos5.c | 12 +- + drivers/i2c/busses/i2c-gxp.c | 3 +- + drivers/i2c/busses/i2c-hisi.c | 14 +-- + drivers/i2c/busses/i2c-hix5hd2.c | 10 +- + drivers/i2c/busses/i2c-i801.c | 6 +- + drivers/i2c/busses/i2c-ibm_iic.c | 3 +- + drivers/i2c/busses/i2c-img-scb.c | 10 +- + drivers/i2c/busses/i2c-imx-lpi2c.c | 23 ++-- + drivers/i2c/busses/i2c-imx.c | 4 +- + drivers/i2c/busses/i2c-jz4780.c | 2 +- + drivers/i2c/busses/i2c-kempld.c | 19 ++- + drivers/i2c/busses/i2c-lpc2k.c | 9 +- + drivers/i2c/busses/i2c-meson.c | 1 - + drivers/i2c/busses/i2c-microchip-corei2c.c | 5 +- + drivers/i2c/busses/i2c-mlxbf.c | 60 +++------ + drivers/i2c/busses/i2c-mpc.c | 3 +- + drivers/i2c/busses/i2c-mt65xx.c | 12 +- + drivers/i2c/busses/i2c-mt7621.c | 3 +- + drivers/i2c/busses/i2c-mxs.c | 1 - + drivers/i2c/busses/i2c-nomadik.c | 12 +- + drivers/i2c/busses/i2c-npcm7xx.c | 1 - + drivers/i2c/busses/i2c-ocores.c | 10 +- + drivers/i2c/busses/i2c-owl.c | 3 +- + drivers/i2c/busses/i2c-pca-platform.c | 1 - + drivers/i2c/busses/i2c-pnx.c | 15 +-- + drivers/i2c/busses/i2c-pxa-pci.c | 1 - + drivers/i2c/busses/i2c-pxa.c | 20 +-- + drivers/i2c/busses/i2c-qcom-cci.c | 6 +- + drivers/i2c/busses/i2c-qcom-geni.c | 4 +- + drivers/i2c/busses/i2c-qup.c | 16 +-- + drivers/i2c/busses/i2c-rcar.c | 12 +- + drivers/i2c/busses/i2c-riic.c | 1 - + drivers/i2c/busses/i2c-s3c2410.c | 20 +-- + drivers/i2c/busses/i2c-sh_mobile.c | 22 +--- + drivers/i2c/busses/i2c-sprd.c | 1 - + drivers/i2c/busses/i2c-st.c | 3 +- + drivers/i2c/busses/i2c-stm32f4.c | 3 +- + drivers/i2c/busses/i2c-stm32f7.c | 8 +- + drivers/i2c/busses/i2c-sun6i-p2wi.c | 3 +- + drivers/i2c/busses/i2c-synquacer.c | 28 ++--- + drivers/i2c/busses/i2c-tegra-bpmp.c | 2 +- + drivers/i2c/busses/i2c-tegra.c | 3 +- + drivers/i2c/busses/i2c-virtio.c | 8 +- + drivers/i2c/busses/i2c-xlp9xx.c | 6 +- + drivers/i2c/muxes/i2c-mux-gpmux.c | 2 +- + drivers/i2c/muxes/i2c-mux-ltc4306.c | 3 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +- + include/linux/virtio.h | 2 - + 66 files changed, 382 insertions(+), 533 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-arb-gpio-challenge.txt + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-arb-gpio-challenge.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-arb.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/nxp,pca9541.txt + create mode 100644 Documentation/devicetree/bindings/i2c/nxp,pca9541.yaml +Merging i2c-host/i2c/andi-for-next (7a34bab2daea i2c: synquacer: Use dev_err_probe in probe function) +$ git merge -m Merge branch 'i2c/andi-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/andi-for-next +Already up to date. +Merging i3c/i3c/next (300098637900 i3c: master: svc: Do not check for 0 return after calling platform_get_irq()) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'ort' strategy. + drivers/i3c/master/ast2600-i3c-master.c | 1 - + drivers/i3c/master/i3c-master-cdns.c | 1 - + drivers/i3c/master/mipi-i3c-hci/cmd_v1.c | 2 +- + drivers/i3c/master/svc-i3c-master.c | 4 ++-- + 4 files changed, 3 insertions(+), 5 deletions(-) +Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (fc8df28be715 hwmon: (nsa320-hwmon) Remove redundant of_match_ptr()) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/trivial-devices.yaml | 6 + + Documentation/hwmon/hs3001.rst | 37 ++ + Documentation/hwmon/index.rst | 2 +- + Documentation/hwmon/nct6775.rst | 11 +- + Documentation/hwmon/pmbus.rst | 2 +- + Documentation/hwmon/smm665.rst | 187 ------ + MAINTAINERS | 13 +- + drivers/hwmon/Kconfig | 24 +- + drivers/hwmon/Makefile | 2 +- + drivers/hwmon/ad7418.c | 4 +- + drivers/hwmon/ads7828.c | 5 +- + drivers/hwmon/adt7475.c | 3 +- + drivers/hwmon/as370-hwmon.c | 3 +- + drivers/hwmon/aspeed-pwm-tacho.c | 3 +- + drivers/hwmon/bt1-pvt.c | 9 +- + drivers/hwmon/g762.c | 1 - + drivers/hwmon/gxp-fan-ctrl.c | 2 +- + drivers/hwmon/hp-wmi-sensors.c | 22 +- + drivers/hwmon/hs3001.c | 242 +++++++ + drivers/hwmon/ina2xx.c | 3 +- + drivers/hwmon/it87.c | 74 ++- + drivers/hwmon/lan966x-hwmon.c | 24 +- + drivers/hwmon/lm63.c | 4 +- + drivers/hwmon/lm75.c | 3 +- + drivers/hwmon/lm85.c | 4 +- + drivers/hwmon/lm90.c | 4 +- + drivers/hwmon/lochnagar-hwmon.c | 1 - + drivers/hwmon/ltq-cputemp.c | 3 +- + drivers/hwmon/max31730.c | 1 - + drivers/hwmon/max6621.c | 2 +- + drivers/hwmon/max6639.c | 6 + + drivers/hwmon/max6697.c | 3 +- + drivers/hwmon/mcp3021.c | 1 - + drivers/hwmon/nct6775-core.c | 355 +++++++---- + drivers/hwmon/nct6775-platform.c | 2 +- + drivers/hwmon/nct6775.h | 30 +- + drivers/hwmon/nsa320-hwmon.c | 4 +- + drivers/hwmon/oxp-sensors.c | 29 +- + drivers/hwmon/peci/dimmtemp.c | 26 +- + drivers/hwmon/pmbus/Kconfig | 7 + + drivers/hwmon/pmbus/acbel-fsg032.c | 38 ++ + drivers/hwmon/pmbus/dps920ab.c | 2 +- + drivers/hwmon/pmbus/ibm-cffps.c | 4 +- + drivers/hwmon/pmbus/ir38064.c | 4 +- + drivers/hwmon/pmbus/max20730.c | 68 +- + drivers/hwmon/pmbus/mp2975.c | 427 ++++++++++--- + drivers/hwmon/pmbus/mp5023.c | 2 +- + drivers/hwmon/pmbus/mpq7932.c | 2 +- + drivers/hwmon/pmbus/q54sj108a2.c | 2 +- + drivers/hwmon/pmbus/tps53679.c | 4 +- + drivers/hwmon/pmbus/ucd9000.c | 4 +- + drivers/hwmon/pmbus/ucd9200.c | 4 +- + drivers/hwmon/sbtsi_temp.c | 1 - + drivers/hwmon/scpi-hwmon.c | 2 +- + drivers/hwmon/sht3x.c | 389 ++++++++---- + drivers/hwmon/smm665.c | 706 --------------------- + drivers/hwmon/tmp421.c | 2 +- + drivers/hwmon/tmp464.c | 2 +- + drivers/hwmon/tmp513.c | 2 +- + drivers/hwmon/tps23861.c | 2 +- + drivers/hwmon/ultra45_env.c | 3 +- + drivers/hwmon/vexpress-hwmon.c | 1 - + drivers/hwmon/w83773g.c | 2 +- + 63 files changed, 1376 insertions(+), 1461 deletions(-) + create mode 100644 Documentation/hwmon/hs3001.rst + delete mode 100644 Documentation/hwmon/smm665.rst + create mode 100644 drivers/hwmon/hs3001.c + delete mode 100644 drivers/hwmon/smm665.c +Merging jc_docs/docs-next (90cd0c18573a doc: update params of memhp_default_state=) + 1b46ecf119d8 ("MAINTAINERS: soc: reference maintainer profile") + e12cf84634f1 ("Documentation/process: maintainer-soc: add clean platforms profile") + f92682a736be ("MAINTAINER: samsung: document dtbs_check requirement for Samsung") +$ 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 Documentation/arch/index.rst +Auto-merging Documentation/filesystems/locking.rst +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging Documentation/kbuild/kconfig.rst +Auto-merging Documentation/mm/vmemmap_dedup.rst +Auto-merging MAINTAINERS +Auto-merging drivers/irqchip/Kconfig +Auto-merging rust/Makefile +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-nvdimm | 4 +- + Documentation/Makefile | 16 ++ + Documentation/accounting/psi.rst | 2 +- + Documentation/admin-guide/cgroup-v1/memcg_test.rst | 2 +- + Documentation/admin-guide/kernel-parameters.rst | 23 +-- + Documentation/admin-guide/kernel-parameters.txt | 44 ++--- + .../admin-guide/mm/numa_memory_policy.rst | 2 +- + Documentation/admin-guide/xfs.rst | 2 +- + Documentation/arch/arm/uefi.rst | 4 +- + Documentation/arch/index.rst | 4 +- + Documentation/{ => arch}/loongarch/booting.rst | 0 + Documentation/{ => arch}/loongarch/features.rst | 0 + Documentation/{ => arch}/loongarch/index.rst | 0 + .../{ => arch}/loongarch/introduction.rst | 0 + .../{ => arch}/loongarch/irq-chip-model.rst | 0 + Documentation/{ => arch}/mips/booting.rst | 0 + Documentation/{ => arch}/mips/features.rst | 0 + Documentation/{ => arch}/mips/index.rst | 0 + Documentation/{ => arch}/mips/ingenic-tcu.rst | 0 + .../devicetree/bindings/timer/ingenic,tcu.yaml | 2 +- + Documentation/doc-guide/kernel-doc.rst | 10 +- + Documentation/driver-api/basics.rst | 27 ++- + Documentation/driver-api/infrastructure.rst | 18 ++ + .../debug/kprobes-on-ftrace/arch-support.txt | 2 +- + .../features/debug/kprobes/arch-support.txt | 2 +- + .../features/debug/kretprobes/arch-support.txt | 2 +- + .../features/debug/stackprotector/arch-support.txt | 2 +- + .../features/debug/uprobes/arch-support.txt | 2 +- + .../features/locking/lockdep/arch-support.txt | 2 +- + .../features/vm/ELF-ASLR/arch-support.txt | 5 +- + Documentation/filesystems/afs.rst | 2 +- + Documentation/filesystems/locking.rst | 1 - + Documentation/filesystems/vfs.rst | 7 +- + Documentation/kbuild/kconfig.rst | 2 + + Documentation/maintainer/configure-git.rst | 36 ++-- + .../maintainer/feature-and-driver-maintainers.rst | 155 ++++++++++++++++ + Documentation/maintainer/index.rst | 1 + + Documentation/maintainer/pull-requests.rst | 4 +- + Documentation/mm/highmem.rst | 25 +-- + Documentation/mm/vmemmap_dedup.rst | 3 +- + Documentation/process/changes.rst | 16 +- + Documentation/process/deprecated.rst | 2 +- + Documentation/process/kernel-docs.rst | 9 + + Documentation/process/researcher-guidelines.rst | 27 +++ + Documentation/riscv/boot-image-header.rst | 13 +- + Documentation/riscv/boot.rst | 169 +++++++++++++++++ + Documentation/riscv/index.rst | 1 + + Documentation/rust/index.rst | 8 + + Documentation/scheduler/completion.rst | 2 +- + Documentation/subsystem-apis.rst | 38 ++-- + .../sp_SP/process/contribution-maturity-model.rst | 120 +++++++++++++ + Documentation/translations/sp_SP/process/index.rst | 2 + + .../sp_SP/process/researcher-guidelines.rst | 150 ++++++++++++++++ + Documentation/translations/zh_CN/arch/index.rst | 4 +- + .../zh_CN/{ => arch}/loongarch/booting.rst | 4 +- + .../zh_CN/{ => arch}/loongarch/features.rst | 4 +- + .../zh_CN/{ => arch}/loongarch/index.rst | 4 +- + .../zh_CN/{ => arch}/loongarch/introduction.rst | 4 +- + .../zh_CN/{ => arch}/loongarch/irq-chip-model.rst | 4 +- + .../translations/zh_CN/{ => arch}/mips/booting.rst | 4 +- + .../zh_CN/{ => arch}/mips/features.rst | 4 +- + .../translations/zh_CN/{ => arch}/mips/index.rst | 4 +- + .../zh_CN/{ => arch}/mips/ingenic-tcu.rst | 4 +- + .../zh_CN/dev-tools/testing-overview.rst | 2 +- + Documentation/translations/zh_TW/IRQ.txt | 8 +- + .../translations/zh_TW/admin-guide/README.rst | 2 +- + .../translations/zh_TW/admin-guide/bug-bisect.rst | 2 +- + .../translations/zh_TW/admin-guide/bug-hunting.rst | 2 +- + .../zh_TW/admin-guide/clearing-warn-once.rst | 2 +- + .../translations/zh_TW/admin-guide/cpu-load.rst | 2 +- + .../translations/zh_TW/admin-guide/index.rst | 2 +- + .../translations/zh_TW/admin-guide/init.rst | 2 +- + .../zh_TW/admin-guide/reporting-issues.rst | 2 +- + .../zh_TW/admin-guide/security-bugs.rst | 2 +- + .../zh_TW/admin-guide/tainted-kernels.rst | 2 +- + .../translations/zh_TW/admin-guide/unicode.rst | 2 +- + .../translations/zh_TW/arch/arm64/amu.rst | 2 +- + .../translations/zh_TW/arch/arm64/booting.txt | 4 +- + .../translations/zh_TW/arch/arm64/elf_hwcaps.rst | 2 +- + .../translations/zh_TW/arch/arm64/hugetlbpage.rst | 2 +- + .../translations/zh_TW/arch/arm64/index.rst | 2 +- + .../zh_TW/arch/arm64/legacy_instructions.txt | 4 +- + .../translations/zh_TW/arch/arm64/memory.txt | 4 +- + .../translations/zh_TW/arch/arm64/perf.rst | 2 +- + .../zh_TW/arch/arm64/silicon-errata.txt | 4 +- + .../zh_TW/arch/arm64/tagged-pointers.txt | 4 +- + Documentation/translations/zh_TW/cpu-freq/core.rst | 2 +- + .../translations/zh_TW/cpu-freq/cpu-drivers.rst | 2 +- + .../translations/zh_TW/cpu-freq/cpufreq-stats.rst | 2 +- + .../translations/zh_TW/cpu-freq/index.rst | 2 +- + .../translations/zh_TW/disclaimer-zh_TW.rst | 2 +- + .../translations/zh_TW/filesystems/debugfs.rst | 4 +- + .../translations/zh_TW/filesystems/index.rst | 2 +- + .../translations/zh_TW/filesystems/sysfs.txt | 2 +- + .../translations/zh_TW/filesystems/tmpfs.rst | 2 +- + .../translations/zh_TW/filesystems/virtiofs.rst | 2 +- + Documentation/translations/zh_TW/gpio.txt | 8 +- + Documentation/translations/zh_TW/index.rst | 200 ++++++++------------- + Documentation/translations/zh_TW/io_ordering.txt | 8 +- + .../translations/zh_TW/process/1.Intro.rst | 2 +- + .../translations/zh_TW/process/2.Process.rst | 2 +- + .../translations/zh_TW/process/3.Early-stage.rst | 2 +- + .../translations/zh_TW/process/4.Coding.rst | 2 +- + .../translations/zh_TW/process/5.Posting.rst | 2 +- + .../translations/zh_TW/process/6.Followthrough.rst | 2 +- + .../zh_TW/process/7.AdvancedTopics.rst | 2 +- + .../translations/zh_TW/process/8.Conclusion.rst | 2 +- + .../process/code-of-conduct-interpretation.rst | 2 +- + .../translations/zh_TW/process/code-of-conduct.rst | 2 +- + .../translations/zh_TW/process/coding-style.rst | 2 +- + .../zh_TW/process/development-process.rst | 2 +- + .../translations/zh_TW/process/email-clients.rst | 2 +- + .../zh_TW/process/embargoed-hardware-issues.rst | 2 +- + Documentation/translations/zh_TW/process/howto.rst | 2 +- + Documentation/translations/zh_TW/process/index.rst | 2 +- + .../zh_TW/process/kernel-driver-statement.rst | 2 +- + .../zh_TW/process/kernel-enforcement-statement.rst | 2 +- + .../translations/zh_TW/process/license-rules.rst | 2 +- + .../translations/zh_TW/process/magic-number.rst | 2 +- + .../zh_TW/process/management-style.rst | 2 +- + .../zh_TW/process/programming-language.rst | 2 +- + .../zh_TW/process/stable-api-nonsense.rst | 2 +- + .../zh_TW/process/stable-kernel-rules.rst | 2 +- + .../zh_TW/process/submit-checklist.rst | 2 +- + .../zh_TW/process/submitting-patches.rst | 2 +- + .../zh_TW/process/volatile-considered-harmful.rst | 2 +- + Documentation/translations/zh_TW/sparse.txt | 10 +- + MAINTAINERS | 10 +- + drivers/irqchip/Kconfig | 2 +- + include/linux/jiffies.h | 197 +++++++++++++++++--- + kernel/time/time.c | 169 +++++++++++++++-- + rust/Makefile | 15 +- + 132 files changed, 1359 insertions(+), 408 deletions(-) + rename Documentation/{ => arch}/loongarch/booting.rst (100%) + rename Documentation/{ => arch}/loongarch/features.rst (100%) + rename Documentation/{ => arch}/loongarch/index.rst (100%) + rename Documentation/{ => arch}/loongarch/introduction.rst (100%) + rename Documentation/{ => arch}/loongarch/irq-chip-model.rst (100%) + rename Documentation/{ => arch}/mips/booting.rst (100%) + rename Documentation/{ => arch}/mips/features.rst (100%) + rename Documentation/{ => arch}/mips/index.rst (100%) + rename Documentation/{ => arch}/mips/ingenic-tcu.rst (100%) + create mode 100644 Documentation/maintainer/feature-and-driver-maintainers.rst + create mode 100644 Documentation/riscv/boot.rst + create mode 100644 Documentation/translations/sp_SP/process/contribution-maturity-model.rst + create mode 100644 Documentation/translations/sp_SP/process/researcher-guidelines.rst + rename Documentation/translations/zh_CN/{ => arch}/loongarch/booting.rst (94%) + rename Documentation/translations/zh_CN/{ => arch}/loongarch/features.rst (61%) + rename Documentation/translations/zh_CN/{ => arch}/loongarch/index.rst (78%) + rename Documentation/translations/zh_CN/{ => arch}/loongarch/introduction.rst (99%) + rename Documentation/translations/zh_CN/{ => arch}/loongarch/irq-chip-model.rst (98%) + rename Documentation/translations/zh_CN/{ => arch}/mips/booting.rst (92%) + rename Documentation/translations/zh_CN/{ => arch}/mips/features.rst (65%) + rename Documentation/translations/zh_CN/{ => arch}/mips/index.rst (79%) + rename Documentation/translations/zh_CN/{ => arch}/mips/ingenic-tcu.rst (97%) +Merging v4l-dvb/master (29006e196a56 media: pci: intel: ivsc: Add CSI submodule) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +Auto-merging drivers/media/platform/nxp/imx7-media-csi.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/qcom_camss.rst | 6 +- + Documentation/devicetree/bindings/i2c/i2c-atr.yaml | 34 + + .../devicetree/bindings/media/amphion,vpu.yaml | 8 +- + .../devicetree/bindings/media/cdns,csi2rx.txt | 100 - + .../devicetree/bindings/media/cdns,csi2rx.yaml | 201 + + .../bindings/media/cec/nvidia,tegra114-cec.yaml | 1 - + .../bindings/media/i2c/st,st-mipid02.yaml | 1 - + .../bindings/media/i2c/ti,ds90ub913.yaml | 133 + + .../bindings/media/i2c/ti,ds90ub953.yaml | 134 + + .../bindings/media/i2c/ti,ds90ub960.yaml | 427 ++ + .../bindings/media/mediatek,vcodec-decoder.yaml | 67 +- + .../devicetree/bindings/media/nxp,imx8-isi.yaml | 5 +- + Documentation/driver-api/media/cec-core.rst | 44 +- + Documentation/driver-api/media/v4l2-cci.rst | 5 + + Documentation/driver-api/media/v4l2-core.rst | 1 + + Documentation/driver-api/media/v4l2-subdev.rst | 104 +- + Documentation/i2c/i2c-address-translators.rst | 96 + + Documentation/i2c/index.rst | 1 + + .../userspace-api/media/v4l/dev-decoder.rst | 16 +- + .../userspace-api/media/v4l/dev-encoder.rst | 24 +- + .../media/v4l/dev-stateless-decoder.rst | 4 +- + .../userspace-api/media/v4l/pixfmt-reserved.rst | 13 + + MAINTAINERS | 85 +- + arch/arm64/configs/defconfig | 1 - + drivers/i2c/Kconfig | 9 + + drivers/i2c/Makefile | 1 + + drivers/i2c/i2c-atr.c | 710 ++++ + drivers/media/cec/core/cec-adap.c | 8 +- + drivers/media/cec/core/cec-notifier.c | 1 + + drivers/media/cec/core/cec-pin-priv.h | 1 + + drivers/media/cec/core/cec-pin.c | 32 +- + drivers/media/cec/i2c/ch7322.c | 2 +- + drivers/media/cec/platform/cec-gpio/cec-gpio.c | 10 +- + drivers/media/cec/platform/meson/ao-cec.c | 2 +- + drivers/media/cec/platform/stm32/stm32-cec.c | 1 - + drivers/media/cec/platform/tegra/tegra_cec.c | 6 +- + drivers/media/common/siano/smsdvb-debugfs.c | 330 +- + drivers/media/common/siano/smsendian.c | 2 +- + drivers/media/dvb-frontends/cx24120.c | 4 +- + drivers/media/dvb-frontends/dib7000p.c | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 29 +- + drivers/media/dvb-frontends/mb86a16.c | 10 +- + drivers/media/dvb-frontends/mn88443x.c | 2 +- + drivers/media/firewire/firedtv-avc.c | 4 +- + drivers/media/i2c/Kconfig | 297 +- + drivers/media/i2c/Makefile | 4 + + drivers/media/i2c/ad5820.c | 2 - + drivers/media/i2c/adv748x/adv748x-csi2.c | 13 +- + drivers/media/i2c/ccs-pll.c | 2 +- + drivers/media/i2c/ccs/Kconfig | 5 +- + drivers/media/i2c/ds90ub913.c | 903 +++++ + drivers/media/i2c/ds90ub953.c | 1430 +++++++ + drivers/media/i2c/ds90ub960.c | 4058 ++++++++++++++++++++ + drivers/media/i2c/dw9719.c | 350 ++ + drivers/media/i2c/et8ek8/Kconfig | 4 - + drivers/media/i2c/hi556.c | 2 +- + drivers/media/i2c/hi847.c | 2 +- + drivers/media/i2c/imx208.c | 2 +- + drivers/media/i2c/imx219.c | 292 +- + drivers/media/i2c/imx290.c | 369 +- + drivers/media/i2c/imx296.c | 2 +- + drivers/media/i2c/imx319.c | 2 +- + drivers/media/i2c/imx355.c | 2 +- + drivers/media/i2c/imx415.c | 2 +- + drivers/media/i2c/isl7998x.c | 2 +- + drivers/media/i2c/max9286.c | 29 +- + drivers/media/i2c/mt9m111.c | 2 +- + drivers/media/i2c/og01a1b.c | 2 +- + drivers/media/i2c/ov01a10.c | 2 +- + drivers/media/i2c/ov08x40.c | 16 +- + drivers/media/i2c/ov13858.c | 2 +- + drivers/media/i2c/ov13b10.c | 129 +- + drivers/media/i2c/ov2640.c | 2 +- + drivers/media/i2c/ov2680.c | 4 +- + drivers/media/i2c/ov2740.c | 2 +- + drivers/media/i2c/ov5640.c | 9 +- + drivers/media/i2c/ov5670.c | 2 +- + drivers/media/i2c/ov5675.c | 2 +- + drivers/media/i2c/ov5693.c | 585 ++- + drivers/media/i2c/ov7740.c | 2 +- + drivers/media/i2c/rdacm20.c | 16 +- + drivers/media/i2c/rdacm21.c | 15 +- + drivers/media/i2c/st-mipid02.c | 25 +- + drivers/media/i2c/tc358743.c | 8 +- + drivers/media/i2c/tc358746.c | 15 +- + drivers/media/i2c/tvp5150.c | 4 + + drivers/media/i2c/video-i2c.c | 2 +- + drivers/media/pci/Kconfig | 2 +- + drivers/media/pci/cx18/cx18-gpio.c | 2 +- + drivers/media/pci/cx18/cx18-irq.c | 2 +- + drivers/media/pci/cx23885/cx23885-core.c | 6 +- + drivers/media/pci/cx23885/cx23885-video.c | 2 +- + drivers/media/pci/intel/Kconfig | 11 + + drivers/media/pci/intel/Makefile | 5 +- + drivers/media/pci/intel/ipu-bridge.c | 557 +++ + drivers/media/pci/intel/ipu3/Kconfig | 1 + + drivers/media/pci/intel/ipu3/Makefile | 3 - + drivers/media/pci/intel/ipu3/cio2-bridge.c | 494 --- + .../intel/ipu3/{ipu3-cio2-main.c => ipu3-cio2.c} | 26 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 6 - + drivers/media/pci/intel/ivsc/Kconfig | 12 + + drivers/media/pci/intel/ivsc/Makefile | 6 + + drivers/media/pci/intel/ivsc/mei_csi.c | 825 ++++ + drivers/media/pci/ivtv/ivtvfb.c | 1 - + drivers/media/pci/saa7164/saa7164-encoder.c | 2 +- + drivers/media/pci/saa7164/saa7164-fw.c | 1 - + drivers/media/pci/ttpci/budget-av.c | 34 +- + drivers/media/pci/ttpci/budget-ci.c | 30 +- + drivers/media/pci/ttpci/budget-core.c | 6 +- + drivers/media/pci/ttpci/budget.c | 20 +- + drivers/media/platform/allegro-dvt/allegro-core.c | 3 +- + drivers/media/platform/amphion/vdec.c | 41 +- + drivers/media/platform/amphion/venc.c | 6 +- + drivers/media/platform/amphion/vpu.h | 3 + + drivers/media/platform/amphion/vpu_cmds.c | 18 +- + drivers/media/platform/amphion/vpu_core.c | 4 +- + drivers/media/platform/amphion/vpu_dbg.c | 17 +- + drivers/media/platform/amphion/vpu_drv.c | 4 +- + drivers/media/platform/amphion/vpu_helpers.c | 61 + + drivers/media/platform/amphion/vpu_malone.c | 2 - + drivers/media/platform/amphion/vpu_mbox.c | 2 - + drivers/media/platform/amphion/vpu_msgs.c | 14 +- + drivers/media/platform/amphion/vpu_rpc.c | 2 - + drivers/media/platform/amphion/vpu_v4l2.c | 7 +- + drivers/media/platform/amphion/vpu_windsor.c | 2 - + drivers/media/platform/aspeed/aspeed-video.c | 5 +- + drivers/media/platform/atmel/atmel-isi.c | 16 +- + drivers/media/platform/atmel/atmel-isi.h | 2 - + drivers/media/platform/cadence/cdns-csi2rx.c | 117 +- + drivers/media/platform/chips-media/coda-common.c | 3 +- + drivers/media/platform/intel/pxa_camera.c | 82 +- + drivers/media/platform/marvell/cafe-driver.c | 18 +- + drivers/media/platform/marvell/mcam-core.c | 15 +- + drivers/media/platform/marvell/mmp-driver.c | 11 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 1 + + .../media/platform/mediatek/jpeg/mtk_jpeg_dec_hw.c | 2 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 4 +- + drivers/media/platform/mediatek/mdp/mtk_mdp_comp.c | 2 - + drivers/media/platform/mediatek/mdp/mtk_mdp_core.c | 2 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 4 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 2 +- + drivers/media/platform/mediatek/vcodec/Makefile | 55 +- + .../media/platform/mediatek/vcodec/common/Makefile | 21 + + .../mediatek/vcodec/common/mtk_vcodec_cmn_drv.h | 147 + + .../vcodec/{ => common}/mtk_vcodec_dbgfs.c | 70 +- + .../vcodec/{ => common}/mtk_vcodec_dbgfs.h | 24 +- + .../mediatek/vcodec/{ => common}/mtk_vcodec_fw.c | 21 +- + .../mediatek/vcodec/{ => common}/mtk_vcodec_fw.h | 8 +- + .../vcodec/{ => common}/mtk_vcodec_fw_priv.h | 14 +- + .../vcodec/{ => common}/mtk_vcodec_fw_scp.c | 26 +- + .../vcodec/{ => common}/mtk_vcodec_fw_vpu.c | 72 +- + .../mediatek/vcodec/common/mtk_vcodec_intr.c | 68 + + .../mediatek/vcodec/{ => common}/mtk_vcodec_intr.h | 6 +- + .../mediatek/vcodec/{ => common}/mtk_vcodec_util.c | 83 +- + .../mediatek/vcodec/common/mtk_vcodec_util.h | 75 + + .../platform/mediatek/vcodec/decoder/Makefile | 25 + + .../mediatek/vcodec/{ => decoder}/mtk_vcodec_dec.c | 204 +- + .../mediatek/vcodec/{ => decoder}/mtk_vcodec_dec.h | 10 +- + .../vcodec/{ => decoder}/mtk_vcodec_dec_drv.c | 165 +- + .../mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h | 324 ++ + .../vcodec/{ => decoder}/mtk_vcodec_dec_hw.c | 23 +- + .../vcodec/{ => decoder}/mtk_vcodec_dec_hw.h | 9 +- + .../vcodec/{ => decoder}/mtk_vcodec_dec_pm.c | 41 +- + .../vcodec/{ => decoder}/mtk_vcodec_dec_pm.h | 6 +- + .../vcodec/{ => decoder}/mtk_vcodec_dec_stateful.c | 176 +- + .../{ => decoder}/mtk_vcodec_dec_stateless.c | 235 +- + .../{ => decoder}/vdec/vdec_av1_req_lat_if.c | 170 +- + .../vcodec/{ => decoder}/vdec/vdec_h264_if.c | 79 +- + .../{ => decoder}/vdec/vdec_h264_req_common.c | 4 +- + .../{ => decoder}/vdec/vdec_h264_req_common.h | 6 +- + .../vcodec/{ => decoder}/vdec/vdec_h264_req_if.c | 75 +- + .../{ => decoder}/vdec/vdec_h264_req_multi_if.c | 155 +- + .../{ => decoder}/vdec/vdec_hevc_req_multi_if.c | 129 +- + .../vcodec/{ => decoder}/vdec/vdec_vp8_if.c | 80 +- + .../vcodec/{ => decoder}/vdec/vdec_vp8_req_if.c | 81 +- + .../vcodec/{ => decoder}/vdec/vdec_vp9_if.c | 137 +- + .../{ => decoder}/vdec/vdec_vp9_req_lat_if.c | 129 +- + .../mediatek/vcodec/{ => decoder}/vdec_drv_base.h | 2 +- + .../mediatek/vcodec/{ => decoder}/vdec_drv_if.c | 12 +- + .../mediatek/vcodec/{ => decoder}/vdec_drv_if.h | 10 +- + .../mediatek/vcodec/{ => decoder}/vdec_ipi_msg.h | 0 + .../mediatek/vcodec/{ => decoder}/vdec_msg_queue.c | 70 +- + .../mediatek/vcodec/{ => decoder}/vdec_msg_queue.h | 14 +- + .../mediatek/vcodec/{ => decoder}/vdec_vpu_if.c | 138 +- + .../mediatek/vcodec/{ => decoder}/vdec_vpu_if.h | 6 +- + .../platform/mediatek/vcodec/encoder/Makefile | 11 + + .../mediatek/vcodec/{ => encoder}/mtk_vcodec_enc.c | 296 +- + .../mediatek/vcodec/{ => encoder}/mtk_vcodec_enc.h | 12 +- + .../vcodec/{ => encoder}/mtk_vcodec_enc_drv.c | 75 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc_drv.h | 248 ++ + .../vcodec/{ => encoder}/mtk_vcodec_enc_pm.c | 15 +- + .../vcodec/{ => encoder}/mtk_vcodec_enc_pm.h | 4 +- + .../vcodec/{ => encoder}/venc/venc_h264_if.c | 110 +- + .../vcodec/{ => encoder}/venc/venc_vp8_if.c | 69 +- + .../mediatek/vcodec/{ => encoder}/venc_drv_base.h | 4 +- + .../mediatek/vcodec/{ => encoder}/venc_drv_if.c | 10 +- + .../mediatek/vcodec/{ => encoder}/venc_drv_if.h | 11 +- + .../mediatek/vcodec/{ => encoder}/venc_ipi_msg.h | 0 + .../mediatek/vcodec/{ => encoder}/venc_vpu_if.c | 110 +- + .../mediatek/vcodec/{ => encoder}/venc_vpu_if.h | 3 +- + .../platform/mediatek/vcodec/mtk_vcodec_drv.h | 548 --- + .../platform/mediatek/vcodec/mtk_vcodec_intr.c | 43 - + .../platform/mediatek/vcodec/mtk_vcodec_util.h | 83 - + drivers/media/platform/mediatek/vpu/mtk_vpu.c | 4 +- + .../media/platform/microchip/microchip-csi2dc.c | 11 +- + .../media/platform/microchip/microchip-isc-base.c | 4 +- + drivers/media/platform/microchip/microchip-isc.h | 2 +- + .../platform/microchip/microchip-sama5d2-isc.c | 13 +- + .../platform/microchip/microchip-sama7g5-isc.c | 13 +- + drivers/media/platform/nvidia/tegra-vde/vde.c | 3 +- + drivers/media/platform/nxp/Kconfig | 11 + + drivers/media/platform/nxp/Makefile | 1 + + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 1 - + drivers/media/platform/nxp/imx-mipi-csis.c | 18 +- + drivers/media/platform/nxp/imx-pxp.c | 1 - + drivers/media/platform/nxp/imx7-media-csi.c | 26 +- + drivers/media/platform/nxp/imx8-isi/Makefile | 4 +- + .../media/platform/nxp/imx8-isi/imx8-isi-core.c | 35 +- + .../media/platform/nxp/imx8-isi/imx8-isi-core.h | 14 +- + .../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 38 +- + .../media/platform/nxp/imx8-isi/imx8-isi-gasket.c | 85 + + .../media/platform/nxp/imx8-isi/imx8-isi-pipe.c | 1 - + .../imx => media/platform/nxp}/imx8mq-mipi-csi2.c | 10 +- + drivers/media/platform/qcom/camss/camss.c | 26 +- + drivers/media/platform/qcom/camss/camss.h | 2 +- + drivers/media/platform/qcom/venus/core.c | 16 +- + drivers/media/platform/qcom/venus/core.h | 19 +- + drivers/media/platform/qcom/venus/firmware.c | 42 +- + drivers/media/platform/qcom/venus/helpers.c | 7 +- + drivers/media/platform/qcom/venus/hfi_helper.h | 61 +- + drivers/media/platform/qcom/venus/hfi_msgs.c | 2 +- + .../media/platform/qcom/venus/hfi_plat_bufs_v6.c | 22 +- + drivers/media/platform/qcom/venus/hfi_platform.c | 4 +- + drivers/media/platform/qcom/venus/hfi_venus.c | 44 +- + drivers/media/platform/qcom/venus/vdec.c | 10 +- + drivers/media/platform/qcom/venus/vdec_ctrls.c | 2 +- + drivers/media/platform/qcom/venus/venc.c | 4 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 2 +- + drivers/media/platform/renesas/rcar-isp.c | 14 +- + .../media/platform/renesas/rcar-vin/rcar-core.c | 53 +- + .../media/platform/renesas/rcar-vin/rcar-csi2.c | 312 +- + drivers/media/platform/renesas/rcar-vin/rcar-vin.h | 10 +- + drivers/media/platform/renesas/rcar_drif.c | 15 +- + drivers/media/platform/renesas/rcar_fdp1.c | 1 - + drivers/media/platform/renesas/rcar_jpu.c | 5 +- + drivers/media/platform/renesas/renesas-ceu.c | 11 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-core.c | 15 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-cru.h | 2 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 13 +- + drivers/media/platform/renesas/sh_vou.c | 12 +- + drivers/media/platform/renesas/vsp1/vsp1_drv.c | 1 - + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 2 +- + .../media/platform/rockchip/rkisp1/rkisp1-csi.c | 7 +- + .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 14 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 8 +- + .../media/platform/samsung/exynos-gsc/gsc-core.c | 1 - + .../media/platform/samsung/exynos4-is/fimc-core.c | 5 +- + .../media/platform/samsung/exynos4-is/fimc-lite.c | 4 +- + .../media/platform/samsung/exynos4-is/media-dev.c | 12 +- + .../media/platform/samsung/exynos4-is/media-dev.h | 2 +- + .../media/platform/samsung/s5p-jpeg/jpeg-core.c | 6 +- + drivers/media/platform/st/stm32/stm32-dcmi.c | 92 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 11 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 3 +- + .../platform/sunxi/sun6i-csi/sun6i_csi_bridge.c | 12 +- + .../platform/sunxi/sun6i-csi/sun6i_csi_bridge.h | 2 +- + .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 13 +- + .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 13 +- + drivers/media/platform/sunxi/sun8i-di/sun8i-di.c | 4 +- + .../platform/sunxi/sun8i-rotate/sun8i_rotate.c | 4 +- + drivers/media/platform/ti/am437x/am437x-vpfe.c | 38 +- + drivers/media/platform/ti/am437x/am437x-vpfe.h | 2 +- + drivers/media/platform/ti/cal/cal-camerarx.c | 206 +- + drivers/media/platform/ti/cal/cal-video.c | 23 +- + drivers/media/platform/ti/cal/cal.c | 78 +- + drivers/media/platform/ti/cal/cal.h | 10 - + drivers/media/platform/ti/davinci/vpif_capture.c | 35 +- + drivers/media/platform/ti/omap3isp/isp.c | 60 +- + drivers/media/platform/ti/omap3isp/isp.h | 15 +- + drivers/media/platform/ti/omap3isp/ispccdc.c | 13 +- + drivers/media/platform/ti/omap3isp/ispccp2.c | 2 + + drivers/media/platform/ti/omap3isp/ispcsi2.c | 2 + + drivers/media/platform/ti/omap3isp/ispcsiphy.c | 15 +- + drivers/media/platform/verisilicon/hantro_drv.c | 11 +- + drivers/media/platform/verisilicon/hantro_v4l2.c | 9 +- + drivers/media/platform/video-mux.c | 10 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 55 +- + drivers/media/radio/wl128x/fmdrv_common.c | 3 +- + drivers/media/rc/Kconfig | 1 + + drivers/media/rc/gpio-ir-recv.c | 2 +- + drivers/media/rc/gpio-ir-tx.c | 2 +- + drivers/media/rc/ir-rx51.c | 2 +- + drivers/media/rc/meson-ir.c | 122 +- + drivers/media/rc/mtk-cir.c | 3 +- + drivers/media/rc/sunxi-cir.c | 3 +- + drivers/media/test-drivers/vivid/vivid-osd.c | 1 - + drivers/media/tuners/qt1010.c | 11 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 9 +- + drivers/media/usb/dvb-usb-v2/anysee.c | 2 +- + drivers/media/usb/dvb-usb-v2/az6007.c | 8 + + drivers/media/usb/dvb-usb-v2/gl861.c | 2 +- + drivers/media/usb/dvb-usb/af9005.c | 5 + + drivers/media/usb/dvb-usb/dw2102.c | 24 + + drivers/media/usb/dvb-usb/m920x.c | 5 +- + drivers/media/usb/dvb-usb/opera1.c | 9 +- + drivers/media/usb/go7007/go7007-i2c.c | 2 - + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 6 +- + drivers/media/usb/pvrusb2/pvrusb2-sysfs.c | 20 +- + drivers/media/usb/siano/smsusb.c | 21 +- + drivers/media/usb/ttusb-dec/ttusbdecfe.c | 12 +- + drivers/media/v4l2-core/Kconfig | 9 + + drivers/media/v4l2-core/Makefile | 1 + + drivers/media/v4l2-core/v4l2-async.c | 705 ++-- + drivers/media/v4l2-core/v4l2-cci.c | 166 + + drivers/media/v4l2-core/v4l2-common.c | 4 + + drivers/media/v4l2-core/v4l2-fwnode.c | 127 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 2 + + drivers/media/v4l2-core/v4l2-subdev.c | 44 +- + drivers/staging/media/atomisp/Kconfig | 3 + + drivers/staging/media/atomisp/i2c/Kconfig | 1 + + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 251 +- + drivers/staging/media/atomisp/i2c/ov2680.h | 86 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 24 - + .../media/atomisp/pci/atomisp_compat_css20.c | 3 - + drivers/staging/media/atomisp/pci/atomisp_csi2.h | 67 - + .../media/atomisp/pci/atomisp_csi2_bridge.c | 432 +-- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 3 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 16 - + .../staging/media/atomisp/pci/sh_css_param_dvs.c | 3 - + drivers/staging/media/atomisp/pci/sh_css_sp.c | 14 +- + .../media/deprecated/atmel/atmel-isc-base.c | 4 +- + drivers/staging/media/deprecated/atmel/atmel-isc.h | 2 +- + .../media/deprecated/atmel/atmel-sama5d2-isc.c | 9 +- + .../media/deprecated/atmel/atmel-sama7g5-isc.c | 9 +- + drivers/staging/media/imx/Kconfig | 27 +- + drivers/staging/media/imx/Makefile | 9 +- + drivers/staging/media/imx/imx-media-csi.c | 10 +- + drivers/staging/media/imx/imx-media-dev-common.c | 6 +- + drivers/staging/media/imx/imx-media-dev.c | 2 +- + drivers/staging/media/imx/imx-media-of.c | 4 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 12 +- + drivers/staging/media/ipu3/ipu3-css.c | 14 +- + drivers/staging/media/meson/vdec/vdec_platform.c | 9 + + drivers/staging/media/rkvdec/rkvdec-vp9.c | 1 - + drivers/staging/media/rkvdec/rkvdec.c | 2 +- + drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c | 2 +- + .../staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c | 6 +- + .../staging/media/sunxi/sun6i-isp/sun6i_isp_proc.h | 2 +- + drivers/staging/media/tegra-video/vi.c | 21 +- + drivers/staging/media/tegra-video/vip.c | 1 + + include/linux/i2c-atr.h | 116 + + include/media/cec.h | 11 +- + include/media/davinci/vpif_types.h | 2 +- + include/media/i2c/ds90ub9xx.h | 22 + + .../cio2-bridge.h => include/media/ipu-bridge.h | 78 +- + include/media/ov_16bit_addr_reg_helpers.h | 92 - + include/media/v4l2-async.h | 236 +- + include/media/v4l2-cci.h | 125 + + include/media/v4l2-fwnode.h | 70 - + include/media/v4l2-subdev.h | 21 +- + include/uapi/linux/videodev2.h | 2 + + 361 files changed, 16728 insertions(+), 6936 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-atr.yaml + delete mode 100644 Documentation/devicetree/bindings/media/cdns,csi2rx.txt + create mode 100644 Documentation/devicetree/bindings/media/cdns,csi2rx.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ti,ds90ub913.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ti,ds90ub953.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ti,ds90ub960.yaml + create mode 100644 Documentation/driver-api/media/v4l2-cci.rst + create mode 100644 Documentation/i2c/i2c-address-translators.rst + create mode 100644 drivers/i2c/i2c-atr.c + create mode 100644 drivers/media/i2c/ds90ub913.c + create mode 100644 drivers/media/i2c/ds90ub953.c + create mode 100644 drivers/media/i2c/ds90ub960.c + create mode 100644 drivers/media/i2c/dw9719.c + create mode 100644 drivers/media/pci/intel/Kconfig + create mode 100644 drivers/media/pci/intel/ipu-bridge.c + delete mode 100644 drivers/media/pci/intel/ipu3/cio2-bridge.c + rename drivers/media/pci/intel/ipu3/{ipu3-cio2-main.c => ipu3-cio2.c} (99%) + create mode 100644 drivers/media/pci/intel/ivsc/Kconfig + create mode 100644 drivers/media/pci/intel/ivsc/Makefile + create mode 100644 drivers/media/pci/intel/ivsc/mei_csi.c + create mode 100644 drivers/media/platform/mediatek/vcodec/common/Makefile + create mode 100644 drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_cmn_drv.h + rename drivers/media/platform/mediatek/vcodec/{ => common}/mtk_vcodec_dbgfs.c (75%) + rename drivers/media/platform/mediatek/vcodec/{ => common}/mtk_vcodec_dbgfs.h (62%) + rename drivers/media/platform/mediatek/vcodec/{ => common}/mtk_vcodec_fw.c (75%) + rename drivers/media/platform/mediatek/vcodec/{ => common}/mtk_vcodec_fw.h (86%) + rename drivers/media/platform/mediatek/vcodec/{ => common}/mtk_vcodec_fw_priv.h (75%) + rename drivers/media/platform/mediatek/vcodec/{ => common}/mtk_vcodec_fw_scp.c (70%) + rename drivers/media/platform/mediatek/vcodec/{ => common}/mtk_vcodec_fw_vpu.c (58%) + create mode 100644 drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_intr.c + rename drivers/media/platform/mediatek/vcodec/{ => common}/mtk_vcodec_intr.h (68%) + rename drivers/media/platform/mediatek/vcodec/{ => common}/mtk_vcodec_util.c (50%) + create mode 100644 drivers/media/platform/mediatek/vcodec/common/mtk_vcodec_util.h + create mode 100644 drivers/media/platform/mediatek/vcodec/decoder/Makefile + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/mtk_vcodec_dec.c (82%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/mtk_vcodec_dec.h (91%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/mtk_vcodec_dec_drv.c (72%) + create mode 100644 drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/mtk_vcodec_dec_hw.c (89%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/mtk_vcodec_dec_hw.h (87%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/mtk_vcodec_dec_pm.c (81%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/mtk_vcodec_dec_pm.h (61%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/mtk_vcodec_dec_stateful.c (73%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/mtk_vcodec_dec_stateless.c (67%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec/vdec_av1_req_lat_if.c (93%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec/vdec_h264_if.c (84%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec/vdec_h264_req_common.c (98%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec/vdec_h264_req_common.h (97%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec/vdec_h264_req_if.c (86%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec/vdec_h264_req_multi_if.c (85%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec/vdec_hevc_req_multi_if.c (90%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec/vdec_vp8_if.c (87%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec/vdec_vp8_req_if.c (81%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec/vdec_vp9_if.c (87%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec/vdec_vp9_req_lat_if.c (94%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec_drv_base.h (95%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec_drv_if.c (86%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec_drv_if.h (89%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec_ipi_msg.h (100%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec_msg_queue.c (81%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec_msg_queue.h (95%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec_vpu_if.c (67%) + rename drivers/media/platform/mediatek/vcodec/{ => decoder}/vdec_vpu_if.h (97%) + create mode 100644 drivers/media/platform/mediatek/vcodec/encoder/Makefile + rename drivers/media/platform/mediatek/vcodec/{ => encoder}/mtk_vcodec_enc.c (82%) + rename drivers/media/platform/mediatek/vcodec/{ => encoder}/mtk_vcodec_enc.h (78%) + rename drivers/media/platform/mediatek/vcodec/{ => encoder}/mtk_vcodec_enc_drv.c (85%) + create mode 100644 drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc_drv.h + rename drivers/media/platform/mediatek/vcodec/{ => encoder}/mtk_vcodec_enc_pm.c (82%) + rename drivers/media/platform/mediatek/vcodec/{ => encoder}/mtk_vcodec_enc_pm.h (78%) + rename drivers/media/platform/mediatek/vcodec/{ => encoder}/venc/venc_h264_if.c (88%) + rename drivers/media/platform/mediatek/vcodec/{ => encoder}/venc/venc_vp8_if.c (88%) + rename drivers/media/platform/mediatek/vcodec/{ => encoder}/venc_drv_base.h (94%) + rename drivers/media/platform/mediatek/vcodec/{ => encoder}/venc_drv_if.c (86%) + rename drivers/media/platform/mediatek/vcodec/{ => encoder}/venc_drv_if.h (94%) + rename drivers/media/platform/mediatek/vcodec/{ => encoder}/venc_ipi_msg.h (100%) + rename drivers/media/platform/mediatek/vcodec/{ => encoder}/venc_vpu_if.c (75%) + rename drivers/media/platform/mediatek/vcodec/{ => encoder}/venc_vpu_if.h (96%) + delete mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_drv.h + delete mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_intr.c + delete mode 100644 drivers/media/platform/mediatek/vcodec/mtk_vcodec_util.h + create mode 100644 drivers/media/platform/nxp/imx8-isi/imx8-isi-gasket.c + rename drivers/{staging/media/imx => media/platform/nxp}/imx8mq-mipi-csi2.c (99%) + create mode 100644 drivers/media/v4l2-core/v4l2-cci.c + create mode 100644 include/linux/i2c-atr.h + create mode 100644 include/media/i2c/ds90ub9xx.h + rename drivers/media/pci/intel/ipu3/cio2-bridge.h => include/media/ipu-bridge.h (60%) + delete mode 100644 include/media/ov_16bit_addr_reg_helpers.h + create mode 100644 include/media/v4l2-cci.h +Merging v4l-dvb-next/master (b7ec3212a73a media: bttv: convert to vb2) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../media/v4l/vidioc-subdev-g-routing.rst | 7 +- + MAINTAINERS | 1 + + drivers/media/i2c/Kconfig | 1 + + drivers/media/i2c/ccs/ccs-data.c | 101 +- + drivers/media/i2c/ds90ub913.c | 2 +- + drivers/media/i2c/ds90ub953.c | 6 +- + drivers/media/i2c/ds90ub960.c | 1 + + drivers/media/i2c/ov2680.c | 1380 +++++++++++--------- + drivers/media/i2c/ov5640.c | 15 +- + drivers/media/i2c/rdacm21.c | 2 +- + drivers/media/pci/bt8xx/Kconfig | 2 +- + drivers/media/pci/bt8xx/bt848.h | 8 + + drivers/media/pci/bt8xx/bttv-audio-hook.c | 10 +- + drivers/media/pci/bt8xx/bttv-driver.c | 1022 +++++---------- + drivers/media/pci/bt8xx/bttv-risc.c | 411 +++--- + drivers/media/pci/bt8xx/bttv-vbi.c | 283 ++-- + drivers/media/pci/bt8xx/bttvp.h | 79 +- + drivers/media/pci/intel/ipu-bridge.c | 265 +++- + drivers/media/pci/intel/ivsc/Makefile | 3 + + drivers/media/pci/intel/ivsc/mei_ace.c | 579 ++++++++ + drivers/media/platform/chips-media/coda-common.c | 1 - + .../media/platform/samsung/s3c-camif/camif-core.c | 4 +- + drivers/media/platform/ti/am437x/am437x-vpfe.c | 4 +- + drivers/media/platform/ti/davinci/vpif_capture.c | 1 + + drivers/media/platform/ti/omap3isp/isp.c | 4 +- + drivers/media/platform/verisilicon/hantro_drv.c | 4 +- + drivers/media/test-drivers/vivid/vivid-core.c | 2 +- + drivers/staging/media/atomisp/i2c/Kconfig | 13 - + drivers/staging/media/atomisp/i2c/Makefile | 1 - + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 828 ------------ + drivers/staging/media/atomisp/i2c/ov2680.h | 173 --- + include/media/ipu-bridge.h | 19 +- + 32 files changed, 2415 insertions(+), 2817 deletions(-) + create mode 100644 drivers/media/pci/intel/ivsc/mei_ace.c + delete mode 100644 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c + delete mode 100644 drivers/staging/media/atomisp/i2c/ov2680.h +Merging pm/linux-next (e8cde28ba512 Merge branch 'pm-tools' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 - + arch/ia64/include/asm/acpi.h | 6 +- + arch/x86/include/asm/acpi.h | 24 +- + arch/x86/xen/enlighten_pv.c | 8 +- + drivers/acpi/Makefile | 1 - + drivers/acpi/ac.c | 27 ++- + drivers/acpi/acpi_processor.c | 124 ++++++++--- + drivers/acpi/acpi_video.c | 20 +- + drivers/acpi/acpica/acdebug.h | 2 + + drivers/acpi/acpica/acglobal.h | 1 + + drivers/acpi/acpica/aclocal.h | 38 +++- + drivers/acpi/acpica/acpredef.h | 3 + + drivers/acpi/acpica/dbcmds.c | 58 +++++ + drivers/acpi/acpica/dbinput.c | 8 + + drivers/acpi/acpica/dswstate.c | 4 +- + drivers/acpi/acpica/exserial.c | 3 +- + drivers/acpi/acpica/psopcode.c | 2 +- + drivers/acpi/acpica/utdebug.c | 5 + + drivers/acpi/arm64/Makefile | 1 + + drivers/acpi/{acpi_amba.c => arm64/amba.c} | 2 +- + drivers/acpi/arm64/init.c | 2 + + drivers/acpi/arm64/init.h | 1 + + drivers/acpi/battery.c | 24 +- + drivers/acpi/bus.c | 33 ++- + drivers/acpi/hed.c | 15 +- + drivers/acpi/internal.h | 15 +- + drivers/acpi/nfit/core.c | 42 ++-- + drivers/acpi/processor_pdc.c | 97 +-------- + drivers/acpi/scan.c | 1 - + drivers/acpi/thermal.c | 55 ++--- + drivers/acpi/video_detect.c | 9 + + drivers/acpi/x86/utils.c | 35 +++ + drivers/cpuidle/governors/teo.c | 241 ++++++++++++++------- + drivers/powercap/arm_scmi_powercap.c | 159 ++++++++------ + drivers/powercap/intel_rapl_common.c | 2 +- + drivers/thermal/amlogic_thermal.c | 2 - + drivers/thermal/broadcom/bcm2711_thermal.c | 2 +- + drivers/thermal/broadcom/brcmstb_thermal.c | 2 +- + drivers/thermal/hisi_thermal.c | 2 +- + drivers/thermal/imx8mm_thermal.c | 1 - + drivers/thermal/imx_sc_thermal.c | 1 - + drivers/thermal/imx_thermal.c | 2 +- + .../intel/int340x_thermal/int3400_thermal.c | 44 ++-- + .../processor_thermal_device_pci_legacy.c | 2 +- + drivers/thermal/intel/intel_soc_dts_iosf.c | 180 ++++++--------- + drivers/thermal/intel/intel_soc_dts_iosf.h | 15 +- + drivers/thermal/intel/intel_soc_dts_thermal.c | 17 +- + drivers/thermal/k3_bandgap.c | 2 +- + drivers/thermal/k3_j72xx_bandgap.c | 2 +- + drivers/thermal/mediatek/auxadc_thermal.c | 1 - + drivers/thermal/mediatek/lvts_thermal.c | 2 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 1 - + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 1 - + drivers/thermal/rcar_gen3_thermal.c | 2 +- + drivers/thermal/rcar_thermal.c | 2 +- + drivers/thermal/rzg2l_thermal.c | 2 +- + drivers/thermal/samsung/exynos_tmu.c | 2 +- + drivers/thermal/sprd_thermal.c | 2 +- + drivers/thermal/st/stm_thermal.c | 2 - + drivers/thermal/sun8i_thermal.c | 2 +- + drivers/thermal/tegra/tegra30-tsensor.c | 2 +- + drivers/thermal/thermal_of.c | 3 +- + drivers/thermal/uniphier_thermal.c | 1 - + include/acpi/acnames.h | 1 + + include/acpi/acpi_bus.h | 6 + + include/acpi/acpixf.h | 2 +- + include/acpi/actbl1.h | 2 +- + include/acpi/actbl2.h | 76 ++++++- + include/acpi/actbl3.h | 4 +- + include/acpi/pdc_intel.h | 36 --- + include/acpi/platform/aclinux.h | 1 + + include/acpi/platform/aczephyr.h | 3 - + include/acpi/proc_cap_intel.h | 40 ++++ + kernel/power/snapshot.c | 187 ++++++++++++---- + tools/power/cpupower/Makefile | 2 +- + tools/power/cpupower/lib/cpupower.c | 7 + + tools/power/cpupower/lib/cpupower_intern.h | 1 + + tools/power/cpupower/utils/cpuidle-set.c | 16 +- + tools/power/cpupower/utils/cpupower-set.c | 65 +++++- + tools/power/cpupower/utils/helpers/helpers.h | 11 + + tools/power/cpupower/utils/helpers/misc.c | 57 ++++- + 81 files changed, 1211 insertions(+), 677 deletions(-) + rename drivers/acpi/{acpi_amba.c => arm64/amba.c} (99%) + delete mode 100644 include/acpi/pdc_intel.h + create mode 100644 include/acpi/proc_cap_intel.h +Merging cpufreq-arm/cpufreq/arm/linux-next (d3dec5bb61ce cpufreq: amd-pstate-ut: Modify the function to get the highest_perf value) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + drivers/cpufreq/acpi-cpufreq.c | 6 ++---- + drivers/cpufreq/amd-pstate-ut.c | 4 ++-- + drivers/cpufreq/armada-37xx-cpufreq.c | 4 +--- + drivers/cpufreq/brcmstb-avs-cpufreq.c | 12 +++++++----- + drivers/cpufreq/cpufreq-dt-platdev.c | 7 +++++++ + drivers/cpufreq/cpufreq-dt.c | 5 ++--- + drivers/cpufreq/davinci-cpufreq.c | 6 ++---- + drivers/cpufreq/imx-cpufreq-dt.c | 6 ++---- + drivers/cpufreq/imx6q-cpufreq.c | 6 ++---- + drivers/cpufreq/kirkwood-cpufreq.c | 6 ++---- + drivers/cpufreq/mediatek-cpufreq-hw.c | 9 ++++----- + drivers/cpufreq/mediatek-cpufreq.c | 2 -- + drivers/cpufreq/omap-cpufreq.c | 6 ++---- + drivers/cpufreq/pcc-cpufreq.c | 6 ++---- + drivers/cpufreq/ppc_cbe_cpufreq.c | 2 +- + drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 1 - + drivers/cpufreq/qcom-cpufreq-hw.c | 6 ++---- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 7 ++----- + drivers/cpufreq/qoriq-cpufreq.c | 6 ++---- + drivers/cpufreq/raspberrypi-cpufreq.c | 6 ++---- + drivers/cpufreq/scpi-cpufreq.c | 7 +++---- + drivers/cpufreq/sti-cpufreq.c | 2 +- + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 6 ++---- + drivers/cpufreq/tegra186-cpufreq.c | 6 ++---- + drivers/cpufreq/tegra194-cpufreq.c | 6 ++---- + drivers/cpufreq/ti-cpufreq.c | 2 +- + drivers/cpufreq/vexpress-spc-cpufreq.c | 6 ++---- + 27 files changed, 59 insertions(+), 89 deletions(-) +Merging cpupower/cpupower (99481d2195bf cpupower: Fix cpuidle_set to accept only numeric values for idle-set operation.) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (5693d077595d PM / devfreq: Fix leak in devfreq_dev_release()) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/devfreq.c | 10 ++++++---- + drivers/devfreq/imx-bus.c | 2 +- + drivers/devfreq/imx8m-ddrc.c | 2 +- + drivers/devfreq/mtk-cci-devfreq.c | 1 - + drivers/devfreq/tegra30-devfreq.c | 2 +- + 5 files changed, 9 insertions(+), 8 deletions(-) +Merging genpd/next (fe38a2d570df MAINTAINERS: adjust file entry in STARFIVE JH71XX PMU CONTROLLER DRIVER) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git genpd/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging opp/opp/linux-next (c2add32ce452 dt-bindings: opp: Increase maxItems for opp-hz property) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/opp/opp-v2-base.yaml | 2 +- + drivers/opp/core.c | 117 +++++++++++++++++---- + include/linux/pm_opp.h | 72 +++++++++---- + 3 files changed, 154 insertions(+), 37 deletions(-) +Merging thermal/thermal/linux-next (57c9eaa4de53 thermal/drivers/qcom/temp-alarm: Use dev_err_probe) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging dlm/next (a3d85fcf268e fs: dlm: don't use RCOM_NAMES for version detection) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Auto-merging fs/gfs2/file.c +Merge made by the 'ort' strategy. + fs/dlm/config.c | 2 +- + fs/dlm/debug_fs.c | 101 +++++++++++++- + fs/dlm/dir.c | 14 +- + fs/dlm/dir.h | 6 +- + fs/dlm/dlm_internal.h | 1 + + fs/dlm/lock.c | 120 ++++++++-------- + fs/dlm/lock.h | 16 ++- + fs/dlm/lowcomms.c | 1 - + fs/dlm/member.c | 15 +- + fs/dlm/member.h | 2 +- + fs/dlm/midcomms.c | 304 ++++++++++++++++------------------------- + fs/dlm/midcomms.h | 1 + + fs/dlm/plock.c | 170 ++++++++++++++++++----- + fs/dlm/rcom.c | 102 ++++++++------ + fs/dlm/rcom.h | 15 +- + fs/dlm/recover.c | 60 ++++---- + fs/dlm/recover.h | 14 +- + fs/dlm/recoverd.c | 16 +-- + fs/dlm/requestqueue.c | 3 +- + fs/dlm/requestqueue.h | 3 +- + fs/gfs2/file.c | 9 +- + fs/ocfs2/stack_user.c | 13 +- + include/linux/dlm_plock.h | 2 + + include/trace/events/dlm.h | 51 +++++++ + include/uapi/linux/dlm_plock.h | 1 + + 25 files changed, 625 insertions(+), 417 deletions(-) +Merging rdma/for-next (d952f54d01ec RDMA/hns: Remove unused declaration hns_roce_modify_srq()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/core/cma.c +Auto-merging drivers/infiniband/hw/bnxt_re/ib_verbs.c +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_rcfw.c +Auto-merging drivers/infiniband/hw/bnxt_re/qplib_res.c +Auto-merging drivers/infiniband/hw/irdma/ctrl.c +Auto-merging drivers/infiniband/hw/irdma/hw.c +Auto-merging drivers/infiniband/hw/irdma/main.h +Auto-merging drivers/infiniband/hw/irdma/uk.c +Auto-merging drivers/infiniband/hw/irdma/utils.c +Merge made by the 'ort' strategy. + drivers/infiniband/core/cache.c | 11 + + drivers/infiniband/core/cma.c | 32 ++- + drivers/infiniband/core/iwpm_util.c | 2 +- + drivers/infiniband/core/netlink.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 35 +-- + .../infiniband/core/uverbs_std_types_counters.c | 2 + + drivers/infiniband/core/verbs.c | 100 ++++++-- + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 35 ++- + drivers/infiniband/hw/bnxt_re/hw_counters.c | 84 ++++++- + drivers/infiniband/hw/bnxt_re/hw_counters.h | 55 +++++ + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 176 +++++++++---- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 2 + + drivers/infiniband/hw/bnxt_re/main.c | 275 ++++++++++++++++++--- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 47 ++-- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 36 +-- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 12 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 19 ++ + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 85 ++++--- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 13 + + drivers/infiniband/hw/efa/efa_com_cmd.c | 8 +- + drivers/infiniband/hw/efa/efa_com_cmd.h | 10 +- + drivers/infiniband/hw/efa/efa_verbs.c | 18 ++ + drivers/infiniband/hw/erdma/erdma_verbs.c | 4 +- + drivers/infiniband/hw/hfi1/device.c | 72 +++--- + drivers/infiniband/hw/hfi1/pio.c | 9 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 7 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 104 ++------ + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 13 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 7 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 28 ++- + drivers/infiniband/hw/irdma/cm.c | 90 +++++-- + drivers/infiniband/hw/irdma/ctrl.c | 5 +- + drivers/infiniband/hw/irdma/hw.c | 63 +++-- + drivers/infiniband/hw/irdma/i40iw_hw.c | 1 + + drivers/infiniband/hw/irdma/i40iw_hw.h | 2 +- + drivers/infiniband/hw/irdma/icrdma_hw.c | 1 + + drivers/infiniband/hw/irdma/icrdma_hw.h | 1 + + drivers/infiniband/hw/irdma/irdma.h | 1 + + drivers/infiniband/hw/irdma/main.h | 8 +- + drivers/infiniband/hw/irdma/uk.c | 113 +++++++-- + drivers/infiniband/hw/irdma/user.h | 11 + + drivers/infiniband/hw/irdma/utils.c | 25 ++ + drivers/infiniband/hw/irdma/verbs.c | 248 ++++++++++++------- + drivers/infiniband/hw/irdma/verbs.h | 5 +- + drivers/infiniband/hw/mlx4/main.c | 44 ++-- + drivers/infiniband/hw/mlx5/counters.c | 2 + + drivers/infiniband/hw/mlx5/mad.c | 40 +-- + drivers/infiniband/hw/mlx5/mr.c | 5 + + drivers/infiniband/hw/mthca/mthca_provider.c | 20 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- + drivers/infiniband/hw/qedr/qedr_roce_cm.c | 1 - + drivers/infiniband/hw/qedr/verbs.c | 2 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 17 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 4 + + drivers/infiniband/sw/rxe/rxe_loc.h | 6 - + drivers/infiniband/sw/rxe/rxe_qp.c | 159 ++++++++---- + drivers/infiniband/sw/rxe/rxe_req.c | 49 ++-- + drivers/infiniband/sw/rxe/rxe_resp.c | 4 + + drivers/infiniband/sw/rxe/rxe_srq.c | 60 +++-- + drivers/infiniband/sw/siw/siw.h | 4 +- + drivers/infiniband/sw/siw/siw_main.c | 62 +---- + drivers/infiniband/sw/siw/siw_qp.c | 4 +- + drivers/infiniband/sw/siw/siw_qp_tx.c | 44 +++- + drivers/infiniband/sw/siw/siw_verbs.c | 10 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 19 +- + drivers/infiniband/ulp/rtrs/rtrs-srv-sysfs.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 15 +- + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 54 ++++ + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 1 + + include/uapi/rdma/bnxt_re-abi.h | 7 + + include/uapi/rdma/irdma-abi.h | 9 + + 75 files changed, 1717 insertions(+), 814 deletions(-) +Merging net-next/main (479b322ee6fe net: dsa: mv88e6060: add phylink_get_caps implementation) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging Documentation/devicetree/bindings/net/can/bosch,m_can.yaml +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/sysdev/fsl_soc.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h +Auto-merging drivers/net/ethernet/sfc/io.h +Auto-merging drivers/net/pcs/pcs-rzn1-miic.c +Auto-merging drivers/net/phy/phy_device.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/wireless/ath/ath11k/pci.c +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/security.h +Auto-merging include/net/tcp.h +Auto-merging net/ipv4/tcp.c +Auto-merging net/key/af_key.c +Auto-merging net/sunrpc/svcsock.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Auto-merging tools/build/feature/Makefile +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + Documentation/bpf/bpf_design_QA.rst | 5 - + Documentation/bpf/bpf_devel_QA.rst | 10 +- + Documentation/bpf/btf.rst | 4 +- + Documentation/bpf/index.rst | 3 +- + Documentation/bpf/llvm_reloc.rst | 6 +- + Documentation/bpf/standardization/index.rst | 18 + + .../bpf/{ => standardization}/instruction-set.rst | 227 +- + .../bpf/{ => standardization}/linux-notes.rst | 3 +- + .../bindings/net/bluetooth/qualcomm-bluetooth.yaml | 2 + + .../devicetree/bindings/net/brcm,asp-v2.0.yaml | 155 ++ + .../devicetree/bindings/net/brcm,unimac-mdio.yaml | 2 + + .../bindings/net/can/allwinner,sun4i-a10-can.yaml | 6 +- + .../devicetree/bindings/net/can/bosch,m_can.yaml | 20 +- + .../devicetree/bindings/net/can/tcan4x5x.txt | 11 +- + .../devicetree/bindings/net/can/xilinx,can.yaml | 3 + + Documentation/devicetree/bindings/net/dsa/dsa.yaml | 2 +- + .../bindings/net/ethernet-controller.yaml | 1 + + .../devicetree/bindings/net/mediatek,net.yaml | 109 +- + .../devicetree/bindings/net/motorcomm,yt8xxx.yaml | 34 + + .../devicetree/bindings/net/oxnas-dwmac.txt | 41 - + .../devicetree/bindings/net/qca,ar803x.yaml | 2 + + .../devicetree/bindings/net/rockchip-dwmac.yaml | 1 + + .../devicetree/bindings/net/ti,icssg-prueth.yaml | 184 ++ + .../bindings/net/wireless/mediatek,mt76.yaml | 13 +- + Documentation/netlink/genetlink-c.yaml | 2 +- + Documentation/netlink/genetlink-legacy.yaml | 2 +- + Documentation/netlink/genetlink.yaml | 2 +- + Documentation/netlink/specs/devlink.yaml | 471 +++- + Documentation/netlink/specs/netdev.yaml | 9 +- + Documentation/networking/af_xdp.rst | 211 +- + .../device_drivers/ethernet/google/gve.rst | 9 + + .../device_drivers/ethernet/marvell/octeontx2.rst | 8 + + Documentation/networking/ip-sysctl.rst | 9 + + Documentation/networking/netconsole.rst | 11 +- + Documentation/networking/page_pool.rst | 131 +- + Documentation/networking/phy.rst | 4 + + MAINTAINERS | 38 +- + arch/powerpc/platforms/8xx/adder875.c | 1 - + arch/powerpc/platforms/8xx/mpc885ads_setup.c | 1 - + arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 - + arch/powerpc/sysdev/fsl_soc.c | 3 - + arch/riscv/net/bpf_jit_comp64.c | 151 +- + arch/x86/net/bpf_jit_comp.c | 389 ++- + drivers/bluetooth/btbcm.c | 5 + + drivers/bluetooth/btintel.c | 198 ++ + drivers/bluetooth/btintel.h | 3 + + drivers/bluetooth/btmtk.c | 133 + + drivers/bluetooth/btmtk.h | 42 + + drivers/bluetooth/btmtkuart.c | 1 - + drivers/bluetooth/btnxpuart.c | 39 +- + drivers/bluetooth/btqca.c | 13 +- + drivers/bluetooth/btqca.h | 12 +- + drivers/bluetooth/btrtl.c | 233 +- + drivers/bluetooth/btrtl.h | 13 + + drivers/bluetooth/btusb.c | 366 ++- + drivers/bluetooth/hci_h5.c | 2 +- + drivers/bluetooth/hci_ldisc.c | 3 +- + drivers/bluetooth/hci_nokia.c | 6 +- + drivers/bluetooth/hci_qca.c | 162 +- + drivers/connector/cn_proc.c | 111 +- + drivers/connector/connector.c | 40 +- + drivers/hid/bpf/entrypoints/Makefile | 2 +- + drivers/infiniband/hw/mlx5/cq.c | 2 +- + drivers/infiniband/hw/mlx5/devx.c | 2 +- + drivers/infiniband/hw/mlx5/main.c | 2 +- + drivers/leds/trigger/ledtrig-netdev.c | 10 +- + drivers/net/Kconfig | 2 + + drivers/net/bonding/bond_alb.c | 2 +- + drivers/net/bonding/bond_debugfs.c | 15 +- + drivers/net/bonding/bond_main.c | 138 +- + drivers/net/bonding/bond_sysfs.c | 4 +- + drivers/net/can/Kconfig | 9 +- + drivers/net/can/bxcan.c | 1 - + drivers/net/can/c_can/c_can_platform.c | 4 +- + drivers/net/can/dev/rx-offload.c | 36 +- + drivers/net/can/flexcan/flexcan-core.c | 16 +- + drivers/net/can/grcan.c | 3 +- + drivers/net/can/ifi_canfd/ifi_canfd.c | 1 - + drivers/net/can/kvaser_pciefd.c | 307 +- + drivers/net/can/m_can/m_can.c | 57 +- + drivers/net/can/m_can/m_can.h | 5 +- + drivers/net/can/m_can/m_can_platform.c | 21 +- + drivers/net/can/m_can/tcan4x5x-core.c | 142 +- + drivers/net/can/m_can/tcan4x5x-regmap.c | 1 - + drivers/net/can/rcar/rcar_canfd.c | 1 - + drivers/net/can/sja1000/ems_pci.c | 6 +- + drivers/net/can/sja1000/sja1000_platform.c | 1 - + drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c | 6 +- + drivers/net/can/sun4i_can.c | 23 +- + drivers/net/can/ti_hecc.c | 5 +- + drivers/net/can/usb/Kconfig | 1 + + drivers/net/can/usb/esd_usb.c | 275 +- + drivers/net/can/usb/gs_usb.c | 187 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 13 - + drivers/net/can/usb/peak_usb/pcan_usb_core.h | 2 - + drivers/net/can/usb/ucan.c | 2 +- + drivers/net/can/xilinx_can.c | 25 +- + drivers/net/dsa/Kconfig | 3 +- + drivers/net/dsa/b53/b53_common.c | 6 - + drivers/net/dsa/b53/b53_mdio.c | 1 + + drivers/net/dsa/b53/b53_mmap.c | 1 + + drivers/net/dsa/hirschmann/hellcreek.c | 1 - + drivers/net/dsa/hirschmann/hellcreek_hwtstamp.c | 9 +- + drivers/net/dsa/hirschmann/hellcreek_ptp.c | 1 + + drivers/net/dsa/lan9303-core.c | 7 +- + drivers/net/dsa/microchip/ksz8863_smi.c | 3 + + drivers/net/dsa/microchip/ksz_common.c | 4 +- + drivers/net/dsa/mt7530-mmio.c | 3 +- + drivers/net/dsa/mt7530.c | 6 - + drivers/net/dsa/mv88e6060.c | 45 + + drivers/net/dsa/mv88e6xxx/Makefile | 3 + + drivers/net/dsa/mv88e6xxx/chip.c | 426 +-- + drivers/net/dsa/mv88e6xxx/chip.h | 33 +- + drivers/net/dsa/mv88e6xxx/pcs-6185.c | 190 ++ + drivers/net/dsa/mv88e6xxx/pcs-6352.c | 390 +++ + drivers/net/dsa/mv88e6xxx/pcs-639x.c | 943 +++++++ + drivers/net/dsa/mv88e6xxx/port.c | 30 - + drivers/net/dsa/mv88e6xxx/serdes.c | 1106 +------- + drivers/net/dsa/mv88e6xxx/serdes.h | 108 +- + drivers/net/dsa/ocelot/felix.c | 6 - + drivers/net/dsa/ocelot/felix_vsc9959.c | 9 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 3 +- + drivers/net/dsa/qca/ar9331.c | 2 +- + drivers/net/dsa/qca/qca8k-8xxx.c | 194 +- + drivers/net/dsa/qca/qca8k-common.c | 50 +- + drivers/net/dsa/qca/qca8k-leds.c | 1 + + drivers/net/dsa/qca/qca8k.h | 6 + + drivers/net/dsa/realtek/realtek-mdio.c | 2 +- + drivers/net/dsa/realtek/realtek-smi.c | 1 - + drivers/net/dsa/rzn1_a5psw.c | 240 +- + drivers/net/dsa/rzn1_a5psw.h | 8 +- + drivers/net/dsa/sja1105/sja1105_flower.c | 8 +- + drivers/net/dsa/sja1105/sja1105_main.c | 7 - + drivers/net/dsa/vitesse-vsc73xx-core.c | 1 - + drivers/net/dsa/xrs700x/xrs700x.c | 2 +- + drivers/net/ethernet/8390/ne2k-pci.c | 16 +- + drivers/net/ethernet/adi/adin1110.c | 8 +- + drivers/net/ethernet/aeroflex/greth.c | 4 +- + drivers/net/ethernet/agere/et131x.c | 3 +- + drivers/net/ethernet/alacritech/slicoss.c | 4 +- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 1 + + drivers/net/ethernet/amd/atarilance.c | 2 +- + drivers/net/ethernet/amd/pds_core/auxbus.c | 2 +- + drivers/net/ethernet/amd/sunlance.c | 2 +- + drivers/net/ethernet/apm/xgene-v2/main.h | 1 + + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 6 +- + drivers/net/ethernet/apple/macmace.c | 2 +- + .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 12 +- + .../aquantia/atlantic/hw_atl2/hw_atl2_utils_fw.c | 2 +- + drivers/net/ethernet/arc/emac_main.c | 2 +- + drivers/net/ethernet/atheros/ag71xx.c | 3 +- + drivers/net/ethernet/broadcom/Kconfig | 12 + + drivers/net/ethernet/broadcom/Makefile | 1 + + drivers/net/ethernet/broadcom/asp2/Makefile | 2 + + drivers/net/ethernet/broadcom/asp2/bcmasp.c | 1437 ++++++++++ + drivers/net/ethernet/broadcom/asp2/bcmasp.h | 586 ++++ + .../net/ethernet/broadcom/asp2/bcmasp_ethtool.c | 503 ++++ + drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 1415 ++++++++++ + .../net/ethernet/broadcom/asp2/bcmasp_intf_defs.h | 257 ++ + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 3 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 161 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 3 + + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 26 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h | 3 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 644 +---- + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 6 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 6 +- + drivers/net/ethernet/broadcom/tg3.c | 3 +- + drivers/net/ethernet/brocade/bna/bnad.c | 13 +- + drivers/net/ethernet/cadence/macb_main.c | 1 - + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 18 +- + .../ethernet/chelsio/inline_crypto/chtls/chtls.h | 1 + + drivers/net/ethernet/cirrus/cs89x0.c | 6 +- + drivers/net/ethernet/cortina/gemini.c | 4 +- + drivers/net/ethernet/emulex/benet/be_main.c | 3 - + drivers/net/ethernet/engleder/tsnep.h | 1 + + drivers/net/ethernet/engleder/tsnep_main.c | 3 +- + drivers/net/ethernet/ezchip/nps_enet.c | 5 +- + drivers/net/ethernet/faraday/ftgmac100.c | 16 +- + drivers/net/ethernet/faraday/ftmac100.c | 50 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 12 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.h | 1 + + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 2 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 1 - + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 1 + + .../ethernet/freescale/dpaa2/dpaa2-switch-flower.c | 22 +- + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 1 - + drivers/net/ethernet/freescale/enetc/enetc.h | 1 + + drivers/net/ethernet/freescale/enetc/enetc_ierb.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 8 +- + drivers/net/ethernet/freescale/fec.h | 12 +- + drivers/net/ethernet/freescale/fec_main.c | 114 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 10 +- + drivers/net/ethernet/freescale/fec_mpc52xx_phy.c | 9 +- + drivers/net/ethernet/freescale/fec_ptp.c | 60 +- + drivers/net/ethernet/freescale/fman/fman.c | 1 + + drivers/net/ethernet/freescale/fman/fman_port.c | 1 + + drivers/net/ethernet/freescale/fman/mac.c | 6 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 7 +- + drivers/net/ethernet/freescale/fs_enet/fs_enet.h | 19 +- + drivers/net/ethernet/freescale/fs_enet/mac-fcc.c | 5 +- + drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 15 - + drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 9 +- + .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 10 +- + drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 7 +- + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 7 +- + drivers/net/ethernet/freescale/gianfar.c | 8 +- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 2 + + drivers/net/ethernet/freescale/ucc_geth.c | 9 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 4 +- + drivers/net/ethernet/fungible/funeth/funeth_txrx.h | 1 + + drivers/net/ethernet/google/gve/gve.h | 113 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 89 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 10 + + drivers/net/ethernet/google/gve/gve_desc.h | 4 +- + drivers/net/ethernet/google/gve/gve_main.c | 20 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 126 +- + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 410 ++- + drivers/net/ethernet/hisilicon/hip04_eth.c | 4 +- + drivers/net/ethernet/hisilicon/hisi_femac.c | 4 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 1 - + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 3 - + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 4 - + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 1 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 2 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 2 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 4 - + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 16 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 1 - + drivers/net/ethernet/hisilicon/hns_mdio.c | 10 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 1 + + drivers/net/ethernet/ibm/emac/core.c | 1 + + drivers/net/ethernet/ibm/emac/core.h | 1 - + drivers/net/ethernet/ibm/emac/mal.c | 2 + + drivers/net/ethernet/ibm/emac/rgmii.c | 2 + + drivers/net/ethernet/ibm/emac/tah.c | 2 + + drivers/net/ethernet/ibm/emac/zmii.c | 2 + + drivers/net/ethernet/ibm/ibmvnic.c | 3 +- + drivers/net/ethernet/intel/e1000/e1000.h | 1 - + drivers/net/ethernet/intel/e1000/e1000_hw.h | 3 - + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 49 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 3 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 116 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 20 +- + drivers/net/ethernet/intel/i40e/i40e_ddp.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_diag.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_hmc.c | 21 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 54 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 72 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 52 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 17 - + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_status.h | 43 - + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 + + drivers/net/ethernet/intel/i40e/i40e_type.h | 9 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 244 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 101 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 18 +- + drivers/net/ethernet/intel/ice/Makefile | 2 +- + drivers/net/ethernet/intel/ice/ice.h | 10 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 109 +- + drivers/net/ethernet/intel/ice/ice_base.c | 9 +- + drivers/net/ethernet/intel/ice/ice_common.c | 259 +- + drivers/net/ethernet/intel/ice/ice_common.h | 5 + + drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 50 + + drivers/net/ethernet/intel/ice/ice_eswitch.c | 46 +- + drivers/net/ethernet/intel/ice/ice_eswitch_br.c | 1346 +++++++++ + drivers/net/ethernet/intel/ice/ice_eswitch_br.h | 120 + + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 3 +- + drivers/net/ethernet/intel/ice/ice_lag.c | 1867 ++++++++++++- + drivers/net/ethernet/intel/ice/ice_lag.h | 34 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 47 +- + drivers/net/ethernet/intel/ice/ice_lib.h | 2 + + drivers/net/ethernet/intel/ice/ice_main.c | 82 +- + drivers/net/ethernet/intel/ice/ice_protocol_type.h | 9 +- + drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 3 + + drivers/net/ethernet/intel/ice/ice_repr.c | 2 +- + drivers/net/ethernet/intel/ice/ice_repr.h | 3 +- + drivers/net/ethernet/intel/ice/ice_sched.c | 37 +- + drivers/net/ethernet/intel/ice/ice_sched.h | 21 + + drivers/net/ethernet/intel/ice/ice_switch.c | 249 +- + drivers/net/ethernet/intel/ice/ice_switch.h | 36 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 78 +- + drivers/net/ethernet/intel/ice/ice_trace.h | 90 + + drivers/net/ethernet/intel/ice/ice_type.h | 12 +- + .../net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.c | 186 +- + .../net/ethernet/intel/ice/ice_vf_vsi_vlan_ops.h | 4 + + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 8 +- + drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.c | 84 +- + drivers/net/ethernet/intel/ice/ice_vsi_vlan_lib.h | 8 + + drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.h | 1 + + drivers/net/ethernet/intel/ice/ice_xsk.c | 219 +- + drivers/net/ethernet/intel/igb/igb_main.c | 8 +- + drivers/net/ethernet/intel/igc/igc.h | 1 + + drivers/net/ethernet/intel/igc/igc_main.c | 35 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 6 - + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 1 - + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 - + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 3 - + drivers/net/ethernet/korina.c | 2 +- + drivers/net/ethernet/marvell/mvmdio.c | 4 +- + drivers/net/ethernet/marvell/mvneta.c | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 10 - + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- + .../ethernet/marvell/octeon_ep/octep_cp_version.h | 11 + + .../ethernet/marvell/octeon_ep/octep_ctrl_mbox.c | 9 +- + .../ethernet/marvell/octeon_ep/octep_ctrl_mbox.h | 6 + + .../ethernet/marvell/octeon_ep/octep_ctrl_net.c | 37 +- + .../ethernet/marvell/octeon_ep/octep_ctrl_net.h | 4 + + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 26 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 14 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 4 + + drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 4 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 5 +- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 9 + + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 35 +- + .../ethernet/marvell/octeontx2/af/rvu_npc_hash.c | 20 +- + .../net/ethernet/marvell/octeontx2/af/rvu_switch.c | 6 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 23 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 21 +- + .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 1 - + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 1 + + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 2 + + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 3 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 470 +++- + drivers/net/ethernet/marvell/octeontx2/nic/qos.c | 408 ++- + drivers/net/ethernet/marvell/octeontx2/nic/qos.h | 11 +- + .../ethernet/marvell/prestera/prestera_flower.c | 20 +- + .../net/ethernet/marvell/prestera/prestera_rxtx.c | 3 - + drivers/net/ethernet/marvell/sky2.c | 1 - + drivers/net/ethernet/mediatek/mtk_eth_path.c | 36 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 508 ++-- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 330 ++- + drivers/net/ethernet/mediatek/mtk_ppe.c | 56 +- + drivers/net/ethernet/mediatek/mtk_ppe.h | 22 +- + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 2 +- + drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 2 + + drivers/net/ethernet/mediatek/mtk_star_emac.c | 1 - + drivers/net/ethernet/mediatek/mtk_wed.c | 5 +- + drivers/net/ethernet/mediatek/mtk_wed_wo.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 243 +- + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 34 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 5 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 4 +- + .../ethernet/mellanox/mlx5/core/en/rep/bridge.c | 4 + + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 17 +- + .../net/ethernet/mellanox/mlx5/core/en/rx_res.c | 25 +- + .../net/ethernet/mellanox/mlx5/core/en/rx_res.h | 7 +- + .../ethernet/mellanox/mlx5/core/en/tc/ct_fs_smfs.c | 25 +- + drivers/net/ethernet/mellanox/mlx5/core/en/trap.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 1 + + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 29 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 77 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 785 ++++-- + .../mellanox/mlx5/core/en_accel/ipsec_offload.c | 11 +- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 25 +- + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 6 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 6 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 37 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 136 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 370 +-- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 22 +- + .../ethernet/mellanox/mlx5/core/esw/bridge_mcast.c | 17 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 12 +- + .../net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c | 325 +++ + .../net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.h | 67 + + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 35 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 273 +- + .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/fpga/core.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/hwmon.c | 418 +++ + drivers/net/ethernet/mellanox/mlx5/core/hwmon.h | 24 + + .../net/ethernet/mellanox/mlx5/core/irq_affinity.c | 78 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/lib/devcom.c | 490 ++-- + .../net/ethernet/mellanox/mlx5/core/lib/devcom.h | 64 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/lib/hv_vhca.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 35 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 3 + + drivers/net/ethernet/mellanox/mlx5/core/mlx5_irq.h | 26 +- + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 60 +- + drivers/net/ethernet/mellanox/mlx5/core/port.c | 2 +- + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/thermal.c | 114 - + drivers/net/ethernet/mellanox/mlx5/core/thermal.h | 20 - + .../net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h | 3 - + drivers/net/ethernet/mellanox/mlxsw/Makefile | 2 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 40 + + .../mellanox/mlxsw/core_acl_flex_actions.h | 2 + + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 1 + + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 1 + + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 45 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 166 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 368 ++- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 37 +- + .../ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 20 +- + .../mellanox/mlxsw/spectrum_acl_flex_keys.c | 3 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 10 - + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 98 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 7 +- + .../ethernet/mellanox/mlxsw/spectrum_port_range.c | 200 ++ + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 626 ++++- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 11 + + .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 5 - + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 193 +- + .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 1 + + .../net/ethernet/microchip/lan966x/lan966x_main.c | 65 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 15 +- + .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 34 +- + .../ethernet/microchip/lan966x/lan966x_tc_flower.c | 4 +- + .../net/ethernet/microchip/sparx5/sparx5_main.h | 9 +- + .../net/ethernet/microchip/sparx5/sparx5_netdev.c | 35 +- + drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 24 +- + .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 4 +- + drivers/net/ethernet/microchip/vcap/vcap_api.c | 2 +- + drivers/net/ethernet/microchip/vcap/vcap_tc.c | 18 +- + drivers/net/ethernet/microchip/vcap/vcap_tc.h | 2 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 35 +- + drivers/net/ethernet/microsoft/mana/hw_channel.c | 24 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 142 +- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 15 + + drivers/net/ethernet/mscc/ocelot_fdma.c | 1 - + drivers/net/ethernet/mscc/ocelot_flower.c | 28 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 3 +- + drivers/net/ethernet/neterion/s2io.c | 17 +- + .../net/ethernet/netronome/nfp/flower/conntrack.c | 43 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 64 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 57 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 1 + + drivers/net/ethernet/ni/nixge.c | 5 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 212 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 70 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 5 + + drivers/net/ethernet/qlogic/qede/qede_filter.c | 12 +- + drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 2 + + drivers/net/ethernet/qualcomm/emac/emac.c | 1 - + drivers/net/ethernet/qualcomm/qca_spi.c | 1 - + drivers/net/ethernet/qualcomm/qca_uart.c | 1 - + drivers/net/ethernet/renesas/ravb_main.c | 3 +- + drivers/net/ethernet/renesas/rswitch.c | 32 +- + drivers/net/ethernet/renesas/rswitch.h | 1 + + drivers/net/ethernet/renesas/sh_eth.c | 2 - + drivers/net/ethernet/sfc/Makefile | 2 +- + drivers/net/ethernet/sfc/bitfield.h | 2 + + drivers/net/ethernet/sfc/ef10.c | 4 +- + drivers/net/ethernet/sfc/ef100_nic.c | 2 +- + drivers/net/ethernet/sfc/ef100_tx.c | 6 +- + drivers/net/ethernet/sfc/ef10_sriov.h | 2 - + drivers/net/ethernet/sfc/efx.c | 1 - + drivers/net/ethernet/sfc/efx.h | 2 - + drivers/net/ethernet/sfc/efx_channels.c | 30 +- + drivers/net/ethernet/sfc/efx_common.c | 7 - + drivers/net/ethernet/sfc/farch_regs.h | 2929 -------------------- + drivers/net/ethernet/sfc/filter.h | 7 - + drivers/net/ethernet/sfc/io.h | 84 +- + drivers/net/ethernet/sfc/mae.c | 827 +++++- + drivers/net/ethernet/sfc/mae.h | 12 + + drivers/net/ethernet/sfc/mcdi.c | 7 - + drivers/net/ethernet/sfc/mcdi.h | 14 + + drivers/net/ethernet/sfc/mcdi_functions.c | 24 +- + drivers/net/ethernet/sfc/mcdi_port_common.c | 5 - + drivers/net/ethernet/sfc/net_driver.h | 63 +- + drivers/net/ethernet/sfc/nic.c | 158 -- + drivers/net/ethernet/sfc/nic.h | 178 -- + drivers/net/ethernet/sfc/nic_common.h | 13 +- + drivers/net/ethernet/sfc/ptp.c | 227 +- + drivers/net/ethernet/sfc/selftest.c | 7 +- + drivers/net/ethernet/sfc/tc.c | 600 +++- + drivers/net/ethernet/sfc/tc.h | 86 +- + drivers/net/ethernet/sfc/tc_conntrack.c | 533 ++++ + drivers/net/ethernet/sfc/tc_conntrack.h | 55 + + drivers/net/ethernet/sfc/tc_counters.c | 8 +- + drivers/net/ethernet/sfc/tc_counters.h | 4 + + drivers/net/ethernet/sfc/tx.c | 45 +- + drivers/net/ethernet/sfc/tx_tso.c | 2 +- + drivers/net/ethernet/sfc/vfdi.h | 252 -- + drivers/net/ethernet/sfc/workarounds.h | 7 - + drivers/net/ethernet/smsc/smsc911x.c | 5 +- + drivers/net/ethernet/smsc/smsc9420.c | 7 +- + drivers/net/ethernet/socionext/netsec.c | 2 +- + drivers/net/ethernet/socionext/sni_ave.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 - + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 - + drivers/net/ethernet/stmicro/stmmac/common.h | 42 +- + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 51 +- + .../net/ethernet/stmicro/stmmac/dwmac-ingenic.c | 1 - + .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 26 +- + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c | 245 -- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 57 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 4 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 1 - + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 17 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c | 6 +- + .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 16 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 15 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 12 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 18 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 34 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_descs.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 30 +- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 20 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 15 +- + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 15 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 5 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 123 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 47 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 284 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 36 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 11 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 6 + + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 6 +- + drivers/net/ethernet/sun/ldmvsw.c | 3 +- + drivers/net/ethernet/sun/niu.c | 2 +- + drivers/net/ethernet/sun/sunbmac.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 1 + + drivers/net/ethernet/sun/sunhme.c | 3 +- + drivers/net/ethernet/sun/sunqe.c | 2 +- + drivers/net/ethernet/ti/Kconfig | 13 + + drivers/net/ethernet/ti/Makefile | 10 + + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 1 + + drivers/net/ethernet/ti/am65-cpsw-qos.c | 6 +- + drivers/net/ethernet/ti/cpsw-common.c | 1 - + drivers/net/ethernet/ti/cpsw-phy-sel.c | 1 - + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/ethernet/ti/cpsw_new.c | 2 +- + drivers/net/ethernet/ti/cpsw_priv.c | 8 +- + drivers/net/ethernet/ti/cpsw_priv.h | 1 + + drivers/net/ethernet/ti/davinci_mdio.c | 1 - + drivers/net/ethernet/ti/icssg/icssg_classifier.c | 367 +++ + drivers/net/ethernet/ti/icssg/icssg_config.c | 450 +++ + drivers/net/ethernet/ti/icssg/icssg_config.h | 200 ++ + drivers/net/ethernet/ti/icssg/icssg_ethtool.c | 188 ++ + drivers/net/ethernet/ti/icssg/icssg_mii_cfg.c | 120 + + drivers/net/ethernet/ti/icssg/icssg_mii_rt.h | 151 + + drivers/net/ethernet/ti/icssg/icssg_prueth.c | 1897 +++++++++++++ + drivers/net/ethernet/ti/icssg/icssg_prueth.h | 262 ++ + drivers/net/ethernet/ti/icssg/icssg_queues.c | 50 + + drivers/net/ethernet/ti/icssg/icssg_stats.c | 57 + + drivers/net/ethernet/ti/icssg/icssg_stats.h | 158 ++ + drivers/net/ethernet/ti/icssg/icssg_switch_map.h | 234 ++ + drivers/net/ethernet/toshiba/tc35815.c | 3 +- + drivers/net/ethernet/via/via-rhine.c | 2 +- + drivers/net/ethernet/via/via-velocity.c | 2 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 68 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 2 +- + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 2 +- + drivers/net/ethernet/wangxun/libwx/wx_type.h | 6 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c | 35 + + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 64 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c | 4 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 8 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 12 +- + drivers/net/ethernet/xilinx/ll_temac.h | 1 + + drivers/net/ethernet/xilinx/ll_temac_main.c | 4 +- + drivers/net/ethernet/xilinx/ll_temac_mdio.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 3 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 +- + drivers/net/gtp.c | 3 +- + drivers/net/hyperv/hyperv_net.h | 1 + + drivers/net/ieee802154/ca8210.c | 1 - + drivers/net/ipa/ipa_main.c | 2 +- + drivers/net/macsec.c | 17 +- + drivers/net/macvlan.c | 34 +- + drivers/net/mdio/mdio-bcm-unimac.c | 2 + + drivers/net/mdio/mdio-xgene.c | 4 +- + drivers/net/mhi_net.c | 1 - + drivers/net/netconsole.c | 115 +- + drivers/net/netdevsim/Makefile | 4 + + drivers/net/netdevsim/ethtool.c | 11 + + drivers/net/netdevsim/macsec.c | 356 +++ + drivers/net/netdevsim/netdev.c | 41 +- + drivers/net/netdevsim/netdevsim.h | 36 + + drivers/net/pcs/pcs-lynx.c | 2 +- + drivers/net/pcs/pcs-rzn1-miic.c | 1 + + drivers/net/phy/Kconfig | 9 +- + drivers/net/phy/Makefile | 3 + + drivers/net/phy/at803x.c | 139 +- + drivers/net/phy/bcm7xxx.c | 1 + + drivers/net/phy/marvell-88q2xxx.c | 263 ++ + drivers/net/phy/marvell-88x2222.c | 1 - + drivers/net/phy/marvell.c | 281 ++ + drivers/net/phy/mdio_bus.c | 37 +- + drivers/net/phy/mediatek-ge-soc.c | 2 - + drivers/net/phy/motorcomm.c | 118 + + drivers/net/phy/nxp-c45-tja11xx.c | 1136 ++++++-- + drivers/net/phy/phy-c45.c | 63 +- + drivers/net/phy/phy-core.c | 2 + + drivers/net/phy/phy.c | 34 + + drivers/net/phy/phy_device.c | 96 +- + drivers/net/phy/phylink.c | 185 +- + drivers/net/phy/sfp.c | 3 + + drivers/net/phy/sfp.h | 1 - + drivers/net/phy/smsc.c | 252 +- + drivers/net/phy/stubs.c | 10 + + drivers/net/ppp/pppoe.c | 4 +- + drivers/net/ppp/pptp.c | 8 +- + drivers/net/tap.c | 5 +- + drivers/net/team/team.c | 65 +- + drivers/net/team/team_mode_activebackup.c | 8 +- + drivers/net/team/team_mode_broadcast.c | 1 - + drivers/net/team/team_mode_loadbalance.c | 50 +- + drivers/net/team/team_mode_roundrobin.c | 1 - + drivers/net/tun.c | 9 +- + drivers/net/usb/r8152.c | 104 +- + drivers/net/veth.c | 2 +- + drivers/net/virtio_net.c | 188 +- + drivers/net/vmxnet3/Makefile | 2 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 236 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 23 + + drivers/net/vmxnet3/vmxnet3_int.h | 43 +- + drivers/net/vmxnet3/vmxnet3_xdp.c | 419 +++ + drivers/net/vmxnet3/vmxnet3_xdp.h | 47 + + drivers/net/vxlan/vxlan_core.c | 57 +- + drivers/net/wireless/ath/ath10k/ahb.c | 2 +- + drivers/net/wireless/ath/ath11k/ahb.c | 29 +- + drivers/net/wireless/ath/ath11k/core.c | 38 +- + drivers/net/wireless/ath/ath11k/core.h | 1 + + drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +- + drivers/net/wireless/ath/ath11k/hw.h | 3 +- + drivers/net/wireless/ath/ath11k/mac.c | 4 +- + drivers/net/wireless/ath/ath11k/pci.c | 2 + + drivers/net/wireless/ath/ath11k/qmi.c | 35 +- + drivers/net/wireless/ath/ath11k/qmi.h | 3 +- + drivers/net/wireless/ath/ath12k/core.h | 34 + + drivers/net/wireless/ath/ath12k/dp_rx.c | 11 +- + drivers/net/wireless/ath/ath12k/dp_tx.c | 8 +- + drivers/net/wireless/ath/ath12k/mac.c | 589 +++- + drivers/net/wireless/ath/ath12k/mac.h | 2 +- + drivers/net/wireless/ath/ath12k/qmi.c | 2 +- + drivers/net/wireless/ath/ath12k/wmi.c | 260 +- + drivers/net/wireless/ath/ath12k/wmi.h | 119 +- + drivers/net/wireless/ath/ath5k/debug.c | 2 - + drivers/net/wireless/ath/ath6kl/debug.c | 2 - + drivers/net/wireless/ath/ath9k/ahb.c | 4 +- + drivers/net/wireless/ath/ath9k/mac.h | 6 +- + drivers/net/wireless/ath/ath9k/pci.c | 4 +- + drivers/net/wireless/ath/ath9k/xmit.c | 6 +- + drivers/net/wireless/ath/wcn36xx/main.c | 3 +- + drivers/net/wireless/ath/wil6210/txrx.c | 2 +- + drivers/net/wireless/ath/wil6210/txrx.h | 6 +- + drivers/net/wireless/ath/wil6210/txrx_edma.c | 2 +- + drivers/net/wireless/ath/wil6210/txrx_edma.h | 6 +- + .../wireless/broadcom/brcm80211/brcmsmac/aiutils.h | 8 - + .../wireless/broadcom/brcm80211/brcmsmac/ampdu.c | 6 - + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 8 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 2 - + .../broadcom/brcm80211/brcmsmac/phy/phy_hal.h | 5 - + .../net/wireless/broadcom/brcm80211/brcmsmac/pub.h | 2 +- + .../net/wireless/broadcom/brcm80211/brcmsmac/scb.h | 14 - + .../wireless/broadcom/brcm80211/brcmsmac/types.h | 9 - + drivers/net/wireless/intersil/orinoco/airport.c | 2 +- + drivers/net/wireless/marvell/libertas/if_sdio.c | 73 +- + drivers/net/wireless/marvell/libertas/if_spi.c | 20 +- + drivers/net/wireless/marvell/libertas/mesh.c | 51 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 1 + + drivers/net/wireless/marvell/mwifiex/main.c | 11 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 25 +- + drivers/net/wireless/marvell/mwifiex/sta_rx.c | 11 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 9 +- + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 19 + + drivers/net/wireless/marvell/mwifiex/util.c | 10 +- + drivers/net/wireless/mediatek/mt76/Kconfig | 8 + + drivers/net/wireless/mediatek/mt76/Makefile | 10 +- + drivers/net/wireless/mediatek/mt76/dma.c | 6 + + drivers/net/wireless/mediatek/mt76/eeprom.c | 89 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 107 +- + drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7603/init.c | 2 - + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 43 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 25 +- + drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h | 6 +- + drivers/net/wireless/mediatek/mt76/mt7603/regs.h | 7 + + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 31 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 49 +- + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 4 - + .../wireless/mediatek/mt76/mt7615/mt7615_trace.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 9 + + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 18 + + .../net/wireless/mediatek/mt76/mt76_connac2_mac.h | 2 +- + .../net/wireless/mediatek/mt76/mt76_connac3_mac.c | 182 ++ + .../net/wireless/mediatek/mt76/mt76_connac3_mac.h | 339 +++ + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 106 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt76x02_trace.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/Kconfig | 6 +- + drivers/net/wireless/mediatek/mt76/mt7915/Makefile | 2 +- + .../net/wireless/mediatek/mt76/mt7915/coredump.c | 7 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 124 +- + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 152 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 20 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 194 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.h | 7 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 233 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 151 +- + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 47 +- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 100 +- + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 16 +- + drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 163 +- + drivers/net/wireless/mediatek/mt76/mt7921/Kconfig | 4 +- + drivers/net/wireless/mediatek/mt76/mt7921/Makefile | 9 +- + .../net/wireless/mediatek/mt76/mt7921/acpi_sar.h | 105 - + .../net/wireless/mediatek/mt76/mt7921/debugfs.c | 228 +- + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 343 +-- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 554 +--- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 806 ++---- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 230 +- + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 355 +-- + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 225 +- + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 34 +- + .../net/wireless/mediatek/mt76/mt7921/pci_mcu.c | 71 +- + drivers/net/wireless/mediatek/mt76/mt7921/regs.h | 465 +--- + drivers/net/wireless/mediatek/mt76/mt7921/sdio.c | 32 +- + .../net/wireless/mediatek/mt76/mt7921/sdio_mac.c | 6 +- + .../net/wireless/mediatek/mt76/mt7921/sdio_mcu.c | 14 +- + .../net/wireless/mediatek/mt76/mt7921/testmode.c | 10 +- + drivers/net/wireless/mediatek/mt76/mt7921/trace.c | 12 - + drivers/net/wireless/mediatek/mt76/mt7921/usb.c | 207 +- + .../net/wireless/mediatek/mt76/mt7921/usb_mac.c | 255 -- + drivers/net/wireless/mediatek/mt76/mt792x.h | 367 +++ + .../mt76/{mt7921/acpi_sar.c => mt792x_acpi_sar.c} | 128 +- + .../net/wireless/mediatek/mt76/mt792x_acpi_sar.h | 105 + + drivers/net/wireless/mediatek/mt76/mt792x_core.c | 844 ++++++ + .../net/wireless/mediatek/mt76/mt792x_debugfs.c | 168 ++ + .../mediatek/mt76/{mt7921/dma.c => mt792x_dma.c} | 476 ++-- + drivers/net/wireless/mediatek/mt76/mt792x_mac.c | 385 +++ + drivers/net/wireless/mediatek/mt76/mt792x_regs.h | 479 ++++ + drivers/net/wireless/mediatek/mt76/mt792x_trace.c | 14 + + .../mt76/{mt7921/mt7921_trace.h => mt792x_trace.h} | 16 +- + drivers/net/wireless/mediatek/mt76/mt792x_usb.c | 309 +++ + .../net/wireless/mediatek/mt76/mt7996/debugfs.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 83 +- + drivers/net/wireless/mediatek/mt76/mt7996/init.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 300 +- + drivers/net/wireless/mediatek/mt76/mt7996/mac.h | 315 +-- + drivers/net/wireless/mediatek/mt76/mt7996/main.c | 114 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 182 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 17 + + drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 94 +- + drivers/net/wireless/mediatek/mt76/mt7996/pci.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7996/regs.h | 25 +- + drivers/net/wireless/mediatek/mt76/testmode.c | 1 + + drivers/net/wireless/mediatek/mt76/trace.h | 2 +- + drivers/net/wireless/mediatek/mt76/tx.c | 16 +- + drivers/net/wireless/mediatek/mt76/usb_trace.h | 2 +- + drivers/net/wireless/microchip/wilc1000/sdio.c | 103 +- + drivers/net/wireless/microchip/wilc1000/spi.c | 150 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 2 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192f.c | 2 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8710b.c | 2 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 2 + + drivers/net/wireless/realtek/rtw88/fw.c | 2 +- + drivers/net/wireless/realtek/rtw88/main.c | 13 +- + drivers/net/wireless/realtek/rtw88/main.h | 9 - + drivers/net/wireless/realtek/rtw88/ps.c | 6 +- + drivers/net/wireless/realtek/rtw88/tx.c | 2 - + drivers/net/wireless/realtek/rtw88/usb.c | 18 - + drivers/net/wireless/realtek/rtw88/usb.h | 7 - + drivers/net/wireless/realtek/rtw88/util.c | 7 +- + drivers/net/wireless/realtek/rtw88/util.h | 3 +- + drivers/net/wireless/realtek/rtw89/core.c | 32 +- + drivers/net/wireless/realtek/rtw89/core.h | 246 +- + drivers/net/wireless/realtek/rtw89/debug.c | 57 +- + drivers/net/wireless/realtek/rtw89/fw.c | 664 ++++- + drivers/net/wireless/realtek/rtw89/fw.h | 368 +-- + drivers/net/wireless/realtek/rtw89/mac.c | 3 +- + drivers/net/wireless/realtek/rtw89/phy.c | 108 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 2 + + drivers/net/wireless/realtek/rtw89/txrx.h | 47 +- + drivers/net/wireless/silabs/wfx/bus_sdio.c | 2 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 2 +- + drivers/net/wwan/t7xx/t7xx_hif_cldma.c | 17 +- + drivers/net/wwan/t7xx/t7xx_hif_cldma.h | 2 +- + drivers/net/wwan/t7xx/t7xx_mhccif.h | 1 + + drivers/net/wwan/t7xx/t7xx_modem_ops.c | 76 +- + drivers/net/wwan/t7xx/t7xx_modem_ops.h | 2 + + drivers/net/wwan/t7xx/t7xx_port.h | 6 +- + drivers/net/wwan/t7xx/t7xx_port_ctrl_msg.c | 8 +- + drivers/net/wwan/t7xx/t7xx_port_proxy.c | 18 +- + drivers/net/wwan/t7xx/t7xx_reg.h | 2 +- + drivers/net/wwan/t7xx/t7xx_state_monitor.c | 13 +- + drivers/net/wwan/t7xx/t7xx_state_monitor.h | 2 + + drivers/net/xen-netfront.c | 2 +- + drivers/ptp/Kconfig | 11 + + drivers/ptp/Makefile | 1 + + drivers/ptp/ptp_mock.c | 175 ++ + drivers/ptp/ptp_qoriq.c | 2 +- + drivers/s390/net/Kconfig | 5 +- + drivers/s390/net/lcs.c | 39 +- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 2 +- + drivers/vfio/pci/mlx5/cmd.c | 4 +- + drivers/w1/w1_netlink.c | 6 +- + include/linux/bpf-cgroup.h | 4 +- + include/linux/bpf.h | 63 +- + include/linux/bpf_mem_alloc.h | 2 + + include/linux/bpf_mprog.h | 343 +++ + include/linux/brcmphy.h | 1 + + include/linux/btf.h | 2 - + include/linux/btf_ids.h | 1 + + include/linux/can/rx-offload.h | 11 +- + include/linux/connector.h | 8 +- + include/linux/filter.h | 39 +- + include/linux/fs_enet_pd.h | 165 -- + include/linux/icmpv6.h | 10 +- + include/linux/if_team.h | 4 +- + include/linux/if_vlan.h | 6 +- + include/linux/ipv6.h | 16 +- + include/linux/lockdep.h | 7 + + include/linux/lsm_hook_defs.h | 2 +- + include/linux/marvell_phy.h | 1 + + include/linux/mdio.h | 26 + + include/linux/mlx5/driver.h | 39 +- + include/linux/mlx5/eswitch.h | 3 + + include/linux/mlx5/fs.h | 2 + + include/linux/mlx5/mlx5_ifc.h | 21 +- + include/linux/net.h | 2 +- + include/linux/net_tstamp.h | 30 + + include/linux/netdevice.h | 108 +- + include/linux/netfilter.h | 10 + + include/linux/netfilter/nf_conntrack_h323.h | 4 - + include/linux/netfilter/nf_conntrack_proto_gre.h | 1 - + include/linux/netlink.h | 6 + + include/linux/phy.h | 49 +- + include/linux/phylib_stubs.h | 68 + + include/linux/phylink.h | 86 +- + include/linux/ptp_mock.h | 38 + + include/linux/rcutiny.h | 2 + + include/linux/rcutree.h | 1 + + include/linux/security.h | 5 +- + include/linux/skbuff.h | 21 +- + include/linux/smscphy.h | 34 + + include/linux/stmmac.h | 33 +- + include/linux/tcp.h | 6 +- + include/linux/trace_events.h | 3 +- + include/net/Space.h | 7 - + include/net/af_vsock.h | 2 - + include/net/bluetooth/bluetooth.h | 11 +- + include/net/bluetooth/hci.h | 11 + + include/net/bluetooth/hci_core.h | 99 +- + include/net/bluetooth/hci_sync.h | 5 +- + include/net/bluetooth/mgmt.h | 2 + + include/net/bluetooth/sco.h | 2 - + include/net/bond_3ad.h | 1 - + include/net/busy_poll.h | 1 + + include/net/caif/cfsrvl.h | 3 - + include/net/datalink.h | 2 - + include/net/devlink.h | 5 - + include/net/dropreason-core.h | 3 + + include/net/dropreason.h | 6 + + include/net/dsa.h | 3 - + include/net/flow_dissector.h | 14 +- + include/net/flow_offload.h | 6 + + include/net/fq.h | 5 - + include/net/handshake.h | 5 + + include/net/ila.h | 16 - + include/net/inet6_hashtables.h | 79 +- + include/net/inet_common.h | 2 + + include/net/inet_connection_sock.h | 3 +- + include/net/inet_hashtables.h | 76 +- + include/net/ip6_route.h | 2 +- + include/net/ip_tunnels.h | 1 + + include/net/ipv6.h | 1 + + include/net/llc_c_ac.h | 1 - + include/net/llc_c_ev.h | 1 - + include/net/mana/gdma.h | 20 +- + include/net/mana/hw_channel.h | 5 + + include/net/mana/mana.h | 92 + + include/net/ndisc.h | 3 - + include/net/neighbour.h | 2 - + include/net/net_namespace.h | 4 +- + include/net/netdev_rx_queue.h | 53 + + include/net/netfilter/nf_conntrack.h | 4 - + include/net/netfilter/nf_conntrack_acct.h | 2 - + include/net/netfilter/nf_conntrack_expect.h | 2 +- + include/net/netfilter/nf_conntrack_helper.h | 3 - + include/net/netfilter/nf_conntrack_labels.h | 1 - + include/net/netlink.h | 10 +- + include/net/netns/ipv4.h | 2 +- + include/net/netns/nftables.h | 2 - + include/net/p8022.h | 3 - + include/net/page_pool.h | 402 --- + include/net/page_pool/helpers.h | 238 ++ + include/net/page_pool/types.h | 236 ++ + include/net/pkt_cls.h | 14 +- + include/net/route.h | 6 +- + include/net/sch_generic.h | 28 +- + include/net/sctp/sctp.h | 2 - + include/net/sctp/sm.h | 3 - + include/net/sctp/structs.h | 2 - + include/net/sock.h | 8 +- + include/net/switchdev.h | 12 +- + include/net/tcp.h | 39 +- + include/net/tcx.h | 206 ++ + include/net/tls.h | 4 - + include/net/tls_prot.h | 68 + + include/net/transp_v6.h | 2 - + include/net/udp.h | 4 - + include/net/udplite.h | 2 - + include/net/xdp.h | 29 +- + include/net/xdp_sock.h | 7 + + include/net/xdp_sock_drv.h | 54 + + include/net/xsk_buff_pool.h | 7 + + include/trace/events/handshake.h | 160 ++ + include/trace/events/page_pool.h | 2 +- + include/trace/events/xdp.h | 18 + + include/uapi/linux/bpf.h | 128 +- + include/uapi/linux/cn_proc.h | 62 +- + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/if_xdp.h | 13 + + include/uapi/linux/ipv6.h | 1 + + include/uapi/linux/mdio.h | 18 +- + include/uapi/linux/netdev.h | 4 +- + include/uapi/linux/openvswitch.h | 2 + + include/uapi/linux/pkt_cls.h | 3 + + include/uapi/linux/virtio_net.h | 14 + + kernel/bpf/Kconfig | 1 + + kernel/bpf/Makefile | 3 +- + kernel/bpf/bpf_lru_list.h | 1 - + kernel/bpf/bpf_struct_ops.c | 6 +- + kernel/bpf/btf.c | 25 +- + kernel/bpf/core.c | 206 +- + kernel/bpf/cpumap.c | 3 - + kernel/bpf/cpumask.c | 20 +- + kernel/bpf/devmap.c | 2 - + kernel/bpf/disasm.c | 58 +- + kernel/bpf/hashtab.c | 22 +- + kernel/bpf/helpers.c | 57 +- + kernel/bpf/map_iter.c | 42 +- + kernel/bpf/memalloc.c | 388 ++- + kernel/bpf/mprog.c | 447 +++ + kernel/bpf/offload.c | 1 + + kernel/bpf/preload/iterators/Makefile | 2 +- + kernel/bpf/preload/iterators/iterators.bpf.c | 9 +- + .../iterators/iterators.lskel-little-endian.h | 526 ++-- + kernel/bpf/ringbuf.c | 26 +- + kernel/bpf/syscall.c | 262 +- + kernel/bpf/tcx.c | 352 +++ + kernel/bpf/verifier.c | 420 ++- + kernel/rcu/rcu.h | 2 - + kernel/trace/bpf_trace.c | 71 +- + kernel/trace/trace_kprobe.c | 13 +- + kernel/trace/trace_probe.h | 5 + + kernel/trace/trace_syscalls.c | 12 +- + kernel/trace/trace_uprobe.c | 10 +- + lib/nlattr.c | 6 + + lib/test_bpf.c | 12 +- + lib/ts_bm.c | 39 +- + net/8021q/vlan_dev.c | 27 +- + net/9p/trans_fd.c | 4 +- + net/Kconfig | 5 + + net/bluetooth/af_bluetooth.c | 53 +- + net/bluetooth/amp.h | 1 - + net/bluetooth/bnep/sock.c | 10 +- + net/bluetooth/coredump.c | 3 +- + net/bluetooth/hci_conn.c | 698 +++-- + net/bluetooth/hci_core.c | 34 +- + net/bluetooth/hci_debugfs.c | 3 +- + net/bluetooth/hci_event.c | 209 +- + net/bluetooth/hci_request.c | 21 - + net/bluetooth/hci_sock.c | 77 +- + net/bluetooth/hci_sync.c | 263 +- + net/bluetooth/hidp/sock.c | 10 +- + net/bluetooth/iso.c | 134 +- + net/bluetooth/l2cap_sock.c | 29 +- + net/bluetooth/mgmt.c | 27 +- + net/bluetooth/msft.c | 414 ++- + net/bluetooth/rfcomm/sock.c | 13 +- + net/bluetooth/sco.c | 32 +- + net/bpf/test_run.c | 21 +- + net/bridge/br.c | 8 + + net/bridge/br_forward.c | 1 + + net/bridge/br_netlink.c | 12 + + net/bridge/br_private.h | 20 +- + net/bridge/br_switchdev.c | 15 +- + net/bridge/br_vlan_tunnel.c | 15 + + net/core/dev.c | 390 ++- + net/core/dev_ioctl.c | 187 +- + net/core/filter.c | 15 +- + net/core/flow_dissector.c | 55 +- + net/core/flow_offload.c | 7 + + net/core/net-sysfs.c | 1 + + net/core/netdev-genl.c | 45 +- + net/core/of_net.c | 1 + + net/core/page_pool.c | 87 +- + net/core/rtnetlink.c | 11 +- + net/core/scm.c | 3 +- + net/core/skbuff.c | 107 +- + net/core/skmsg.c | 8 +- + net/core/sock.c | 43 +- + net/core/xdp.c | 2 +- + net/dccp/feat.h | 1 - + net/dccp/ipv4.c | 3 +- + net/dccp/ipv6.c | 1 + + net/dccp/ipv6.h | 4 - + net/devlink/Makefile | 2 +- + net/devlink/dev.c | 51 +- + net/devlink/devl_internal.h | 54 +- + net/devlink/health.c | 40 +- + net/devlink/leftover.c | 443 ++- + net/devlink/netlink.c | 129 +- + net/devlink/netlink_gen.c | 481 ++++ + net/devlink/netlink_gen.h | 79 + + net/dsa/port.c | 53 +- + net/dsa/slave.c | 9 +- + net/dsa/tag_qca.c | 8 +- + net/ethtool/common.c | 3 +- + net/ethtool/ioctl.c | 91 +- + net/ethtool/netlink.c | 59 +- + net/ethtool/tunnels.c | 73 +- + net/handshake/Makefile | 2 +- + net/handshake/alert.c | 110 + + net/handshake/handshake.h | 6 + + net/handshake/tlshd.c | 23 + + net/handshake/trace.c | 2 + + net/hsr/hsr_netlink.h | 2 - + net/ipv4/af_inet.c | 46 +- + net/ipv4/bpf_tcp_ca.c | 2 - + net/ipv4/inet_hashtables.c | 66 +- + net/ipv4/ip_output.c | 2 +- + net/ipv4/netfilter/nf_defrag_ipv4.c | 17 +- + net/ipv4/nexthop.c | 61 +- + net/ipv4/tcp.c | 101 +- + net/ipv4/tcp_input.c | 67 +- + net/ipv4/tcp_ipv4.c | 3 + + net/ipv4/tcp_metrics.c | 19 +- + net/ipv4/tcp_minisocks.c | 4 +- + net/ipv4/tcp_output.c | 19 +- + net/ipv4/tcp_timer.c | 89 +- + net/ipv4/udp.c | 90 +- + net/ipv6/addrconf.c | 90 +- + net/ipv6/af_inet6.c | 14 +- + net/ipv6/anycast.c | 2 +- + net/ipv6/datagram.c | 7 +- + net/ipv6/exthdrs.c | 7 +- + net/ipv6/icmp.c | 6 +- + net/ipv6/ila/ila_main.c | 1 - + net/ipv6/ila/ila_xlat.c | 1 - + net/ipv6/inet6_hashtables.c | 69 +- + net/ipv6/ip6_output.c | 11 +- + net/ipv6/ipv6_sockglue.c | 8 +- + net/ipv6/mcast.c | 8 +- + net/ipv6/ndisc.c | 17 +- + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 11 + + net/ipv6/ping.c | 1 + + net/ipv6/raw.c | 1 + + net/ipv6/route.c | 5 +- + net/ipv6/rpl_iptunnel.c | 3 +- + net/ipv6/tcp_ipv6.c | 1 + + net/ipv6/udp.c | 97 +- + net/ipv6/udplite.c | 1 + + net/key/af_key.c | 1 - + net/l2tp/l2tp_ip6.c | 4 +- + net/llc/llc_conn.c | 11 +- + net/mptcp/pm_netlink.c | 30 +- + net/mptcp/protocol.c | 214 +- + net/mptcp/protocol.h | 23 +- + net/mptcp/sockopt.c | 65 +- + net/mptcp/subflow.c | 2 +- + net/netfilter/core.c | 6 + + net/netfilter/nf_bpf_link.c | 125 +- + net/netfilter/nf_conntrack_bpf.c | 1 + + net/netfilter/nf_conntrack_core.c | 2 +- + net/netfilter/nf_conntrack_expect.c | 4 +- + net/netfilter/nf_conntrack_netlink.c | 8 +- + net/netfilter/nf_conntrack_proto_dccp.c | 2 + + net/netfilter/nf_flow_table_offload.c | 22 +- + net/netfilter/nf_tables_offload.c | 13 +- + net/netfilter/nfnetlink_log.c | 6 +- + net/netfilter/nft_cmp.c | 2 +- + net/netfilter/nft_ct.c | 2 + + net/netfilter/nft_fib.c | 17 +- + net/netfilter/nft_lookup.c | 6 +- + net/netfilter/nft_masq.c | 8 +- + net/netfilter/nft_nat.c | 8 +- + net/netfilter/nft_redir.c | 8 +- + net/netlabel/netlabel_cipso_v4.h | 3 - + net/netlink/af_netlink.c | 128 +- + net/netlink/af_netlink.h | 26 +- + net/netlink/diag.c | 10 +- + net/netlink/genetlink.c | 6 +- + net/openvswitch/actions.c | 42 +- + net/openvswitch/conntrack.c | 81 +- + net/openvswitch/datapath.c | 16 + + net/openvswitch/drop.h | 41 + + net/openvswitch/flow_netlink.c | 10 +- + net/packet/af_packet.c | 4 +- + net/qrtr/af_qrtr.c | 5 + + net/qrtr/ns.c | 139 +- + net/rds/rdma_transport.h | 1 - + net/rds/rds.h | 3 - + net/rds/tcp.h | 1 - + net/sched/Kconfig | 4 +- + net/sched/act_ct.c | 3 +- + net/sched/cls_flower.c | 35 + + net/sched/sch_drr.c | 11 +- + net/sched/sch_hfsc.c | 10 +- + net/sched/sch_htb.c | 17 +- + net/sched/sch_ingress.c | 61 +- + net/sched/sch_qfq.c | 12 +- + net/sched/sch_taprio.c | 68 +- + net/sctp/protocol.c | 3 +- + net/sctp/socket.c | 1 + + net/smc/smc_core.h | 1 - + net/smc/smc_ib.h | 1 - + net/socket.c | 136 +- + net/sunrpc/svcsock.c | 48 +- + net/sunrpc/xprtsock.c | 43 +- + net/switchdev/switchdev.c | 25 + + net/tipc/addr.h | 1 - + net/tipc/bearer.h | 2 - + net/tipc/link.h | 2 - + net/tipc/name_distr.h | 1 - + net/tipc/net.h | 1 - + net/tls/tls.h | 7 +- + net/tls/tls_device.c | 6 +- + net/tls/tls_main.c | 2 + + net/tls/tls_strp.c | 3 +- + net/tls/tls_sw.c | 139 +- + net/unix/scm.c | 3 +- + net/vmw_vsock/virtio_transport_common.c | 110 +- + net/vmw_vsock/vmci_transport.h | 3 - + net/xdp/xsk.c | 376 ++- + net/xdp/xsk_buff_pool.c | 7 + + net/xdp/xsk_queue.h | 97 +- + net/xfrm/xfrm_device.c | 13 +- + samples/bpf/Makefile | 6 +- + samples/bpf/README.rst | 14 +- + samples/bpf/gnu/stubs.h | 2 +- + samples/bpf/syscall_tp_kern.c | 4 + + samples/bpf/test_lwt_bpf.sh | 2 +- + samples/hid/Makefile | 6 +- + security/security.c | 2 +- + security/selinux/hooks.c | 4 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 4 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 26 +- + tools/bpf/bpftool/Makefile | 2 +- + tools/bpf/bpftool/btf_dumper.c | 2 +- + tools/bpf/bpftool/feature.c | 2 +- + tools/bpf/bpftool/link.c | 432 ++- + tools/bpf/bpftool/net.c | 98 +- + tools/bpf/bpftool/netlink_dumper.h | 8 + + tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 26 +- + tools/bpf/bpftool/skeleton/profiler.bpf.c | 27 +- + tools/bpf/bpftool/xlated_dumper.c | 6 +- + tools/bpf/bpftool/xlated_dumper.h | 2 + + tools/bpf/runqslower/Makefile | 2 +- + tools/build/feature/Makefile | 2 +- + tools/include/uapi/linux/bpf.h | 128 +- + tools/include/uapi/linux/if_xdp.h | 9 + + tools/include/uapi/linux/netdev.h | 4 +- + tools/lib/bpf/Makefile | 4 +- + tools/lib/bpf/bpf.c | 135 +- + tools/lib/bpf/bpf.h | 103 +- + tools/lib/bpf/bpf_tracing.h | 2 +- + tools/lib/bpf/hashmap.h | 10 - + tools/lib/bpf/libbpf.c | 328 ++- + tools/lib/bpf/libbpf.h | 33 +- + tools/lib/bpf/libbpf.map | 3 + + tools/lib/bpf/libbpf_common.h | 16 + + tools/lib/bpf/netlink.c | 5 + + tools/lib/bpf/usdt.bpf.h | 4 +- + tools/lib/bpf/usdt.c | 5 +- + tools/net/ynl/Makefile | 1 + + tools/net/ynl/generated/devlink-user.c | 2261 +++++++++++++++ + tools/net/ynl/generated/devlink-user.h | 1782 ++++++++++++ + tools/net/ynl/generated/netdev-user.c | 6 + + tools/net/ynl/generated/netdev-user.h | 2 + + tools/net/ynl/samples/netdev.c | 2 + + tools/net/ynl/ynl-gen-c.py | 27 +- + tools/net/ynl/ynl-regen.sh | 5 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/bpf/.gitignore | 2 + + tools/testing/selftests/bpf/DENYLIST.aarch64 | 2 + + tools/testing/selftests/bpf/Makefile | 46 +- + tools/testing/selftests/bpf/bench.c | 4 + + .../testing/selftests/bpf/benchs/bench_htab_mem.c | 350 +++ + .../testing/selftests/bpf/benchs/bench_ringbufs.c | 2 +- + .../selftests/bpf/benchs/run_bench_htab_mem.sh | 40 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 58 +- + tools/testing/selftests/bpf/cgroup_helpers.c | 12 + + tools/testing/selftests/bpf/cgroup_helpers.h | 1 + + tools/testing/selftests/bpf/cgroup_tcp_skb.h | 35 + + .../selftests/bpf/generate_udp_fragments.py | 90 + + tools/testing/selftests/bpf/gnu/stubs.h | 2 +- + .../testing/selftests/bpf/ip_check_defrag_frags.h | 57 + + .../selftests/bpf/map_tests/map_percpu_stats.c | 447 +++ + tools/testing/selftests/bpf/network_helpers.c | 29 +- + tools/testing/selftests/bpf/network_helpers.h | 3 + + .../selftests/bpf/prog_tests/assign_reuse.c | 199 ++ + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 5 +- + .../selftests/bpf/prog_tests/cgroup_tcp_skb.c | 344 +++ + .../testing/selftests/bpf/prog_tests/fentry_test.c | 43 +- + .../testing/selftests/bpf/prog_tests/fexit_test.c | 43 +- + .../selftests/bpf/prog_tests/get_func_args_test.c | 4 +- + .../selftests/bpf/prog_tests/get_func_ip_test.c | 57 +- + .../selftests/bpf/prog_tests/global_map_resize.c | 14 +- + .../selftests/bpf/prog_tests/ip_check_defrag.c | 283 ++ + .../testing/selftests/bpf/prog_tests/linked_list.c | 78 +- + tools/testing/selftests/bpf/prog_tests/log_fixup.c | 2 +- + .../selftests/bpf/prog_tests/modify_return.c | 10 +- + .../bpf/prog_tests/netfilter_link_attach.c | 86 + + .../selftests/bpf/prog_tests/ptr_untrusted.c | 36 + + .../selftests/bpf/prog_tests/refcounted_kptr.c | 4 + + tools/testing/selftests/bpf/prog_tests/spin_lock.c | 37 +- + .../testing/selftests/bpf/prog_tests/tc_helpers.h | 72 + + tools/testing/selftests/bpf/prog_tests/tc_links.c | 1583 +++++++++++ + tools/testing/selftests/bpf/prog_tests/tc_opts.c | 2270 +++++++++++++++ + .../selftests/bpf/prog_tests/tcp_hdr_options.c | 2 +- + .../selftests/bpf/prog_tests/test_ldsx_insn.c | 139 + + .../selftests/bpf/prog_tests/tracing_struct.c | 19 + + .../selftests/bpf/prog_tests/trampoline_count.c | 4 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 12 + + .../testing/selftests/bpf/prog_tests/xdp_attach.c | 65 + + tools/testing/selftests/bpf/progs/cgroup_tcp_skb.c | 382 +++ + .../testing/selftests/bpf/progs/fentry_many_args.c | 39 + + .../testing/selftests/bpf/progs/fexit_many_args.c | 40 + + .../testing/selftests/bpf/progs/get_func_ip_test.c | 25 +- + .../selftests/bpf/progs/get_func_ip_uprobe_test.c | 18 + + tools/testing/selftests/bpf/progs/htab_mem_bench.c | 105 + + .../testing/selftests/bpf/progs/ip_check_defrag.c | 104 + + tools/testing/selftests/bpf/progs/linked_list.c | 2 +- + .../testing/selftests/bpf/progs/map_percpu_stats.c | 24 + + tools/testing/selftests/bpf/progs/map_ptr_kern.c | 5 + + tools/testing/selftests/bpf/progs/modify_return.c | 40 + + .../selftests/bpf/progs/nested_trust_failure.c | 16 + + .../selftests/bpf/progs/nested_trust_success.c | 15 + + .../testing/selftests/bpf/progs/refcounted_kptr.c | 94 +- + .../selftests/bpf/progs/test_assign_reuse.c | 142 + + .../selftests/bpf/progs/test_cls_redirect.h | 9 + + .../selftests/bpf/progs/test_global_map_resize.c | 8 +- + tools/testing/selftests/bpf/progs/test_ldsx_insn.c | 118 + + .../bpf/progs/test_netfilter_link_attach.c | 14 + + .../selftests/bpf/progs/test_ptr_untrusted.c | 29 + + tools/testing/selftests/bpf/progs/test_tc_link.c | 40 + + .../selftests/bpf/progs/test_xdp_attach_fail.c | 54 + + tools/testing/selftests/bpf/progs/tracing_struct.c | 54 + + tools/testing/selftests/bpf/progs/verifier_bswap.c | 59 + + tools/testing/selftests/bpf/progs/verifier_gotol.c | 44 + + tools/testing/selftests/bpf/progs/verifier_ldsx.c | 131 + + tools/testing/selftests/bpf/progs/verifier_movsx.c | 235 ++ + tools/testing/selftests/bpf/progs/verifier_sdiv.c | 781 ++++++ + .../testing/selftests/bpf/progs/verifier_typedef.c | 23 + + tools/testing/selftests/bpf/progs/xsk_xdp_progs.c | 6 +- + tools/testing/selftests/bpf/test_xsk.sh | 5 + + tools/testing/selftests/bpf/trace_helpers.c | 5 +- + .../selftests/bpf/verifier/atomic_cmpxchg.c | 1 + + tools/testing/selftests/bpf/verifier/basic_instr.c | 6 +- + tools/testing/selftests/bpf/verifier/ctx_skb.c | 2 + + tools/testing/selftests/bpf/verifier/jmp32.c | 8 + + tools/testing/selftests/bpf/verifier/map_kptr.c | 2 + + tools/testing/selftests/bpf/verifier/precise.c | 2 +- + tools/testing/selftests/bpf/xsk.c | 136 +- + tools/testing/selftests/bpf/xsk.h | 2 + + tools/testing/selftests/bpf/xsk_prereqs.sh | 7 + + tools/testing/selftests/bpf/xskxceiver.c | 466 +++- + tools/testing/selftests/bpf/xskxceiver.h | 21 +- + tools/testing/selftests/connector/.gitignore | 1 + + tools/testing/selftests/connector/Makefile | 6 + + tools/testing/selftests/connector/proc_filter.c | 310 +++ + .../selftests/drivers/net/mlxsw/port_range_occ.sh | 111 + + .../drivers/net/mlxsw/port_range_scale.sh | 95 + + .../selftests/drivers/net/mlxsw/rif_bridge.sh | 183 ++ + .../testing/selftests/drivers/net/mlxsw/rif_lag.sh | 136 + + .../selftests/drivers/net/mlxsw/rif_lag_vlan.sh | 146 + + .../drivers/net/mlxsw/router_bridge_lag.sh | 50 + + .../selftests/drivers/net/mlxsw/rtnetlink.sh | 31 - + .../net/mlxsw/spectrum-2/port_range_scale.sh | 1 + + .../drivers/net/mlxsw/spectrum-2/resource_scale.sh | 1 + + .../drivers/net/mlxsw/spectrum/port_range_scale.sh | 16 + + .../drivers/net/mlxsw/spectrum/resource_scale.sh | 1 + + tools/testing/selftests/hid/Makefile | 6 +- + tools/testing/selftests/net/Makefile | 7 +- + tools/testing/selftests/net/csum.c | 6 +- + tools/testing/selftests/net/fib_nexthops.sh | 129 + + tools/testing/selftests/net/forwarding/Makefile | 7 + + .../selftests/net/forwarding/bridge_locked_port.sh | 36 + + tools/testing/selftests/net/forwarding/lib.sh | 18 + + .../selftests/net/forwarding/router_bridge.sh | 76 + + .../selftests/net/forwarding/router_bridge_1d.sh | 185 ++ + .../net/forwarding/router_bridge_1d_lag.sh | 408 +++ + .../selftests/net/forwarding/router_bridge_lag.sh | 323 +++ + .../forwarding/router_bridge_pvid_vlan_upper.sh | 155 ++ + .../selftests/net/forwarding/router_bridge_vlan.sh | 100 +- + .../net/forwarding/router_bridge_vlan_upper.sh | 169 ++ + .../forwarding/router_bridge_vlan_upper_pvid.sh | 171 ++ + .../net/forwarding/tc_flower_port_range.sh | 228 ++ + tools/testing/selftests/net/hwtstamp_config.c | 6 +- + tools/testing/selftests/net/mptcp/diag.sh | 7 + + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 66 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 760 ++--- + tools/testing/selftests/net/mptcp/mptcp_lib.sh | 105 + + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 20 +- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 12 +- + tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 33 +- + tools/testing/selftests/net/mptcp/simult_flows.sh | 4 + + tools/testing/selftests/net/mptcp/userspace_pm.sh | 281 +- + .../selftests/net/openvswitch/openvswitch.sh | 325 ++- + .../testing/selftests/net/openvswitch/ovs-dpctl.py | 602 +++- + tools/testing/selftests/net/psock_lib.h | 4 +- + tools/testing/selftests/net/rtnetlink.sh | 83 + + tools/testing/selftests/net/tcp_mmap.c | 18 +- + .../selftests/net/test_bridge_backup_port.sh | 759 +++++ + tools/testing/selftests/net/tls.c | 11 + + tools/testing/selftests/ptp/testptp.c | 73 +- + tools/testing/selftests/tc-testing/Makefile | 2 +- + tools/testing/selftests/tc-testing/config | 3 +- + .../selftests/tc-testing/taprio_wait_for_admin.sh | 16 + + .../tc-testing/tc-tests/qdiscs/taprio.json | 102 +- + tools/testing/vsock/vsock_test.c | 140 +- + 1356 files changed, 73877 insertions(+), 24228 deletions(-) + create mode 100644 Documentation/bpf/standardization/index.rst + rename Documentation/bpf/{ => standardization}/instruction-set.rst (69%) + rename Documentation/bpf/{ => standardization}/linux-notes.rst (96%) + create mode 100644 Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml + delete mode 100644 Documentation/devicetree/bindings/net/oxnas-dwmac.txt + create mode 100644 Documentation/devicetree/bindings/net/ti,icssg-prueth.yaml + create mode 100644 drivers/net/dsa/mv88e6xxx/pcs-6185.c + create mode 100644 drivers/net/dsa/mv88e6xxx/pcs-6352.c + create mode 100644 drivers/net/dsa/mv88e6xxx/pcs-639x.c + create mode 100644 drivers/net/ethernet/broadcom/asp2/Makefile + create mode 100644 drivers/net/ethernet/broadcom/asp2/bcmasp.c + create mode 100644 drivers/net/ethernet/broadcom/asp2/bcmasp.h + create mode 100644 drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c + create mode 100644 drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c + create mode 100644 drivers/net/ethernet/broadcom/asp2/bcmasp_intf_defs.h + delete mode 100644 drivers/net/ethernet/intel/i40e/i40e_status.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_eswitch_br.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_eswitch_br.h + create mode 100644 drivers/net/ethernet/marvell/octeon_ep/octep_cp_version.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/hwmon.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/hwmon.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/thermal.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/thermal.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_port_range.c + delete mode 100644 drivers/net/ethernet/sfc/farch_regs.h + create mode 100644 drivers/net/ethernet/sfc/tc_conntrack.c + create mode 100644 drivers/net/ethernet/sfc/tc_conntrack.h + delete mode 100644 drivers/net/ethernet/sfc/vfdi.h + delete mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-oxnas.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_classifier.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_config.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_config.h + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_ethtool.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_mii_cfg.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_mii_rt.h + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_prueth.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_prueth.h + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_queues.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_stats.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_stats.h + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_switch_map.h + create mode 100644 drivers/net/netdevsim/macsec.c + create mode 100644 drivers/net/phy/marvell-88q2xxx.c + create mode 100644 drivers/net/phy/stubs.c + create mode 100644 drivers/net/vmxnet3/vmxnet3_xdp.c + create mode 100644 drivers/net/vmxnet3/vmxnet3_xdp.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt76_connac3_mac.h + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/acpi_sar.h + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/trace.c + delete mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/usb_mac.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt792x.h + rename drivers/net/wireless/mediatek/mt76/{mt7921/acpi_sar.c => mt792x_acpi_sar.c} (64%) + create mode 100644 drivers/net/wireless/mediatek/mt76/mt792x_acpi_sar.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt792x_core.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt792x_debugfs.c + rename drivers/net/wireless/mediatek/mt76/{mt7921/dma.c => mt792x_dma.c} (55%) + create mode 100644 drivers/net/wireless/mediatek/mt76/mt792x_mac.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt792x_regs.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt792x_trace.c + rename drivers/net/wireless/mediatek/mt76/{mt7921/mt7921_trace.h => mt792x_trace.h} (68%) + create mode 100644 drivers/net/wireless/mediatek/mt76/mt792x_usb.c + create mode 100644 drivers/ptp/ptp_mock.c + create mode 100644 include/linux/bpf_mprog.h + delete mode 100644 include/linux/fs_enet_pd.h + create mode 100644 include/linux/phylib_stubs.h + create mode 100644 include/linux/ptp_mock.h + delete mode 100644 include/net/ila.h + create mode 100644 include/net/netdev_rx_queue.h + delete mode 100644 include/net/page_pool.h + create mode 100644 include/net/page_pool/helpers.h + create mode 100644 include/net/page_pool/types.h + create mode 100644 include/net/tcx.h + create mode 100644 include/net/tls_prot.h + create mode 100644 kernel/bpf/mprog.c + create mode 100644 kernel/bpf/tcx.c + create mode 100644 net/devlink/netlink_gen.c + create mode 100644 net/devlink/netlink_gen.h + create mode 100644 net/handshake/alert.c + create mode 100644 net/openvswitch/drop.h + create mode 100644 tools/testing/selftests/bpf/benchs/bench_htab_mem.c + create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_htab_mem.sh + create mode 100644 tools/testing/selftests/bpf/cgroup_tcp_skb.h + create mode 100755 tools/testing/selftests/bpf/generate_udp_fragments.py + create mode 100644 tools/testing/selftests/bpf/ip_check_defrag_frags.h + create mode 100644 tools/testing/selftests/bpf/map_tests/map_percpu_stats.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/assign_reuse.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_tcp_skb.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/netfilter_link_attach.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/ptr_untrusted.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/tc_helpers.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/tc_links.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/tc_opts.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_ldsx_insn.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_tcp_skb.c + create mode 100644 tools/testing/selftests/bpf/progs/fentry_many_args.c + create mode 100644 tools/testing/selftests/bpf/progs/fexit_many_args.c + create mode 100644 tools/testing/selftests/bpf/progs/get_func_ip_uprobe_test.c + create mode 100644 tools/testing/selftests/bpf/progs/htab_mem_bench.c + create mode 100644 tools/testing/selftests/bpf/progs/ip_check_defrag.c + create mode 100644 tools/testing/selftests/bpf/progs/map_percpu_stats.c + create mode 100644 tools/testing/selftests/bpf/progs/test_assign_reuse.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ldsx_insn.c + create mode 100644 tools/testing/selftests/bpf/progs/test_netfilter_link_attach.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ptr_untrusted.c + create mode 100644 tools/testing/selftests/bpf/progs/test_tc_link.c + create mode 100644 tools/testing/selftests/bpf/progs/test_xdp_attach_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_bswap.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_gotol.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_ldsx.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_movsx.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_sdiv.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_typedef.c + create mode 100644 tools/testing/selftests/connector/.gitignore + create mode 100644 tools/testing/selftests/connector/Makefile + create mode 100644 tools/testing/selftests/connector/proc_filter.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/port_range_occ.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/port_range_scale.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/rif_bridge.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/rif_lag.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/rif_lag_vlan.sh + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/router_bridge_lag.sh + create mode 120000 tools/testing/selftests/drivers/net/mlxsw/spectrum-2/port_range_scale.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/spectrum/port_range_scale.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_bridge_1d.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_bridge_1d_lag.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_bridge_lag.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_bridge_pvid_vlan_upper.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_bridge_vlan_upper.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_bridge_vlan_upper_pvid.sh + create mode 100755 tools/testing/selftests/net/forwarding/tc_flower_port_range.sh + create mode 100755 tools/testing/selftests/net/test_bridge_backup_port.sh + create mode 100755 tools/testing/selftests/tc-testing/taprio_wait_for_admin.sh +Merging bpf-next/for-next (83a89c4b6ae9 selftests/bpf: Clean up fmod_ret in bench_rename test script) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Merge made by the 'ort' strategy. + include/linux/bpf.h | 1 - + tools/bpf/bpftool/perf.c | 2 +- + tools/lib/bpf/libbpf.c | 4 ++-- + tools/testing/selftests/bpf/benchs/run_bench_rename.sh | 2 +- + tools/testing/selftests/bpf/prog_tests/kfunc_call.c | 2 +- + 5 files changed, 5 insertions(+), 6 deletions(-) +Merging ipsec-next/master (a94fd40a18ae xfrm: delete not-needed clear to zero of encap_oa) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (2d297d20ace8 RDMA/mlx5: Handles RoCE MACsec steering rules addition and deletion) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Auto-merging drivers/infiniband/core/cache.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/Kconfig +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/Makefile +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h +CONFLICT (modify/delete): drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c deleted in mlx5-next/mlx5-next and modified in HEAD. Version HEAD of drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c left in tree. +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_stats.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Auto-merging drivers/net/macsec.c +Auto-merging include/linux/mlx5/driver.h +CONFLICT (content): Merge conflict in include/linux/mlx5/driver.h +Auto-merging include/linux/mlx5/fs.h +Recorded preimage for 'include/linux/mlx5/driver.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c +rm 'drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c' +$ git commit --no-edit -v -a +Recorded resolution for 'include/linux/mlx5/driver.h'. +[master 31dbc7d9ac61] Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/cache.c | 6 +- + drivers/infiniband/hw/mlx5/Makefile | 1 + + drivers/infiniband/hw/mlx5/macsec.c | 364 +++ + drivers/infiniband/hw/mlx5/macsec.h | 29 + + drivers/infiniband/hw/mlx5/main.c | 41 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 17 + + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- + .../mellanox/mlx5/core/en_accel/en_accel.h | 4 +- + .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 176 +- + .../ethernet/mellanox/mlx5/core/en_accel/macsec.h | 26 +- + .../mellanox/mlx5/core/en_accel/macsec_fs.c | 1394 ----------- + .../mellanox/mlx5/core/en_accel/macsec_fs.h | 47 - + .../mellanox/mlx5/core/en_accel/macsec_stats.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 37 +- + .../ethernet/mellanox/mlx5/core/lib/macsec_fs.c | 2410 ++++++++++++++++++++ + .../ethernet/mellanox/mlx5/core/lib/macsec_fs.h | 64 + + drivers/net/macsec.c | 15 + + include/linux/mlx5/device.h | 2 + + include/linux/mlx5/driver.h | 51 + + include/linux/mlx5/fs.h | 2 + + include/linux/mlx5/macsec.h | 32 + + include/net/macsec.h | 2 + + 26 files changed, 3121 insertions(+), 1630 deletions(-) + create mode 100644 drivers/infiniband/hw/mlx5/macsec.c + create mode 100644 drivers/infiniband/hw/mlx5/macsec.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_fs.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.h + create mode 100644 include/linux/mlx5/macsec.h +$ git am -3 ../patches/0001-fix-up-for-net-mlx5e-Move-MACsec-flow-steering-opera.patch +Applying: fix up for "net/mlx5e: Move MACsec flow steering operations to be used as core library" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/ethernet/mellanox/mlx5/core/lib/macsec_fs.c +$ git add -A . +$ git commit -v -a --amend +[master 6b1131b1e609] Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git + Date: Tue Aug 15 12:33:09 2023 +1000 +Merging netfilter-next/main (b98a5aa7e4c2 Merge branch 'net-remove-redundant-initialization-owner') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (b98a5aa7e4c2 Merge branch 'net-remove-redundant-initialization-owner') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (b5793de3cfae Bluetooth: hci_conn: avoid checking uninitialized CIG/CIS ids) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Already up to date. +Merging wireless-next/for-next (81083076a007 Merge tag 'wireless-next-2023-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging wpan-next/master (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Already up to date. +Merging wpan-staging/staging (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call) +$ git merge -m Merge branch 'staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (264725e35fbc mtd: Clean refcounting with MTD_PARTITIONED_MASTER) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Auto-merging drivers/mtd/nand/raw/fsl_upm.c +Auto-merging drivers/mtd/nand/raw/meson_nand.c +Auto-merging drivers/mtd/nand/raw/rockchip-nand-controller.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/partitions/seama.yaml | 44 ++++++++++ + drivers/mtd/devices/docg3.c | 8 +- + drivers/mtd/devices/mchp23k256.c | 2 +- + drivers/mtd/devices/mchp48l640.c | 2 +- + drivers/mtd/devices/mtd_dataflash.c | 1 - + drivers/mtd/devices/spear_smi.c | 5 +- + drivers/mtd/devices/st_spi_fsm.c | 14 +-- + drivers/mtd/lpddr/lpddr2_nvm.c | 4 +- + drivers/mtd/maps/lantiq-flash.c | 11 +-- + drivers/mtd/maps/physmap-bt1-rom.c | 1 - + drivers/mtd/maps/physmap-core.c | 3 +- + drivers/mtd/maps/physmap-gemini.c | 2 +- + drivers/mtd/maps/physmap-ixp4xx.c | 2 +- + drivers/mtd/maps/physmap-ixp4xx.h | 1 + + drivers/mtd/maps/physmap-versatile.c | 2 +- + drivers/mtd/maps/plat-ram.c | 3 +- + drivers/mtd/maps/sun_uflash.c | 2 +- + drivers/mtd/mtdblock.c | 2 +- + drivers/mtd/mtdblock_ro.c | 2 +- + drivers/mtd/mtdcore.c | 99 +++++++++++++--------- + drivers/mtd/mtdcore.h | 1 + + drivers/mtd/mtdpart.c | 14 +-- + drivers/mtd/nand/ecc-mxic.c | 2 +- + drivers/mtd/nand/ecc.c | 2 +- + drivers/mtd/nand/onenand/onenand_omap2.c | 2 +- + drivers/mtd/nand/raw/ams-delta.c | 2 +- + drivers/mtd/nand/raw/davinci_nand.c | 1 - + drivers/mtd/nand/raw/denali_dt.c | 1 - + drivers/mtd/nand/raw/fsl_ifc_nand.c | 1 + + drivers/mtd/nand/raw/fsl_upm.c | 3 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- + drivers/mtd/nand/raw/ingenic/ingenic_ecc.c | 1 + + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 1 - + drivers/mtd/nand/raw/marvell_nand.c | 3 +- + drivers/mtd/nand/raw/meson_nand.c | 1 - + drivers/mtd/nand/raw/mpc5121_nfc.c | 4 +- + drivers/mtd/nand/raw/mtk_nand.c | 1 - + drivers/mtd/nand/raw/mxc_nand.c | 1 - + drivers/mtd/nand/raw/ndfc.c | 3 +- + drivers/mtd/nand/raw/omap2.c | 2 +- + drivers/mtd/nand/raw/pl35x-nand-controller.c | 4 +- + drivers/mtd/nand/raw/qcom_nandc.c | 2 +- + drivers/mtd/nand/raw/rockchip-nand-controller.c | 1 - + drivers/mtd/nand/raw/s3c2410.c | 1 - + drivers/mtd/nand/raw/sh_flctl.c | 1 - + drivers/mtd/nand/raw/socrates_nand.c | 3 +- + drivers/mtd/nand/raw/sunxi_nand.c | 1 - + drivers/mtd/nand/raw/xway_nand.c | 3 +- + drivers/mtd/spi-nor/controllers/nxp-spifi.c | 1 - + include/linux/mtd/mtd.h | 2 +- + 50 files changed, 155 insertions(+), 122 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/seama.yaml +Merging nand/nand/next (3549fecd10d2 mtd: rawnand: vf610_nfc: Do not check 0 for platform_get_irq()) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging drivers/mtd/nand/onenand/onenand_omap2.c +Auto-merging drivers/mtd/nand/raw/fsl_upm.c +Auto-merging drivers/mtd/nand/raw/marvell_nand.c +Auto-merging drivers/mtd/nand/raw/meson_nand.c +Auto-merging drivers/mtd/nand/raw/mxc_nand.c +Auto-merging drivers/mtd/nand/raw/omap2.c +Auto-merging drivers/mtd/nand/raw/qcom_nandc.c +Auto-merging drivers/mtd/nand/raw/sh_flctl.c +Auto-merging drivers/mtd/nand/raw/sunxi_nand.c +Auto-merging drivers/mtd/nand/spi/toshiba.c +Merge made by the 'ort' strategy. + .../bindings/mtd/amlogic,meson-nand.yaml | 6 +- + .../bindings/mtd/marvell,nand-controller.yaml | 1 + + .../devicetree/bindings/mtd/nand-controller.yaml | 2 +- + .../devicetree/bindings/mtd/oxnas-nand.txt | 41 - + drivers/mtd/nand/onenand/onenand_omap2.c | 10 +- + drivers/mtd/nand/onenand/onenand_samsung.c | 9 +- + drivers/mtd/nand/raw/Kconfig | 9 +- + drivers/mtd/nand/raw/Makefile | 1 - + drivers/mtd/nand/raw/atmel/nand-controller.c | 3 +- + drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c | 4 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 123 ++- + drivers/mtd/nand/raw/brcmnand/iproc_nand.c | 7 +- + drivers/mtd/nand/raw/fsl_upm.c | 3 +- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 3 +- + drivers/mtd/nand/raw/lpc32xx_slc.c | 3 +- + drivers/mtd/nand/raw/marvell_nand.c | 16 + + drivers/mtd/nand/raw/meson_nand.c | 71 +- + drivers/mtd/nand/raw/mxc_nand.c | 9 +- + drivers/mtd/nand/raw/nand_base.c | 1 + + drivers/mtd/nand/raw/omap2.c | 3 +- + drivers/mtd/nand/raw/oxnas_nand.c | 209 ----- + drivers/mtd/nand/raw/qcom_nandc.c | 922 ++++++++++++--------- + drivers/mtd/nand/raw/sh_flctl.c | 3 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 4 +- + drivers/mtd/nand/raw/sunxi_nand.c | 3 +- + drivers/mtd/nand/raw/vf610_nfc.c | 4 +- + drivers/mtd/nand/spi/esmt.c | 9 + + drivers/mtd/nand/spi/gigadevice.c | 20 + + drivers/mtd/nand/spi/toshiba.c | 33 + + include/linux/mtd/rawnand.h | 1 + + 30 files changed, 785 insertions(+), 748 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mtd/oxnas-nand.txt + delete mode 100644 drivers/mtd/nand/raw/oxnas_nand.c +Merging spi-nor/spi-nor/next (aa517a29d645 mtd: spi-nor: spansion: switch cypress_nor_get_page_size() to use vreg_offset) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Auto-merging drivers/mtd/spi-nor/spansion.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 21 +- + drivers/mtd/spi-nor/atmel.c | 8 +- + drivers/mtd/spi-nor/core.c | 38 ++- + drivers/mtd/spi-nor/core.h | 9 +- + drivers/mtd/spi-nor/debugfs.c | 1 + + drivers/mtd/spi-nor/issi.c | 4 +- + drivers/mtd/spi-nor/macronix.c | 4 +- + drivers/mtd/spi-nor/micron-st.c | 8 +- + drivers/mtd/spi-nor/spansion.c | 320 +++++++++++++-------- + drivers/mtd/spi-nor/sst.c | 8 +- + drivers/mtd/spi-nor/swp.c | 9 +- + drivers/mtd/spi-nor/winbond.c | 9 +- + drivers/mtd/spi-nor/xilinx.c | 4 +- + 13 files changed, 293 insertions(+), 150 deletions(-) +Merging crypto/master (91cb1e1432b3 crypto: jitter - Add clarifying comments to Jitter Entropy RCT cutoff values) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/crypto/Kconfig +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-driver-qat | 61 ++ + Documentation/ABI/testing/sysfs-driver-ccp | 18 + + .../devicetree/bindings/crypto/st,stm32-hash.yaml | 1 + + MAINTAINERS | 12 + + arch/arm64/crypto/Makefile | 5 - + arch/arm64/crypto/aes-glue-ce.c | 2 + + arch/arm64/crypto/aes-glue-neon.c | 1 + + arch/powerpc/crypto/Kconfig | 26 + + arch/powerpc/crypto/Makefile | 4 + + arch/powerpc/crypto/chacha-p10-glue.c | 221 ++++ + arch/powerpc/crypto/chacha-p10le-8x.S | 842 +++++++++++++++ + arch/powerpc/crypto/poly1305-p10-glue.c | 186 ++++ + arch/powerpc/crypto/poly1305-p10le_64.S | 1075 ++++++++++++++++++++ + arch/x86/crypto/aesni-intel_glue.c | 22 +- + crypto/af_alg.c | 4 + + crypto/algapi.c | 16 +- + crypto/asymmetric_keys/public_key.c | 8 +- + crypto/asymmetric_keys/verify_pefile.c | 2 +- + crypto/jitterentropy.c | 10 +- + crypto/lrw.c | 6 +- + crypto/sig.c | 5 - + crypto/xts.c | 6 +- + drivers/char/hw_random/Kconfig | 37 +- + drivers/char/hw_random/amd-rng.c | 1 + + drivers/char/hw_random/arm_smccc_trng.c | 2 - + drivers/char/hw_random/atmel-rng.c | 2 +- + drivers/char/hw_random/ba431-rng.c | 10 +- + drivers/char/hw_random/bcm2835-rng.c | 3 +- + drivers/char/hw_random/cctrng.c | 93 +- + drivers/char/hw_random/cn10k-rng.c | 18 +- + drivers/char/hw_random/exynos-trng.c | 8 +- + drivers/char/hw_random/imx-rngc.c | 24 +- + drivers/char/hw_random/ingenic-rng.c | 2 +- + drivers/char/hw_random/ingenic-trng.c | 59 +- + drivers/char/hw_random/iproc-rng200.c | 3 +- + drivers/char/hw_random/nomadik-rng.c | 19 +- + drivers/char/hw_random/npcm-rng.c | 3 +- + drivers/char/hw_random/omap-rng.c | 2 - + drivers/char/hw_random/omap3-rom-rng.c | 1 - + drivers/char/hw_random/pasemi-rng.c | 3 +- + drivers/char/hw_random/pic32-rng.c | 76 +- + drivers/char/hw_random/stm32-rng.c | 3 +- + drivers/char/hw_random/timeriomem-rng.c | 25 +- + drivers/char/hw_random/xgene-rng.c | 6 +- + drivers/char/hw_random/xiphera-trng.c | 1 - + drivers/crypto/atmel-aes.c | 15 +- + drivers/crypto/atmel-sha.c | 19 +- + drivers/crypto/atmel-tdes.c | 14 +- + drivers/crypto/caam/caamhash.c | 17 +- + drivers/crypto/caam/ctrl.c | 106 ++ + drivers/crypto/caam/intern.h | 25 +- + drivers/crypto/caam/jr.c | 193 +++- + drivers/crypto/caam/regs.h | 9 +- + drivers/crypto/ccp/Makefile | 3 +- + drivers/crypto/ccp/dbc.c | 250 +++++ + drivers/crypto/ccp/dbc.h | 56 + + drivers/crypto/ccp/psp-dev.c | 19 +- + drivers/crypto/ccp/psp-dev.h | 1 + + drivers/crypto/ccp/sp-dev.h | 7 + + drivers/crypto/ccp/sp-pci.c | 96 +- + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 10 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 5 +- + drivers/crypto/hisilicon/qm.c | 28 +- + drivers/crypto/hisilicon/sec/sec_drv.c | 4 +- + .../crypto/intel/keembay/keembay-ocs-hcu-core.c | 10 +- + .../crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c | 14 + + .../crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.h | 4 + + drivers/crypto/intel/qat/qat_4xxx/adf_drv.c | 3 + + .../crypto/intel/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 28 + + .../crypto/intel/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 7 + + .../crypto/intel/qat/qat_c62x/adf_c62x_hw_data.c | 28 + + .../crypto/intel/qat/qat_c62x/adf_c62x_hw_data.h | 7 + + drivers/crypto/intel/qat/qat_common/Makefile | 5 + + .../intel/qat/qat_common/adf_accel_devices.h | 14 + + drivers/crypto/intel/qat/qat_common/adf_admin.c | 61 ++ + .../crypto/intel/qat/qat_common/adf_cfg_strings.h | 2 + + drivers/crypto/intel/qat/qat_common/adf_clock.c | 131 +++ + drivers/crypto/intel/qat/qat_common/adf_clock.h | 14 + + .../crypto/intel/qat/qat_common/adf_common_drv.h | 6 + + drivers/crypto/intel/qat/qat_common/adf_dbgfs.c | 12 + + .../crypto/intel/qat/qat_common/adf_fw_counters.c | 264 +++++ + .../crypto/intel/qat/qat_common/adf_fw_counters.h | 11 + + .../crypto/intel/qat/qat_common/adf_gen2_config.c | 7 + + .../crypto/intel/qat/qat_common/adf_gen2_hw_data.h | 3 + + .../crypto/intel/qat/qat_common/adf_gen4_hw_data.h | 3 + + drivers/crypto/intel/qat/qat_common/adf_gen4_pm.h | 2 +- + .../crypto/intel/qat/qat_common/adf_gen4_timer.c | 70 ++ + .../crypto/intel/qat/qat_common/adf_gen4_timer.h | 21 + + .../crypto/intel/qat/qat_common/adf_heartbeat.c | 336 ++++++ + .../crypto/intel/qat/qat_common/adf_heartbeat.h | 79 ++ + .../intel/qat/qat_common/adf_heartbeat_dbgfs.c | 194 ++++ + .../intel/qat/qat_common/adf_heartbeat_dbgfs.h | 12 + + drivers/crypto/intel/qat/qat_common/adf_init.c | 28 + + drivers/crypto/intel/qat/qat_common/adf_isr.c | 6 + + .../intel/qat/qat_common/icp_qat_fw_init_admin.h | 23 +- + .../crypto/intel/qat/qat_common/qat_compression.c | 3 +- + drivers/crypto/intel/qat/qat_common/qat_uclo.c | 7 +- + .../intel/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 13 + + .../intel/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 5 + + drivers/crypto/omap-des.c | 8 +- + drivers/crypto/starfive/Kconfig | 2 + + drivers/crypto/starfive/Makefile | 2 +- + drivers/crypto/starfive/jh7110-aes.c | 1034 +++++++++++++++++++ + drivers/crypto/starfive/jh7110-cryp.c | 42 +- + drivers/crypto/starfive/jh7110-cryp.h | 65 ++ + drivers/crypto/stm32/Kconfig | 2 + + drivers/crypto/stm32/stm32-hash.c | 739 +++++++++++--- + include/crypto/algapi.h | 3 + + include/linux/hisi_acc_qm.h | 2 +- + include/linux/psp-platform-access.h | 4 + + include/uapi/linux/psp-dbc.h | 147 +++ + lib/Makefile | 1 - + lib/crypto/Makefile | 2 + + lib/{ => crypto}/mpi/Makefile | 0 + lib/{ => crypto}/mpi/ec.c | 0 + lib/{ => crypto}/mpi/generic_mpih-add1.c | 0 + lib/{ => crypto}/mpi/generic_mpih-lshift.c | 0 + lib/{ => crypto}/mpi/generic_mpih-mul1.c | 0 + lib/{ => crypto}/mpi/generic_mpih-mul2.c | 0 + lib/{ => crypto}/mpi/generic_mpih-mul3.c | 0 + lib/{ => crypto}/mpi/generic_mpih-rshift.c | 0 + lib/{ => crypto}/mpi/generic_mpih-sub1.c | 0 + lib/{ => crypto}/mpi/longlong.h | 0 + lib/{ => crypto}/mpi/mpi-add.c | 0 + lib/{ => crypto}/mpi/mpi-bit.c | 0 + lib/{ => crypto}/mpi/mpi-cmp.c | 8 +- + lib/{ => crypto}/mpi/mpi-div.c | 0 + lib/{ => crypto}/mpi/mpi-inline.h | 0 + lib/{ => crypto}/mpi/mpi-internal.h | 0 + lib/{ => crypto}/mpi/mpi-inv.c | 0 + lib/{ => crypto}/mpi/mpi-mod.c | 0 + lib/{ => crypto}/mpi/mpi-mul.c | 0 + lib/{ => crypto}/mpi/mpi-pow.c | 0 + lib/{ => crypto}/mpi/mpi-sub-ui.c | 0 + lib/{ => crypto}/mpi/mpicoder.c | 0 + lib/{ => crypto}/mpi/mpih-cmp.c | 0 + lib/{ => crypto}/mpi/mpih-div.c | 0 + lib/{ => crypto}/mpi/mpih-mul.c | 0 + lib/{ => crypto}/mpi/mpiutil.c | 0 + tools/crypto/ccp/.gitignore | 1 + + tools/crypto/ccp/Makefile | 13 + + tools/crypto/ccp/dbc.c | 72 ++ + tools/crypto/ccp/dbc.py | 64 ++ + tools/crypto/ccp/dbc_cli.py | 134 +++ + tools/crypto/ccp/test_dbc.py | 266 +++++ + 145 files changed, 7216 insertions(+), 639 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-driver-qat + create mode 100644 arch/arm64/crypto/aes-glue-ce.c + create mode 100644 arch/arm64/crypto/aes-glue-neon.c + create mode 100644 arch/powerpc/crypto/chacha-p10-glue.c + create mode 100644 arch/powerpc/crypto/chacha-p10le-8x.S + create mode 100644 arch/powerpc/crypto/poly1305-p10-glue.c + create mode 100644 arch/powerpc/crypto/poly1305-p10le_64.S + create mode 100644 drivers/crypto/ccp/dbc.c + create mode 100644 drivers/crypto/ccp/dbc.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_clock.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_clock.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_fw_counters.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_fw_counters.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen4_timer.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen4_timer.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_heartbeat.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_heartbeat.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_heartbeat_dbgfs.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_heartbeat_dbgfs.h + create mode 100644 drivers/crypto/starfive/jh7110-aes.c + create mode 100644 include/uapi/linux/psp-dbc.h + rename lib/{ => crypto}/mpi/Makefile (100%) + rename lib/{ => crypto}/mpi/ec.c (100%) + rename lib/{ => crypto}/mpi/generic_mpih-add1.c (100%) + rename lib/{ => crypto}/mpi/generic_mpih-lshift.c (100%) + rename lib/{ => crypto}/mpi/generic_mpih-mul1.c (100%) + rename lib/{ => crypto}/mpi/generic_mpih-mul2.c (100%) + rename lib/{ => crypto}/mpi/generic_mpih-mul3.c (100%) + rename lib/{ => crypto}/mpi/generic_mpih-rshift.c (100%) + rename lib/{ => crypto}/mpi/generic_mpih-sub1.c (100%) + rename lib/{ => crypto}/mpi/longlong.h (100%) + rename lib/{ => crypto}/mpi/mpi-add.c (100%) + rename lib/{ => crypto}/mpi/mpi-bit.c (100%) + rename lib/{ => crypto}/mpi/mpi-cmp.c (96%) + rename lib/{ => crypto}/mpi/mpi-div.c (100%) + rename lib/{ => crypto}/mpi/mpi-inline.h (100%) + rename lib/{ => crypto}/mpi/mpi-internal.h (100%) + rename lib/{ => crypto}/mpi/mpi-inv.c (100%) + rename lib/{ => crypto}/mpi/mpi-mod.c (100%) + rename lib/{ => crypto}/mpi/mpi-mul.c (100%) + rename lib/{ => crypto}/mpi/mpi-pow.c (100%) + rename lib/{ => crypto}/mpi/mpi-sub-ui.c (100%) + rename lib/{ => crypto}/mpi/mpicoder.c (100%) + rename lib/{ => crypto}/mpi/mpih-cmp.c (100%) + rename lib/{ => crypto}/mpi/mpih-div.c (100%) + rename lib/{ => crypto}/mpi/mpih-mul.c (100%) + rename lib/{ => crypto}/mpi/mpiutil.c (100%) + create mode 100644 tools/crypto/ccp/.gitignore + create mode 100644 tools/crypto/ccp/Makefile + create mode 100644 tools/crypto/ccp/dbc.c + create mode 100644 tools/crypto/ccp/dbc.py + create mode 100755 tools/crypto/ccp/dbc_cli.py + create mode 100755 tools/crypto/ccp/test_dbc.py +Merging drm/drm-next (2b9d7b651522 Merge tag 'drm-intel-next-2023-08-10' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) + 26e60294e8ea ("drm/i915/sdvo: fix panel_type initialization") + 28e671114fb0 ("drm/i915/guc/slpc: Restore efficient freq earlier") +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/accel/ivpu/ivpu_gem.c +Auto-merging drivers/dma-buf/heaps/system_heap.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.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/amdgpu_vm_pt.c +Auto-merging drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c +Auto-merging drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_debug.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_debug.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_debug.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.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_7_ppt.c +Auto-merging drivers/gpu/drm/bridge/ite-it6505.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/i915/display/intel_display_device.c +Auto-merging drivers/gpu/drm/i915/display/intel_dpll_mgr.c +Auto-merging drivers/gpu/drm/i915/display/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/display/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/gt/gen8_engine_cs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_request.c +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gmu.c +Auto-merging drivers/gpu/drm/msm/msm_mdss.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/disp.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_connector.c +Auto-merging drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/radeon/cik.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_vop.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/media/test-drivers/vivid/vivid-osd.c +Auto-merging drivers/video/fbdev/bw2.c +Auto-merging drivers/video/fbdev/cg14.c +Auto-merging drivers/video/fbdev/cg3.c +Auto-merging drivers/video/fbdev/cg6.c +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/video/fbdev/ep93xx-fb.c +Auto-merging drivers/video/fbdev/ffb.c +Auto-merging drivers/video/fbdev/grvga.c +Auto-merging drivers/video/fbdev/imxfb.c +Auto-merging drivers/video/fbdev/leo.c +Auto-merging drivers/video/fbdev/mb862xx/mb862xxfbdrv.c +Auto-merging drivers/video/fbdev/p9100.c +Auto-merging drivers/video/fbdev/platinumfb.c +Auto-merging drivers/video/fbdev/sunxvr1000.c +Auto-merging drivers/video/fbdev/sunxvr2500.c +Auto-merging drivers/video/fbdev/sunxvr500.c +Auto-merging drivers/video/fbdev/tcx.c +Auto-merging drivers/video/fbdev/xilinxfb.c +Resolved 'drivers/gpu/drm/amd/amdgpu/psp_v13_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_debug.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master dc244403a4e1] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/toshiba,tc358767.yaml | 3 + + .../bindings/display/panel/ilitek,ili9881c.yaml | 1 + + .../bindings/display/panel/panel-lvds.yaml | 6 + + .../bindings/display/panel/panel-simple.yaml | 6 +- + .../bindings/display/panel/sitronix,st7789v.yaml | 13 +- + .../display/panel/startek,kd070fhfid015.yaml | 69 + + .../bindings/display/panel/visionox,r66451.yaml | 59 + + .../bindings/display/solomon,ssd1307fb.yaml | 28 +- + .../bindings/display/ti/ti,am65x-dss.yaml | 18 +- + .../devicetree/bindings/input/elan,ekth6915.yaml | 5 + + .../devicetree/bindings/input/goodix,gt7375p.yaml | 5 + + .../devicetree/bindings/input/hid-over-i2c.yaml | 2 + + .../bindings/input/touchscreen/touchscreen.yaml | 7 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/gpu/amdgpu/flashing.rst | 33 + + Documentation/gpu/amdgpu/index.rst | 1 + + Documentation/gpu/driver-uapi.rst | 11 + + Documentation/gpu/drm-mm.rst | 52 +- + Documentation/gpu/rfc/i915_scheduler.rst | 4 + + Documentation/gpu/todo.rst | 69 +- + MAINTAINERS | 20 +- + arch/arm/kernel/efi.c | 2 + + arch/arm64/kernel/efi.c | 1 + + arch/loongarch/kernel/efi.c | 1 + + arch/sh/boards/mach-ecovec24/setup.c | 2 +- + arch/sh/boards/mach-kfr2r09/setup.c | 2 +- + arch/sh/boards/mach-sh7763rdp/setup.c | 2 +- + arch/x86/Makefile | 2 +- + arch/x86/video/Makefile | 2 +- + drivers/Kconfig | 2 - + drivers/accel/ivpu/Makefile | 7 +- + drivers/accel/ivpu/ivpu_debugfs.c | 294 +++ + drivers/accel/ivpu/ivpu_debugfs.h | 13 + + drivers/accel/ivpu/ivpu_drv.c | 49 +- + drivers/accel/ivpu/ivpu_drv.h | 24 +- + drivers/accel/ivpu/ivpu_fw.c | 107 +- + drivers/accel/ivpu/ivpu_fw.h | 4 + + drivers/accel/ivpu/ivpu_fw_log.c | 142 ++ + drivers/accel/ivpu/ivpu_fw_log.h | 38 + + drivers/accel/ivpu/ivpu_gem.c | 10 +- + drivers/accel/ivpu/ivpu_hw.h | 13 +- + .../accel/ivpu/{ivpu_hw_mtl.c => ivpu_hw_37xx.c} | 496 +++-- + drivers/accel/ivpu/ivpu_hw_37xx_reg.h | 281 +++ + drivers/accel/ivpu/ivpu_hw_40xx.c | 1178 ++++++++++++ + drivers/accel/ivpu/ivpu_hw_40xx_reg.h | 267 +++ + drivers/accel/ivpu/ivpu_hw_mtl_reg.h | 281 --- + drivers/accel/ivpu/ivpu_job.c | 4 +- + drivers/accel/ivpu/ivpu_mmu.c | 98 +- + drivers/accel/ivpu/ivpu_mmu_context.c | 338 ++-- + drivers/accel/ivpu/ivpu_mmu_context.h | 9 +- + drivers/accel/ivpu/ivpu_pm.c | 1 + + drivers/accel/ivpu/ivpu_pm.h | 1 + + drivers/accel/qaic/qaic_data.c | 4 +- + drivers/accel/qaic/qaic_drv.c | 1 - + drivers/auxdisplay/cfag12864bfb.c | 1 - + drivers/auxdisplay/ht16k33.c | 1 - + drivers/dma-buf/dma-buf-sysfs-stats.c | 2 +- + drivers/dma-buf/dma-buf.c | 17 +- + drivers/dma-buf/heaps/cma_heap.c | 3 - + drivers/dma-buf/heaps/system_heap.c | 3 - + drivers/dma-buf/udmabuf.c | 2 - + drivers/firmware/efi/libstub/efi-stub-entry.c | 2 + + drivers/firmware/efi/libstub/screen_info.c | 2 + + drivers/gpu/drm/Kconfig | 34 +- + drivers/gpu/drm/Makefile | 4 + + drivers/gpu/drm/amd/amdgpu/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 50 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 7 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 8 +- + .../amdgpu/amdgpu_amdkfd_aldebaran.h} | 27 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c | 167 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 299 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 211 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 78 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 256 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c | 183 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fw_attestation.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 109 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 86 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 159 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 15 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 59 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 1 + + .../{aqua_vanjaram_reg_init.c => aqua_vanjaram.c} | 2 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 14 +- + drivers/gpu/drm/amd/amdgpu/atom.h | 2 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 202 +-- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 39 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 124 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 42 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 37 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 52 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 54 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 87 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 66 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 35 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 31 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.h | 16 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 6 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 32 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 22 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 22 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 36 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 3 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 61 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 21 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 3 + + drivers/gpu/drm/amd/display/Kconfig | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 202 ++- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 6 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 14 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 185 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 33 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 42 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 15 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 58 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 11 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 1 + + drivers/gpu/drm/amd/display/dc/basics/conversion.c | 2 +- + drivers/gpu/drm/amd/display/dc/basics/vector.c | 11 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 16 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 20 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 33 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.h | 7 + + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 44 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 94 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 1 + + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 18 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 577 ++++-- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 35 +- + drivers/gpu/drm/amd/display/dc/dc.h | 33 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 3 + + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 15 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 6 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 16 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_sw.c | 16 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 28 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 46 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.h | 6 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 4 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 18 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 56 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_dccg.h | 1 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 25 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 4 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.c | 49 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 5 + + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 2 +- + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 2 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 1 + + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 18 +- + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 2 - + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 2 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 24 +- + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 25 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 24 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 9 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 66 +- + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h | 2 - + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 5 + + .../amd/display/dc/irq/dcn314/irq_service_dcn314.c | 7 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 107 +- + .../amd/display/dc/link/hwss/link_hwss_hpo_dp.c | 10 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 3 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 21 +- + .../gpu/drm/amd/display/dc/link/link_validation.c | 8 +- + .../drm/amd/display/dc/link/protocols/link_ddc.c | 2 +- + .../display/dc/link/protocols/link_dp_capability.c | 22 +- + .../display/dc/link/protocols/link_dp_training.c | 9 +- + .../link_dp_training_fixed_vs_pe_retimer.c | 90 +- + .../dc/link/protocols/link_edp_panel_control.c | 80 +- + .../dc/link/protocols/link_edp_panel_control.h | 1 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 7 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 131 ++ + .../drm/amd/display/dmub/inc/dmub_subvp_state.h | 183 -- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 8 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 31 +- + .../drm/amd/display/include/link_service_types.h | 2 +- + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 9 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 69 + + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 4 +- + drivers/gpu/drm/amd/include/yellow_carp_offset.h | 6 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 3 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 3 +- + drivers/gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h | 21 +- + .../gpu/drm/amd/pm/swsmu/inc/smu_11_0_cdr_table.h | 6 +- + .../gpu/drm/amd/pm/swsmu/inc/smu_v13_0_7_pptable.h | 21 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 25 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 109 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 6 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 3 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 9 +- + drivers/gpu/drm/arm/Kconfig | 1 + + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 22 +- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 58 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 11 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 3 + + drivers/gpu/drm/arm/hdlcd_drv.c | 5 +- + drivers/gpu/drm/arm/malidp_drv.c | 6 +- + drivers/gpu/drm/armada/Kconfig | 2 +- + drivers/gpu/drm/armada/armada_drv.c | 2 - + drivers/gpu/drm/armada/armada_fbdev.c | 2 +- + drivers/gpu/drm/armada/armada_overlay.c | 6 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 6 +- + drivers/gpu/drm/ast/ast_dp.c | 11 + + drivers/gpu/drm/ast/ast_dp501.c | 43 +- + drivers/gpu/drm/ast/ast_drv.h | 100 +- + drivers/gpu/drm/ast/ast_main.c | 318 ++-- + drivers/gpu/drm/ast/ast_mm.c | 2 - + drivers/gpu/drm/ast/ast_mode.c | 122 +- + drivers/gpu/drm/ast/ast_post.c | 74 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 25 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 6 +- + drivers/gpu/drm/bridge/Kconfig | 20 +- + drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 1 - + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 11 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 2 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 4 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 122 +- + drivers/gpu/drm/bridge/analogix/anx7625.h | 2 +- + drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 3 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 80 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.h | 2 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-j721e.c | 9 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-j721e.h | 2 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 2 +- + drivers/gpu/drm/bridge/chrontel-ch7033.c | 2 +- + drivers/gpu/drm/bridge/display-connector.c | 1 - + drivers/gpu/drm/bridge/fsl-ldb.c | 1 - + drivers/gpu/drm/bridge/imx/imx8qm-ldb.c | 2 +- + drivers/gpu/drm/bridge/imx/imx8qxp-ldb.c | 1 + + drivers/gpu/drm/bridge/ite-it6505.c | 128 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 1 - + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 6 +- + drivers/gpu/drm/bridge/lvds-codec.c | 1 - + drivers/gpu/drm/bridge/nwl-dsi.c | 2 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 1 - + drivers/gpu/drm/bridge/parade-ps8640.c | 79 - + drivers/gpu/drm/bridge/samsung-dsim.c | 5 +- + drivers/gpu/drm/bridge/sii902x.c | 40 + + drivers/gpu/drm/bridge/sil-sii8620.c | 2 +- + drivers/gpu/drm/bridge/simple-bridge.c | 3 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 37 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 49 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 30 +- + drivers/gpu/drm/bridge/tc358762.c | 63 +- + drivers/gpu/drm/bridge/tc358764.c | 14 +- + drivers/gpu/drm/bridge/tc358767.c | 31 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 2 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 45 +- + drivers/gpu/drm/display/drm_hdcp_helper.c | 4 +- + drivers/gpu/drm/drm_atomic_helper.c | 2 +- + drivers/gpu/drm/drm_atomic_uapi.c | 58 +- + drivers/gpu/drm/drm_bridge.c | 46 + + drivers/gpu/drm/drm_bridge_connector.c | 13 +- + drivers/gpu/drm/drm_connector.c | 8 +- + drivers/gpu/drm/drm_debugfs.c | 42 + + drivers/gpu/drm/drm_drv.c | 8 +- + drivers/gpu/drm/drm_edid.c | 3 +- + drivers/gpu/drm/drm_exec.c | 333 ++++ + drivers/gpu/drm/drm_fbdev_dma.c | 11 +- + drivers/gpu/drm/drm_fbdev_generic.c | 7 +- + drivers/gpu/drm/drm_gem.c | 7 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 4 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 226 +-- + drivers/gpu/drm/drm_gpuva_mgr.c | 1725 ++++++++++++++++++ + drivers/gpu/drm/drm_internal.h | 2 + + drivers/gpu/drm/drm_ioctl.c | 5 +- + drivers/gpu/drm/drm_managed.c | 2 +- + drivers/gpu/drm/drm_mipi_dbi.c | 17 +- + drivers/gpu/drm/drm_mipi_dsi.c | 1 + + drivers/gpu/drm/drm_mode_object.c | 4 +- + drivers/gpu/drm/drm_panel.c | 218 ++- + drivers/gpu/drm/drm_plane_helper.c | 12 +- + drivers/gpu/drm/drm_prime.c | 83 +- + drivers/gpu/drm/drm_syncobj.c | 148 +- + drivers/gpu/drm/drm_sysfs.c | 23 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 3 - + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 2 +- + drivers/gpu/drm/exynos/Kconfig | 2 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 2 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 3 - + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 2 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 1 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 6 +- + drivers/gpu/drm/gma500/Kconfig | 2 +- + drivers/gpu/drm/gma500/fbdev.c | 6 +- + drivers/gpu/drm/gud/gud_pipe.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 1 - + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 6 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 7 +- + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 1 + + drivers/gpu/drm/i2c/ch7006_drv.c | 2 +- + drivers/gpu/drm/i2c/sil164_drv.c | 2 +- + drivers/gpu/drm/i915/Kconfig | 2 +- + drivers/gpu/drm/i915/Makefile | 4 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 8 + + drivers/gpu/drm/i915/display/g4x_hdmi.c | 23 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 139 +- + drivers/gpu/drm/i915/display/icl_dsi.h | 4 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 7 +- + drivers/gpu/drm/i915/display/intel_bios.c | 188 +- + drivers/gpu/drm/i915/display/intel_bios.h | 6 + + drivers/gpu/drm/i915/display/intel_cdclk.c | 26 +- + drivers/gpu/drm/i915/display/intel_color.c | 27 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 7 +- + drivers/gpu/drm/i915/display/intel_crt.c | 2 + + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 13 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 3 - + drivers/gpu/drm/i915/display/intel_ddi.c | 113 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 4 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 38 +- + drivers/gpu/drm/i915/display/intel_display.c | 111 +- + drivers/gpu/drm/i915/display/intel_display.h | 4 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 11 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 6 +- + .../gpu/drm/i915/display/intel_display_device.c | 203 ++- + .../gpu/drm/i915/display/intel_display_device.h | 8 +- + .../gpu/drm/i915/display/intel_display_driver.c | 2 + + drivers/gpu/drm/i915/display/intel_display_irq.c | 102 +- + drivers/gpu/drm/i915/display/intel_display_irq.h | 7 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 49 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 29 +- + .../drm/i915/display/intel_display_power_well.h | 1 - + drivers/gpu/drm/i915/display/intel_dp.c | 17 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 53 +- + drivers/gpu/drm/i915/display/intel_dp_aux.h | 3 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 29 +- + drivers/gpu/drm/i915/display/intel_dsi.c | 20 + + drivers/gpu/drm/i915/display/intel_dsi.h | 2 + + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 2 + + drivers/gpu/drm/i915/display/intel_fbc.c | 64 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 10 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 46 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.h | 28 - + drivers/gpu/drm/i915/display/intel_hdcp.c | 5 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 80 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 3 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 75 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 14 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 4 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 5 +- + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 206 ++- + drivers/gpu/drm/i915/display/intel_psr_regs.h | 16 + + drivers/gpu/drm/i915/display/intel_qp_tables.c | 10 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 22 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 208 ++- + drivers/gpu/drm/i915/display/intel_vdsc.h | 1 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 6 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 23 - + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 2 - + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 25 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 67 + + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 7 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 38 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 13 + + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 2 +- + drivers/gpu/drm/i915/gt/gen2_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 12 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 1 + + .../gpu/drm/i915/gt/intel_execlists_submission.c | 8 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 148 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 12 - + drivers/gpu/drm/i915/gt/intel_gt_defines.h | 11 + + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 8 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 108 ++ + drivers/gpu/drm/i915/gt/intel_gt_types.h | 5 + + drivers/gpu/drm/i915/gt/intel_lrc.c | 9 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 10 +- + drivers/gpu/drm/i915/gt/intel_ppgtt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 3 - + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 83 +- + drivers/gpu/drm/i915/gt/intel_rps.h | 4 + + drivers/gpu/drm/i915/gt/intel_sa_media.c | 2 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +- + drivers/gpu/drm/i915/gt/intel_tlb.c | 159 ++ + drivers/gpu/drm/i915/gt/intel_tlb.h | 29 + + drivers/gpu/drm/i915/gt/intel_workarounds.c | 161 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_rc6.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_timeline.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_tlb.c | 3 +- + .../gpu/drm/i915/gt/uc/intel_gsc_binary_headers.h | 75 +- + drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c | 334 +++- + drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h | 5 +- + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 141 +- + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.h | 21 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_debugfs.c | 39 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_debugfs.h | 14 + + .../drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 10 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 13 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_debugfs.c | 2 + + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 128 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 4 + + drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 6 +- + drivers/gpu/drm/i915/i915_drv.h | 106 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 10 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 3 + + drivers/gpu/drm/i915/i915_irq.c | 94 +- + drivers/gpu/drm/i915/i915_pci.c | 64 +- + drivers/gpu/drm/i915/i915_perf.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 27 +- + drivers/gpu/drm/i915/i915_request.c | 4 +- + drivers/gpu/drm/i915/i915_trace.h | 10 +- + drivers/gpu/drm/i915/i915_vma.c | 43 +- + drivers/gpu/drm/i915/i915_vma.h | 7 + + drivers/gpu/drm/i915/intel_clock_gating.c | 15 +- + drivers/gpu/drm/i915/intel_device_info.c | 48 +- + drivers/gpu/drm/i915/intel_device_info.h | 11 +- + drivers/gpu/drm/i915/intel_step.c | 10 +- + drivers/gpu/drm/i915/intel_uncore.c | 44 +- + drivers/gpu/drm/i915/intel_uncore.h | 5 + + drivers/gpu/drm/i915/pxp/intel_pxp.c | 8 +- + drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_perf.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 31 + + drivers/gpu/drm/i915/selftests/igt_spinner.c | 14 +- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 6 +- + drivers/gpu/drm/i915/soc/intel_dram.c | 2 +- + drivers/gpu/drm/i915/soc/intel_gmch.c | 4 +- + drivers/gpu/drm/i915/soc/intel_pch.c | 18 +- + drivers/gpu/drm/imx/dcss/dcss-dev.c | 5 +- + drivers/gpu/drm/imx/dcss/dcss-drv.c | 1 + + drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c | 11 +- + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 2 +- + drivers/gpu/drm/ingenic/Kconfig | 2 + + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 2 +- + drivers/gpu/drm/lima/lima_drv.c | 11 +- + drivers/gpu/drm/lima/lima_gem.c | 8 +- + drivers/gpu/drm/logicvc/logicvc_drm.c | 8 +- + drivers/gpu/drm/loongson/Kconfig | 17 + + drivers/gpu/drm/loongson/Makefile | 22 + + drivers/gpu/drm/loongson/loongson_device.c | 102 ++ + drivers/gpu/drm/loongson/loongson_module.c | 33 + + drivers/gpu/drm/loongson/loongson_module.h | 12 + + drivers/gpu/drm/loongson/lsdc_benchmark.c | 133 ++ + drivers/gpu/drm/loongson/lsdc_benchmark.h | 13 + + drivers/gpu/drm/loongson/lsdc_crtc.c | 1024 +++++++++++ + drivers/gpu/drm/loongson/lsdc_debugfs.c | 110 ++ + drivers/gpu/drm/loongson/lsdc_drv.c | 456 +++++ + drivers/gpu/drm/loongson/lsdc_drv.h | 388 ++++ + drivers/gpu/drm/loongson/lsdc_gem.c | 311 ++++ + drivers/gpu/drm/loongson/lsdc_gem.h | 37 + + drivers/gpu/drm/loongson/lsdc_gfxpll.c | 199 ++ + drivers/gpu/drm/loongson/lsdc_gfxpll.h | 52 + + drivers/gpu/drm/loongson/lsdc_i2c.c | 179 ++ + drivers/gpu/drm/loongson/lsdc_i2c.h | 29 + + drivers/gpu/drm/loongson/lsdc_irq.c | 74 + + drivers/gpu/drm/loongson/lsdc_irq.h | 16 + + drivers/gpu/drm/loongson/lsdc_output.h | 21 + + drivers/gpu/drm/loongson/lsdc_output_7a1000.c | 178 ++ + drivers/gpu/drm/loongson/lsdc_output_7a2000.c | 552 ++++++ + drivers/gpu/drm/loongson/lsdc_pixpll.c | 481 +++++ + drivers/gpu/drm/loongson/lsdc_pixpll.h | 86 + + drivers/gpu/drm/loongson/lsdc_plane.c | 793 ++++++++ + drivers/gpu/drm/loongson/lsdc_probe.c | 56 + + drivers/gpu/drm/loongson/lsdc_probe.h | 12 + + drivers/gpu/drm/loongson/lsdc_regs.h | 406 +++++ + drivers/gpu/drm/loongson/lsdc_ttm.c | 593 ++++++ + drivers/gpu/drm/loongson/lsdc_ttm.h | 99 + + drivers/gpu/drm/mcde/mcde_drv.c | 8 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 8 +- + drivers/gpu/drm/mediatek/mtk_disp_aal.c | 3 +- + drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 3 +- + drivers/gpu/drm/mediatek/mtk_disp_color.c | 3 +- + drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 3 +- + drivers/gpu/drm/mediatek/mtk_disp_merge.c | 3 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 3 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 3 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 3 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 1 - + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 1 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +- + drivers/gpu/drm/mediatek/mtk_ethdr.c | 2 +- + drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 3 +- + drivers/gpu/drm/meson/meson_drv.c | 6 +- + drivers/gpu/drm/meson/meson_drv.h | 1 - + drivers/gpu/drm/meson/meson_dw_hdmi.c | 13 +- + drivers/gpu/drm/meson/meson_dw_mipi_dsi.c | 3 +- + drivers/gpu/drm/meson/meson_encoder_dsi.c | 1 - + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- + drivers/gpu/drm/msm/Kconfig | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 + + drivers/gpu/drm/msm/dp/dp_audio.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 2 + + drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 3 +- + drivers/gpu/drm/msm/msm_drv.c | 3 - + drivers/gpu/drm/msm/msm_drv.h | 1 - + drivers/gpu/drm/msm/msm_fbdev.c | 6 +- + drivers/gpu/drm/msm/msm_gem.c | 8 + + drivers/gpu/drm/msm/msm_gem_prime.c | 15 - + drivers/gpu/drm/msm/msm_mdss.c | 2 + + drivers/gpu/drm/mxsfb/lcdif_drv.c | 7 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 6 +- + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 9 + + drivers/gpu/drm/nouveau/Kbuild | 3 + + drivers/gpu/drm/nouveau/Kconfig | 2 + + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 9 +- + drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 29 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- + drivers/gpu/drm/nouveau/include/nvif/if000c.h | 26 +- + drivers/gpu/drm/nouveau/include/nvif/vmm.h | 19 +- + drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | 6 +- + drivers/gpu/drm/nouveau/include/nvkm/core/os.h | 5 - + .../gpu/drm/nouveau/include/nvkm/engine/falcon.h | 2 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 20 +- + drivers/gpu/drm/nouveau/nouveau_abi16.c | 24 + + drivers/gpu/drm/nouveau/nouveau_abi16.h | 42 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 227 ++- + drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 22 +- + drivers/gpu/drm/nouveau/nouveau_chan.h | 1 + + drivers/gpu/drm/nouveau/nouveau_connector.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 39 + + drivers/gpu/drm/nouveau/nouveau_display.c | 17 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 30 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 93 +- + drivers/gpu/drm/nouveau/nouveau_encoder.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_exec.c | 411 +++++ + drivers/gpu/drm/nouveau/nouveau_exec.h | 54 + + drivers/gpu/drm/nouveau/nouveau_fence.c | 23 +- + drivers/gpu/drm/nouveau/nouveau_fence.h | 5 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 86 +- + drivers/gpu/drm/nouveau/nouveau_gem.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_mem.h | 5 + + drivers/gpu/drm/nouveau/nouveau_prime.c | 13 +- + drivers/gpu/drm/nouveau/nouveau_sched.c | 419 +++++ + drivers/gpu/drm/nouveau/nouveau_sched.h | 127 ++ + drivers/gpu/drm/nouveau/nouveau_svm.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.c | 1916 ++++++++++++++++++++ + drivers/gpu/drm/nouveau/nouveau_uvmm.h | 108 ++ + drivers/gpu/drm/nouveau/nouveau_vmm.c | 4 +- + drivers/gpu/drm/nouveau/nvif/mmu.c | 3 + + drivers/gpu/drm/nouveau/nvif/vmm.c | 100 +- + drivers/gpu/drm/nouveau/nvkm/core/intr.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/core/object.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/ce/ga100.c | 10 + + drivers/gpu/drm/nouveau/nvkm/engine/ce/ga102.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/ce/priv.h | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c | 32 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga100.c | 105 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.h | 6 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/uchan.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/base.c | 15 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ga102.c | 7 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 14 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv04.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv20.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv25.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv2a.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv30.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv34.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv35.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv40.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/nv50.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/priv.h | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv44.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/base.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/gf100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/nv10.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/sw/priv.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c | 12 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga100.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga102.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c | 17 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gv100.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 5 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp102.c | 30 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/tu102.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c | 214 ++- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 219 ++- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 25 + + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgf100.c | 16 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 16 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmnv50.c | 27 +- + drivers/gpu/drm/omapdrm/Kconfig | 2 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 5 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 6 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 6 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 5 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 5 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 5 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 9 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 20 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 16 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 24 +- + drivers/gpu/drm/omapdrm/omap_gem.h | 3 - + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 9 +- + drivers/gpu/drm/panel/Kconfig | 23 + + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 3 +- + drivers/gpu/drm/panel/panel-auo-a030jtn01.c | 2 +- + drivers/gpu/drm/panel/panel-boe-himax8279d.c | 1 - + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 1 - + drivers/gpu/drm/panel/panel-dsi-cm.c | 2 +- + drivers/gpu/drm/panel/panel-edp.c | 2 + + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 1 - + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 2 +- + drivers/gpu/drm/panel/panel-himax-hx8394.c | 2 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 3 +- + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 2 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 196 +- + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 3 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 1 - + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 2 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 1 - + drivers/gpu/drm/panel/panel-lvds.c | 8 +- + .../gpu/drm/panel/panel-magnachip-d53e6ea8966.c | 1 - + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 2 +- + drivers/gpu/drm/panel/panel-newvision-nv3051d.c | 2 +- + drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 3 +- + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 2 +- + drivers/gpu/drm/panel/panel-novatek-nt35560.c | 1 - + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 2 +- + drivers/gpu/drm/panel/panel-novatek-nt36523.c | 2 +- + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 1 - + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 1 - + drivers/gpu/drm/panel/panel-orisetech-ota5601a.c | 1 - + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 1 - + drivers/gpu/drm/panel/panel-samsung-db7430.c | 4 - + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 41 +- + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 2 +- + drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 2 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 2 +- + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 1 - + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 6 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 6 +- + drivers/gpu/drm/panel/panel-simple.c | 64 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 2 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 2 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 359 +++- + drivers/gpu/drm/panel/panel-sony-td4353-jdi.c | 1 - + .../gpu/drm/panel/panel-startek-kd070fhfid015.c | 406 +++++ + drivers/gpu/drm/panel/panel-truly-nt35597.c | 2 +- + drivers/gpu/drm/panel/panel-visionox-r66451.c | 390 ++++ + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 18 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 6 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 16 + + drivers/gpu/drm/panfrost/panfrost_mmu.c | 19 +- + drivers/gpu/drm/pl111/pl111_drv.c | 3 - + drivers/gpu/drm/pl111/pl111_versatile.c | 1 + + drivers/gpu/drm/qxl/qxl_drv.c | 2 - + drivers/gpu/drm/radeon/Kconfig | 2 +- + drivers/gpu/drm/radeon/atom.c | 18 +- + drivers/gpu/drm/radeon/cik.c | 2 +- + drivers/gpu/drm/radeon/clearstate_si.h | 3 +- + drivers/gpu/drm/radeon/r300.c | 6 +- + drivers/gpu/drm/radeon/r600.c | 2 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 8 +- + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 18 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 11 +- + drivers/gpu/drm/radeon/radeon_drv.c | 54 +- + drivers/gpu/drm/radeon/radeon_drv.h | 13 + + drivers/gpu/drm/radeon/radeon_encoders.c | 22 +- + drivers/gpu/drm/radeon/radeon_fbdev.c | 4 +- + drivers/gpu/drm/radeon/radeon_gart.c | 37 +- + drivers/gpu/drm/radeon/radeon_gem.c | 4 +- + drivers/gpu/drm/radeon/radeon_kms.c | 10 +- + drivers/gpu/drm/radeon/radeon_legacy_tv.c | 6 +- + drivers/gpu/drm/radeon/radeon_test.c | 8 +- + drivers/gpu/drm/radeon/radeon_vce.c | 4 +- + drivers/gpu/drm/radeon/rv770.c | 33 +- + drivers/gpu/drm/radeon/rv770_smc.c | 36 +- + drivers/gpu/drm/radeon/sislands_smc.h | 51 +- + drivers/gpu/drm/renesas/rcar-du/rcar_cmm.c | 6 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 11 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 2 + + drivers/gpu/drm/renesas/rcar-du/rcar_du_plane.c | 3 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c | 1 + + drivers/gpu/drm/renesas/rcar-du/rcar_dw_hdmi.c | 6 +- + drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c | 6 +- + drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 7 +- + drivers/gpu/drm/renesas/rcar-du/rzg2l_mipi_dsi.c | 7 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 9 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 6 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 8 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 6 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 9 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 10 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 - + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 1 - + drivers/gpu/drm/rockchip/rockchip_lvds.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 6 +- + drivers/gpu/drm/solomon/ssd130x.c | 203 ++- + drivers/gpu/drm/solomon/ssd130x.h | 3 + + drivers/gpu/drm/sprd/sprd_dpu.c | 4 +- + drivers/gpu/drm/sprd/sprd_drm.c | 3 +- + drivers/gpu/drm/sprd/sprd_dsi.c | 6 +- + drivers/gpu/drm/sti/sti_compositor.c | 5 +- + drivers/gpu/drm/sti/sti_drv.c | 8 +- + drivers/gpu/drm/sti/sti_dvo.c | 5 +- + drivers/gpu/drm/sti/sti_hda.c | 5 +- + drivers/gpu/drm/sti/sti_hdmi.c | 6 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 5 +- + drivers/gpu/drm/sti/sti_tvout.c | 5 +- + drivers/gpu/drm/stm/drv.c | 9 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 6 +- + drivers/gpu/drm/stm/ltdc.c | 1 - + drivers/gpu/drm/sun4i/sun4i_backend.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_frontend.c | 8 +- + drivers/gpu/drm/sun4i/sun4i_frontend.h | 1 + + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 8 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 12 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 6 +- + drivers/gpu/drm/sun4i/sun6i_drc.c | 6 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 6 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 8 +- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 3 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 8 +- + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 8 +- + drivers/gpu/drm/tegra/Kconfig | 2 +- + drivers/gpu/drm/tegra/dc.c | 3 +- + drivers/gpu/drm/tegra/dpaux.c | 8 +- + drivers/gpu/drm/tegra/drm.c | 2 - + drivers/gpu/drm/tegra/fbdev.c | 7 +- + drivers/gpu/drm/tegra/gem.c | 2 - + drivers/gpu/drm/tegra/gr2d.c | 19 +- + drivers/gpu/drm/tegra/gr3d.c | 18 +- + drivers/gpu/drm/tegra/hdmi.c | 51 +- + drivers/gpu/drm/tegra/hub.c | 2 +- + drivers/gpu/drm/tegra/nvdec.c | 21 +- + drivers/gpu/drm/tegra/sor.c | 6 +- + drivers/gpu/drm/tegra/vic.c | 19 +- + drivers/gpu/drm/tests/Makefile | 3 +- + drivers/gpu/drm/tests/drm_client_modeset_test.c | 8 - + drivers/gpu/drm/tests/drm_exec_test.c | 213 +++ + drivers/gpu/drm/tests/drm_framebuffer_test.c | 4 +- + drivers/gpu/drm/tests/drm_kunit_helpers.c | 141 +- + drivers/gpu/drm/tests/drm_modes_test.c | 8 - + drivers/gpu/drm/tests/drm_probe_helper_test.c | 8 - + drivers/gpu/drm/tidss/tidss_dispc.c | 59 +- + drivers/gpu/drm/tidss/tidss_dispc.h | 2 + + drivers/gpu/drm/tidss/tidss_drv.c | 9 +- + drivers/gpu/drm/tidss/tidss_encoder.c | 138 +- + drivers/gpu/drm/tidss/tidss_encoder.h | 5 +- + drivers/gpu/drm/tidss/tidss_kms.c | 12 +- + drivers/gpu/drm/tidss/tidss_plane.c | 3 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 6 +- + drivers/gpu/drm/tiny/ili9225.c | 7 +- + drivers/gpu/drm/tiny/ili9486.c | 4 + + drivers/gpu/drm/tiny/ofdrm.c | 6 +- + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 3 +- + drivers/gpu/drm/tiny/repaper.c | 2 +- + drivers/gpu/drm/tiny/simpledrm.c | 6 +- + drivers/gpu/drm/ttm/Makefile | 1 + + drivers/gpu/drm/ttm/tests/.kunitconfig | 4 + + drivers/gpu/drm/ttm/tests/Makefile | 6 + + drivers/gpu/drm/ttm/tests/ttm_device_test.c | 212 +++ + drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 113 ++ + drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 41 + + drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 437 +++++ + drivers/gpu/drm/ttm/ttm_bo.c | 4 +- + drivers/gpu/drm/tve200/tve200_drv.c | 8 +- + drivers/gpu/drm/udl/udl_modeset.c | 13 +- + drivers/gpu/drm/v3d/v3d_drv.c | 9 +- + drivers/gpu/drm/v3d/v3d_drv.h | 2 +- + drivers/gpu/drm/vc4/tests/vc4_mock.c | 12 + + drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 115 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 8 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 9 +- + drivers/gpu/drm/vc4/vc4_drv.c | 8 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 9 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 7 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 5 +- + drivers/gpu/drm/vc4/vc4_txp.c | 9 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 5 +- + drivers/gpu/drm/vc4/vc4_vec.c | 9 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_submit.c | 254 ++- + drivers/gpu/drm/vkms/vkms_composer.c | 105 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 12 +- + drivers/gpu/drm/vkms/vkms_drv.c | 20 +- + drivers/gpu/drm/vkms/vkms_drv.h | 17 +- + drivers/gpu/drm/vkms/vkms_formats.c | 149 +- + drivers/gpu/drm/vkms/vkms_formats.h | 2 +- + drivers/gpu/drm/vkms/vkms_writeback.c | 9 +- + drivers/gpu/drm/xen/xen_drm_front.c | 4 - + drivers/gpu/drm/xlnx/zynqmp_disp.c | 14 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 2 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 10 +- + drivers/gpu/host1x/bus.c | 29 +- + drivers/gpu/host1x/context.c | 10 +- + drivers/gpu/host1x/dev.c | 3 +- + drivers/gpu/ipu-v3/ipu-common.c | 2 +- + drivers/gpu/ipu-v3/ipu-pre.c | 4 +- + drivers/gpu/ipu-v3/ipu-prg.c | 5 +- + drivers/hid/hid-picolcd_fb.c | 1 - + drivers/hid/i2c-hid/Kconfig | 6 + + drivers/hid/i2c-hid/i2c-hid-core.c | 349 +++- + .../media/common/videobuf2/videobuf2-dma-contig.c | 3 - + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 3 - + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 3 - + drivers/media/test-drivers/vivid/Kconfig | 4 +- + drivers/media/test-drivers/vivid/vivid-osd.c | 4 +- + drivers/of/device.c | 1 + + drivers/of/property.c | 2 + + drivers/staging/fbtft/Kconfig | 1 + + drivers/staging/fbtft/fbtft-core.c | 2 +- + drivers/staging/sm750fb/sm750.c | 2 - + drivers/staging/sm750fb/sm750_accel.c | 1 - + drivers/staging/sm750fb/sm750_cursor.c | 1 - + drivers/staging/sm750fb/sm750_hw.c | 1 - + drivers/video/Kconfig | 4 +- + drivers/video/backlight/backlight.c | 6 +- + drivers/video/backlight/bd6107.c | 2 +- + drivers/video/backlight/gpio_backlight.c | 6 +- + drivers/video/backlight/lv5207lp.c | 2 +- + drivers/video/console/Kconfig | 2 +- + drivers/video/fbdev/68328fb.c | 2 +- + drivers/video/fbdev/Kconfig | 381 +--- + drivers/video/fbdev/acornfb.c | 6 +- + drivers/video/fbdev/amba-clcd.c | 1 - + drivers/video/fbdev/amifb.c | 5 +- + drivers/video/fbdev/arcfb.c | 1 - + drivers/video/fbdev/asiliantfb.c | 5 +- + drivers/video/fbdev/atafb.c | 1 - + drivers/video/fbdev/atmel_lcdfb.c | 6 +- + drivers/video/fbdev/aty/aty128fb.c | 17 +- + drivers/video/fbdev/aty/atyfb_base.c | 21 +- + drivers/video/fbdev/aty/radeon_backlight.c | 2 +- + drivers/video/fbdev/aty/radeon_base.c | 6 +- + drivers/video/fbdev/broadsheetfb.c | 82 +- + drivers/video/fbdev/bw2.c | 1 - + drivers/video/fbdev/carminefb.c | 6 +- + drivers/video/fbdev/cg14.c | 2 +- + drivers/video/fbdev/cg3.c | 1 - + drivers/video/fbdev/cg6.c | 2 +- + drivers/video/fbdev/chipsfb.c | 5 +- + drivers/video/fbdev/cirrusfb.c | 3 +- + drivers/video/fbdev/clps711x-fb.c | 1 - + drivers/video/fbdev/cobalt_lcdfb.c | 1 - + drivers/video/fbdev/controlfb.c | 2 +- + drivers/video/fbdev/core/Kconfig | 198 ++ + drivers/video/fbdev/core/Makefile | 11 +- + drivers/video/fbdev/core/fb_backlight.c | 33 + + drivers/video/fbdev/core/fb_chrdev.c | 485 +++++ + drivers/video/fbdev/core/fb_info.c | 79 + + drivers/video/fbdev/core/fb_internal.h | 67 + + drivers/video/fbdev/core/fb_procfs.c | 62 + + drivers/video/fbdev/core/fbcon.c | 7 +- + drivers/video/fbdev/core/fbmem.c | 592 +----- + drivers/video/fbdev/core/fbsysfs.c | 138 +- + drivers/video/fbdev/cyber2000fb.c | 2 +- + drivers/video/fbdev/da8xx-fb.c | 5 +- + drivers/video/fbdev/efifb.c | 5 +- + drivers/video/fbdev/ep93xx-fb.c | 22 +- + drivers/video/fbdev/ffb.c | 3 +- + drivers/video/fbdev/fm2fb.c | 5 +- + drivers/video/fbdev/fsl-diu-fb.c | 32 +- + drivers/video/fbdev/g364fb.c | 6 +- + drivers/video/fbdev/gbefb.c | 1 - + drivers/video/fbdev/geode/Kconfig | 12 +- + drivers/video/fbdev/geode/gx1fb_core.c | 6 +- + drivers/video/fbdev/geode/gxfb_core.c | 6 +- + drivers/video/fbdev/geode/lxfb_core.c | 6 +- + drivers/video/fbdev/goldfishfb.c | 5 +- + drivers/video/fbdev/grvga.c | 6 +- + drivers/video/fbdev/gxt4500.c | 7 +- + drivers/video/fbdev/hecubafb.c | 80 +- + drivers/video/fbdev/hgafb.c | 2 +- + drivers/video/fbdev/hitfb.c | 2 +- + drivers/video/fbdev/hpfb.c | 1 - + drivers/video/fbdev/hyperv_fb.c | 3 +- + drivers/video/fbdev/i740fb.c | 6 +- + drivers/video/fbdev/i810/i810_main.c | 4 +- + drivers/video/fbdev/imsttfb.c | 3 +- + drivers/video/fbdev/imxfb.c | 7 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 5 +- + drivers/video/fbdev/kyro/fbdev.c | 5 +- + drivers/video/fbdev/leo.c | 1 - + drivers/video/fbdev/macfb.c | 5 +- + drivers/video/fbdev/matrox/matroxfb_crtc2.c | 5 +- + drivers/video/fbdev/maxinefb.c | 5 +- + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 15 +- + drivers/video/fbdev/metronomefb.c | 78 +- + drivers/video/fbdev/mmp/fb/Kconfig | 4 +- + drivers/video/fbdev/mmp/fb/mmpfb.c | 6 +- + drivers/video/fbdev/mx3fb.c | 5 +- + drivers/video/fbdev/neofb.c | 2 +- + drivers/video/fbdev/nvidia/nv_backlight.c | 2 +- + drivers/video/fbdev/nvidia/nvidia.c | 12 +- + drivers/video/fbdev/ocfb.c | 4 +- + drivers/video/fbdev/offb.c | 6 +- + drivers/video/fbdev/omap/Kconfig | 4 +- + drivers/video/fbdev/omap/omapfb_main.c | 5 +- + drivers/video/fbdev/omap2/omapfb/Kconfig | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 1 - + drivers/video/fbdev/p9100.c | 1 - + drivers/video/fbdev/platinumfb.c | 5 +- + drivers/video/fbdev/pm2fb.c | 3 +- + drivers/video/fbdev/pm3fb.c | 3 +- + drivers/video/fbdev/pmag-aa-fb.c | 5 +- + drivers/video/fbdev/pmag-ba-fb.c | 5 +- + drivers/video/fbdev/pmagb-b-fb.c | 5 +- + drivers/video/fbdev/ps3fb.c | 6 +- + drivers/video/fbdev/pvr2fb.c | 2 +- + drivers/video/fbdev/pxa168fb.c | 8 +- + drivers/video/fbdev/pxafb.c | 6 +- + drivers/video/fbdev/q40fb.c | 5 +- + drivers/video/fbdev/riva/fbdev.c | 13 +- + drivers/video/fbdev/s1d13xxxfb.c | 4 +- + drivers/video/fbdev/s3c-fb.c | 5 +- + drivers/video/fbdev/sa1100fb.c | 1 - + drivers/video/fbdev/savage/savagefb_driver.c | 3 +- + drivers/video/fbdev/sh7760fb.c | 54 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 2 - + drivers/video/fbdev/simplefb.c | 5 +- + drivers/video/fbdev/sis/sis_main.c | 5 +- + drivers/video/fbdev/skeletonfb.c | 2 +- + drivers/video/fbdev/sm501fb.c | 4 +- + drivers/video/fbdev/sm712fb.c | 10 +- + drivers/video/fbdev/smscufx.c | 6 +- + drivers/video/fbdev/ssd1307fb.c | 69 +- + drivers/video/fbdev/sstfb.c | 5 +- + drivers/video/fbdev/sunxvr1000.c | 5 +- + drivers/video/fbdev/sunxvr2500.c | 5 +- + drivers/video/fbdev/sunxvr500.c | 1 - + drivers/video/fbdev/tcx.c | 1 - + drivers/video/fbdev/tdfxfb.c | 6 +- + drivers/video/fbdev/tgafb.c | 2 +- + drivers/video/fbdev/tridentfb.c | 2 +- + drivers/video/fbdev/udlfb.c | 2 +- + drivers/video/fbdev/uvesafb.c | 7 +- + drivers/video/fbdev/valkyriefb.c | 5 +- + drivers/video/fbdev/vermilion/vermilion.c | 2 +- + drivers/video/fbdev/vesafb.c | 6 +- + drivers/video/fbdev/vfb.c | 1 - + drivers/video/fbdev/vga16fb.c | 2 +- + drivers/video/fbdev/via/viafbdev.c | 2 +- + drivers/video/fbdev/vt8500lcdfb.c | 3 +- + drivers/video/fbdev/wm8505fb.c | 3 +- + drivers/video/fbdev/xen-fbfront.c | 63 +- + drivers/video/fbdev/xilinxfb.c | 5 +- + drivers/video/logo/Kconfig | 2 +- + include/drm/bridge/dw_hdmi.h | 2 + + include/drm/drm_bridge.h | 3 + + include/drm/drm_crtc.h | 5 - + include/drm/drm_debugfs.h | 25 + + include/drm/drm_drv.h | 32 +- + include/drm/drm_exec.h | 123 ++ + include/drm/drm_file.h | 8 +- + include/drm/drm_gem.h | 82 + + include/drm/drm_gem_dma_helper.h | 14 +- + include/drm/drm_gem_shmem_helper.h | 19 +- + include/drm/drm_gem_vram_helper.h | 9 +- + include/drm/drm_gpuva_mgr.h | 706 ++++++++ + include/drm/drm_kunit_helpers.h | 7 + + include/drm/drm_modeset_helper_vtables.h | 48 +- + include/drm/drm_panel.h | 96 + + include/drm/drm_plane.h | 2 +- + include/drm/drm_prime.h | 7 - + include/drm/drm_syncobj.h | 6 +- + include/drm/drm_sysfs.h | 4 +- + include/drm/task_barrier.h | 4 +- + include/drm/ttm/ttm_bo.h | 2 - + include/linux/efi.h | 3 +- + include/linux/fb.h | 60 +- + include/linux/platform_data/bd6107.h | 2 +- + include/linux/platform_data/gpio_backlight.h | 2 +- + include/linux/platform_data/lv5207lp.h | 2 +- + include/linux/sysfb.h | 3 +- + include/uapi/drm/drm.h | 84 +- + include/uapi/drm/drm_mode.h | 7 +- + include/uapi/drm/ivpu_accel.h | 9 +- + include/uapi/drm/nouveau_drm.h | 265 ++- + include/uapi/drm/virtgpu_drm.h | 16 +- + samples/Kconfig | 4 +- + samples/vfio-mdev/mdpy-fb.c | 5 +- + 1099 files changed, 32066 insertions(+), 9574 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/startek,kd070fhfid015.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/visionox,r66451.yaml + create mode 100644 Documentation/gpu/amdgpu/flashing.rst + create mode 100644 drivers/accel/ivpu/ivpu_debugfs.c + create mode 100644 drivers/accel/ivpu/ivpu_debugfs.h + create mode 100644 drivers/accel/ivpu/ivpu_fw_log.c + create mode 100644 drivers/accel/ivpu/ivpu_fw_log.h + rename drivers/accel/ivpu/{ivpu_hw_mtl.c => ivpu_hw_37xx.c} (52%) + create mode 100644 drivers/accel/ivpu/ivpu_hw_37xx_reg.h + create mode 100644 drivers/accel/ivpu/ivpu_hw_40xx.c + create mode 100644 drivers/accel/ivpu/ivpu_hw_40xx_reg.h + delete mode 100644 drivers/accel/ivpu/ivpu_hw_mtl_reg.h + rename drivers/gpu/drm/{nouveau/nvkm/subdev/fb/ramga102.c => amd/amdgpu/amdgpu_amdkfd_aldebaran.h} (69%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c + rename drivers/gpu/drm/amd/amdgpu/{aqua_vanjaram_reg_init.c => aqua_vanjaram.c} (99%) + delete mode 100644 drivers/gpu/drm/amd/display/dmub/inc/dmub_subvp_state.h + create mode 100644 drivers/gpu/drm/drm_exec.c + create mode 100644 drivers/gpu/drm/drm_gpuva_mgr.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_defines.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_tlb.c + create mode 100644 drivers/gpu/drm/i915/gt/intel_tlb.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_debugfs.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc_debugfs.h + create mode 100644 drivers/gpu/drm/loongson/Kconfig + create mode 100644 drivers/gpu/drm/loongson/Makefile + create mode 100644 drivers/gpu/drm/loongson/loongson_device.c + create mode 100644 drivers/gpu/drm/loongson/loongson_module.c + create mode 100644 drivers/gpu/drm/loongson/loongson_module.h + create mode 100644 drivers/gpu/drm/loongson/lsdc_benchmark.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_benchmark.h + create mode 100644 drivers/gpu/drm/loongson/lsdc_crtc.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_debugfs.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_drv.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_drv.h + create mode 100644 drivers/gpu/drm/loongson/lsdc_gem.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_gem.h + create mode 100644 drivers/gpu/drm/loongson/lsdc_gfxpll.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_gfxpll.h + create mode 100644 drivers/gpu/drm/loongson/lsdc_i2c.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_i2c.h + create mode 100644 drivers/gpu/drm/loongson/lsdc_irq.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_irq.h + create mode 100644 drivers/gpu/drm/loongson/lsdc_output.h + create mode 100644 drivers/gpu/drm/loongson/lsdc_output_7a1000.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_output_7a2000.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_pixpll.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_pixpll.h + create mode 100644 drivers/gpu/drm/loongson/lsdc_plane.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_probe.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_probe.h + create mode 100644 drivers/gpu/drm/loongson/lsdc_regs.h + create mode 100644 drivers/gpu/drm/loongson/lsdc_ttm.c + create mode 100644 drivers/gpu/drm/loongson/lsdc_ttm.h + create mode 100644 drivers/gpu/drm/nouveau/nouveau_exec.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_exec.h + create mode 100644 drivers/gpu/drm/nouveau/nouveau_sched.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_sched.h + create mode 100644 drivers/gpu/drm/nouveau/nouveau_uvmm.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_uvmm.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp102.c + create mode 100644 drivers/gpu/drm/panel/panel-startek-kd070fhfid015.c + create mode 100644 drivers/gpu/drm/panel/panel-visionox-r66451.c + create mode 100644 drivers/gpu/drm/tests/drm_exec_test.c + create mode 100644 drivers/gpu/drm/ttm/tests/.kunitconfig + create mode 100644 drivers/gpu/drm/ttm/tests/Makefile + create mode 100644 drivers/gpu/drm/ttm/tests/ttm_device_test.c + create mode 100644 drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c + create mode 100644 drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h + create mode 100644 drivers/gpu/drm/ttm/tests/ttm_pool_test.c + create mode 100644 drivers/video/fbdev/core/Kconfig + create mode 100644 drivers/video/fbdev/core/fb_backlight.c + create mode 100644 drivers/video/fbdev/core/fb_chrdev.c + create mode 100644 drivers/video/fbdev/core/fb_info.c + create mode 100644 drivers/video/fbdev/core/fb_internal.h + create mode 100644 drivers/video/fbdev/core/fb_procfs.c + create mode 100644 include/drm/drm_exec.h + create mode 100644 include/drm/drm_gpuva_mgr.h +Merging drm-misc/for-linux-next (f5d8f9c0d8b4 drm/panel: JDI LT070ME05000 simplify with dev_err_probe()) + f5d8f9c0d8b4 ("drm/panel: JDI LT070ME05000 simplify with dev_err_probe()") +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/panel/panel-jdi-lt070me05000.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_vop.c +Merge made by the 'ort' strategy. + .../bindings/display/panel/panel-simple.yaml | 2 + + .../display/rockchip/rockchip,dw-mipi-dsi.yaml | 2 + + .../bindings/display/rockchip/rockchip-vop.yaml | 1 + + drivers/gpu/drm/Kconfig | 2 +- + drivers/gpu/drm/bridge/Kconfig | 2 + + drivers/gpu/drm/bridge/cadence/Kconfig | 1 + + drivers/gpu/drm/bridge/lvds-codec.c | 12 ++--- + drivers/gpu/drm/bridge/panel.c | 16 +++++++ + drivers/gpu/drm/bridge/samsung-dsim.c | 20 ++++++-- + drivers/gpu/drm/loongson/lsdc_pixpll.c | 6 ++- + drivers/gpu/drm/nouveau/nouveau_drv.h | 19 ++------ + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 4 -- + drivers/gpu/drm/panel/panel-simple.c | 29 ++++++++++++ + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 20 ++++++++ + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 24 ++++------ + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 39 ++++++++------- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 55 ++++++++++++++++++++++ + include/drm/bridge/samsung-dsim.h | 1 + + include/uapi/drm/ivpu_accel.h | 18 ++++++- + 19 files changed, 204 insertions(+), 69 deletions(-) +Merging amdgpu/drm-next (6be2ad4f0073 drm/amdgpu: don't allow userspace to create a doorbell BO) + 15f5b0a7abb7 ("drm/amd/pm: correct the pcie width for smu 13.0.0") + 161c908d6a44 ("drm/amdgpu: Match against exact bootloader status") + 2b4adeb34f99 ("drm/amdkfd: disable IOMMUv2 support for Raven") + 30a56f3243b2 ("drm/amd/display: check attr flag before set cursor degamma on DCN3+") + 3b885ab27f36 ("drm/amd/pm: Fix SMU v13.0.6 energy reporting") + 41519dc45535 ("drm/amd/display: Don't show stack trace for missing eDP") + 510d242f498a ("drm/amd/pm: disable the SMU13 OD feature support temporarily") + 70e64c4d522b ("drm/amd: Disable S/G for APUs when 64GB or more host memory") + 73b0648179c5 ("drm/amdgpu: fix possible UAF in amdgpu_cs_pass1()") + 7ffcbd1a1f59 ("drm/amd/display: Fix a regression on Polaris cards") + 81af32520e7a ("drm/amdgpu/gfx11: only enable CP GFX shadowing on SR-IOV") + 95979df25be5 ("drm/amdkfd: ignore crat by default") + 99c150199659 ("drm/amdkfd: disable IOMMUv2 support for KV/CZ") + d68a1145dcf1 ("drm/amd/pm: skip the RLC stop when S0i3 suspend for SMU v13.0.4/11") +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_crat.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_crat.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging 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 +Recorded preimage for 'drivers/gpu/drm/amd/amdkfd/kfd_crat.c' +Recorded preimage for 'drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/amdkfd/kfd_crat.c'. +Recorded resolution for 'drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c'. +[master 776d5c8ed000] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 10 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 76 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 82 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c | 109 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 89 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 148 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 37 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 26 - + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 16 - + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 769 +++++++++++++++ + drivers/gpu/drm/amd/amdgpu/ih_v6_1.h | 28 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 12 - + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 25 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 6 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 270 ++++++ + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.h | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 66 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 27 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 42 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 3 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 6 +- + drivers/gpu/drm/amd/amdkfd/Kconfig | 1 - + drivers/gpu/drm/amd/amdkfd/Makefile | 4 - + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 811 ++++++++-------- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 5 + + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 22 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 73 -- + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 39 - + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 14 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 6 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 81 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v10.c | 2 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 2 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 133 +-- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 233 ++--- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 82 -- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 51 +- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 356 ------- + drivers/gpu/drm/amd/amdkfd/kfd_iommu.h | 84 -- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 27 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 27 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 45 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 56 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 23 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 61 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 111 +-- + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 76 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 14 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 12 - + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 74 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 9 - + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 183 ++++ + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.h | 46 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 32 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 32 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.h | 7 - + .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 26 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 6 +- + .../drm/amd/display/dc/clk_mgr/dcn316/dcn316_smu.c | 18 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 125 +-- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 5 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 605 +++++------- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 3 +- + drivers/gpu/drm/amd/display/dc/dc.h | 18 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 29 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 29 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 41 + + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 2 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 6 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 303 ++++++ + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.h | 58 ++ + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 8 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 12 +- + .../display/dc/dce110/dce110_timing_generator.c | 4 +- + .../amd/display/dc/dce112/dce112_hw_sequencer.c | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 5 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 15 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 25 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 15 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 7 +- + .../drm/amd/display/dc/dcn201/dcn201_resource.c | 15 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 3 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 2 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 3 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 3 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 15 +- + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 16 +- + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 3 +- + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 28 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h | 61 ++ + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 182 ++-- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 8 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 2 +- + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 2 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 6 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 4 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 4 +- + drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h | 40 +- + drivers/gpu/drm/amd/display/dc/gpio/hpd_regs.h | 10 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 57 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 10 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 14 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 21 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 2 +- + .../drm/amd/display/dc/link/hwss/link_hwss_dio.c | 3 + + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 7 + + .../display/dc/link/protocols/link_dp_capability.c | 10 + + .../dc/link/protocols/link_edp_panel_control.c | 165 ++++ + .../dc/link/protocols/link_edp_panel_control.h | 8 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 430 +++++++++ + .../drm/amd/display/include/ddc_service_types.h | 1 + + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 5 +- + .../drm/amd/display/modules/color/color_gamma.c | 5 +- + .../drm/amd/display/modules/power/power_helpers.c | 5 + + .../drm/amd/display/modules/power/power_helpers.h | 2 + + .../amd/include/asic_reg/nbio/nbio_7_9_0_sh_mask.h | 8 + + .../amd/include/asic_reg/oss/osssys_6_1_0_offset.h | 279 ++++++ + .../include/asic_reg/oss/osssys_6_1_0_sh_mask.h | 1019 ++++++++++++++++++++ + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 15 +- + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 48 +- + drivers/gpu/drm/amd/pm/legacy-dpm/r600_dpm.h | 3 +- + drivers/gpu/drm/amd/pm/legacy-dpm/sislands_smc.h | 63 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 16 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c | 21 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/common_baco.c | 2 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/fiji_baco.c | 24 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/hwmgr.c | 6 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/polaris_baco.c | 30 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.h | 6 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.h | 3 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppevvmath.h | 14 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h | 3 +- + .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 16 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 30 +- + .../drm/amd/pm/powerplay/hwmgr/smu7_powertune.c | 15 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/tonga_baco.c | 30 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_baco.c | 26 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 9 +- + .../drm/amd/pm/powerplay/hwmgr/vega10_powertune.c | 89 +- + .../drm/amd/pm/powerplay/hwmgr/vega10_pptable.h | 18 +- + .../pm/powerplay/hwmgr/vega10_processpptables.c | 6 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_baco.c | 12 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 10 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.h | 3 +- + .../drm/amd/pm/powerplay/hwmgr/vega12_pptable.h | 11 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.c | 7 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 12 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.h | 6 +- + .../drm/amd/pm/powerplay/hwmgr/vega20_pptable.h | 19 +- + .../gpu/drm/amd/pm/powerplay/inc/hardwaremanager.h | 3 +- + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 8 +- + drivers/gpu/drm/amd/pm/powerplay/inc/pp_thermal.h | 6 +- + drivers/gpu/drm/amd/pm/powerplay/inc/smu7.h | 6 +- + drivers/gpu/drm/amd/pm/powerplay/inc/smu71.h | 22 +- + drivers/gpu/drm/amd/pm/powerplay/inc/smu73.h | 45 +- + .../gpu/drm/amd/pm/powerplay/inc/smu73_discrete.h | 73 +- + drivers/gpu/drm/amd/pm/powerplay/inc/smu75.h | 12 +- + drivers/gpu/drm/amd/pm/powerplay/inc/smu7_fusion.h | 42 +- + .../gpu/drm/amd/pm/powerplay/inc/smu9_driver_if.h | 20 +- + .../gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/smumgr/fiji_smumgr.c | 2 +- + .../drm/amd/pm/powerplay/smumgr/iceland_smumgr.c | 2 +- + .../drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/smumgr/vegam_smumgr.c | 7 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 23 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 7 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 12 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 7 +- + .../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 | 80 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/smu_internal.h | 4 +- + drivers/gpu/drm/drm_buddy.c | 8 +- + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 12 +- + include/uapi/drm/amdgpu_drm.h | 7 +- + 242 files changed, 6251 insertions(+), 3786 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v6_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v6_1.h + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_iommu.c + delete mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_iommu.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_replay.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dmub_replay.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_6_1_0_sh_mask.h +Merging drm-intel/for-linux-next (95c23e2085f2 drm/i915/dp: Fix LT debug print in SDP CRC enable) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_crt.c | 6 -- + drivers/gpu/drm/i915/display/intel_dp.c | 6 -- + .../gpu/drm/i915/display/intel_dp_link_training.c | 12 +-- + drivers/gpu/drm/i915/display/intel_hdmi.c | 6 -- + drivers/gpu/drm/i915/display/intel_hotplug.c | 85 ++++++++++++++++++++-- + drivers/gpu/drm/i915/display/intel_vdsc.c | 12 ++- + 6 files changed, 94 insertions(+), 33 deletions(-) +Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (d93cf453f51d drm/msm/dpu: fix the irq index in dpu_encoder_phys_wb_wait_for_commit_done) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Auto-merging Documentation/devicetree/bindings/display/msm/qcom,sm8350-mdss.yaml +Auto-merging Documentation/devicetree/bindings/display/msm/qcom,sm8450-mdss.yaml +Auto-merging Documentation/devicetree/bindings/display/msm/qcom,sm8550-mdss.yaml +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Auto-merging drivers/gpu/drm/msm/msm_mdss.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_mdss.c +Resolved 'drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h' using previous resolution. +Resolved 'drivers/gpu/drm/msm/msm_mdss.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b39981c9c007] Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/qcom,dispcc-sm6125.yaml | 24 +- + .../bindings/display/msm/dp-controller.yaml | 1 + + .../bindings/display/msm/dsi-controller-main.yaml | 6 + + .../bindings/display/msm/dsi-phy-14nm.yaml | 11 + + .../bindings/display/msm/mdss-common.yaml | 6 + + .../bindings/display/msm/qcom,sc7180-dpu.yaml | 5 +- + .../bindings/display/msm/qcom,sm6125-mdss.yaml | 213 +++++++++ + .../bindings/display/msm/qcom,sm6350-mdss.yaml | 7 - + .../bindings/display/msm/qcom,sm6375-mdss.yaml | 7 - + .../bindings/display/msm/qcom,sm8350-mdss.yaml | 6 + + .../bindings/display/msm/qcom,sm8450-mdss.yaml | 8 + + .../bindings/display/msm/qcom,sm8550-mdss.yaml | 8 + + .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 347 +++++++++----- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 369 ++++++++++----- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 434 +++++++++++------ + .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 473 +++++++++++++------ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 223 +++++++++ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 453 ++++++++++++------ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 202 +++++--- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 106 +++-- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 207 ++++++--- + .../drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 104 +++-- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 113 +++-- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 439 ++++++++++++------ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 264 +++++++---- + .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 511 +++++++++++++++------ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 467 +++++++++++++------ + .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 492 ++++++++++++++------ + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 161 +++---- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h | 35 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 109 ++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 2 - + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 8 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 18 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 251 +++------- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 60 +-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 106 +++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 18 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 22 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 24 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 5 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 18 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 34 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 112 ++++- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 39 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 23 - + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 3 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 3 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 2 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 7 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + + drivers/gpu/drm/msm/msm_drv.c | 42 +- + drivers/gpu/drm/msm/msm_drv.h | 10 +- + drivers/gpu/drm/msm/msm_gpu.c | 1 - + drivers/gpu/drm/msm/msm_mdss.c | 85 ++-- + drivers/gpu/drm/msm/msm_mdss.h | 27 ++ + 64 files changed, 4454 insertions(+), 2308 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm6125-mdss.yaml + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h + create mode 100644 drivers/gpu/drm/msm/msm_mdss.h +Merging drm-msm-lumag/msm-next-lumag (d93cf453f51d drm/msm/dpu: fix the irq index in dpu_encoder_phys_wb_wait_for_commit_done) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging etnaviv/etnaviv/next (88c31d2dd191 drm/etnaviv: fix error code in event_alloc()) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 11 +- + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 3 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 14 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 - + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 3 - + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 188 +++++++++++++++------------ + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 13 +- + drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 63 +++++++++ + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 3 + + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 5 +- + 11 files changed, 201 insertions(+), 107 deletions(-) +Merging fbdev/for-next (87ac8777d424 fbdev: mx3fb: Remove the driver) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/Kconfig +CONFLICT (content): Merge conflict in drivers/video/fbdev/Kconfig +Auto-merging drivers/video/fbdev/amifb.c +CONFLICT (modify/delete): drivers/video/fbdev/mx3fb.c deleted in fbdev/for-next and modified in HEAD. Version HEAD of drivers/video/fbdev/mx3fb.c left in tree. +Auto-merging drivers/video/fbdev/ssd1307fb.c +Resolved 'drivers/video/fbdev/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/video/fbdev/mx3fb.c +rm 'drivers/video/fbdev/mx3fb.c' +$ git commit --no-edit -v -a +[master bccf25ff035a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git +$ git diff -M --stat --summary HEAD^.. + drivers/video/fbdev/Kconfig | 11 - + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/amifb.c | 2 +- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 4 +- + drivers/video/fbdev/mx3fb.c | 1695 ----------------------------- + drivers/video/fbdev/ssd1307fb.c | 4 +- + include/linux/platform_data/video-mx3fb.h | 50 - + 7 files changed, 6 insertions(+), 1761 deletions(-) + delete mode 100644 drivers/video/fbdev/mx3fb.c + delete mode 100644 include/linux/platform_data/video-mx3fb.h +Merging regmap/for-next (26fc7cfa30d6 Merge remote-tracking branch 'regmap/for-6.6' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/Kconfig | 12 ++- + drivers/base/regmap/regcache-maple.c | 16 ++-- + drivers/base/regmap/regcache-rbtree.c | 12 +-- + drivers/base/regmap/regcache.c | 38 +++++---- + drivers/base/regmap/regmap-kunit.c | 40 +++++++++ + drivers/base/regmap/regmap-mmio.c | 24 ------ + drivers/base/regmap/regmap.c | 122 --------------------------- + include/linux/regmap.h | 1 + + sound/hda/hdac_regmap.c | 9 +- + tools/testing/kunit/configs/all_tests.config | 2 + + 10 files changed, 94 insertions(+), 182 deletions(-) +Merging sound/for-next (ff7a0b4016cb ALSA: dice: add stream format parameters for Weiss devices) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging drivers/media/dvb-frontends/dib7000p.c +Auto-merging drivers/media/dvb-frontends/drxk_hard.c +Auto-merging drivers/media/dvb-frontends/mn88443x.c +Auto-merging include/linux/device.h +Auto-merging include/linux/minmax.h +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/soc/codecs/es8316.c +Auto-merging sound/soc/codecs/rt722-sdca-sdw.c +Auto-merging sound/soc/codecs/wm8904.c +Auto-merging sound/soc/fsl/fsl_spdif.c +Auto-merging tools/testing/kunit/configs/all_tests.config +Merge made by the 'ort' strategy. + Documentation/core-api/kernel-api.rst | 7 +- + .../devicetree/bindings/sound/audio-iio-aux.yaml | 64 ++ + .../devicetree/bindings/sound/fsl,rpmsg.yaml | 1 + + .../bindings/sound/mediatek,mt8188-afe.yaml | 7 + + .../devicetree/bindings/sound/nau8821.txt | 55 -- + .../devicetree/bindings/sound/nuvoton,nau8821.yaml | 125 +++ + .../devicetree/bindings/sound/nuvoton,nau8822.yaml | 12 + + .../bindings/sound/qcom,msm8916-wcd-analog.txt | 101 -- + .../sound/qcom,pm8916-wcd-analog-codec.yaml | 153 +++ + .../devicetree/bindings/sound/simple-card.yaml | 53 + + .../devicetree/bindings/sound/wlf,wm8904.yaml | 74 ++ + Documentation/devicetree/bindings/sound/wm8904.txt | 33 - + Documentation/driver-api/media/dtv-common.rst | 9 - + drivers/iio/inkern.c | 86 +- + drivers/media/dvb-core/Makefile | 2 +- + drivers/media/dvb-frontends/af9013_priv.h | 2 +- + drivers/media/dvb-frontends/af9033_priv.h | 2 +- + drivers/media/dvb-frontends/cxd2820r_priv.h | 2 +- + drivers/media/dvb-frontends/cxd2841er.c | 2 +- + .../cxd2880/cxd2880_tnrdmd_dvbt2_mon.c | 2 +- + .../cxd2880/cxd2880_tnrdmd_dvbt_mon.c | 2 +- + drivers/media/dvb-frontends/cxd2880/cxd2880_top.c | 2 +- + drivers/media/dvb-frontends/dib7000p.c | 2 +- + drivers/media/dvb-frontends/dib8000.c | 2 +- + drivers/media/dvb-frontends/dib9000.c | 2 +- + drivers/media/dvb-frontends/drxk_hard.c | 2 +- + drivers/media/dvb-frontends/lgdt3305.c | 2 +- + drivers/media/dvb-frontends/lgdt3306a.c | 2 +- + drivers/media/dvb-frontends/lgdt330x.c | 2 +- + drivers/media/dvb-frontends/m88ds3103_priv.h | 2 +- + drivers/media/dvb-frontends/mn88443x.c | 2 +- + drivers/media/dvb-frontends/mn88472_priv.h | 2 +- + drivers/media/dvb-frontends/mn88473_priv.h | 2 +- + drivers/media/dvb-frontends/or51132.c | 2 +- + drivers/media/dvb-frontends/or51211.c | 2 +- + drivers/media/dvb-frontends/rtl2830_priv.h | 2 +- + drivers/media/dvb-frontends/rtl2832_priv.h | 2 +- + drivers/media/dvb-frontends/si2165.c | 2 +- + drivers/media/dvb-frontends/stv0367.c | 2 +- + drivers/media/dvb-frontends/tc90522.c | 2 +- + drivers/media/dvb-frontends/tda10048.c | 2 +- + drivers/staging/greybus/audio_codec.c | 18 +- + drivers/staging/greybus/audio_codec.h | 1 + + drivers/staging/greybus/audio_helper.c | 20 +- + include/linux/device.h | 26 + + include/linux/iio/consumer.h | 37 +- + include/{media/dvb_math.h => linux/int_log.h} | 18 +- + include/linux/minmax.h | 64 ++ + include/linux/pci_ids.h | 106 +- + include/linux/platform_device.h | 28 + + include/sound/control.h | 31 +- + include/sound/cs35l41.h | 5 +- + include/sound/cs35l56.h | 29 +- + include/sound/emu10k1.h | 20 +- + include/sound/hda_codec.h | 3 - + include/sound/hdaudio.h | 26 + + include/sound/info.h | 2 - + include/sound/simple_card_utils.h | 5 +- + include/sound/soc-dai.h | 3 + + include/sound/soc-dapm.h | 138 ++- + include/sound/soc.h | 6 + + lib/math/Makefile | 2 +- + .../dvb-core/dvb_math.c => lib/math/int_log.c | 26 +- + sound/Kconfig | 4 - + sound/ac97/bus.c | 2 +- + sound/atmel/ac97c.c | 3 +- + sound/core/control.c | 126 ++- + sound/core/control_compat.c | 2 +- + sound/core/control_led.c | 2 +- + sound/core/jack.c | 2 - + sound/core/oss/mixer_oss.c | 10 +- + sound/core/pcm.c | 2 - + sound/core/vmaster.c | 28 + + sound/drivers/pcmtest.c | 55 +- + sound/drivers/serial-generic.c | 2 +- + sound/firewire/dice/Makefile | 2 +- + sound/firewire/dice/dice-weiss.c | 104 ++ + sound/firewire/dice/dice.c | 63 ++ + sound/firewire/dice/dice.h | 1 + + sound/hda/hdac_i915.c | 21 +- + sound/hda/intel-dsp-config.c | 152 ++- + sound/isa/sb/emu8000.c | 2 - + sound/isa/sb/sb16_csp.c | 2 - + sound/pci/ac97/ac97_patch.c | 22 +- + sound/pci/ca0106/ca0106_mixer.c | 30 +- + sound/pci/cmipci.c | 6 +- + sound/pci/cs46xx/cs46xx_lib.c | 7 +- + sound/pci/emu10k1/emu10k1.c | 13 +- + sound/pci/emu10k1/emu10k1_main.c | 98 +- + sound/pci/emu10k1/emu10k1_synth.c | 10 +- + sound/pci/emu10k1/emufx.c | 17 +- + sound/pci/emu10k1/emumixer.c | 89 +- + sound/pci/emu10k1/emumpu401.c | 40 +- + sound/pci/emu10k1/emupcm.c | 17 +- + sound/pci/emu10k1/emuproc.c | 23 +- + sound/pci/emu10k1/io.c | 12 +- + sound/pci/emu10k1/irq.c | 13 +- + sound/pci/emu10k1/p16v.h | 56 -- + sound/pci/emu10k1/p17v.h | 1 - + sound/pci/emu10k1/timer.c | 8 +- + sound/pci/emu10k1/tina2.h | 1 - + sound/pci/emu10k1/voice.c | 12 +- + sound/pci/es1968.c | 15 +- + sound/pci/hda/Kconfig | 31 + + sound/pci/hda/Makefile | 6 + + sound/pci/hda/cs35l41_hda.c | 297 ++++-- + sound/pci/hda/cs35l56_hda.c | 1034 ++++++++++++++++++++ + sound/pci/hda/cs35l56_hda.h | 48 + + sound/pci/hda/cs35l56_hda_i2c.c | 69 ++ + sound/pci/hda/cs35l56_hda_spi.c | 68 ++ + sound/pci/hda/hda_auto_parser.h | 2 + + sound/pci/hda/hda_codec.c | 2 - + sound/pci/hda/hda_component.h | 2 + + sound/pci/hda/hda_generic.h | 3 + + sound/pci/hda/hda_intel.c | 375 +++---- + sound/pci/hda/hda_tegra.c | 7 +- + sound/pci/hda/patch_hdmi.c | 5 +- + sound/pci/hda/patch_realtek.c | 10 +- + sound/pci/ice1712/juli.c | 28 +- + sound/pci/ice1712/psc724.c | 19 +- + sound/pci/ice1712/quartet.c | 24 +- + sound/pci/ice1712/wm8776.c | 6 +- + sound/pci/maestro3.c | 15 +- + sound/pci/via82xx.c | 6 +- + sound/ppc/awacs.c | 1 + + sound/ppc/burgundy.c | 1 + + sound/soc/Kconfig | 11 + + sound/soc/amd/Kconfig | 5 +- + sound/soc/amd/acp-config.c | 33 + + sound/soc/amd/acp/Kconfig | 8 + + sound/soc/amd/acp/Makefile | 2 + + sound/soc/amd/acp/acp-i2s.c | 2 + + sound/soc/amd/acp/acp-legacy-common.c | 347 +++++++ + sound/soc/amd/acp/acp-mach-common.c | 267 +++++ + sound/soc/amd/acp/acp-mach.h | 2 + + sound/soc/amd/acp/acp-pci.c | 57 +- + sound/soc/amd/acp/acp-pdm.c | 13 +- + sound/soc/amd/acp/acp-platform.c | 6 +- + sound/soc/amd/acp/acp-rembrandt.c | 184 ++-- + sound/soc/amd/acp/acp-renoir.c | 115 +-- + sound/soc/amd/acp/acp-sof-mach.c | 16 + + sound/soc/amd/acp/amd.h | 51 + + sound/soc/amd/mach-config.h | 1 + + sound/soc/amd/ps/ps-sdw-dma.c | 5 +- + sound/soc/amd/vangogh/acp5x-mach.c | 149 ++- + sound/soc/atmel/mchp-pdmc.c | 12 +- + sound/soc/bcm/bcm63xx-i2s-whistler.c | 16 +- + sound/soc/codecs/Kconfig | 13 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ad1836.c | 2 +- + sound/soc/codecs/ad1980.c | 2 +- + sound/soc/codecs/adau1372.c | 2 +- + sound/soc/codecs/adau1373.c | 2 +- + sound/soc/codecs/adau1701.c | 2 +- + sound/soc/codecs/adau1761.c | 2 +- + sound/soc/codecs/adau1781.c | 2 +- + sound/soc/codecs/adau1977.c | 2 +- + sound/soc/codecs/adau7118-i2c.c | 2 +- + sound/soc/codecs/adav80x.c | 2 +- + sound/soc/codecs/audio-iio-aux.c | 344 +++++++ + sound/soc/codecs/cs35l36.c | 2 +- + sound/soc/codecs/cs35l41-lib.c | 122 ++- + sound/soc/codecs/cs35l41.c | 18 +- + sound/soc/codecs/cs35l45-tables.c | 4 +- + sound/soc/codecs/cs35l56-i2c.c | 14 +- + sound/soc/codecs/cs35l56-sdw.c | 72 +- + sound/soc/codecs/cs35l56-shared.c | 490 +++++++++- + sound/soc/codecs/cs35l56-spi.c | 10 +- + sound/soc/codecs/cs35l56.c | 651 +++--------- + sound/soc/codecs/cs35l56.h | 15 +- + sound/soc/codecs/cs4265.c | 2 +- + sound/soc/codecs/cs4270.c | 2 +- + sound/soc/codecs/cs42l51.c | 2 +- + sound/soc/codecs/cs42l52.c | 2 +- + sound/soc/codecs/cs42l56.c | 2 +- + sound/soc/codecs/cs42xx8.c | 2 +- + sound/soc/codecs/cs4349.c | 2 +- + sound/soc/codecs/es8316.c | 5 +- + sound/soc/codecs/es8326.c | 75 +- + sound/soc/codecs/es8326.h | 9 +- + sound/soc/codecs/lpass-rx-macro.c | 10 +- + sound/soc/codecs/lpass-tx-macro.c | 10 +- + sound/soc/codecs/lpass-va-macro.c | 6 +- + sound/soc/codecs/lpass-wsa-macro.c | 10 +- + sound/soc/codecs/msm8916-wcd-analog.c | 56 +- + sound/soc/codecs/nau8825.c | 93 +- + sound/soc/codecs/rt5645.c | 50 + + sound/soc/codecs/rt5677.c | 121 +-- + sound/soc/codecs/rt5677.h | 92 +- + sound/soc/codecs/rt722-sdca-sdw.c | 2 +- + sound/soc/codecs/rt722-sdca.c | 3 +- + sound/soc/codecs/sigmadsp.c | 25 +- + sound/soc/codecs/tas2781-i2c.c | 1 - + sound/soc/codecs/wcd9335.c | 2 +- + sound/soc/codecs/wcd938x-sdw.c | 2 +- + sound/soc/codecs/wm2200.c | 2 +- + sound/soc/codecs/wm5100.c | 2 +- + sound/soc/codecs/wm8510.c | 2 +- + sound/soc/codecs/wm8523.c | 2 +- + sound/soc/codecs/wm8580.c | 2 +- + sound/soc/codecs/wm8711.c | 2 +- + sound/soc/codecs/wm8728.c | 2 +- + sound/soc/codecs/wm8731.c | 2 +- + sound/soc/codecs/wm8737.c | 2 +- + sound/soc/codecs/wm8741.c | 2 +- + sound/soc/codecs/wm8750.c | 2 +- + sound/soc/codecs/wm8753.c | 2 +- + sound/soc/codecs/wm8770.c | 2 +- + sound/soc/codecs/wm8776.c | 2 +- + sound/soc/codecs/wm8804.c | 2 +- + sound/soc/codecs/wm8900.c | 2 +- + sound/soc/codecs/wm8903.c | 2 +- + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8940.c | 2 +- + sound/soc/codecs/wm8955.c | 2 +- + sound/soc/codecs/wm8960.c | 12 +- + sound/soc/codecs/wm8961.c | 2 +- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/codecs/wm8971.c | 2 +- + sound/soc/codecs/wm8978.c | 2 +- + sound/soc/codecs/wm8983.c | 2 +- + sound/soc/codecs/wm8985.c | 2 +- + sound/soc/codecs/wm8988.c | 2 +- + sound/soc/codecs/wm8991.c | 2 +- + sound/soc/codecs/wm8993.c | 2 +- + sound/soc/codecs/wm8995.c | 2 +- + sound/soc/codecs/wm8996.c | 2 +- + sound/soc/codecs/wm9081.c | 2 +- + sound/soc/codecs/wm9090.c | 2 +- + sound/soc/codecs/wm9705.c | 2 +- + sound/soc/codecs/wm9712.c | 2 +- + sound/soc/codecs/wm9713.c | 2 +- + sound/soc/codecs/wsa881x.c | 2 +- + sound/soc/codecs/wsa883x.c | 2 +- + sound/soc/dwc/dwc-i2s.c | 65 +- + sound/soc/dwc/dwc-pcm.c | 8 +- + sound/soc/dwc/local.h | 24 + + sound/soc/fsl/fsl_rpmsg.c | 8 + + sound/soc/fsl/fsl_spdif.c | 8 +- + sound/soc/fsl/fsl_spdif.h | 6 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 12 +- + sound/soc/generic/audio-graph-card.c | 2 +- + sound/soc/generic/audio-graph-card2.c | 2 +- + sound/soc/generic/simple-card-utils.c | 23 +- + sound/soc/generic/simple-card.c | 66 +- + sound/soc/intel/atom/sst/sst.c | 14 +- + sound/soc/intel/atom/sst/sst.h | 7 +- + sound/soc/intel/atom/sst/sst_pci.c | 4 +- + sound/soc/intel/avs/board_selection.c | 26 +- + sound/soc/intel/avs/boards/Kconfig | 20 + + sound/soc/intel/avs/boards/Makefile | 4 + + sound/soc/intel/avs/boards/es8336.c | 315 ++++++ + sound/soc/intel/avs/boards/rt5663.c | 254 +++++ + sound/soc/intel/avs/boards/rt5682.c | 67 +- + sound/soc/intel/avs/core.c | 16 +- + sound/soc/intel/boards/Kconfig | 5 +- + sound/soc/intel/boards/sof_rt5682.c | 80 +- + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 12 + + sound/soc/intel/skylake/skl-messages.c | 16 +- + sound/soc/intel/skylake/skl-pcm.c | 3 +- + sound/soc/intel/skylake/skl.c | 36 +- + sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 4 +- + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 8 +- + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 27 +- + sound/soc/pxa/pxa2xx-i2s.c | 13 +- + sound/soc/qcom/qdsp6/q6apm.c | 2 +- + sound/soc/soc-core.c | 273 ++++-- + sound/soc/soc-topology.c | 3 - + sound/soc/sof/amd/Kconfig | 8 + + sound/soc/sof/amd/Makefile | 1 + + sound/soc/sof/amd/acp-common.c | 4 + + sound/soc/sof/amd/acp-ipc.c | 26 + + sound/soc/sof/amd/acp-probes.c | 147 +++ + sound/soc/sof/amd/acp.c | 36 +- + sound/soc/sof/amd/acp.h | 13 +- + sound/soc/sof/amd/pci-rmb.c | 2 + + sound/soc/sof/amd/pci-rn.c | 2 + + sound/soc/sof/intel/pci-apl.c | 8 +- + sound/soc/sof/intel/pci-cnl.c | 15 +- + sound/soc/sof/intel/pci-icl.c | 12 +- + sound/soc/sof/intel/pci-mtl.c | 3 +- + sound/soc/sof/intel/pci-skl.c | 6 +- + sound/soc/sof/intel/pci-tgl.c | 45 +- + sound/soc/sof/intel/pci-tng.c | 3 +- + sound/soc/sof/sof-client-probes.c | 1 + + sound/soc/starfive/jh7110_tdm.c | 5 +- + sound/soc/tegra/tegra20_ac97.c | 3 +- + sound/soc/ti/omap-dmic.c | 4 +- + sound/soc/ti/omap-mcbsp.c | 4 +- + sound/soc/ti/omap-mcpdm.c | 3 +- + sound/sparc/amd7930.c | 3 +- + sound/sparc/cs4231.c | 2 +- + sound/sparc/dbri.c | 2 +- + sound/usb/bcd2000/bcd2000.c | 4 +- + sound/usb/endpoint.h | 1 - + sound/xen/xen_snd_front_alsa.c | 8 +- + tools/testing/kunit/configs/all_tests.config | 5 + + tools/testing/selftests/alsa/pcm-test.c | 8 +- + 298 files changed, 7176 insertions(+), 2976 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/audio-iio-aux.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nau8821.txt + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8821.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/qcom,msm8916-wcd-analog.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,pm8916-wcd-analog-codec.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8904.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8904.txt + rename include/{media/dvb_math.h => linux/int_log.h} (63%) + rename drivers/media/dvb-core/dvb_math.c => lib/math/int_log.c (84%) + create mode 100644 sound/firewire/dice/dice-weiss.c + create mode 100644 sound/pci/hda/cs35l56_hda.c + create mode 100644 sound/pci/hda/cs35l56_hda.h + create mode 100644 sound/pci/hda/cs35l56_hda_i2c.c + create mode 100644 sound/pci/hda/cs35l56_hda_spi.c + create mode 100644 sound/soc/amd/acp/acp-legacy-common.c + create mode 100644 sound/soc/codecs/audio-iio-aux.c + create mode 100644 sound/soc/intel/avs/boards/es8336.c + create mode 100644 sound/soc/intel/avs/boards/rt5663.c + create mode 100644 sound/soc/sof/amd/acp-probes.c +Merging ieee1394/for-next (06c2afb862f9 Linux 6.5-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 (52a3cd64f03b Merge remote-tracking branch 'asoc/for-6.6' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging sound/drivers/serial-generic.c +Auto-merging sound/soc/atmel/mchp-pdmc.c +Auto-merging sound/soc/soc-topology.c +Merge made by the 'ort' strategy. + Documentation/core-api/kernel-api.rst | 1 - + .../devicetree/bindings/sound/awinic,aw88395.yaml | 4 +- + Documentation/devicetree/bindings/sound/gtm601.txt | 19 - + .../devicetree/bindings/sound/max9892x.txt | 44 - + .../devicetree/bindings/sound/maxim,max98925.yaml | 98 ++ + .../devicetree/bindings/sound/option,gtm601.yaml | 42 + + .../devicetree/bindings/sound/renesas,rsnd.yaml | 60 +- + .../devicetree/bindings/sound/wlf,wm8960.yaml | 20 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 6 +- + include/linux/firmware/imx/dsp.h | 6 - + include/linux/firmware/mediatek/mtk-adsp-ipc.h | 6 - + include/linux/soundwire/sdw.h | 5 + + include/linux/soundwire/sdw_intel.h | 7 +- + include/sound/hda-mlink.h | 4 + + include/sound/soc-acpi.h | 7 + + include/sound/soc-dai.h | 26 +- + include/sound/sof/topology.h | 4 +- + sound/drivers/serial-generic.c | 2 +- + sound/soc/adi/axi-i2s.c | 2 +- + sound/soc/adi/axi-spdif.c | 2 +- + sound/soc/amd/acp-da7219-max98357a.c | 41 +- + sound/soc/amd/acp-rt5645.c | 22 +- + sound/soc/amd/acp/acp-i2s.c | 24 +- + sound/soc/amd/acp/acp-mach-common.c | 226 +++- + sound/soc/amd/acp/acp-rembrandt.c | 3 - + sound/soc/amd/acp/acp-renoir.c | 2 - + sound/soc/amd/acp/amd.h | 1 - + sound/soc/amd/acp3x-rt5682-max9836.c | 23 +- + sound/soc/amd/vangogh/acp5x-mach.c | 3 + + sound/soc/atmel/atmel-i2s.c | 18 +- + sound/soc/atmel/atmel-pdmic.c | 2 +- + sound/soc/atmel/mchp-i2s-mcc.c | 26 +- + sound/soc/atmel/mchp-pdmc.c | 18 +- + sound/soc/atmel/mchp-spdifrx.c | 16 +- + sound/soc/atmel/mchp-spdiftx.c | 20 +- + sound/soc/atmel/tse850-pcm5142.c | 2 +- + sound/soc/au1x/ac97c.c | 10 +- + sound/soc/au1x/psc-ac97.c | 2 +- + sound/soc/bcm/bcm2835-i2s.c | 24 +- + sound/soc/bcm/cygnus-ssp.h | 2 - + sound/soc/cirrus/ep93xx-i2s.c | 2 +- + sound/soc/codecs/88pm860x-codec.c | 4 +- + sound/soc/codecs/Kconfig | 21 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/ak4613.c | 11 +- + sound/soc/codecs/aw88261.c | 1300 ++++++++++++++++++++ + sound/soc/codecs/aw88261.h | 459 +++++++ + sound/soc/codecs/aw88395/aw88395_lib.c | 193 ++- + sound/soc/codecs/aw88395/aw88395_reg.h | 1 + + sound/soc/codecs/cs35l56.c | 33 +- + sound/soc/codecs/cs42l51-i2c.c | 2 +- + sound/soc/codecs/cs47l15.c | 6 +- + sound/soc/codecs/cs47l24.c | 8 +- + sound/soc/codecs/cs47l35.c | 8 +- + sound/soc/codecs/cs47l85.c | 8 +- + sound/soc/codecs/cs47l90.c | 8 +- + sound/soc/codecs/cs47l92.c | 6 +- + sound/soc/codecs/cx2072x.c | 11 +- + sound/soc/codecs/es8326.c | 316 +++-- + sound/soc/codecs/es8326.h | 23 +- + sound/soc/codecs/hdmi-codec.c | 44 +- + sound/soc/codecs/jz4740.c | 2 +- + sound/soc/codecs/max98363.c | 41 +- + sound/soc/codecs/max98373-sdw.c | 47 +- + sound/soc/codecs/max98926.c | 3 +- + sound/soc/codecs/max98927.c | 357 +++--- + sound/soc/codecs/rt1011.c | 2 - + sound/soc/codecs/rt1015.c | 1 - + sound/soc/codecs/rt1015p.c | 1 - + sound/soc/codecs/rt1016.c | 1 - + sound/soc/codecs/rt1017-sdca-sdw.c | 824 +++++++++++++ + sound/soc/codecs/rt1017-sdca-sdw.h | 183 +++ + sound/soc/codecs/rt1019.c | 1 - + sound/soc/codecs/rt1305.c | 2 - + sound/soc/codecs/rt1308-sdw.c | 54 +- + sound/soc/codecs/rt1308.c | 2 - + sound/soc/codecs/rt1316-sdw.c | 56 +- + sound/soc/codecs/rt1318-sdw.c | 43 +- + sound/soc/codecs/rt5514-spi.c | 1 - + sound/soc/codecs/rt5514.c | 1 - + sound/soc/codecs/rt5645.c | 1 - + sound/soc/codecs/rt5659.c | 1 - + sound/soc/codecs/rt5660.c | 2 - + sound/soc/codecs/rt5682-sdw.c | 60 +- + sound/soc/codecs/rt5682.c | 3 + + sound/soc/codecs/rt700-sdw.c | 7 +- + sound/soc/codecs/rt700.c | 46 +- + sound/soc/codecs/rt711-sdca-sdw.c | 3 +- + sound/soc/codecs/rt711-sdca.c | 48 +- + sound/soc/codecs/rt711-sdw.c | 7 +- + sound/soc/codecs/rt711.c | 47 +- + sound/soc/codecs/rt712-sdca-dmic.c | 47 +- + sound/soc/codecs/rt712-sdca-sdw.c | 3 +- + sound/soc/codecs/rt712-sdca.c | 45 +- + sound/soc/codecs/rt715-sdca-sdw.c | 5 +- + sound/soc/codecs/rt715-sdca.c | 41 +- + sound/soc/codecs/rt715-sdw.c | 9 +- + sound/soc/codecs/rt715.c | 102 +- + sound/soc/codecs/rt715.h | 7 + + sound/soc/codecs/ssm3515.c | 2 +- + sound/soc/codecs/sta32x.c | 2 +- + sound/soc/codecs/sta350.c | 2 +- + sound/soc/codecs/sta529.c | 2 +- + sound/soc/codecs/stac9766.c | 2 +- + sound/soc/codecs/sti-sas.c | 2 +- + sound/soc/codecs/tlv320aic32x4-clk.c | 16 +- + sound/soc/codecs/tlv320aic32x4.h | 5 +- + sound/soc/codecs/wm2200.c | 12 +- + sound/soc/codecs/wm5102.c | 6 +- + sound/soc/codecs/wm5110.c | 8 +- + sound/soc/codecs/wm8960.c | 42 +- + sound/soc/codecs/wm8960.h | 4 +- + sound/soc/codecs/wm8994.c | 2 +- + sound/soc/codecs/wm_adsp.c | 8 +- + sound/soc/codecs/wm_adsp.h | 1 + + sound/soc/dwc/dwc-i2s.c | 18 +- + sound/soc/fsl/fsl_asrc.c | 16 +- + sound/soc/fsl/fsl_aud2htx.c | 10 +- + sound/soc/fsl/fsl_easrc.c | 16 +- + sound/soc/fsl/fsl_esai.c | 20 +- + sound/soc/fsl/fsl_micfil.c | 116 +- + sound/soc/fsl/fsl_micfil.h | 64 + + sound/soc/fsl/fsl_qmc_audio.c | 28 +- + sound/soc/fsl/fsl_sai.c | 24 +- + sound/soc/fsl/fsl_spdif.c | 17 +- + sound/soc/fsl/fsl_ssi.c | 3 +- + sound/soc/fsl/fsl_xcvr.c | 16 +- + sound/soc/fsl/imx-audio-rpmsg.c | 1 - + sound/soc/fsl/imx-es8328.c | 25 +- + sound/soc/generic/audio-graph-card.c | 2 +- + sound/soc/hisilicon/hi6210-i2s.c | 2 +- + sound/soc/img/img-i2s-in.c | 14 +- + sound/soc/img/img-i2s-out.c | 14 +- + sound/soc/img/img-parallel-out.c | 14 +- + sound/soc/img/img-spdif-in.c | 12 +- + sound/soc/img/img-spdif-out.c | 12 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- + sound/soc/intel/atom/sst/sst_stream.c | 13 +- + sound/soc/intel/avs/boards/da7219.c | 34 +- + sound/soc/intel/avs/probes.c | 10 +- + sound/soc/intel/avs/topology.c | 6 +- + sound/soc/intel/boards/Kconfig | 5 +- + sound/soc/intel/boards/Makefile | 2 +- + sound/soc/intel/boards/bdw_rt286.c | 6 + + sound/soc/intel/boards/bxt_da7219_max98357a.c | 7 + + sound/soc/intel/boards/bytcr_wm5102.c | 7 + + sound/soc/intel/boards/kbl_da7219_max98357a.c | 7 + + sound/soc/intel/boards/kbl_da7219_max98927.c | 7 + + sound/soc/intel/boards/sof_da7219_max98373.c | 10 + + sound/soc/intel/boards/sof_maxim_common.c | 170 +-- + sound/soc/intel/boards/sof_maxim_common.h | 19 +- + sound/soc/intel/boards/sof_rt5682.c | 92 +- + sound/soc/intel/boards/sof_sdw.c | 608 +++++---- + sound/soc/intel/boards/sof_sdw_common.h | 7 + + sound/soc/intel/boards/sof_sdw_cs_amp.c | 47 + + sound/soc/intel/catpt/pcm.c | 8 +- + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 7 + + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 27 + + sound/soc/intel/keembay/kmb_platform.c | 4 +- + sound/soc/jz4740/jz4740-i2s.c | 3 +- + sound/soc/loongson/loongson_card.c | 2 +- + sound/soc/loongson/loongson_i2s.c | 16 +- + sound/soc/mediatek/mt8173/mt8173-max98090.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 23 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 23 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 23 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 43 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 53 +- + sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 2 - + .../mt8186/mt8186-mt6366-da7219-max98357.c | 6 + + sound/soc/mediatek/mt8195/mt8195-dai-etdm.c | 56 +- + sound/soc/meson/aiu-acodec-ctrl.c | 4 +- + sound/soc/meson/aiu-codec-ctrl.c | 4 +- + sound/soc/meson/aiu-fifo-i2s.c | 3 + + sound/soc/meson/aiu-fifo-spdif.c | 3 + + sound/soc/meson/aiu.c | 6 - + sound/soc/meson/axg-frddr.c | 4 +- + sound/soc/meson/axg-pdm.c | 18 +- + sound/soc/meson/axg-spdifin.c | 4 +- + sound/soc/meson/axg-tdm-interface.c | 6 +- + sound/soc/meson/axg-toddr.c | 4 +- + sound/soc/meson/g12a-toacodec.c | 4 +- + sound/soc/meson/g12a-tohdmitx.c | 4 +- + sound/soc/pxa/mmp-sspa.c | 2 +- + sound/soc/pxa/pxa-ssp.c | 12 +- + sound/soc/qcom/apq8016_sbc.c | 37 +- + sound/soc/qcom/lpass-apq8016.c | 4 - + sound/soc/qcom/lpass-cpu.c | 40 +- + sound/soc/qcom/lpass-ipq806x.c | 1 - + sound/soc/qcom/lpass-sc7180.c | 5 +- + sound/soc/qcom/lpass-sc7280.c | 2 - + sound/soc/qcom/lpass.h | 4 +- + sound/soc/qcom/qdsp6/q6afe-dai.c | 88 +- + sound/soc/qcom/qdsp6/q6apm.h | 2 - + sound/soc/qcom/qdsp6/q6asm-dai.c | 6 +- + sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c | 3 - + sound/soc/qcom/sc7180.c | 40 +- + sound/soc/qcom/sc7280.c | 34 +- + sound/soc/qcom/sdm845.c | 32 +- + sound/soc/rockchip/rk3399_gru_sound.c | 7 +- + sound/soc/rockchip/rockchip_i2s.c | 2 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 2 +- + sound/soc/rockchip/rockchip_pdm.c | 2 +- + sound/soc/rockchip/rockchip_rt5645.c | 22 +- + sound/soc/rockchip/rockchip_spdif.c | 2 +- + sound/soc/samsung/i2s.c | 5 +- + sound/soc/samsung/littlemill.c | 27 +- + sound/soc/samsung/lowland.c | 8 +- + sound/soc/samsung/midas_wm1811.c | 24 +- + sound/soc/samsung/pcm.c | 18 +- + sound/soc/sh/rcar/core.c | 173 ++- + sound/soc/sh/rcar/rsnd.h | 4 + + sound/soc/soc-acpi.c | 73 ++ + sound/soc/soc-dai.c | 55 +- + sound/soc/soc-topology.c | 6 +- + sound/soc/sof/intel/Kconfig | 16 + + sound/soc/sof/intel/Makefile | 4 +- + sound/soc/sof/intel/cnl.c | 2 + + sound/soc/sof/intel/hda-dai-ops.c | 179 ++- + sound/soc/sof/intel/hda-dai.c | 211 +++- + sound/soc/sof/intel/hda-mlink.c | 45 +- + sound/soc/sof/intel/hda.c | 140 +-- + sound/soc/sof/intel/hda.h | 21 + + sound/soc/sof/intel/icl.c | 1 + + sound/soc/sof/intel/lnl.c | 188 +++ + sound/soc/sof/intel/mtl.c | 23 +- + sound/soc/sof/intel/mtl.h | 22 +- + sound/soc/sof/intel/pci-lnl.c | 71 ++ + sound/soc/sof/intel/shim.h | 1 + + sound/soc/sof/intel/tgl.c | 4 + + sound/soc/sof/ipc3-dtrace.c | 12 +- + sound/soc/sof/ipc3-pcm.c | 17 + + sound/soc/sof/ipc3.c | 2 +- + sound/soc/sof/ipc4-pcm.c | 21 +- + sound/soc/sof/ipc4-topology.c | 10 + + sound/soc/sof/ipc4-topology.h | 4 +- + sound/soc/sof/mediatek/mt8186/mt8186.c | 40 +- + sound/soc/sof/sof-client-probes-ipc4.c | 9 + + sound/soc/sof/sof-client-probes.c | 6 +- + sound/soc/sof/topology.c | 7 +- + sound/soc/starfive/jh7110_tdm.c | 16 +- + sound/soc/sti/sti_uniperif.c | 6 +- + sound/soc/stm/stm32_i2s.c | 2 +- + sound/soc/stm/stm32_sai_sub.c | 18 +- + sound/soc/stm/stm32_spdifrx.c | 2 +- + sound/soc/sunxi/sun4i-codec.c | 6 +- + sound/soc/sunxi/sun4i-i2s.c | 18 +- + sound/soc/sunxi/sun4i-spdif.c | 4 +- + sound/soc/sunxi/sun50i-dmic.c | 2 +- + sound/soc/tegra/tegra20_ac97.c | 10 +- + sound/soc/tegra/tegra20_i2s.c | 2 +- + sound/soc/tegra/tegra20_spdif.c | 2 +- + sound/soc/tegra/tegra210_admaif.c | 12 +- + sound/soc/tegra/tegra30_i2s.c | 2 +- + sound/soc/ti/davinci-evm.c | 13 +- + sound/soc/ti/davinci-i2s.c | 22 +- + sound/soc/ti/davinci-mcasp.c | 27 +- + sound/soc/ti/omap-dmic.c | 22 +- + sound/soc/ti/omap-mcbsp.c | 28 +- + sound/soc/ti/omap-mcpdm.c | 22 +- + sound/soc/uniphier/aio-cpu.c | 161 ++- + sound/soc/uniphier/aio-ld11.c | 62 +- + sound/soc/uniphier/aio-pxs2.c | 55 +- + sound/soc/uniphier/aio.h | 10 +- + sound/soc/ux500/ux500_msp_dai.c | 2 +- + 265 files changed, 7426 insertions(+), 2303 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/gtm601.txt + delete mode 100644 Documentation/devicetree/bindings/sound/max9892x.txt + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98925.yaml + create mode 100644 Documentation/devicetree/bindings/sound/option,gtm601.yaml + create mode 100644 sound/soc/codecs/aw88261.c + create mode 100644 sound/soc/codecs/aw88261.h + create mode 100644 sound/soc/codecs/rt1017-sdca-sdw.c + create mode 100644 sound/soc/codecs/rt1017-sdca-sdw.h + create mode 100644 sound/soc/intel/boards/sof_sdw_cs_amp.c + create mode 100644 sound/soc/sof/intel/lnl.c + create mode 100644 sound/soc/sof/intel/pci-lnl.c +Merging modules/modules-next (a6846234f458 ARM: module: Use module_init_layout_section() to spot init sections) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Merge made by the 'ort' strategy. + arch/arm/kernel/module-plts.c | 2 +- + arch/arm/mach-pxa/sharpsl_pm.c | 2 -- + arch/arm/mach-pxa/spitz.c | 14 +------------- + arch/arm64/kernel/module-plts.c | 2 +- + arch/mips/alchemy/devboards/db1000.c | 8 +------- + arch/mips/alchemy/devboards/db1200.c | 19 ++----------------- + arch/mips/alchemy/devboards/db1300.c | 10 +--------- + drivers/mmc/host/Kconfig | 5 +++-- + drivers/net/ethernet/freescale/enetc/enetc_ptp.c | 2 +- + drivers/rtc/rtc-ds1685.c | 2 +- + include/linux/module_symbol.h | 4 +--- + include/linux/moduleloader.h | 5 +++++ + kernel/module/main.c | 16 ++++++++++++---- + kernel/params.c | 2 +- + samples/hw_breakpoint/data_breakpoint.c | 6 ++++-- + 15 files changed, 35 insertions(+), 64 deletions(-) +Merging input/next (54116d442e00 Input: rpckbd - fix the return value handle for platform_get_irq()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/misc/Kconfig +Auto-merging drivers/input/touchscreen/exc3000.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/azoteq,iqs7222.yaml | 248 +- + .../bindings/input/touchscreen/azoteq,iqs7211.yaml | 769 ++++++ + .../bindings/input/touchscreen/edt-ft5x06.yaml | 6 + + .../bindings/input/touchscreen/eeti,exc3000.yaml | 2 + + .../bindings/input/touchscreen/melfas,mms114.yaml | 5 + + drivers/input/gameport/Kconfig | 4 +- + drivers/input/gameport/gameport.c | 26 +- + drivers/input/joystick/xpad.c | 25 + + drivers/input/keyboard/adp5588-keys.c | 17 +- + drivers/input/keyboard/amikbd.c | 25 +- + drivers/input/keyboard/bcm-keypad.c | 24 +- + drivers/input/keyboard/gpio_keys.c | 21 +- + drivers/input/keyboard/gpio_keys_polled.c | 8 +- + drivers/input/keyboard/lm8323.c | 95 +- + drivers/input/keyboard/lm8333.c | 44 +- + drivers/input/keyboard/lpc32xx-keys.c | 9 +- + drivers/input/keyboard/mcs_touchkey.c | 65 +- + drivers/input/keyboard/nomadik-ske-keypad.c | 127 +- + drivers/input/keyboard/nspire-keypad.c | 3 +- + drivers/input/keyboard/omap4-keypad.c | 9 +- + drivers/input/keyboard/opencores-kbd.c | 9 +- + drivers/input/keyboard/pinephone-keyboard.c | 20 +- + drivers/input/keyboard/pxa27x_keypad.c | 9 +- + drivers/input/keyboard/qt1070.c | 46 +- + drivers/input/keyboard/qt2160.c | 130 +- + drivers/input/keyboard/sun4i-lradc-keys.c | 6 +- + drivers/input/keyboard/tca6416-keypad.c | 139 +- + drivers/input/keyboard/tegra-kbc.c | 2 +- + drivers/input/keyboard/tm2-touchkey.c | 1 - + drivers/input/misc/Kconfig | 4 +- + drivers/input/misc/da9063_onkey.c | 9 + + drivers/input/misc/gpio-vibra.c | 22 +- + drivers/input/misc/iqs269a.c | 2 +- + drivers/input/misc/iqs626a.c | 2 +- + drivers/input/misc/iqs7222.c | 478 +++- + drivers/input/misc/mma8450.c | 2 +- + drivers/input/misc/pm8941-pwrkey.c | 1 - + drivers/input/misc/pm8xxx-vibrator.c | 1 - + drivers/input/misc/pmic8xxx-pwrkey.c | 1 - + drivers/input/misc/pwm-beeper.c | 19 +- + drivers/input/misc/pwm-vibra.c | 32 +- + drivers/input/misc/rotary_encoder.c | 9 +- + drivers/input/misc/sparcspkr.c | 3 +- + drivers/input/mouse/elan_i2c_core.c | 9 +- + drivers/input/mouse/psmouse-smbus.c | 19 +- + drivers/input/serio/apbps2.c | 2 +- + drivers/input/serio/i8042-sparcio.h | 4 +- + drivers/input/serio/rpckbd.c | 8 +- + drivers/input/serio/xilinx_ps2.c | 4 +- + drivers/input/touchscreen/Kconfig | 14 +- + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/bu21013_ts.c | 72 +- + drivers/input/touchscreen/bu21029_ts.c | 51 +- + drivers/input/touchscreen/chipone_icn8318.c | 8 +- + drivers/input/touchscreen/cy8ctma140.c | 8 +- + drivers/input/touchscreen/cyttsp5.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 10 +- + drivers/input/touchscreen/ektf2127.c | 8 +- + drivers/input/touchscreen/elants_i2c.c | 22 +- + drivers/input/touchscreen/exc3000.c | 7 + + drivers/input/touchscreen/goodix.c | 40 +- + drivers/input/touchscreen/ili210x.c | 2 +- + drivers/input/touchscreen/iqs5xx.c | 2 +- + drivers/input/touchscreen/iqs7211.c | 2557 ++++++++++++++++++++ + drivers/input/touchscreen/lpc32xx_ts.c | 98 +- + drivers/input/touchscreen/melfas_mip4.c | 9 +- + drivers/input/touchscreen/mms114.c | 89 +- + drivers/input/touchscreen/novatek-nvt-ts.c | 10 +- + drivers/input/touchscreen/pixcir_i2c_ts.c | 40 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 30 +- + drivers/input/touchscreen/resistive-adc-touch.c | 8 +- + drivers/input/touchscreen/silead.c | 8 +- + drivers/input/touchscreen/sis_i2c.c | 20 +- + drivers/input/touchscreen/surface3_spi.c | 13 +- + drivers/input/touchscreen/sx8654.c | 10 +- + drivers/input/touchscreen/ti_am335x_tsc.c | 1 - + include/linux/gameport.h | 2 +- + include/linux/tca6416_keypad.h | 1 - + 78 files changed, 4623 insertions(+), 1045 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/azoteq,iqs7211.yaml + create mode 100644 drivers/input/touchscreen/iqs7211.c +Merging block/for-next (bc1b17592bbd Merge branch 'for-6.6/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging MAINTAINERS +Auto-merging block/blk-core.c +Auto-merging block/fops.c +Auto-merging drivers/block/nbd.c +Auto-merging drivers/nvme/host/ioctl.c +Auto-merging fs/Kconfig +Auto-merging fs/buffer.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/internal.h +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/super.c +CONFLICT (content): Merge conflict in fs/super.c +Auto-merging fs/udf/file.c +Auto-merging include/linux/bio.h +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/iomap.h +Auto-merging include/linux/mm.h +Auto-merging io_uring/io_uring.c +Auto-merging io_uring/rw.c +Auto-merging lib/raid6/test/Makefile +CONFLICT (content): Merge conflict in lib/raid6/test/Makefile +Auto-merging mm/migrate.c +Auto-merging net/socket.c +Resolved 'fs/super.c' using previous resolution. +Recorded preimage for 'lib/raid6/test/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'lib/raid6/test/Makefile'. +[master f3dbc59b47d8] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 - + block/Kconfig | 1 + + block/bio-integrity.c | 59 ++-- + block/bio.c | 142 ++++----- + block/blk-core.c | 1 + + block/blk-flush.c | 26 +- + block/blk-iolatency.c | 35 +-- + block/blk-mq.c | 28 +- + block/blk-settings.c | 7 +- + block/blk-sysfs.c | 21 +- + block/blk.h | 10 +- + block/fops.c | 143 ++++++++- + block/mq-deadline.c | 3 +- + drivers/block/nbd.c | 1 + + drivers/block/swim3.c | 2 +- + drivers/block/ublk_drv.c | 352 +++++++++++++++++++-- + drivers/md/Kconfig | 11 + + drivers/md/dm-crypt.c | 1 - + drivers/md/dm-raid.c | 1 - + drivers/md/md-bitmap.c | 351 ++++++++++----------- + drivers/md/md-bitmap.h | 1 + + drivers/md/md-cluster.c | 8 +- + drivers/md/md-faulty.c | 2 + + drivers/md/md-linear.c | 1 + + drivers/md/md-multipath.c | 1 + + drivers/md/md.c | 226 ++++++++------ + drivers/md/md.h | 13 +- + drivers/md/raid0.c | 16 +- + drivers/md/raid1.c | 68 +++-- + drivers/md/raid1.h | 1 - + drivers/md/raid10.c | 85 +++--- + drivers/md/raid10.h | 1 - + drivers/md/raid5-cache.c | 14 +- + drivers/md/raid5.c | 72 ++--- + drivers/nvme/host/ioctl.c | 1 - + drivers/nvme/target/io-cmd-bdev.c | 3 +- + drivers/scsi/scsi_lib.c | 12 +- + drivers/target/target_core_iblock.c | 3 +- + fs/Kconfig | 4 + + fs/Makefile | 2 +- + fs/adfs/Kconfig | 1 + + fs/affs/Kconfig | 1 + + fs/befs/Kconfig | 1 + + fs/bfs/Kconfig | 1 + + fs/buffer.c | 6 - + fs/efs/Kconfig | 1 + + fs/exfat/Kconfig | 1 + + fs/ext2/Kconfig | 1 + + fs/ext4/Kconfig | 1 + + fs/ext4/inode.c | 2 +- + fs/f2fs/Kconfig | 1 + + fs/f2fs/file.c | 2 +- + fs/fat/Kconfig | 1 + + fs/freevxfs/Kconfig | 1 + + fs/gfs2/Kconfig | 1 + + fs/gfs2/file.c | 16 +- + fs/hfs/Kconfig | 1 + + fs/hfsplus/Kconfig | 1 + + fs/hpfs/Kconfig | 1 + + fs/internal.h | 6 - + fs/iomap/buffered-io.c | 2 +- + fs/isofs/Kconfig | 1 + + fs/jfs/Kconfig | 1 + + fs/minix/Kconfig | 1 + + fs/nilfs2/Kconfig | 1 + + fs/nilfs2/file.c | 2 +- + fs/ntfs/Kconfig | 1 + + fs/ntfs3/Kconfig | 1 + + fs/ocfs2/Kconfig | 1 + + fs/omfs/Kconfig | 1 + + fs/qnx4/Kconfig | 1 + + fs/qnx6/Kconfig | 1 + + fs/reiserfs/Kconfig | 1 + + fs/romfs/Kconfig | 1 + + fs/super.c | 4 +- + fs/sysv/Kconfig | 1 + + fs/udf/Kconfig | 1 + + fs/udf/file.c | 2 +- + fs/ufs/Kconfig | 1 + + include/linux/bio.h | 7 +- + include/linux/blk-mq.h | 6 +- + include/linux/blkdev.h | 2 + + include/linux/buffer_head.h | 44 +-- + include/linux/io_uring.h | 6 + + include/linux/io_uring_types.h | 9 +- + include/linux/iomap.h | 4 + + include/linux/mm.h | 18 ++ + include/trace/events/block.h | 2 + + include/trace/events/kyber.h | 8 +- + include/trace/events/wbt.h | 8 +- + include/uapi/linux/futex.h | 31 +- + include/uapi/linux/io_uring.h | 22 +- + include/uapi/linux/ioprio.h | 21 +- + include/uapi/linux/ublk_cmd.h | 63 +++- + io_uring/Makefile | 4 +- + io_uring/cancel.c | 86 ++++-- + io_uring/cancel.h | 7 +- + io_uring/fdinfo.c | 18 +- + io_uring/futex.c | 376 +++++++++++++++++++++++ + io_uring/futex.h | 36 +++ + io_uring/io-wq.c | 70 +++-- + io_uring/io-wq.h | 2 +- + io_uring/io_uring.c | 185 ++++++----- + io_uring/io_uring.h | 26 +- + io_uring/net.c | 8 +- + io_uring/opdef.c | 44 ++- + io_uring/poll.c | 21 +- + io_uring/refs.c | 51 ++++ + io_uring/refs.h | 52 ++++ + io_uring/rsrc.c | 14 +- + io_uring/rsrc.h | 1 - + io_uring/rw.c | 5 +- + io_uring/splice.c | 4 +- + io_uring/sqpoll.c | 18 +- + io_uring/sqpoll.h | 1 + + io_uring/timeout.c | 20 +- + io_uring/uring_cmd.c | 28 ++ + io_uring/waitid.c | 321 +++++++++++++++++++ + io_uring/waitid.h | 15 + + kernel/exit.c | 131 ++++---- + kernel/exit.h | 30 ++ + kernel/futex/futex.h | 93 +++++- + kernel/futex/requeue.c | 3 +- + kernel/futex/syscalls.c | 41 +-- + kernel/futex/waitwake.c | 55 ++-- + lib/raid6/mktables.c | 2 + + lib/raid6/recov.c | 1 - + lib/raid6/test/.gitignore | 3 + + lib/raid6/test/Makefile | 31 +- + mm/migrate.c | 4 +- + net/socket.c | 2 + + tools/cgroup/iocost_monitor.py | 21 +- + tools/io_uring/Makefile | 18 -- + tools/io_uring/README | 29 -- + tools/io_uring/barrier.h | 16 - + tools/io_uring/io_uring-bench.c | 592 ------------------------------------ + tools/io_uring/io_uring-cp.c | 283 ----------------- + tools/io_uring/liburing.h | 187 ------------ + tools/io_uring/queue.c | 156 ---------- + tools/io_uring/setup.c | 107 ------- + tools/io_uring/syscall.c | 52 ---- + 141 files changed, 2834 insertions(+), 2489 deletions(-) + create mode 100644 io_uring/futex.c + create mode 100644 io_uring/futex.h + create mode 100644 io_uring/refs.c + create mode 100644 io_uring/waitid.c + create mode 100644 io_uring/waitid.h + create mode 100644 kernel/exit.h + create mode 100644 lib/raid6/test/.gitignore + delete mode 100644 tools/io_uring/Makefile + delete mode 100644 tools/io_uring/README + delete mode 100644 tools/io_uring/barrier.h + delete mode 100644 tools/io_uring/io_uring-bench.c + delete mode 100644 tools/io_uring/io_uring-cp.c + delete mode 100644 tools/io_uring/liburing.h + delete mode 100644 tools/io_uring/queue.c + delete mode 100644 tools/io_uring/setup.c + delete mode 100644 tools/io_uring/syscall.c +Merging device-mapper/for-next (1e4ab7b4c881 dm cache policy smq: ensure IO doesn't prevent cleaner policy progress) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (caea958926c3 ata: sata_rcar: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Auto-merging drivers/ata/libata-scsi.c +Merge made by the 'ort' strategy. + Documentation/driver-api/libata.rst | 38 +--- + drivers/ata/ahci.c | 2 +- + drivers/ata/ahci_ceva.c | 2 +- + drivers/ata/ahci_dwc.c | 2 +- + drivers/ata/ahci_mtk.c | 1 + + drivers/ata/ahci_mvebu.c | 2 +- + drivers/ata/ahci_octeon.c | 4 +- + drivers/ata/ahci_qoriq.c | 4 +- + drivers/ata/ahci_seattle.c | 4 +- + drivers/ata/ahci_sunxi.c | 2 +- + drivers/ata/ahci_tegra.c | 5 +- + drivers/ata/ahci_xgene.c | 16 +- + drivers/ata/libahci.c | 7 +- + drivers/ata/libahci_platform.c | 1 + + drivers/ata/libata-core.c | 385 +++++++++------------------------- + drivers/ata/libata-eh.c | 176 +++++++--------- + drivers/ata/libata-sata.c | 112 +--------- + drivers/ata/libata-scsi.c | 165 ++------------- + drivers/ata/libata-sff.c | 32 +-- + drivers/ata/libata.h | 3 - + drivers/ata/pata_arasan_cf.c | 6 +- + drivers/ata/pata_ep93xx.c | 5 +- + drivers/ata/pata_ftide010.c | 15 +- + drivers/ata/pata_imx.c | 9 +- + drivers/ata/pata_ixp4xx_cf.c | 24 +-- + drivers/ata/pata_mpc52xx.c | 10 +- + drivers/ata/pata_pxa.c | 6 +- + drivers/ata/pata_rb532_cf.c | 6 +- + drivers/ata/pata_sl82c105.c | 3 +- + drivers/ata/sata_dwc_460ex.c | 8 +- + drivers/ata/sata_fsl.c | 12 +- + drivers/ata/sata_gemini.c | 9 +- + drivers/ata/sata_highbank.c | 4 +- + drivers/ata/sata_inic162x.c | 2 +- + drivers/ata/sata_mv.c | 7 +- + drivers/ata/sata_nv.c | 2 +- + drivers/ata/sata_rcar.c | 17 +- + drivers/ata/sata_sil24.c | 4 +- + drivers/ata/sata_sx4.c | 1 - + drivers/scsi/hisi_sas/hisi_sas_main.c | 2 +- + drivers/scsi/libsas/sas_ata.c | 9 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + include/linux/libata.h | 40 ++-- + 43 files changed, 308 insertions(+), 858 deletions(-) +Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (13433b9e2723 mmc: core: Cleanup mmc_sd_num_wr_blocks() function) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 6 + + .../devicetree/bindings/mmc/mmc-controller.yaml | 2 +- + Documentation/devicetree/bindings/mmc/mtk-sd.yaml | 10 - + .../devicetree/bindings/mmc/sdhci-atmel.txt | 4 +- + drivers/mmc/core/block.c | 11 +- + drivers/mmc/core/bus.c | 3 + + drivers/mmc/host/atmel-mci.c | 1 - + drivers/mmc/host/cavium-octeon.c | 2 + + drivers/mmc/host/cavium-thunderx.c | 1 + + drivers/mmc/host/davinci_mmc.c | 3 +- + drivers/mmc/host/meson-gx-mmc.c | 5 +- + drivers/mmc/host/mmci.c | 39 +++- + drivers/mmc/host/moxart-mmc.c | 2 - + drivers/mmc/host/mtk-sd.c | 4 +- + drivers/mmc/host/mxcmmc.c | 4 +- + drivers/mmc/host/mxs-mmc.c | 1 - + drivers/mmc/host/omap_hsmmc.c | 5 +- + drivers/mmc/host/owl-mmc.c | 3 +- + drivers/mmc/host/pxamci.c | 6 +- + drivers/mmc/host/renesas_sdhi_core.c | 22 ++- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 3 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 3 +- + drivers/mmc/host/sdhci-bcm-kona.c | 1 - + drivers/mmc/host/sdhci-cadence.c | 2 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 2 +- + drivers/mmc/host/sdhci-iproc.c | 2 +- + drivers/mmc/host/sdhci-milbeaut.c | 2 +- + drivers/mmc/host/sdhci-msm.c | 2 +- + drivers/mmc/host/sdhci-of-arasan.c | 4 +- + drivers/mmc/host/sdhci-of-at91.c | 2 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 2 +- + drivers/mmc/host/sdhci-of-sparx5.c | 2 +- + drivers/mmc/host/sdhci-omap.c | 1 - + drivers/mmc/host/sdhci-pci-core.c | 4 + + drivers/mmc/host/sdhci-pci-o2micro.c | 207 +++++++++++++++++---- + drivers/mmc/host/sdhci-pci.h | 4 + + drivers/mmc/host/sdhci-pxav2.c | 1 - + drivers/mmc/host/sdhci-s3c.c | 1 - + drivers/mmc/host/sdhci-spear.c | 4 +- + drivers/mmc/host/sdhci-sprd.c | 1 - + drivers/mmc/host/sdhci-st.c | 5 +- + drivers/mmc/host/sdhci-tegra.c | 1 - + drivers/mmc/host/sh_mmcif.c | 1 - + drivers/mmc/host/sunplus-mmc.c | 3 +- + drivers/mmc/host/uniphier-sd.c | 13 +- + drivers/mmc/host/via-sdmmc.c | 2 - + drivers/mmc/host/wbsd.c | 2 - + drivers/mmc/host/wmt-sdmmc.c | 1 - + 48 files changed, 274 insertions(+), 138 deletions(-) +Merging mfd/for-mfd-next (3d2b5d02738e dt-bindings: mfd: stericsson,db8500-prcmu: Add missing unevaluatedProperties for each regulator) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging drivers/counter/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/stmpe-keypad.txt | 41 --- + .../bindings/input/touchscreen/stmpe.txt | 108 -------- + .../bindings/mfd/allwinner,sun6i-a31-prcm.yaml | 43 +-- + .../bindings/mfd/allwinner,sun8i-a23-prcm.yaml | 42 --- + .../devicetree/bindings/mfd/atmel-hlcdc.txt | 1 + + .../bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml | 4 +- + .../bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml | 4 +- + .../bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml | 4 +- + .../bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml | 4 +- + .../bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml | 4 +- + .../bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml | 4 +- + .../devicetree/bindings/mfd/maxim,max77693.yaml | 52 ++++ + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 6 +- + .../devicetree/bindings/mfd/st,stmpe.yaml | 297 +++++++++++++++++++++ + .../devicetree/bindings/mfd/st,stpmic1.yaml | 12 +- + .../bindings/mfd/stericsson,db8500-prcmu.yaml | 20 ++ + Documentation/devicetree/bindings/mfd/stmpe.txt | 42 --- + drivers/counter/Kconfig | 2 +- + drivers/mfd/Kconfig | 5 +- + drivers/mfd/ab8500-core.c | 1 - + drivers/mfd/acer-ec-a500.c | 2 +- + drivers/mfd/act8945a.c | 2 +- + drivers/mfd/altera-sysmgr.c | 3 +- + drivers/mfd/arizona-core.c | 1 - + drivers/mfd/atc260x-core.c | 1 - + drivers/mfd/atmel-hlcdc.c | 4 +- + drivers/mfd/axp20x.c | 12 +- + drivers/mfd/bcm590xx.c | 1 - + drivers/mfd/cros_ec_dev.c | 2 +- + drivers/mfd/cs47l15-tables.c | 8 +- + drivers/mfd/cs47l24-tables.c | 2 +- + drivers/mfd/cs47l35-tables.c | 8 +- + drivers/mfd/cs47l85-tables.c | 8 +- + drivers/mfd/cs47l90-tables.c | 8 +- + drivers/mfd/cs47l92-tables.c | 8 +- + drivers/mfd/da9052-i2c.c | 5 +- + drivers/mfd/da9055-i2c.c | 1 - + drivers/mfd/da9062-core.c | 2 +- + drivers/mfd/exynos-lpass.c | 4 +- + drivers/mfd/hi655x-pmic.c | 7 +- + drivers/mfd/ipaq-micro.c | 5 +- + drivers/mfd/iqs62x.c | 2 +- + drivers/mfd/lp873x.c | 2 +- + drivers/mfd/madera-i2c.c | 1 - + drivers/mfd/madera-spi.c | 1 - + drivers/mfd/max77620.c | 1 - + drivers/mfd/max77686.c | 1 - + drivers/mfd/max77843.c | 2 +- + drivers/mfd/max8907.c | 1 - + drivers/mfd/max8925-core.c | 1 - + drivers/mfd/max8997.c | 1 - + drivers/mfd/max8998.c | 1 - + drivers/mfd/mt6358-irq.c | 5 +- + drivers/mfd/mt6397-core.c | 5 +- + drivers/mfd/mt6397-irq.c | 5 +- + drivers/mfd/omap-usb-host.c | 4 +- + drivers/mfd/omap-usb-tll.c | 4 +- + drivers/mfd/palmas.c | 3 +- + drivers/mfd/qcom-pm8008.c | 2 +- + drivers/mfd/qcom-pm8xxx.c | 10 +- + drivers/mfd/rave-sp.c | 2 +- + drivers/mfd/rk8xx-core.c | 2 +- + drivers/mfd/rohm-bd71828.c | 2 +- + drivers/mfd/rohm-bd718x7.c | 2 +- + drivers/mfd/rohm-bd9576.c | 2 +- + drivers/mfd/rt5033.c | 2 +- + drivers/mfd/rz-mtu3.c | 5 +- + drivers/mfd/rz-mtu3.c.rej | 12 + + drivers/mfd/sec-core.c | 2 - + drivers/mfd/sprd-sc27xx-spi.c | 2 +- + drivers/mfd/ssbi.c | 6 +- + drivers/mfd/stm32-lptimer.c | 1 + + drivers/mfd/stm32-timers.c | 4 +- + drivers/mfd/sun4i-gpadc.c | 4 +- + drivers/mfd/ti-lmu.c | 1 - + drivers/mfd/ti_am335x_tscadc.c | 5 +- + drivers/mfd/tps6507x.c | 1 - + drivers/mfd/tps65090.c | 1 - + drivers/mfd/tps65217.c | 1 - + drivers/mfd/tps65218.c | 1 - + drivers/mfd/tps6594-core.c | 2 +- + drivers/mfd/twl6040.c | 2 - + drivers/mfd/wm5102-tables.c | 2 +- + drivers/mfd/wm5110-tables.c | 2 +- + drivers/mfd/wm831x-core.c | 3 +- + drivers/mfd/wm8994-regmap.c | 6 +- + drivers/mfd/wm8997-tables.c | 2 +- + drivers/mfd/wm8998-tables.c | 2 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 3 +- + drivers/pwm/Kconfig | 2 +- + include/linux/mfd/dbx500-prcmu.h | 21 -- + include/linux/mfd/hi655x-pmic.h | 1 - + include/linux/mfd/rz-mtu3.h | 66 ----- + 93 files changed, 507 insertions(+), 507 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/stmpe-keypad.txt + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/stmpe.txt + create mode 100644 Documentation/devicetree/bindings/mfd/st,stmpe.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/stmpe.txt + create mode 100644 drivers/mfd/rz-mtu3.c.rej +Merging backlight/for-backlight-next (fe1328b5b2a0 backlight: gpio_backlight: Drop output GPIO direction check for initial power state) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Auto-merging drivers/video/backlight/gpio_backlight.c +Merge made by the 'ort' strategy. + drivers/video/backlight/gpio_backlight.c | 3 +-- + drivers/video/backlight/lp855x_bl.c | 33 +++++++++++++++++++------------- + drivers/video/backlight/qcom-wled.c | 2 +- + 3 files changed, 22 insertions(+), 16 deletions(-) +Merging battery/for-next (7e6311f04b41 power: supply: qcom_pmi8998_charger: fix charger status) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-platform-power-on-reason | 12 ++ + drivers/power/reset/Kconfig | 7 - + drivers/power/reset/Makefile | 1 - + drivers/power/reset/as3722-poweroff.c | 1 - + drivers/power/reset/at91-poweroff.c | 4 +- + drivers/power/reset/at91-reset.c | 37 +++- + drivers/power/reset/at91-sama5d2_shdwc.c | 4 +- + drivers/power/reset/brcm-kona-reset.c | 8 +- + drivers/power/reset/gemini-poweroff.c | 4 +- + drivers/power/reset/gpio-poweroff.c | 3 +- + drivers/power/reset/gpio-restart.c | 2 +- + drivers/power/reset/keystone-reset.c | 3 +- + drivers/power/reset/msm-poweroff.c | 6 +- + drivers/power/reset/ocelot-reset.c | 9 +- + drivers/power/reset/odroid-go-ultra-poweroff.c | 3 +- + drivers/power/reset/oxnas-restart.c | 233 --------------------- + drivers/power/reset/st-poweroff.c | 2 +- + drivers/power/reset/syscon-poweroff.c | 3 +- + drivers/power/reset/syscon-reboot.c | 3 +- + drivers/power/reset/xgene-reboot.c | 2 +- + drivers/power/supply/axp20x_ac_power.c | 1 - + drivers/power/supply/axp20x_battery.c | 1 - + drivers/power/supply/axp20x_usb_power.c | 1 - + drivers/power/supply/bd99954-charger.c | 2 +- + drivers/power/supply/bq24190_charger.c | 17 +- + drivers/power/supply/cpcap-battery.c | 2 +- + drivers/power/supply/da9150-charger.c | 2 - + drivers/power/supply/da9150-fg.c | 1 - + drivers/power/supply/lego_ev3_battery.c | 2 +- + drivers/power/supply/ltc2941-battery-gauge.c | 2 +- + drivers/power/supply/ltc4162-l-charger.c | 2 +- + drivers/power/supply/max14656_charger_detector.c | 2 +- + drivers/power/supply/max17040_battery.c | 2 +- + drivers/power/supply/max8903_charger.c | 1 - + drivers/power/supply/power_supply_core.c | 6 +- + drivers/power/supply/qcom_pmi8998_charger.c | 13 +- + drivers/power/supply/rn5t618_power.c | 1 - + drivers/power/supply/rt5033_charger.c | 2 +- + drivers/power/supply/rt9455_charger.c | 3 +- + drivers/power/supply/sbs-battery.c | 2 +- + drivers/power/supply/tps65090-charger.c | 2 +- + drivers/power/supply/tps65217_charger.c | 1 - + drivers/power/supply/twl4030_charger.c | 1 + + include/linux/power/power_on_reason.h | 19 ++ + 44 files changed, 114 insertions(+), 321 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-power-on-reason + delete mode 100644 drivers/power/reset/oxnas-restart.c + create mode 100644 include/linux/power/power_on_reason.h +Merging regulator/for-next (4483b65be2c2 Merge remote-tracking branch 'regulator/for-6.6' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/regulator/active-semi,act8846.yaml | 82 +-- + .../bindings/regulator/adi,max77857.yaml | 86 +++ + .../devicetree/bindings/regulator/dlg,da9121.yaml | 22 +- + .../bindings/regulator/dlg,slg51000.yaml | 132 +++++ + .../devicetree/bindings/regulator/mps,mp5416.yaml | 2 + + .../devicetree/bindings/regulator/mps,mpq7920.yaml | 3 +- + .../devicetree/bindings/regulator/pfuze100.yaml | 4 + + .../bindings/regulator/qcom,rpm-regulator.yaml | 2 +- + .../bindings/regulator/qcom,rpmh-regulator.yaml | 24 +- + .../regulator/qcom,sdm845-refgen-regulator.yaml | 57 ++ + .../bindings/regulator/qcom,smd-rpm-regulator.yaml | 1 + + .../regulator/richtek,rt4831-regulator.yaml | 1 + + .../bindings/regulator/richtek,rt5739.yaml | 1 + + .../regulator/richtek,rtmv20-regulator.yaml | 1 + + .../bindings/regulator/richtek,rtq2208.yaml | 197 +++++++ + .../regulator/richtek,rtq6752-regulator.yaml | 1 + + .../devicetree/bindings/regulator/slg51000.txt | 88 ---- + .../bindings/regulator/st,stm32mp1-pwr-reg.yaml | 2 +- + .../devicetree/bindings/regulator/wlf,arizona.yaml | 2 + + MAINTAINERS | 2 +- + drivers/regulator/Kconfig | 39 +- + drivers/regulator/Makefile | 5 +- + drivers/regulator/act8945a-regulator.c | 2 +- + drivers/regulator/atc260x-regulator.c | 7 +- + drivers/regulator/axp20x-regulator.c | 1 - + drivers/regulator/bd71815-regulator.c | 1 - + drivers/regulator/bd71828-regulator.c | 1 - + drivers/regulator/bd718x7-regulator.c | 22 +- + drivers/regulator/cpcap-regulator.c | 2 +- + drivers/regulator/da9062-regulator.c | 11 +- + drivers/regulator/da9121-regulator.c | 18 +- + drivers/regulator/fan53555.c | 2 +- + drivers/regulator/fixed.c | 1 - + drivers/regulator/helpers.c | 15 +- + drivers/regulator/hi6421-regulator.c | 20 +- + drivers/regulator/lp872x.c | 2 +- + drivers/regulator/lp8755.c | 1 - + drivers/regulator/lp87565-regulator.c | 4 +- + drivers/regulator/ltc3589.c | 4 +- + drivers/regulator/max20086-regulator.c | 1 - + .../{max597x-regulator.c => max5970-regulator.c} | 28 +- + drivers/regulator/max77541-regulator.c | 6 +- + drivers/regulator/max77650-regulator.c | 2 +- + drivers/regulator/max77826-regulator.c | 1 - + drivers/regulator/max77857-regulator.c | 461 ++++++++++++++++ + drivers/regulator/max8893.c | 4 +- + drivers/regulator/mcp16502.c | 7 +- + drivers/regulator/mp5416.c | 2 +- + drivers/regulator/mp886x.c | 2 +- + drivers/regulator/mpq7920.c | 3 +- + drivers/regulator/mt6311-regulator.c | 1 - + drivers/regulator/mt6315-regulator.c | 2 +- + drivers/regulator/mt6359-regulator.c | 2 +- + drivers/regulator/mtk-dvfsrc-regulator.c | 3 +- + drivers/regulator/pbias-regulator.c | 1 - + drivers/regulator/pca9450-regulator.c | 1 - + drivers/regulator/pfuze100-regulator.c | 3 +- + drivers/regulator/pwm-regulator.c | 2 +- + drivers/regulator/qcom-refgen-regulator.c | 154 ++++++ + drivers/regulator/qcom-rpmh-regulator.c | 39 +- + drivers/regulator/qcom_rpm-regulator.c | 3 +- + drivers/regulator/qcom_smd-regulator.c | 1 - + drivers/regulator/qcom_usb_vbus-regulator.c | 1 - + drivers/regulator/raa215300.c | 18 +- + drivers/regulator/rc5t583-regulator.c | 1 - + drivers/regulator/rk808-regulator.c | 3 +- + drivers/regulator/rohm-regulator.c | 2 +- + drivers/regulator/rpi-panel-attiny-regulator.c | 3 +- + drivers/regulator/rt5739.c | 36 +- + drivers/regulator/rt5759-regulator.c | 2 +- + drivers/regulator/rtq2208-regulator.c | 583 +++++++++++++++++++++ + drivers/regulator/s2mpa01.c | 1 - + drivers/regulator/stm32-pwr.c | 3 +- + drivers/regulator/stm32-vrefbuf.c | 2 +- + drivers/regulator/sy8824x.c | 2 +- + drivers/regulator/sy8827n.c | 2 +- + drivers/regulator/tps6286x-regulator.c | 8 +- + drivers/regulator/tps6287x-regulator.c | 6 +- + drivers/regulator/tps65218-regulator.c | 2 +- + drivers/regulator/tps65219-regulator.c | 2 +- + drivers/regulator/tps65910-regulator.c | 1 - + drivers/regulator/tps6594-regulator.c | 2 +- + drivers/regulator/twl-regulator.c | 1 - + drivers/regulator/twl6030-regulator.c | 1 - + drivers/regulator/uniphier-regulator.c | 2 +- + drivers/regulator/userspace-consumer.c | 52 +- + drivers/regulator/vctrl-regulator.c | 2 +- + drivers/regulator/vexpress-regulator.c | 3 +- + include/linux/regulator/driver.h | 11 +- + 89 files changed, 2034 insertions(+), 315 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/adi,max77857.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/dlg,slg51000.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/qcom,sdm845-refgen-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/richtek,rtq2208.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/slg51000.txt + rename drivers/regulator/{max597x-regulator.c => max5970-regulator.c} (94%) + create mode 100644 drivers/regulator/max77857-regulator.c + create mode 100644 drivers/regulator/qcom-refgen-regulator.c + create mode 100644 drivers/regulator/rtq2208-regulator.c +Merging security/next (6672efbb685f lsm: constify the 'target' parameter in security_capget()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/security.h +Auto-merging security/security.c +CONFLICT (content): Merge conflict in security/security.c +Auto-merging security/selinux/hooks.c +Auto-merging security/smack/smack_lsm.c +Resolved 'security/security.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 96a3c11c39c8] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git +$ git diff -M --stat --summary HEAD^.. + include/linux/cred.h | 1 - + include/linux/evm.h | 14 +++--- + include/linux/lsm_hook_defs.h | 8 ++-- + include/linux/lsm_hooks.h | 20 +++++++++ + include/linux/security.h | 7 +-- + kernel/capability.c | 2 +- + security/apparmor/lsm.c | 2 +- + security/commoncap.c | 2 +- + security/integrity/evm/evm.h | 4 +- + security/integrity/evm/evm_crypto.c | 11 ++++- + security/integrity/evm/evm_main.c | 39 +++++++++++++--- + security/security.c | 88 +++++++++++++++++++++++++------------ + security/selinux/hooks.c | 19 ++++---- + security/smack/smack.h | 2 +- + security/smack/smack_lsm.c | 68 ++++++++++++++++------------ + 15 files changed, 194 insertions(+), 93 deletions(-) +Merging apparmor/apparmor-next (efea5b0dcc43 apparmor: remove unused PROF_* macros) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging security/apparmor/apparmorfs.c +Auto-merging security/apparmor/policy_unpack.c +Merge made by the 'ort' strategy. + security/apparmor/apparmorfs.c | 3 +++ + security/apparmor/audit.c | 1 + + security/apparmor/capability.c | 4 ++-- + security/apparmor/domain.c | 12 +++++++----- + security/apparmor/file.c | 6 +++--- + security/apparmor/include/file.h | 37 ------------------------------------- + security/apparmor/include/net.h | 1 - + security/apparmor/include/policy.h | 9 --------- + security/apparmor/include/task.h | 2 +- + security/apparmor/label.c | 26 ++++++++++++++------------ + security/apparmor/lib.c | 4 ++-- + security/apparmor/match.c | 4 ++-- + security/apparmor/policy.c | 21 ++++++++++++--------- + security/apparmor/policy_compat.c | 1 + + security/apparmor/policy_unpack.c | 2 +- + security/apparmor/resource.c | 8 ++++---- + security/apparmor/task.c | 5 +---- + 17 files changed, 54 insertions(+), 92 deletions(-) +Merging integrity/next-integrity (55e2b69649be kexec_lock: Replace kexec_mutex() by kexec_lock() in two comments) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Auto-merging kernel/kexec_file.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/ima_policy | 6 +++--- + arch/powerpc/kernel/ima_arch.c | 8 ++++---- + kernel/kexec_file.c | 2 +- + security/integrity/ima/Kconfig | 12 ------------ + security/integrity/ima/ima_appraise.c | 12 +++++++----- + security/integrity/ima/ima_efi.c | 3 +++ + security/integrity/ima/ima_kexec.c | 2 +- + security/integrity/ima/ima_policy.c | 17 +++++------------ + 8 files changed, 24 insertions(+), 38 deletions(-) +Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (e49be9bc7c1b selinux: use unsigned iterator in nlmsgtab code) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/selinux/hooks.c +Auto-merging security/selinux/selinuxfs.c +Merge made by the 'ort' strategy. + security/selinux/Kconfig | 25 ++++-- + security/selinux/avc.c | 17 ++-- + security/selinux/hooks.c | 122 ++++++++++++++--------------- + security/selinux/include/avc.h | 2 +- + security/selinux/include/avc_ss.h | 2 +- + security/selinux/include/objsec.h | 4 +- + security/selinux/include/policycap_names.h | 2 +- + security/selinux/include/security.h | 45 ++++------- + security/selinux/netif.c | 4 +- + security/selinux/nlmsgtab.c | 3 +- + security/selinux/selinuxfs.c | 28 ++++--- + security/selinux/ss/avtab.c | 66 +++++----------- + security/selinux/ss/avtab.h | 12 ++- + security/selinux/ss/conditional.c | 4 +- + security/selinux/ss/constraint.h | 2 +- + security/selinux/ss/context.h | 2 +- + security/selinux/ss/ebitmap.c | 2 +- + security/selinux/ss/ebitmap.h | 2 +- + security/selinux/ss/hashtab.c | 8 +- + security/selinux/ss/hashtab.h | 8 +- + security/selinux/ss/mls.c | 12 +-- + security/selinux/ss/mls.h | 2 +- + security/selinux/ss/mls_types.h | 2 +- + security/selinux/ss/policydb.c | 98 ++++++++++++----------- + security/selinux/ss/policydb.h | 9 ++- + security/selinux/ss/services.c | 54 ++++++------- + security/selinux/ss/services.h | 4 +- + security/selinux/ss/sidtab.c | 2 +- + security/selinux/ss/sidtab.h | 2 +- + security/selinux/ss/symtab.c | 4 +- + security/selinux/ss/symtab.h | 4 +- + security/selinux/status.c | 6 +- + security/selinux/xfrm.c | 2 +- + 33 files changed, 275 insertions(+), 286 deletions(-) +Merging smack/next (3ad49d37cf57 smackfs: Prevent underflow in smk_set_cipso()) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Merge made by the 'ort' strategy. + security/smack/smackfs.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging tomoyo/master (254a8ed6aab3 tomoyo: remove unused function declaration) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Merge made by the 'ort' strategy. + security/tomoyo/common.c | 1 + + security/tomoyo/common.h | 6 ++---- + security/tomoyo/domain.c | 5 ++--- + 3 files changed, 5 insertions(+), 7 deletions(-) +Merging tpmdd/next (2ccdd1b13c59 Linux 6.5-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (8a504bd61ec7 watchdog: starfive: Remove #ifdef guards for PM related functions) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Merge made by the 'ort' strategy. + .../bindings/watchdog/marvell,cn10624-wdt.yaml | 83 +++++ + .../devicetree/bindings/watchdog/ti,rti-wdt.yaml | 28 +- + drivers/watchdog/Kconfig | 96 +++--- + drivers/watchdog/Makefile | 1 + + drivers/watchdog/armada_37xx_wdt.c | 1 - + drivers/watchdog/at91rm9200_wdt.c | 3 +- + drivers/watchdog/cpwd.c | 2 +- + drivers/watchdog/ftwdt010_wdt.c | 6 +- + drivers/watchdog/gef_wdt.c | 2 +- + drivers/watchdog/imx2_wdt.c | 3 +- + drivers/watchdog/imx7ulp_wdt.c | 1 - + drivers/watchdog/lantiq_wdt.c | 3 +- + drivers/watchdog/loongson1_wdt.c | 1 + + drivers/watchdog/marvell_gti_wdt.c | 340 +++++++++++++++++++++ + drivers/watchdog/menz69_wdt.c | 1 - + drivers/watchdog/meson_wdt.c | 4 +- + drivers/watchdog/mpc8xxx_wdt.c | 4 +- + drivers/watchdog/mtk_wdt.c | 1 - + drivers/watchdog/of_xilinx_wdt.c | 3 +- + drivers/watchdog/pic32-dmt.c | 1 - + drivers/watchdog/pic32-wdt.c | 1 - + drivers/watchdog/pika_wdt.c | 2 +- + drivers/watchdog/qcom-wdt.c | 1 - + drivers/watchdog/rave-sp-wdt.c | 2 +- + drivers/watchdog/riowd.c | 2 +- + drivers/watchdog/rti_wdt.c | 48 +++ + drivers/watchdog/rza_wdt.c | 4 +- + drivers/watchdog/rzg2l_wdt.c | 2 +- + drivers/watchdog/s3c2410_wdt.c | 16 +- + drivers/watchdog/sama5d4_wdt.c | 1 - + drivers/watchdog/sbsa_gwdt.c | 3 +- + drivers/watchdog/starfive-wdt.c | 13 +- + drivers/watchdog/stm32_iwdg.c | 1 - + drivers/watchdog/sunxi_wdt.c | 1 - + drivers/watchdog/watchdog_core.c | 2 +- + drivers/watchdog/xilinx_wwdt.c | 4 +- + 36 files changed, 593 insertions(+), 94 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/marvell,cn10624-wdt.yaml + create mode 100644 drivers/watchdog/marvell_gti_wdt.c +Merging iommu/next (b2b57855813d Merge branches 'apple/dart', 'arm/mediatek', 'arm/renesas', 'arm/rockchip', 'unisoc', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/scan.c +Auto-merging drivers/dma/idxd/device.c +Auto-merging drivers/iommu/amd/iommu_v2.c +Auto-merging drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c +Auto-merging drivers/iommu/intel/svm.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/iommu/mediatek,iommu.yaml | 12 +- + MAINTAINERS | 1 + + drivers/acpi/scan.c | 7 +- + drivers/dma/idxd/device.c | 39 +- + drivers/dma/idxd/dma.c | 5 +- + drivers/dma/idxd/idxd.h | 9 + + drivers/dma/idxd/init.c | 54 +- + drivers/dma/idxd/sysfs.c | 7 - + drivers/iommu/amd/amd_iommu.h | 4 + + drivers/iommu/amd/amd_iommu_types.h | 22 +- + drivers/iommu/amd/init.c | 131 ++-- + drivers/iommu/amd/iommu.c | 86 ++- + drivers/iommu/amd/iommu_v2.c | 7 +- + drivers/iommu/apple-dart.c | 2 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 2 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 16 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c | 2 +- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 1 - + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 3 +- + drivers/iommu/dma-iommu.c | 26 +- + drivers/iommu/dma-iommu.h | 8 + + drivers/iommu/intel/debugfs.c | 34 +- + drivers/iommu/intel/iommu.c | 244 ++++--- + drivers/iommu/intel/iommu.h | 9 + + drivers/iommu/intel/pasid.c | 4 +- + drivers/iommu/intel/pasid.h | 2 - + drivers/iommu/intel/svm.c | 62 +- + drivers/iommu/iommu-sva.c | 29 +- + drivers/iommu/iommu-sysfs.c | 8 - + drivers/iommu/iommu.c | 723 ++++++++++++--------- + drivers/iommu/ipmmu-vmsa.c | 43 +- + drivers/iommu/mtk_iommu.c | 149 ++++- + drivers/iommu/of_iommu.c | 4 +- + drivers/iommu/omap-iommu.c | 42 +- + drivers/iommu/omap-iommu.h | 2 +- + drivers/iommu/rockchip-iommu.c | 72 +- + drivers/iommu/sprd-iommu.c | 26 +- + drivers/iommu/sun50i-iommu.c | 29 +- + drivers/iommu/tegra-smmu.c | 2 +- + drivers/iommu/virtio-iommu.c | 2 +- + .../memory/mediatek,mt8188-memory-port.h | 489 ++++++++++++++ + include/linux/amd-iommu.h | 1 - + include/linux/dmar.h | 2 - + include/linux/iommu.h | 24 +- + include/soc/mediatek/smi.h | 1 + + 45 files changed, 1610 insertions(+), 837 deletions(-) + create mode 100644 include/dt-bindings/memory/mediatek,mt8188-memory-port.h +Merging audit/next (b59bc6e37237 audit: fix possible soft lockup in __audit_inode_child()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Merge made by the 'ort' strategy. + kernel/audit.c | 2 -- + kernel/audit.h | 2 +- + kernel/auditsc.c | 2 ++ + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging devicetree/for-next (2b9583244aad of: unittest: Remove redundant of_match_ptr()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging drivers/of/device.c +Auto-merging drivers/of/platform.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 3 ++ + .../bindings/chrome/google,cros-ec-typec.yaml | 6 ++-- + .../bindings/connector/usb-connector.yaml | 5 ++- + .../devicetree/bindings/crypto/qcom-qce.yaml | 1 + + .../bindings/extcon/qcom,pm8941-misc.yaml | 2 +- + .../devicetree/bindings/mfd/qcom,pm8008.yaml | 2 +- + .../devicetree/bindings/reset/altr,rst-mgr.yaml | 12 +++++-- + .../bindings/soc/qcom/qcom,pmic-glink.yaml | 6 ---- + .../devicetree/bindings/usb/cypress,cypd4226.yaml | 6 ++-- + .../devicetree/bindings/usb/samsung-hsotg.txt | 38 ---------------------- + drivers/base/platform.c | 2 +- + drivers/of/base.c | 1 + + drivers/of/device.c | 32 ------------------ + drivers/of/of_private.h | 6 ++++ + drivers/of/platform.c | 34 +++++++++++++++++++ + drivers/of/unittest.c | 16 +++++---- + include/linux/of.h | 7 ++-- + include/linux/of_platform.h | 6 ---- + 18 files changed, 78 insertions(+), 107 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/usb/samsung-hsotg.txt +Merging dt-krzk/for-next (f418e00ab433 Merge branch 'next/qcom-pinctrl' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 2 + + .../pinctrl/qcom,sm6115-lpass-lpi-pinctrl.yaml | 135 ++++++++++++++++ + .../pinctrl/qcom,sm8350-lpass-lpi-pinctrl.yaml | 143 +++++++++++++++++ + drivers/pinctrl/qcom/Kconfig | 19 +++ + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-sm6115-lpass-lpi.c | 175 +++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-sm8350-lpass-lpi.c | 167 ++++++++++++++++++++ + 7 files changed, 643 insertions(+) + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm6115-lpass-lpi-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8350-lpass-lpi-pinctrl.yaml + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm6115-lpass-lpi.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8350-lpass-lpi.c +Merging mailbox/mailbox-for-next (1b712f18c461 mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (a9ca0d5d5006 Merge remote-tracking branch 'spi/for-6.6' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/spi/brcm,bcm63xx-spi.yaml | 71 ++++++ + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 12 +- + .../devicetree/bindings/spi/loongson,ls2k-spi.yaml | 46 ++++ + .../bindings/spi/nvidia,tegra114-spi.txt | 61 ----- + .../bindings/spi/nvidia,tegra114-spi.yaml | 100 ++++++++ + .../bindings/spi/nvidia,tegra20-sflash.txt | 37 --- + .../bindings/spi/nvidia,tegra20-sflash.yaml | 81 ++++++ + .../bindings/spi/nvidia,tegra20-slink.txt | 37 --- + .../bindings/spi/nvidia,tegra20-slink.yaml | 90 +++++++ + .../devicetree/bindings/spi/spi-bcm63xx.txt | 33 --- + .../devicetree/bindings/spi/spi-cadence.yaml | 6 + + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 3 + + .../devicetree/bindings/spi/spi-nxp-fspi.yaml | 3 + + .../devicetree/bindings/spi/spi-pl022.yaml | 1 + + MAINTAINERS | 12 +- + drivers/spi/Kconfig | 26 ++ + drivers/spi/Makefile | 3 + + drivers/spi/spi-amd.c | 52 ++-- + drivers/spi/spi-amlogic-spifc-a1.c | 88 +++---- + drivers/spi/spi-ar934x.c | 3 +- + drivers/spi/spi-armada-3700.c | 3 +- + drivers/spi/spi-aspeed-smc.c | 14 +- + drivers/spi/spi-at91-usart.c | 3 +- + drivers/spi/spi-ath79.c | 2 +- + drivers/spi/spi-atmel.c | 10 +- + drivers/spi/spi-au1550.c | 74 +++--- + drivers/spi/spi-axi-spi-engine.c | 62 ++--- + drivers/spi/spi-bcm-qspi.c | 64 ++--- + drivers/spi/spi-bcm2835.c | 130 +++++----- + drivers/spi/spi-bcm2835aux.c | 92 ++++--- + drivers/spi/spi-bcm63xx-hsspi.c | 86 +++---- + drivers/spi/spi-bcm63xx.c | 68 ++--- + drivers/spi/spi-bcmbca-hsspi.c | 66 ++--- + drivers/spi/spi-bitbang-txrx.h | 16 +- + drivers/spi/spi-bitbang.c | 8 +- + drivers/spi/spi-butterfly.c | 18 +- + drivers/spi/spi-cadence-quadspi.c | 112 +++++++-- + drivers/spi/spi-cadence-xspi.c | 31 ++- + drivers/spi/spi-cadence.c | 76 +++--- + drivers/spi/spi-cavium-octeon.c | 32 +-- + drivers/spi/spi-cavium-thunderx.c | 32 +-- + drivers/spi/spi-clps711x.c | 42 ++-- + drivers/spi/spi-coldfire-qspi.c | 77 +++--- + drivers/spi/spi-davinci.c | 88 +++---- + drivers/spi/spi-dln2.c | 94 +++---- + drivers/spi/spi-dw-core.c | 112 ++++----- + drivers/spi/spi-dw-dma.c | 22 +- + drivers/spi/spi-dw-mmio.c | 14 +- + drivers/spi/spi-dw.h | 4 +- + drivers/spi/spi-ep93xx.c | 187 +++++++------- + drivers/spi/spi-falcon.c | 34 +-- + drivers/spi/spi-fsi.c | 2 +- + drivers/spi/spi-fsl-cpm.c | 74 +++--- + drivers/spi/spi-fsl-dspi.c | 34 +-- + drivers/spi/spi-fsl-espi.c | 76 +++--- + drivers/spi/spi-fsl-lib.c | 3 +- + drivers/spi/spi-fsl-lib.h | 3 - + drivers/spi/spi-fsl-lpspi.c | 89 +++---- + drivers/spi/spi-fsl-qspi.c | 11 +- + drivers/spi/spi-fsl-spi.c | 80 +++--- + drivers/spi/spi-geni-qcom.c | 53 +++- + drivers/spi/spi-gpio.c | 77 +++--- + drivers/spi/spi-gxp.c | 7 +- + drivers/spi/spi-hisi-kunpeng.c | 82 +++--- + drivers/spi/spi-hisi-sfc-v3xx.c | 18 +- + drivers/spi/spi-img-spfi.c | 118 ++++----- + drivers/spi/spi-imx.c | 128 +++++----- + drivers/spi/spi-ingenic.c | 4 +- + drivers/spi/spi-intel.c | 42 ++-- + drivers/spi/spi-jcore.c | 44 ++-- + drivers/spi/spi-lantiq-ssc.c | 99 ++++---- + drivers/spi/spi-loongson-core.c | 279 +++++++++++++++++++++ + drivers/spi/spi-loongson-pci.c | 55 ++++ + drivers/spi/spi-loongson-plat.c | 47 ++++ + drivers/spi/spi-loongson.h | 49 ++++ + drivers/spi/spi-loopback-test.c | 2 +- + drivers/spi/spi-lp8841-rtc.c | 11 +- + drivers/spi/spi-meson-spicc.c | 3 +- + drivers/spi/spi-microchip-core.c | 6 +- + drivers/spi/spi-mpc512x-psc.c | 2 +- + drivers/spi/spi-mpc52xx-psc.c | 2 +- + drivers/spi/spi-mt65xx.c | 2 +- + drivers/spi/spi-mt7621.c | 2 + + drivers/spi/spi-mtk-nor.c | 3 +- + drivers/spi/spi-mtk-snfi.c | 3 +- + drivers/spi/spi-mxs.c | 2 +- + drivers/spi/spi-npcm-fiu.c | 22 +- + drivers/spi/spi-nxp-fspi.c | 7 +- + drivers/spi/spi-omap-uwire.c | 2 +- + drivers/spi/spi-omap2-mcspi.c | 4 +- + drivers/spi/spi-orion.c | 3 +- + drivers/spi/spi-pci1xxxx.c | 2 +- + drivers/spi/spi-pic32-sqi.c | 2 +- + drivers/spi/spi-pic32.c | 2 +- + drivers/spi/spi-pxa2xx.c | 2 +- + drivers/spi/spi-qcom-qspi.c | 4 +- + drivers/spi/spi-qup.c | 1 - + drivers/spi/spi-rb4xx.c | 2 +- + drivers/spi/spi-rockchip-sfc.c | 2 +- + drivers/spi/spi-rockchip.c | 2 +- + drivers/spi/spi-rspi.c | 5 +- + drivers/spi/spi-rzv2m-csi.c | 120 ++++----- + drivers/spi/spi-s3c64xx.c | 12 +- + drivers/spi/spi-sc18is602.c | 3 +- + drivers/spi/spi-sh-msiof.c | 1 - + drivers/spi/spi-sifive.c | 2 +- + drivers/spi/spi-slave-mt27xx.c | 2 +- + drivers/spi/spi-sn-f-ospi.c | 2 +- + drivers/spi/spi-sprd-adi.c | 3 +- + drivers/spi/spi-sprd.c | 1 - + drivers/spi/spi-stm32-qspi.c | 1 - + drivers/spi/spi-stm32.c | 18 +- + drivers/spi/spi-sun6i.c | 32 ++- + drivers/spi/spi-tegra114.c | 1 - + drivers/spi/spi-tegra20-sflash.c | 6 +- + drivers/spi/spi-tegra20-slink.c | 11 +- + drivers/spi/spi-tegra210-quad.c | 1 - + drivers/spi/spi-ti-qspi.c | 3 +- + drivers/spi/spi-wpcm-fiu.c | 3 +- + drivers/spi/spi-xcomm.c | 2 +- + drivers/spi/spi-xtensa-xtfpga.c | 2 +- + drivers/spi/spi-zynq-qspi.c | 4 +- + drivers/spi/spi-zynqmp-gqspi.c | 8 +- + drivers/spi/spi.c | 219 +++++++--------- + include/linux/soc/qcom/geni-se.h | 9 + + include/linux/spi/spi.h | 173 +++++++------ + include/trace/events/spi.h | 2 +- + 127 files changed, 2716 insertions(+), 1937 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/brcm,bcm63xx-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/loongson,ls2k-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.txt + create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra114-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt + create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt + create mode 100644 Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-bcm63xx.txt + create mode 100644 drivers/spi/spi-loongson-core.c + create mode 100644 drivers/spi/spi-loongson-pci.c + create mode 100644 drivers/spi/spi-loongson-plat.c + create mode 100644 drivers/spi/spi-loongson.h +Merging tip/master (855484a68d16 Merge x86/microcode into tip/master) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/core-api/cpu_hotplug.rst +Auto-merging Documentation/filesystems/proc.rst +Auto-merging MAINTAINERS +Auto-merging arch/Kconfig +Auto-merging arch/alpha/include/asm/pgtable.h +Auto-merging arch/arc/include/asm/pgtable-bits-arcv2.h +Auto-merging arch/arm/include/asm/pgtable.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/csky/include/asm/pgtable.h +Auto-merging arch/hexagon/include/asm/pgtable.h +Auto-merging arch/ia64/include/asm/pgtable.h +Auto-merging arch/loongarch/include/asm/pgtable.h +Auto-merging arch/m68k/include/asm/mcf_pgtable.h +Auto-merging arch/m68k/include/asm/motorola_pgtable.h +Auto-merging arch/m68k/include/asm/sun3_pgtable.h +Auto-merging arch/microblaze/include/asm/pgtable.h +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/nios2/include/asm/pgtable.h +Auto-merging arch/openrisc/include/asm/pgtable.h +Auto-merging arch/parisc/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/riscv/include/asm/pgtable.h +Auto-merging arch/s390/Kconfig +CONFLICT (content): Merge conflict in arch/s390/Kconfig +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/sh/include/asm/pgtable_32.h +Auto-merging arch/sparc/include/asm/pgtable_32.h +Auto-merging arch/sparc/include/asm/pgtable_64.h +Auto-merging arch/um/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/include/asm/tlbflush.h +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/kernel/apic/hw_nmi.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/mm/pgtable.c +Auto-merging arch/x86/mm/tlb.c +Auto-merging arch/x86/xen/enlighten_pv.c +Auto-merging arch/x86/xen/mmu_pv.c +Auto-merging arch/xtensa/include/asm/pgtable.h +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/powercap/intel_rapl_common.c +Auto-merging fs/proc/task_mmu.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/perf_event.h +Auto-merging include/linux/pgtable.h +Auto-merging include/linux/syscalls.h +Auto-merging init/Kconfig +Auto-merging kernel/events/core.c +Auto-merging kernel/fork.c +Auto-merging mm/debug_vm_pgtable.c +Auto-merging mm/gup.c +Auto-merging mm/huge_memory.c +Auto-merging mm/internal.h +Auto-merging mm/memory.c +Auto-merging mm/migrate.c +Auto-merging mm/migrate_device.c +Auto-merging mm/mmap.c +Auto-merging mm/mprotect.c +Auto-merging mm/nommu.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/util.c +Recorded preimage for 'arch/s390/Kconfig' +Recorded preimage for 'arch/x86/entry/syscalls/syscall_64.tbl' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/s390/Kconfig'. +Recorded resolution for 'arch/x86/entry/syscalls/syscall_64.tbl'. +[master b8dcf3385d0d] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/arch/x86/boot.rst | 2 +- + Documentation/arch/x86/index.rst | 1 + + Documentation/arch/x86/shstk.rst | 179 +++ + Documentation/core-api/cpu_hotplug.rst | 10 +- + Documentation/filesystems/proc.rst | 1 + + Documentation/mm/arch_pgtable_helpers.rst | 12 +- + MAINTAINERS | 5 +- + arch/Kconfig | 8 + + arch/alpha/include/asm/pgtable.h | 2 +- + arch/arc/include/asm/hugepage.h | 2 +- + arch/arc/include/asm/pgtable-bits-arcv2.h | 2 +- + arch/arm/include/asm/pgtable-3level.h | 2 +- + arch/arm/include/asm/pgtable.h | 2 +- + arch/arm/kernel/signal.c | 2 +- + arch/arm64/include/asm/pgtable.h | 4 +- + arch/arm64/kernel/signal.c | 2 +- + arch/arm64/kernel/signal32.c | 2 +- + arch/arm64/mm/trans_pgd.c | 4 +- + arch/csky/include/asm/pgtable.h | 2 +- + arch/hexagon/include/asm/pgtable.h | 2 +- + arch/ia64/include/asm/pgtable.h | 2 +- + arch/loongarch/include/asm/local.h | 4 +- + arch/loongarch/include/asm/pgtable.h | 4 +- + arch/m68k/include/asm/mcf_pgtable.h | 2 +- + arch/m68k/include/asm/motorola_pgtable.h | 2 +- + arch/m68k/include/asm/sun3_pgtable.h | 2 +- + arch/microblaze/include/asm/pgtable.h | 2 +- + arch/mips/include/asm/local.h | 4 +- + arch/mips/include/asm/pgtable.h | 6 +- + arch/nios2/include/asm/pgtable.h | 2 +- + arch/openrisc/include/asm/pgtable.h | 2 +- + arch/parisc/include/asm/pgtable.h | 2 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 4 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 4 +- + arch/powerpc/include/asm/nohash/32/pte-8xx.h | 4 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- + arch/riscv/include/asm/pgtable.h | 6 +- + arch/s390/Kconfig | 1 + + arch/s390/include/asm/hugetlb.h | 2 +- + arch/s390/include/asm/pgtable.h | 4 +- + arch/s390/mm/pageattr.c | 4 +- + arch/sh/include/asm/pgtable_32.h | 4 +- + arch/sparc/include/asm/pgtable_32.h | 2 +- + arch/sparc/include/asm/pgtable_64.h | 6 +- + arch/sparc/kernel/signal32.c | 2 +- + arch/sparc/kernel/signal_64.c | 2 +- + arch/um/include/asm/pgtable.h | 2 +- + arch/x86/Kconfig | 62 +- + arch/x86/Kconfig.assembler | 5 + + arch/x86/boot/compressed/Makefile | 5 + + arch/x86/boot/compressed/efi_mixed.S | 107 +- + arch/x86/boot/compressed/error.c | 2 +- + arch/x86/boot/compressed/error.h | 2 +- + arch/x86/boot/compressed/head_32.S | 32 - + arch/x86/boot/compressed/head_64.S | 280 ++--- + arch/x86/boot/compressed/misc.c | 44 +- + arch/x86/boot/compressed/misc.h | 2 - + arch/x86/boot/compressed/pgtable.h | 10 +- + arch/x86/boot/compressed/pgtable_64.c | 87 +- + arch/x86/boot/compressed/sev.c | 112 +- + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/events/amd/ibs.c | 190 +-- + arch/x86/events/core.c | 11 +- + arch/x86/events/intel/core.c | 54 +- + arch/x86/events/intel/cstate.c | 12 +- + arch/x86/events/intel/ds.c | 9 +- + arch/x86/events/intel/uncore.c | 2 +- + arch/x86/events/msr.c | 10 +- + arch/x86/events/perf_event.h | 2 + + arch/x86/events/rapl.c | 2 +- + arch/x86/hyperv/hv_apic.c | 26 +- + arch/x86/hyperv/hv_init.c | 2 +- + arch/x86/hyperv/hv_spinlock.c | 2 +- + arch/x86/hyperv/hv_vtl.c | 2 +- + arch/x86/include/asm/apic.h | 241 ++-- + arch/x86/include/asm/boot.h | 8 + + arch/x86/include/asm/cpufeatures.h | 3 +- + arch/x86/include/asm/disabled-features.h | 16 +- + arch/x86/include/asm/div64.h | 6 + + arch/x86/include/asm/efi.h | 7 +- + arch/x86/include/asm/entry-common.h | 1 + + arch/x86/include/asm/fpu/api.h | 9 + + arch/x86/include/asm/fpu/regset.h | 7 +- + arch/x86/include/asm/fpu/sched.h | 3 +- + arch/x86/include/asm/fpu/types.h | 16 +- + arch/x86/include/asm/fpu/xstate.h | 6 +- + arch/x86/include/asm/hw_irq.h | 4 +- + arch/x86/include/asm/idtentry.h | 3 +- + arch/x86/include/asm/intel-family.h | 18 +- + arch/x86/include/asm/io_apic.h | 7 +- + arch/x86/include/asm/irq_vectors.h | 7 - + arch/x86/include/asm/local.h | 4 +- + arch/x86/include/asm/microcode.h | 175 +-- + arch/x86/include/asm/microcode_amd.h | 60 - + arch/x86/include/asm/microcode_intel.h | 88 -- + arch/x86/include/asm/mmu_context.h | 2 + + arch/x86/include/asm/mpspec.h | 31 +- + arch/x86/include/asm/nospec-branch.h | 3 - + arch/x86/include/asm/paravirt.h | 7 + + arch/x86/include/asm/pgtable.h | 302 ++++- + arch/x86/include/asm/pgtable_types.h | 47 +- + arch/x86/include/asm/processor.h | 11 +- + arch/x86/include/asm/qspinlock.h | 7 +- + arch/x86/include/asm/qspinlock_paravirt.h | 2 + + arch/x86/include/asm/sev.h | 6 + + arch/x86/include/asm/shstk.h | 38 + + arch/x86/include/asm/smp.h | 14 - + arch/x86/include/asm/special_insns.h | 13 + + arch/x86/include/asm/tlbflush.h | 3 +- + arch/x86/include/asm/trap_pf.h | 2 + + arch/x86/include/asm/traps.h | 12 + + arch/x86/include/uapi/asm/mman.h | 4 + + arch/x86/include/uapi/asm/prctl.h | 12 + + arch/x86/kernel/Makefile | 4 + + arch/x86/kernel/acpi/boot.c | 12 +- + arch/x86/kernel/alternative.c | 1 + + arch/x86/kernel/amd_nb.c | 8 + + arch/x86/kernel/apic/Makefile | 2 +- + arch/x86/kernel/apic/apic.c | 456 +++---- + arch/x86/kernel/apic/apic_common.c | 21 +- + arch/x86/kernel/apic/apic_flat_64.c | 80 +- + arch/x86/kernel/apic/apic_noop.c | 91 +- + arch/x86/kernel/apic/apic_numachip.c | 50 +- + arch/x86/kernel/apic/bigsmp_32.c | 89 +- + arch/x86/kernel/apic/hw_nmi.c | 4 +- + arch/x86/kernel/apic/init.c | 110 ++ + arch/x86/kernel/apic/io_apic.c | 30 +- + arch/x86/kernel/apic/ipi.c | 178 ++- + arch/x86/kernel/apic/local.h | 30 +- + arch/x86/kernel/apic/msi.c | 2 +- + arch/x86/kernel/apic/probe_32.c | 119 +- + arch/x86/kernel/apic/probe_64.c | 18 +- + arch/x86/kernel/apic/vector.c | 116 +- + arch/x86/kernel/apic/x2apic_cluster.c | 23 +- + arch/x86/kernel/apic/x2apic_phys.c | 76 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 51 +- + arch/x86/kernel/cet.c | 152 +++ + arch/x86/kernel/cpu/acrn.c | 2 +- + arch/x86/kernel/cpu/amd.c | 3 +- + arch/x86/kernel/cpu/bugs.c | 7 +- + arch/x86/kernel/cpu/common.c | 41 +- + arch/x86/kernel/cpu/cpuid-deps.c | 1 + + arch/x86/kernel/cpu/hygon.c | 3 +- + arch/x86/kernel/cpu/intel.c | 176 +-- + arch/x86/kernel/cpu/intel_epb.c | 2 +- + arch/x86/kernel/cpu/mce/amd.c | 2 +- + arch/x86/kernel/cpu/mce/core.c | 9 +- + arch/x86/kernel/cpu/mce/inject.c | 3 +- + arch/x86/kernel/cpu/mce/intel.c | 19 +- + arch/x86/kernel/cpu/mce/internal.h | 1 + + arch/x86/kernel/cpu/mce/threshold.c | 2 +- + arch/x86/kernel/cpu/microcode/Makefile | 4 +- + arch/x86/kernel/cpu/microcode/amd.c | 133 +- + arch/x86/kernel/cpu/microcode/core.c | 17 +- + arch/x86/kernel/cpu/microcode/intel.c | 304 +++-- + arch/x86/kernel/cpu/microcode/internal.h | 131 ++ + arch/x86/kernel/cpu/mshyperv.c | 4 +- + arch/x86/kernel/cpu/proc.c | 23 + + arch/x86/kernel/devicetree.c | 21 +- + arch/x86/kernel/fpu/core.c | 54 +- + arch/x86/kernel/fpu/regset.c | 81 ++ + arch/x86/kernel/fpu/xstate.c | 90 +- + arch/x86/kernel/head_64.S | 32 +- + arch/x86/kernel/idt.c | 3 +- + arch/x86/kernel/irq.c | 14 +- + arch/x86/kernel/irq_work.c | 4 +- + arch/x86/kernel/jailhouse.c | 6 +- + arch/x86/kernel/kprobes/core.c | 34 + + arch/x86/kernel/kprobes/opt.c | 40 +- + arch/x86/kernel/kvm.c | 14 +- + arch/x86/kernel/mpparse.c | 20 +- + arch/x86/kernel/nmi_selftest.c | 2 +- + arch/x86/kernel/paravirt.c | 3 +- + arch/x86/kernel/process.c | 21 +- + arch/x86/kernel/process_64.c | 8 + + arch/x86/kernel/ptrace.c | 12 + + arch/x86/kernel/setup.c | 7 +- + arch/x86/kernel/setup_percpu.c | 10 - + arch/x86/kernel/sev.c | 4 +- + arch/x86/kernel/shstk.c | 550 ++++++++ + arch/x86/kernel/signal.c | 1 + + arch/x86/kernel/signal_32.c | 2 +- + arch/x86/kernel/signal_64.c | 8 +- + arch/x86/kernel/smp.c | 10 +- + arch/x86/kernel/smpboot.c | 132 +- + arch/x86/kernel/sys_x86_64.c | 6 +- + arch/x86/kernel/traps.c | 89 -- + arch/x86/kernel/vmlinux.lds.S | 10 +- + arch/x86/kernel/vsmp_64.c | 2 +- + arch/x86/kvm/svm/svm.c | 2 + + arch/x86/kvm/vmx/posted_intr.c | 2 +- + arch/x86/kvm/vmx/vmx.c | 2 +- + arch/x86/lib/retpoline.S | 15 +- + arch/x86/mm/fault.c | 22 + + arch/x86/mm/init.c | 12 +- + arch/x86/mm/pat/set_memory.c | 4 +- + arch/x86/mm/pgtable.c | 40 + + arch/x86/mm/srat.c | 5 +- + arch/x86/mm/tlb.c | 19 +- + arch/x86/pci/xen.c | 2 +- + arch/x86/platform/uv/uv_irq.c | 2 +- + arch/x86/platform/uv/uv_nmi.c | 2 +- + arch/x86/purgatory/purgatory.c | 1 + + arch/x86/xen/apic.c | 85 +- + arch/x86/xen/enlighten_hvm.c | 2 +- + arch/x86/xen/enlighten_pv.c | 6 +- + arch/x86/xen/mmu_pv.c | 2 +- + arch/x86/xen/smp_pv.c | 5 +- + arch/x86/xen/xen-asm.S | 2 +- + arch/xtensa/include/asm/pgtable.h | 2 +- + drivers/edac/amd64_edac.c | 15 + + drivers/edac/i10nm_base.c | 2 +- + drivers/firmware/efi/libstub/Makefile | 1 + + drivers/firmware/efi/libstub/arm64-stub.c | 2 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 2 + + drivers/firmware/efi/libstub/efistub.h | 3 +- + drivers/firmware/efi/libstub/randomalloc.c | 10 +- + drivers/firmware/efi/libstub/x86-5lvl.c | 95 ++ + drivers/firmware/efi/libstub/x86-stub.c | 285 +++-- + drivers/firmware/efi/libstub/x86-stub.h | 17 + + drivers/firmware/efi/libstub/zboot.c | 2 +- + drivers/hwmon/k10temp.c | 8 +- + drivers/idle/intel_idle.c | 10 +- + drivers/iommu/amd/iommu.c | 2 +- + drivers/iommu/hyperv-iommu.c | 4 +- + drivers/iommu/intel/irq_remapping.c | 2 +- + drivers/perf/arm_pmu.c | 10 +- + drivers/platform/x86/intel/ifs/load.c | 7 +- + drivers/platform/x86/intel/pmc/core.c | 2 +- + .../x86/intel/speed_select_if/isst_if_common.c | 2 +- + drivers/powercap/intel_rapl_common.c | 2 +- + drivers/powercap/intel_rapl_msr.c | 2 +- + drivers/thermal/intel/intel_tcc_cooling.c | 2 +- + fs/aio.c | 2 +- + fs/proc/array.c | 6 + + fs/proc/task_mmu.c | 3 + + include/asm-generic/hugetlb.h | 2 +- + include/linux/cfi.h | 4 +- + include/linux/cgroup-defs.h | 2 + + include/linux/cpu.h | 1 - + include/linux/cpuhotplug.h | 2 +- + include/linux/decompress/mm.h | 2 +- + include/linux/mm.h | 47 +- + include/linux/mman.h | 4 + + include/linux/pci_ids.h | 2 + + include/linux/perf_event.h | 14 +- + include/linux/pgtable.h | 28 + + include/linux/proc_fs.h | 1 + + include/linux/rbtree_augmented.h | 26 + + include/linux/sched.h | 21 +- + include/linux/sched/task.h | 38 +- + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/siginfo.h | 3 +- + include/uapi/linux/elf.h | 2 + + include/uapi/linux/perf_event.h | 3 +- + init/Kconfig | 1 + + ipc/shm.c | 2 +- + kernel/cgroup/cgroup.c | 34 + + kernel/cpu.c | 2 +- + kernel/events/core.c | 18 +- + kernel/events/ring_buffer.c | 5 +- + kernel/fork.c | 8 + + kernel/irq/chip.c | 11 +- + kernel/irq/internals.h | 4 +- + kernel/irq/manage.c | 26 +- + kernel/locking/qspinlock_paravirt.h | 20 +- + kernel/sched/core.c | 98 +- + kernel/sched/debug.c | 49 +- + kernel/sched/fair.c | 1327 +++++++++++--------- + kernel/sched/features.h | 23 +- + kernel/sched/psi.c | 2 +- + kernel/sched/sched.h | 24 +- + kernel/sched/topology.c | 15 +- + kernel/softirq.c | 2 +- + kernel/sys_ni.c | 1 + + lib/locking-selftest.c | 133 +- + mm/debug_vm_pgtable.c | 12 +- + mm/gup.c | 2 +- + mm/huge_memory.c | 11 +- + mm/internal.h | 4 +- + mm/memory.c | 5 +- + mm/migrate.c | 2 +- + mm/migrate_device.c | 2 +- + mm/mmap.c | 14 +- + mm/mprotect.c | 2 +- + mm/nommu.c | 4 +- + mm/userfaultfd.c | 2 +- + mm/util.c | 2 +- + tools/arch/x86/include/asm/irq_vectors.h | 7 - + tools/objtool/check.c | 2 +- + .../trace/beauty/tracepoints/x86_irq_vectors.sh | 2 +- + tools/perf/util/thread-stack.c | 4 +- + tools/power/x86/turbostat/turbostat.c | 2 +- + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/test_shadow_stack.c | 884 +++++++++++++ + 296 files changed, 6172 insertions(+), 4044 deletions(-) + create mode 100644 Documentation/arch/x86/shstk.rst + delete mode 100644 arch/x86/include/asm/microcode_amd.h + delete mode 100644 arch/x86/include/asm/microcode_intel.h + create mode 100644 arch/x86/include/asm/shstk.h + create mode 100644 arch/x86/kernel/apic/init.c + create mode 100644 arch/x86/kernel/cet.c + create mode 100644 arch/x86/kernel/cpu/microcode/internal.h + create mode 100644 arch/x86/kernel/shstk.c + create mode 100644 drivers/firmware/efi/libstub/x86-5lvl.c + create mode 100644 drivers/firmware/efi/libstub/x86-stub.h + create mode 100644 tools/testing/selftests/x86/test_shadow_stack.c +$ git am -3 ../patches/0001-fix-up-for-mm-Make-pte_mkwrite-take-a-VMA.patch +Applying: fix up for "mm: Make pte_mkwrite() take a VMA" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/include/asm/book3s/64/pgtable.h +$ git add -A . +$ git commit -v -a --amend +[master ac20d151cdbc] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Tue Aug 15 14:23:07 2023 +1000 +Merging clockevents/timers/drivers/next (8b5bf64c89c7 clocksource/drivers/cadence-ttc: Fix memory leak in ttc_timer_probe) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (ce53ad81ed36 EDAC/igen6: Fix the issue of no error events) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging drivers/edac/i10nm_base.c +Merge made by the 'ort' strategy. + drivers/edac/i10nm_base.c | 54 ++++++++++++++++++++++++++++++++++++++++++----- + drivers/edac/igen6_edac.c | 8 +++---- + 2 files changed, 53 insertions(+), 9 deletions(-) +Merging irqchip/irq/irqchip-next (a82f3119d543 Merge branch irq/misc-6.5 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (7c1130ea5cae test: ftrace: Fix kprobe test for eventfs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging fs/tracefs/inode.c +Auto-merging include/linux/trace_events.h +Merge made by the 'ort' strategy. + fs/tracefs/Makefile | 1 + + fs/tracefs/event_inode.c | 801 +++++++++++++++++++++ + fs/tracefs/inode.c | 151 +++- + fs/tracefs/internal.h | 29 + + include/linux/trace_events.h | 1 + + include/linux/tracefs.h | 23 + + kernel/trace/ring_buffer.c | 20 +- + kernel/trace/trace.c | 99 +-- + kernel/trace/trace.h | 12 +- + kernel/trace/trace_entries.h | 2 +- + kernel/trace/trace_events.c | 76 +- + kernel/trace/trace_export.c | 9 + + .../ftrace/test.d/kprobe/kprobe_args_char.tc | 9 +- + .../ftrace/test.d/kprobe/kprobe_args_string.tc | 9 +- + 14 files changed, 1116 insertions(+), 126 deletions(-) + create mode 100644 fs/tracefs/event_inode.c + create mode 100644 fs/tracefs/internal.h +Merging rcu/rcu/next (13e3e81ac928 rcu-tasks: Fix boot-time RCU tasks debug-only deadlock) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/filesystems/proc.rst +Auto-merging kernel/rcu/rcu.h +Auto-merging scripts/checkpatch.pl +Merge made by the 'ort' strategy. + Documentation/RCU/lockdep-splat.rst | 2 +- + Documentation/RCU/rculist_nulls.rst | 38 ++- + Documentation/admin-guide/kernel-parameters.txt | 56 ++- + Documentation/filesystems/proc.rst | 5 +- + arch/x86/kernel/tsc.c | 2 +- + fs/proc/cmdline.c | 13 + + include/linux/init.h | 3 +- + include/linux/notifier.h | 11 - + include/linux/rculist_nulls.h | 4 +- + include/linux/rcupdate_trace.h | 1 + + include/linux/rcupdate_wait.h | 5 + + include/linux/srcutiny.h | 4 + + include/linux/torture.h | 15 +- + init/main.c | 2 +- + kernel/locking/locktorture.c | 76 ++++- + kernel/rcu/rcu.h | 12 +- + kernel/rcu/rcuscale.c | 83 ++++- + kernel/rcu/rcutorture.c | 9 +- + kernel/rcu/refscale.c | 39 ++- + kernel/rcu/srcutree.c | 32 +- + kernel/rcu/tasks.h | 140 ++++++-- + kernel/rcu/tree.c | 20 +- + kernel/rcu/tree_nocb.h | 4 +- + kernel/rcu/tree_stall.h | 56 ++- + kernel/rcu/update.c | 8 +- + kernel/scftorture.c | 12 +- + kernel/smp.c | 13 +- + kernel/time/clocksource.c | 8 +- + kernel/torture.c | 96 +++--- + scripts/checkpatch.pl | 33 +- + .../selftests/rcutorture/bin/configcheck.sh | 61 ++-- + .../testing/selftests/rcutorture/bin/functions.sh | 2 +- + .../rcutorture/bin/kvm-recheck-rcuscale.sh | 8 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 46 ++- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 12 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 12 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 17 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 127 +++++-- + .../rcutorture/configs/lock/ver_functions.sh | 5 +- + .../selftests/rcutorture/configs/rcu/TASKS03 | 1 - + .../selftests/rcutorture/configs/rcu/TRACE02 | 1 + + .../selftests/rcutorture/configs/rcu/TREE01 | 1 - + .../rcutorture/configs/rcu/ver_functions.sh | 5 +- + .../selftests/rcutorture/configs/rcuscale/CFcommon | 2 + + .../selftests/rcutorture/configs/rcuscale/TRACE01 | 2 + + .../rcutorture/configs/rcuscale/ver_functions.sh | 5 +- + .../rcutorture/configs/refscale/NOPREEMPT | 1 + + .../rcutorture/configs/refscale/ver_functions.sh | 5 +- + .../selftests/rcutorture/configs/scf/NOPREEMPT | 2 + + .../rcutorture/configs/scf/ver_functions.sh | 5 +- + .../rcutorture/formal/srcu-cbmc/.gitignore | 2 - + .../selftests/rcutorture/formal/srcu-cbmc/Makefile | 17 - + .../formal/srcu-cbmc/empty_includes/linux/delay.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/export.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/mutex.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/percpu.h | 0 + .../srcu-cbmc/empty_includes/linux/preempt.h | 0 + .../srcu-cbmc/empty_includes/linux/rcupdate.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/sched.h | 0 + .../formal/srcu-cbmc/empty_includes/linux/smp.h | 0 + .../srcu-cbmc/empty_includes/linux/workqueue.h | 0 + .../srcu-cbmc/empty_includes/uapi/linux/types.h | 0 + .../formal/srcu-cbmc/include/linux/.gitignore | 2 - + .../formal/srcu-cbmc/include/linux/kconfig.h | 1 - + .../formal/srcu-cbmc/include/linux/types.h | 152 --------- + .../rcutorture/formal/srcu-cbmc/modify_srcu.awk | 376 --------------------- + .../rcutorture/formal/srcu-cbmc/src/assume.h | 17 - + .../rcutorture/formal/srcu-cbmc/src/barriers.h | 41 --- + .../rcutorture/formal/srcu-cbmc/src/bug_on.h | 14 - + .../formal/srcu-cbmc/src/combined_source.c | 14 - + .../rcutorture/formal/srcu-cbmc/src/config.h | 28 -- + .../rcutorture/formal/srcu-cbmc/src/include_srcu.c | 32 -- + .../rcutorture/formal/srcu-cbmc/src/int_typedefs.h | 34 -- + .../rcutorture/formal/srcu-cbmc/src/locks.h | 221 ------------ + .../rcutorture/formal/srcu-cbmc/src/misc.c | 12 - + .../rcutorture/formal/srcu-cbmc/src/misc.h | 58 ---- + .../rcutorture/formal/srcu-cbmc/src/percpu.h | 93 ----- + .../rcutorture/formal/srcu-cbmc/src/preempt.c | 79 ----- + .../rcutorture/formal/srcu-cbmc/src/preempt.h | 59 ---- + .../formal/srcu-cbmc/src/simple_sync_srcu.c | 51 --- + .../rcutorture/formal/srcu-cbmc/src/workqueues.h | 103 ------ + .../srcu-cbmc/tests/store_buffering/.gitignore | 2 - + .../srcu-cbmc/tests/store_buffering/Makefile | 12 - + .../tests/store_buffering/assert_end.fail | 1 - + .../srcu-cbmc/tests/store_buffering/force.fail | 1 - + .../srcu-cbmc/tests/store_buffering/force2.fail | 1 - + .../srcu-cbmc/tests/store_buffering/force3.fail | 1 - + .../srcu-cbmc/tests/store_buffering/main.pass | 0 + .../formal/srcu-cbmc/tests/store_buffering/test.c | 73 ---- + .../formal/srcu-cbmc/tests/test_script.sh | 103 ------ + 91 files changed, 825 insertions(+), 1899 deletions(-) + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/.gitignore + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/Makefile + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/delay.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/export.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/mutex.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/percpu.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/preempt.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/rcupdate.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/sched.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/smp.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/workqueue.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/uapi/linux/types.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/.gitignore + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/kconfig.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h + delete mode 100755 tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/assume.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/bug_on.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/combined_source.c + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/config.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/include_srcu.c + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/int_typedefs.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/locks.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.c + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/percpu.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.c + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/simple_sync_srcu.c + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/workqueues.h + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/.gitignore + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/Makefile + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/assert_end.fail + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force.fail + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force2.fail + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force3.fail + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/main.pass + delete mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/test.c + delete mode 100755 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/test_script.sh +Merging kvm/next (d5ad9aae13dc selftests/rseq: Fix build with undefined __weak) +$ 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 (3b4e3afb2032 Merge branch kvm-arm64/6.6/misc into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/hyp/nvhe/switch.c +Merge made by the 'ort' strategy. + arch/arm64/include/asm/kvm_arm.h | 1 - + arch/arm64/include/asm/kvm_host.h | 6 +++--- + arch/arm64/kvm/arm.c | 26 ++++++++++++-------------- + arch/arm64/kvm/guest.c | 15 --------------- + arch/arm64/kvm/hyp/nvhe/switch.c | 2 +- + arch/arm64/kvm/reset.c | 23 +++++++++-------------- + 6 files changed, 25 insertions(+), 48 deletions(-) +Merging kvms390/next (b275d8313217 KVM: s390: selftests: Add selftest for single-stepping) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging arch/s390/kvm/intercept.c +Merge made by the 'ort' strategy. + arch/s390/kvm/intercept.c | 38 +++++- + arch/s390/kvm/interrupt.c | 14 +++ + arch/s390/kvm/kvm-s390.c | 27 ++++- + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/s390x/debug_test.c | 160 +++++++++++++++++++++++++ + 5 files changed, 229 insertions(+), 11 deletions(-) + create mode 100644 tools/testing/selftests/kvm/s390x/debug_test.c +Merging kvm-riscv/riscv_kvm_next (477069398ed6 KVM: riscv: selftests: Add get-reg-list test) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Auto-merging tools/testing/selftests/kvm/Makefile +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 4 +- + arch/riscv/include/asm/csr.h | 2 + + arch/riscv/include/asm/kvm_host.h | 9 + + arch/riscv/include/asm/kvm_vcpu_vector.h | 6 +- + arch/riscv/include/uapi/asm/kvm.h | 16 + + arch/riscv/kvm/Makefile | 1 + + arch/riscv/kvm/aia.c | 4 +- + arch/riscv/kvm/vcpu.c | 547 +--------- + arch/riscv/kvm/vcpu_fp.c | 12 +- + arch/riscv/kvm/vcpu_onereg.c | 1051 ++++++++++++++++++++ + arch/riscv/kvm/vcpu_sbi.c | 16 +- + arch/riscv/kvm/vcpu_timer.c | 11 +- + arch/riscv/kvm/vcpu_vector.c | 72 +- + tools/testing/selftests/kvm/Makefile | 13 +- + tools/testing/selftests/kvm/aarch64/get-reg-list.c | 554 ++--------- + tools/testing/selftests/kvm/get-reg-list.c | 401 ++++++++ + .../testing/selftests/kvm/include/kvm_util_base.h | 21 + + .../selftests/kvm/include/riscv/processor.h | 3 + + tools/testing/selftests/kvm/include/test_util.h | 2 + + tools/testing/selftests/kvm/lib/test_util.c | 15 + + tools/testing/selftests/kvm/riscv/get-reg-list.c | 872 ++++++++++++++++ + 21 files changed, 2547 insertions(+), 1085 deletions(-) + create mode 100644 arch/riscv/kvm/vcpu_onereg.c + create mode 100644 tools/testing/selftests/kvm/get-reg-list.c + create mode 100644 tools/testing/selftests/kvm/riscv/get-reg-list.c +Merging kvm-x86/next (240f73689188 Merge branch 'misc') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/include/asm/kexec.h +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kernel/crash.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/lapic.c +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/svm/svm.h +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging tools/arch/x86/include/asm/cpufeatures.h +Auto-merging tools/testing/selftests/kvm/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/Makefile +Auto-merging tools/testing/selftests/kvm/include/test_util.h +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/include/test_util.h +Recorded preimage for 'tools/testing/selftests/kvm/Makefile' +Recorded preimage for 'tools/testing/selftests/kvm/include/test_util.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'tools/testing/selftests/kvm/Makefile'. +Recorded resolution for 'tools/testing/selftests/kvm/include/test_util.h'. +[master c40dd744bc79] Merge branch 'next' of https://github.com/kvm-x86/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/kexec.h | 2 - + arch/x86/include/asm/kvm_host.h | 39 ++- + arch/x86/include/asm/kvm_page_track.h | 71 ++--- + arch/x86/include/asm/reboot.h | 7 + + arch/x86/include/asm/svm.h | 1 + + arch/x86/include/asm/virtext.h | 154 ----------- + arch/x86/include/asm/vmx.h | 2 +- + arch/x86/kernel/crash.c | 31 --- + arch/x86/kernel/reboot.c | 66 +++-- + arch/x86/kvm/Kconfig | 15 +- + arch/x86/kvm/cpuid.c | 40 ++- + arch/x86/kvm/cpuid.h | 46 +++ + arch/x86/kvm/governed_features.h | 21 ++ + arch/x86/kvm/kvm_emulate.h | 1 - + arch/x86/kvm/lapic.c | 29 +- + arch/x86/kvm/mmu.h | 2 + + arch/x86/kvm/mmu/mmu.c | 247 +++++++---------- + arch/x86/kvm/mmu/mmu_internal.h | 14 +- + arch/x86/kvm/mmu/page_track.c | 292 ++++++++++---------- + arch/x86/kvm/mmu/page_track.h | 58 ++++ + arch/x86/kvm/mmu/paging_tmpl.h | 23 +- + arch/x86/kvm/mmu/spte.c | 6 +- + arch/x86/kvm/mmu/spte.h | 8 +- + arch/x86/kvm/mmu/tdp_iter.c | 4 +- + arch/x86/kvm/mmu/tdp_mmu.c | 31 ++- + arch/x86/kvm/pmu.c | 4 +- + arch/x86/kvm/reverse_cpuid.h | 1 + + arch/x86/kvm/svm/nested.c | 57 ++-- + arch/x86/kvm/svm/sev.c | 89 +++++- + arch/x86/kvm/svm/svm.c | 282 ++++++++++++------- + arch/x86/kvm/svm/svm.h | 60 +--- + arch/x86/kvm/vmx/capabilities.h | 2 +- + arch/x86/kvm/vmx/hyperv.c | 2 +- + arch/x86/kvm/vmx/nested.c | 13 +- + arch/x86/kvm/vmx/nested.h | 2 +- + arch/x86/kvm/vmx/pmu_intel.c | 81 ++++-- + arch/x86/kvm/vmx/vmx.c | 200 +++++++------- + arch/x86/kvm/vmx/vmx.h | 3 +- + arch/x86/kvm/x86.c | 63 ++--- + arch/x86/kvm/x86.h | 1 + + drivers/gpu/drm/i915/gvt/gtt.c | 102 +------ + drivers/gpu/drm/i915/gvt/gtt.h | 1 - + drivers/gpu/drm/i915/gvt/gvt.h | 3 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 120 +++----- + drivers/gpu/drm/i915/gvt/page_track.c | 10 +- + include/linux/kvm_host.h | 19 ++ + tools/arch/x86/include/asm/cpufeatures.h | 1 + + tools/testing/selftests/kvm/Makefile | 6 + + .../selftests/kvm/aarch64/aarch32_id_regs.c | 8 +- + tools/testing/selftests/kvm/aarch64/arch_timer.c | 22 +- + .../selftests/kvm/aarch64/debug-exceptions.c | 8 +- + tools/testing/selftests/kvm/aarch64/hypercalls.c | 20 +- + .../selftests/kvm/aarch64/page_fault_test.c | 17 +- + tools/testing/selftests/kvm/aarch64/vgic_irq.c | 3 +- + tools/testing/selftests/kvm/guest_print_test.c | 219 +++++++++++++++ + .../selftests/kvm/include/aarch64/arch_timer.h | 12 +- + .../testing/selftests/kvm/include/aarch64/ucall.h | 20 ++ + tools/testing/selftests/kvm/include/riscv/ucall.h | 20 ++ + tools/testing/selftests/kvm/include/s390x/ucall.h | 19 ++ + tools/testing/selftests/kvm/include/test_util.h | 18 +- + tools/testing/selftests/kvm/include/ucall_common.h | 98 +++---- + tools/testing/selftests/kvm/include/x86_64/ucall.h | 13 + + tools/testing/selftests/kvm/kvm_page_table_test.c | 8 +- + tools/testing/selftests/kvm/lib/aarch64/ucall.c | 11 +- + tools/testing/selftests/kvm/lib/guest_sprintf.c | 307 +++++++++++++++++++++ + tools/testing/selftests/kvm/lib/kvm_util.c | 6 +- + tools/testing/selftests/kvm/lib/riscv/ucall.c | 11 - + tools/testing/selftests/kvm/lib/s390x/ucall.c | 10 - + tools/testing/selftests/kvm/lib/sparsebit.c | 1 - + tools/testing/selftests/kvm/lib/string_override.c | 9 + + tools/testing/selftests/kvm/lib/ucall_common.c | 44 +++ + tools/testing/selftests/kvm/lib/x86_64/processor.c | 18 +- + tools/testing/selftests/kvm/lib/x86_64/ucall.c | 36 ++- + .../testing/selftests/kvm/max_guest_memory_test.c | 2 +- + tools/testing/selftests/kvm/memslot_perf_test.c | 4 +- + tools/testing/selftests/kvm/s390x/cmma_test.c | 62 ++--- + tools/testing/selftests/kvm/s390x/memop.c | 13 +- + tools/testing/selftests/kvm/s390x/tprot.c | 11 +- + .../testing/selftests/kvm/set_memory_region_test.c | 21 +- + tools/testing/selftests/kvm/steal_time.c | 20 +- + tools/testing/selftests/kvm/x86_64/cpuid_test.c | 12 +- + .../kvm/x86_64/dirty_log_page_splitting_test.c | 18 +- + .../kvm/x86_64/exit_on_emulation_failure_test.c | 2 +- + .../kvm/x86_64/hyperv_extended_hypercalls.c | 3 +- + .../testing/selftests/kvm/x86_64/hyperv_features.c | 29 +- + tools/testing/selftests/kvm/x86_64/kvm_pv_test.c | 8 +- + .../selftests/kvm/x86_64/monitor_mwait_test.c | 35 ++- + .../selftests/kvm/x86_64/nested_exceptions_test.c | 16 +- + .../selftests/kvm/x86_64/recalc_apic_map_test.c | 6 +- + .../testing/selftests/kvm/x86_64/set_boot_cpu_id.c | 6 +- + .../kvm/x86_64/svm_nested_soft_inject_test.c | 22 +- + .../testing/selftests/kvm/x86_64/sync_regs_test.c | 117 ++++++++ + tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c | 34 +-- + .../selftests/kvm/x86_64/userspace_io_test.c | 10 +- + .../vmx_exception_with_invalid_guest_state.c | 2 +- + .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 31 ++- + .../selftests/kvm/x86_64/xapic_state_test.c | 8 +- + .../testing/selftests/kvm/x86_64/xcr0_cpuid_test.c | 29 +- + .../testing/selftests/kvm/x86_64/xen_vmcall_test.c | 20 +- + 100 files changed, 2334 insertions(+), 1498 deletions(-) + delete mode 100644 arch/x86/include/asm/virtext.h + create mode 100644 arch/x86/kvm/governed_features.h + create mode 100644 arch/x86/kvm/mmu/page_track.h + create mode 100644 tools/testing/selftests/kvm/guest_print_test.c + create mode 100644 tools/testing/selftests/kvm/include/aarch64/ucall.h + create mode 100644 tools/testing/selftests/kvm/include/riscv/ucall.h + create mode 100644 tools/testing/selftests/kvm/include/s390x/ucall.h + create mode 100644 tools/testing/selftests/kvm/include/x86_64/ucall.h + create mode 100644 tools/testing/selftests/kvm/lib/guest_sprintf.c +Merging xen-tip/linux-next (c04e9894846c xen: speed up grant-table reclaim) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (abf773b6fafc Merge branch 'for-6.6' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. + mm/percpu.c | 69 +++++++++++++++++++++++++------------------------------------ + 1 file changed, 28 insertions(+), 41 deletions(-) +Merging workqueues/for-next (c076af902bdf Merge branch 'for-6.6' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging init/main.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 28 +- + Documentation/core-api/workqueue.rst | 356 ++++- + include/linux/workqueue.h | 115 +- + init/main.c | 1 + + kernel/workqueue.c | 1614 +++++++++++++---------- + kernel/workqueue_internal.h | 2 +- + tools/workqueue/wq_dump.py | 177 +++ + tools/workqueue/wq_monitor.py | 21 +- + 8 files changed, 1511 insertions(+), 803 deletions(-) + create mode 100644 tools/workqueue/wq_dump.py +Merging drivers-x86/for-next (65c6ea33e7f6 Merge remote-tracking branch 'pdx86/platform-drivers-x86-simatic-ipc' into review-hans) + 3fce06406c59 ("watchdog: make Siemens Simatic watchdog driver default on platform") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/platform/x86/intel/tpmi.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/watchdog/Kconfig +CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig +Recorded preimage for 'drivers/watchdog/Kconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/watchdog/Kconfig'. +[master 47f12ee430fd] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/debugfs-tpmi | 31 + + .../ABI/testing/sysfs-class-firmware-attributes | 101 +- + Documentation/ABI/testing/sysfs-platform-asus-wmi | 88 ++ + MAINTAINERS | 39 +- + drivers/leds/simple/Kconfig | 1 + + drivers/platform/chrome/cros_ec.c | 1 + + drivers/platform/mellanox/mlxbf-bootctl.c | 67 ++ + drivers/platform/mellanox/mlxbf-bootctl.h | 19 + + drivers/platform/mellanox/mlxreg-hotplug.c | 1 - + drivers/platform/mellanox/mlxreg-io.c | 1 - + drivers/platform/x86/Kconfig | 27 +- + drivers/platform/x86/Makefile | 5 +- + drivers/platform/x86/asus-wmi.c | 605 ++++++++++- + drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 9 +- + drivers/platform/x86/hp/Kconfig | 16 + + drivers/platform/x86/hp/Makefile | 1 + + drivers/platform/x86/hp/hp-bioscfg/Makefile | 11 + + .../x86/hp/hp-bioscfg/biosattr-interface.c | 312 ++++++ + drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 1063 ++++++++++++++++++++ + drivers/platform/x86/hp/hp-bioscfg/bioscfg.h | 487 +++++++++ + .../platform/x86/hp/hp-bioscfg/enum-attributes.c | 457 +++++++++ + .../platform/x86/hp/hp-bioscfg/int-attributes.c | 418 ++++++++ + .../x86/hp/hp-bioscfg/order-list-attributes.c | 445 ++++++++ + .../x86/hp/hp-bioscfg/passwdobj-attributes.c | 556 ++++++++++ + .../platform/x86/hp/hp-bioscfg/spmobj-attributes.c | 381 +++++++ + .../platform/x86/hp/hp-bioscfg/string-attributes.c | 395 ++++++++ + .../x86/hp/hp-bioscfg/surestart-attributes.c | 132 +++ + drivers/platform/x86/intel/tpmi.c | 399 +++++++- + drivers/platform/x86/sel3350-platform.c | 251 +++++ + drivers/platform/x86/siemens/Kconfig | 64 ++ + drivers/platform/x86/siemens/Makefile | 11 + + .../x86/siemens/simatic-ipc-batt-apollolake.c | 51 + + .../x86/siemens/simatic-ipc-batt-elkhartlake.c | 51 + + .../platform/x86/siemens/simatic-ipc-batt-f7188x.c | 87 ++ + drivers/platform/x86/siemens/simatic-ipc-batt.c | 253 +++++ + drivers/platform/x86/siemens/simatic-ipc-batt.h | 20 + + drivers/platform/x86/siemens/simatic-ipc.c | 236 +++++ + drivers/platform/x86/simatic-ipc.c | 151 --- + drivers/platform/x86/system76_acpi.c | 74 +- + drivers/platform/x86/thinkpad_acpi.c | 45 +- + drivers/platform/x86/wmi-bmof.c | 26 +- + drivers/watchdog/Kconfig | 2 +- + drivers/watchdog/simatic-ipc-wdt.c | 9 +- + include/linux/intel_tpmi.h | 2 + + include/linux/platform_data/x86/asus-wmi.h | 19 +- + include/linux/platform_data/x86/simatic-ipc-base.h | 5 +- + include/linux/platform_data/x86/simatic-ipc.h | 6 +- + tools/power/x86/intel-speed-select/isst-config.c | 51 +- + tools/power/x86/intel-speed-select/isst-display.c | 2 +- + tools/power/x86/intel-speed-select/isst.h | 2 +- + 50 files changed, 7243 insertions(+), 243 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-tpmi + create mode 100644 drivers/platform/x86/hp/hp-bioscfg/Makefile + create mode 100644 drivers/platform/x86/hp/hp-bioscfg/biosattr-interface.c + create mode 100644 drivers/platform/x86/hp/hp-bioscfg/bioscfg.c + create mode 100644 drivers/platform/x86/hp/hp-bioscfg/bioscfg.h + create mode 100644 drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c + create mode 100644 drivers/platform/x86/hp/hp-bioscfg/int-attributes.c + create mode 100644 drivers/platform/x86/hp/hp-bioscfg/order-list-attributes.c + create mode 100644 drivers/platform/x86/hp/hp-bioscfg/passwdobj-attributes.c + create mode 100644 drivers/platform/x86/hp/hp-bioscfg/spmobj-attributes.c + create mode 100644 drivers/platform/x86/hp/hp-bioscfg/string-attributes.c + create mode 100644 drivers/platform/x86/hp/hp-bioscfg/surestart-attributes.c + create mode 100644 drivers/platform/x86/sel3350-platform.c + create mode 100644 drivers/platform/x86/siemens/Kconfig + create mode 100644 drivers/platform/x86/siemens/Makefile + create mode 100644 drivers/platform/x86/siemens/simatic-ipc-batt-apollolake.c + create mode 100644 drivers/platform/x86/siemens/simatic-ipc-batt-elkhartlake.c + create mode 100644 drivers/platform/x86/siemens/simatic-ipc-batt-f7188x.c + create mode 100644 drivers/platform/x86/siemens/simatic-ipc-batt.c + create mode 100644 drivers/platform/x86/siemens/simatic-ipc-batt.h + create mode 100644 drivers/platform/x86/siemens/simatic-ipc.c + delete mode 100644 drivers/platform/x86/simatic-ipc.c +Merging chrome-platform/for-next (0820debb7d48 platform/chrome: chromeos_acpi: print hex string for ACPI_TYPE_BUFFER) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-driver-chromeos-acpi | 17 ++++++++++- + .../firmware-guide/acpi/chromeos-acpi-device.rst | 5 ++-- + MAINTAINERS | 1 + + drivers/platform/chrome/chromeos_acpi.c | 33 ++++++++++++++++++++-- + drivers/platform/chrome/cros_ec_lpc.c | 4 +-- + 5 files changed, 52 insertions(+), 8 deletions(-) +Merging chrome-platform-firmware/for-firmware-next (0979e7e3cfd7 MAINTAINERS: Add drivers/firmware/google/ entry) +$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 9 +++++++++ + 1 file changed, 9 insertions(+) +Merging hsi/for-next (7ebf243a2018 hsi: omap_ssi: Explicitly include correct DT includes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/controllers/omap_ssi_core.c | 1 + + 1 file changed, 1 insertion(+) +Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging leds-lj/for-leds-next (841165267827 leds: qcom-lpg: Drop assignment to struct pwmchip::base) +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Auto-merging drivers/leds/simple/Kconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/leds/common.yaml | 12 ++ + .../devicetree/bindings/leds/leds-an30259a.txt | 55 ------ + .../devicetree/bindings/leds/nxp,pca995x.yaml | 81 ++++++++ + .../bindings/leds/panasonic,an30259a.yaml | 84 +++++++++ + .../devicetree/bindings/leds/rohm,bd2606mvv.yaml | 4 +- + drivers/leds/Kconfig | 9 + + drivers/leds/Makefile | 1 + + drivers/leds/blink/Kconfig | 4 +- + drivers/leds/flash/Kconfig | 2 + + drivers/leds/flash/leds-qcom-flash.c | 5 + + drivers/leds/led-class.c | 4 + + drivers/leds/leds-ariel.c | 2 +- + drivers/leds/leds-aw200xx.c | 4 +- + drivers/leds/leds-cpcap.c | 2 +- + drivers/leds/leds-cr0014114.c | 2 +- + drivers/leds/leds-ip30.c | 8 +- + drivers/leds/leds-is31fl32xx.c | 1 - + drivers/leds/leds-mlxreg.c | 1 - + drivers/leds/leds-ns2.c | 2 +- + drivers/leds/leds-pca9532.c | 1 - + drivers/leds/leds-pca995x.c | 204 +++++++++++++++++++++ + drivers/leds/leds-pm8058.c | 1 - + drivers/leds/leds-pwm.c | 4 +- + drivers/leds/leds-spi-byte.c | 2 +- + drivers/leds/leds-syscon.c | 3 +- + drivers/leds/leds-ti-lmu-common.c | 2 +- + drivers/leds/leds-tlc591xx.c | 1 - + drivers/leds/rgb/leds-qcom-lpg.c | 2 - + drivers/leds/simple/Kconfig | 14 ++ + drivers/leds/simple/Makefile | 1 + + drivers/leds/simple/simatic-ipc-leds-gpio-core.c | 4 + + .../simple/simatic-ipc-leds-gpio-elkhartlake.c | 57 ++++++ + drivers/leds/simple/simatic-ipc-leds-gpio.h | 2 +- + 33 files changed, 495 insertions(+), 86 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/leds/leds-an30259a.txt + create mode 100644 Documentation/devicetree/bindings/leds/nxp,pca995x.yaml + create mode 100644 Documentation/devicetree/bindings/leds/panasonic,an30259a.yaml + create mode 100644 drivers/leds/leds-pca995x.c + create mode 100644 drivers/leds/simple/simatic-ipc-leds-gpio-elkhartlake.c +$ git am -3 ../patches/0001-Revert-leds-pca995x-Add-support-for-PCA995X-chips.patch +Applying: Revert "leds: pca995x: Add support for PCA995X chips" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/leds/Kconfig +M drivers/leds/Makefile +D drivers/leds/leds-pca995x.c +$ git add -A . +$ git commit -v -a --amend +[master e5038c16ef8f] Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git + Date: Tue Aug 15 16:49:41 2023 +1000 +Merging ipmi/for-next (b02bb79eee07 ipmi: fix potential deadlock on &kcs_bmc->lock) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + .../bindings/ipmi/aspeed,ast2400-kcs-bmc.yaml | 8 ++++---- + drivers/char/ipmi/ipmb_dev_int.c | 2 +- + drivers/char/ipmi/ipmi_devintf.c | 24 +++++++++++----------- + drivers/char/ipmi/ipmi_ipmb.c | 2 +- + drivers/char/ipmi/ipmi_si_intf.c | 5 +++++ + drivers/char/ipmi/ipmi_si_platform.c | 2 +- + drivers/char/ipmi/ipmi_ssif.c | 11 +++++++--- + drivers/char/ipmi/ipmi_watchdog.c | 2 +- + drivers/char/ipmi/kcs_bmc.c | 5 +++-- + drivers/char/ipmi/ssif_bmc.c | 2 +- + 10 files changed, 37 insertions(+), 26 deletions(-) +Merging driver-core/driver-core-next (699fb50d9903 drivers: base: Free devm resources when unregistering a device) + 32944855bac7 ("HID: hidraw: make hidraw_class structure const") + afdf5dd33a91 ("HID: roccat: make all 'class' structures const") +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging drivers/base/core.c +Auto-merging drivers/base/cpu.c +Auto-merging drivers/base/node.c +Auto-merging drivers/char/tpm/tpm-chip.c +Auto-merging fs/kernfs/dir.c +Auto-merging include/linux/device.h +Merge made by the 'ort' strategy. + Documentation/process/stable-kernel-rules.rst | 197 +++++++++++++---------- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 41 ++--- + arch/x86/kernel/cpuid.c | 31 ++-- + arch/x86/kernel/msr.c | 31 ++-- + drivers/base/core.c | 11 ++ + drivers/base/cpu.c | 19 +++ + drivers/base/dd.c | 2 + + drivers/base/node.c | 1 - + drivers/base/test/.kunitconfig | 2 + + drivers/base/test/Kconfig | 4 + + drivers/base/test/Makefile | 3 + + drivers/base/test/platform-device-test.c | 220 ++++++++++++++++++++++++++ + drivers/base/test/root-device-test.c | 108 +++++++++++++ + drivers/base/test/test_async_driver_probe.c | 2 +- + drivers/char/tpm/tpm-chip.c | 11 +- + drivers/char/tpm/tpm-interface.c | 21 ++- + drivers/char/tpm/tpm.h | 4 +- + drivers/char/tpm/tpm2-space.c | 2 +- + fs/kernfs/dir.c | 4 + + fs/kernfs/mount.c | 13 +- + include/linux/dev_printk.h | 2 + + include/linux/device.h | 2 - + include/linux/kernfs.h | 4 + + include/linux/kobject.h | 8 +- + lib/kobject.c | 33 ++-- + 25 files changed, 600 insertions(+), 176 deletions(-) + create mode 100644 drivers/base/test/.kunitconfig + create mode 100644 drivers/base/test/platform-device-test.c + create mode 100644 drivers/base/test/root-device-test.c +$ git reset --hard HEAD^ +HEAD is now at cd2e9e1ed18a Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git +Merging next-20230809 version of driver-core +$ git merge -m next-20230809/driver-core 0ce7c12e88cfa3e4cb0800e8172e5befea5c199a +Auto-merging drivers/base/cpu.c +Auto-merging drivers/char/tpm/tpm-chip.c +Auto-merging include/linux/device.h +Merge made by the 'ort' strategy. + Documentation/process/stable-kernel-rules.rst | 58 +++++++++++++++++---------- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 41 ++++++++++--------- + arch/x86/kernel/cpuid.c | 31 +++++++------- + arch/x86/kernel/msr.c | 31 +++++++------- + drivers/base/cpu.c | 19 +++++++++ + drivers/base/dd.c | 2 + + drivers/base/test/test_async_driver_probe.c | 2 +- + drivers/char/tpm/tpm-chip.c | 11 +++-- + drivers/char/tpm/tpm-interface.c | 21 +++++----- + drivers/char/tpm/tpm.h | 4 +- + drivers/char/tpm/tpm2-space.c | 2 +- + fs/kernfs/mount.c | 13 +++++- + include/linux/dev_printk.h | 2 + + include/linux/device.h | 2 - + include/linux/kernfs.h | 4 ++ + include/linux/kobject.h | 8 ++-- + lib/kobject.c | 33 ++++++++------- + 17 files changed, 170 insertions(+), 114 deletions(-) +Merging usb/usb-next (bbb9e06d2c64 Merge 6.5-rc6 into usb-next) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/mips/cavium-octeon/octeon-platform.c +Auto-merging drivers/usb/dwc3/dwc3-octeon.c +Merge made by the 'ort' strategy. + CREDITS | 11 - + .../ABI/testing/configfs-usb-gadget-midi2 | 54 + + Documentation/ABI/testing/sysfs-bus-umc | 28 - + Documentation/ABI/testing/sysfs-bus-usb | 34 - + Documentation/ABI/testing/sysfs-class-uwb_rc | 156 -- + .../ABI/testing/sysfs-class-uwb_rc-wusbhc | 57 - + Documentation/ABI/testing/sysfs-wusb_cbaf | 101 - + Documentation/admin-guide/kernel-parameters.txt | 2 +- + .../devicetree/bindings/phy/realtek,usb2phy.yaml | 175 ++ + .../devicetree/bindings/phy/realtek,usb3phy.yaml | 107 + + .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 17 +- + .../devicetree/bindings/usb/cypress,hx3.yaml | 77 + + .../devicetree/bindings/usb/generic-ehci.yaml | 1 + + .../devicetree/bindings/usb/genesys,gl850g.yaml | 1 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 36 +- + Documentation/driver-api/usb/usb.rst | 9 +- + Documentation/usb/authorization.rst | 9 +- + Documentation/usb/gadget-testing.rst | 154 ++ + arch/mips/cavium-octeon/Makefile | 1 - + arch/mips/cavium-octeon/octeon-platform.c | 1 - + drivers/net/wireless/mediatek/mt76/usb.c | 3 +- + drivers/phy/Kconfig | 1 + + drivers/phy/Makefile | 1 + + drivers/phy/realtek/Kconfig | 27 + + drivers/phy/realtek/Makefile | 3 + + drivers/phy/realtek/phy-rtk-usb2.c | 1331 +++++++++ + drivers/phy/realtek/phy-rtk-usb3.c | 767 ++++++ + drivers/usb/cdns3/cdns3-gadget.c | 1 + + drivers/usb/cdns3/cdns3-plat.c | 4 +- + drivers/usb/cdns3/cdns3-starfive.c | 6 +- + drivers/usb/cdns3/cdns3-ti.c | 1 + + drivers/usb/cdns3/cdnsp-pci.c | 3 +- + drivers/usb/cdns3/core.c | 16 +- + drivers/usb/cdns3/core.h | 7 +- + drivers/usb/cdns3/drd.c | 4 + + drivers/usb/chipidea/ci.h | 19 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 18 +- + drivers/usb/chipidea/ci_hdrc_imx.h | 1 + + drivers/usb/chipidea/ci_hdrc_tegra.c | 3 +- + drivers/usb/chipidea/core.c | 5 +- + drivers/usb/chipidea/host.c | 1 + + drivers/usb/chipidea/udc.c | 12 +- + drivers/usb/chipidea/usbmisc_imx.c | 18 +- + drivers/usb/class/cdc-acm.c | 12 +- + drivers/usb/common/common.c | 1 + + drivers/usb/core/config.c | 3 - + drivers/usb/core/devices.c | 1 - + drivers/usb/core/file.c | 68 +- + drivers/usb/core/hcd.c | 50 +- + drivers/usb/core/hub.c | 513 ++-- + drivers/usb/core/message.c | 30 +- + drivers/usb/core/of.c | 1 - + drivers/usb/core/sysfs.c | 3 - + drivers/usb/core/urb.c | 27 +- + drivers/usb/core/usb.c | 20 +- + drivers/usb/core/usb.h | 5 +- + drivers/usb/dwc2/gadget.c | 1 - + drivers/usb/dwc2/platform.c | 2 +- + drivers/usb/dwc3/Kconfig | 10 + + drivers/usb/dwc3/Makefile | 1 + + drivers/usb/dwc3/dwc3-am62.c | 94 +- + drivers/usb/dwc3/dwc3-imx8mp.c | 1 + + drivers/usb/dwc3/dwc3-keystone.c | 1 + + .../octeon-usb.c => drivers/usb/dwc3/dwc3-octeon.c | 435 ++- + drivers/usb/dwc3/dwc3-of-simple.c | 1 - + drivers/usb/gadget/Kconfig | 18 + + drivers/usb/gadget/function/Makefile | 2 + + drivers/usb/gadget/function/f_mass_storage.c | 2 +- + drivers/usb/gadget/function/f_midi2.c | 2883 ++++++++++++++++++++ + drivers/usb/gadget/function/u_midi2.h | 81 + + drivers/usb/gadget/udc/aspeed-vhub/core.c | 3 +- + drivers/usb/gadget/udc/aspeed_udc.c | 4 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 6 +- + drivers/usb/gadget/udc/core.c | 1 + + drivers/usb/gadget/udc/fsl_qe_udc.c | 2 + + drivers/usb/gadget/udc/fsl_udc_core.c | 3 +- + drivers/usb/gadget/udc/gr_udc.c | 13 +- + drivers/usb/gadget/udc/max3420_udc.c | 4 +- + drivers/usb/gadget/udc/mv_u3d_core.c | 4 +- + drivers/usb/gadget/udc/mv_udc_core.c | 2 +- + drivers/usb/gadget/udc/pxa27x_udc.c | 2 +- + drivers/usb/gadget/udc/renesas_usb3.c | 2 +- + drivers/usb/gadget/udc/renesas_usbf.c | 6 +- + drivers/usb/gadget/udc/snps_udc_plat.c | 7 +- + drivers/usb/gadget/udc/tegra-xudc.c | 1 - + drivers/usb/gadget/udc/udc-xilinx.c | 9 +- + drivers/usb/host/ehci-atmel.c | 7 +- + drivers/usb/host/ehci-brcm.c | 4 +- + drivers/usb/host/ehci-exynos.c | 3 +- + drivers/usb/host/ehci-fsl.c | 5 +- + drivers/usb/host/ehci-hcd.c | 8 +- + drivers/usb/host/ehci-hub.c | 10 +- + drivers/usb/host/ehci-mv.c | 3 +- + drivers/usb/host/ehci-npcm7xx.c | 5 +- + drivers/usb/host/ehci-omap.c | 3 +- + drivers/usb/host/ehci-orion.c | 9 +- + drivers/usb/host/ehci-platform.c | 3 +- + drivers/usb/host/ehci-sched.c | 3 +- + drivers/usb/host/ehci-sh.c | 7 +- + drivers/usb/host/ehci-spear.c | 3 +- + drivers/usb/host/ehci-st.c | 12 +- + drivers/usb/host/ehci.h | 10 + + drivers/usb/host/fhci-hcd.c | 3 +- + drivers/usb/host/fsl-mph-dr-of.c | 3 +- + drivers/usb/host/isp1362-hcd.c | 3 +- + drivers/usb/host/ohci-at91.c | 9 +- + drivers/usb/host/ohci-da8xx.c | 4 +- + drivers/usb/host/ohci-exynos.c | 3 +- + drivers/usb/host/ohci-nxp.c | 3 +- + drivers/usb/host/ohci-platform.c | 3 +- + drivers/usb/host/ohci-ppc-of.c | 3 +- + drivers/usb/host/ohci-pxa27x.c | 3 +- + drivers/usb/host/ohci-sm501.c | 3 +- + drivers/usb/host/ohci-spear.c | 3 +- + drivers/usb/host/ohci-st.c | 14 +- + drivers/usb/host/oxu210hp-hcd.c | 3 +- + drivers/usb/host/uhci-platform.c | 3 +- + drivers/usb/host/xhci-mem.c | 3 - + drivers/usb/host/xhci-plat.c | 1 - + drivers/usb/host/xhci-rcar.c | 1 - + drivers/usb/host/xhci-tegra.c | 30 +- + drivers/usb/host/xhci.c | 11 +- + drivers/usb/misc/cypress_cy7c63.c | 2 +- + drivers/usb/misc/cytherm.c | 12 +- + drivers/usb/misc/onboard_usb_hub.c | 41 +- + drivers/usb/misc/onboard_usb_hub.h | 15 + + drivers/usb/misc/usb251xb.c | 2 +- + drivers/usb/misc/usb_u132.h | 97 - + drivers/usb/misc/usbsevseg.c | 2 +- + drivers/usb/mtu3/mtu3.h | 1 + + drivers/usb/mtu3/mtu3_host.c | 1 + + drivers/usb/musb/cppi_dma.h | 3 - + drivers/usb/musb/jz4740.c | 2 +- + drivers/usb/musb/mediatek.c | 1 + + drivers/usb/musb/mpfs.c | 1 + + drivers/usb/musb/musb_core.c | 4 +- + drivers/usb/musb/musb_dma.h | 4 - + drivers/usb/musb/musb_dsps.c | 2 - + drivers/usb/musb/musb_gadget.c | 2 +- + drivers/usb/musb/sunxi.c | 1 - + drivers/usb/musb/tusb6010.c | 17 +- + drivers/usb/phy/phy-mxs-usb.c | 16 +- + drivers/usb/phy/phy-tegra-usb.c | 2 +- + drivers/usb/renesas_usbhs/common.c | 2 +- + drivers/usb/renesas_usbhs/rza.c | 2 +- + drivers/usb/renesas_usbhs/rza2.c | 1 - + drivers/usb/typec/mux/intel_pmc_mux.c | 53 +- + drivers/usb/typec/mux/nb7vpq904m.c | 2 +- + drivers/usb/typec/tcpm/fusb302.c | 2 +- + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 2 +- + .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 2 - + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_port.c | 6 +- + drivers/usb/typec/tcpm/tcpci_mt6370.c | 2 +- + drivers/usb/typec/tcpm/tcpm.c | 127 +- + drivers/usb/typec/ucsi/Kconfig | 1 + + drivers/usb/typec/ucsi/Makefile | 2 + + drivers/usb/typec/ucsi/debugfs.c | 99 + + drivers/usb/typec/ucsi/ucsi.c | 15 + + drivers/usb/typec/ucsi/ucsi.h | 24 + + drivers/usb/typec/ucsi/ucsi_glink.c | 1 - + drivers/usb/usbip/vudc_dev.c | 5 +- + include/linux/usb.h | 12 - + include/linux/usb/ch9.h | 5 +- + include/linux/usb/chipidea.h | 1 + + include/linux/usb/composite.h | 23 - + include/linux/usb/hcd.h | 2 - + include/linux/usb/phy.h | 13 + + include/uapi/linux/usb/ch11.h | 6 +- + include/uapi/linux/usb/ch9.h | 5 +- + 169 files changed, 6865 insertions(+), 1600 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-midi2 + delete mode 100644 Documentation/ABI/testing/sysfs-bus-umc + delete mode 100644 Documentation/ABI/testing/sysfs-class-uwb_rc + delete mode 100644 Documentation/ABI/testing/sysfs-class-uwb_rc-wusbhc + delete mode 100644 Documentation/ABI/testing/sysfs-wusb_cbaf + create mode 100644 Documentation/devicetree/bindings/phy/realtek,usb2phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/realtek,usb3phy.yaml + create mode 100644 Documentation/devicetree/bindings/usb/cypress,hx3.yaml + create mode 100644 drivers/phy/realtek/Kconfig + create mode 100644 drivers/phy/realtek/Makefile + create mode 100644 drivers/phy/realtek/phy-rtk-usb2.c + create mode 100644 drivers/phy/realtek/phy-rtk-usb3.c + rename arch/mips/cavium-octeon/octeon-usb.c => drivers/usb/dwc3/dwc3-octeon.c (61%) + create mode 100644 drivers/usb/gadget/function/f_midi2.c + create mode 100644 drivers/usb/gadget/function/u_midi2.h + delete mode 100644 drivers/usb/misc/usb_u132.h + create mode 100644 drivers/usb/typec/ucsi/debugfs.c +Merging thunderbolt/next (a3f6445842e5 Documentation/ABI: thunderbolt: Replace 01.org in contact) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Auto-merging drivers/thunderbolt/tb.c +Auto-merging drivers/thunderbolt/tmu.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-thunderbolt | 38 ++++++------- + drivers/thunderbolt/acpi.c | 18 ++++-- + drivers/thunderbolt/switch.c | 73 +++++++++++++------------ + drivers/thunderbolt/tb.c | 24 +++++--- + drivers/thunderbolt/tb.h | 4 +- + drivers/thunderbolt/tmu.c | 2 +- + 6 files changed, 89 insertions(+), 70 deletions(-) +Merging usb-serial/usb-next (974e2f6a0554 USB: serial: xr: add TIOCGRS485 and TIOCSRS485 ioctls) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Merge made by the 'ort' strategy. + drivers/usb/serial/xr_serial.c | 89 +++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 88 insertions(+), 1 deletion(-) +Merging tty/tty-next (e67d7f60d238 tty: gdm724x: simplify gdm_tty_write()) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging arch/alpha/kernel/setup.c +Auto-merging arch/powerpc/platforms/8xx/mpc885ads_setup.c +CONFLICT (content): Merge conflict in arch/powerpc/platforms/8xx/mpc885ads_setup.c +Auto-merging arch/powerpc/platforms/8xx/tqm8xx_setup.c +CONFLICT (content): Merge conflict in arch/powerpc/platforms/8xx/tqm8xx_setup.c +Auto-merging arch/powerpc/sysdev/fsl_soc.c +CONFLICT (content): Merge conflict in arch/powerpc/sysdev/fsl_soc.c +Auto-merging arch/powerpc/xmon/xmon.c +Auto-merging arch/sparc/kernel/process_64.c +Auto-merging drivers/bluetooth/hci_ldisc.c +Auto-merging drivers/net/can/sja1000/ems_pci.c +Auto-merging drivers/tty/Kconfig +Auto-merging drivers/tty/n_gsm.c +Auto-merging drivers/tty/serial/8250/8250_port.c +Auto-merging drivers/tty/serial/fsl_lpuart.c +Auto-merging drivers/tty/serial/omap-serial.c +Auto-merging drivers/tty/sysrq.c +Auto-merging drivers/usb/class/cdc-acm.c +Auto-merging include/linux/pci_ids.h +Auto-merging include/linux/serial_core.h +Auto-merging kernel/rcu/tree_stall.h +Resolved 'arch/powerpc/platforms/8xx/mpc885ads_setup.c' using previous resolution. +Resolved 'arch/powerpc/platforms/8xx/tqm8xx_setup.c' using previous resolution. +Resolved 'arch/powerpc/sysdev/fsl_soc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 00df05aae716] Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/serial/amlogic,meson-uart.yaml | 2 + + .../devicetree/bindings/serial/fsl-lpuart.yaml | 6 +- + arch/alpha/kernel/setup.c | 2 +- + arch/alpha/kernel/srmcons.c | 5 +- + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 4 +- + arch/loongarch/kernel/sysrq.c | 2 +- + arch/m68k/emu/nfcon.c | 8 +- + arch/mips/kernel/sysrq.c | 2 +- + arch/powerpc/include/asm/fs_pd.h | 10 - + arch/powerpc/platforms/8xx/mpc885ads_setup.c | 1 - + arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 - + arch/powerpc/sysdev/fsl_soc.c | 2 - + arch/powerpc/xmon/xmon.c | 2 +- + arch/sparc/include/asm/vio.h | 2 +- + arch/sparc/kernel/process_64.c | 4 +- + arch/um/drivers/line.c | 2 +- + arch/um/drivers/line.h | 3 +- + arch/xtensa/platforms/iss/console.c | 27 +-- + drivers/accessibility/speakup/spk_ttyio.c | 7 +- + drivers/bluetooth/hci_ldisc.c | 15 +- + drivers/char/ttyprintk.c | 5 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/input/serio/serport.c | 18 +- + drivers/ipack/devices/ipoctal.c | 7 +- + drivers/isdn/capi/capi.c | 8 +- + drivers/misc/bcm-vk/bcm_vk_tty.c | 5 +- + drivers/misc/ti-st/st_core.c | 18 +- + drivers/misc/ti-st/st_kim.c | 13 +- + drivers/mmc/core/sdio_uart.c | 4 +- + drivers/net/caif/caif_serial.c | 2 +- + drivers/net/can/can327.c | 47 ++--- + drivers/net/can/sja1000/ems_pci.c | 7 +- + drivers/net/can/slcan/slcan-core.c | 13 +- + drivers/net/hamradio/6pack.c | 4 +- + drivers/net/hamradio/mkiss.c | 4 +- + drivers/net/mctp/mctp-serial.c | 5 +- + drivers/net/ppp/ppp_async.c | 26 +-- + drivers/net/ppp/ppp_synctty.c | 26 +-- + drivers/net/slip/slip.c | 4 +- + drivers/net/usb/hso.c | 20 +- + drivers/parport/parport_pc.c | 5 + + drivers/s390/char/con3215.c | 6 +- + drivers/s390/char/con3270.c | 6 +- + drivers/s390/char/sclp_tty.c | 10 +- + drivers/s390/char/sclp_vt220.c | 6 +- + drivers/staging/gdm724x/gdm_tty.c | 21 +-- + drivers/staging/greybus/uart.c | 3 +- + drivers/tty/Kconfig | 1 + + drivers/tty/amiserial.c | 4 +- + drivers/tty/ehv_bytechan.c | 4 +- + drivers/tty/goldfish.c | 7 +- + drivers/tty/hvc/hvc_console.c | 4 +- + drivers/tty/hvc/hvc_opal.c | 2 +- + drivers/tty/hvc/hvcs.c | 10 +- + drivers/tty/hvc/hvsi.c | 15 +- + drivers/tty/ipwireless/hardware.c | 2 +- + drivers/tty/ipwireless/tty.c | 4 +- + drivers/tty/mips_ejtag_fdc.c | 6 +- + drivers/tty/moxa.c | 8 +- + drivers/tty/mxser.c | 4 +- + drivers/tty/n_gsm.c | 17 +- + drivers/tty/n_hdlc.c | 12 +- + drivers/tty/n_null.c | 25 +-- + drivers/tty/n_tty.c | 103 +++++----- + drivers/tty/nozomi.c | 6 +- + drivers/tty/pty.c | 2 +- + drivers/tty/rpmsg_tty.c | 5 +- + drivers/tty/serdev/serdev-ttyport.c | 4 +- + drivers/tty/serial/21285.c | 3 +- + drivers/tty/serial/8250/8250_early.c | 1 - + drivers/tty/serial/8250/8250_ingenic.c | 1 - + drivers/tty/serial/8250/8250_men_mcb.c | 210 +++++++++++++++------ + drivers/tty/serial/8250/8250_omap.c | 1 - + drivers/tty/serial/8250/8250_pci.c | 10 + + drivers/tty/serial/8250/8250_port.c | 3 +- + drivers/tty/serial/8250/8250_pxa.c | 1 + + drivers/tty/serial/Makefile | 2 +- + drivers/tty/serial/altera_jtaguart.c | 4 +- + drivers/tty/serial/altera_uart.c | 2 +- + drivers/tty/serial/amba-pl010.c | 3 +- + drivers/tty/serial/amba-pl011.c | 5 +- + drivers/tty/serial/apbuart.c | 6 +- + drivers/tty/serial/ar933x_uart.c | 3 +- + drivers/tty/serial/arc_uart.c | 27 ++- + drivers/tty/serial/atmel_serial.c | 3 +- + drivers/tty/serial/bcm63xx_uart.c | 8 +- + drivers/tty/serial/clps711x.c | 6 +- + .../{cpm_uart/cpm_uart_core.c => cpm_uart.c} | 157 +++++++++++++-- + drivers/tty/serial/{cpm_uart => }/cpm_uart.h | 38 +--- + drivers/tty/serial/cpm_uart/Makefile | 12 -- + drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c | 122 ------------ + drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h | 33 ---- + drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c | 156 --------------- + drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h | 33 ---- + drivers/tty/serial/digicolor-usart.c | 3 +- + drivers/tty/serial/dz.c | 2 +- + drivers/tty/serial/fsl_linflexuart.c | 10 +- + drivers/tty/serial/fsl_lpuart.c | 88 ++++++--- + drivers/tty/serial/imx.c | 4 +- + drivers/tty/serial/ip22zilog.c | 2 +- + drivers/tty/serial/kgdb_nmi.c | 3 +- + drivers/tty/serial/lantiq.c | 3 +- + drivers/tty/serial/liteuart.c | 3 +- + drivers/tty/serial/ma35d1_serial.c | 3 +- + drivers/tty/serial/max3100.c | 3 +- + drivers/tty/serial/max310x.c | 10 +- + drivers/tty/serial/mcf.c | 2 +- + drivers/tty/serial/meson_uart.c | 138 ++++++++------ + drivers/tty/serial/milbeaut_usio.c | 3 +- + drivers/tty/serial/mpc52xx_uart.c | 2 +- + drivers/tty/serial/mps2-uart.c | 4 +- + drivers/tty/serial/mvebu-uart.c | 11 +- + drivers/tty/serial/mxs-auart.c | 5 +- + drivers/tty/serial/omap-serial.c | 11 +- + drivers/tty/serial/pic32_uart.c | 1 - + drivers/tty/serial/pxa.c | 2 +- + drivers/tty/serial/qcom_geni_serial.c | 17 +- + drivers/tty/serial/rp2.c | 4 +- + drivers/tty/serial/sa1100.c | 3 +- + drivers/tty/serial/samsung_tty.c | 8 +- + drivers/tty/serial/sb1250-duart.c | 3 +- + drivers/tty/serial/sc16is7xx.c | 4 +- + drivers/tty/serial/sccnxp.c | 7 +- + drivers/tty/serial/serial-tegra.c | 23 +-- + drivers/tty/serial/serial_core.c | 28 ++- + drivers/tty/serial/serial_txx9.c | 3 +- + drivers/tty/serial/sh-sci.c | 1 - + drivers/tty/serial/sifive.c | 11 +- + drivers/tty/serial/sprd_serial.c | 38 ++-- + drivers/tty/serial/st-asc.c | 9 +- + drivers/tty/serial/stm32-usart.c | 5 +- + drivers/tty/serial/sunhv.c | 4 +- + drivers/tty/serial/sunplus-uart.c | 2 +- + drivers/tty/serial/sunsab.c | 3 +- + drivers/tty/serial/sunsu.c | 4 +- + drivers/tty/serial/sunzilog.c | 4 +- + drivers/tty/serial/tegra-tcu.c | 1 - + drivers/tty/serial/uartlite.c | 3 - + drivers/tty/serial/ucc_uart.c | 4 +- + drivers/tty/serial/vt8500_serial.c | 8 +- + drivers/tty/serial/xilinx_uartps.c | 4 +- + drivers/tty/serial/zs.c | 3 +- + drivers/tty/synclink_gt.c | 83 ++++---- + drivers/tty/sysrq.c | 84 ++++----- + drivers/tty/tty.h | 8 +- + drivers/tty/tty_audit.c | 6 +- + drivers/tty/tty_buffer.c | 35 ++-- + drivers/tty/tty_io.c | 50 ++--- + drivers/tty/tty_ioctl.c | 18 +- + drivers/tty/tty_port.c | 34 ++-- + drivers/tty/ttynull.c | 4 +- + drivers/tty/vcc.c | 18 +- + drivers/tty/vt/selection.c | 2 +- + drivers/tty/vt/vt.c | 22 +-- + drivers/usb/class/cdc-acm.c | 8 +- + drivers/usb/gadget/function/u_serial.c | 6 +- + drivers/usb/host/xhci-dbgtty.c | 7 +- + drivers/usb/serial/usb-serial.c | 5 +- + include/linux/fs_uart_pd.h | 71 ------- + include/linux/pci_ids.h | 4 + + include/linux/serial_core.h | 18 +- + include/linux/sysrq.h | 18 +- + include/linux/ti_wilink_st.h | 2 +- + include/linux/tty_buffer.h | 18 +- + include/linux/tty_driver.h | 9 +- + include/linux/tty_flip.h | 22 +-- + include/linux/tty_ldisc.h | 67 ++++--- + include/linux/tty_port.h | 7 +- + kernel/debug/debug_core.c | 2 +- + kernel/power/poweroff.c | 2 +- + kernel/rcu/tree_stall.h | 2 +- + net/bluetooth/rfcomm/tty.c | 31 +-- + net/nfc/nci/uart.c | 23 +-- + sound/soc/codecs/cx20442.c | 4 +- + sound/soc/ti/ams-delta.c | 2 +- + 175 files changed, 1172 insertions(+), 1534 deletions(-) + rename drivers/tty/serial/{cpm_uart/cpm_uart_core.c => cpm_uart.c} (90%) + rename drivers/tty/serial/{cpm_uart => }/cpm_uart.h (64%) + delete mode 100644 drivers/tty/serial/cpm_uart/Makefile + delete mode 100644 drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c + delete mode 100644 drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h + delete mode 100644 drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c + delete mode 100644 drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h + delete mode 100644 include/linux/fs_uart_pd.h +Merging char-misc/char-misc-next (e75850b4573a Merge 6.5-rc6 into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging MAINTAINERS +Auto-merging drivers/android/binderfs.c +Auto-merging drivers/firmware/stratix10-rsu.c +Auto-merging drivers/hwmon/peci/dimmtemp.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-bus-mhi | 4 +- + .../ABI/testing/sysfs-bus-fsi-devices-sbefifo | 6 +- + Documentation/ABI/testing/sysfs-bus-iio | 16 + + .../ABI/testing/sysfs-bus-iio-filter-admv8818 | 2 + + Documentation/admin-guide/dynamic-debug-howto.rst | 5 +- + .../bindings/fsi/ibm,i2cr-fsi-master.yaml | 41 + + .../iio/adc/allwinner,sun20i-d1-gpadc.yaml | 91 ++ + .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 15 +- + .../bindings/iio/dac/microchip,mcp4728.yaml | 49 ++ + .../bindings/iio/frequency/adi,admv1013.yaml | 60 ++ + .../bindings/iio/frequency/adi,admv1014.yaml | 8 + + .../bindings/iio/light/rohm,bu27010.yaml | 49 ++ + .../bindings/iio/proximity/murata,irsd200.yaml | 60 ++ + .../bindings/iio/proximity/semtech,sx9310.yaml | 5 +- + .../bindings/iio/proximity/semtech,sx9324.yaml | 5 +- + .../bindings/peci/nuvoton,npcm-peci.yaml | 56 ++ + MAINTAINERS | 2 + + .../boot/dts/nuvoton/nuvoton-common-npcm7xx.dtsi | 9 + + .../boot/dts/nuvoton/nuvoton-common-npcm8xx.dtsi | 9 + + arch/x86/kernel/apm_32.c | 6 - + drivers/android/binder.c | 20 +- + drivers/android/binderfs.c | 1 - + drivers/bus/mhi/host/boot.c | 34 +- + drivers/bus/mhi/host/init.c | 2 +- + drivers/bus/mhi/host/main.c | 1 - + drivers/bus/mhi/host/pci_generic.c | 53 +- + drivers/bus/mhi/host/pm.c | 5 + + drivers/cdx/controller/cdx_controller.c | 3 +- + drivers/cdx/controller/cdx_rpmsg.c | 3 +- + drivers/char/agp/uninorth-agp.c | 1 + + drivers/char/bsr.c | 3 +- + drivers/char/xillybus/Kconfig | 2 +- + drivers/firmware/google/Kconfig | 2 +- + drivers/firmware/stratix10-rsu.c | 100 ++- + drivers/firmware/stratix10-svc.c | 20 +- + drivers/fsi/Kconfig | 17 + + drivers/fsi/Makefile | 2 + + drivers/fsi/fsi-core.c | 154 ++-- + drivers/fsi/fsi-master-aspeed.c | 4 +- + drivers/fsi/fsi-master-ast-cf.c | 5 +- + drivers/fsi/fsi-master-gpio.c | 2 +- + drivers/fsi/fsi-master-hub.c | 2 +- + drivers/fsi/fsi-master-i2cr.c | 316 +++++++ + drivers/fsi/fsi-master-i2cr.h | 33 + + drivers/fsi/fsi-master.h | 2 +- + drivers/fsi/fsi-occ.c | 2 +- + drivers/fsi/fsi-sbefifo.c | 53 +- + drivers/fsi/fsi-scom.c | 8 + + drivers/fsi/fsi-slave.h | 28 + + drivers/fsi/i2cr-scom.c | 154 ++++ + drivers/hwmon/peci/cputemp.c | 18 + + drivers/hwmon/peci/dimmtemp.c | 50 ++ + drivers/iio/accel/adxl313_i2c.c | 8 +- + drivers/iio/accel/adxl355_i2c.c | 15 +- + drivers/iio/accel/adxl372_spi.c | 1 - + drivers/iio/accel/bma180.c | 1 - + drivers/iio/accel/da280.c | 11 +- + drivers/iio/accel/kxsd9-spi.c | 1 - + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/adc/Kconfig | 12 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ab8500-gpadc.c | 6 +- + drivers/iio/adc/ad7124.c | 2 +- + drivers/iio/adc/ad7192.c | 31 +- + drivers/iio/adc/ad9467.c | 2 +- + drivers/iio/adc/adi-axi-adc.c | 3 +- + drivers/iio/adc/at91_adc.c | 1 - + drivers/iio/adc/bcm_iproc_adc.c | 4 +- + drivers/iio/adc/cc10001_adc.c | 1 - + drivers/iio/adc/imx7d_adc.c | 2 +- + drivers/iio/adc/ina2xx-adc.c | 2 +- + drivers/iio/adc/lpc32xx_adc.c | 4 +- + drivers/iio/adc/men_z188_adc.c | 1 - + drivers/iio/adc/meson_saradc.c | 243 +++++- + drivers/iio/adc/npcm_adc.c | 4 +- + drivers/iio/adc/palmas_gpadc.c | 7 +- + drivers/iio/adc/qcom-spmi-adc5.c | 2 + + drivers/iio/adc/qcom-spmi-iadc.c | 1 - + drivers/iio/adc/rockchip_saradc.c | 3 +- + drivers/iio/adc/sc27xx_adc.c | 1 - + drivers/iio/adc/spear_adc.c | 4 +- + drivers/iio/adc/stm32-adc-core.c | 5 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 3 +- + drivers/iio/adc/stm32-dfsdm-core.c | 4 +- + drivers/iio/adc/stmpe-adc.c | 2 +- + drivers/iio/adc/sun20i-gpadc-iio.c | 276 ++++++ + drivers/iio/adc/sun4i-gpadc-iio.c | 1 - + drivers/iio/adc/ti-lmp92064.c | 53 ++ + drivers/iio/adc/ti_am335x_adc.c | 1 - + drivers/iio/amplifiers/Kconfig | 1 + + drivers/iio/amplifiers/ad8366.c | 15 + + drivers/iio/cdc/ad7150.c | 10 +- + drivers/iio/chemical/scd4x.c | 79 +- + drivers/iio/common/Kconfig | 1 + + drivers/iio/common/Makefile | 1 + + drivers/iio/common/inv_sensors/Kconfig | 7 + + drivers/iio/common/inv_sensors/Makefile | 6 + + .../inv_sensors/inv_sensors_timestamp.c} | 100 ++- + drivers/iio/dac/Kconfig | 11 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/mcp4728.c | 618 +++++++++++++ + drivers/iio/filter/admv8818.c | 65 +- + drivers/iio/frequency/admv1013.c | 14 + + drivers/iio/imu/adis16475.c | 5 +- + drivers/iio/imu/inv_icm42600/Kconfig | 1 + + drivers/iio/imu/inv_icm42600/Makefile | 1 - + drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 35 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 33 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 14 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 35 +- + .../iio/imu/inv_icm42600/inv_icm42600_timestamp.h | 85 -- + drivers/iio/imu/inv_mpu6050/Kconfig | 1 + + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 33 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 22 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 104 +-- + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 6 +- + drivers/iio/industrialio-core.c | 161 ++-- + drivers/iio/industrialio-event.c | 2 + + drivers/iio/industrialio-trigger.c | 2 +- + drivers/iio/light/cm3605.c | 2 +- + drivers/iio/light/rohm-bu27008.c | 630 +++++++++++--- + drivers/iio/light/vcnl4000.c | 710 +++++++++++++-- + drivers/iio/potentiometer/mcp4018.c | 35 +- + drivers/iio/potentiometer/mcp4531.c | 139 +-- + drivers/iio/proximity/Kconfig | 12 + + drivers/iio/proximity/Makefile | 1 + + drivers/iio/proximity/irsd200.c | 958 +++++++++++++++++++++ + drivers/iio/proximity/isl29501.c | 2 +- + drivers/iio/proximity/mb1232.c | 7 +- + drivers/iio/temperature/mlx90614.c | 2 +- + drivers/iio/trigger/stm32-lptimer-trigger.c | 9 +- + drivers/misc/Kconfig | 1 + + drivers/misc/atmel-ssc.c | 3 +- + drivers/misc/bcm-vk/bcm_vk.h | 2 +- + drivers/misc/bcm-vk/bcm_vk_msg.c | 14 +- + drivers/misc/cxl/base.c | 1 + + drivers/misc/eeprom/idt_89hpesx.c | 23 +- + drivers/misc/fastrpc.c | 1 + + drivers/misc/genwqe/card_base.c | 49 +- + drivers/misc/genwqe/card_base.h | 2 +- + drivers/misc/hi6421v600-irq.c | 4 +- + drivers/misc/hpilo.c | 18 +- + drivers/misc/lis3lv02d/lis3lv02d.c | 2 +- + drivers/misc/mchp_pci1xxxx/Kconfig | 1 + + drivers/misc/mchp_pci1xxxx/Makefile | 2 +- + drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c | 443 ++++++++++ + drivers/misc/mei/bus-fixup.c | 10 +- + drivers/misc/mei/bus.c | 1 + + drivers/misc/mei/gsc-me.c | 1 + + drivers/misc/mei/init.c | 8 +- + drivers/misc/mei/mei_dev.h | 2 + + drivers/misc/mei/pxp/mei_pxp.c | 3 +- + drivers/misc/qcom-coincell.c | 1 - + drivers/misc/sram.c | 2 +- + drivers/misc/tps6594-esm.c | 9 +- + drivers/misc/tps6594-pfsm.c | 9 +- + drivers/misc/vcpu_stall_detector.c | 1 - + drivers/misc/xilinx_sdfec.c | 7 +- + drivers/misc/xilinx_tmr_inject.c | 3 +- + drivers/misc/xilinx_tmr_manager.c | 6 +- + drivers/pcmcia/Kconfig | 1 + + drivers/peci/controller/Kconfig | 16 + + drivers/peci/controller/Makefile | 1 + + drivers/peci/controller/peci-aspeed.c | 2 +- + drivers/peci/controller/peci-npcm.c | 298 +++++++ + drivers/peci/core.c | 4 +- + drivers/peci/cpu.c | 5 + + drivers/uio/uio_pruss.c | 6 +- + include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h | 88 +- + include/dt-bindings/iio/qcom,spmi-adc7-pm8350b.h | 124 +-- + include/dt-bindings/iio/qcom,spmi-adc7-pmk8350.h | 52 +- + include/dt-bindings/iio/qcom,spmi-adc7-pmr735a.h | 24 +- + include/dt-bindings/iio/qcom,spmi-adc7-pmr735b.h | 24 +- + include/linux/dynamic_debug.h | 4 +- + include/linux/firmware/intel/stratix10-smc.h | 25 + + .../linux/firmware/intel/stratix10-svc-client.h | 5 + + include/linux/iio/common/inv_sensors_timestamp.h | 95 ++ + include/linux/iio/types.h | 2 + + include/linux/mhi.h | 6 + + include/linux/peci.h | 4 +- + include/trace/events/fsi.h | 31 + + include/trace/events/fsi_master_i2cr.h | 107 +++ + include/uapi/linux/fsi.h | 10 + + include/uapi/linux/sync_file.h | 2 +- + lib/dynamic_debug.c | 8 +- + tools/iio/iio_generic_buffer.c | 17 +- + 186 files changed, 6696 insertions(+), 1189 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fsi/ibm,i2cr-fsi-master.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/allwinner,sun20i-d1-gpadc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/microchip,mcp4728.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/rohm,bu27010.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/murata,irsd200.yaml + create mode 100644 Documentation/devicetree/bindings/peci/nuvoton,npcm-peci.yaml + create mode 100644 drivers/fsi/fsi-master-i2cr.c + create mode 100644 drivers/fsi/fsi-master-i2cr.h + create mode 100644 drivers/fsi/fsi-slave.h + create mode 100644 drivers/fsi/i2cr-scom.c + create mode 100644 drivers/iio/adc/sun20i-gpadc-iio.c + create mode 100644 drivers/iio/common/inv_sensors/Kconfig + create mode 100644 drivers/iio/common/inv_sensors/Makefile + rename drivers/iio/{imu/inv_icm42600/inv_icm42600_timestamp.c => common/inv_sensors/inv_sensors_timestamp.c} (56%) + create mode 100644 drivers/iio/dac/mcp4728.c + delete mode 100644 drivers/iio/imu/inv_icm42600/inv_icm42600_timestamp.h + create mode 100644 drivers/iio/proximity/irsd200.c + create mode 100644 drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c + create mode 100644 drivers/peci/controller/peci-npcm.c + create mode 100644 include/linux/iio/common/inv_sensors_timestamp.h + create mode 100644 include/trace/events/fsi_master_i2cr.h +Merging accel/habanalabs-next (ef8b0cb1ba37 accel/habanalabs: fix ETR/ETF flush logic) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Auto-merging drivers/accel/habanalabs/common/habanalabs.h +CONFLICT (content): Merge conflict in drivers/accel/habanalabs/common/habanalabs.h +Resolved 'drivers/accel/habanalabs/common/habanalabs.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c4efec7cf21e] Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/debugfs-driver-habanalabs | 84 ++--- + Documentation/ABI/testing/sysfs-driver-habanalabs | 64 ++-- + drivers/accel/drm_accel.c | 21 +- + drivers/accel/habanalabs/common/command_buffer.c | 5 +- + .../accel/habanalabs/common/command_submission.c | 374 +++++++++++++-------- + drivers/accel/habanalabs/common/context.c | 9 +- + drivers/accel/habanalabs/common/debugfs.c | 22 +- + drivers/accel/habanalabs/common/device.c | 268 +++++++-------- + drivers/accel/habanalabs/common/firmware_if.c | 13 +- + drivers/accel/habanalabs/common/habanalabs.h | 88 +++-- + drivers/accel/habanalabs/common/habanalabs_drv.c | 169 +++++----- + drivers/accel/habanalabs/common/habanalabs_ioctl.c | 98 +++--- + drivers/accel/habanalabs/common/irq.c | 17 +- + drivers/accel/habanalabs/common/memory.c | 7 +- + drivers/accel/habanalabs/gaudi/gaudi.c | 4 + + drivers/accel/habanalabs/gaudi/gaudi_coresight.c | 12 + + drivers/accel/habanalabs/gaudi2/gaudi2.c | 371 +++++++++++++++++--- + drivers/accel/habanalabs/gaudi2/gaudi2_coresight.c | 34 +- + drivers/accel/habanalabs/gaudi2/gaudi2_security.c | 21 +- + drivers/accel/habanalabs/goya/goya_coresight.c | 10 + + .../accel/habanalabs/include/common/hl_boot_if.h | 5 + + include/uapi/drm/habanalabs_accel.h | 55 +-- + 22 files changed, 1099 insertions(+), 652 deletions(-) +Merging coresight/next (484281bd5b98 hwtracing: hisi_ptt: Use pci_dev_id() to simplify the code) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Auto-merging drivers/acpi/arm64/amba.c +Merge made by the 'ort' strategy. + drivers/acpi/arm64/amba.c | 1 - + drivers/hwtracing/coresight/coresight-core.c | 2 +- + drivers/hwtracing/coresight/coresight-cti-core.c | 2 +- + drivers/hwtracing/coresight/coresight-dummy.c | 12 +-- + drivers/hwtracing/coresight/coresight-etm4x-cfg.c | 4 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 118 +++++++++++++++++---- + drivers/hwtracing/coresight/coresight-etm4x.h | 4 + + drivers/hwtracing/coresight/coresight-platform.c | 8 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 5 +- + drivers/hwtracing/coresight/coresight-tmc.h | 2 +- + drivers/hwtracing/coresight/coresight-trbe.h | 2 +- + drivers/hwtracing/ptt/hisi_ptt.c | 8 +- + include/linux/coresight.h | 59 +++++++++++ + 14 files changed, 179 insertions(+), 50 deletions(-) +Merging fastrpc/for-next (64227235abd9 misc: fastrpc: Pass proper scm arguments for static process init) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Auto-merging drivers/misc/fastrpc.c +Merge made by the 'ort' strategy. + drivers/misc/fastrpc.c | 35 +++++++++++++++++++++-------------- + 1 file changed, 21 insertions(+), 14 deletions(-) +Merging fpga/for-next (1a22ec09a2c1 fpga: region: make fpga_region_class a static const structure) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + drivers/fpga/Kconfig | 2 + + drivers/fpga/Makefile | 3 + + drivers/fpga/altera-fpga2sdram.c | 2 +- + drivers/fpga/altera-freeze-bridge.c | 11 +- + drivers/fpga/altera-pr-ip-core-plat.c | 9 +- + drivers/fpga/dfl-fme-main.c | 17 +- + drivers/fpga/dfl-fme-mgr.c | 4 +- + drivers/fpga/dfl-pci.c | 15 +- + drivers/fpga/fpga-bridge.c | 48 ++--- + drivers/fpga/fpga-mgr.c | 25 ++- + drivers/fpga/fpga-region.c | 37 ++-- + drivers/fpga/microchip-spi.c | 2 +- + drivers/fpga/of-fpga-region.c | 2 + + drivers/fpga/socfpga-a10.c | 7 +- + drivers/fpga/socfpga.c | 7 +- + drivers/fpga/stratix10-soc.c | 1 + + drivers/fpga/tests/.kunitconfig | 5 + + drivers/fpga/tests/Kconfig | 11 ++ + drivers/fpga/tests/Makefile | 6 + + drivers/fpga/tests/fpga-bridge-test.c | 175 ++++++++++++++++++ + drivers/fpga/tests/fpga-mgr-test.c | 327 ++++++++++++++++++++++++++++++++++ + drivers/fpga/tests/fpga-region-test.c | 211 ++++++++++++++++++++++ + drivers/fpga/ts73xx-fpga.c | 4 +- + drivers/fpga/xilinx-pr-decoupler.c | 4 +- + drivers/fpga/zynq-fpga.c | 4 +- + 25 files changed, 828 insertions(+), 111 deletions(-) + create mode 100644 drivers/fpga/tests/.kunitconfig + create mode 100644 drivers/fpga/tests/Kconfig + create mode 100644 drivers/fpga/tests/Makefile + create mode 100644 drivers/fpga/tests/fpga-bridge-test.c + create mode 100644 drivers/fpga/tests/fpga-mgr-test.c + create mode 100644 drivers/fpga/tests/fpga-region-test.c +Merging icc/icc-next (768c42cd9acb Merge branch 'icc-fixes' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 6 ++ + .../bindings/interconnect/qcom,rpmh.yaml | 18 +++-- + drivers/interconnect/imx/imx8mp.c | 1 - + drivers/interconnect/qcom/icc-rpm.c | 4 +- + drivers/interconnect/qcom/icc-rpmh.c | 2 +- + drivers/interconnect/qcom/msm8916.c | 2 +- + drivers/interconnect/qcom/msm8939.c | 2 +- + drivers/interconnect/qcom/msm8974.c | 3 +- + drivers/interconnect/qcom/msm8996.c | 3 +- + drivers/interconnect/qcom/osm-l3.c | 2 +- + drivers/interconnect/qcom/qcm2290.c | 3 +- + drivers/interconnect/qcom/qcs404.c | 2 +- + drivers/interconnect/qcom/qdu1000.c | 3 +- + drivers/interconnect/qcom/sa8775p.c | 3 +- + drivers/interconnect/qcom/sc7180.c | 3 +- + drivers/interconnect/qcom/sc7280.c | 3 +- + drivers/interconnect/qcom/sc8180x.c | 3 +- + drivers/interconnect/qcom/sc8280xp.c | 3 +- + drivers/interconnect/qcom/sdm660.c | 3 +- + drivers/interconnect/qcom/sdm670.c | 3 +- + drivers/interconnect/qcom/sdm845.c | 3 +- + drivers/interconnect/qcom/sdx55.c | 3 +- + drivers/interconnect/qcom/sdx65.c | 3 +- + drivers/interconnect/qcom/sm6350.c | 3 +- + drivers/interconnect/qcom/sm8150.c | 3 +- + drivers/interconnect/qcom/sm8250.c | 77 ++++++++++++++++++++-- + drivers/interconnect/qcom/sm8250.h | 6 ++ + drivers/interconnect/qcom/sm8350.c | 3 +- + drivers/interconnect/qcom/sm8450.c | 4 +- + drivers/interconnect/qcom/sm8550.c | 4 +- + drivers/interconnect/qcom/smd-rpm.c | 2 - + include/dt-bindings/interconnect/qcom,sm8250.h | 7 ++ + 32 files changed, 149 insertions(+), 41 deletions(-) +Merging iio/togreg (14b7447cec15 Documentation: ABI: testing: admv8818: add bypass) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (7451eecf1ef8 phy: marvell pxa-usb: fix Wvoid-pointer-to-enum-cast warning) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging MAINTAINERS +Auto-merging drivers/phy/Kconfig +Auto-merging drivers/phy/Makefile +Auto-merging drivers/phy/hisilicon/phy-hisi-inno-usb2.c +Auto-merging drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c +Merge made by the 'ort' strategy. + .../bindings/phy/qcom,msm8996-qmp-ufs-phy.yaml | 228 --- + .../bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml | 80 - + .../bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml | 282 ---- + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 19 +- + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 48 +- + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 46 +- + .../bindings/phy/qcom,snps-eusb2-repeater.yaml | 7 +- + .../bindings/phy/rockchip,inno-usb2phy.yaml | 21 +- + .../bindings/phy/rockchip,pcie3-phy.yaml | 33 +- + .../bindings/phy/starfive,jh7110-dphy-rx.yaml | 71 + + .../bindings/phy/starfive,jh7110-pcie-phy.yaml | 58 + + .../bindings/phy/starfive,jh7110-usb-phy.yaml | 50 + + MAINTAINERS | 15 + + drivers/phy/Kconfig | 1 + + drivers/phy/Makefile | 1 + + drivers/phy/allwinner/phy-sun4i-usb.c | 2 - + drivers/phy/allwinner/phy-sun50i-usb3.c | 1 + + drivers/phy/amlogic/phy-meson-axg-mipi-dphy.c | 2 +- + .../phy/amlogic/phy-meson-axg-mipi-pcie-analog.c | 1 + + drivers/phy/amlogic/phy-meson-axg-pcie.c | 1 + + .../phy/amlogic/phy-meson-g12a-mipi-dphy-analog.c | 1 + + drivers/phy/amlogic/phy-meson-g12a-usb2.c | 2 +- + drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 2 +- + drivers/phy/amlogic/phy-meson-gxl-usb2.c | 2 +- + drivers/phy/amlogic/phy-meson8-hdmi-tx.c | 2 +- + drivers/phy/amlogic/phy-meson8b-usb2.c | 2 +- + drivers/phy/broadcom/phy-bcm-ns-usb3.c | 2 +- + drivers/phy/broadcom/phy-bcm-sr-usb.c | 2 +- + drivers/phy/broadcom/phy-bcm63xx-usbh.c | 1 + + drivers/phy/broadcom/phy-brcm-sata.c | 2 +- + drivers/phy/broadcom/phy-brcm-usb.c | 1 - + drivers/phy/cadence/cdns-dphy-rx.c | 1 + + drivers/phy/cadence/cdns-dphy.c | 3 +- + drivers/phy/cadence/phy-cadence-sierra.c | 98 ++ + drivers/phy/cadence/phy-cadence-torrent.c | 1734 +++++++------------- + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 2 +- + drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 2 +- + drivers/phy/freescale/phy-fsl-lynx-28g.c | 1 + + drivers/phy/hisilicon/phy-hi3660-usb3.c | 1 + + drivers/phy/hisilicon/phy-hi3670-usb3.c | 1 + + drivers/phy/hisilicon/phy-hi6220-usb.c | 1 + + drivers/phy/hisilicon/phy-hisi-inno-usb2.c | 3 +- + drivers/phy/hisilicon/phy-histb-combphy.c | 3 +- + drivers/phy/hisilicon/phy-hix5hd2-sata.c | 1 + + drivers/phy/ingenic/phy-ingenic-usb.c | 1 + + drivers/phy/lantiq/phy-lantiq-rcu-usb2.c | 1 - + drivers/phy/marvell/phy-armada38x-comphy.c | 1 + + drivers/phy/marvell/phy-berlin-sata.c | 1 + + drivers/phy/marvell/phy-mmp3-hsic.c | 1 + + drivers/phy/marvell/phy-mmp3-usb.c | 1 + + drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 1 + + drivers/phy/marvell/phy-mvebu-a3700-utmi.c | 2 +- + drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 4 +- + drivers/phy/marvell/phy-mvebu-cp110-utmi.c | 2 +- + drivers/phy/marvell/phy-mvebu-sata.c | 1 + + drivers/phy/marvell/phy-pxa-28nm-usb2.c | 1 - + drivers/phy/marvell/phy-pxa-usb.c | 2 +- + drivers/phy/mediatek/phy-mtk-hdmi.h | 1 - + drivers/phy/mediatek/phy-mtk-mipi-dsi.c | 30 +- + drivers/phy/mediatek/phy-mtk-mipi-dsi.h | 2 - + drivers/phy/mediatek/phy-mtk-pcie.c | 2 +- + drivers/phy/mediatek/phy-mtk-tphy.c | 2 +- + drivers/phy/mediatek/phy-mtk-ufs.c | 1 + + drivers/phy/phy-can-transceiver.c | 1 + + drivers/phy/phy-xgene.c | 1 + + drivers/phy/qualcomm/Kconfig | 10 + + drivers/phy/qualcomm/Makefile | 1 + + drivers/phy/qualcomm/phy-ath79-usb.c | 1 + + drivers/phy/qualcomm/phy-qcom-edp.c | 2 - + drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 1 - + drivers/phy/qualcomm/phy-qcom-ipq4019-usb.c | 3 +- + drivers/phy/qualcomm/phy-qcom-ipq806x-usb.c | 2 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 682 ++++---- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 1 - + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 342 +++- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h | 1 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v5_20.h | 2 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6.h | 5 + + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 13 +- + drivers/phy/qualcomm/phy-qcom-qmp-usb-legacy.c | 1407 ++++++++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 557 ------- + drivers/phy/qualcomm/phy-qcom-qmp.h | 2 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 1 - + drivers/phy/qualcomm/phy-qcom-snps-eusb2.c | 1 + + drivers/phy/qualcomm/phy-qcom-snps-femto-v2.c | 1 - + drivers/phy/qualcomm/phy-qcom-usb-hs.c | 2 +- + drivers/phy/ralink/phy-mt7621-pci.c | 3 +- + drivers/phy/renesas/phy-rcar-gen2.c | 1 - + drivers/phy/renesas/phy-rcar-gen3-pcie.c | 1 - + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 2 - + drivers/phy/renesas/r8a779f0-ether-serdes.c | 10 +- + drivers/phy/rockchip/phy-rockchip-dphy-rx0.c | 1 - + drivers/phy/rockchip/phy-rockchip-inno-dsidphy.c | 2 +- + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 235 ++- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 357 +++- + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 3 +- + drivers/phy/rockchip/phy-rockchip-snps-pcie3.c | 3 +- + drivers/phy/rockchip/phy-rockchip-typec.c | 3 +- + drivers/phy/samsung/phy-exynos-dp-video.c | 2 - + drivers/phy/samsung/phy-exynos-mipi-video.c | 3 +- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 2 - + drivers/phy/samsung/phy-samsung-usb2.c | 2 - + drivers/phy/socionext/phy-uniphier-pcie.c | 2 +- + drivers/phy/st/phy-spear1310-miphy.c | 3 +- + drivers/phy/st/phy-spear1340-miphy.c | 3 +- + drivers/phy/st/phy-stm32-usbphyc.c | 3 +- + drivers/phy/starfive/Kconfig | 38 + + drivers/phy/starfive/Makefile | 4 + + drivers/phy/starfive/phy-jh7110-dphy-rx.c | 232 +++ + drivers/phy/starfive/phy-jh7110-pcie.c | 204 +++ + drivers/phy/starfive/phy-jh7110-usb.c | 152 ++ + drivers/phy/sunplus/phy-sunplus-usb2.c | 2 +- + drivers/phy/tegra/phy-tegra194-p2u.c | 2 +- + drivers/phy/tegra/xusb.c | 2 +- + drivers/phy/ti/phy-gmii-sel.c | 9 +- + drivers/phy/ti/phy-tusb1210.c | 1 + + drivers/phy/ti/phy-twl4030-usb.c | 1 + + drivers/phy/xilinx/phy-zynqmp.c | 95 +- + 118 files changed, 4447 insertions(+), 2869 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-ufs-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/starfive,jh7110-dphy-rx.yaml + create mode 100644 Documentation/devicetree/bindings/phy/starfive,jh7110-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/starfive,jh7110-usb-phy.yaml + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-usb-legacy.c + create mode 100644 drivers/phy/starfive/Kconfig + create mode 100644 drivers/phy/starfive/Makefile + create mode 100644 drivers/phy/starfive/phy-jh7110-dphy-rx.c + create mode 100644 drivers/phy/starfive/phy-jh7110-pcie.c + create mode 100644 drivers/phy/starfive/phy-jh7110-usb.c +Merging soundwire/next (e66f91a2d10b soundwire: intel_auxdevice: add hybrid IDA-based device_number allocation) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging drivers/soundwire/bus.c +Auto-merging drivers/soundwire/qcom.c +Auto-merging include/linux/soundwire/sdw.h +Auto-merging include/linux/soundwire/sdw_intel.h +Merge made by the 'ort' strategy. + drivers/soundwire/bus.c | 18 +++--- + drivers/soundwire/intel_auxdevice.c | 112 ++++++++++++++++++++++++++++++------ + drivers/soundwire/qcom.c | 1 - + include/linux/soundwire/sdw.h | 12 ++-- + include/linux/soundwire/sdw_intel.h | 7 +++ + 5 files changed, 118 insertions(+), 32 deletions(-) +Merging extcon/extcon-next (d20a3a8a32e3 extcon: cht_wc: add POWER_SUPPLY dependency) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/extcon/maxim,max77843.yaml | 1 + + .../devicetree/bindings/extcon/siliconmitus,sm5502-muic.yaml | 4 ++++ + drivers/extcon/Kconfig | 1 + + include/linux/extcon.h | 12 ------------ + 4 files changed, 6 insertions(+), 12 deletions(-) +Merging gnss/gnss-next (fdf0eaf11452 Linux 6.5-rc2) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (73e2f19da508 kvm/vfio: avoid bouncing the mutex when adding and deleting groups) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Auto-merging drivers/iommu/iommufd/device.c +Auto-merging drivers/iommu/iommufd/iommufd_private.h +Auto-merging drivers/iommu/iommufd/main.c +Merge made by the 'ort' strategy. + Documentation/driver-api/vfio.rst | 147 +++++++++++++- + Documentation/virt/kvm/devices/vfio.rst | 45 +++-- + drivers/gpu/drm/i915/gvt/kvmgt.c | 1 + + drivers/iommu/iommufd/Kconfig | 4 +- + drivers/iommu/iommufd/device.c | 116 ++++++++++- + drivers/iommu/iommufd/iommufd_private.h | 2 + + drivers/iommu/iommufd/main.c | 26 ++- + drivers/s390/cio/vfio_ccw_ops.c | 1 + + drivers/s390/crypto/vfio_ap_ops.c | 1 + + drivers/vfio/Kconfig | 27 +++ + drivers/vfio/Makefile | 3 +- + drivers/vfio/device_cdev.c | 228 ++++++++++++++++++++++ + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 1 + + drivers/vfio/group.c | 173 +++++++++++------ + drivers/vfio/iommufd.c | 138 ++++++++++---- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 2 + + drivers/vfio/pci/mlx5/main.c | 1 + + drivers/vfio/pci/vfio_pci.c | 1 + + drivers/vfio/pci/vfio_pci_core.c | 254 +++++++++++++++---------- + drivers/vfio/platform/vfio_amba.c | 1 + + drivers/vfio/platform/vfio_platform.c | 1 + + drivers/vfio/vfio.h | 218 +++++++++++++++++++-- + drivers/vfio/vfio_main.c | 254 ++++++++++++++++++++++--- + include/linux/iommufd.h | 7 + + include/linux/vfio.h | 66 ++++++- + include/uapi/linux/kvm.h | 13 +- + include/uapi/linux/vfio.h | 142 +++++++++++++- + samples/vfio-mdev/mbochs.c | 1 + + samples/vfio-mdev/mdpy.c | 1 + + samples/vfio-mdev/mtty.c | 1 + + virt/kvm/vfio.c | 161 ++++++++-------- + 31 files changed, 1678 insertions(+), 359 deletions(-) + create mode 100644 drivers/vfio/device_cdev.c +Merging w1/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging staging/staging-next (656ae4f48a6f staging: fieldbus: arcx-anybus: Remove redundant of_match_ptr()) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/media/platform/nxp/imx8mq-mipi-csi2.c +Auto-merging drivers/staging/media/imx/imx-media-dev-common.c +Auto-merging drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c +Auto-merging drivers/staging/media/tegra-video/vi.c +Auto-merging drivers/staging/media/tegra-video/vip.c +Merge made by the 'ort' strategy. + drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 1 - + drivers/staging/axis-fifo/axis-fifo.c | 18 +-- + drivers/staging/fieldbus/anybuss/arcx-anybus.c | 6 +- + drivers/staging/greybus/arche-platform.c | 1 + + drivers/staging/greybus/pwm.c | 1 - + drivers/staging/media/imx/imx-media-capture.c | 1 - + drivers/staging/media/imx/imx-media-dev-common.c | 2 - + drivers/staging/media/meson/vdec/esparser.c | 1 - + drivers/staging/media/meson/vdec/vdec.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 2 +- + drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c | 1 - + drivers/staging/media/tegra-video/csi.c | 1 - + drivers/staging/media/tegra-video/vi.c | 2 +- + drivers/staging/media/tegra-video/vip.c | 1 - + drivers/staging/most/dim2/dim2.c | 2 +- + drivers/staging/pi433/pi433_if.c | 1 - + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 7 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 17 +-- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 3 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 25 +--- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 8 -- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 38 ++--- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 12 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 60 ++++---- + drivers/staging/rtl8192e/rtl819x_TS.h | 2 - + drivers/staging/rtl8192e/rtl819x_TSProc.c | 51 ++----- + drivers/staging/rtl8192e/rtllib.h | 26 ++-- + drivers/staging/rtl8192e/rtllib_module.c | 3 - + drivers/staging/rtl8192e/rtllib_rx.c | 58 +++----- + drivers/staging/rtl8192e/rtllib_softmac.c | 161 +++++++++------------ + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 8 +- + drivers/staging/rtl8192e/rtllib_tx.c | 3 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 10 +- + drivers/staging/rtl8712/os_intfs.c | 1 + + drivers/staging/rtl8712/usb_intf.c | 1 - + drivers/staging/rtl8723bs/core/rtw_ap.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 12 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 6 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 167 +++++++++++----------- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 161 ++++++++------------- + drivers/staging/rts5208/sd.c | 3 +- + drivers/staging/vme_user/vme.c | 83 +++++------ + drivers/staging/vme_user/vme_bridge.h | 46 +++--- + 46 files changed, 410 insertions(+), 619 deletions(-) +Merging counter-next/counter-next (71ab2f343f1f counter: rz-mtu3-cnt: Reorder locking sequence for consistency) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-counter | 8 ++++---- + drivers/counter/microchip-tcb-capture.c | 1 - + drivers/counter/rz-mtu3-cnt.c | 4 ++-- + include/linux/counter.h | 2 +- + 4 files changed, 7 insertions(+), 8 deletions(-) +Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (0f264ab788ed dt-bindings: dmaengine: at_xdmac: add compatible with microchip,sam9x7) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/dma/idxd/device.c +Auto-merging drivers/dma/idxd/sysfs.c +Auto-merging drivers/dma/owl-dma.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 2 +- + .../devicetree/bindings/dma/atmel-xdma.txt | 3 +- + .../devicetree/bindings/dma/brcm,bcm2835-dma.txt | 83 - + .../devicetree/bindings/dma/brcm,bcm2835-dma.yaml | 102 ++ + .../devicetree/bindings/dma/qcom,bam-dma.yaml | 31 +- + drivers/dma/Kconfig | 21 +- + drivers/dma/Makefile | 1 - + drivers/dma/apple-admac.c | 3 +- + drivers/dma/at_hdmac.c | 2 +- + drivers/dma/bcm-sba-raid.c | 4 +- + drivers/dma/bestcomm/bestcomm.c | 3 +- + drivers/dma/dma-jz4780.c | 1 - + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 1 - + drivers/dma/dw/rzn1-dmamux.c | 4 +- + drivers/dma/ep93xx_dma.c | 4 +- + drivers/dma/fsl-qdma.c | 4 +- + drivers/dma/fsl_raid.c | 3 +- + drivers/dma/fsldma.c | 3 +- + drivers/dma/idxd/device.c | 2 - + drivers/dma/idxd/perfmon.c | 7 +- + drivers/dma/idxd/sysfs.c | 29 +- + drivers/dma/img-mdc-dma.c | 1 - + drivers/dma/imx-dma.c | 2 +- + drivers/dma/imx-sdma.c | 1 - + drivers/dma/ipu/Makefile | 2 - + drivers/dma/ipu/ipu_idmac.c | 1801 -------------------- + drivers/dma/ipu/ipu_intern.h | 173 -- + drivers/dma/ipu/ipu_irq.c | 367 ---- + drivers/dma/lpc18xx-dmamux.c | 4 +- + drivers/dma/mediatek/mtk-cqdma.c | 1 - + drivers/dma/mediatek/mtk-hsdma.c | 1 - + drivers/dma/mediatek/mtk-uart-apdma.c | 2 - + drivers/dma/mpc512x_dma.c | 4 +- + drivers/dma/mxs-dma.c | 1 - + drivers/dma/nbpfaxi.c | 1 - + drivers/dma/owl-dma.c | 3 +- + drivers/dma/ppc4xx/adma.c | 2 +- + drivers/dma/qcom/gpi.c | 3 +- + drivers/dma/qcom/hidma.c | 14 +- + drivers/dma/qcom/hidma_mgmt.c | 5 +- + drivers/dma/sh/rz-dmac.c | 17 +- + drivers/dma/sh/shdmac.c | 8 +- + drivers/dma/sprd-dma.c | 2 +- + drivers/dma/stm32-dma.c | 3 +- + drivers/dma/stm32-dmamux.c | 4 +- + drivers/dma/stm32-mdma.c | 1 - + drivers/dma/sun6i-dma.c | 2 +- + drivers/dma/tegra186-gpc-dma.c | 2 +- + drivers/dma/tegra20-apb-dma.c | 1 - + drivers/dma/tegra210-adma.c | 3 +- + drivers/dma/ti/dma-crossbar.c | 5 +- + drivers/dma/ti/edma.c | 1 - + drivers/dma/ti/k3-udma-private.c | 2 + + drivers/dma/ti/k3-udma.c | 1 - + drivers/dma/ti/omap-dma.c | 2 +- + drivers/dma/xgene-dma.c | 3 +- + drivers/dma/xilinx/xilinx_dma.c | 4 +- + drivers/dma/xilinx/zynqmp_dma.c | 3 +- + 58 files changed, 210 insertions(+), 2555 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/brcm,bcm2835-dma.yaml + delete mode 100644 drivers/dma/ipu/Makefile + delete mode 100644 drivers/dma/ipu/ipu_idmac.c + delete mode 100644 drivers/dma/ipu/ipu_intern.h + delete mode 100644 drivers/dma/ipu/ipu_irq.c +Merging cgroup/for-next (82b90b6c5b38 cgroup:namespace: Remove unused cgroup_namespaces_init()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging Documentation/admin-guide/cgroup-v1/memory.rst +Auto-merging MAINTAINERS +Auto-merging include/linux/cgroup-defs.h +Auto-merging kernel/cgroup/cgroup.c +Auto-merging tools/testing/selftests/cgroup/.gitignore +CONFLICT (content): Merge conflict in tools/testing/selftests/cgroup/.gitignore +Auto-merging tools/testing/selftests/cgroup/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/cgroup/Makefile +Resolved 'tools/testing/selftests/cgroup/.gitignore' using previous resolution. +Resolved 'tools/testing/selftests/cgroup/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d7cb1c487a02] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v1/memory.rst | 6 +- + Documentation/admin-guide/cgroup-v2.rst | 2 +- + MAINTAINERS | 2 + + include/linux/cgroup-defs.h | 14 ++ + include/linux/misc_cgroup.h | 28 +-- + include/uapi/linux/cgroupstats.h | 2 - + kernel/cgroup/cgroup-v1.c | 2 +- + kernel/cgroup/cgroup.c | 81 +++---- + kernel/cgroup/cpuset.c | 264 +++++++++++++-------- + kernel/cgroup/misc.c | 55 +++-- + kernel/cgroup/namespace.c | 6 - + kernel/cgroup/rstat.c | 12 +- + tools/testing/selftests/cgroup/.gitignore | 1 + + tools/testing/selftests/cgroup/Makefile | 2 + + tools/testing/selftests/cgroup/cgroup_util.c | 2 + + tools/testing/selftests/cgroup/cgroup_util.h | 2 + + tools/testing/selftests/cgroup/test_core.c | 2 +- + tools/testing/selftests/cgroup/test_cpuset.c | 275 ++++++++++++++++++++++ + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 2 +- + 19 files changed, 558 insertions(+), 202 deletions(-) + create mode 100644 tools/testing/selftests/cgroup/test_cpuset.c +$ git am -3 ../patches/0001-Revert-cgroup-put-cgroup_tryget_css-inside-CONFIG_CG.patch +Applying: Revert "cgroup: put cgroup_tryget_css() inside CONFIG_CGROUP_SCHED" +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/cgroup/cgroup.c +$ git add -A . +$ git commit -v -a --amend +[master e92fcc0b6262] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git + Date: Tue Aug 15 17:56:01 2023 +1000 +Merging scsi/for-next (7da4622a53ea Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/scsi/hisi_sas/hisi_sas_main.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 247 --- + Documentation/scsi/scsi_mid_low_api.rst | 4 +- + drivers/infiniband/ulp/srp/ib_srp.c | 4 - + drivers/scsi/aic7xxx/aicasm/Makefile | 16 +- + drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c | 1 + + drivers/scsi/be2iscsi/be_iscsi.c | 4 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 5 - + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 11 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 18 +- + drivers/scsi/lpfc/lpfc.h | 20 + + drivers/scsi/lpfc/lpfc_attr.c | 136 +- + drivers/scsi/lpfc/lpfc_ct.c | 20 +- + drivers/scsi/lpfc/lpfc_els.c | 58 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 77 +- + drivers/scsi/lpfc/lpfc_hw.h | 2 + + drivers/scsi/lpfc/lpfc_init.c | 53 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 94 +- + drivers/scsi/lpfc/lpfc_nvme.c | 16 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 5 +- + drivers/scsi/lpfc/lpfc_sli.c | 8 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/qedf/qedf_dbg.h | 2 + + drivers/scsi/qedf/qedf_debugfs.c | 35 +- + drivers/scsi/qla2xxx/qla_def.h | 9 +- + drivers/scsi/qla2xxx/qla_gbl.h | 1 + + drivers/scsi/qla2xxx/qla_init.c | 217 ++- + drivers/scsi/qla2xxx/qla_iocb.c | 1 + + drivers/scsi/qla2xxx/qla_isr.c | 7 +- + drivers/scsi/qla2xxx/qla_mbx.c | 3 + + drivers/scsi/qla2xxx/qla_nvme.c | 3 +- + drivers/scsi/qla2xxx/qla_os.c | 11 +- + drivers/scsi/qla2xxx/qla_target.c | 14 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qla4xxx/ql4_os.c | 15 + + drivers/scsi/qlogicpti.c | 2 +- + drivers/scsi/scsi_transport_iscsi.c | 80 +- + drivers/scsi/sun_esp.c | 3 +- + drivers/target/iscsi/iscsi_target_configfs.c | 74 +- + drivers/target/iscsi/iscsi_target_tpg.c | 26 - + drivers/target/iscsi/iscsi_target_tpg.h | 1 - + drivers/ufs/core/Kconfig | 8 - + drivers/ufs/core/Makefile | 1 - + drivers/ufs/core/ufs-hwmon.c | 3 +- + drivers/ufs/core/ufs-mcq.c | 34 +- + drivers/ufs/core/ufs-sysfs.c | 22 - + drivers/ufs/core/ufs_bsg.c | 2 + + drivers/ufs/core/ufshcd-crypto.h | 20 +- + drivers/ufs/core/ufshcd-priv.h | 4 +- + drivers/ufs/core/ufshcd.c | 611 +++--- + drivers/ufs/core/ufshpb.c | 2668 -------------------------- + drivers/ufs/core/ufshpb.h | 318 --- + drivers/ufs/host/cdns-pltfrm.c | 27 +- + drivers/ufs/host/tc-dwc-g210-pci.c | 2 +- + drivers/ufs/host/tc-dwc-g210.c | 32 +- + drivers/ufs/host/ti-j721e-ufs.c | 2 + + drivers/ufs/host/ufs-mediatek.c | 180 +- + drivers/ufs/host/ufs-mediatek.h | 33 + + drivers/ufs/host/ufs-qcom.c | 170 +- + drivers/ufs/host/ufs-qcom.h | 4 +- + drivers/ufs/host/ufs-renesas.c | 2 +- + drivers/ufs/host/ufshcd-dwc.c | 22 +- + drivers/ufs/host/ufshcd-pci.c | 2 +- + drivers/ufs/host/ufshcd-pltfrm.c | 10 +- + include/scsi/scsi_transport_iscsi.h | 1 - + include/target/iscsi/iscsi_target_core.h | 4 - + include/uapi/scsi/scsi_bsg_ufs.h | 52 +- + include/ufs/ufs.h | 90 +- + include/ufs/ufs_quirks.h | 6 - + include/ufs/ufshcd.h | 59 +- + include/ufs/ufshci.h | 51 +- + include/ufs/unipro.h | 6 + + 71 files changed, 1504 insertions(+), 4251 deletions(-) + delete mode 100644 drivers/ufs/core/ufshpb.c + delete mode 100644 drivers/ufs/core/ufshpb.h +Merging scsi-mkp/for-next (a18e81d17a7e scsi: ufs: ufs-pci: Add support for QEMU) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 1 + + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 2 +- + drivers/scsi/mpi3mr/mpi3mr.h | 23 ++++- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 37 +++++-- + drivers/scsi/mpi3mr/mpi3mr_os.c | 155 ++++++++++++++++++++++++------ + drivers/ufs/core/ufshcd.c | 11 ++- + drivers/ufs/host/ufs-qcom.c | 6 +- + drivers/ufs/host/ufshcd-pci.c | 1 + + include/ufs/ufshcd.h | 1 + + 11 files changed, 195 insertions(+), 46 deletions(-) +Merging vhost/linux-next (1a08d66726dc virtio_net: merge dma operations when filling mergeable buffers) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/net/virtio_net.c +CONFLICT (content): Merge conflict in drivers/net/virtio_net.c +Auto-merging drivers/vdpa/mlx5/net/mlx5_vnet.c +Auto-merging include/linux/virtio.h +Recorded preimage for 'drivers/net/virtio_net.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/net/virtio_net.c'. +[master d3820eb0fa38] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 11 +- + drivers/net/virtio_net.c | 232 ++++++++++++++++++--- + drivers/vdpa/mlx5/core/mlx5_vdpa.h | 5 +- + drivers/vdpa/mlx5/core/mr.c | 105 +++++++--- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 26 +-- + drivers/vdpa/pds/Makefile | 3 +- + drivers/vdpa/pds/debugfs.c | 15 +- + drivers/vdpa/pds/vdpa_dev.c | 176 +++++++++++----- + drivers/vdpa/pds/vdpa_dev.h | 5 +- + drivers/vdpa/vdpa.c | 9 +- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 8 + + drivers/vdpa/vdpa_user/vduse_dev.c | 8 +- + drivers/vhost/scsi.c | 187 ++++++++++++++--- + drivers/vhost/vdpa.c | 15 +- + drivers/virtio/virtio_mem.c | 168 ++++++++++----- + drivers/virtio/virtio_mmio.c | 5 +- + drivers/virtio/virtio_pci_common.c | 2 - + drivers/virtio/virtio_pci_legacy.c | 1 + + drivers/virtio/virtio_ring.c | 410 ++++++++++++++++++++++++++++++++----- + drivers/virtio/virtio_vdpa.c | 2 + + include/linux/vdpa.h | 4 + + include/linux/virtio.h | 22 ++ + include/uapi/linux/vhost_types.h | 4 + + 23 files changed, 1132 insertions(+), 291 deletions(-) +Merging rpmsg/for-next (af2010496de7 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging Documentation/devicetree/bindings/remoteproc/qcom,sm8350-pas.yaml +Merge made by the 'ort' strategy. + .../bindings/remoteproc/fsl,imx-rproc.yaml | 20 ++++ + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 24 +++++ + .../bindings/remoteproc/qcom,msm8996-mss-pil.yaml | 12 ++- + .../bindings/remoteproc/qcom,pas-common.yaml | 1 - + .../bindings/remoteproc/qcom,qcs404-pas.yaml | 3 +- + .../bindings/remoteproc/qcom,sc7180-pas.yaml | 3 +- + .../bindings/remoteproc/qcom,sc8180x-pas.yaml | 3 +- + .../bindings/remoteproc/qcom,sc8280xp-pas.yaml | 3 +- + .../bindings/remoteproc/qcom,sdx55-pas.yaml | 3 +- + .../bindings/remoteproc/qcom,sm6115-pas.yaml | 39 +++++--- + .../bindings/remoteproc/qcom,sm6350-pas.yaml | 3 +- + .../bindings/remoteproc/qcom,sm8150-pas.yaml | 3 +- + .../bindings/remoteproc/qcom,sm8350-pas.yaml | 3 +- + .../bindings/remoteproc/qcom,sm8550-pas.yaml | 1 + + drivers/hwspinlock/omap_hwspinlock.c | 8 +- + drivers/hwspinlock/qcom_hwspinlock.c | 11 +++ + drivers/hwspinlock/u8500_hsem.c | 6 +- + drivers/remoteproc/imx_dsp_rproc.c | 3 +- + drivers/remoteproc/imx_rproc.c | 73 ++++++++++++++- + drivers/remoteproc/imx_rproc.h | 2 + + drivers/remoteproc/omap_remoteproc.c | 3 +- + drivers/remoteproc/pru_rproc.c | 3 +- + drivers/remoteproc/qcom_common.c | 21 +++-- + drivers/remoteproc/qcom_q6v5_adsp.c | 26 +++--- + drivers/remoteproc/qcom_q6v5_mss.c | 95 +++++++++++++++---- + drivers/remoteproc/qcom_q6v5_pas.c | 102 ++++++++------------- + drivers/remoteproc/qcom_q6v5_wcss.c | 3 +- + drivers/remoteproc/qcom_sysmon.c | 1 - + drivers/remoteproc/qcom_wcnss.c | 30 +++--- + drivers/remoteproc/qcom_wcnss_iris.c | 1 + + drivers/remoteproc/rcar_rproc.c | 3 +- + drivers/remoteproc/remoteproc_coredump.c | 2 + + drivers/remoteproc/remoteproc_internal.h | 4 - + drivers/remoteproc/st_slim_rproc.c | 1 - + drivers/remoteproc/stm32_rproc.c | 4 +- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 2 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 3 +- + drivers/remoteproc/wkup_m3_rproc.c | 2 +- + drivers/rpmsg/qcom_glink_native.c | 61 ++++++++++++ + drivers/rpmsg/rpmsg_char.c | 54 +++++++++-- + drivers/rpmsg/rpmsg_core.c | 21 +++++ + drivers/rpmsg/rpmsg_internal.h | 2 + + include/linux/remoteproc.h | 4 + + include/linux/rpmsg.h | 15 +++ + include/uapi/linux/rpmsg.h | 10 ++ + 45 files changed, 511 insertions(+), 186 deletions(-) +Merging gpio/for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (a40fe1ffb69b gpio: sim: simplify gpio_sim_device_config_live_store()) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpio/gpio-sim.c +Auto-merging drivers/gpio/gpio-ws16c48.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/gpio/adi,ds4520-gpio.yaml | 51 ++ + .../devicetree/bindings/gpio/brcm,kona-gpio.txt | 52 -- + .../devicetree/bindings/gpio/brcm,kona-gpio.yaml | 100 +++ + .../devicetree/bindings/gpio/fsl-imx-gpio.yaml | 2 + + .../devicetree/bindings/gpio/snps,dw-apb-gpio.yaml | 4 + + .../devicetree/bindings/gpio/st,stmpe-gpio.yaml | 4 + + MAINTAINERS | 2 +- + drivers/gpio/Kconfig | 31 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-104-dio-48e.c | 127 +++- + drivers/gpio/gpio-104-idio-16.c | 286 ++------- + drivers/gpio/gpio-74xx-mmio.c | 2 - + drivers/gpio/gpio-altera-a10sr.c | 3 +- + drivers/gpio/gpio-ath79.c | 3 +- + drivers/gpio/gpio-bcm-kona.c | 24 +- + drivers/gpio/gpio-brcmstb.c | 4 +- + drivers/gpio/gpio-clps711x.c | 4 +- + drivers/gpio/gpio-creg-snps.c | 2 +- + drivers/gpio/gpio-davinci.c | 2 +- + drivers/gpio/gpio-ds4520.c | 80 +++ + drivers/gpio/gpio-eic-sprd.c | 3 +- + drivers/gpio/gpio-exar.c | 2 - + drivers/gpio/gpio-ftgpio010.c | 4 +- + drivers/gpio/gpio-ge.c | 68 +-- + drivers/gpio/gpio-grgpio.c | 2 +- + drivers/gpio/gpio-hlwd.c | 2 +- + drivers/gpio/gpio-idio-16.c | 254 ++++---- + drivers/gpio/gpio-idio-16.h | 79 +-- + drivers/gpio/gpio-imx-scu.c | 3 +- + drivers/gpio/gpio-ixp4xx.c | 2 +- + drivers/gpio/gpio-logicvc.c | 3 - + drivers/gpio/gpio-lp3943.c | 2 - + drivers/gpio/gpio-lpc32xx.c | 4 +- + drivers/gpio/gpio-max3191x.c | 4 +- + drivers/gpio/gpio-max732x.c | 6 +- + drivers/gpio/gpio-max77620.c | 2 - + drivers/gpio/gpio-mb86s7x.c | 2 +- + drivers/gpio/gpio-mmio.c | 9 +- + drivers/gpio/gpio-mpc5200.c | 2 +- + drivers/gpio/gpio-mpc8xxx.c | 4 +- + drivers/gpio/gpio-msc313.c | 1 - + drivers/gpio/gpio-mxc.c | 109 +++- + drivers/gpio/gpio-mxs.c | 3 +- + drivers/gpio/gpio-omap.c | 8 +- + drivers/gpio/gpio-palmas.c | 2 - + drivers/gpio/gpio-pci-idio-16.c | 294 ++------- + drivers/gpio/gpio-pcie-idio-24.c | 669 ++++++++------------- + drivers/gpio/gpio-pisosr.c | 28 +- + drivers/gpio/gpio-pmic-eic-sprd.c | 3 +- + drivers/gpio/gpio-pxa.c | 1 - + drivers/gpio/gpio-raspberrypi-exp.c | 4 +- + drivers/gpio/gpio-rc5t583.c | 2 - + drivers/gpio/gpio-rcar.c | 1 - + drivers/gpio/gpio-rockchip.c | 2 +- + drivers/gpio/gpio-sama5d2-piobu.c | 1 - + drivers/gpio/gpio-sch.c | 2 - + drivers/gpio/gpio-sifive.c | 52 +- + drivers/gpio/gpio-sim.c | 20 +- + drivers/gpio/gpio-sprd.c | 2 +- + drivers/gpio/gpio-stp-xway.c | 3 +- + drivers/gpio/gpio-syscon.c | 3 - + drivers/gpio/gpio-tegra.c | 2 +- + drivers/gpio/gpio-tegra186.c | 2 +- + drivers/gpio/gpio-timberdale.c | 2 - + drivers/gpio/gpio-tps65218.c | 2 +- + drivers/gpio/gpio-tps6586x.c | 2 +- + drivers/gpio/gpio-tps65910.c | 2 +- + drivers/gpio/gpio-tqmx86.c | 2 - + drivers/gpio/gpio-ts4800.c | 3 +- + drivers/gpio/gpio-ts4900.c | 2 +- + drivers/gpio/gpio-uniphier.c | 1 - + drivers/gpio/gpio-vf610.c | 1 - + drivers/gpio/gpio-vx855.c | 2 - + drivers/gpio/gpio-wcd934x.c | 3 +- + drivers/gpio/gpio-ws16c48.c | 552 ++++++----------- + drivers/gpio/gpio-xilinx.c | 4 +- + drivers/gpio/gpio-xra1403.c | 6 +- + drivers/gpio/gpio-zevio.c | 2 - + drivers/gpio/gpiolib-acpi.c | 2 +- + drivers/gpio/gpiolib-of.c | 6 +- + drivers/gpio/gpiolib.c | 188 +++--- + drivers/gpio/gpiolib.h | 12 +- + 82 files changed, 1431 insertions(+), 1818 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/adi,ds4520-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/brcm,kona-gpio.yaml + create mode 100644 drivers/gpio/gpio-ds4520.c +Merging gpio-intel/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (dfe014e7b5bc Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.yaml +Auto-merging arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +Auto-merging arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts +Auto-merging arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi +Auto-merging arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi +Auto-merging arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts +Auto-merging arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +Auto-merging arch/arm64/boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts +Auto-merging arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts +Auto-merging arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi +Auto-merging arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts +Auto-merging arch/arm64/boot/dts/amlogic/meson-sm1-x96-air-gbit.dts +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging drivers/pinctrl/qcom/Kconfig +Auto-merging drivers/pinctrl/qcom/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/omap/ctrl.txt | 2 +- + .../bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml | 5 + + .../pinctrl/amlogic,meson-pinctrl-common.yaml | 7 + + .../pinctrl/amlogic,meson-pinctrl-g12a-aobus.yaml | 3 + + .../amlogic,meson-pinctrl-g12a-periphs.yaml | 3 + + .../pinctrl/amlogic,meson8-pinctrl-aobus.yaml | 4 + + .../pinctrl/amlogic,meson8-pinctrl-cbus.yaml | 4 + + .../bindings/pinctrl/cypress,cy8c95x0.yaml | 4 + + .../devicetree/bindings/pinctrl/pinctrl-single.txt | 262 ----- + .../bindings/pinctrl/pinctrl-single.yaml | 207 ++++ + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 6 + + .../bindings/pinctrl/qcom,sa8775p-tlmm.yaml | 2 +- + .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 5 - + .../bindings/pinctrl/ti,omap-pinctrl.txt | 13 - + .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 4 + + arch/arm/boot/dts/st/ste-href520-tvk.dts | 2 +- + arch/arm/boot/dts/st/ste-hrefprev60-stuib.dts | 2 +- + arch/arm/boot/dts/st/ste-hrefprev60-tvk.dts | 2 +- + arch/arm/boot/dts/st/ste-hrefv60plus-stuib.dts | 2 +- + arch/arm/boot/dts/st/ste-hrefv60plus-tvk.dts | 2 +- + arch/arm/boot/dts/st/ste-snowball.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 2 +- + .../boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 2 +- + .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 2 +- + .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 4 +- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi | 2 +- + .../boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 2 +- + .../arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 4 +- + arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 12 +- + .../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 2 +- + drivers/firmware/xilinx/zynqmp.c | 49 + + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 10 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 11 +- + drivers/pinctrl/berlin/pinctrl-as370.c | 3 +- + drivers/pinctrl/core.c | 20 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 3 +- + drivers/pinctrl/freescale/pinctrl-imx23.c | 3 +- + drivers/pinctrl/freescale/pinctrl-imx25.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx27.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx28.c | 3 +- + drivers/pinctrl/freescale/pinctrl-imx35.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx50.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx51.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx53.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx6dl.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx6q.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx6sl.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx6sll.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx6sx.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx6ul.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx7d.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx7ulp.c | 5 +- + drivers/pinctrl/freescale/pinctrl-imx8dxl.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx8mm.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx8mq.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx8qxp.c | 3 +- + drivers/pinctrl/freescale/pinctrl-imx8ulp.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx93.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imxrt1050.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imxrt1170.c | 2 +- + drivers/pinctrl/freescale/pinctrl-vf610.c | 4 +- + drivers/pinctrl/mediatek/pinctrl-mt2701.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt2712.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt6397.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt8127.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt8135.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt8167.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt8173.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt8365.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt8516.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 2 - + drivers/pinctrl/meson/Kconfig | 6 + + drivers/pinctrl/meson/Makefile | 1 + + drivers/pinctrl/meson/pinctrl-amlogic-c3.c | 1108 ++++++++++++++++++++ + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 35 +- + drivers/pinctrl/meson/pinctrl-meson.c | 1 - + drivers/pinctrl/mvebu/pinctrl-ac5.c | 1 - + drivers/pinctrl/mvebu/pinctrl-armada-370.c | 1 - + drivers/pinctrl/mvebu/pinctrl-armada-375.c | 1 - + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 2 - + drivers/pinctrl/mvebu/pinctrl-dove.c | 3 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 2 - + drivers/pinctrl/nxp/pinctrl-s32cc.c | 2 +- + drivers/pinctrl/nxp/pinctrl-s32g2.c | 2 +- + drivers/pinctrl/pinctrl-amd.c | 4 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 7 +- + drivers/pinctrl/pinctrl-axp209.c | 1 - + drivers/pinctrl/pinctrl-cy8c95x0.c | 15 + + drivers/pinctrl/pinctrl-k210.c | 2 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 4 +- + drivers/pinctrl/pinctrl-mcp23s08_spi.c | 10 + + drivers/pinctrl/pinctrl-ocelot.c | 4 +- + drivers/pinctrl/pinctrl-oxnas.c | 1 - + drivers/pinctrl/pinctrl-palmas.c | 1 - + drivers/pinctrl/pinctrl-pic32.c | 5 +- + drivers/pinctrl/pinctrl-rockchip.c | 5 +- + drivers/pinctrl/pinctrl-single.c | 14 +- + drivers/pinctrl/pinctrl-stmfx.c | 4 +- + drivers/pinctrl/pinctrl-sx150x.c | 1 - + drivers/pinctrl/pinctrl-zynqmp.c | 9 + + drivers/pinctrl/pinmux.c | 6 +- + drivers/pinctrl/pxa/pinctrl-pxa25x.c | 1 - + drivers/pinctrl/pxa/pinctrl-pxa27x.c | 1 - + drivers/pinctrl/qcom/pinctrl-ipq5018.c | 10 - + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 9 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 9 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 2 + + drivers/pinctrl/qcom/pinctrl-sa8775p.c | 1 + + drivers/pinctrl/qcom/pinctrl-sdx75.c | 1 - + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 + + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +- + drivers/pinctrl/renesas/core.c | 1 - + drivers/pinctrl/renesas/pinctrl-rza1.c | 3 +- + drivers/pinctrl/renesas/pinctrl-rza2.c | 3 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 35 +- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 35 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 +- + drivers/pinctrl/spear/pinctrl-spear1310.c | 2 +- + drivers/pinctrl/spear/pinctrl-spear1340.c | 2 +- + drivers/pinctrl/spear/pinctrl-spear300.c | 2 +- + drivers/pinctrl/spear/pinctrl-spear310.c | 2 +- + drivers/pinctrl/spear/pinctrl-spear320.c | 2 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 1 - + .../pinctrl/starfive/pinctrl-starfive-jh7110-aon.c | 5 +- + .../pinctrl/starfive/pinctrl-starfive-jh7110-sys.c | 2 - + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 1 - + drivers/pinctrl/stm32/pinctrl-stm32.c | 38 +- + drivers/pinctrl/sunplus/sppctl.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun20i-d1.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-a100-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-a100.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-h6.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-h616-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun5i.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun8i-a33.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun8i-a83t-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 1 - + drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c | 1 - + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 6 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 19 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 2 + + drivers/pinctrl/tegra/pinctrl-tegra194.c | 1 - + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 11 +- + include/dt-bindings/gpio/amlogic-c3-gpio.h | 72 ++ + .../amlogic,meson-g12a-gpio-intc.h | 126 +++ + include/linux/firmware/xlnx-zynqmp.h | 13 + + 167 files changed, 1905 insertions(+), 584 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-single.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-single.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt + create mode 100644 drivers/pinctrl/meson/pinctrl-amlogic-c3.c + create mode 100644 include/dt-bindings/gpio/amlogic-c3-gpio.h + create mode 100644 include/dt-bindings/interrupt-controller/amlogic,meson-g12a-gpio-intc.h +Merging pinctrl-intel/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (95eb19869401 pinctrl: renesas: rzg2l: Use devm_clk_get_enabled() helper) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (3ccb179aa40d pwm: lpc32xx: Remove handling of PWM channels) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Auto-merging drivers/staging/greybus/pwm.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/brcm,kona-pwm.txt | 21 ---- + .../devicetree/bindings/pwm/brcm,kona-pwm.yaml | 51 +++++++++ + drivers/pwm/core.c | 41 ++++--- + drivers/pwm/pwm-apple.c | 1 + + drivers/pwm/pwm-atmel-hlcdc.c | 66 +++++------ + drivers/pwm/pwm-atmel-tcb.c | 123 ++++++++------------- + drivers/pwm/pwm-atmel.c | 79 ++++++++----- + drivers/pwm/pwm-bcm-kona.c | 4 +- + drivers/pwm/pwm-berlin.c | 1 + + drivers/pwm/pwm-crc.c | 4 +- + drivers/pwm/pwm-cros-ec.c | 11 +- + drivers/pwm/pwm-fsl-ftm.c | 3 +- + drivers/pwm/pwm-hibvt.c | 2 +- + drivers/pwm/pwm-imx1.c | 1 - + drivers/pwm/pwm-jz4740.c | 2 +- + drivers/pwm/pwm-lp3943.c | 5 +- + drivers/pwm/pwm-lpc18xx-sct.c | 34 ++---- + drivers/pwm/pwm-lpc32xx.c | 16 +-- + drivers/pwm/pwm-mediatek.c | 1 - + drivers/pwm/pwm-meson.c | 1 - + drivers/pwm/pwm-microchip-core.c | 2 +- + drivers/pwm/pwm-mtk-disp.c | 1 - + drivers/pwm/pwm-ntxec.c | 4 +- + drivers/pwm/pwm-pxa.c | 10 +- + drivers/pwm/pwm-rockchip.c | 4 +- + drivers/pwm/pwm-rz-mtu3.c | 2 +- + drivers/pwm/pwm-sifive.c | 5 +- + drivers/pwm/pwm-sl28cpld.c | 14 ++- + drivers/pwm/pwm-sprd.c | 1 + + drivers/pwm/pwm-stm32.c | 14 +-- + drivers/pwm/pwm-stmpe.c | 17 +-- + drivers/pwm/pwm-sun4i.c | 1 - + drivers/pwm/pwm-sunplus.c | 1 + + drivers/pwm/pwm-tegra.c | 1 - + drivers/pwm/pwm-tiecap.c | 2 +- + drivers/pwm/pwm-tiehrpwm.c | 2 +- + drivers/pwm/pwm-visconti.c | 2 +- + drivers/pwm/pwm-vt8500.c | 5 +- + drivers/staging/greybus/pwm.c | 12 +- + include/linux/pwm.h | 6 +- + 40 files changed, 282 insertions(+), 291 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pwm/brcm,kona-pwm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/brcm,kona-pwm.yaml +Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++--- + ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++-- + ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++ + kernel/ucount.c | 16 ++++++------- + 4 files changed, 89 insertions(+), 14 deletions(-) +Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (2b2fe6052dd0 selftests/rseq: Use rseq_unqual_scalar_typeof in macros) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging tools/testing/selftests/rseq/Makefile +Merge made by the 'ort' strategy. + tools/testing/selftests/prctl/.gitignore | 1 + + tools/testing/selftests/prctl/Makefile | 4 +- + tools/testing/selftests/prctl/set-process-name.c | 62 +++++++++++++++++ + tools/testing/selftests/resctrl/Makefile | 2 +- + tools/testing/selftests/resctrl/cache.c | 66 +++++++++--------- + tools/testing/selftests/resctrl/cat_test.c | 28 ++------ + tools/testing/selftests/resctrl/cmt_test.c | 29 ++------ + tools/testing/selftests/resctrl/fill_buf.c | 87 +++++++++-------------- + tools/testing/selftests/resctrl/mba_test.c | 9 +-- + tools/testing/selftests/resctrl/mbm_test.c | 17 ++--- + tools/testing/selftests/resctrl/resctrl.h | 17 ++--- + tools/testing/selftests/resctrl/resctrl_tests.c | 89 ++++++++++++++++-------- + tools/testing/selftests/resctrl/resctrl_val.c | 7 +- + tools/testing/selftests/resctrl/resctrlfs.c | 66 +++++++++--------- + tools/testing/selftests/rseq/Makefile | 2 +- + tools/testing/selftests/rseq/compiler.h | 26 +++++++ + tools/testing/selftests/rseq/rseq-arm.h | 4 +- + tools/testing/selftests/rseq/rseq-arm64.h | 58 +++++++-------- + tools/testing/selftests/rseq/rseq-mips.h | 4 +- + tools/testing/selftests/rseq/rseq-ppc.h | 4 +- + tools/testing/selftests/rseq/rseq-riscv.h | 6 +- + tools/testing/selftests/rseq/rseq-s390.h | 4 +- + tools/testing/selftests/rseq/rseq-x86.h | 4 +- + 23 files changed, 316 insertions(+), 280 deletions(-) + create mode 100644 tools/testing/selftests/prctl/set-process-name.c +Merging kunit/test (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (582eb3aeed2d kunit: replace KUNIT_TRIGGER_STATIC_STUB maro with KUNIT_STATIC_STUB_REDIRECT) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Auto-merging MAINTAINERS +Auto-merging include/kunit/test.h +Auto-merging lib/Kconfig.debug +Auto-merging rust/Makefile +Auto-merging rust/bindings/bindings_helper.h +Auto-merging rust/kernel/sync/arc.rs +Auto-merging rust/kernel/types.rs +Merge made by the 'ort' strategy. + Documentation/dev-tools/kunit/run_wrapper.rst | 12 + + Documentation/dev-tools/kunit/running_tips.rst | 166 ++++++++++ + MAINTAINERS | 2 + + include/kunit/attributes.h | 50 +++ + include/kunit/static_stub.h | 6 +- + include/kunit/test-bug.h | 2 + + include/kunit/test.h | 91 +++++- + kernel/time/time_test.c | 2 +- + lib/Kconfig.debug | 16 + + lib/kunit/Kconfig | 2 +- + lib/kunit/Makefile | 3 +- + lib/kunit/attributes.c | 412 +++++++++++++++++++++++++ + lib/kunit/executor.c | 241 ++++++++++----- + lib/kunit/executor_test.c | 152 ++++++++- + lib/kunit/kunit-example-test.c | 9 + + lib/kunit/test.c | 64 +++- + lib/memcpy_kunit.c | 8 +- + rust/.gitignore | 2 + + rust/Makefile | 29 ++ + rust/bindings/bindings_helper.h | 1 + + rust/helpers.c | 7 + + rust/kernel/init.rs | 26 +- + rust/kernel/kunit.rs | 163 ++++++++++ + rust/kernel/lib.rs | 2 + + rust/kernel/str.rs | 4 +- + rust/kernel/sync/arc.rs | 9 +- + rust/kernel/sync/lock/mutex.rs | 1 + + rust/kernel/sync/lock/spinlock.rs | 1 + + rust/kernel/types.rs | 6 +- + scripts/.gitignore | 2 + + scripts/Makefile | 4 + + scripts/rustdoc_test_builder.rs | 72 +++++ + scripts/rustdoc_test_gen.rs | 260 ++++++++++++++++ + tools/testing/kunit/kunit.py | 70 ++++- + tools/testing/kunit/kunit_kernel.py | 8 +- + tools/testing/kunit/kunit_parser.py | 11 +- + tools/testing/kunit/kunit_tool_test.py | 39 ++- + tools/testing/kunit/qemu_configs/arm64.py | 2 +- + 38 files changed, 1806 insertions(+), 151 deletions(-) + create mode 100644 include/kunit/attributes.h + create mode 100644 lib/kunit/attributes.c + create mode 100644 rust/kernel/kunit.rs + create mode 100644 scripts/rustdoc_test_builder.rs + create mode 100644 scripts/rustdoc_test_gen.rs +Merging livepatching/for-next (ac4890f97211 Merge branch 'for-6.5/core' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (4f3688dca150 rtc: remove redundant of_match_ptr()) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/rtc/nxp,pcf2127.yaml | 1 + + drivers/rtc/Kconfig | 5 +- + drivers/rtc/rtc-abx80x.c | 2 +- + drivers/rtc/rtc-armada38x.c | 5 +- + drivers/rtc/rtc-aspeed.c | 2 +- + drivers/rtc/rtc-at91rm9200.c | 3 +- + drivers/rtc/rtc-at91sam9.c | 2 +- + drivers/rtc/rtc-ds1742.c | 1 - + drivers/rtc/rtc-fsl-ftm-alarm.c | 5 +- + drivers/rtc/rtc-isl12026.c | 5 +- + drivers/rtc/rtc-isl1208.c | 16 +- + drivers/rtc/rtc-jz4740.c | 2 +- + drivers/rtc/rtc-lpc24xx.c | 3 +- + drivers/rtc/rtc-m41t80.c | 2 +- + drivers/rtc/rtc-mpc5121.c | 4 +- + drivers/rtc/rtc-mt6397.c | 2 +- + drivers/rtc/rtc-mt7622.c | 4 +- + drivers/rtc/rtc-mxc.c | 1 - + drivers/rtc/rtc-nct3018y.c | 2 +- + drivers/rtc/rtc-pcf2127.c | 874 ++++++++++++++++----- + drivers/rtc/rtc-pcf85063.c | 107 ++- + drivers/rtc/rtc-pcf85363.c | 1 - + drivers/rtc/rtc-pxa.c | 1 - + drivers/rtc/rtc-rs5c372.c | 2 +- + drivers/rtc/rtc-rv3028.c | 82 +- + drivers/rtc/rtc-rv3032.c | 2 +- + drivers/rtc/rtc-rv8803.c | 2 +- + drivers/rtc/rtc-rx6110.c | 1 - + drivers/rtc/rtc-rx8581.c | 1 - + drivers/rtc/rtc-rzn1.c | 2 +- + drivers/rtc/rtc-s3c.c | 1 - + drivers/rtc/rtc-stm32.c | 143 ++-- + drivers/rtc/rtc-stmp3xxx.c | 1 - + drivers/rtc/rtc-sun6i.c | 1 - + drivers/rtc/rtc-sunplus.c | 2 +- + drivers/rtc/rtc-sunxi.c | 2 - + drivers/rtc/rtc-ti-k3.c | 2 +- + 37 files changed, 912 insertions(+), 382 deletions(-) +Merging nvdimm/libnvdimm-for-next (feb72e9b2082 nvdimm/pfn_dev: Avoid unnecessary endian conversion) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Auto-merging drivers/nvdimm/pfn_devs.c +Merge made by the 'ort' strategy. + drivers/nvdimm/namespace_devs.c | 3 ++- + drivers/nvdimm/nd_virtio.c | 3 ++- + drivers/nvdimm/of_pmem.c | 4 ++-- + drivers/nvdimm/pfn_devs.c | 20 +++++++++++++------- + drivers/nvdimm/pmem.c | 3 ++- + drivers/nvdimm/region_devs.c | 5 +++-- + 6 files changed, 24 insertions(+), 14 deletions(-) +Merging at24/at24/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (994def29acc5 ntb: Remove error checking for debugfs_create_dir()) +$ 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/test/ntb_tool.c | 2 -- + 1 file changed, 2 deletions(-) +Merging seccomp/for-next/seccomp (fbc5d382407e selftests/seccomp: Handle arm32 corner cases better) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/sched.h +Auto-merging tools/perf/bench/Build +Auto-merging tools/perf/bench/bench.h +Auto-merging tools/perf/builtin-bench.c +Merge made by the 'ort' strategy. + include/linux/completion.h | 1 + + include/linux/swait.h | 2 +- + include/linux/wait.h | 3 + + include/uapi/linux/seccomp.h | 4 + + kernel/sched/completion.c | 26 ++-- + kernel/sched/core.c | 5 +- + kernel/sched/fair.c | 4 + + kernel/sched/sched.h | 13 +- + kernel/sched/swait.c | 8 +- + kernel/sched/wait.c | 5 + + kernel/seccomp.c | 72 ++++++++++- + tools/arch/x86/include/uapi/asm/unistd_32.h | 3 + + tools/arch/x86/include/uapi/asm/unistd_64.h | 3 + + tools/perf/bench/Build | 1 + + tools/perf/bench/bench.h | 1 + + tools/perf/bench/sched-seccomp-notify.c | 178 ++++++++++++++++++++++++++ + tools/perf/builtin-bench.c | 1 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 67 +++++++++- + 18 files changed, 368 insertions(+), 29 deletions(-) + create mode 100644 tools/perf/bench/sched-seccomp-notify.c +Merging fsi/next (f432b1cf7820 fsi: fix some spelling mistakes in comment) + 2ecbdc7eea63 ("dt-bindings: fsi: Document the IBM I2C Responder virtual FSI master") + 366b119391d1 ("fsi: Add IBM I2C Responder virtual FSI master") + 5b4ffc4030fb ("fsi: Add I2C Responder SCOM driver") + 83ec2bf4d7d2 ("docs: ABI: fix spelling/grammar in SBEFIFO timeout interface") + c0d1c32d8bcb ("fsi: master-ast-cf: Add MODULE_FIRMWARE macro") + f432b1cf7820 ("fsi: fix some spelling mistakes in comment") +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Auto-merging drivers/fsi/fsi-core.c +CONFLICT (content): Merge conflict in drivers/fsi/fsi-core.c +Recorded preimage for 'drivers/fsi/fsi-core.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/fsi/fsi-core.c'. +[master 45f3314d1767] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git +$ git diff -M --stat --summary HEAD^.. + drivers/fsi/fsi-master-hub.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging slimbus/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (0e4a8e9e49ea nvmem: core: Notify when a new layout is registered) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/nvmem/fsl,t1023-sfp.yaml | 37 +++++++++ + .../bindings/nvmem/layouts/fixed-cell.yaml | 26 ++++++ + .../bindings/nvmem/layouts/fixed-layout.yaml | 12 +++ + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 5 +- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 2 + + .../devicetree/bindings/nvmem/qcom,sec-qfprom.yaml | 55 ++++++++++++ + drivers/nvmem/Kconfig | 31 ++++++- + drivers/nvmem/Makefile | 4 + + drivers/nvmem/bcm-ocotp.c | 1 - + drivers/nvmem/brcm_nvram.c | 3 +- + drivers/nvmem/core.c | 21 +++-- + drivers/nvmem/imx-iim.c | 1 - + drivers/nvmem/imx-ocotp-ele.c | 2 +- + drivers/nvmem/imx-ocotp-scu.c | 2 +- + drivers/nvmem/imx-ocotp.c | 1 - + drivers/nvmem/lpc18xx_otp.c | 5 +- + drivers/nvmem/meson-mx-efuse.c | 5 +- + drivers/nvmem/qcom-spmi-sdam.c | 2 +- + drivers/nvmem/qfprom.c | 17 ++-- + drivers/nvmem/qoriq-efuse.c | 78 +++++++++++++++++ + drivers/nvmem/rave-sp-eeprom.c | 2 +- + drivers/nvmem/rockchip-efuse.c | 3 +- + drivers/nvmem/sc27xx-efuse.c | 1 - + drivers/nvmem/sec-qfprom.c | 97 ++++++++++++++++++++++ + drivers/nvmem/snvs_lpgpr.c | 3 +- + drivers/nvmem/sprd-efuse.c | 2 +- + drivers/nvmem/stm32-romem.c | 3 +- + drivers/nvmem/sunplus-ocotp.c | 2 +- + drivers/nvmem/sunxi_sid.c | 5 +- + drivers/nvmem/u-boot-env.c | 4 +- + drivers/nvmem/uniphier-efuse.c | 3 +- + include/linux/nvmem-consumer.h | 4 +- + 32 files changed, 380 insertions(+), 59 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/fsl,t1023-sfp.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/qcom,sec-qfprom.yaml + create mode 100644 drivers/nvmem/qoriq-efuse.c + create mode 100644 drivers/nvmem/sec-qfprom.c +$ git reset --hard HEAD^ +HEAD is now at 45f3314d1767 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git +Merging next-20230809 version of nvmem +$ git merge -m next-20230809/nvmem c8efcf7a86ebf2ff48584d270b3070a7075bc345 +Merge made by the 'ort' strategy. + .../devicetree/bindings/nvmem/fsl,t1023-sfp.yaml | 37 ++++++++++ + .../bindings/nvmem/layouts/fixed-cell.yaml | 26 ++++++++ + .../bindings/nvmem/layouts/fixed-layout.yaml | 12 ++++ + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 5 +- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 1 + + drivers/nvmem/Kconfig | 12 ++++ + drivers/nvmem/Makefile | 2 + + drivers/nvmem/brcm_nvram.c | 3 +- + drivers/nvmem/lpc18xx_otp.c | 4 +- + drivers/nvmem/meson-mx-efuse.c | 4 +- + drivers/nvmem/qfprom.c | 17 ++--- + drivers/nvmem/qoriq-efuse.c | 78 ++++++++++++++++++++++ + drivers/nvmem/rockchip-efuse.c | 3 +- + drivers/nvmem/stm32-romem.c | 3 +- + drivers/nvmem/sunxi_sid.c | 4 +- + drivers/nvmem/uniphier-efuse.c | 3 +- + 16 files changed, 184 insertions(+), 30 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/fsl,t1023-sfp.yaml + create mode 100644 drivers/nvmem/qoriq-efuse.c +Merging xarray/main (cbc02854331e XArray: Do not return sibling entries from xa_load()) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Merge made by the 'ort' strategy. + lib/xarray.c | 2 +- + tools/testing/radix-tree/multiorder.c | 68 +++++++++++++++++++++++++++++++++-- + 2 files changed, 67 insertions(+), 3 deletions(-) +Merging hyperv/hyperv-next (5d0c230f1de8 Linux 6.5-rc4) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (def85dce1451 auxdisplay: Switch i2c drivers back to use .probe()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (b6464883f45a kdb: move kdb_send_sig() declaration to a better header file) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (0724869ede9c bus: mhi: host: pci_generic: add support for Telit FE990 modem) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (0f5e4adb608c memblock: report failures when memblock_can_resize is not set) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging mm/memblock.c +Merge made by the 'ort' strategy. + mm/memblock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging cxl/next (fe77cc2e5a6a cxl: Fix one kernel-doc comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (f6e6e95ce162 efi/riscv: libstub: Fix comment about absolute relocation) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging include/linux/efi.h +Merge made by the 'ort' strategy. + arch/x86/platform/efi/memmap.c | 2 +- + drivers/firmware/efi/libstub/Makefile | 2 +- + include/linux/efi.h | 1 - + 3 files changed, 2 insertions(+), 3 deletions(-) +Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (66489e5487b7 Merge branch 'slab/for-6.6/random_kmalloc' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Auto-merging mm/Kconfig +Auto-merging mm/slab_common.c +Merge made by the 'ort' strategy. + include/linux/percpu.h | 12 +++++++--- + include/linux/slab.h | 23 +++++++++++++++++--- + mm/Kconfig | 17 +++++++++++++++ + mm/kfence/kfence_test.c | 7 ++++-- + mm/slab.c | 2 +- + mm/slab.h | 2 +- + mm/slab_common.c | 49 ++++++++++++++++++++++++++++++++++++----- + mm/slub.c | 58 ++++++++++++++++++++++++++++--------------------- + 8 files changed, 130 insertions(+), 40 deletions(-) +Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (35ca42399297 selftests/landlock: Add hostfs tests) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (08ab786556ff rust: bindgen: upgrade to 0.65.1) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging Documentation/process/changes.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging rust/Makefile +Auto-merging rust/helpers.c +Auto-merging rust/kernel/lib.rs +Auto-merging rust/kernel/types.rs +Merge made by the 'ort' strategy. + Documentation/process/changes.rst | 4 +- + Documentation/rust/quick-start.rst | 19 +- + MAINTAINERS | 2 + + Makefile | 16 +- + rust/Makefile | 16 +- + rust/alloc/alloc.rs | 20 ++- + rust/alloc/boxed.rs | 131 +++++++------- + rust/alloc/lib.rs | 50 +++--- + rust/alloc/raw_vec.rs | 18 +- + rust/alloc/slice.rs | 43 +++-- + rust/alloc/vec/drain.rs | 8 +- + rust/alloc/vec/drain_filter.rs | 8 +- + rust/alloc/vec/into_iter.rs | 35 ++-- + rust/alloc/vec/mod.rs | 84 ++------- + rust/compiler_builtins.rs | 7 + + rust/helpers.c | 21 +-- + rust/kernel/allocator.rs | 84 ++++----- + rust/kernel/lib.rs | 3 - + rust/kernel/sync/lock.rs | 6 +- + rust/kernel/types.rs | 21 ++- + rust/macros/lib.rs | 97 +++++++++++ + rust/macros/module.rs | 2 +- + rust/macros/paste.rs | 96 ++++++++++ + scripts/Makefile.modfinal | 2 - + scripts/generate_rust_analyzer.py | 27 ++- + scripts/is_rust_module.sh | 16 -- + scripts/min-tool-version.sh | 4 +- + scripts/rust_is_available.sh | 233 ++++++++++++++++++------- + scripts/rust_is_available_test.py | 346 +++++++++++++++++++++++++++++++++++++ + 29 files changed, 1031 insertions(+), 388 deletions(-) + create mode 100644 rust/macros/paste.rs + delete mode 100755 scripts/is_rust_module.sh + create mode 100755 scripts/rust_is_available_test.py +Merging sysctl/sysctl-next (d6ea45102f22 sysctl: Use ctl_table_size as stopping criteria for list macro) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Auto-merging drivers/net/vrf.c +Auto-merging fs/proc/proc_sysctl.c +Auto-merging include/net/ipv6.h +Auto-merging include/net/net_namespace.h +Auto-merging ipc/ipc_sysctl.c +Auto-merging ipc/mq_sysctl.c +Auto-merging kernel/ucount.c +Auto-merging net/ipv4/route.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv6/icmp.c +Auto-merging net/ipv6/route.c +Auto-merging net/smc/smc_sysctl.c +Merge made by the 'ort' strategy. + arch/arm64/kernel/armv8_deprecated.c | 2 +- + arch/s390/appldata/appldata_base.c | 2 +- + drivers/net/vrf.c | 3 +- + fs/proc/proc_sysctl.c | 90 +++++++++++++++++---------------- + include/linux/sysctl.h | 31 +++++++++--- + include/net/ipv6.h | 2 + + include/net/net_namespace.h | 10 ++-- + ipc/ipc_sysctl.c | 4 +- + ipc/mq_sysctl.c | 4 +- + kernel/ucount.c | 5 +- + net/ax25/sysctl_net_ax25.c | 3 +- + net/bridge/br_netfilter_hooks.c | 3 +- + net/core/neighbour.c | 8 ++- + net/core/sysctl_net_core.c | 3 +- + net/ieee802154/6lowpan/reassembly.c | 8 ++- + net/ipv4/devinet.c | 3 +- + net/ipv4/ip_fragment.c | 3 +- + net/ipv4/route.c | 8 ++- + net/ipv4/sysctl_net_ipv4.c | 3 +- + net/ipv4/xfrm4_policy.c | 3 +- + net/ipv6/addrconf.c | 3 +- + net/ipv6/icmp.c | 5 ++ + net/ipv6/netfilter/nf_conntrack_reasm.c | 3 +- + net/ipv6/reassembly.c | 3 +- + net/ipv6/route.c | 13 +++-- + net/ipv6/sysctl_net_ipv6.c | 16 ++++-- + net/ipv6/xfrm6_policy.c | 3 +- + net/mpls/af_mpls.c | 6 ++- + net/mptcp/ctrl.c | 3 +- + net/netfilter/ipvs/ip_vs_ctl.c | 8 ++- + net/netfilter/ipvs/ip_vs_lblc.c | 10 ++-- + net/netfilter/ipvs/ip_vs_lblcr.c | 10 ++-- + net/netfilter/nf_conntrack_standalone.c | 4 +- + net/netfilter/nf_log.c | 7 +-- + net/rds/tcp.c | 3 +- + net/sctp/sysctl.c | 4 +- + net/smc/smc_sysctl.c | 3 +- + net/sysctl_net.c | 28 ++++++---- + net/unix/sysctl_net_unix.c | 3 +- + net/xfrm/xfrm_sysctl.c | 8 ++- + 40 files changed, 223 insertions(+), 118 deletions(-) +Merging execve/for-next/execve (fdf0eaf11452 Linux 6.5-rc2) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (5b914afcd166 bitmap: Fix a typo ("identify map")) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Merge made by the 'ort' strategy. + include/linux/cpumask.h | 113 +++++++++++++++++++++++++++++------------------- + lib/bitmap.c | 4 +- + lib/cpumask.c | 17 +++++--- + 3 files changed, 83 insertions(+), 51 deletions(-) +Merging hte/for-next (ac9a78681b92 Linux 6.4-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (429e2140a119 Merge branch 'for-next/hardening' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging arch/x86/kernel/paravirt.c +Auto-merging drivers/soc/fsl/qe/qe.c +Auto-merging kernel/events/core.c +Merge made by the 'ort' strategy. + arch/um/include/shared/user.h | 1 - + arch/um/os-Linux/umid.c | 6 +++--- + arch/x86/kernel/paravirt.c | 8 ++++++-- + drivers/eisa/eisa-bus.c | 2 +- + drivers/soc/fsl/qe/qe.c | 4 ++-- + include/linux/seq_file.h | 7 ++++--- + kernel/events/core.c | 6 +++--- + lib/Kconfig.ubsan | 10 +++++++++- + scripts/gcc-plugins/gcc-common.h | 4 ++++ + tools/testing/selftests/kselftest_harness.h | 11 +++++------ + 10 files changed, 37 insertions(+), 22 deletions(-) +Merging kspp-gustavo/for-next/kspp (4d8cbf6dbcda fs: omfs: Use flexible-array member in struct omfs_extent) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Merge made by the 'ort' strategy. + arch/sparc/include/uapi/asm/openpromio.h | 5 ++--- + fs/omfs/file.c | 12 ++++++------ + fs/omfs/omfs_fs.h | 2 +- + fs/reiserfs/fix_node.c | 5 +++-- + fs/reiserfs/reiserfs.h | 2 +- + 5 files changed, 13 insertions(+), 13 deletions(-) +Merging nolibc/nolibc (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc +Already up to date. +Merging iommufd/for-next (23a1b46f15d5 iommufd/selftest: Make the mock iommu driver into a real driver) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Auto-merging drivers/iommu/iommu.c +Auto-merging drivers/iommu/iommufd/device.c +CONFLICT (content): Merge conflict in drivers/iommu/iommufd/device.c +Auto-merging drivers/iommu/iommufd/iommufd_private.h +Auto-merging drivers/iommu/iommufd/main.c +Resolved 'drivers/iommu/iommufd/device.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2648fdb84883] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git +$ git diff -M --stat --summary HEAD^.. + drivers/iommu/iommu-priv.h | 19 + + drivers/iommu/iommu.c | 81 ++- + drivers/iommu/iommufd/device.c | 690 ++++++++++++++++------- + drivers/iommu/iommufd/hw_pagetable.c | 112 +++- + drivers/iommu/iommufd/io_pagetable.c | 38 +- + drivers/iommu/iommufd/iommufd_private.h | 60 +- + drivers/iommu/iommufd/iommufd_test.h | 10 + + drivers/iommu/iommufd/main.c | 32 +- + drivers/iommu/iommufd/selftest.c | 197 +++++-- + drivers/vfio/iommufd.c | 11 +- + drivers/vfio/vfio_main.c | 4 + + include/linux/iommufd.h | 2 + + include/uapi/linux/iommufd.h | 26 + + include/uapi/linux/vfio.h | 6 + + tools/testing/selftests/iommu/iommufd.c | 94 ++- + tools/testing/selftests/iommu/iommufd_fail_nth.c | 67 ++- + tools/testing/selftests/iommu/iommufd_utils.h | 82 ++- + 17 files changed, 1193 insertions(+), 338 deletions(-) + create mode 100644 drivers/iommu/iommu-priv.h +$ git am -3 ../patches/0001-fix-for-iommufd-Move-putting-a-hwpt-to-a-helper-func.patch +Applying: fix for "iommufd: Move putting a hwpt to a helper function" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/iommu/iommufd/iommufd_private.h +$ git add -A . +$ git commit -v -a --amend +[master d9e6f46f5022] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git + Date: Tue Aug 15 20:30:43 2023 +1000 +$ git am -3 ../patches/0001-fix-up-for-iommufd-selftest-Make-the-mock-iommu-driv.patch +Applying: fix up for "iommufd/selftest: Make the mock iommu driver into a real driver" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/iommu/iommu.c +$ git add -A . +$ git commit -v -a --amend +[master 4e9e4ce00fea] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git + Date: Tue Aug 15 20:30:43 2023 +1000 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..aaf2c43c8dc9 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230815 |